From 456a64e5ef1e632b98ee43b20838b05869a444a6 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 23 十二月 2024 10:32:27 +0800
Subject: [PATCH] 调度建议与预警信息
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java | 123 +++++++++++++++---------------
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java | 94 ++++++++++++++++++++++-
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java | 9 +-
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/constant/CommonConstant.java | 12 +++
4 files changed, 168 insertions(+), 70 deletions(-)
diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/constant/CommonConstant.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/constant/CommonConstant.java
index 60ea0f3..f2b97e5 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/constant/CommonConstant.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/common/constant/CommonConstant.java
@@ -13,4 +13,16 @@
//蒸汽调度方案code
String STEAM_CODE = "sha01";
+
+ //氧气班平衡计划方案code
+ String OXYGEN_ONE_CODE = "oxygen01";
+
+ //氧气系统优化调度决策方案code
+ String OXYGEN_TWO_CODE = "oxygen02";
+
+ //超上限
+ String EXCEEDING_UPPER_LIMIT = "UpperLimit";
+
+ //超下限
+ String EXCEEDING_LOWER_LIMIT = "LowerLimit";
}
diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java
index 4621a2b..5da7ffa 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java
@@ -1,12 +1,15 @@
package com.iailab.module.shasteel.mq.consumer;
import com.alibaba.fastjson.JSONObject;
+import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.module.model.api.mcs.McsApi;
import com.iailab.module.model.api.mcs.dto.AlarmMessageRespDTO;
+import com.iailab.module.model.api.mcs.dto.ScheduleSuggestRespDTO;
import com.iailab.module.model.api.mcs.dto.StScheduleSchemeDTO;
import com.iailab.module.model.api.mdk.MdkApi;
import com.iailab.module.model.api.mdk.dto.MdkScheduleReqDTO;
import com.iailab.module.model.api.mdk.dto.MdkScheduleRespDTO;
+import com.iailab.module.shasteel.mq.common.constant.CommonConstant;
import com.iailab.module.shasteel.mq.common.enums.TriggerConditionEnum;
import com.iailab.module.shasteel.mq.config.QueueModelAlarmConfig;
import lombok.extern.slf4j.Slf4j;
@@ -19,6 +22,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
/**
* 监听报警信息
@@ -67,12 +71,90 @@
mdkScheduleReqDTO.setScheduleCode(stScheduleSchemeDTO.getCode());
mdkScheduleReqDTO.setScheduleTime(stScheduleSchemeDTO.getScheduleTime());
MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(mdkScheduleReqDTO);//执行调度方案
- String result = mdkScheduleRespDTO.getResult().toString();
- System.out.println(result);
- AlarmMessageRespDTO alarmMessageRespDTO = (AlarmMessageRespDTO)messageJson.get("AlarmMessageRespDTO");
- alarmMessageRespDTO.setContent(result);
- // 根据模型返回结果，保存调度建议
- mcsApi.createAlarmMessage(alarmMessageRespDTO);
+ if(mdkScheduleRespDTO == null){
+ return;
+ }
+ AlarmMessageRespDTO alarmRespDTO = (AlarmMessageRespDTO)messageJson.get("AlarmMessageRespDTO");
+ alarmRespDTO.setId(UUID.randomUUID().toString());
+ alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ mcsApi.createAlarmMessage(alarmRespDTO);
+ Map<String, Object> result = mdkScheduleRespDTO.getResult();
+ switch (mdkScheduleRespDTO.getScheduleCode()) {
+ case CommonConstant.OXYGEN_ONE_CODE://氧气班平衡计划方案
+ if(!result.containsKey("faAdvice") || !result.containsKey("yingDiAdvice") || !result.containsKey("yingZhongAdvice")
+ || !result.containsKey("hongAdvice") || !result.containsKey("RunAdvice")){
+ return;
+ }
+ for (String key : result.keySet()) {
+ if ("faAdvice".equals(key) && !"".equals(result.get("faAdvice").toString())) {
+ ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
+ suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setContent(result.get("faAdvice").toString());//法夜空建议送出量建议
+ suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
+ mcsApi.createScheduleSuggest(suggestRespDTO);
+ }else if ("yingDiAdvice".equals(key) && !"".equals(result.get("yingDiAdvice").toString())) {
+ ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
+ suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setContent(result.get("yingDiAdvice").toString());//盈德低压建议送出量建议
+ suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
+ mcsApi.createScheduleSuggest(suggestRespDTO);
+ }else if ("yingZhongAdvice".equals(key) && !"".equals(result.get("yingZhongAdvice").toString())) {
+ ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
+ suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setContent(result.get("yingZhongAdvice").toString());//盈德中压建议送出量建议
+ suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
+ mcsApi.createScheduleSuggest(suggestRespDTO);
+ }else if ("hongAdvice".equals(key) && !"".equals(result.get("hongAdvice").toString())) {
+ ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
+ suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setContent(result.get("hongAdvice").toString());//宏昌建议送出量建议
+ suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
+ mcsApi.createScheduleSuggest(suggestRespDTO);
+ }else if ("RunAdvice".equals(key) && !"".equals(result.get("RunAdvice").toString())) {
+ ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
+ suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setContent(result.get("RunAdvice").toString());//润忠建议送出量建议
+ suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
+ mcsApi.createScheduleSuggest(suggestRespDTO);
+ }
+ }
+ break;
+ case CommonConstant.OXYGEN_TWO_CODE://氧气系统优化调度决策方案
+ if(!result.containsKey("yingdiAdvice") || !result.containsKey("faAdvice") || !result.containsKey("hongAdvice")
+ || !result.containsKey("RunAdvice")){
+ return;
+ }
+ for (String key : result.keySet()) {
+ if ("yingdiAdvice".equals(key) && !"".equals(result.get("yingdiAdvice").toString())) {
+ ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
+ suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setContent(result.get("yingdiAdvice").toString());//盈德中压建议调整量建议
+ suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
+ mcsApi.createScheduleSuggest(suggestRespDTO);
+ }else if ("faAdvice".equals(key) && !"".equals(result.get("faAdvice").toString())) {
+ ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
+ suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setContent(result.get("faAdvice").toString());//法夜空建议调整量建议
+ suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
+ mcsApi.createScheduleSuggest(suggestRespDTO);
+ }else if ("hongAdvice".equals(key) && !"".equals(result.get("hongAdvice").toString())) {
+ ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
+ suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setContent(result.get("hongAdvice").toString());//宏昌建议调整量建议
+ suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
+ mcsApi.createScheduleSuggest(suggestRespDTO);
+ }else if ("RunAdvice".equals(key) && !"".equals(result.get("RunAdvice").toString())) {
+ ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
+ suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setContent(result.get("RunAdvice").toString());//润忠建议调整量建议
+ suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
+ mcsApi.createScheduleSuggest(suggestRespDTO);
+ }
+ }
+ break;
+ default:
+ break;
+ }
}
}
}
\ No newline at end of file
diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java
index 869b18c..e3626c7 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java
@@ -74,71 +74,74 @@
Map<String, Object> result = mdkScheduleRespDTO.getResult();
switch (mdkScheduleRespDTO.getScheduleCode()) {
case CommonConstant.COMPRESSOR_CODE://压缩空气调度方案
- if(result.containsKey("pressureWarning") && !"".equals(result.get("pressureWarning").toString())){
- AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
- alarmRespDTO.setId(UUID.randomUUID().toString());
- alarmRespDTO.setContent(result.get("pressureWarning").toString());//压力预警信息
- alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
- mcsApi.createAlarmMessage(alarmRespDTO);
+ if(!result.containsKey("pressureWarning") || !result.containsKey("dispatchStart") || !result.containsKey("dispatchEnd")){
+ return;
}
- if(result.containsKey("dispatchStart") && !"".equals(result.get("dispatchStart").toString())){
- ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
- suggestRespDTO.setId(UUID.randomUUID().toString());
- suggestRespDTO.setContent(result.get("dispatchStart").toString());//空压机启动调度建议
- suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
- mcsApi.createScheduleSuggest(suggestRespDTO);
+ for (String key : result.keySet()) {
+ if("pressureWarning".equals(key) && !"".equals(result.get("pressureWarning").toString())){
+ AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
+ alarmRespDTO.setId(UUID.randomUUID().toString());
+ alarmRespDTO.setContent(result.get("pressureWarning").toString());//压力预警信息
+ alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ mcsApi.createAlarmMessage(alarmRespDTO);
+ }else if("dispatchStart".equals(key) && !"".equals(result.get("dispatchStart").toString())){
+ ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
+ suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setContent(result.get("dispatchStart").toString());//空压机启动调度建议
+ suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
+ mcsApi.createScheduleSuggest(suggestRespDTO);
+ }else if("dispatchEnd".equals(key) && !"".equals(result.get("dispatchEnd").toString())){
+ ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
+ suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setContent(result.get("dispatchClose").toString());//空压机关停调度建议
+ suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
+ mcsApi.createScheduleSuggest(suggestRespDTO);
+ }
}
- if(result.containsKey("dispatchClose") && !"".equals(result.get("dispatchClose").toString())){
- ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
- suggestRespDTO.setId(UUID.randomUUID().toString());
- suggestRespDTO.setContent(result.get("dispatchClose").toString());//空压机关停调度建议
- suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
- mcsApi.createScheduleSuggest(suggestRespDTO);
- }
-
break;
case CommonConstant.STEAM_CODE://蒸汽调度方案
- if(result.containsKey("daxinWarning") && !"".equals(result.get("daxinWarning").toString())){
- AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
- alarmRespDTO.setId(UUID.randomUUID().toString());
- alarmRespDTO.setContent(result.get("daxinWarning").toString());//大新预警
- alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
- mcsApi.createAlarmMessage(alarmRespDTO);
+ if(!result.containsKey("daxinWarning") || !result.containsKey("jinfengWarning") || !result.containsKey("zhuanlu1Warning")
+ || !result.containsKey("zhuanlu2Warning") || !result.containsKey("jinfengAdvice") || !result.containsKey("daxinAdvice")){
+ return;
}
- if(result.containsKey("jinfengWarning") && !"".equals(result.get("jinfengWarning").toString())){
- AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
- alarmRespDTO.setId(UUID.randomUUID().toString());
- alarmRespDTO.setContent(result.get("jinfengWarning").toString());//锦丰预警
- alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
- mcsApi.createAlarmMessage(alarmRespDTO);
- }
- if(result.containsKey("zhuanlu1Warning") && !"".equals(result.get("zhuanlu1Warning").toString())){
- AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
- alarmRespDTO.setId(UUID.randomUUID().toString());
- alarmRespDTO.setContent(result.get("zhuanlu1Warning").toString());//转炉一预警
- alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
- mcsApi.createAlarmMessage(alarmRespDTO);
- }
- if(result.containsKey("zhuanlu2Warning") && !"".equals(result.get("zhuanlu2Warning").toString())){
- AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
- alarmRespDTO.setId(UUID.randomUUID().toString());
- alarmRespDTO.setContent(result.get("zhuanlu2Warning").toString());//转炉二预警
- alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
- mcsApi.createAlarmMessage(alarmRespDTO);
- }
- if(result.containsKey("jinfengAdvice") && !"".equals(result.get("jinfengAdvice").toString())){
- ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
- suggestRespDTO.setId(UUID.randomUUID().toString());
- suggestRespDTO.setContent(result.get("jinfengAdvice").toString());//锦丰调度建议
- suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
- mcsApi.createScheduleSuggest(suggestRespDTO);
- }
- if(result.containsKey("daxinAdvice") && !"".equals(result.get("daxinAdvice").toString())){
- ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
- suggestRespDTO.setId(UUID.randomUUID().toString());
- suggestRespDTO.setContent(result.get("daxinAdvice").toString());//大新调度建议
- suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
- mcsApi.createScheduleSuggest(suggestRespDTO);
+ for (String key : result.keySet()) {
+ if ("daxinWarning".equals(key) && !"".equals(result.get("daxinWarning").toString())) {
+ AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
+ alarmRespDTO.setId(UUID.randomUUID().toString());
+ alarmRespDTO.setContent(result.get("daxinWarning").toString());//大新预警
+ alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ mcsApi.createAlarmMessage(alarmRespDTO);
+ }else if ("jinfengWarning".equals(key) && !"".equals(result.get("jinfengWarning").toString())) {
+ AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
+ alarmRespDTO.setId(UUID.randomUUID().toString());
+ alarmRespDTO.setContent(result.get("jinfengWarning").toString());//锦丰预警
+ alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ mcsApi.createAlarmMessage(alarmRespDTO);
+ }else if ("zhuanlu1Warning".equals(key) && !"".equals(result.get("zhuanlu1Warning").toString())) {
+ AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
+ alarmRespDTO.setId(UUID.randomUUID().toString());
+ alarmRespDTO.setContent(result.get("zhuanlu1Warning").toString());//转炉一预警
+ alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ mcsApi.createAlarmMessage(alarmRespDTO);
+ }else if ("zhuanlu2Warning".equals(key) && !"".equals(result.get("zhuanlu2Warning").toString())) {
+ AlarmMessageRespDTO alarmRespDTO = new AlarmMessageRespDTO();
+ alarmRespDTO.setId(UUID.randomUUID().toString());
+ alarmRespDTO.setContent(result.get("zhuanlu2Warning").toString());//转炉二预警
+ alarmRespDTO.setAlarmTime(DateUtils.parse(messageJson.get("predictTime").toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ mcsApi.createAlarmMessage(alarmRespDTO);
+ }else if ("jinfengAdvice".equals(key) && !"".equals(result.get("jinfengAdvice").toString())) {
+ ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
+ suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setContent(result.get("jinfengAdvice").toString());//锦丰调度建议
+ suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
+ mcsApi.createScheduleSuggest(suggestRespDTO);
+ }else if ("daxinAdvice".equals(key) && !"".equals(result.get("daxinAdvice").toString())) {
+ ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
+ suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setContent(result.get("daxinAdvice").toString());//大新调度建议
+ suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
+ mcsApi.createScheduleSuggest(suggestRespDTO);
+ }
}
break;
default:
diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java
index 6b30eb1..a989569 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java
@@ -6,6 +6,7 @@
import com.iailab.module.model.api.mcs.dto.AlarmConfigRespDTO;
import com.iailab.module.model.api.mcs.dto.AlarmMessageRespDTO;
import com.iailab.module.model.api.mcs.dto.PreDataJsonReqVO;
+import com.iailab.module.shasteel.mq.common.constant.CommonConstant;
import com.iailab.module.shasteel.mq.common.constant.RoutingConstant;
import com.iailab.module.shasteel.mq.config.QueuePredictFinishConfig;
import lombok.extern.slf4j.Slf4j;
@@ -84,9 +85,9 @@
AlarmMessageRespDTO alarmMessage = new AlarmMessageRespDTO();
alarmMessage.setConfigId(item.getId());
if (dataValue.compareTo(item.getLowerLimit()) < 0) {
- alarmMessage.setAlarmType("1");//超下限
+ alarmMessage.setAlarmType(CommonConstant.EXCEEDING_LOWER_LIMIT);//超下限
} else if (dataValue.compareTo(item.getUpperLimit()) > 0) {
- alarmMessage.setAlarmType("2");//超上限
+ alarmMessage.setAlarmType(CommonConstant.EXCEEDING_UPPER_LIMIT);//超上限
}
alarmMessage.setAlarmTime(DateUtils.parse(data[0].toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
StringBuffer sb = new StringBuffer();
@@ -94,9 +95,9 @@
sb.append(" ");
sb.append(item.getAlarmObj());
if ("1".equals(alarmMessage.getAlarmType())) {
- sb.append("超下限");
+ sb.append(CommonConstant.EXCEEDING_LOWER_LIMIT);
} else if ("2".equals(alarmMessage.getAlarmType())) {
- sb.append("超上限");
+ sb.append(CommonConstant.EXCEEDING_UPPER_LIMIT);
}
sb.append(dataValue);
sb.append(item.getUnit());
--
Gitblit v1.9.3