From 2c4d2a25b547754c0af7b19e1b1ad805a42ae811 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 21 Sep 2023 17:45:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/deviceImage/YDeviceImageService.java      | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 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 a376ac4..3ca8de0 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
@@ -19,6 +19,7 @@ import com.yxt.supervise.monitor.biz.util.HttpUtils;
 import com.yxt.supervise.monitor.biz.util.ImageCompareUtil;
 import com.yxt.supervise.monitor.biz.util.ImageDownloadUtil;
 import com.yxt.supervise.monitor.biz.wareHouse.YWareHouseMapper;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -64,6 +65,7 @@ public class YDeviceImageService extends ServiceImpl<YDeviceImageMapper, DeviceI
         }
         queryWrapper.eq("t.isDelete", 0);
         queryWrapper.eq("t.isShow", 1);
+        queryWrapper.orderByDesc("t.modifyTime");
         queryWrapper.orderByAsc("t.channelNo");
 
         IPage<DeviceImage> athleteBOIPage = null;
@@ -136,7 +138,9 @@ public class YDeviceImageService extends ServiceImpl<YDeviceImageMapper, DeviceI
         Date nowTime = calendar.getTime();
         SimpleDateFormat sdf = new SimpleDateFormat("YYYYMMddHHmm");
         String imageAfter = sdf.format(nowTime);
-        wrapper.like("imgAfter", imageAfter);
+        //时间多截取一位
+        String after=imageAfter.substring(0,imageAfter.length()-1);
+        wrapper.like("imgAfter", after);
         wrapper.orderByDesc("createTime");
         List<DeviceImage> deviceImageList = this.list(wrapper);
 
@@ -187,5 +191,12 @@ public class YDeviceImageService extends ServiceImpl<YDeviceImageMapper, DeviceI
         wrapper.set("isShow", 0);
         this.update(wrapper);
     }
-
+    @Test
+    public void ss(){
+        SimpleDateFormat sdf = new SimpleDateFormat("YYYYMMddHHm");
+        String imageAfter = sdf.format(new Date());
+        String s=imageAfter.substring(0,imageAfter.length()-1);
+        System.out.println(imageAfter);
+        System.out.println(s);
+    }
 }