图片查重

src/main/java/com/poteviohealth/cgp/statistics/controller/OrderController.java

@@ -204,12 +204,11 @@ public class OrderController extends BaseWebController {
         return returnVal;
     }
 
-    @RequestMapping(value = "/uploadArrayFile", method = RequestMethod.POST)
-    @ApiOperation(value = "阿里云图片上传")
+    @RequestMapping(value = "/uploadCheck", method = RequestMethod.POST)
+    @ApiOperation(value = "图片上传前检查")
     @MethodTime
     @ResponseBody
-    public VaultsResponse<DistinctionDTO> uploadArrayFile(@RequestParam("file") MultipartFile file,@RequestParam("orderId") Long orderId,@RequestParam("uidList") List<String> uidList){
-        log.info(orderId);
+    public VaultsResponse<DistinctionDTO> uploadCheck(@RequestParam("file") MultipartFile file,@RequestParam("orderId") Long orderId,@RequestParam("uidList") List<String> uidList){
         //图片检查
         try {
             DistinctionDTO dto;
@@ -222,26 +221,15 @@ public class OrderController extends BaseWebController {
                 //视频处理
                 File tempFile = File.createTempFile("temp_", ".mp4");
                 file.transferTo(tempFile);
-                MultipartFile videoFile =  new MockMultipartFile(tempFile.getName(), new FileInputStream(tempFile));
                 File imageFile = ossUtils.generateCover(tempFile);
                 MultipartFile tempMultipartFile =  new MockMultipartFile(imageFile.getName(), new FileInputStream(imageFile));
                 dto = distinctionService.checkImg(tempMultipartFile,orderId,uidList);
-                if(dto.getOrderId() ==null){
-                    VaultsResponse<String> vaultsResponse = ossUtils.uploadOneFile(videoFile,orderId);
-                    dto.setUrl(vaultsResponse.getData());
-                }
                 tempFile.delete();
                 imageFile.delete();
             }else{
                 //图片处理
                 dto = distinctionService.checkImg(file,orderId,uidList);
-                if(dto.getOrderId() ==null){
-                    VaultsResponse<String> vaultsResponse = ossUtils.uploadOneFile(file,orderId);
-                    dto.setUrl(vaultsResponse.getData());
-                }
             }
-
-
             return VaultsResponse.success(dto);
         } catch (IOException e) {
             e.printStackTrace();
@@ -249,6 +237,19 @@ public class OrderController extends BaseWebController {
         return VaultsResponse.failed();
     }
 
+
+
+    @RequestMapping(value = "/uploadArrayFile", method = RequestMethod.POST)
+    @ApiOperation(value = "阿里云图片上传")
+    @MethodTime
+    @ResponseBody
+    public VaultsResponse<String> uploadArrayFile(@RequestParam("file") MultipartFile file,@RequestParam("orderId") Long orderId,@RequestParam("uidList") List<String> uidList){
+        log.info(orderId);
+        VaultsResponse<String> vaultsResponse = ossUtils.uploadOneFile(file,orderId);
+        log.info(vaultsResponse.getData());
+        return vaultsResponse;
+    }
+
     @PostMapping("/orderFile")
     @ApiOperation(value = "工单照片")
     @ResponseBody