guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改工单列表及相关接口

Browse Source
pull/1/head
sunchenliang 1 year ago
parent 55d6676549
commit 71eec4287b
7 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java
Unescape View File

@ -396,7 +396,7 @@ public class OcrTaskchildPictureController extends BaseController {
String orderType = request.getParameter("orderType");
//排序字段
String orderValue = request.getParameter("orderName");
List<OcrTaskchildPicture> similarityList = ocrTaskchildPictureService.getSimilarityList(Integer.valueOf(pageNo), Integer.valueOf(pageSize), pictureId, orderType, orderValue);
Page<OcrTaskchildPicture> similarityList = ocrTaskchildPictureService.getSimilarityList(Integer.valueOf(pageNo), Integer.valueOf(pageSize), pictureId, orderType, orderValue);
return ResultVoUtil.success(similarityList);
}

3
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java
Unescape View File

@ -360,6 +360,9 @@ public class OcrPicture implements BaseDto, java.io.Serializable {
@JsonIgnore
private SearchQuery searchQueryrolesShowleave;
@TableField(exist = false)
private OcrPictureInfo pictureInfo;
@TableField(exist = false)
@JsonIgnore
private final Map<String, String> query = Stream.of(

2
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java
Unescape View File

@ -142,7 +142,7 @@ public interface OcrTaskchildPictureService extends BaseService<OcrTaskchildPict
PictureDetailVo getPictureDetail(String pictureId, UserToken userToken);
List<OcrTaskchildPicture> getSimilarityList(Integer pageNo, Integer pageSize, String pictureId, String orderType, String orderValue);
Page<OcrTaskchildPicture> getSimilarityList(Integer pageNo, Integer pageSize, String pictureId, String orderType, String orderValue);
Page<OcrTaskchildPicture> getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId);

1
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java
Unescape View File

@ -68,6 +68,7 @@ public class OcrTaskPackageServiceImpl extends ServiceImpl<OcrTaskPackageMapper,
if(search!=null){
Map map = JSONObject.parseObject(search.toString(), Map.class);
record.putAll(map);
record.put("createTime",map.getOrDefault("submit_date_timestamp","").toString());
}
}
}

10
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
Unescape View File

@ -643,8 +643,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
}
@Override
public List<OcrTaskchildPicture> getSimilarityList(Integer pageNo, Integer pageSize, String pictureId, String orderType, String orderValue) {
public Page<OcrTaskchildPicture> getSimilarityList(Integer pageNo, Integer pageSize, String pictureId, String orderType, String orderValue) {
OcrPictureDuplicateHis duplicateHis = pictureDuplicateHisService.getOne(new LambdaQueryWrapper<OcrPictureDuplicateHis>().eq(OcrPictureDuplicateHis::getPictureId, pictureId));
Page<OcrTaskchildPicture> objectPage = new Page<>();
if (ObjectUtils.isNotEmpty(duplicateHis) && org.apache.commons.lang3.StringUtils.isNotBlank(duplicateHis.getCheckDuplicateResultHisJson())) {
OcrTaskchildPicture one = this.getOne(new LambdaQueryWrapper<OcrTaskchildPicture>().eq(OcrTaskchildPicture::getPictureid, pictureId));
JSONObject jsonObject = JSONObject.parseObject(duplicateHis.getCheckDuplicateResultHisJson());
@ -666,9 +667,12 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
taskChildPictures.sort(Comparator.comparing(OcrTaskchildPicture::getCreatedate));
}
}
return taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
List<OcrTaskchildPicture> collect = taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
objectPage.setRecords(collect);
objectPage.setTotal(taskChildPictures.size());
return objectPage;
}
return new ArrayList<>();
return objectPage;
}
@Override

14
jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml
Unescape View File

@ -65,6 +65,17 @@
<result column="field17" property="field17" jdbcType="VARCHAR"/>
<result column="field18" property="field18" jdbcType="VARCHAR"/>
<result column="suspiciousfile" property="suspiciousfile" jdbcType="INTEGER"/>
<association property="pictureInfo" javaType="cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo">
<result column="pictureid" property="pictureId"/>
<result column="img_size" property="imgSize"/>
<result column="img_format" property="imgFormat"/>
<result column="img_measure" property="imgMeasure"/>
<result column="upload_time" property="uploadTime"/>
<result column="create_time" property="createTime"/>
<result column="img_space" property="imgSpace"/>
<result column="tag_time" property="tagTime"/>
<result column="source" property="source"/>
</association>
</resultMap>
<sql id="Base_Column_List">
ID AS id,
@ -207,9 +218,10 @@
</sql>
<select id="getPackagePictureInfo" resultMap="BaseResultMap">
SELECT t2.*
SELECT t2.*,t3.*
FROM ocr_check_duplicate_result t1
LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID
left join ocr_picture_info t3 on t2.ID=t3.picture_id
where t1.check_duplicate_id = #{packageId}
<if test="pictureId != null and pictureId != ''">
and t1.picture_id = #{pictureId}

2
jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
Unescape View File

@ -644,7 +644,7 @@
order by t1.max_similarity ${oderType}
</if>
<if test="oderName == 'createdate'">
order by t2.createdate ${oderType}
order by t2.create_time ${oderType}
</if>
</select>
</mapper>

Write Preview
Loading…
Cancel
Save