From 58604b91f1150765203bdd9836951b66761cdf57 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 24 六月 2025 23:04:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunDayScheduleModuleTask.java | 73 +++++++++++++++++++++++++++++-------
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunScheduleModuleTask.java | 3 -
2 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunDayScheduleModuleTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunDayScheduleModuleTask.java
index e42b148..0b2a532 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunDayScheduleModuleTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunDayScheduleModuleTask.java
@@ -15,6 +15,7 @@
import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Date;
import java.util.List;
/**
@@ -25,6 +26,8 @@
private Logger logger = LoggerFactory.getLogger(getClass());
private String AnStellCOAL = "AnStellCOAL"; //焦化备煤管控
+ private String AnSteelCDQTrackImplv3 = "AnSteelCDQTrackImplv3"; //焦化干熄焦产蒸汽模型
+ private String AnSteelChemProSteamTrack = "AnSteelChemProSteamTrack"; //焦化化产蒸汽消耗模型
@Autowired
private MdkApi mdkApi;
@@ -70,23 +73,65 @@
if (AnStellCOAL.equals(code)) {
Object equipOperationInfo = mdkScheduleRespDTO.getResult().get("EquipOperationInfo");
if(equipOperationInfo != null && StringUtils.isNotBlank(equipOperationInfo.toString())) {
- JSONArray jsonArray = JSON.parseArray(equipOperationInfo.toString());
- if (jsonArray.size() > 0) {
- for (Object suggest : jsonArray) {
- ScheduleSuggestRespDTO suggestDto = new ScheduleSuggestRespDTO();
- suggestDto.setTitle("焦化备煤建议");
- suggestDto.setContent(suggest.toString());
- suggestDto.setScheduleObj("COAL");
- suggestDto.setScheduleTime(dto.getScheduleTime());
- suggestDto.setCreateTime(calendar.getTime());
- mcsApi.createScheduleSuggest(suggestDto);
- }
- }
+ ScheduleSuggestRespDTO suggestDto = new ScheduleSuggestRespDTO();
+ suggestDto.setTitle("焦化备煤建议");
+ suggestDto.setContent(equipOperationInfo.toString());
+ suggestDto.setScheduleObj("COAL");
+ suggestDto.setScheduleTime(dto.getScheduleTime());
+ suggestDto.setCreateTime(new Date());
+ mcsApi.createScheduleSuggest(suggestDto);
+ }
+ }
+ //干熄焦产蒸汽 建议保存
+ if (AnSteelCDQTrackImplv3.equals(code)) {
+ Object finalResultStr = mdkScheduleRespDTO.getResult().get("finalResultStr");
+ if(finalResultStr != null && StringUtils.isNotBlank(finalResultStr.toString())) {
+ ScheduleSuggestRespDTO suggestDto = new ScheduleSuggestRespDTO();
+ suggestDto.setTitle("干熄焦产蒸汽建议");
+ suggestDto.setContent(finalResultStr.toString());
+ suggestDto.setScheduleObj("GXJCZQ");
+ suggestDto.setScheduleTime(dto.getScheduleTime());
+ suggestDto.setCreateTime(new Date());
+ mcsApi.createScheduleSuggest(suggestDto);
+ }
+
+ Object resultList = mdkScheduleRespDTO.getResult().get("resultList");
+ if(resultList != null && StringUtils.isNotBlank(resultList.toString())) {
+ ScheduleSuggestRespDTO suggestDto = new ScheduleSuggestRespDTO();
+ suggestDto.setTitle("干熄焦产蒸汽异常溯源");
+ suggestDto.setContent(resultList.toString());
+ suggestDto.setScheduleObj("GXJCZQ_YCSY");
+ suggestDto.setScheduleTime(dto.getScheduleTime());
+ suggestDto.setCreateTime(new Date());
+ mcsApi.createScheduleSuggest(suggestDto);
+ }
+ }
+ //化产蒸汽消耗 建议保存
+ if (AnSteelChemProSteamTrack.equals(code)) {
+ Object finalResultStr = mdkScheduleRespDTO.getResult().get("finalResultStr");
+ if(finalResultStr != null && StringUtils.isNotBlank(finalResultStr.toString())) {
+ ScheduleSuggestRespDTO suggestDto = new ScheduleSuggestRespDTO();
+ suggestDto.setTitle("化产蒸汽消耗建议");
+ suggestDto.setContent(finalResultStr.toString());
+ suggestDto.setScheduleObj("HCZQXH");
+ suggestDto.setScheduleTime(dto.getScheduleTime());
+ suggestDto.setCreateTime(new Date());
+ mcsApi.createScheduleSuggest(suggestDto);
+ }
+
+ Object resultList = mdkScheduleRespDTO.getResult().get("resultList");
+ if(resultList != null && StringUtils.isNotBlank(resultList.toString())) {
+ ScheduleSuggestRespDTO suggestDto = new ScheduleSuggestRespDTO();
+ suggestDto.setTitle("化产蒸汽消耗异常溯源");
+ suggestDto.setContent(resultList.toString());
+ suggestDto.setScheduleObj("HCZQXH_YCSY");
+ suggestDto.setScheduleTime(dto.getScheduleTime());
+ suggestDto.setCreateTime(new Date());
+ mcsApi.createScheduleSuggest(suggestDto);
}
}
} catch (Exception ex) {
- logger.error("runDayScheduleModuleTask运行异常");
- ex.printStackTrace();
+ logger.error("runDayScheduleModuleTask运行异常",ex);
}
logger.info("runDayScheduleModuleTask运行完成");
}
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunScheduleModuleTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunScheduleModuleTask.java
index 732ee2c..6efefe3 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunScheduleModuleTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunScheduleModuleTask.java
@@ -250,8 +250,7 @@
}
} catch (Exception ex) {
- logger.error("runScheduleModuleTask运行异常");
- ex.printStackTrace();
+ logger.error("runScheduleModuleTask运行异常",ex);
}
logger.info("runScheduleModuleTask运行完成");
}
--
Gitblit v1.9.3