linjj
/
docus-collector2.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增根据病患id获取文件信息

Browse Source
segment2.0
linrf 2 years ago
parent bc3ff687f6
commit bb8a847c35
13 changed files with 91 additions and 128 deletions
Show Stats Download Patch File Download Diff File

2
docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/AddOcrFileInfoDTO.java
Unescape Escape View File

@ -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;

7
docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/EditOcrFileInfoDTO.java
Unescape Escape View File

@ -6,16 +6,11 @@ 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
@ -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;

2
docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/AddOcrFileInfoTestDTO.java
Unescape Escape View File

@ -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;

6
docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/EditOcrFileInfoTestDTO.java
Unescape Escape View File

@ -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;

8
docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfo.java
Unescape Escape View File

@ -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;

4
docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfoTest.java
Unescape Escape View File

@ -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")

7
docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfo/OcrFileInfoVO.java
Unescape Escape View File

@ -6,16 +6,11 @@ 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
@ -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;

6
docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfotest/OcrFileInfoTestVO.java
Unescape Escape View File

@ -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;

14
docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoDaoImpl.java
Unescape Escape View File

@ -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<OcrFileInfoMapper, OcrFileIn
Date endTime = searchDTO.getEndTime();
query.le(OcrFileInfo::getCreateTime, endTime);
}
//关键字比较，多个列or
//if (!StringUtils.isEmpty(searchDTO.getKeyword())) {
//单个列用like
//query. like(OcrFileInfo::getxxx, searchDTO.getKeyword());
//多个列用like
//query. and(sub -> 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<OcrFileInfo> list = super.find(query);

14
docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoTestDaoImpl.java
Unescape Escape View File

@ -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<OcrFileInfoTestMapper, O
Date endTime = searchDTO.getEndTime();
query.le(OcrFileInfoTest::getCreateTime, endTime);
}
//关键字比较，多个列or
//if (!StringUtils.isEmpty(searchDTO.getKeyword())) {
//单个列用like
//query. like(OcrFileInfoTest::getxxx, searchDTO.getKeyword());
//多个列用like
//query. and(sub -> 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<OcrFileInfoTest> list = super.find(query);

17
docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoTestServiceImpl.java
Unescape Escape View File

@ -60,23 +60,6 @@ public class OcrFileInfoTestServiceImpl implements IOcrFileInfoTestService {
@Override
public PageResult<OcrFileInfoTestVO> search(SearchDTO searchDTO) {
return OcrFileInfoTestConvert.INSTANCE.convertVO(iOcrFileInfoTestDao.search(searchDTO));
//PageResult<OcrFileInfoTestVO> result = OcrFileInfoTestConvert.INSTANCE.convertVO(iOcrFileInfoTestDao.search(searchDTO));
//if (CollectionUtils.isEmpty(result.getList())) {
//return new PageResult<>();
//}
//Map<String, SchSystemParams> 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)

9
docus-segmentation/src/main/resources/mapper/OcrFileInfoMapper.xml
Unescape Escape View File

@ -21,15 +21,20 @@
<result column="assort_id" property="assortId"/>
<result column="assort_name" property="assortName"/>
<result column="rule_id" property="ruleId"/>
<result column="key" property="key"/>
<result column="hit_key" property="hitKey"/>
<result column="rate" property="rate"/>
<result column="file_size" property="fileSize"/>
<result column="height" property="height"/>
<result column="width" property="width"/>
<result column="x" property="x"/>
<result column="y" property="y"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
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
</sql>
</mapper>

9
docus-segmentation/src/main/resources/mapper/OcrFileInfoTestMapper.xml
Unescape Escape View File

@ -21,15 +21,20 @@
<result column="assort_id" property="assortId"/>
<result column="assort_name" property="assortName"/>
<result column="rule_id" property="ruleId"/>
<result column="key" property="key"/>
<result column="hit_key" property="hitKey"/>
<result column="rate" property="rate"/>
<result column="file_size" property="fileSize"/>
<result column="height" property="height"/>
<result column="width" property="width"/>
<result column="x" property="x"/>
<result column="y" property="y"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
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
</sql>
</mapper>

Write Preview
Loading…
Cancel
Save