From af2d5942652584c65579894c4a4a680bc37dad20 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期六, 08 二月 2025 15:29:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleOnaOptTask.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 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 365de8a..f33f03d 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
@@ -82,14 +82,13 @@
}
schemeMap.clear();
Map<String, MdkScheduleRespDTO> resultMap = new HashMap<String, MdkScheduleRespDTO>();
- schemeList.forEach(item -> {
- schemeMap.put(item.getCode(), item);
- StScheduleSchemeDTO scheme = schemeList.get(0);
+ schemeList.forEach(scheme -> {
+ schemeMap.put(scheme.getCode(), scheme);
MdkScheduleReqDTO dto = new MdkScheduleReqDTO();
dto.setScheduleTime(scheduleTime);
dto.setScheduleCode(scheme.getCode());
MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(dto);
- resultMap.put(item.getCode(), mdkScheduleRespDTO);
+ resultMap.put(scheme.getCode(), mdkScheduleRespDTO);
});
if (CollectionUtils.isEmpty(resultMap)) {
logger.info("resultMap为空");
@@ -104,17 +103,25 @@
if (entry.getKey().equals(CODE06)) {
// 氧气班平衡计划，建议值写入测点
mdkApi.scheduleModelOut(entry.getValue());
+ logger.info("氧气班平衡计划下发参数: {}", entry.getValue());
} else if (entry.getKey().equals(CODE05)) {
String scheduleObj = schemeMap.get(CODE05).getScheduleObj();
- // double[] adviceValues = (double[]) entry.getValue().getResult().get("adviceValues");
- String yingdiAdvice = entry.getValue().getResult().get("yingdiAdvice").toString();
- saveScheduleSuggest("盈德中压建议调整量", yingdiAdvice, scheduleObj, scheduleTime);
String faAdvice = entry.getValue().getResult().get("faAdvice").toString();
- saveScheduleSuggest("法夜空建议调整量", faAdvice, scheduleObj, scheduleTime);
String hongAdvice = entry.getValue().getResult().get("hongAdvice").toString();
- saveScheduleSuggest("宏昌建议调整量", hongAdvice, scheduleObj, scheduleTime);
String runAdvice = entry.getValue().getResult().get("RunAdvice").toString();
- saveScheduleSuggest("宏昌建议调整量", runAdvice, scheduleObj, scheduleTime);
+ String yingdiAdvice = entry.getValue().getResult().get("yingdiAdvice").toString();
+ if(!yingdiAdvice.equals("压力正常")){
+ saveScheduleSuggest("盈德中压建议调整量", yingdiAdvice, scheduleObj, scheduleTime);
+ }
+ if(!faAdvice.equals("压力正常")){
+ saveScheduleSuggest("法夜空建议调整量", faAdvice, scheduleObj, scheduleTime);
+ }
+ if(!hongAdvice.equals("压力正常")){
+ saveScheduleSuggest("宏昌建议调整量", hongAdvice, scheduleObj, scheduleTime);
+ }
+ if(!runAdvice.equals("压力正常")){
+ saveScheduleSuggest("润忠建议调整量", runAdvice, scheduleObj, scheduleTime);
+ }
} else if (entry.getKey().equals(CODE01)) {
String scheduleObj = schemeMap.get(CODE01).getScheduleObj();
String advice = entry.getValue().getResult().get("advice").toString();
--
Gitblit v1.9.3