From cb3c46e5a38a5ade1fb18de6b88bfa30df834859 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Tue, 9 Apr 2024 14:51:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E8=8E=B7=E5=8F=96hash=E5=80=BC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jyjz/xiaoyao/ocr/thread/TaskRunner.java   |  4 +--
 .../thread/tasks/PictureImgToLocalTask.java   | 26 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/TaskRunner.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/TaskRunner.java
index 870b414b..b5bd8fda 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/TaskRunner.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/TaskRunner.java
@@ -22,7 +22,7 @@ public class TaskRunner implements CommandLineRunner {
         TaskThreadPool taskThreadPool = new TaskThreadPool();
         taskThreadPool.startPictureDisposePull();
         taskThreadPool.startPictureImgToLocalPull();
-//        ImageDownloadMonitoring imageDownloadMonitoring = new ImageDownloadMonitoring();
-//        imageDownloadMonitoring.startImageDownloadMonitoring(localImagePath);
+        ImageDownloadMonitoring imageDownloadMonitoring = new ImageDownloadMonitoring();
+        imageDownloadMonitoring.startImageDownloadMonitoring(localImagePath);
     }
 }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureImgToLocalTask.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureImgToLocalTask.java
index 0e5ff181..e7044a7a 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureImgToLocalTask.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureImgToLocalTask.java
@@ -64,26 +64,26 @@ public class PictureImgToLocalTask implements Runnable {
             if (ObjectUtil.isNotEmpty(picture)) {
                 picture.setLocalpictrueurl(pictureImgToLocal.getLocalPath());
                 picture.setIsdownload(1);
-//                try {
-//                    picture.setLocalThumbnailUrl(ImageUtils.generateThumbnail(pictureImgToLocal.getLocalPath(),182));
-//                    picture.setServerThumbnailUrl(ocrPictureService.getServerUrl()+ImageUtils.getFileName(picture.getLocalThumbnailUrl()));
-//                } catch (IOException e) {
-//                    throw new RuntimeException(e);
-//                }
-//                Map<String, String> ocrPictureClassifyAndHash = ocrPictureService.getOcrPictureClassifyAndHash(picture.getLocalpictrueurl());
-//                if(ocrPictureClassifyAndHash!=null){
-//                    picture.setImgHash(ocrPictureClassifyAndHash.get("hash"));
-//                    picture.setClassificationid(ocrPictureClassifyAndHash.get("classId"));
-//                }
+                try {
+                    picture.setLocalThumbnailUrl(ImageUtils.generateThumbnail(pictureImgToLocal.getLocalPath(),182));
+                    picture.setServerThumbnailUrl(ocrPictureService.getServerUrl()+ImageUtils.getFileName(picture.getLocalThumbnailUrl()));
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+                Map<String, String> ocrPictureClassifyAndHash = ocrPictureService.getOcrPictureClassifyAndHash(picture.getLocalpictrueurl());
+                if(ocrPictureClassifyAndHash!=null){
+                    picture.setImgHash(ocrPictureClassifyAndHash.get("hash"));
+                    picture.setClassificationid(ocrPictureClassifyAndHash.get("classId"));
+                }
                 // 获取拍照时间
 //                Long timestamp = ocrPictureService.getPhotoDateTime(picture);
 //                if(timestamp != 0L){
 //                    picture.setPhotoDateTimestamp(timestamp);
 //                }
-//                ocrPictureService.updateById(picture);
+                ocrPictureService.updateById(picture);
                 logger.info("图片本地化，回写数据完成!");
                 logger.info("开启获取图片信息操作!");
-//                ocrPictureService.savePicturesInfo(picture);
+                ocrPictureService.savePicturesInfo(picture);
                 logger.info("获取图片信息操作,结束!");
             }
         }else{