From ec48af7364c9ae8ddc0d39322e72dd5422072e25 Mon Sep 17 00:00:00 2001 From: zhanglb Date: Thu, 14 Sep 2023 15:10:25 +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 --- .../ocrcutconfig/AddOcrCutConfigDTO.java | 3 +++ .../ocrcutconfig/EditOcrCutConfigDTO.java | 6 ++++- .../AddOcrCutConfigTestDTO.java | 3 +++ .../EditOcrCutConfigTestDTO.java | 3 +++ .../ocrurlconfig/AddOcrUrlConfigDTO.java | 3 +++ .../ocrurlconfig/EditOcrUrlConfigDTO.java | 6 ++++- .../AddOcrUrlConfigTestDTO.java | 3 +++ .../EditOcrUrlConfigTestDTO.java | 3 +++ .../entity/segmentation/OcrCutConfig.java | 4 ++++ .../entity/segmentation/OcrUrlConfig.java | 4 ++++ .../ocrcutconfig/OcrCutConfigVO.java | 3 +++ .../ocrcutconfigtest/OcrCutConfigTestVO.java | 3 +++ .../ocrurlconfig/OcrUrlConfigVO.java | 3 +++ .../ocrurlconfigtest/OcrUrlConfigTestVO.java | 3 +++ .../dao/impl/OcrCutConfigDaoImpl.java | 16 +++++-------- .../dao/impl/OcrFileInfoDaoImpl.java | 23 ++++++++++++------- .../dao/impl/OcrSpecialRuleDaoImpl.java | 14 ++++------- .../dao/impl/OcrUrlConfigDaoImpl.java | 14 ++++------- .../service/impl/OcrVersionServiceImpl.java | 19 +++++++++++++++ 19 files changed, 98 insertions(+), 38 deletions(-) diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/AddOcrCutConfigDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/AddOcrCutConfigDTO.java index 26e04f3..0b3f961 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/AddOcrCutConfigDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/AddOcrCutConfigDTO.java @@ -39,6 +39,9 @@ public class AddOcrCutConfigDTO implements Serializable { @ApiModelProperty(value = "半截图纵向区域结束") private Double widthEnd; + + @ApiModelProperty(value = "版本号") + private Integer version; @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/EditOcrCutConfigDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/EditOcrCutConfigDTO.java index 5b56956..7491443 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/EditOcrCutConfigDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/EditOcrCutConfigDTO.java @@ -1,5 +1,6 @@ package com.docus.server.dto.segmentation.ocrcutconfig; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -39,7 +40,10 @@ public class EditOcrCutConfigDTO implements Serializable { @ApiModelProperty(value = "半截图纵向区域结束") private Double widthEnd; - + + @ApiModelProperty(value = "版本号") + private Integer version; + @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/AddOcrCutConfigTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/AddOcrCutConfigTestDTO.java index 58acac9..acafcef 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/AddOcrCutConfigTestDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/AddOcrCutConfigTestDTO.java @@ -39,6 +39,9 @@ public class AddOcrCutConfigTestDTO implements Serializable { @ApiModelProperty(value = "半截图纵向区域结束") private Double widthEnd; + + @ApiModelProperty(value = "版本号") + private Integer version; @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/EditOcrCutConfigTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/EditOcrCutConfigTestDTO.java index b3129cc..3d60f32 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/EditOcrCutConfigTestDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/EditOcrCutConfigTestDTO.java @@ -39,6 +39,9 @@ public class EditOcrCutConfigTestDTO implements Serializable { @ApiModelProperty(value = "半截图纵向区域结束") private Double widthEnd; + + @ApiModelProperty(value = "版本号") + private Integer version; @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/AddOcrUrlConfigDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/AddOcrUrlConfigDTO.java index 71fa6cf..c0d6196 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/AddOcrUrlConfigDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/AddOcrUrlConfigDTO.java @@ -33,6 +33,9 @@ public class AddOcrUrlConfigDTO implements Serializable { @ApiModelProperty(value = "路径地址") private String url; + + @ApiModelProperty(value = "版本号") + private Integer version; @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/EditOcrUrlConfigDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/EditOcrUrlConfigDTO.java index 7b18e51..7f62135 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/EditOcrUrlConfigDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/EditOcrUrlConfigDTO.java @@ -1,5 +1,6 @@ package com.docus.server.dto.segmentation.ocrurlconfig; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -33,7 +34,10 @@ public class EditOcrUrlConfigDTO implements Serializable { @ApiModelProperty(value = "路径地址") private String url; - + + @ApiModelProperty(value = "版本号") + private Integer version; + @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/AddOcrUrlConfigTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/AddOcrUrlConfigTestDTO.java index d5d14fb..51ce726 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/AddOcrUrlConfigTestDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/AddOcrUrlConfigTestDTO.java @@ -33,6 +33,9 @@ public class AddOcrUrlConfigTestDTO implements Serializable { @ApiModelProperty(value = "路径地址") private String url; + + @ApiModelProperty(value = "版本号") + private Integer version; @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/EditOcrUrlConfigTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/EditOcrUrlConfigTestDTO.java index a737b37..0ad8c90 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/EditOcrUrlConfigTestDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/EditOcrUrlConfigTestDTO.java @@ -33,6 +33,9 @@ public class EditOcrUrlConfigTestDTO implements Serializable { @ApiModelProperty(value = "路径地址") private String url; + + @ApiModelProperty(value = "版本号") + private Integer version; @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrCutConfig.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrCutConfig.java index fe92309..343d11a 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrCutConfig.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrCutConfig.java @@ -49,6 +49,10 @@ public class OcrCutConfig implements Serializable { @TableField("width_end") private Double widthEnd; + @ApiModelProperty(value = "版本号") + @TableField("version") + private Integer version; + @ApiModelProperty(value = "创建时间") @TableField("create_time") private Date createTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrUrlConfig.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrUrlConfig.java index 87a783a..980c093 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrUrlConfig.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrUrlConfig.java @@ -41,6 +41,10 @@ public class OcrUrlConfig implements Serializable { @TableField("url") private String url; + @ApiModelProperty(value = "版本号") + @TableField("version") + private Integer version; + @ApiModelProperty(value = "创建时间") @TableField("create_time") private Date createTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrcutconfig/OcrCutConfigVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrcutconfig/OcrCutConfigVO.java index 2a87aaa..b207818 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrcutconfig/OcrCutConfigVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrcutconfig/OcrCutConfigVO.java @@ -39,6 +39,9 @@ public class OcrCutConfigVO implements Serializable { @ApiModelProperty(value = "半截图纵向区域结束") private Double widthEnd; + + @ApiModelProperty(value = "版本号") + private Integer version; @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrcutconfigtest/OcrCutConfigTestVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrcutconfigtest/OcrCutConfigTestVO.java index 4ac9ea1..abde87f 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrcutconfigtest/OcrCutConfigTestVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrcutconfigtest/OcrCutConfigTestVO.java @@ -39,6 +39,9 @@ public class OcrCutConfigTestVO implements Serializable { @ApiModelProperty(value = "半截图纵向区域结束") private Double widthEnd; + + @ApiModelProperty(value = "版本号") + private Integer version; @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrurlconfig/OcrUrlConfigVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrurlconfig/OcrUrlConfigVO.java index ef2e58c..5805c6b 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrurlconfig/OcrUrlConfigVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrurlconfig/OcrUrlConfigVO.java @@ -33,6 +33,9 @@ public class OcrUrlConfigVO implements Serializable { @ApiModelProperty(value = "路径地址") private String url; + + @ApiModelProperty(value = "版本号") + private Integer version; @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrurlconfigtest/OcrUrlConfigTestVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrurlconfigtest/OcrUrlConfigTestVO.java index f76ec25..9f65c1c 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrurlconfigtest/OcrUrlConfigTestVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrurlconfigtest/OcrUrlConfigTestVO.java @@ -33,6 +33,9 @@ public class OcrUrlConfigTestVO implements Serializable { @ApiModelProperty(value = "路径地址") private String url; + + @ApiModelProperty(value = "版本号") + private Integer version; @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrCutConfigDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrCutConfigDaoImpl.java index 0208320..017dae3 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrCutConfigDaoImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrCutConfigDaoImpl.java @@ -6,6 +6,7 @@ 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.OcrCutConfig; +import com.docus.server.entity.segmentation.OcrSpecialRule; import com.docus.server.infrastructure.dao.IOcrCutConfigDao; import com.docus.server.infrastructure.mapper.OcrCutConfigMapper; import com.github.pagehelper.PageHelper; @@ -86,16 +87,11 @@ public class OcrCutConfigDaoImpl extends BaseDaoImpl sub.like(OcrCutConfig::getxx1, searchDTO.getKeyword()) - // оr(). like(OcrCutConfig::getXX2, searchDTO.getKeyword())) - //); - //} - //默认createTime倒序排序 + + Object version = searchDTO.getParams("version"); + query.eq(OcrCutConfig::getVersion,version); + + query.orderByDesc(OcrCutConfig::getCreateTime); List list = super.find(query); return new PageResult<>(list); 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 83fefa7..ea4e92e 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 @@ -6,6 +6,7 @@ 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; +import com.docus.server.entity.segmentation.OcrBasicTest; import com.docus.server.entity.segmentation.OcrFileInfo; import com.docus.server.infrastructure.dao.IOcrFileInfoDao; import com.docus.server.infrastructure.mapper.OcrFileInfoMapper; @@ -79,18 +80,24 @@ public class OcrFileInfoDaoImpl extends BaseDaoImpl query = Wrappers.lambdaQuery(); - //时间范围，默认按createTime - if (searchDTO.getBeginTime() != null) { - query.ge(OcrFileInfo::getCreateTime, searchDTO.getBeginTime()); - } - if (searchDTO.getEndTime() != null) { - Date endTime = searchDTO.getEndTime(); - query.le(OcrFileInfo::getCreateTime, endTime); - } + Object patientId = searchDTO.getParams("patientId"); + Object assortId = searchDTO.getParams("assortId"); + Object picName = searchDTO.getParams("picName"); + + + if (Func.isNotEmpty(patientId)) { query.eq(OcrFileInfo::getPatientId, patientId); } + if (Func.isNotEmpty(assortId)) { + query.like(OcrFileInfo::getAssortId, String.format("%s%s%s","%", assortId,"%")); + } + if (Func.isNotEmpty(picName)) { + query.like(OcrFileInfo::getPicName, String.format("%s%s%s","%", picName,"%")); + } + + //默认createTime倒序排序 query.orderByDesc(OcrFileInfo::getCreateTime); List list = super.find(query); diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpecialRuleDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpecialRuleDaoImpl.java index cd530d3..4650901 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpecialRuleDaoImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpecialRuleDaoImpl.java @@ -5,6 +5,7 @@ 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.OcrRuleTest; import com.docus.server.entity.segmentation.OcrSpecialRule; import com.docus.server.infrastructure.dao.IOcrSpecialRuleDao; import com.docus.server.infrastructure.mapper.OcrSpecialRuleMapper; @@ -86,15 +87,10 @@ public class OcrSpecialRuleDaoImpl extends BaseDaoImpl sub.like(OcrSpecialRule::getxx1, searchDTO.getKeyword()) - // оr(). like(OcrSpecialRule::getXX2, searchDTO.getKeyword())) - //); - //} + + Object version = searchDTO.getParams("version"); + query.eq(OcrSpecialRule::getVersion,version); + //默认createTime倒序排序 query.orderByDesc(OcrSpecialRule::getCreateTime); List list = super.find(query); diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrUrlConfigDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrUrlConfigDaoImpl.java index 80028db..e6f59fe 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrUrlConfigDaoImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrUrlConfigDaoImpl.java @@ -5,6 +5,7 @@ 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.OcrSpecialRule; import com.docus.server.entity.segmentation.OcrUrlConfig; import com.docus.server.infrastructure.dao.IOcrUrlConfigDao; import com.docus.server.infrastructure.mapper.OcrUrlConfigMapper; @@ -86,15 +87,10 @@ public class OcrUrlConfigDaoImpl extends BaseDaoImpl sub.like(OcrUrlConfig::getxx1, searchDTO.getKeyword()) - // оr(). like(OcrUrlConfig::getXX2, searchDTO.getKeyword())) - //); - //} + + Object version = searchDTO.getParams("version"); + query.eq(OcrUrlConfig::getVersion,version); + //默认createTime倒序排序 query.orderByDesc(OcrUrlConfig::getCreateTime); List list = super.find(query); diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrVersionServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrVersionServiceImpl.java index 2e2168a..da3251e 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrVersionServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrVersionServiceImpl.java @@ -129,6 +129,7 @@ public class OcrVersionServiceImpl implements IOcrVersionService { BeanUtil.copyProperties(m,ocrRule); return ocrRule; }).collect(Collectors.toList()); + List ocrSpecialRuleTestDaoAll = iOcrSpecialRuleTestDao.findAll().stream().map(m-> { m.setVersion(finalVersion); m.setId(idService.getDateSeq()); @@ -137,8 +138,26 @@ public class OcrVersionServiceImpl implements IOcrVersionService { return ocrSpecialRule; }).collect(Collectors.toList()); + List ocrCutConfigList = iOcrCutConfigTestDao.findAll().stream().map(m-> { + OcrCutConfig ocrCutConfig = new OcrCutConfig(); + BeanUtil.copyProperties(m,ocrCutConfig); + ocrCutConfig.setVersion(finalVersion); + ocrCutConfig.setId(idService.getDateSeq()); + return ocrCutConfig; + }).collect(Collectors.toList()); + + List ocrUrlConfigList = iOcrUrlConfigTestDao.findAll().stream().map(m-> { + OcrUrlConfig ocrUrlConfig = new OcrUrlConfig(); + BeanUtil.copyProperties(m,ocrUrlConfig); + ocrUrlConfig.setVersion(finalVersion); + ocrUrlConfig.setId(idService.getDateSeq()); + return ocrUrlConfig; + }).collect(Collectors.toList()); + iOcrRuleDao.saveBatch(ocrRuleList,iOcrRuleDao.DEFAULT_BATCH_SIZE); iOcrSpecialRuleDao.saveBatch(ocrSpecialRuleTestDaoAll,iOcrSpecialRuleDao.DEFAULT_BATCH_SIZE); + iOcrCutConfigDao.saveBatch(ocrCutConfigList,iOcrRuleDao.DEFAULT_BATCH_SIZE); + iOcrUrlConfigDao.saveBatch(ocrUrlConfigList,iOcrSpecialRuleDao.DEFAULT_BATCH_SIZE); List isEnableList = iOcrVersionDao.findBy("isEnable", "1").stream().peek(p-> p.setIsEnable(false)).collect(Collectors.toList()); iOcrVersionDao.updateBatchById(isEnableList,1000);