|
@@ -20,6 +20,7 @@ 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;
|
|
|
|
|
+import com.poteviohealth.cgp.statistics.service.IDistinctionService;
|
|
|
import com.poteviohealth.cgp.statistics.service.IOrderService;
|
|
import com.poteviohealth.cgp.statistics.service.IOrderService;
|
|
|
import com.poteviohealth.cgp.statistics.service.IWatermarkImgService;
|
|
import com.poteviohealth.cgp.statistics.service.IWatermarkImgService;
|
|
|
import com.poteviohealth.cgp.statistics.utils.ExcelUtils2;
|
|
import com.poteviohealth.cgp.statistics.utils.ExcelUtils2;
|
|
@@ -34,6 +35,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
+import java.io.IOException;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
|
@@ -57,6 +59,8 @@ public class OrderController extends BaseWebController {
|
|
|
private OssUtils ossUtils;
|
|
private OssUtils ossUtils;
|
|
|
@Resource
|
|
@Resource
|
|
|
private IWatermarkImgService watermarkImgService;
|
|
private IWatermarkImgService watermarkImgService;
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private IDistinctionService distinctionService;
|
|
|
|
|
|
|
|
@PostMapping(value = "/orderServiceExport")
|
|
@PostMapping(value = "/orderServiceExport")
|
|
|
@ApiOperation(httpMethod = "POST", value = "工单Excel导出")
|
|
@ApiOperation(httpMethod = "POST", value = "工单Excel导出")
|
|
@@ -202,6 +206,13 @@ public class OrderController extends BaseWebController {
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public VaultsResponse<String> uploadArrayFile(@RequestParam("file") MultipartFile file,@RequestParam("orderId") Long orderId){
|
|
public VaultsResponse<String> uploadArrayFile(@RequestParam("file") MultipartFile file,@RequestParam("orderId") Long orderId){
|
|
|
log.info(orderId);
|
|
log.info(orderId);
|
|
|
|
|
+ //图片检查
|
|
|
|
|
+
|
|
|
|
|
+ try {
|
|
|
|
|
+ Long repeatId = distinctionService.checkImg(file.getInputStream());
|
|
|
|
|
+ } catch (IOException e) {
|
|
|
|
|
+ e.printStackTrace();
|
|
|
|
|
+ }
|
|
|
VaultsResponse<String> vaultsResponse = ossUtils.uploadOneFile(file,orderId);
|
|
VaultsResponse<String> vaultsResponse = ossUtils.uploadOneFile(file,orderId);
|
|
|
log.info(vaultsResponse.getData());
|
|
log.info(vaultsResponse.getData());
|
|
|
/* if(vaultsResponse.validate()){
|
|
/* if(vaultsResponse.validate()){
|