From bc3ff687f61a06680e3d02c3c957ae7cd18408d9 Mon Sep 17 00:00:00 2001 From: zhanglb Date: Fri, 1 Sep 2023 08:46:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E6=9E=B6=E6=9E=84=E7=9A=84=E5=BC=BA?= =?UTF-8?q?=E8=BF=AB=E4=B8=8B=EF=BC=8C=E6=8F=90=E4=BA=A4=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E5=A0=86=E6=B2=A1=E5=86=99=E5=AE=8C=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/api/segmentation/OcrSpRuleApi.java | 81 ---------- .../ocrsprule/AddOcrSpRuleDTO.java | 44 ------ .../ocrsprule/DeleteOcrSpRuleDTO.java | 34 ---- .../ocrsprule/EditOcrSpRuleDTO.java | 44 ------ .../entity/segmentation/OcrRuleJson.java | 28 ++++ .../entity/segmentation/OcrRuleResult.java | 13 ++ .../server/entity/segmentation/OcrSpRule.java | 49 ------ .../entity/segmentation/OcrSpecialResult.java | 13 ++ .../segmentation/OcrSpecialRuleJson.java | 19 +++ .../segmentation/ocrsprule/OcrSpRuleVO.java | 44 ------ .../controller/OcrSpRuleController.java | 100 ------------ .../server/convert/OcrSpRuleConvert.java | 49 ------ .../dao/IOcrFileInfoTestDao.java | 3 + .../infrastructure/dao/IOcrSpRuleDao.java | 65 -------- .../dao/impl/OcrFileInfoTestDaoImpl.java | 1 + .../dao/impl/OcrSpRuleDaoImpl.java | 123 --------------- .../mapper/OcrSpRuleMapper.java | 17 -- .../server/service/IOcrRuleTestService.java | 9 ++ .../server/service/IOcrSpRuleService.java | 65 -------- .../service/IOcrSpecialRuleTestService.java | 18 +++ .../service/handler/StartOcrTestHandler.java | 27 +++- .../service/impl/OcrRuleTestServiceImpl.java | 16 ++ .../service/impl/OcrSpRuleServiceImpl.java | 145 ------------------ .../impl/OcrSpecialRuleTestServiceImpl.java | 29 ++++ .../main/resources/mapper/OcrSpRuleMapper.xml | 19 --- 25 files changed, 174 insertions(+), 881 deletions(-) delete mode 100644 docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpRuleApi.java delete mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/AddOcrSpRuleDTO.java delete mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/DeleteOcrSpRuleDTO.java delete mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/EditOcrSpRuleDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRuleJson.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRuleResult.java delete mode 100644 docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpRule.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpecialResult.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpecialRuleJson.java delete mode 100644 docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrsprule/OcrSpRuleVO.java delete mode 100644 docus-segmentation/src/main/java/com/docus/server/controller/OcrSpRuleController.java delete mode 100644 docus-segmentation/src/main/java/com/docus/server/convert/OcrSpRuleConvert.java delete mode 100644 docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrSpRuleDao.java delete mode 100644 docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpRuleDaoImpl.java delete mode 100644 docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrSpRuleMapper.java delete mode 100644 docus-segmentation/src/main/java/com/docus/server/service/IOcrSpRuleService.java delete mode 100644 docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpRuleServiceImpl.java delete mode 100644 docus-segmentation/src/main/resources/mapper/OcrSpRuleMapper.xml diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpRuleApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpRuleApi.java deleted file mode 100644 index ffe4141..0000000 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpRuleApi.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.docus.server.api.segmentation; - -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.segmentation.ocrsprule.AddOcrSpRuleDTO; -import com.docus.server.dto.segmentation.ocrsprule.DeleteOcrSpRuleDTO; -import com.docus.server.dto.segmentation.ocrsprule.EditOcrSpRuleDTO; -import com.docus.server.vo.segmentation.ocrsprule.OcrSpRuleVO; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; - -import java.util.List; - - -/** - * 特殊策略表 API - * - * @author AutoGenerator - * @since 2023-08-21 - */ -@FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrSpRuleApi") -@RequestMapping("/ocr/SpRule") -public interface OcrSpRuleApi { - - /** - * 按主键查询 - * - * @param id 主键id - * @return 实体 - */ - @GetMapping("/find/{id}") - OcrSpRuleVO findById(@PathVariable(value = "id") Long id); - - /** - * 查询所有 - * - * @return 实体 - */ - @GetMapping("/findAll") - List findAll(); - - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - @PostMapping("/search") - PageResult search(@RequestBody SearchDTO searchDTO); - - /** - * 新增 - * - * @param addOcrSpRuleDTO 新增参数 - */ - @PostMapping("/add") - boolean add(@RequestBody AddOcrSpRuleDTO addOcrSpRuleDTO); - - /** - * 编辑 - * - * @param editOcrSpRuleDTO 编辑参数 - */ - @PutMapping("/edit") - boolean edit(@RequestBody EditOcrSpRuleDTO editOcrSpRuleDTO); - - /** - * 批量删除 - * - * @param deleteOcrSpRuleDTO 删除参数 - * @return 成功或失败 - */ - @DeleteMapping("/delete") - int delete(@RequestBody DeleteOcrSpRuleDTO deleteOcrSpRuleDTO); -} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/AddOcrSpRuleDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/AddOcrSpRuleDTO.java deleted file mode 100644 index dfbe1e0..0000000 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/AddOcrSpRuleDTO.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.docus.server.dto.segmentation.ocrsprule; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import com.docus.server.enums.*; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** -* -* 特殊策略表 AddDTO -* -* @author AutoGenerator -* @since 2023-08-21 -*/ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(value="AddOcrSpRuleDTO对象", description="特殊策略表") -public class AddOcrSpRuleDTO implements Serializable { - - @ApiModelProperty(value = "id") - private Long id; - - @ApiModelProperty(value = "") - private String assortId; - - @ApiModelProperty(value = "规则开始json") - private String startJson; - - @ApiModelProperty(value = "规则结束json") - private String endJson; - - -} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/DeleteOcrSpRuleDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/DeleteOcrSpRuleDTO.java deleted file mode 100644 index ff0e14d..0000000 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/DeleteOcrSpRuleDTO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.docus.server.dto.segmentation.ocrsprule; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import com.docus.server.enums.*; - -import java.io.Serializable; -import java.util.List; - -/** -* -* 特殊策略表 DeleteDTO -* -* @author AutoGenerator -* @since 2023-08-21 -*/ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(value="DeleteOcrSpRuleDTO对象", description="特殊策略表") -public class DeleteOcrSpRuleDTO implements Serializable { - - @ApiModelProperty(value = "ids") - private List ids; - -} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/EditOcrSpRuleDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/EditOcrSpRuleDTO.java deleted file mode 100644 index 864ec85..0000000 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/EditOcrSpRuleDTO.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.docus.server.dto.segmentation.ocrsprule; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import com.docus.server.enums.*; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** -* -* 特殊策略表 EditDTO -* -* @author AutoGenerator -* @since 2023-08-21 -*/ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(value="EditOcrSpRuleDTO对象", description="特殊策略表") -public class EditOcrSpRuleDTO implements Serializable { - - @ApiModelProperty(value = "id") - private Long id; - - @ApiModelProperty(value = "") - private String assortId; - - @ApiModelProperty(value = "规则开始json") - private String startJson; - - @ApiModelProperty(value = "规则结束json") - private String endJson; - - -} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRuleJson.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRuleJson.java new file mode 100644 index 0000000..562f384 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRuleJson.java @@ -0,0 +1,28 @@ +package com.docus.server.entity.segmentation; + +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class OcrRuleJson { + + @ApiModelProperty(value = "分段id") + private String assortId; + + @ApiModelProperty(value = "分段名称") + private String assortName; + + @ApiModelProperty(value = "占比分") + private Integer matchRatio; + + @ApiModelProperty(value = "匹配关键词 多个#分割") + private String keyWord; + + @ApiModelProperty(value = "排序") + private Integer sort; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRuleResult.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRuleResult.java new file mode 100644 index 0000000..2335f2a --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRuleResult.java @@ -0,0 +1,13 @@ +package com.docus.server.entity.segmentation; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class OcrRuleResult { + + @ApiModelProperty(value = "id") + private Long id; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpRule.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpRule.java deleted file mode 100644 index 9de6b69..0000000 --- a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpRule.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.docus.server.entity.segmentation; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * 特殊策略表 - * - * @author AutoGenerator - * @since 2023-08-21 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@TableName("ocr_sp_rule") -@ApiModel(value = "OcrSpRule对象", description = "特殊策略表") -public class OcrSpRule implements Serializable { - - @ApiModelProperty(value = "id") - @TableId(value = "id", type = IdType.ASSIGN_UUID) - private Long id; - - @ApiModelProperty(value = "") - @TableField("assort_id") - private String assortId; - - @ApiModelProperty(value = "规则开始json") - @TableField("start_json") - private String startJson; - - @ApiModelProperty(value = "规则结束json") - @TableField("end_json") - private String endJson; - - -} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpecialResult.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpecialResult.java new file mode 100644 index 0000000..91032f8 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpecialResult.java @@ -0,0 +1,13 @@ +package com.docus.server.entity.segmentation; + + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class OcrSpecialResult { + + @ApiModelProperty(value = "id") + private Long id; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpecialRuleJson.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpecialRuleJson.java new file mode 100644 index 0000000..a9ed440 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpecialRuleJson.java @@ -0,0 +1,19 @@ +package com.docus.server.entity.segmentation; + +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class OcrSpecialRuleJson { + + @ApiModelProperty(value = "命中分数") + private Integer score; + + @ApiModelProperty(value = "匹配关键词 多个#分割") + private String keyWord; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrsprule/OcrSpRuleVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrsprule/OcrSpRuleVO.java deleted file mode 100644 index bfe623d..0000000 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrsprule/OcrSpRuleVO.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.docus.server.vo.segmentation.ocrsprule; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import com.docus.server.enums.*; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** -* -* 特殊策略表 VO -* -* @author AutoGenerator -* @since 2023-08-21 -*/ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(value="OcrSpRuleVO对象", description="特殊策略表") -public class OcrSpRuleVO implements Serializable { - - @ApiModelProperty(value = "id") - private Long id; - - @ApiModelProperty(value = "") - private String assortId; - - @ApiModelProperty(value = "规则开始json") - private String startJson; - - @ApiModelProperty(value = "规则结束json") - private String endJson; - - -} diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/OcrSpRuleController.java b/docus-segmentation/src/main/java/com/docus/server/controller/OcrSpRuleController.java deleted file mode 100644 index 0cb663d..0000000 --- a/docus-segmentation/src/main/java/com/docus/server/controller/OcrSpRuleController.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.docus.server.controller; - -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.api.segmentation.OcrSpRuleApi; -import com.docus.server.dto.segmentation.ocrsprule.AddOcrSpRuleDTO; -import com.docus.server.dto.segmentation.ocrsprule.DeleteOcrSpRuleDTO; -import com.docus.server.dto.segmentation.ocrsprule.EditOcrSpRuleDTO; -import com.docus.server.service.IOcrSpRuleService; -import com.docus.server.vo.segmentation.ocrsprule.OcrSpRuleVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 特殊策略表 控制器类 - * - * @author AutoGenerator - * @since 2023-08-21 - */ -@Api(value = "特殊策略表", tags = "特殊策略表") -@RestController -public class OcrSpRuleController implements OcrSpRuleApi { - @Resource - private IOcrSpRuleService iOcrSpRuleService; - - /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ - @ApiOperation("按主键查询") - @Override - public OcrSpRuleVO findById(Long id) { - return iOcrSpRuleService.findById(id); - } - - /** - * 查询所有 - * - * @return 实体 - */ - @ApiOperation("查询所有") - @Override - public List findAll() { - return iOcrSpRuleService.findAll(); - } - - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - @ApiOperation("关键字搜索") - @Override - public PageResult search(SearchDTO searchDTO) { - return iOcrSpRuleService.search(searchDTO); - } - - /** - * 新增 - * - * @param addOcrSpRuleDTO 编辑参数 - * @return 成功或失败 - */ - @ApiOperation("新增") - @Override - public boolean add(AddOcrSpRuleDTO addOcrSpRuleDTO) { - return iOcrSpRuleService.add(addOcrSpRuleDTO); - } - - /** - * 编辑 - * - * @param editOcrSpRuleDTO 编辑参数 - * @return 成功或失败 - */ - @ApiOperation("编辑") - @Override - public boolean edit(EditOcrSpRuleDTO editOcrSpRuleDTO) { - return iOcrSpRuleService.edit(editOcrSpRuleDTO); - } - - /** - * 批量删除 - * - * @param deleteOcrSpRuleDTO 删除参数 - * @return 成功或失败 - */ - @ApiOperation("批量删除") - @Override - public int delete(DeleteOcrSpRuleDTO deleteOcrSpRuleDTO) { - return iOcrSpRuleService.delete(deleteOcrSpRuleDTO); - } -} diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrSpRuleConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrSpRuleConvert.java deleted file mode 100644 index 9d50144..0000000 --- a/docus-segmentation/src/main/java/com/docus/server/convert/OcrSpRuleConvert.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.docus.server.convert; - -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.segmentation.OcrSpRule; - import com.docus.server.dto.segmentation.ocrsprule.AddOcrSpRuleDTO; - import com.docus.server.dto.segmentation.ocrsprule.EditOcrSpRuleDTO; - import com.docus.server.dto.segmentation.ocrsprule.DeleteOcrSpRuleDTO; -import com.docus.server.vo.segmentation.ocrsprule.OcrSpRuleVO; - -import org.mapstruct.Mapper; -import org.mapstruct.Mappings; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** -* -* 特殊策略表 服务转换器 -* -* @author AutoGenerator -* @since 2023-08-21 -*/ -@Mapper -public interface OcrSpRuleConvert { - - OcrSpRuleConvert INSTANCE = Mappers.getMapper(OcrSpRuleConvert.class); - - @Mappings({}) - OcrSpRule convertDO(AddOcrSpRuleDTO addOcrSpRuleDTO); - - @Mappings({}) - OcrSpRule convertDO(EditOcrSpRuleDTO editOcrSpRuleDTO); - - @Mappings({}) - List convertAddDOList(List addOcrSpRuleDTO); - - @Mappings({}) - List convertEditDOList(List editOcrSpRuleDTO); - - @Mappings({}) - OcrSpRuleVO convertVO(OcrSpRule ocrSpRule); - - @Mappings({}) - List convertVO(List ocrSpRuleList); - - @Mappings({}) - PageResult convertVO(PageResult pageResult); -} - diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrFileInfoTestDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrFileInfoTestDao.java index c779099..de92a65 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrFileInfoTestDao.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrFileInfoTestDao.java @@ -14,6 +14,9 @@ import java.util.List; * @since 2023-08-29 */ public interface IOcrFileInfoTestDao extends IBaseDao { + + + /** * 按主键查询 * diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrSpRuleDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrSpRuleDao.java deleted file mode 100644 index e905511..0000000 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrSpRuleDao.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.docus.server.infrastructure.dao; - -import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.segmentation.OcrSpRule; - -import java.util.List; - -/** - * 特殊策略表 数据访问接口 - * - * @author AutoGenerator - * @since 2023-08-21 - */ -public interface IOcrSpRuleDao extends IBaseDao { - /** - * 按主键查询 - * - * @param id 主键id - * @return 实体 - */ - OcrSpRule findById(Long id); - - /** - * 新增 - * - * @param ocrSpRule 新增参数 - * @return 成功或失败 - */ - boolean add(OcrSpRule ocrSpRule); - - /** - * 编辑 - * - * @param ocrSpRule 编辑参数 - * @return 成功或失败 - */ - boolean edit(OcrSpRule ocrSpRule); - - /** - * 批量删除 - * - * @param ids 主键ids - * @return 成功或失败 - */ - int delete(List ids); - - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - PageResult search(SearchDTO searchDTO); - - /** - * 名称不重复 - * - * @param id 主键 - * @param name 名称 - * @return 名称重复数量 - */ - int findByIdAndName(Long id, String name); -} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoTestDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoTestDaoImpl.java index 2495965..cd52d16 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoTestDaoImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoTestDaoImpl.java @@ -23,6 +23,7 @@ import java.util.List; @Repository public class OcrFileInfoTestDaoImpl extends BaseDaoImpl implements IOcrFileInfoTestDao { + /** * 按主键查询 * diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpRuleDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpRuleDaoImpl.java deleted file mode 100644 index b7149c8..0000000 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpRuleDaoImpl.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.docus.server.infrastructure.dao.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.segmentation.OcrSpRule; -import com.docus.server.infrastructure.dao.IOcrSpRuleDao; -import com.docus.server.infrastructure.mapper.OcrSpRuleMapper; -import com.github.pagehelper.PageHelper; -import org.springframework.stereotype.Repository; - -import java.util.Date; -import java.util.List; - -/** - * 特殊策略表 数据访问实现类 - * - * @author AutoGenerator - * @since 2023-08-21 - */ -@Repository -public class OcrSpRuleDaoImpl extends BaseDaoImpl implements IOcrSpRuleDao { - - /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ - @Override - public OcrSpRule findById(Long id) { - return super.findById(id); - } - - /** - * 新增 - * - * @param ocrSpRule 编辑参数 - * @return 成功或失败 - */ - @Override - public boolean add(OcrSpRule ocrSpRule) { - return super.save(ocrSpRule); - } - - /** - * 编辑 - * - * @param ocrSpRule 编辑参数 - * @return 成功或失败 - */ - @Override - public boolean edit(OcrSpRule ocrSpRule) { - return super.updateById(ocrSpRule); - } - - /** - * 批量删除 - * - * @param ids 主键ids - * @return 成功或失败 - */ - @Override - public int delete(List ids) { - return super.deleteByIds(ids); - } - - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - @Override - public PageResult search(SearchDTO searchDTO) { - //分页 - PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); - LambdaQueryWrapper query = Wrappers.lambdaQuery(); - //时间范围，默认按createTime - if (searchDTO.getBeginTime() != null) { -// query.ge(OcrSpRule::getCreateTime, searchDTO.getBeginTime()); - } - if (searchDTO.getEndTime() != null) { - Date endTime = searchDTO.getEndTime(); -// query.le(OcrSpRule::getCreateTime, endTime); - } - //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { - //单个列用like - //query. like(OcrSpRule::getxxx, searchDTO.getKeyword()); - //多个列用like - //query. and(sub -> sub.like(OcrSpRule::getxx1, searchDTO.getKeyword()) - // оr(). like(OcrSpRule::getXX2, searchDTO.getKeyword())) - //); - //} - //默认createTime倒序排序 -// query.orderByDesc(OcrSpRule::getCreateTime); - List list = super.find(query); - return new PageResult<>(list); - } - - /** - * 名称不重复 - * - * @param id 主键 - * @param name 名称 - * @return 名称重复数量 - */ - @Override - public int findByIdAndName(Long id, String name) { - LambdaQueryWrapper query = Wrappers.lambdaQuery(); - if (id != null) { - query.ne(OcrSpRule::getId, id); - } - //if (Func.isNotBlank(name)) { - // query.eq(OcrSpRule::getName, name); - //} - - return baseMapper.selectCount(query); - } -} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrSpRuleMapper.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrSpRuleMapper.java deleted file mode 100644 index ef06de1..0000000 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrSpRuleMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.docus.server.infrastructure.mapper; - -import com.docus.server.entity.segmentation.OcrSpRule; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** -* -* 特殊策略表 Mapper 接口 -* -* @author AutoGenerator -* @since 2023-08-21 -*/ -@Mapper -public interface OcrSpRuleMapper extends BaseMapper { - -} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrRuleTestService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrRuleTestService.java index 8a5096b..32a1203 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/IOcrRuleTestService.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrRuleTestService.java @@ -5,6 +5,7 @@ import com.docus.infrastructure.web.response.PageResult; import com.docus.server.dto.segmentation.ocrruletest.AddOcrRuleTestDTO; import com.docus.server.dto.segmentation.ocrruletest.DeleteOcrRuleTestDTO; import com.docus.server.dto.segmentation.ocrruletest.EditOcrRuleTestDTO; +import com.docus.server.entity.segmentation.OcrRuleResult; import com.docus.server.vo.segmentation.ocrruletest.OcrRuleTestVO; import java.util.List; @@ -16,6 +17,14 @@ import java.util.List; * @since 2023-08-29 */ public interface IOcrRuleTestService { + + /** + * 判断是否命中分段规则 + * @param text + * @return + */ + OcrRuleResult handleSpecialRule(String text); + /** * 按主键查询 * diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpRuleService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpRuleService.java deleted file mode 100644 index 4411f87..0000000 --- a/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpRuleService.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.docus.server.service; - -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.segmentation.ocrsprule.AddOcrSpRuleDTO; -import com.docus.server.dto.segmentation.ocrsprule.DeleteOcrSpRuleDTO; -import com.docus.server.dto.segmentation.ocrsprule.EditOcrSpRuleDTO; -import com.docus.server.vo.segmentation.ocrsprule.OcrSpRuleVO; - -import java.util.List; - -/** - * 特殊策略表 服务接口 - * - * @author AutoGenerator - * @since 2023-08-21 - */ -public interface IOcrSpRuleService { - /** - * 按主键查询 - * - * @param id 主键id - * @return 实体 - */ - OcrSpRuleVO findById(Long id); - - /** - * 查询所有 - * - * @return 实体 - */ - List findAll(); - - /** - * 新增 - * - * @param addOcrSpRuleDTO 新增参数 - * @return 成功或失败 - */ - boolean add(AddOcrSpRuleDTO addOcrSpRuleDTO); - - /** - * 编辑 - * - * @param editOcrSpRuleDTO 编辑参数 - * @return 成功或失败 - */ - boolean edit(EditOcrSpRuleDTO editOcrSpRuleDTO); - - /** - * 批量删除 - * - * @param deleteOcrSpRuleDTO 删除参数 - * @return 成功或失败 - */ - int delete(DeleteOcrSpRuleDTO deleteOcrSpRuleDTO); - - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - PageResult search(SearchDTO searchDTO); -} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpecialRuleTestService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpecialRuleTestService.java index 2c821b0..fbe2623 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpecialRuleTestService.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpecialRuleTestService.java @@ -5,6 +5,7 @@ import com.docus.infrastructure.web.response.PageResult; import com.docus.server.dto.segmentation.ocrspecialruletest.AddOcrSpecialRuleTestDTO; import com.docus.server.dto.segmentation.ocrspecialruletest.DeleteOcrSpecialRuleTestDTO; import com.docus.server.dto.segmentation.ocrspecialruletest.EditOcrSpecialRuleTestDTO; +import com.docus.server.entity.segmentation.OcrSpecialResult; import com.docus.server.vo.segmentation.ocrspecialruletest.OcrSpecialRuleTestVO; import java.util.List; @@ -16,6 +17,23 @@ import java.util.List; * @since 2023-08-29 */ public interface IOcrSpecialRuleTestService { + + + /** + * 判断是否特殊规则开始 + * @param ocrTextList + * @return + */ + OcrSpecialResult handleSpecialRule(List ocrTextList); + + /** + * 判断是否特殊规则结束 + * @param result + * @return + */ + boolean handleSpecialRule(OcrSpecialResult result,String text); + + /** * 按主键查询 * diff --git a/docus-segmentation/src/main/java/com/docus/server/service/handler/StartOcrTestHandler.java b/docus-segmentation/src/main/java/com/docus/server/service/handler/StartOcrTestHandler.java index 61dcb8f..c95881f 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/handler/StartOcrTestHandler.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/handler/StartOcrTestHandler.java @@ -2,6 +2,10 @@ package com.docus.server.service.handler; import com.docus.log.annotation.TrackRetryListener; import com.docus.server.api.ocr.OcrApi; +import com.docus.server.entity.segmentation.OcrFileInfoTest; +import com.docus.server.entity.segmentation.OcrSpecialResult; +import com.docus.server.infrastructure.dao.IOcrFileInfoTestDao; +import com.docus.server.service.IOcrSpecialRuleTestService; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -14,10 +18,29 @@ import java.util.List; public class StartOcrTestHandler { @Resource private OcrApi ocrApi; + @Resource + private IOcrFileInfoTestDao iOcrFileInfoTestDao; + @Resource + private IOcrSpecialRuleTestService iOcrSpecialRuleTestService; @TrackRetryListener("START_OCR_TEST") public void startOcr(String patientId) { - System.out.println(patientId); - List text = ocrApi.getText("D:\\docus\\cut\\segmentation\\20230822\\c6b03e5767814895a2c155c32f174051\\麻醉.jpg"); + //根据病案号查询文件列表 + List fileInfoTestList = iOcrFileInfoTestDao.findBy("patientId",patientId); + + for (OcrFileInfoTest fileInfoTest:fileInfoTestList) { + //遍历文件列表 获取ocr识别结果 + List ocrTextList = ocrApi.getText(fileInfoTest.getPicCutUrl()); + //优先判断是否特殊规则开始 + OcrSpecialResult ocrSpecialResult = iOcrSpecialRuleTestService.handleSpecialRule(ocrTextList); + //判断是否属于某个分段 + + //更新文件数据的分段 + + } + + //更新数据库表 + + } } 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 c4ab2c7..1069cf9 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 @@ -7,6 +7,7 @@ import com.docus.server.convert.OcrRuleTestConvert; import com.docus.server.dto.segmentation.ocrruletest.AddOcrRuleTestDTO; import com.docus.server.dto.segmentation.ocrruletest.DeleteOcrRuleTestDTO; import com.docus.server.dto.segmentation.ocrruletest.EditOcrRuleTestDTO; +import com.docus.server.entity.segmentation.OcrRuleResult; import com.docus.server.entity.segmentation.OcrRuleTest; import com.docus.server.infrastructure.dao.IOcrRuleTestDao; import com.docus.server.service.IOcrRuleTestService; @@ -30,6 +31,21 @@ public class OcrRuleTestServiceImpl implements IOcrRuleTestService { @Resource private IdService idService; + @Override + public OcrRuleResult handleSpecialRule(String text) { + + //查询所有规则列表 + + + //判断是否包含 + + + //判断命中率 + + + return null; + } + /** * 按主键查询 * diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpRuleServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpRuleServiceImpl.java deleted file mode 100644 index fee0e68..0000000 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpRuleServiceImpl.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.docus.server.service.impl; - -import com.docus.infrastructure.redis.service.IdService; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.OcrSpRuleConvert; -import com.docus.server.dto.segmentation.ocrsprule.AddOcrSpRuleDTO; -import com.docus.server.dto.segmentation.ocrsprule.DeleteOcrSpRuleDTO; -import com.docus.server.dto.segmentation.ocrsprule.EditOcrSpRuleDTO; -import com.docus.server.entity.segmentation.OcrSpRule; -import com.docus.server.infrastructure.dao.IOcrSpRuleDao; -import com.docus.server.service.IOcrSpRuleService; -import com.docus.server.vo.segmentation.ocrsprule.OcrSpRuleVO; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 特殊策略表 服务实现类 - * - * @author AutoGenerator - * @since 2023-08-21 - */ -@Service -public class OcrSpRuleServiceImpl implements IOcrSpRuleService { - @Resource - private IOcrSpRuleDao iOcrSpRuleDao; - @Resource - private IdService idService; - - /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ - @Override - public OcrSpRuleVO findById(Long id) { - return OcrSpRuleConvert.INSTANCE.convertVO(iOcrSpRuleDao.findById(id)); - } - - /** - * 查询所有 - * - * @return 实体 - */ - @Override - public List findAll() { - return OcrSpRuleConvert.INSTANCE.convertVO(iOcrSpRuleDao.findAll()); - } - - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - @Override - public PageResult search(SearchDTO searchDTO) { - return OcrSpRuleConvert.INSTANCE.convertVO(iOcrSpRuleDao.search(searchDTO)); - - //PageResult result = OcrSpRuleConvert.INSTANCE.convertVO(iOcrSpRuleDao.search(searchDTO)); - - //if (CollectionUtils.isEmpty(result.getList())) { - //return new PageResult<>(); - //} - - //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); - - //result.getList().forEach(p -> { - // String collectorId = String.valueOf(p.getCollectorId()); - // if (map.containsKey(collectorId)) { - // p.setCollectorName(map.get(collectorId).getParamName()); - // } - //}); - - //return result; - } - - /** - * 新增 - * - * @param addOcrSpRuleDTO 编辑参数 - * @return 成功或失败 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean add(AddOcrSpRuleDTO addOcrSpRuleDTO) { - OcrSpRule ocrSpRule = OcrSpRuleConvert.INSTANCE.convertDO(addOcrSpRuleDTO); - ocrSpRule.setId(idService.getDateSeq()); - return iOcrSpRuleDao.add(ocrSpRule); - - // String name = addOcrSpRuleDTO.getName(); - - //OcrSpRule ocrSpRule = iOcrSpRuleDao.findOneBy("name", name); - - //if (Func.notNull(ocrSpRule)) { - // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "特殊策略表已经存在"); - // } - - // OcrSpRule ocrSpRule =OcrSpRuleConvert.INSTANCE.convertDO(addOcrSpRuleDTO); - // ocrSpRule.setId(idService.getDateSeq()); - - // return iOcrSpRuleDao.add(schCollector); - - } - - /** - * 编辑 - * - * @param editOcrSpRuleDTO 编辑参数 - * @return 成功或失败 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean edit(EditOcrSpRuleDTO editOcrSpRuleDTO) { - OcrSpRule ocrSpRule = OcrSpRuleConvert.INSTANCE.convertDO(editOcrSpRuleDTO); - return iOcrSpRuleDao.edit(ocrSpRule); - - // Long id = editOcrSpRuleDTO.getId(); - - // OcrSpRule ocrSpRule = iOcrSpRuleDao.findById(id); - - // if (Func.isNull(ocrSpRule)) { - // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "特殊策略表，无法更新！"); - // } - - // ocrSpRule.setUpdateTime(LocalDateTime.now()); - // return iOcrSpRuleDao.edit(ocrSpRule); - } - - /** - * 批量删除 - * - * @param deleteOcrSpRuleDTO 删除参数 - * @return 成功或失败 - */ - @Override - public int delete(DeleteOcrSpRuleDTO deleteOcrSpRuleDTO) { - return iOcrSpRuleDao.delete(deleteOcrSpRuleDTO.getIds()); - } -} - diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleTestServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleTestServiceImpl.java index aca6488..4edb9cf 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleTestServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleTestServiceImpl.java @@ -7,6 +7,7 @@ import com.docus.server.convert.OcrSpecialRuleTestConvert; import com.docus.server.dto.segmentation.ocrspecialruletest.AddOcrSpecialRuleTestDTO; import com.docus.server.dto.segmentation.ocrspecialruletest.DeleteOcrSpecialRuleTestDTO; import com.docus.server.dto.segmentation.ocrspecialruletest.EditOcrSpecialRuleTestDTO; +import com.docus.server.entity.segmentation.OcrSpecialResult; import com.docus.server.entity.segmentation.OcrSpecialRuleTest; import com.docus.server.infrastructure.dao.IOcrSpecialRuleTestDao; import com.docus.server.service.IOcrSpecialRuleTestService; @@ -30,6 +31,34 @@ public class OcrSpecialRuleTestServiceImpl implements IOcrSpecialRuleTestService @Resource private IdService idService; + @Override + public OcrSpecialResult handleSpecialRule(List ocrTextList) { + // 查询所以的特殊规则列表 + + + //判断是否符合某个条件的开始条件 + + + //默认返回空对象 + return null; + } + + @Override + public boolean handleSpecialRule(OcrSpecialResult result,String text) { + + //获取结束条件列表 + + + //判断得分占比 + + + //返回结束 + + + //默认返回没结束 + return false; + } + /** * 按主键查询 * diff --git a/docus-segmentation/src/main/resources/mapper/OcrSpRuleMapper.xml b/docus-segmentation/src/main/resources/mapper/OcrSpRuleMapper.xml deleted file mode 100644 index 53c80be..0000000 --- a/docus-segmentation/src/main/resources/mapper/OcrSpRuleMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - id, assort_id, start_json, end_json - - -