From 45505e134415c1243213c430fa2280b40d8c76e9 Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 2 Sep 2025 14:51:54 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=B8=A9=E5=BA=A6=E4=BC=A0?= =?UTF-8?q?=E6=84=9F=E5=99=A8=E6=8A=A5=E8=AD=A6=E5=AE=9A=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/quartz/task/RyTask.java | 19 ++++++++++++------- .../mapper/T_W_TemperturedataMapper.java | 1 + .../system/T_W_TemperturedataMapper.xml | 17 +++++++++++++++++ 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java index c5e106d..c251161 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java @@ -10,6 +10,8 @@ import com.ruoyi.system.mapper.TArraytemperaturedataMapper; import com.ruoyi.system.mapper.TSetmonitorthresholdvalueMapper; import com.ruoyi.system.mapper.T_Alarm_DataMapper; import com.ruoyi.system.mapper.T_W_TemperturedataMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.ruoyi.common.utils.StringUtils; @@ -19,6 +21,7 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -29,6 +32,7 @@ import java.util.stream.Collectors; @Component("ryTask") public class RyTask { + private static final Logger log = LoggerFactory.getLogger(RyTask.class); @Autowired private TArraytemperaturedataMapper tArraytemperaturedataMapper; @@ -109,14 +113,14 @@ public class RyTask { String nowTime = DateUtils.getTime(); String beginTime = LocalDateTime .parse(nowTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) - .plusMinutes(-2) // 加一分钟 + .plusMinutes(-30) // 加一分钟 .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); T_W_Temperturedata selectData = new T_W_Temperturedata(); HashMap selectMap = new HashMap<>(); selectMap.put("beginTime", beginTime); selectMap.put("endTime", nowTime); selectData.setParams(selectMap); - List dataList = tWTemperturedataMapper.selectT_W_illdataList(selectData); + List dataList = tWTemperturedataMapper.selectT_W_Max_dataList(selectData); T_Alarm_Data alarmData = new T_Alarm_Data(); alarmData.setAlarmStatus(1); //0-已处理 1-未处理 @@ -131,10 +135,13 @@ public class RyTask { if (alarmList.contains(monitorId)){ continue; } - for (TSetmonitorthresholdvalue value : thresholdlist) { + List collect = thresholdlist.stream().filter(e -> e.getMonitorId().equals(monitorId)).collect(Collectors.toList()); + if (collect.size() > 0){ + TSetmonitorthresholdvalue value = collect.get(0); if (value.getMonitorId().equals(monitorId)){ BigDecimal temperatureMax = value.getTemperatureMax(); BigDecimal temperatureMin = value.getTemperatureMin(); + System.out.println("temperatureAlarm:monitorId" + monitorId + "|temperatureMax：" + temperatureMax + "|Tempreture：" + data.getTempreture()); if (StringUtils.isNotNull(temperatureMax) && data.getTempreture().compareTo(temperatureMax) > 0){ T_Alarm_Data insertData = new T_Alarm_Data(); insertData.setMonitorId(data.getMonitorId()); @@ -145,19 +152,17 @@ public class RyTask { insertData.setAlarmData(data.getTempreture()); insertData.setCause(value.gettMaxIdea() != null ? value.gettMaxIdea() : "温度过高"); tAlarmDataMapper.insertT_Alarm_Data(insertData); - } - if (StringUtils.isNotNull(temperatureMin) && temperatureMin.compareTo(data.getTempreture()) > 0){ + } else if (StringUtils.isNotNull(temperatureMin) && temperatureMin.compareTo(data.getTempreture()) > 0){ T_Alarm_Data insertData = new T_Alarm_Data(); insertData.setMonitorId(data.getMonitorId()); insertData.setCollectTime(DateUtils.getNowDate()); - insertData.setAlarmType(0);//0-过高报警 1-过低报警 + insertData.setAlarmType(1);//0-过高报警 1-过低报警 insertData.setMonitorType(16); insertData.setAlarmStatus(1); insertData.setAlarmData(data.getTempreture()); insertData.setCause(value.gettMinIdea() != null ? value.gettMinIdea() : "温度过底"); tAlarmDataMapper.insertT_Alarm_Data(insertData); } - break; } } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/T_W_TemperturedataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/T_W_TemperturedataMapper.java index d3d71e0..19a9fa8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/T_W_TemperturedataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/T_W_TemperturedataMapper.java @@ -85,5 +85,6 @@ public interface T_W_TemperturedataMapper public List selectT_W_illdataFirstList(T_W_Temperturedata t_W_Temperturedata); public List selectT_W_illdataList(T_W_Temperturedata t_W_Temperturedata); + public List selectT_W_Max_dataList(T_W_Temperturedata t_W_Temperturedata); public List selectill_max_min_avg(T_W_Temperturedata t_W_Temperturedata); } diff --git a/ruoyi-system/src/main/resources/mapper/system/T_W_TemperturedataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/T_W_TemperturedataMapper.xml index ae36d44..77a1100 100644 --- a/ruoyi-system/src/main/resources/mapper/system/T_W_TemperturedataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/T_W_TemperturedataMapper.xml @@ -124,6 +124,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +