From f11bad79d4c9ab5ca3775c31e22dd47e00ccc4b4 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Tue, 7 May 2024 14:39:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=8F=AF=E7=96=91?=
 =?UTF-8?q?=E4=B8=8E=E7=9B=B8=E4=BC=BC=E5=9B=BE=E7=89=87=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=BE=E7=89=87=E5=A2=99=E6=97=A0=E5=AE=BD=E9=AB=98?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OcrTaskchildDubiousFileServiceImpl.java   | 20 +++++++++++++++++++
 .../impl/OcrTaskchildPictureServiceImpl.java  | 18 +++++++++++++++++
 .../xiaoyao/ocr/vo/OcrTaskChildPictureVo.java |  7 +++++++
 3 files changed, 45 insertions(+)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildDubiousFileServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildDubiousFileServiceImpl.java
index 01ce77a6..ee4b9783 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildDubiousFileServiceImpl.java
+++ b/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());
         }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
index 96de3e44..6d93dc71 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
+++ b/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;
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskChildPictureVo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskChildPictureVo.java
index cd777e4c..1d802f37 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskChildPictureVo.java
+++ b/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;
+
 }