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/RunCokingTraceModelLJTask.java | 192 ++++++++++-------------------------------------
1 files changed, 42 insertions(+), 150 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java
index ce57dff..0262cc0 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java
@@ -1,27 +1,24 @@
package com.iailab.module.ansteel.job.task;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.iailab.framework.common.util.date.DateUtils;
-import com.iailab.module.ansteel.coking.entity.CokingAnalyIndEntity;
-import com.iailab.module.ansteel.coking.entity.CokingTraceDeviationEntity;
-import com.iailab.module.ansteel.coking.entity.CokingTraceSuggestEntity;
import com.iailab.module.ansteel.coking.service.*;
import com.iailab.module.ansteel.common.constant.CommonConstant;
-import com.iailab.module.data.api.ind.IndItemApi;
-import com.iailab.module.data.api.point.DataPointApi;
+import com.iailab.module.ansteel.common.enums.TraceProcessTypeEnum;
import com.iailab.module.model.api.mcs.McsApi;
-import com.iailab.module.model.api.mcs.dto.ChartParamDTO;
-import org.apache.commons.lang3.StringUtils;
+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.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
/**
* 炼焦工序-异常溯源
@@ -50,21 +47,12 @@
private CokingTraceIndService cokingTraceIndService;
@Autowired
- private CokingTraceConfService cokingTraceConfService;
-
- @Autowired
private CokingTraceChartService cokingTraceChartService;
@Autowired
private McsApi mcsApi;
- @Autowired
- private DataPointApi dataPointApi;
-
- @Autowired
- private IndItemApi indItemApi;
-
- private final static String process = "炼焦工序";
+ private final static String process = TraceProcessTypeEnum.LJ.getProcess();
private final static String reportName = "炼焦工序异常溯源";
@@ -72,36 +60,9 @@
private final static String indType = "炼焦工序异常溯源";
- private static final HashMap<String, Object> cokeColoumMap = new HashMap<String, Object>() {{
- put("cokeColoum0", "一级指标-偏差值");
- put("cokeColoum1", "二级指标-偏差值");
- put("cokeColoum2", "影响因素1-偏差值");
- put("cokeColoum3", "影响因素2-偏差值");
- put("cokeColoum4", "影响因素3-偏差值");
- put("cokeColoum5", "影响因素n-偏差值");
- }};
-
- private static final HashMap<String, Object> historyPointMap = new HashMap<String, Object>() {{
- put("F0000101009", "荒煤气发生");
- put("F0000101009", "耗热量");
- }};
-
- private static final String jsonStr = "{\n" + " " +
- "\"result\": {\n" + " " +
- "\"cokeCOG\":[100.5,99.8],\n" + " " +
- "\"cokeHeat\":[3.7,3.8],\n" + " " +
- "\"cokeIndex\":[[0.8,0.7],[608,608],[1440,1460],[1346,1293],[0.8,0.7],[1372,1293]],\n" + " " +
- "\"cokeTotal\":\"炼焦吨焦耗热量因煤气流量偏高、煤气水分偏低而增加23，经模型计算，延建议调整煤气流量，预计可使吨焦耗热量指标降低17\",\n" + " " +
- "\"cokeColoum0\":[[0,13],[0,42],[0,34]],\n" + " " +
- "\"cokeColoum1\":[[13,12],[12,34],[24,42]],\n" + " " +
- "\"cokeColoum2\":[[27,45],[58,42],[70,31]],\n" + " " +
- "\"cokeColoum3\":[[108,56],[110,89],[185,21]],\n" + " " +
- "\"cokeColoum4\":[[199,13],[200,51],[197,34]],\n" + " " +
- "\"cokeColoum5\":[[147,33],[131,12],[122,13]],\n" + " " +
- "\"cokeHomePage\":[[202,42],[203,13],[204,45],[205,34],[206,17]],\n" + " " +
- "\"cokeHomeIndex\":[[90.4,90.2],[80.3,78],[103,100],[280,270]],\n" + " " +
- "\"cokeHomeIndexInfo\":\"2月18日甲班：吨焦耗热量异常\",\n" + " " +
- "\"cokeHomeErr\":\"2月18日煤气预热器前数据异常（无数据）\"\n" + " " + "}\n" + "}";
+ private String scheduleCode = "lianjiaoguankong"; //焦化炼焦管控模型
+ private final String finalResultStrKey = "finalResultStr";
+ private final String resultListKey = "resultList";
@Override
public void run(String params) {
@@ -111,39 +72,31 @@
calendar.set(Calendar.MILLISECOND, 0);
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MINUTE, 0);
- int hour = calendar.get(Calendar.HOUR_OF_DAY);
- Date startDate = calendar.getTime();
+
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
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 = "丙班";
+ calendar.add(Calendar.DAY_OF_YEAR, -1);
+ Date startDate = calendar.getTime();
+ String clock = DateUtils.format(startDate);
+
+ calendar.add(Calendar.DAY_OF_YEAR, 1);
+ calendar.add(Calendar.MINUTE, -3);
+ Date collectStartDate = calendar.getTime();
+
+ // 查询模型结果
+ 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;
@@ -151,20 +104,22 @@
// 保存报告
String analyDate = DateUtils.format(startDate);
- String analyContent = result.getString("coalIndexInfo");
- String relId = cokingTraceReportService.save(process, reportName, analyDate, analyClass, clock, analyContent);
+ String analyContent = "炼焦异常";
+ String relId = cokingTraceReportService.save(process, reportName, analyDate, clock, analyContent);
// 保存一级分析指标
- saveAnalyInd(relId, process, analyDate, analyClass, analyContent);
+ cokingAnalyIndService.saveAnalyInd(relId, process, analyDate, analyContent);
// 保存优化建议
- saveTraceSuggest(relId, process, clock, result);
+ String suggest = result.getString(finalResultStrKey);
+ cokingTraceSuggestService.saveTraceSuggest(relId, process, clock, suggest, SugObj);
// 保存偏差值
- saveTraceDeviation(relId, process, clock, result);
+ String jsonString = result.getString(resultListKey);
+ cokingTraceDeviationService.saveTraceDeviation(relId, process, clock, jsonString, SugObj);
// 保存溯源指标
- cokingTraceIndService.saveTraceInd(relId, indType, clock);
+ cokingTraceIndService.saveTraceInd(relId, indType, clock, collectStartDate, endDate);
// 保存溯源折线图
cokingTraceChartService.save(relId, clock, indType, startDate, endDate);
@@ -174,68 +129,5 @@
ex.printStackTrace();
}
logger.info("RunCokingTraceModelLJTask运行完成");
- }
-
- public void saveTraceSuggest(String relId, String process, String clock, JSONObject result) {
- String cokeTotal = result.get("cokeTotal").toString();
- if (StringUtils.isBlank(cokeTotal)) {
- logger.info("cokeTotal is null");
- return;
- }
- CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity();
- suggestEntity.setRelId(relId);
- suggestEntity.setProcess(process);
- suggestEntity.setSugObj(SugObj);
- suggestEntity.setClock(clock);
- suggestEntity.setContent(cokeTotal);
- suggestEntity.setCreateDate(new Date());
- cokingTraceSuggestService.save(suggestEntity);
- }
-
- @Transactional
- public void saveTraceDeviation(String relId, String process, String clock, JSONObject result) {
- List<ChartParamDTO> list = mcsApi.getChartParamList(CommonConstant.COKE_INDEX_CHARTCODE);
- Map<String, String> steamIndexMaps = list.stream().collect(Collectors.toMap(ChartParamDTO::getParamCode, e -> e.getParamName()));
- for (int i = 0; i <= 5; i++) {
- String cokeColoum = result.get("cokeColoum" + i).toString();
- if (StringUtils.isNotBlank(cokeColoum)) {
- JSONArray responseArr = JSON.parseArray(cokeColoum);
- List<CokingTraceDeviationEntity> entityList = new ArrayList<>();
- for (int j = 0; j < responseArr.size(); j++) {
- JSONArray element = JSON.parseArray(responseArr.get(j).toString());
- CokingTraceDeviationEntity deviationEntity = new CokingTraceDeviationEntity();
- deviationEntity.setRelId(relId);
- deviationEntity.setProcess(process);
- deviationEntity.setClock(clock);
- deviationEntity.setSugObj(SugObj);
- deviationEntity.setGroupName(cokeColoumMap.get("cokeColoum" + i).toString());
- deviationEntity.setIndName(steamIndexMaps.get(element.get(0).toString()));
- deviationEntity.setIndValue(element.get(1).toString());
- deviationEntity.setCreateDate(new Date());
- entityList.add(deviationEntity);
- }
- cokingTraceDeviationService.save(entityList);
- }
- }
- }
-
- public void saveAnalyInd(String relId, String process, String analyDate, String analyClass, String analyContent) {
- if (StringUtils.isBlank(analyContent)) {
- logger.info("analyContent is null");
- return;
- }
- String[] analyContentArr = analyContent.split(";");
- List<CokingAnalyIndEntity> entityList = new ArrayList<>();
- for (int i = 0; i < analyContentArr.length; i++) {
- CokingAnalyIndEntity analyIndEntity = new CokingAnalyIndEntity();
- analyIndEntity.setRelId(relId);
- analyIndEntity.setAnalyType(process);
- analyIndEntity.setAnalyDate(analyDate);
- analyIndEntity.setAnalyClass(analyClass);
- analyIndEntity.setAnalyContent(analyContentArr[i]);
- analyIndEntity.setSort(i + 1);
- entityList.add(analyIndEntity);
- }
- cokingAnalyIndService.save(entityList);
}
}
\ No newline at end of file
--
Gitblit v1.9.3