segment分支

docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/ZdAssortDaoImpl.java

@@ -9,6 +9,7 @@ import com.docus.server.entity.segmentation.ZdAssort;
 import com.docus.server.infrastructure.dao.IZdAssortDao;
 import com.docus.server.infrastructure.mapper.ZdAssortMapper;
 import com.github.pagehelper.PageHelper;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -21,7 +22,8 @@ import java.util.List;
  */
 @Repository
 public class ZdAssortDaoImpl extends BaseDaoImpl<ZdAssortMapper, ZdAssort> implements IZdAssortDao {
-
+    @Value("${ocr.defaultAssortSource}")
+    private String defaultAssortSource;
     /**
      * 按主键查询
      *
@@ -94,7 +96,7 @@ public class ZdAssortDaoImpl extends BaseDaoImpl<ZdAssortMapper, ZdAssort> imple
         // оr(). like(ZdAssort::getXX2, searchDTO.getKeyword()))
         //);
         //}
-        query.eq(ZdAssort::getAssortSource, 3);
+        query.eq(ZdAssort::getAssortSource, defaultAssortSource);
         query.eq(ZdAssort::getEffective, 1);
 
         //默认createTime倒序排序

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

@@ -23,12 +23,12 @@ import com.docus.server.service.IOcrRuleService;
 import com.docus.server.service.IOcrSpecialRuleService;
 import com.docus.server.service.impl.PlatformServiceImpl;
 import com.docus.server.vo.segmentation.ocrcutconfig.OcrCutConfigVO;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -59,6 +59,12 @@ public class StartSegmentHandler {
     private IFileUploadService iFileUploadService;
     @Resource
     private IOcrCutConfigService iOcrCutConfigService;
+    @Value("${ocr.defaultAssortId}")
+    private String defaultAssortId;
+    @Value("${ocr.defaultAssortName}")
+    private String defaultAssortName;
+    @Value("${ocr.defaultSuffix}")
+    private String defaultSuffix;
 
     @TrackRetryListener("START_SEGMENT")
     public void startSegment(String patientId) {
@@ -141,8 +147,8 @@ public class StartSegmentHandler {
                     rate = ocrRuleResult.getRate();
                 } else {
                     if (assortName == null) {
-                        assortId = "-1";
+                        assortId = this.defaultAssortId;
-                        assortName = "其他（无关键字）";
+                        assortName = this.defaultAssortName;
                     }
                 }
             }
@@ -161,7 +167,7 @@ public class StartSegmentHandler {
 
             FileDTO fileDTO = new FileDTO();
             fileDTO.setAssortId(fileInfo.getAssortId());
-            fileDTO.setFileTitle(fileInfo.getAssortName());
+            fileDTO.setFileTitle(fileInfo.getAssortName()+this.defaultSuffix);
             fileDTO.setSort(fileInfo.getSort());
             fileDTO.setFileType(2);
             fileDTO.setUploadFileName(fileInfo.getPicName());

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

@@ -13,6 +13,7 @@ import com.docus.server.service.IOcrCutConfigTestService;
 import com.docus.server.service.IOcrRuleTestService;
 import com.docus.server.service.IOcrSpecialRuleTestService;
 import com.docus.server.vo.segmentation.ocrcutconfigtest.OcrCutConfigTestVO;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -42,7 +43,10 @@ public class StartSegmentTestHandler {
     private IOcrCutConfigTestService iOcrCutConfigTestService;
     @Resource
     private IFileUploadService iFileUploadService;
-
+    @Value("${ocr.defaultAssortId}")
+    private String defaultAssortId;
+    @Value("${ocr.defaultAssortName}")
+    private String defaultAssortName;
 
     @TrackRetryListener("START_SEGMENT_TEST")
     public List<OcrFileInfoTest> startSegment(String patientId) {
@@ -125,8 +129,8 @@ public class StartSegmentTestHandler {
                     rate = ocrRuleResult.getRate();
                 }else {
                     if (assortName==null){
-                        assortId = "-1";
+                        assortId = this.defaultAssortId;
-                        assortName="其他（无关键字）";
+                        assortName = this.defaultAssortName;
                     }
                 }
             }

docus-segmentation/src/main/resources/bootstrap.yml

@@ -66,6 +66,10 @@ file:
 
 ocr:
   api-url: http://192.168.16.85:9999/uploadfile
+  defaultAssortId: -1
+  defaultAssortName: 其他
+  defaultAssortSource: 1
+  defaultSuffix: (扫描)
 
 download:
   api-url: http://localhost:9291/api/downplatform/uploadFileBatch