fix: 解决可疑与相似图片列表，图片墙无宽高问题

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildDubiousFileServiceImpl.java

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -43,6 +44,9 @@ public class OcrTaskchildDubiousFileServiceImpl extends ServiceImpl<OcrTaskchild
     @Resource
     private OcrTaskchildPictureService ocrTaskchildPictureService;
 
+    @Autowired
+    private OcrPictureInfoService ocrPictureInfoService;
+
     /**
      * 分页查询可疑文件夹下的图片信息,并返回对应的状态，相似度，时间值等
      *
@@ -112,6 +116,22 @@ public class OcrTaskchildDubiousFileServiceImpl extends ServiceImpl<OcrTaskchild
 
 
             List<OcrTaskChildPictureVo> records = taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+
+            //补齐数据
+            for (OcrTaskChildPictureVo taskChildPictureVo : records) {
+                //赋值宽高
+                LambdaQueryWrapper<OcrPictureInfo> ocrPictureInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                ocrPictureInfoLambdaQueryWrapper.eq(OcrPictureInfo::getPictureId,taskChildPictureVo.getPictureId());
+                OcrPictureInfo ocrPictureInfo = ocrPictureInfoService.getOne(ocrPictureInfoLambdaQueryWrapper);
+                if (ocrPictureInfo != null && ocrPictureInfo.getImgMeasure() != null) {
+                    String[] dimensions = ocrPictureInfo.getImgMeasure().split("x");
+                    if (dimensions.length == 2) {
+                        taskChildPictureVo.setWide(dimensions[0]);
+                        taskChildPictureVo.setHigh(dimensions[1]);
+                    }
+                }
+            }
+
             objectPage.setRecords(records);
             objectPage.setTotal(taskChildPictures.size());
         }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java

@@ -94,6 +94,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
     @Autowired
     private DepartmentService departmentService;
 
+    @Autowired
+    private OcrPictureInfoService ocrPictureInfoService;
+
     /**
      * 图片真假设置
      *
@@ -723,6 +726,21 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
                 }
             }
             List<OcrTaskChildPictureVo> collect = taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+
+            //补齐数据
+            for (OcrTaskChildPictureVo taskChildPictureVo : collect) {
+                //赋值宽高
+                LambdaQueryWrapper<OcrPictureInfo> ocrPictureInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                ocrPictureInfoLambdaQueryWrapper.eq(OcrPictureInfo::getPictureId,taskChildPictureVo.getPictureId());
+                OcrPictureInfo ocrPictureInfo = ocrPictureInfoService.getOne(ocrPictureInfoLambdaQueryWrapper);
+                if (ocrPictureInfo != null && ocrPictureInfo.getImgMeasure() != null) {
+                    String[] dimensions = ocrPictureInfo.getImgMeasure().split("x");
+                    if (dimensions.length == 2) {
+                        taskChildPictureVo.setWide(dimensions[0]);
+                        taskChildPictureVo.setHigh(dimensions[1]);
+                    }
+                }
+            }
             objectPage.setRecords(collect);
             objectPage.setTotal(taskChildPictures.size());
             return objectPage;

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskChildPictureVo.java

@@ -171,4 +171,11 @@ public class OcrTaskChildPictureVo implements java.io.Serializable {
     @ApiModelProperty(value = "查重id")
     private String checkDuplicateId;
 
+
+    @ApiModelProperty(value = "图片宽")
+    private String Wide;
+
+    @ApiModelProperty(value = "图片高")
+    private String High;
+
 }