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<Long, List<OcrPicture>> 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<OcrTaskchildPicture> 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<OcrPictureInfo> 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);
 

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)