From 2f0ec4be38447bc0e8a04b79038f694bd33d75ee Mon Sep 17 00:00:00 2001 From: zhanglb Date: Mon, 18 Sep 2023 10:11:54 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../segmentation/ocrrule/AddOcrRuleDTO.java | 3 +++ .../segmentation/ocrrule/EditOcrRuleDTO.java | 3 +++ .../ocrruletest/AddOcrRuleTestDTO.java | 3 +++ .../ocrruletest/EditOcrRuleTestDTO.java | 3 +++ .../server/entity/segmentation/OcrRule.java | 4 ++++ .../entity/segmentation/OcrRuleTest.java | 4 ++++ .../vo/segmentation/ocrrule/OcrRuleVO.java | 4 ++++ .../ocrruletest/OcrRuleTestVO.java | 3 +++ .../server/controller/FileController.java | 23 +++++++++---------- .../service/handler/StartSegmentHandler.java | 5 +++- .../service/impl/OcrRuleServiceImpl.java | 4 ++++ .../service/impl/OcrRuleTestServiceImpl.java | 2 ++ .../impl/OcrSpecialRuleServiceImpl.java | 2 +- 13 files changed, 49 insertions(+), 14 deletions(-) diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/AddOcrRuleDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/AddOcrRuleDTO.java index 891cd65..d98e68a 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/AddOcrRuleDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/AddOcrRuleDTO.java @@ -34,6 +34,9 @@ public class AddOcrRuleDTO implements Serializable { @ApiModelProperty(value = "分段id") private String assortId; + @ApiModelProperty(value = "分段名称") + private Integer assortName; + @ApiModelProperty(value = "占比分") private Integer matchRatio; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/EditOcrRuleDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/EditOcrRuleDTO.java index 363a5a2..dbc821c 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/EditOcrRuleDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/EditOcrRuleDTO.java @@ -34,6 +34,9 @@ public class EditOcrRuleDTO implements Serializable { @ApiModelProperty(value = "分段id") private String assortId; + @ApiModelProperty(value = "分段名称") + private Integer assortName; + @ApiModelProperty(value = "占比分") private Integer matchRatio; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/AddOcrRuleTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/AddOcrRuleTestDTO.java index dc7938a..6191e11 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/AddOcrRuleTestDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/AddOcrRuleTestDTO.java @@ -34,6 +34,9 @@ public class AddOcrRuleTestDTO implements Serializable { @ApiModelProperty(value = "分段id") private String assortId; + @ApiModelProperty(value = "分段名称") + private Integer assortName; + @ApiModelProperty(value = "占比分") private Integer matchRatio; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/EditOcrRuleTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/EditOcrRuleTestDTO.java index 507184e..aa653ef 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/EditOcrRuleTestDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/EditOcrRuleTestDTO.java @@ -34,6 +34,9 @@ public class EditOcrRuleTestDTO implements Serializable { @ApiModelProperty(value = "分段id") private String assortId; + @ApiModelProperty(value = "分段名称") + private Integer assortName; + @ApiModelProperty(value = "占比分") private Integer matchRatio; diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRule.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRule.java index b194f1f..1bfa36d 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRule.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRule.java @@ -41,6 +41,10 @@ public class OcrRule implements Serializable { @TableField("assort_id") private String assortId; + @ApiModelProperty(value = "分段名称") + @TableField("assort_name") + private String assortName; + @ApiModelProperty(value = "占比分") @TableField("match_ratio") private Integer matchRatio; diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRuleTest.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRuleTest.java index f27535e..fbd9350 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRuleTest.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRuleTest.java @@ -41,6 +41,10 @@ public class OcrRuleTest implements Serializable { @TableField("assort_id") private String assortId; + @ApiModelProperty(value = "分段名称") + @TableField("assort_name") + private String assortName; + @ApiModelProperty(value = "占比分") @TableField("match_ratio") private Integer matchRatio; diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrrule/OcrRuleVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrrule/OcrRuleVO.java index 0911c2d..05e3770 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrrule/OcrRuleVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrrule/OcrRuleVO.java @@ -1,5 +1,6 @@ package com.docus.server.vo.segmentation.ocrrule; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -34,6 +35,9 @@ public class OcrRuleVO implements Serializable { @ApiModelProperty(value = "分段id") private String assortId; + @ApiModelProperty(value = "分段名称") + private Integer assortName; + @ApiModelProperty(value = "占比分") private Integer matchRatio; diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrruletest/OcrRuleTestVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrruletest/OcrRuleTestVO.java index bd1cf55..13cf794 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrruletest/OcrRuleTestVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrruletest/OcrRuleTestVO.java @@ -34,6 +34,9 @@ public class OcrRuleTestVO implements Serializable { @ApiModelProperty(value = "分段id") private String assortId; + @ApiModelProperty(value = "分段名称") + private Integer assortName; + @ApiModelProperty(value = "占比分") private Integer matchRatio; diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/FileController.java b/docus-segmentation/src/main/java/com/docus/server/controller/FileController.java index edf3da6..40bb313 100644 --- a/docus-segmentation/src/main/java/com/docus/server/controller/FileController.java +++ b/docus-segmentation/src/main/java/com/docus/server/controller/FileController.java @@ -91,7 +91,6 @@ public class FileController { widthEnd = ocrCutConfigVO.getWidthEnd(); } - List segmentation = iFileUploadService.uploadFile(files, "segmentation", height, widthStart, widthEnd); //将基础信息存到库表里面，后面自动分段后，需要上传到归档系统 @@ -130,15 +129,15 @@ public class FileController { return commonService.getOcr(segmentation.get(0), request); } - - /** - * 下载平台 - * - * @throws Exception - */ - @ApiOperation("批量上传文件到归档系统") - @GetMapping("/uploadPlatform") - public void uploadPlatform() throws Exception { - downloadService.uploadPlatform(null, null); - } +// +// /** +// * 下载平台 +// * +// * @throws Exception +// */ +// @ApiOperation("批量上传文件到归档系统") +// @GetMapping("/uploadPlatform") +// public void uploadPlatform() throws Exception { +// downloadService.uploadPlatform(null, null); +// } } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/handler/StartSegmentHandler.java b/docus-segmentation/src/main/java/com/docus/server/service/handler/StartSegmentHandler.java index 36ab1c8..07f2f46 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/handler/StartSegmentHandler.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/handler/StartSegmentHandler.java @@ -11,6 +11,7 @@ import com.docus.server.infrastructure.dao.IOcrUrlConfigDao; import com.docus.server.infrastructure.dao.IOcrVersionDao; import com.docus.server.service.IOcrRuleService; import com.docus.server.service.IOcrSpecialRuleService; +import com.docus.server.service.impl.PlatformServiceImpl; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -38,6 +39,8 @@ public class StartSegmentHandler { private IOcrUrlConfigDao iOcrUrlConfigDao; @Resource private IOcrBasicDao iOcrBasicDao; + @Resource + private PlatformServiceImpl platformService; @TrackRetryListener("START_SEGMENT") public void startSegment(String patientId) { @@ -111,6 +114,6 @@ public class StartSegmentHandler { iOcrFileInfoDao.updateBatchById(fileInfoList,iOcrFileInfoDao.DEFAULT_BATCH_SIZE); //数据上传到3.0 - + platformService.uploadPlatform(null, null); } } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleServiceImpl.java index 15b949d..5e959dd 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleServiceImpl.java @@ -92,6 +92,7 @@ public class OcrRuleServiceImpl implements IOcrRuleService { continue; } String assortId = ocrRule.getAssortId(); + String assortName = ocrRule.getAssortName(); double score = ocrRule.getMatchRatio(); String[] keyWordList = ocrRule.getKeyWord().split("#"); @@ -110,6 +111,7 @@ public class OcrRuleServiceImpl implements IOcrRuleService { for (OcrRuleJson ruleJson : ocrRuleList) { //匹配二级的关键词列表 assortId = ruleJson.getAssortId(); + assortName = ruleJson.getAssortName(); List ocrRuleSecondJsonList = ruleJson.getKeyWordList(); for (OcrRuleSecondJson ocrRuleSecondJson:ocrRuleSecondJsonList) { if (Func.isEmpty(ocrRuleSecondJson.getKeyWord())){ @@ -126,6 +128,7 @@ public class OcrRuleServiceImpl implements IOcrRuleService { OcrRuleResult ocrRuleResult = new OcrRuleResult(); ocrRuleResult.setRuleId(ocrRule.getId()); ocrRuleResult.setAssortId(assortId); + ocrRuleResult.setAssortName(assortName); ocrRuleResult.setHitKey(keyWord); ocrRuleResult.setRate(rate); return ocrRuleResult; @@ -138,6 +141,7 @@ public class OcrRuleServiceImpl implements IOcrRuleService { OcrRuleResult ocrRuleResult = new OcrRuleResult(); ocrRuleResult.setRuleId(ocrRule.getId()); ocrRuleResult.setAssortId(assortId); + ocrRuleResult.setAssortName(assortName); ocrRuleResult.setHitKey(keyWord); ocrRuleResult.setRate(rate); return ocrRuleResult; diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleTestServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleTestServiceImpl.java index d38a3c8..bbf9cdb 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleTestServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleTestServiceImpl.java @@ -42,6 +42,7 @@ public class OcrRuleTestServiceImpl implements IOcrRuleTestService { List ocrRuleTestList = iOcrRuleTestDao.findAll(); //判断是否符合某个条件的开始条件 for (OcrRuleTest ocrRuleTest : ocrRuleTestList) { + String assortName = ocrRuleTest.getAssortId(); String assortId = ocrRuleTest.getAssortId(); double score = ocrRuleTest.getMatchRatio(); if (Func.isEmpty(ocrRuleTest.getKeyWord())){ @@ -64,6 +65,7 @@ public class OcrRuleTestServiceImpl implements IOcrRuleTestService { for (OcrRuleJson ruleJson : ocrRuleList) { //匹配二级的关键词列表 assortId = ruleJson.getAssortId(); + assortName = ruleJson.getAssortName(); List ocrRuleSecondJsonList = ruleJson.getKeyWordList(); for (OcrRuleSecondJson ocrRuleSecondJson : ocrRuleSecondJsonList) { if (Func.isEmpty(ocrRuleSecondJson.getKeyWord())){ diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleServiceImpl.java index 5f758e0..ec429d3 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleServiceImpl.java @@ -117,7 +117,7 @@ public class OcrSpecialRuleServiceImpl implements IOcrSpecialRuleService { String assortId = ocrSpecialRule.getAssortId(); String startJson = ocrSpecialRule.getStartJson(); - String assortName = ocrSpecialRule.getName(); + String assortName = ocrSpecialRule.getAssortName(); List ocrSpecialRuleJsons = Func.parseJsonArray(startJson, OcrSpecialRuleJson.class); for (OcrSpecialRuleJson ocrSpecialRuleJson : ocrSpecialRuleJsons) {