From dafd58d88b4b7c3993f0c0e82ad875aa1c47832e Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 25 三月 2025 10:40:21 +0800
Subject: [PATCH] 各制氧机组建议
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleOnaOptTask.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 18598ba..5f6a054 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,6 +1,5 @@
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.ScheduleSuggestRespDTO;
import com.iailab.module.model.api.mcs.dto.StScheduleSchemeDTO;
@@ -120,17 +119,10 @@
// 氧气系统优化调度决策
StScheduleSchemeDTO scheduleScheme = schemeMap.get(CODE05);
String scheduleObj = scheduleScheme.getScheduleObj();
- String yingdiAdvice = entry.getValue().getResult().get("yingdiAdvice").toString();
+ /*String yingdiAdvice = entry.getValue().getResult().get("yingdiAdvice").toString();
String faAdvice = entry.getValue().getResult().get("faAdvice").toString();
String hongAdvice = entry.getValue().getResult().get("hongAdvice").toString();
String runAdvice = entry.getValue().getResult().get("runAdvice").toString();
- /*JSONArray adviceValues = JSONArray.parseArray(entry.getValue().getResult().get("adviceValues").toString());
- List<BigDecimal> adviceValueList = new ArrayList<>();
- if (!CollectionUtils.isEmpty(adviceValues)) {
- for (int i = 0; i < adviceValues.size(); i++) {
- adviceValueList.add(new BigDecimal(adviceValues.get(i).toString()));
- }
- }*/
if(!yingdiAdvice.equals("压力正常")){
saveScheduleSuggest("盈德中压调整建议", yingdiAdvice, scheduleObj, scheduleTime);
}
@@ -142,7 +134,15 @@
}
if(!runAdvice.equals("压力正常")){
saveScheduleSuggest("润忠调整建议", runAdvice, scheduleObj, scheduleTime);
+ }*/
+
+ double[][] adviceValues = (double[][])entry.getValue().getResult().get("adviceValues");
+ logger.info("adviceValues=" + Arrays.toString(adviceValues));
+ String advice = entry.getValue().getResult().get("advice").toString();
+ if(!advice.contains("压力正常")){
+ saveScheduleSuggest("各制氧机组建议", advice, scheduleObj, scheduleTime, new BigDecimal(adviceValues[0][0]), scheduleScheme.getAdjustRate());
}
+
} else if (entry.getKey().equals(CODE01)) {
StScheduleSchemeDTO scheduleScheme = schemeMap.get(CODE05);
String scheduleObj = scheduleScheme.getScheduleObj();
@@ -162,6 +162,7 @@
private void saveScheduleSuggest(String title, String content, String scheduleObj, Date scheduleTime) {
if (StringUtils.isBlank(content)) {
+ logger.info(title + "调整值为空，不产生建议");
return;
}
@@ -176,19 +177,20 @@
private void saveScheduleSuggest(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(scheduleObj) && gasAdjustMode.get(scheduleObj).equals(adjustValue.compareTo(BigDecimal.ZERO)) &&
- gasLastSugTime.containsKey(scheduleObj) && (scheduleTime.getTime() - gasLastSugTime.get(scheduleObj).getTime() <= Integer.valueOf(adjustRate).longValue() * 60 * 1000)) {
+ 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(scheduleObj, adjustValue.compareTo(BigDecimal.ZERO));
- gasLastSugTime.put(scheduleObj, scheduleTime);
+ gasAdjustMode.put(title, adjustValue.compareTo(BigDecimal.ZERO));
+ gasLastSugTime.put(title, scheduleTime);
ScheduleSuggestRespDTO suggest = new ScheduleSuggestRespDTO();
suggest.setTitle(title);
--
Gitblit v1.9.3