|
@@ -11,10 +11,7 @@ import com.poteviohealth.cgp.common.facade.time.MethodTime;
|
|
|
import com.poteviohealth.cgp.common.filter.TokenContext;
|
|
import com.poteviohealth.cgp.common.filter.TokenContext;
|
|
|
import com.poteviohealth.cgp.common.filter.repeatSubmit.RepeatSubmit;
|
|
import com.poteviohealth.cgp.common.filter.repeatSubmit.RepeatSubmit;
|
|
|
import com.poteviohealth.cgp.common.model.VaultsResponse;
|
|
import com.poteviohealth.cgp.common.model.VaultsResponse;
|
|
|
-import com.poteviohealth.cgp.statistics.model.indto.DishesOrderWebInDTO;
|
|
|
|
|
-import com.poteviohealth.cgp.statistics.model.indto.OrderCostWebInDTO;
|
|
|
|
|
-import com.poteviohealth.cgp.statistics.model.indto.OrderServiceWebInDTO;
|
|
|
|
|
-import com.poteviohealth.cgp.statistics.model.indto.OrderWebInDTO;
|
|
|
|
|
|
|
+import com.poteviohealth.cgp.statistics.model.indto.*;
|
|
|
import com.poteviohealth.cgp.statistics.model.outdto.DishesOrderWebOutDTO;
|
|
import com.poteviohealth.cgp.statistics.model.outdto.DishesOrderWebOutDTO;
|
|
|
import com.poteviohealth.cgp.statistics.model.outdto.OrderCostWebOutDTO;
|
|
import com.poteviohealth.cgp.statistics.model.outdto.OrderCostWebOutDTO;
|
|
|
import com.poteviohealth.cgp.statistics.model.outdto.OrderExcelDTO;
|
|
import com.poteviohealth.cgp.statistics.model.outdto.OrderExcelDTO;
|
|
@@ -194,12 +191,12 @@ public class OrderController extends BaseWebController {
|
|
|
@RequestMapping(value = "/uploadArrayFile", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/uploadArrayFile", method = RequestMethod.POST)
|
|
|
@ApiOperation(value = "阿里云图片上传")
|
|
@ApiOperation(value = "阿里云图片上传")
|
|
|
@MethodTime
|
|
@MethodTime
|
|
|
- public VaultsResponse uploadArrayFile(@RequestParam("file") MultipartFile file){
|
|
|
|
|
- log.info(file.getOriginalFilename());
|
|
|
|
|
- /* VaultsResponse<List<PriceUploadDto>> vaultsResponse = ossUtils.uploadArrayFile(list);
|
|
|
|
|
- if(vaultsResponse.validate()){
|
|
|
|
|
|
|
+ public VaultsResponse<String> uploadArrayFile(@RequestParam("file") MultipartFile file,@RequestParam("orderId") Long orderId){
|
|
|
|
|
+ log.info(orderId);
|
|
|
|
|
+ VaultsResponse<String> vaultsResponse = ossUtils.uploadArrayFile2(file);
|
|
|
|
|
+ /* if(vaultsResponse.validate()){
|
|
|
return orderService.updateOrderUrl(list);
|
|
return orderService.updateOrderUrl(list);
|
|
|
}*/
|
|
}*/
|
|
|
- return VaultsResponse.success();
|
|
|
|
|
|
|
+ return vaultsResponse;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|