From 92dd2a69b3c53a46b5e92fc9d8303df4ba2276b9 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期二, 29 四月 2025 17:23:18 +0800
Subject: [PATCH] 定时任务修改
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java | 90 +++++++++++++++++++-------------------------
1 files changed, 39 insertions(+), 51 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java
index 700f866..40733e5 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java
@@ -11,6 +11,7 @@
import com.iailab.module.ansteel.common.constant.CommonConstant;
import com.iailab.module.model.api.mcs.McsApi;
import com.iailab.module.model.api.mcs.dto.ChartParamDTO;
+import com.iailab.module.model.api.mdk.MdkApi;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -19,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -52,6 +54,9 @@
@Autowired
private McsApi mcsApi;
+ @Autowired
+ private MdkApi mdkApi;
+
private final static String process = "干熄焦工序";
private final static String reportName = "干熄焦工序异常溯源";
@@ -60,42 +65,23 @@
private final static String steamRow = "steamRow";
- private static final HashMap<String, Object> steamFirstColoumMap = new HashMap<String, Object>() {{
- put("steamFirstColoum0", "一级指标-偏差值");
- put("steamFirstColoum1", "二级指标-偏差值");
- put("steamFirstColoum2", "影响因素1-偏差值");
- put("steamFirstColoum3", "影响因素2-偏差值");
- put("steamFirstColoum4", "影响因素3-偏差值");
- put("steamFirstColoum5", "影响因素n-偏差值");
- }};
-
- private static final HashMap<String, Object> steamSecondColoumMap = new HashMap<String, Object>() {{
- put("steamSecondColoum0", "一级指标-偏差值");
- put("steamSecondColoum1", "二级指标-偏差值");
- put("steamSecondColoum2", "影响因素1-偏差值");
- put("steamSecondColoum3", "影响因素2-偏差值");
- put("steamSecondColoum4", "影响因素3-偏差值");
- put("steamSecondColoum5", "影响因素n-偏差值");
- }};
+ private final static String SugObj = "GXJ";
private static final String jsonStr="{\"result\":{" +
- " \"steamTotal\":\"2#干熄焦蒸汽发生量因空气导入量偏高、锅炉入口温度偏低而减少13t，经模型计算，建议调整空气导入量，预计可使主蒸汽流量指标升高20m3/h\",\n" +
- " \"steamRow0\":[[14,20],[14,30],[14,35]],\n" +
- " \"steamRow1\":[[10,5],[11,15],[21,20]],\n" +
- " \"steamRow2\":[[74,8],[36,18],[35,34]],\n" +
- " \"steamRow3\":[[24,67],[6,12],[19,21]],\n" +
- " \"steamRow4\":[[21,19],[22,31],[8,42]],\n" +
- " \"steamRow5\":[[11,45],[9,62],[18,34]],\n" +
- " \"steamSecondColoum0\":[[14,20],[14,50],[14,13]],\n" +
- " \"steamSecondColoum1\":[[11,27],[10,35],[22,16]],\n" +
- " \"steamSecondColoum2\":[[36,90],[35,34],[74,55]],\n" +
- " \"steamSecondColoum3\":[[6,66],[19,73],[21,31]],\n" +
- " \"steamSecondColoum4\":[[22,65],[8,22],[21,67]],\n" +
- " \"steamSecondColoum5\":[[9,29],[11,56],[18,61]],\n" +
- " \"steamHomePage\":[[663,617],[66.5,68.9]],\n" +
- " \"steamHomeIndex\":[[90.4,90.2],[80.3,78],[103,100],[280,270]],\n" +
- " \"steamHomeIndexInfo\":\"4月25日甲班：干熄焦产蒸汽量异常\",\n" +
- " \"steamHomeErr\":\"4月25日循环风机转速数据异常（无数据）\"}}";
+ " \"steamProd\":[[0.038,0.036],[0.035,0.036],[0.037,0.034]]," +
+ "\"steamRow0\":[[14.0,20.7],[14.0,30.5],[14.0,35.2],[24.0,67.9],[6.0,12.3]]," +
+ "\"steamRow1\":[[10.0,5.5],[11.0,15.1],[21.0,20.6],[22.0,31.3],[8.0,42.5]]," +
+ "\"steamRow2\":[[74.0,8.2],[36.0,18.2],[35.0,34.6],[9.0,62.4],[18.0,34.7]]," +
+ "\"steamPressure\":[3.7,3.6,3.4]," +
+ "\"steamHomePage\":[[220.4,223.5],[0.5],[673214.3]]," +
+ "\"steamHomeIndexInfo\":\"2025-04-28 甲班 干熄焦产蒸汽量异常\"," +
+ "\"steamTemperature\":[461.3,460.4,456.6]," +
+ "\"steamElec\":[233564.3,224571.7,246120.2,603157.7]," +
+ "\"steamIndex\":[[3.182,3.265,3.275],[1250.3,1293.1,1264.05],[890.3,886.32,901.21],[161495.2,171043.5,168533.6],[203667.2,238742.6,226731.7],[223548.3,223097.9,226733.3]]," +
+ "\"steamTotal1\":\"2#干熄焦蒸汽发生量因空气导入量偏高、锅炉入口温度偏低而减少13t，经模型计算，建议调整空气导入量，预计可使主蒸汽流量指标升高20m3/h\"," +
+ "\"steamHomeIndex\":[[63.2,61.7],[62.8,67.2],[66.1,65.7],[204.6,220.5]]" +
+ " }" +
+ "}";
@Override
public void run(String params) {
@@ -107,37 +93,39 @@
calendar.set(Calendar.MINUTE, 0);
int hour = calendar.get(Calendar.HOUR_OF_DAY);
Date startDate = calendar.getTime();
- Date endDate = calendar.getTime();
String clock = "";
String analyClass = "";
if (hour >= 8 && hour < 16) {
calendar.set(Calendar.HOUR_OF_DAY, 0);
startDate = calendar.getTime();
- calendar.add(Calendar.HOUR_OF_DAY, 8);
- endDate = calendar.getTime();
clock = DateUtils.format(startDate).concat("-").concat("A");
analyClass = "甲班";
} else if (hour >= 16 && hour < 24) {
calendar.set(Calendar.HOUR_OF_DAY, 8);
startDate = calendar.getTime();
- calendar.add(Calendar.HOUR_OF_DAY, 8);
- endDate = calendar.getTime();
clock = DateUtils.format(startDate).concat("-").concat("B");
analyClass = "乙班";
} else if (hour >= 0 && hour < 8) {
calendar.add(Calendar.DAY_OF_YEAR, -1);
calendar.set(Calendar.HOUR_OF_DAY, 16);
startDate = calendar.getTime();
- calendar.add(Calendar.HOUR_OF_DAY, 8);
- endDate = calendar.getTime();
clock = DateUtils.format(startDate).concat("-").concat("B");
analyClass = "丙班";
}
// 调用模型
+/* MdkScheduleReqDTO dto = new MdkScheduleReqDTO();
+ dto.setScheduleTime(calendar.getTime());
+ dto.setScheduleCode(params);
+ MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(dto);
+ logger.info(params + "调度方案执行完成，" + mdkScheduleRespDTO);
+ Map<String, Object> result = mdkScheduleRespDTO.getResult();
+
+ JSONObject jsonObject = new JSONObject(result);
+ JSONObject result2 = (JSONObject) JSON.toJSON(jsonObject.get("result"));*/
+
JSONObject jsonObject = JSONObject.parseObject(jsonStr);
JSONObject result = (JSONObject) JSON.toJSON(jsonObject.get("result"));
-
if (Objects.isNull(result)) {
logger.info("模型结果为空");
return;
@@ -170,7 +158,7 @@
public void saveTraceSuggest(String relId, String process, String clock, JSONObject result) {
List<CokingTraceSuggestEntity> entityList = new ArrayList<>();
- String steamTotal = result.get("steamTotal").toString();
+ String steamTotal = result.get("steamTotal1").toString();
if(StringUtils.isNotBlank(steamTotal)){
CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity();
suggestEntity.setRelId(relId);
@@ -208,38 +196,38 @@
entity.setRelId(relId);
entity.setProcess(process);
entity.setClock(clock);
- entity.setSugObj("GXJ");
+ entity.setSugObj(SugObj);
- entity.setInd1Name(steamIndexMaps.get(rowArr.getJSONArray(0).get(0).toString()));
+ entity.setInd1Name(steamIndexMaps.get(new BigDecimal(rowArr.getJSONArray(0).get(0).toString()).setScale(0,BigDecimal.ROUND_HALF_UP).toString()));
entity.setInd1Value(rowArr.getJSONArray(0).get(1).toString());
entity.setInd1Unit("");
- entity.setInd2Name(steamIndexMaps.get(rowArr.getJSONArray(1).get(0).toString()));
+ entity.setInd2Name(steamIndexMaps.get(new BigDecimal(rowArr.getJSONArray(1).get(0).toString()).setScale(0,BigDecimal.ROUND_HALF_UP).toString()));
entity.setInd2Value(rowArr.getJSONArray(1).get(1).toString());
entity.setInd2Unit("");
if (rowArr.size() > 2) {
- entity.setFac1Name(steamIndexMaps.get(rowArr.getJSONArray(2).get(0).toString()));
+ entity.setFac1Name(steamIndexMaps.get(new BigDecimal(rowArr.getJSONArray(2).get(0).toString()).setScale(0,BigDecimal.ROUND_HALF_UP).toString()));
entity.setFac1Value(rowArr.getJSONArray(2).get(1).toString());
entity.setFac1Unit("");
}
if (rowArr.size() > 3) {
- entity.setFac2Name(steamIndexMaps.get(rowArr.getJSONArray(3).get(0).toString()));
+ entity.setFac2Name(steamIndexMaps.get(new BigDecimal(rowArr.getJSONArray(3).get(0).toString()).setScale(0,BigDecimal.ROUND_HALF_UP).toString()));
entity.setFac2Value(rowArr.getJSONArray(3).get(1).toString());
entity.setFac2Unit("");
}
if (rowArr.size() > 4) {
- entity.setFac3Name(steamIndexMaps.get(rowArr.getJSONArray(4).get(0).toString()));
+ entity.setFac3Name(steamIndexMaps.get(new BigDecimal(rowArr.getJSONArray(4).get(0).toString()).setScale(0,BigDecimal.ROUND_HALF_UP).toString()));
entity.setFac3Value(rowArr.getJSONArray(4).get(1).toString());
entity.setFac3Unit("");
}
if (rowArr.size() > 5) {
- entity.setFac4Name(steamIndexMaps.get(rowArr.getJSONArray(5).get(0).toString()));
+ entity.setFac4Name(steamIndexMaps.get(new BigDecimal(rowArr.getJSONArray(5).get(0).toString()).setScale(0,BigDecimal.ROUND_HALF_UP).toString()));
entity.setFac4Value(rowArr.getJSONArray(5).get(1).toString());
entity.setFac4Unit("");
}
if (rowArr.size() > 6) {
- entity.setFac5Name(steamIndexMaps.get(rowArr.getJSONArray(6).get(0).toString()));
+ entity.setFac5Name(steamIndexMaps.get(new BigDecimal(rowArr.getJSONArray(6).get(0).toString()).setScale(0,BigDecimal.ROUND_HALF_UP).toString()));
entity.setFac5Value(rowArr.getJSONArray(6).get(1).toString());
entity.setFac5Unit("");
}
--
Gitblit v1.9.3