From d75701adae7a2bc5d8c1383164ea85dfa038a8f9 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期五, 27 六月 2025 12:46:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java | 60 +++++++++++++++++++++++++-----------------------------------
1 files changed, 25 insertions(+), 35 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 34efa22..c76e9c2 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
@@ -8,13 +8,16 @@
import com.iailab.module.ansteel.common.enums.TraceProcessTypeEnum;
import com.iailab.module.model.api.mcs.McsApi;
import com.iailab.module.model.api.mdk.MdkApi;
+import com.iailab.module.model.api.mdk.dto.StScheduleRecordVO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import java.util.Calendar;
import java.util.Date;
+import java.util.List;
import java.util.Objects;
/**
@@ -56,30 +59,15 @@
private final static String indType = "干熄焦工序异常溯源";
- private final static String row = "steamRow";
-
- private final static String total = "steamTotal1";
-
private final static String SugObj = "GXJ";
+
+ private String scheduleCode = "AnSteelCDQTrackImplv3"; //焦化干熄焦产蒸汽模型
+ private final String finalResultStrKey = "finalResultStr";
+ private final String resultListKey = "resultList";
@Autowired
private CokingTraceChartService cokingTraceChartService;
- private static final String jsonStr = "{\"result\":{" +
- " \"steamProd\":[[0.76,0.76],[07,0.72],[0.74,0.68]]," +
- "\"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\":\"干熄焦产蒸汽量异常\"," +
- "\"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) {
@@ -100,19 +88,20 @@
calendar.add(Calendar.MINUTE, -3);
Date collectStartDate = calendar.getTime();
- // 调用模型
-// MdkScheduleReqDTO dto = new MdkScheduleReqDTO();
-// dto.setScheduleTime(calendar.getTime());
-// dto.setScheduleCode(params);
-// MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(dto);
-// logger.info(params + "调度方案执行完成，" + mdkScheduleRespDTO);
-//
-// Map<String, Object> tResult = mdkScheduleRespDTO.getResult();
-// JSONObject result = new JSONObject(tResult);
-// logger.info("result===" + JSONObject.toJSONString(result));
+ // 查询模型结果
+ List<StScheduleRecordVO> lastScheduleData = mcsApi.getLastScheduleData(scheduleCode, 1);
+ if (CollectionUtils.isEmpty(lastScheduleData)) {
+ logger.info("模型结果为空");
+ return;
+ }
+ StScheduleRecordVO stScheduleRecordVO = lastScheduleData.get(0);
+ if (stScheduleRecordVO == null) {
+ logger.info("模型结果为空");
+ return;
+ }
+ String jsonStr = stScheduleRecordVO.getResultData();
- JSONObject jsonObject = JSONObject.parseObject(jsonStr);
- JSONObject result = (JSONObject) JSON.toJSON(jsonObject.get("result"));
+ JSONObject result = JSONObject.parseObject(jsonStr);
if (Objects.isNull(result)) {
logger.info("模型结果为空");
return;
@@ -120,18 +109,19 @@
// 保存报告
String analyDate = DateUtils.format(startDate);
- String analyContent = clock + " " + result.getString("steamHomeIndexInfo");
- String content = result.getString(total);
+ String analyContent = "干熄焦异常";
String relId = cokingTraceReportService.save(process, reportName, analyDate, clock, analyContent);
// 保存一级分析指标
cokingAnalyIndService.saveAnalyInd(relId, process, analyDate, analyContent);
// 保存优化建议
- cokingTraceSuggestService.saveTraceSuggest(relId, process, clock, content, SugObj);
+ String suggest = result.getString(finalResultStrKey);
+ cokingTraceSuggestService.saveTraceSuggest(relId, process, clock, suggest, SugObj);
// 保存偏差值
- cokingTraceDeviationService.saveTraceDeviation(relId, process, clock, result, CommonConstant.COKE_INDEX_CHARTCODE, row, SugObj);
+ String jsonString = result.getString(resultListKey);
+ cokingTraceDeviationService.saveTraceDeviation(relId, process, clock, jsonString, SugObj);
// 保存溯源指标
cokingTraceIndService.saveTraceInd(relId, indType, clock, collectStartDate, endDate);
--
Gitblit v1.9.3