From 0564b61032890f9d116b2fa1c3d8e667c26b140d Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期四, 26 六月 2025 09:45:50 +0800
Subject: [PATCH] RunMachineStateTask增加判断
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleOnaOptTask.java | 90 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 74 insertions(+), 16 deletions(-)
diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleOnaOptTask.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleOnaOptTask.java
index 4e94f46..21360f2 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleOnaOptTask.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleOnaOptTask.java
@@ -1,7 +1,7 @@
package com.iailab.module.shasteel.job.task;
-import com.alibaba.fastjson.JSONArray;
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;
@@ -9,6 +9,8 @@
import com.iailab.module.model.api.mdk.dto.MdkScheduleRespDTO;
import com.iailab.module.model.enums.CommonConstant;
import com.iailab.module.model.enums.ScheduleTriggerMethodEnum;
+import com.iailab.module.shasteel.job.entity.MessageInfoEntity;
+import com.iailab.module.shasteel.job.service.MessageInfoService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,6 +42,10 @@
* 氮气预警模型
* 预警信号 advice
*
+ * consumpOxygenTest
+ * 耗氧异常检测
+ * 预警信号 advice
+ *
* @author PanZhibao
* @Description
* @createTime 2025年01月07日
@@ -53,6 +59,9 @@
@Autowired
private MdkApi mdkApi;
+
+ @Autowired
+ private MessageInfoService messageInfoService;
private Map<String, StScheduleSchemeDTO> schemeMap = new HashMap<>();
@@ -72,6 +81,10 @@
private static final String CODE05 = "05";
private static final String CODE01 = "01";
+
+ private static final String CODE_CONS = "consumpOxygenTest";
+
+ private static final String CODE_OXYGEN = "shaOxygenPlanDetection";
@Override
public void run(String params) {
@@ -137,33 +150,51 @@
saveScheduleSuggest("润忠调整建议", runAdvice, scheduleObj, scheduleTime);
}*/
- logger.info("adviceValues=" + entry.getValue().getResult().get("adviceValues"));
- List<BigDecimal> adviceValues = new ArrayList<>();
- JSONArray ja0 = JSONArray.parseArray(entry.getValue().getResult().get("adviceValues").toString());
- JSONArray ja1 = ja0.getJSONArray(0);
- for(int i = 0; i < ja1.size(); i++) {
- adviceValues.add(new BigDecimal(ja1.get(i).toString()));
- }
- logger.info("adviceValues=" + JSONArray.toJSONString(adviceValues));
+ BigDecimal adviceValues = new BigDecimal(entry.getValue().getResult().get("adviceValues").toString());
+ logger.info("各制氧机组建议 adviceValues=" + adviceValues);
String advice = entry.getValue().getResult().get("advice").toString();
- if(!advice.contains("压力正常")){
- saveScheduleSuggest("各制氧机组建议", advice, scheduleObj, scheduleTime, adviceValues.get(0), scheduleScheme.getAdjustRate());
+ if(adviceValues.compareTo(BigDecimal.ZERO) != 0){
+ saveScheduleSuggest("各制氧机组建议", advice, scheduleObj, scheduleTime, adviceValues, scheduleScheme.getAdjustRate(), scheduleScheme.getModelId(), scheduleScheme.getId());
}
} else if (entry.getKey().equals(CODE01)) {
- StScheduleSchemeDTO scheduleScheme = schemeMap.get(CODE05);
+ StScheduleSchemeDTO scheduleScheme = schemeMap.get(CODE01);
String scheduleObj = scheduleScheme.getScheduleObj();
+ BigDecimal adviceValues = new BigDecimal(entry.getValue().getResult().get("advicevalues").toString());
+ logger.info("氮气预警 adviceValues=" + adviceValues);
+
String advice = entry.getValue().getResult().get("advice").toString();
- if(!"压力正常".equals(advice)){
- saveScheduleSuggest("氮气预警", advice, scheduleObj, scheduleTime);
+ if(adviceValues.compareTo(BigDecimal.ZERO) != 0){
+ saveAlarmMessage("氮气预警", advice, scheduleObj, scheduleTime,adviceValues,scheduleScheme.getAdjustRate());
+ }
+ }else if (entry.getKey().equals(CODE_CONS)) {
+ StScheduleSchemeDTO scheduleScheme = schemeMap.get(CODE_CONS);
+ String scheduleObj = scheduleScheme.getScheduleObj();
+ BigDecimal adviceValues = new BigDecimal(entry.getValue().getResult().get("adviceValues").toString());
+ logger.info("耗氧异常检测 adviceValues=" + adviceValues);
+
+ String advice = entry.getValue().getResult().get("advice").toString();
+ if(adviceValues.compareTo(BigDecimal.ZERO) != 0){
+ saveAlarmMessage("耗氧异常检测", advice, scheduleObj, scheduleTime, adviceValues, scheduleScheme.getAdjustRate());
+ }
+ }
+ else if (entry.getKey().equals(CODE_OXYGEN)) {
+ StScheduleSchemeDTO scheduleScheme = schemeMap.get(CODE_OXYGEN);
+ String scheduleObj = scheduleScheme.getScheduleObj();
+ BigDecimal adviceValues = new BigDecimal(entry.getValue().getResult().get("adviceValues").toString());
+ logger.info("耗氧异常检测（检修计划检测） adviceValues=" + adviceValues);
+
+ String advice = entry.getValue().getResult().get("advice").toString();
+ if(adviceValues.compareTo(BigDecimal.ZERO) != 0){
+ saveAlarmMessage("耗氧异常检测", advice, scheduleObj, scheduleTime, adviceValues, scheduleScheme.getAdjustRate());
}
}
}
logger.info(params + "调度方案执行完成");
} catch (Exception ex) {
- logger.error("RunScheduleOnaOptTask运行异常");
+ logger.error("RunScheduleOnaOptTask运行异常",ex);
ex.printStackTrace();
}
logger.info("RunScheduleOnaOptTask运行完成");
@@ -184,7 +215,7 @@
mcsApi.createScheduleSuggest(suggest);
}
- private void saveScheduleSuggest(String title, String content, String scheduleObj, Date scheduleTime, BigDecimal adjustValue, int adjustRate) {
+ private void saveScheduleSuggest(String title, String content, String scheduleObj, Date scheduleTime, BigDecimal adjustValue, int adjustRate, String modelId, String schemeId) {
if (StringUtils.isBlank(content)) {
logger.info(title + "调整值为空，不产生建议");
return;
@@ -206,7 +237,34 @@
suggest.setContent(content);
suggest.setScheduleObj(scheduleObj);
suggest.setScheduleTime(scheduleTime);
+ suggest.setModelId(modelId);
+ suggest.setSchemeId(schemeId);
suggest.setSort(0);
mcsApi.createScheduleSuggest(suggest);
}
+ private void saveAlarmMessage(String title, String content, String scheduleObj, Date scheduleTime, BigDecimal adjustValue, int adjustRate) {
+ if (StringUtils.isBlank(content)) {
+ logger.info(title + "预警值为空，不产生预警");
+ return;
+ }
+ if (adjustValue == null || adjustValue.doubleValue() == 0) {
+ logger.info(title + "预警值为空，不产生预警");
+ return;
+ }
+ if (gasAdjustMode.containsKey(title) && gasAdjustMode.get(title).equals(adjustValue.compareTo(BigDecimal.ZERO)) &&
+ gasLastSugTime.containsKey(title) && (scheduleTime.getTime() - gasLastSugTime.get(title).getTime() <= Integer.valueOf(adjustRate).longValue() * 60 * 1000)) {
+ logger.info("预警在有效期内");
+ return;
+ }
+ gasAdjustMode.put(title, adjustValue.compareTo(BigDecimal.ZERO));
+ gasLastSugTime.put(title, scheduleTime);
+
+ AlarmMessageRespDTO alarm = new AlarmMessageRespDTO();
+ alarm.setTitle(title);
+ alarm.setContent(content);
+ alarm.setAlarmObj(scheduleObj);
+ alarm.setAlarmType(adjustValue.compareTo(BigDecimal.ZERO) > 0 ? "超上限" : "超下限");
+ alarm.setAlarmTime(scheduleTime);
+ mcsApi.createAlarmMessage(alarm);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3