From 369143d68b5f2488710f9a5deec9a1670cec90c2 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Thu, 11 Jul 2024 10:26:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=A8=E9=87=8F=E8=AE=BE=E5=A4=87=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E7=A6=BB=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zhgd/xmgl/task/RainTask.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/task/RainTask.java b/src/main/java/com/zhgd/xmgl/task/RainTask.java
index 769cb30c6..22cc3d2cb 100644
--- a/src/main/java/com/zhgd/xmgl/task/RainTask.java
+++ b/src/main/java/com/zhgd/xmgl/task/RainTask.java
@@ -130,21 +130,20 @@ public class RainTask {
                 record.setDevSn(deviceAddr);
                 record.setProjectSn(dev.getProjectSn());
                 records.add(record);
-                dev.setLastUploadTime(new Date());
             }
 
             //更新在线离线
             String offline = "offline";
             if (offline.equals(deviceStatus)) {
                 if (dev != null) {
-                    if (DateUtil.compare(dev.getLastUploadTime(), DateUtil.offsetMinute(new Date(), -30)) >= 0) {
+                    if (dev.getLastUploadTime() != null && DateUtil.compare(dev.getLastUploadTime(), DateUtil.offsetMinute(new Date(), -30)) >= 0) {
                         dev.setLastUploadTime(DateUtil.offsetMinute(new Date(), -60));
                         rainDevMapper.updateById(dev);
                     }
                 }
             } else {
                 if (dev != null) {
-                    if (DateUtil.compare(dev.getLastUploadTime(), DateUtil.offsetMinute(new Date(), -30)) < 0) {
+                    if (dev.getLastUploadTime() == null || DateUtil.compare(dev.getLastUploadTime(), DateUtil.offsetMinute(new Date(), -20)) < 0) {
                         dev.setLastUploadTime(new Date());
                         rainDevMapper.updateById(dev);
                     }