From 84c7fee3170a1df3ab3c40d147fd21fec5c14501 Mon Sep 17 00:00:00 2001 From: DELL Date: Wed, 24 Apr 2024 17:19:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=9B=BE=E7=89=87=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E5=9B=BE=E7=89=87=E7=9A=84=E5=AE=BD=E5=92=8C?= =?UTF-8?q?=E9=AB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OcrPictureController.java | 18 ++++++++++++++++-- .../xiaoyao/ocr/dataobject/OcrPicture.java | 7 ++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java index 79ae562e..61d64ffa 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java @@ -10,7 +10,9 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVo; import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; import cn.jyjz.xiaoyao.common.base.vo.UserToken; import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo; import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture; +import cn.jyjz.xiaoyao.ocr.service.OcrPictureInfoService; import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService; import cn.jyjz.xiaoyao.ocr.util.DataUtil; @@ -55,6 +57,8 @@ public class OcrPictureController extends BaseController { private UserService userService; @Resource private LogService logService; + @Resource + private OcrPictureInfoService ocrPictureInfoService; /** * 工单查询 @@ -333,11 +337,11 @@ public class OcrPictureController extends BaseController { Map> completeSimilarGroupMap = ocrPictures.stream().filter(s->Objects.nonNull(s.getCompleteSimilarGroupId())).collect(Collectors.groupingBy(OcrPicture::getCompleteSimilarGroupId)); for (OcrPicture ocrPictureOne : ocrPictures) { - filterScoreNoGroup(ocrPictureOne,completeSimilarGroupMap); + filterScoreNoGroup(ocrPictureOne, completeSimilarGroupMap); LambdaQueryWrapper ocrTaskchildPictureLambdaQueryWrapper = new LambdaQueryWrapper<>(); ocrTaskchildPictureLambdaQueryWrapper.eq(OcrTaskchildPicture::getPictureid, ocrPictureOne.getId()); OcrTaskchildPicture ocrTaskchildPicture = ocrTaskchildPictureService.getOne(ocrTaskchildPictureLambdaQueryWrapper); - if(ocrTaskchildPicture != null && ocrTaskchildPicture.getStates() != null){ + if (ocrTaskchildPicture != null && ocrTaskchildPicture.getStates() != null) { switch (ocrTaskchildPicture.getStates()) { case 1: ocrPictureOne.setField16("未提交"); @@ -354,7 +358,17 @@ public class OcrPictureController extends BaseController { } ocrPictureOne.setStates(ocrTaskchildPicture.getStates()); } + LambdaQueryWrapper ocrPictureInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); + ocrPictureInfoLambdaQueryWrapper.eq(OcrPictureInfo::getPictureId, ocrPictureOne.getId()); + OcrPictureInfo ocrPictureInfo = ocrPictureInfoService.getOne(ocrPictureInfoLambdaQueryWrapper); ocrPicturesNew.add(ocrPictureOne); + if (ocrPictureInfo != null && ocrPictureInfo.getImgMeasure() != null) { + String[] dimensions = ocrPictureInfo.getImgMeasure().split("x"); + if (dimensions.length == 2) { + ocrPictureOne.setWide(dimensions[0]); + ocrPictureOne.setHigh(dimensions[1]); + } + } } pageList.setRecords(ocrPicturesNew); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java index 825399dd..e785e50c 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java @@ -385,8 +385,13 @@ public class OcrPicture implements BaseDto, java.io.Serializable { @TableField(exist = false) private Integer isRepeatHis; + @ApiModelProperty(value = "图片信息-宽") + @TableField(exist = false) + private String wide; - + @ApiModelProperty(value = "图片信息-高") + @TableField(exist = false) + private String high; //保存当前登录用户的数据权限范围的搜索条件 @TableField(exist = false)