From a46066af08f499e1858f29c84477ab995baf859f Mon Sep 17 00:00:00 2001
From: yangzongjia <yangzongjia>
Date: Sat, 9 Sep 2023 13:03:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=AF=94=E4=B8=8A=E4=B8=80=E5=B0=8F?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E9=80=BB=E8=BE=91=E6=94=B9=E4=B8=BA=E5=AF=B9?=
 =?UTF-8?q?=E6=AF=94=E6=98=A8=E5=A4=A9=E5=90=8C=E6=97=B6=E9=97=B4=E6=AE=B5?=
 =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/deviceImage/YDeviceImageService.java    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java
index 2d9dc85..39a70b7 100644
--- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java
+++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java
@@ -26,10 +26,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Service
 public class YDeviceImageService extends ServiceImpl<YDeviceImageMapper, DeviceImage> {
@@ -121,10 +119,19 @@ public class YDeviceImageService extends ServiceImpl<YDeviceImageMapper, DeviceI
 
 
         // 入库操作
+        // 查询比对的前一张照片  今天的9:00和昨天的9:00
         QueryWrapper<DeviceImage> wrapper = new QueryWrapper<>();
         wrapper.eq("isShow", "1");
         wrapper.eq("channelNo", device.getChannelNo());
         wrapper.eq("ckId", device.getCkId());
+
+        // 获取前一天的时间
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.DATE, -1);
+        Date nowTime = calendar.getTime();
+        SimpleDateFormat sdf = new SimpleDateFormat("YYYYMMddHHmm");
+        String imageAfter = sdf.format(nowTime);
+        wrapper.like("imgAfter", imageAfter);
         wrapper.orderByDesc("createTime");
         List<DeviceImage> deviceImageList = this.list(wrapper);
 
@@ -158,7 +165,7 @@ public class YDeviceImageService extends ServiceImpl<YDeviceImageMapper, DeviceI
         } else {
             deviceImage.setImgBefore(picName);
             deviceImage.setImgAfter(picName);
-            deviceImage.setSimilarity("100%");
+//            deviceImage.setSimilarity("100%");
             this.save(deviceImage);
         }
         return deviceImage;