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/RunCokingTraceModelBMTask.java | 70 ++++++++++++++---------------------
1 files changed, 28 insertions(+), 42 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java
index c4463de..640ca1d 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java
@@ -10,6 +10,9 @@
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.MdkScheduleReqDTO;
+import com.iailab.module.model.api.mdk.dto.MdkScheduleRespDTO;
+import com.iailab.module.model.api.mdk.dto.StScheduleRecordVO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -66,24 +69,9 @@
private final static String indType = "备煤工序异常溯源";
- private final static String row = "coalRow";
-
- private final static String total = "coalPrepElecTotal1";
-
- private static final String jsonStr = "{\n" + " " +
- "\"result\": {\n" +
- "\"coalHomeIndexInfo\":\"备煤耗电偏高\"," +
- "\"coalPrepElec\":[1600.8,1613.5]," +
- "\"coalPrepElecTotal1\":\"备煤耗电量偏高，经模型计算，原因和调整建议如下：煤量异常，当前值2000, 建议调整煤量至区间[765.0,1020.0]\"," +
- "\"coalPrepElecTime\":[[0.3,0.3],[1700.31,1900.2],[120.3]]," +
- "\"coalPrepElecIndex\":[133527.2,283517.6,83451.5,233461.2,83564.4]," +
- "\"coalRow0\":[[0.0,1000.3],[1.0,120.2],[7.0,1150.32]]," +
- "\"coalRow1\":[[0.0,1000.5],[2.0,200.56],[7.0,120.2]]," +
- "\"coalRow2\":[[0.0,1000.6],[3.0,261.7],[7.0,170.52]]," +
- "\"coalPrepElecHomePage\":[503000.6,84.04]," +
- "\"coalHomeIndex\":[30.0,4.6,523000.6]" +
- " }" +
- "}";
+ private String scheduleCode = "";
+ private final String finalResultStrKey = "finalResultStr";
+ private final String resultListKey = "resultList";
@Override
public void run(String params) {
@@ -104,20 +92,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;
@@ -125,24 +113,25 @@
// 保存报告
String analyDate = DateUtils.format(startDate);
- String analyContent = clock + " " + result.getString("coalHomeIndexInfo");
- 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);
// 保存溯源折线图
- save(relId, clock, indType, startDate, endDate);
+ saveTraceChart(relId, clock, indType, startDate, endDate);
} catch (Exception ex) {
logger.error("RunCokingTraceModelBMTask运行异常");
@@ -151,7 +140,7 @@
logger.info("RunCokingTraceModelBMTask运行完成");
}
- public void save(String relId, String clock, String indType, Date startDate, Date endDate) {
+ public void saveTraceChart(String relId, String clock, String indType, Date startDate, Date endDate) {
logger.info("查询需要保存chart的配置");
Calendar calendar = Calendar.getInstance();
@@ -165,7 +154,6 @@
Map<String, Object> map = new HashMap<>();
map.put("indType", indType);
map.put("ext1", "chart");
- map.put("ext2", "chart2");
List<CokingTraceConfEntity> list = cokingTraceConfService.list(map);
if (CollectionUtils.isEmpty(list)) {
return;
@@ -174,8 +162,7 @@
List<CokingTraceChartEntity> entityList = new ArrayList<>();
- List<CokingTraceConfEntity> listMin = list.stream().filter(e -> e.getExt1().equals("chart")).collect(Collectors.toList());
- logger.info("listMin===", JSON.toJSON(listMin).toString());
+ List<CokingTraceConfEntity> listMin = list.stream().filter(e -> e.getIndCode().equals("BMSY025")).collect(Collectors.toList());
listMin.forEach(value -> {
CokingTraceChartEntity cokingTraceChartEntity = new CokingTraceChartEntity();
@@ -190,8 +177,7 @@
entityList.add(cokingTraceChartEntity);
});
- List<CokingTraceConfEntity> listMonth = list.stream().filter(e -> e.getExt2().equals("chart2")).collect(Collectors.toList());
- logger.info("listMonth===", JSON.toJSON(listMonth).toString());
+ List<CokingTraceConfEntity> listMonth = list.stream().filter(e -> e.getIndCode().equals("BMSY026")).collect(Collectors.toList());
listMonth.forEach(value -> {
CokingTraceChartEntity cokingTraceChartEntity = new CokingTraceChartEntity();
--
Gitblit v1.9.3