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/RunCokingTraceModelHCTask.java | 223 +++++++++++++++++++++++--------------------------------
1 files changed, 95 insertions(+), 128 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
index 4731a6a..891d2db 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
@@ -1,24 +1,19 @@
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.*;
+import com.iailab.module.ansteel.coking.entity.CokingTraceChartEntity;
+import com.iailab.module.ansteel.coking.entity.CokingTraceConfEntity;
import com.iailab.module.ansteel.coking.service.*;
import com.iailab.module.ansteel.common.constant.CommonConstant;
-import com.iailab.module.ansteel.common.enums.ProcessConfDataTypeEnum;
-import com.iailab.module.data.api.ind.IndItemApi;
-import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
-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.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.*;
@@ -54,9 +49,12 @@
private CokingTraceChartService cokingTraceChartService;
@Autowired
+ private CokingTraceConfService cokingTraceConfService;
+
+ @Autowired
private McsApi mcsApi;
- private final static String process = "化产工序";
+ private final static String process = TraceProcessTypeEnum.HC.getProcess();
private final static String reportName = "化产工序异常溯源";
@@ -64,30 +62,9 @@
private final static String indType = "化产工序异常溯源";
- private static final HashMap<String, Object> chemProdColoumMap = new HashMap<String, Object>() {{
- put("chemProdFirstColoum0", "一级指标-偏差值");
- put("chemProdFirstColoum1", "二级指标-偏差值");
- put("chemProdFirstColoum2", "影响因素1-偏差值");
- }};
-
- private static final HashMap<String, Object> historyPointMap = new HashMap<String, Object>() {{
- put("F0000101006", "蒸汽消耗");
- put("F0000101006", "初冷器出口煤气温度");
- put("F0000101006", "洗苯塔后煤气含苯");
- put("F0000101006", "脱硫后H2S含量");
- }};
-
- private static final String jsonStr = "{\n" +
- "\"result\":{\n" +
- "\"chemProdSteam\":[[33836,33925]], \n" +
- "\"chemProdIndex\":[[352,355],[68,66.3],[82.5,87.6],[50.7,56.5],[73.5,73.1]],\n" +
- "\"chemProdTotal\":\"蒸汽消耗量异常，当前值1342，经模型计算，指标1异常，当前值1342，建议调整指标1至区间[90,110],指标2异常，当前值1342，建议调整指标2至区间[50,80]\",\n" +
- "\"chemProdFirstColoum0\":[[0,42]],\n" + " \"chemProdFirstColoum1\":[[5,1342],[7,1342],[9,1342]],\n" +
- "\"chemProdFirstColoum2\":[[5,10,1342],[5,16,1342],[7,18,1342]],\n" +
- "\"chemProdHomePage\":[[9,1342],[9,1342]],\n" +
- "\"chemProdHomeIndex\":[[90.4,90.2],[80.3,78],[103,100],[280,270]],\n" +
- "\"chemProdHomeIndexInfo\":\"2月18日甲班：化产蒸汽消耗量异常\",\n" +
- "\"chemProdHomeErr\":\"2月18日化产蒸汽消耗量数据异常（无数据）\"\n" + " }" + "}";
+ private String scheduleCode = "AnSteelChemProSteamTrack"; //焦化化产蒸汽消耗模型
+ private final String finalResultStrKey = "finalResultStr";
+ private final String resultListKey = "resultList";
@Override
public void run(String params) {
@@ -97,39 +74,36 @@
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();
+
+ calendar.add(Calendar.DAY_OF_YEAR, -6);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);//化产折线图用的时间 前七天
+ Date chartStartDate = 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;
@@ -137,23 +111,25 @@
// 保存报告
String analyDate = DateUtils.format(startDate);
- String analyContent = result.getString("chemProdHomeIndexInfo");
- 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);
+ saveTraceChart(relId, clock, indType, chartStartDate, endDate);
} catch (Exception ex) {
logger.error("RunCokingTraceModelHCTask运行异常");
@@ -162,66 +138,57 @@
logger.info("RunCokingTraceModelHCTask运行完成");
}
- public void saveTraceSuggest(String relId, String process, String clock, JSONObject result) {
- String chemProdTotal = result.get("chemProdTotal").toString();
- if (StringUtils.isBlank(chemProdTotal)) {
- logger.info("coalPrepElecTotal1 is null");
+ public void saveTraceChart(String relId, String clock, String indType, Date startDate, Date endDate) {
+ logger.info("查询需要保存chart的配置");
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
+ calendar.set(Calendar.SECOND, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.add(Calendar.DAY_OF_YEAR, -1);
+ Date start = calendar.getTime();
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("indType", indType);
+ map.put("ext1", "chart");
+ List<CokingTraceConfEntity> list = cokingTraceConfService.list(map);
+ if (CollectionUtils.isEmpty(list)) {
return;
}
- CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity();
- suggestEntity.setRelId(relId);
- suggestEntity.setProcess(process);
- suggestEntity.setSugObj(SugObj);
- suggestEntity.setClock(clock);
- suggestEntity.setContent(chemProdTotal);
- suggestEntity.setCreateDate(new Date());
- cokingTraceSuggestService.save(suggestEntity);
- }
+ logger.info("list.size={}", list.size());
- @Transactional
- public void saveTraceDeviation(String relId, String process, String clock, JSONObject result) {
- List<ChartParamDTO> list = mcsApi.getChartParamList(CommonConstant.CHEMPROD_INDEX_CHARTCODE);
- Map<String, String> steamIndexMaps = list.stream().collect(Collectors.toMap(ChartParamDTO::getParamCode, e -> e.getParamName()));
- for (int i = 0; i <= 2; i++) {
- String chemProdFirstColoum = result.get("chemProdFirstColoum" + i).toString();
- if (StringUtils.isNotBlank(chemProdFirstColoum)) {
- JSONArray responseArr = JSON.parseArray(chemProdFirstColoum);
- List<CokingTraceDeviationEntity> cokingTraceDeviationEntities = 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(chemProdColoumMap.get("chemProdFirstColoum" + i).toString());
- deviationEntity.setIndName(steamIndexMaps.get(element.get(0).toString()));
- deviationEntity.setIndValue(element.get(1).toString());
- deviationEntity.setCreateDate(new Date());
- cokingTraceDeviationEntities.add(deviationEntity);
- }
- cokingTraceDeviationService.save(cokingTraceDeviationEntities);
- }
- }
- }
+ List<CokingTraceChartEntity> entityList = new ArrayList<>();
- 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);
+ List<CokingTraceConfEntity> listMin = list.stream().filter(e -> !e.getIndCode().equals("HCSY032")).collect(Collectors.toList());
+
+ listMin.forEach(value -> {
+ CokingTraceChartEntity cokingTraceChartEntity = new CokingTraceChartEntity();
+ cokingTraceChartEntity.setRelId(relId);
+ cokingTraceChartEntity.setName(value.getIndName());
+ cokingTraceChartEntity.setClock(clock);
+ cokingTraceChartEntity.setDataType(value.getDataType());
+ cokingTraceChartEntity.setDataNo(value.getPointNo());
+ cokingTraceChartEntity.setStartTime(startDate);
+ cokingTraceChartEntity.setEndTime(endDate);
+ cokingTraceChartEntity.setCreateDate(new Date());
+ entityList.add(cokingTraceChartEntity);
+ });
+
+ List<CokingTraceConfEntity> listMonth = list.stream().filter(e -> e.getIndCode().equals("HCSY032")).collect(Collectors.toList());
+
+ listMonth.forEach(value -> {
+ CokingTraceChartEntity cokingTraceChartEntity = new CokingTraceChartEntity();
+ cokingTraceChartEntity.setRelId(relId);
+ cokingTraceChartEntity.setName(value.getIndName());
+ cokingTraceChartEntity.setClock(clock);
+ cokingTraceChartEntity.setDataType(value.getDataType());
+ cokingTraceChartEntity.setDataNo(value.getPointNo());
+ cokingTraceChartEntity.setStartTime(start);
+ cokingTraceChartEntity.setEndTime(endDate);
+ cokingTraceChartEntity.setCreateDate(new Date());
+ entityList.add(cokingTraceChartEntity);
+ });
+ cokingTraceChartService.insert(entityList);
}
}
\ No newline at end of file
--
Gitblit v1.9.3