bug修复

docus-segmentation/src/main/java/com/docus/server/controller/FileController.java

@@ -4,10 +4,8 @@ import com.docus.server.common.event.FlowEvent;
 import com.docus.server.common.service.IFileUploadService;
 import com.docus.server.dto.segmentation.UploadBatchFileRequest;
 import com.docus.server.entity.segmentation.OcrFileInfoTest;
-import com.docus.server.service.IOcrCutConfigService;
-import com.docus.server.service.IOcrCutConfigTestService;
-import com.docus.server.service.IOcrFileInfoTestService;
-import com.docus.server.service.IPublishEventService;
+import com.docus.server.entity.segmentation.OcrVersion;
+import com.docus.server.service.*;
 import com.docus.server.service.impl.CommonService;
 import com.docus.server.service.impl.PlatformServiceImpl;
 import com.docus.server.vo.scheduling.management.schcollectorversionfile.UploadFileVO;
@@ -54,6 +52,8 @@ public class FileController {
     private IPublishEventService iPublishEventService;
     @Resource
     private IOcrFileInfoTestService iOcrFileInfoTestService;
+    @Resource
+    private IOcrVersionService iOcrVersionService;
 
     @ApiOperation("文件下载")
     @GetMapping("/download")
@@ -85,7 +85,8 @@ public class FileController {
             widthStart = ocrCutConfigTestVO.getWidthStart();
             widthEnd = ocrCutConfigTestVO.getWidthEnd();
         } else {
-            OcrCutConfigVO ocrCutConfigVO = iOcrCutConfigService.findAll().get(0);
+            OcrVersion ocrVersion = iOcrVersionService.finEnableVersion();
+            OcrCutConfigVO ocrCutConfigVO = iOcrCutConfigService.findByVersion(ocrVersion.getVersion());
             height = ocrCutConfigVO.getHeight();
             widthStart = ocrCutConfigVO.getWidthStart();
             widthEnd = ocrCutConfigVO.getWidthEnd();

docus-segmentation/src/main/java/com/docus/server/service/IOcrCutConfigService.java

@@ -5,6 +5,7 @@ import com.docus.infrastructure.web.response.PageResult;
 import com.docus.server.dto.segmentation.ocrcutconfig.AddOcrCutConfigDTO;
 import com.docus.server.dto.segmentation.ocrcutconfig.DeleteOcrCutConfigDTO;
 import com.docus.server.dto.segmentation.ocrcutconfig.EditOcrCutConfigDTO;
+import com.docus.server.entity.segmentation.OcrCutConfig;
 import com.docus.server.vo.segmentation.ocrcutconfig.OcrCutConfigVO;
 
 import java.util.List;
@@ -24,6 +25,13 @@ public interface IOcrCutConfigService {
      */
     OcrCutConfigVO findById(Long id);
 
+    /**
+     * 按主键查询
+     *
+     * @param version 主键id
+     * @return 实体
+     */
+    OcrCutConfigVO findByVersion(Integer version);
     /**
      * 查询所有
      *

docus-segmentation/src/main/java/com/docus/server/service/IOcrVersionService.java

@@ -5,6 +5,7 @@ import com.docus.infrastructure.web.response.PageResult;
 import com.docus.server.dto.segmentation.ocrversion.AddOcrVersionDTO;
 import com.docus.server.dto.segmentation.ocrversion.DeleteOcrVersionDTO;
 import com.docus.server.dto.segmentation.ocrversion.EditOcrVersionDTO;
+import com.docus.server.entity.segmentation.OcrVersion;
 import com.docus.server.vo.segmentation.ocrversion.OcrVersionVO;
 
 import java.util.List;
@@ -24,6 +25,7 @@ public interface IOcrVersionService {
      */
     OcrVersionVO findById(Long id);
 
+    OcrVersion finEnableVersion ();
     /**
      * 查询所有
      *

docus-segmentation/src/main/java/com/docus/server/service/impl/OcrCutConfigServiceImpl.java

@@ -41,6 +41,11 @@ public class OcrCutConfigServiceImpl implements IOcrCutConfigService {
         return OcrCutConfigConvert.INSTANCE.convertVO(iOcrCutConfigDao.findById(id));
     }
 
+    @Override
+    public OcrCutConfigVO findByVersion(Integer version) {
+        return OcrCutConfigConvert.INSTANCE.convertVO(iOcrCutConfigDao.findBy("version",version).get(0)) ;
+    }
+
     /**
      * 查询所有
      *

docus-segmentation/src/main/java/com/docus/server/service/impl/OcrVersionServiceImpl.java

@@ -63,6 +63,11 @@ public class OcrVersionServiceImpl implements IOcrVersionService {
         return OcrVersionConvert.INSTANCE.convertVO(iOcrVersionDao.findById(id));
     }
 
+    @Override
+    public OcrVersion finEnableVersion() {
+        return iOcrVersionDao.findBy("isEnable","1").get(0);
+    }
+
     /**
      * 查询所有
      *
@@ -125,18 +130,18 @@ public class OcrVersionServiceImpl implements IOcrVersionService {
         ocrVersion.setUpdateTime(new Date());
 
         List<OcrRule> ocrRuleList = iOcrRuleTestDao.findAll().stream().map(m-> {
-            m.setVersion(finalVersion);
-            m.setId(idService.getDateSeq());
             OcrRule ocrRule = new OcrRule();
             BeanUtil.copyProperties(m,ocrRule);
+            ocrRule.setVersion(finalVersion);
+            ocrRule.setId(idService.getDateSeq());
             return ocrRule;
         }).collect(Collectors.toList());
 
         List<OcrSpecialRule> ocrSpecialRuleTestDaoAll = iOcrSpecialRuleTestDao.findAll().stream().map(m-> {
-            m.setVersion(finalVersion);
-            m.setId(idService.getDateSeq());
             OcrSpecialRule ocrSpecialRule = new OcrSpecialRule();
             BeanUtil.copyProperties(m,ocrSpecialRule);
+            ocrSpecialRule.setVersion(finalVersion);
+            ocrSpecialRule.setId(idService.getDateSeq());
             return ocrSpecialRule;
         }).collect(Collectors.toList());