逻辑变更

docus-api-common/src/main/java/com/docus/server/common/service/IFileUploadService.java

@@ -17,7 +17,7 @@ public interface IFileUploadService {
 
     List<UploadFileVO> uploadFile(MultipartFile[] files, String segmentation, Double height, Double widthStart, Double widthEnd) throws Exception;
 
-    void  compressFile(String compressPath,String picPath,String fileName,Double compressWidth);
+    void  compressFile(String compressPath,String picPath,Double compressWidth);
 
-    void cutPic(String saveCutFilePath,String compressPath,String fileName,Double widthStart, Double heightStart);
+    void cutPic(String saveCutFilePath,String compressPath,Double widthStart, Double heightStart);
 }

docus-api-common/src/main/java/com/docus/server/common/service/impl/FileUploadServiceImpl.java

@@ -127,14 +127,14 @@ public class FileUploadServiceImpl implements IFileUploadService {
 
 
     @Override
-    public void  compressFile(String compressPath,String picPath,String fileName,Double compressWidth) {
+    public void  compressFile(String compressPath,String picPath ,Double compressWidth) {
         if (Func.isNotBlank(compressPath)) {
             try {
                 File compressFileDir = new File(compressPath);
                 if (!compressFileDir.exists()) {
                     compressFileDir.mkdirs();
                 }
-                File compressDest = new File(saveCompressFilePath+fileName);
+                File compressDest = new File(saveCompressFilePath);
                 BufferedImage image = ImageIO.read(new File(picPath));
                 int width = image.getWidth();
                 //图片压缩
@@ -146,16 +146,16 @@ public class FileUploadServiceImpl implements IFileUploadService {
     }
 
     @Override
-    public  void cutPic(String saveCutFilePath,String compressPath,String fileName,Double widthStart, Double heightStart){
+    public  void cutPic(String saveCutFilePath,String compressPath ,Double widthStart, Double heightStart){
         if (Func.isNotBlank(saveCutFilePath)) {
             try {
-                File cutFileDir = new File(saveCutFilePath + fileName);
+                File cutFileDir = new File(saveCutFilePath);
                 if (!cutFileDir.exists()) {
                     cutFileDir.mkdirs();
                 }
-                File cutDest = new File(saveCutFilePath + fileName);
+                File cutDest = new File(saveCutFilePath);
 
-                BufferedImage image = ImageIO.read(FileUtil.file(compressPath+fileName));
+                BufferedImage image = ImageIO.read(FileUtil.file(compressPath));
                 int height = image.getHeight();
                 int width = image.getWidth();
                 int startY = height / 100 * widthStart.intValue();

docus-segmentation/src/main/java/com/docus/server/service/handler/StartSegmentHandler.java

@@ -78,8 +78,8 @@ public class StartSegmentHandler {
         List<File> files = new ArrayList<>(fileInfoList.size());
         List<FileDTO> fileDTOList = new ArrayList<>(fileInfoList.size());
         for (OcrFileInfo fileInfo : fileInfoList) {
-            iFileUploadService.compressFile(fileInfo.getPicCompressUrl(),fileInfo.getPicUrl(),fileInfo.getPicName(),height);
-            iFileUploadService.cutPic(fileInfo.getPicCutUrl(),fileInfo.getPicCompressUrl(),fileInfo.getPicName(),widthStart,widthEnd);
+            iFileUploadService.compressFile(fileInfo.getPicCompressUrl(),fileInfo.getPicUrl(),height);
+            iFileUploadService.cutPic(fileInfo.getPicCutUrl(),fileInfo.getPicCompressUrl(),widthStart,widthEnd);
 
             boolean assortFlag = false;
             String assortId = null;

docus-segmentation/src/main/java/com/docus/server/service/handler/StartSegmentTestHandler.java

@@ -62,8 +62,8 @@ public class StartSegmentTestHandler {
         Double widthEnd = ocrCutConfigTestVO.getWidthEnd();
 
         for (OcrFileInfoTest fileInfoTest : fileInfoTestList) {
-            iFileUploadService.compressFile(fileInfoTest.getPicCompressUrl(),fileInfoTest.getPicUrl(),fileInfoTest.getPicName(),height);
-            iFileUploadService.cutPic(fileInfoTest.getPicCutUrl(),fileInfoTest.getPicCompressUrl(),fileInfoTest.getPicName(),widthStart,widthEnd);
+            iFileUploadService.compressFile(fileInfoTest.getPicCompressUrl(),fileInfoTest.getPicUrl(),height);
+            iFileUploadService.cutPic(fileInfoTest.getPicCutUrl(),fileInfoTest.getPicCompressUrl(),widthStart,widthEnd);
 
 
             boolean assortFlag = false;