From 85b598a7127415549f74571c015d66c0bc115d5d Mon Sep 17 00:00:00 2001
From: zhangyue <82248909@qq.com>
Date: Fri, 21 Aug 2026 19:12:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=B0=8F=E6=97=B6=E5=86=85=E4=B8=8D?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Impl/SurvAlertRecordServiceImpl.java      | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/main/java/com/lanhai/service/Impl/SurvAlertRecordServiceImpl.java b/src/main/java/com/lanhai/service/Impl/SurvAlertRecordServiceImpl.java
index 2af690d..b241e91 100644
--- a/src/main/java/com/lanhai/service/Impl/SurvAlertRecordServiceImpl.java
+++ b/src/main/java/com/lanhai/service/Impl/SurvAlertRecordServiceImpl.java
@@ -1,5 +1,6 @@
 package com.lanhai.service.Impl;
 
+import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 //import cn.hutool.extra.mail.MailUtil;
 import cn.hutool.json.JSONUtil;
@@ -22,11 +23,13 @@ import com.lanhai.service.ISurvAlertRecordService;
 import com.lanhai.service.ISurvDeviceDeployService;
 import com.lanhai.service.ISurvStationInfoService;
 import com.lanhai.util.DataUtil;
+import com.xxl.job.core.context.XxlJobHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -127,6 +130,23 @@ public class SurvAlertRecordServiceImpl extends ServiceImpl<SurvAlertRecordMappe
         String mn = baowenMap.get("mn");
         String DataTime = baowenMap.get("DataTime");
         if(deviceDeploy != null){
+            //检查该设备上一次的数据，如果在60分钟以内，不报警
+            SurvAlertRecord lastBaojing = lambdaQuery()
+                    .eq(SurvAlertRecord::getDeployId,deviceDeploy.getId())
+                    .orderByDesc(SurvAlertRecord::getAlertTime)
+                    .last("limit 1")
+                    .one();
+            if(lastBaojing != null){
+                if(lastBaojing.getAlertTime()!=null){
+                    long times = DateUtil.between(lastBaojing.getAlertTime(), new Date(),DateUnit.MINUTE);
+                    if(times<=60){
+                        XxlJobHelper.log("&&&&&设备：{}，编号：{}，在60分钟以内，不报警&&&&&",deviceDeploy.getDeployDes(),deviceDeploy.getDeployCode());
+                        log.error("&&&&&设备：{}，编号：{}，在60分钟以内，不报警&&&&",deviceDeploy.getDeployDes(),deviceDeploy.getDeployCode());
+                        return;
+                    }
+                }
+            }
+
             LinkedHashMap<String, JSONObject> zhibiaomap = zhibiaoService.getAllZhiBiao(deviceDeploy.getScEquZhibiaoList());
             StringBuilder sb = new StringBuilder();
             JSONArray jsonarr = new JSONArray();