diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TSetmonitorthresholdvalueController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TSetmonitorthresholdvalueController.java index 2e5236a..29aa5a2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TSetmonitorthresholdvalueController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TSetmonitorthresholdvalueController.java @@ -62,6 +62,12 @@ public class TSetmonitorthresholdvalueController extends BaseController case 16: url = "/SetMonitorThresholdValueTemp"; break; + case 20: + url = "/SetMonitorThresholdValueVibration";//振动 + break; + case 30: + url = "/SetMonitorThresholdValueArray";//温度阵列 + break; } return prefix + url; } @@ -149,6 +155,12 @@ public class TSetmonitorthresholdvalueController extends BaseController case 16: url ="/Tempedit"; break; + case 20: + url ="/VibrationEdit"; + break; + case 30: + url ="/ArrayEdit"; + break; } return prefix + url; } @@ -156,7 +168,7 @@ public class TSetmonitorthresholdvalueController extends BaseController /** * 修改保存仪阈值设置信息 */ - @RequiresPermissions("system:SetMonitorThresholdValue:edit") +// @RequiresPermissions("system:SetMonitorThresholdValue:edit") @Log(title = "仪阈值设置信息", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody diff --git a/ruoyi-admin/src/main/resources/templates/demo/modal/table/alarmRecord.html b/ruoyi-admin/src/main/resources/templates/demo/modal/table/alarmRecord.html index 2b0ff81..aa01809 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/modal/table/alarmRecord.html +++ b/ruoyi-admin/src/main/resources/templates/demo/modal/table/alarmRecord.html @@ -135,7 +135,7 @@ title: '异常数据' }, { - field: 'alarmIdea', + field: 'cause', title: '专家意见' }] }; diff --git a/ruoyi-admin/src/main/resources/templates/system/ArrayTemperatureData/ArrayTemperatureData.html b/ruoyi-admin/src/main/resources/templates/system/ArrayTemperatureData/ArrayTemperatureData.html index f9c8d56..31cc5c9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/ArrayTemperatureData/ArrayTemperatureData.html +++ b/ruoyi-admin/src/main/resources/templates/system/ArrayTemperatureData/ArrayTemperatureData.html @@ -208,7 +208,7 @@ $('.centerDiv' + index).css({'display': 'inline-block'}) let getColorByTemperature = {} $('#temInfo' + index).html(`最高温度：${e.data?.[index - 1]?.maxTemperature || ''}℃ 最低温度：${e.data?.[index - 1]?.minTemperature || ''}℃ 平均温度:${e.data?.[index - 1]?.avgTemperature || ''}℃`) - $('#timeInfo' + index).html(`名称：${e.data?.[index - 1]?.monitorName || ''} 采集时间：${e.data?.[index - 1]?.collectTime || ''} `) + $('#timeInfo' + index).html(`名称：${e.data?.[index - 1]?.monitorName || ''}
采集时间：${e.data?.[index - 1]?.collectTime || ''} `) let colors = [] let tems = [] for (i in e.data[index - 1]) { diff --git a/ruoyi-admin/src/main/resources/templates/system/SetMonitorThresholdValue/ArrayEdit.html b/ruoyi-admin/src/main/resources/templates/system/SetMonitorThresholdValue/ArrayEdit.html new file mode 100644 index 0000000..6fbb73d --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/SetMonitorThresholdValue/ArrayEdit.html @@ -0,0 +1,191 @@ + + + + + + +
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+
+ +
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/SetMonitorThresholdValue/SetMonitorThresholdValueArray.html b/ruoyi-admin/src/main/resources/templates/system/SetMonitorThresholdValue/SetMonitorThresholdValueArray.html new file mode 100644 index 0000000..4eeaaa2 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/SetMonitorThresholdValue/SetMonitorThresholdValueArray.html @@ -0,0 +1,300 @@ + + + + + + + + + + +
+
+
+
+ 测控点信息 +
+
+ + + + +
+ +
+
+
+
+
+
+ +
+
+
+
+
+ + +
+ +
+
+
+ + +
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/SetMonitorThresholdValue/SetMonitorThresholdValueTemp.html b/ruoyi-admin/src/main/resources/templates/system/SetMonitorThresholdValue/SetMonitorThresholdValueTemp.html index 927df51..ab6f2ab 100644 --- a/ruoyi-admin/src/main/resources/templates/system/SetMonitorThresholdValue/SetMonitorThresholdValueTemp.html +++ b/ruoyi-admin/src/main/resources/templates/system/SetMonitorThresholdValue/SetMonitorThresholdValueTemp.html @@ -1,7 +1,7 @@ - + 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 48b9c91..cf8b9ef 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 @@ -1,49 +1,94 @@ package com.ruoyi.quartz.task; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.system.domain.TArraytemperaturedata; +import com.ruoyi.system.domain.T_Alarm_Data; +import com.ruoyi.system.domain.dto.T_Alarm_DataDTO; import com.ruoyi.system.mapper.TArraytemperaturedataMapper; +import com.ruoyi.system.mapper.T_Alarm_DataMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.ruoyi.common.utils.StringUtils; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.HashMap; +import java.util.List; +import java.util.stream.Collectors; + /** * 定时任务调度测试 - * + * * @author ruoyi */ @Component("ryTask") -public class RyTask -{ +public class RyTask { @Autowired private TArraytemperaturedataMapper tArraytemperaturedataMapper; - public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) - { + @Autowired + private T_Alarm_DataMapper tAlarmDataMapper; + + + public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) { System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i)); } - public void ryParams(String params) - { + public void ryParams(String params) { System.out.println("执行有参方法：" + params); } - public void ryNoParams() - { + public void ryNoParams() { System.out.println("执行无参方法"); } /** * 删除红外温度阵列历史数据 + * * @param days */ - public void deleteArrayDataTask(Integer days){ + public void deleteArrayDataTask(Integer days) { days = -days; System.out.printf("deleteArrayDataTask: %s!", days); tArraytemperaturedataMapper.deleteTArraytemperaturedataBycollectTime(days); } - - - + /** + * + */ + public void ArrayTemperatureSensorAlarm() { + String nowTime = DateUtils.getTime(); + String beginTime = LocalDateTime + .parse(nowTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + .plusMinutes(-1) // 加一分钟 + .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + TArraytemperaturedata selectData = new TArraytemperaturedata(); + HashMap selectMap = new HashMap<>(); + selectMap.put("beginTime", beginTime); + selectMap.put("endTime", nowTime); + selectData.setParams(selectMap); + List dataList = tArraytemperaturedataMapper.selectArrayTemperatureSensorAlarmList(selectData); + T_Alarm_Data alarmData = new T_Alarm_Data(); + alarmData.setAlarmStatus(1); //0-已处理 1-未处理 + List dataDTOList = tAlarmDataMapper.selectT_Alarm_DataList(alarmData); + List alarmList = dataDTOList.stream().map(T_Alarm_DataDTO::getMonitorId).collect(Collectors.toList()); + for (TArraytemperaturedata data : dataList) { + if (alarmList.contains(data.getMonitorId())){ + continue; + } + if (data.getMaxTemperature().compareTo(data.getTemperatureMax()) > 0){ + T_Alarm_Data insertData = new T_Alarm_Data(); + insertData.setMonitorId(data.getMonitorId()); + insertData.setCollectTime(DateUtils.getNowDate()); + insertData.setAlarmType(0);//0-过高报警 1-过低报警 + insertData.setMonitorType(30); + insertData.setAlarmStatus(1); + insertData.setAlarmData(data.getMaxTemperature()); + insertData.setCause(data.gettMaxIdea()); + tAlarmDataMapper.insertT_Alarm_Data(insertData); + } + } + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TArraytemperaturedata.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TArraytemperaturedata.java index 52bf324..93ac545 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TArraytemperaturedata.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TArraytemperaturedata.java @@ -4680,6 +4680,26 @@ public class TArraytemperaturedata extends BaseEntity { private List monitorList; + private BigDecimal temperatureMax; + + private String tMaxIdea; + + public String gettMaxIdea() { + return tMaxIdea; + } + + public void settMaxIdea(String tMaxIdea) { + this.tMaxIdea = tMaxIdea; + } + + public BigDecimal getTemperatureMax() { + return temperatureMax; + } + + public void setTemperatureMax(BigDecimal temperatureMax) { + this.temperatureMax = temperatureMax; + } + public List getMonitorList() { return monitorList; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TSetmonitorthresholdvalue.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TSetmonitorthresholdvalue.java index fdcfe71..d09066b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TSetmonitorthresholdvalue.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TSetmonitorthresholdvalue.java @@ -121,7 +121,17 @@ public class TSetmonitorthresholdvalue extends BaseEntity private String iMinIdea; - public void setObjId(Long objId) + private String monitorName; + + public String getMonitorName() { + return monitorName; + } + + public void setMonitorName(String monitorName) { + this.monitorName = monitorName; + } + + public void setObjId(Long objId) { this.objId = objId; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TArraytemperaturedataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TArraytemperaturedataMapper.java index fd98b1c..bf957f6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TArraytemperaturedataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TArraytemperaturedataMapper.java @@ -75,4 +75,11 @@ public interface TArraytemperaturedataMapper List> getHighestPointTemperature(TArraytemperaturedata tArraytemperaturedata); public int deleteTArraytemperaturedataBycollectTime(Integer days); + + /** + * 阵列温度传感器报警 + * @param selectData + * @return + */ + List selectArrayTemperatureSensorAlarmList(TArraytemperaturedata selectData); } diff --git a/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml index 3155430..0d3fc5f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml @@ -782,6 +782,8 @@ + + @@ -1577,6 +1579,9 @@ and t.avgTemperature = #{avgTemperature} and t.collectTime = #{collectTime} and t.recodeTime = #{recodeTime} + + and t.collectTime between #{params.beginTime} and #{params.endTime} + @@ -3978,6 +3983,21 @@ order by monitorId, collectTime + +