From bb8a847c35a54302b04f2df7247f373a1140ef90 Mon Sep 17 00:00:00 2001 From: linrf Date: Fri, 1 Sep 2023 09:26:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E7=97=85?= =?UTF-8?q?=E6=82=A3id=E8=8E=B7=E5=8F=96=E6=96=87=E4=BB=B6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocrfileinfo/AddOcrFileInfoDTO.java | 2 +- .../ocrfileinfo/EditOcrFileInfoDTO.java | 19 +++---- .../AddOcrFileInfoTestDTO.java | 2 +- .../EditOcrFileInfoTestDTO.java | 6 +-- .../entity/segmentation/OcrFileInfo.java | 8 +-- .../entity/segmentation/OcrFileInfoTest.java | 6 +-- .../ocrfileinfo/OcrFileInfoVO.java | 19 +++---- .../ocrfileinfotest/OcrFileInfoTestVO.java | 6 +-- .../dao/impl/OcrFileInfoDaoImpl.java | 14 ++--- .../dao/impl/OcrFileInfoTestDaoImpl.java | 14 ++--- .../impl/OcrFileInfoTestServiceImpl.java | 17 ------ .../resources/mapper/OcrFileInfoMapper.xml | 53 ++++++++++--------- .../mapper/OcrFileInfoTestMapper.xml | 53 ++++++++++--------- 13 files changed, 91 insertions(+), 128 deletions(-) diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/AddOcrFileInfoDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/AddOcrFileInfoDTO.java index 985238f..8d30872 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/AddOcrFileInfoDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/AddOcrFileInfoDTO.java @@ -72,7 +72,7 @@ public class AddOcrFileInfoDTO implements Serializable { private Integer ruleId; @ApiModelProperty(value = "命中关键词") - private String key; + private String hitKey; @ApiModelProperty(value = "命中占比") private Float rate; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/EditOcrFileInfoDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/EditOcrFileInfoDTO.java index d838835..ca1c5aa 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/EditOcrFileInfoDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/EditOcrFileInfoDTO.java @@ -6,26 +6,21 @@ 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.Date; /** -* -* ocr文件信息 EditDTO -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * ocr文件信息 EditDTO + * + * @author AutoGenerator + * @since 2023-08-29 + */ @Data @Builder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value="EditOcrFileInfoDTO对象", description="ocr文件信息") +@ApiModel(value = "EditOcrFileInfoDTO对象", description = "ocr文件信息") public class EditOcrFileInfoDTO implements Serializable { @ApiModelProperty(value = "id") @@ -77,7 +72,7 @@ public class EditOcrFileInfoDTO implements Serializable { private Integer ruleId; @ApiModelProperty(value = "命中关键词") - private String key; + private String hitKey; @ApiModelProperty(value = "命中占比") private Float rate; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/AddOcrFileInfoTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/AddOcrFileInfoTestDTO.java index a4c69a5..9099f09 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/AddOcrFileInfoTestDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/AddOcrFileInfoTestDTO.java @@ -72,7 +72,7 @@ public class AddOcrFileInfoTestDTO implements Serializable { private Integer ruleId; @ApiModelProperty(value = "命中关键词") - private String key; + private String hitKey; @ApiModelProperty(value = "命中占比") private Float rate; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/EditOcrFileInfoTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/EditOcrFileInfoTestDTO.java index 7751309..30e9b37 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/EditOcrFileInfoTestDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/EditOcrFileInfoTestDTO.java @@ -6,10 +6,6 @@ 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.Date; @@ -77,7 +73,7 @@ public class EditOcrFileInfoTestDTO implements Serializable { private Integer ruleId; @ApiModelProperty(value = "命中关键词") - private String key; + private String hitKey; @ApiModelProperty(value = "命中占比") private Float rate; diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfo.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfo.java index c0bf071..18845c4 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfo.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfo.java @@ -95,17 +95,13 @@ public class OcrFileInfo implements Serializable { private Integer ruleId; @ApiModelProperty(value = "命中关键词") - @TableField("key") - private String key; + @TableField("hit_key") + private String hitKey; @ApiModelProperty(value = "命中占比") @TableField("rate") private Float rate; - @ApiModelProperty(value = "文件名称") - @TableField("key") - private String fileName; - @ApiModelProperty(value = "文件大小") @TableField("file_size") private Long fileSize; diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfoTest.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfoTest.java index c885709..0c78003 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfoTest.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfoTest.java @@ -95,8 +95,8 @@ public class OcrFileInfoTest implements Serializable { private Integer ruleId; @ApiModelProperty(value = "命中关键词") - @TableField("key") - private String key; + @TableField("hit_key") + private String hitKey; @ApiModelProperty(value = "命中占比") @TableField("rate") @@ -121,7 +121,7 @@ public class OcrFileInfoTest implements Serializable { @ApiModelProperty(value = "纵坐标") @TableField("y") private int y; - + @ApiModelProperty(value = "创建时间") @TableField("create_time") private Date createTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfo/OcrFileInfoVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfo/OcrFileInfoVO.java index cc6321d..06aa8b6 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfo/OcrFileInfoVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfo/OcrFileInfoVO.java @@ -6,26 +6,21 @@ 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.Date; /** -* -* ocr文件信息 VO -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * ocr文件信息 VO + * + * @author AutoGenerator + * @since 2023-08-29 + */ @Data @Builder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value="OcrFileInfoVO对象", description="ocr文件信息") +@ApiModel(value = "OcrFileInfoVO对象", description = "ocr文件信息") public class OcrFileInfoVO implements Serializable { @ApiModelProperty(value = "id") @@ -77,7 +72,7 @@ public class OcrFileInfoVO implements Serializable { private Integer ruleId; @ApiModelProperty(value = "命中关键词") - private String key; + private String hitKey; @ApiModelProperty(value = "命中占比") private Float rate; diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfotest/OcrFileInfoTestVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfotest/OcrFileInfoTestVO.java index 6716221..afc3d80 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfotest/OcrFileInfoTestVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfotest/OcrFileInfoTestVO.java @@ -6,10 +6,6 @@ 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.Date; @@ -77,7 +73,7 @@ public class OcrFileInfoTestVO implements Serializable { private Integer ruleId; @ApiModelProperty(value = "命中关键词") - private String key; + private String hitKey; @ApiModelProperty(value = "命中占比") private Float rate; diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoDaoImpl.java index daa8b2e..83fefa7 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoDaoImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoDaoImpl.java @@ -2,6 +2,7 @@ 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.core.util.Func; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; @@ -86,15 +87,10 @@ public class OcrFileInfoDaoImpl extends BaseDaoImpl sub.like(OcrFileInfo::getxx1, searchDTO.getKeyword()) - // оr(). like(OcrFileInfo::getXX2, searchDTO.getKeyword())) - //); - //} + Object patientId = searchDTO.getParams("patientId"); + if (Func.isNotEmpty(patientId)) { + query.eq(OcrFileInfo::getPatientId, patientId); + } //默认createTime倒序排序 query.orderByDesc(OcrFileInfo::getCreateTime); List list = super.find(query); 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 cd52d16..da9f15c 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 @@ -2,6 +2,7 @@ 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.core.util.Func; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; @@ -87,15 +88,10 @@ public class OcrFileInfoTestDaoImpl extends BaseDaoImpl sub.like(OcrFileInfoTest::getxx1, searchDTO.getKeyword()) - // оr(). like(OcrFileInfoTest::getXX2, searchDTO.getKeyword())) - //); - //} + Object patientId = searchDTO.getParams("patientId"); + if (Func.isNotEmpty(patientId)) { + query.eq(OcrFileInfoTest::getPatientId, patientId); + } //默认createTime倒序排序 query.orderByDesc(OcrFileInfoTest::getCreateTime); List list = super.find(query); diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoTestServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoTestServiceImpl.java index 76878a5..d9ff89f 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoTestServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoTestServiceImpl.java @@ -60,23 +60,6 @@ public class OcrFileInfoTestServiceImpl implements IOcrFileInfoTestService { @Override public PageResult search(SearchDTO searchDTO) { return OcrFileInfoTestConvert.INSTANCE.convertVO(iOcrFileInfoTestDao.search(searchDTO)); - - //PageResult result = OcrFileInfoTestConvert.INSTANCE.convertVO(iOcrFileInfoTestDao.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; } @Transactional(rollbackFor = Exception.class) diff --git a/docus-segmentation/src/main/resources/mapper/OcrFileInfoMapper.xml b/docus-segmentation/src/main/resources/mapper/OcrFileInfoMapper.xml index 7d0c6d3..4398c25 100644 --- a/docus-segmentation/src/main/resources/mapper/OcrFileInfoMapper.xml +++ b/docus-segmentation/src/main/resources/mapper/OcrFileInfoMapper.xml @@ -5,31 +5,36 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - id, patient_id, file_title, pic_name, file_type, sort, serial_number, pic_url, pic_cut_url, angle, ocr_text, ocr_finish_time, ocr_status, assort_id, assort_name, rule_id, key, rate, create_time, update_time + + + id, patient_id, file_title, pic_name, file_type, sort, serial_number, pic_url, pic_cut_url, angle, ocr_text, ocr_finish_time, ocr_status, assort_id, assort_name, rule_id,hit_key,rate,file_size,height,width, x,y, create_time, update_time diff --git a/docus-segmentation/src/main/resources/mapper/OcrFileInfoTestMapper.xml b/docus-segmentation/src/main/resources/mapper/OcrFileInfoTestMapper.xml index eb06312..d282f04 100644 --- a/docus-segmentation/src/main/resources/mapper/OcrFileInfoTestMapper.xml +++ b/docus-segmentation/src/main/resources/mapper/OcrFileInfoTestMapper.xml @@ -5,31 +5,36 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - id, patient_id, file_title, pic_name, file_type, sort, serial_number, pic_url, pic_cut_url, angle, ocr_text, ocr_finish_time, ocr_status, assort_id, assort_name, rule_id, key, rate, create_time, update_time + + + id, patient_id, file_title, pic_name, file_type, sort, serial_number, pic_url, pic_cut_url, angle, ocr_text, ocr_finish_time, ocr_status, assort_id, assort_name, rule_id, hit_key, rate,file_size,height,width, x,y,create_time, update_time