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/RunCokingTraceModelLJTask.java | 139 +++++++++++++++++++++++++++-------------------
1 files changed, 81 insertions(+), 58 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..9ee62a9 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
@@ -9,17 +9,18 @@
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.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;
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.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -50,19 +51,13 @@
private CokingTraceIndService cokingTraceIndService;
@Autowired
- private CokingTraceConfService cokingTraceConfService;
-
- @Autowired
private CokingTraceChartService cokingTraceChartService;
@Autowired
private McsApi mcsApi;
@Autowired
- private DataPointApi dataPointApi;
-
- @Autowired
- private IndItemApi indItemApi;
+ private MdkApi mdkApi;
private final static String process = "炼焦工序";
@@ -72,36 +67,25 @@
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 final static String cokeRow = "cokeRow";
- 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 static final String jsonStr = "{\n" +
+ "\"result\": {\n" +
+ "\"cokeElec\":[583562.4]," +
+ "\"cokeHeat1\":[130820.4,136710.3]," +
+ "\"cokeRow0\":[[0.0,13.6],[2.0,10.5],[69.0,34.6]]," +
+ "\"cokeIndex\":[[0.0149,0.0148],[23.6,24.5],[1350.2,1423.5],[1.21,1.25],[0.28],[103542.3,135238.5],[104668.63,137826.5],[155678.2]]," +
+ "\"cokeRow1\":[[0.0,12.51],[81.0,34.3],[69.0,42.3],[86.0,56.4],[92.0,89.4]]," +
+ "\"cokeRow2\":[[0.0,45.3],[9.0,42.5],[81.0,31.2],[88.0,16.3]]," +
+ "\"cokeHeat2\":[135220.3,134720.3]," +
+ "\"cokeCOG2\":[64525.8,64824.2]," +
+ "\"cokeHomeIndex\":[[90.4,90.2],[80.3,78.5],[103.6,100.3],[280.9,270.4]]," +
+ "\"cokeHomeIndexInfo\":\"2025-04-28 甲班 吨焦耗热量异常\"," +
+ "\"cokeCOG1\":[64435.5,64532.6]," +
+ "\"cokeHomePage\":[[124439.4,124428.4],[320.6],[224.3],[248305.4],[124436.2],[3.96],[0.43]]," +
+ "\"cokeTotal\":\"炼焦吨焦耗热量因煤气流量偏高、煤气水分偏低而增加23，经模型计算，延建议调整煤气流量，预计可使吨焦耗热量指标降低17\"" +
+ " }" +
+ "}";
@Override
public void run(String params) {
@@ -151,7 +135,7 @@
// 保存报告
String analyDate = DateUtils.format(startDate);
- String analyContent = result.getString("coalIndexInfo");
+ String analyContent = result.getString("cokeHomeIndexInfo");
String relId = cokingTraceReportService.save(process, reportName, analyDate, analyClass, clock, analyContent);
// 保存一级分析指标
@@ -196,27 +180,64 @@
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);
+
+ List<String> coalRowKeys = new ArrayList<>();
+ result.forEach((key, value) -> {
+ if (StringUtils.isNotBlank(key) && key.contains(cokeRow)) {
+ coalRowKeys.add(key);
}
+
+ });
+
+ List<CokingTraceDeviationEntity> entityList = new ArrayList<>();
+ for (String key : coalRowKeys) {
+ JSONArray rowArr = JSON.parseArray(result.get(key).toString());
+ if (CollectionUtils.isEmpty(rowArr)) {
+ continue;
+ }
+ CokingTraceDeviationEntity entity = new CokingTraceDeviationEntity();
+ entity.setRelId(relId);
+ entity.setProcess(process);
+ entity.setClock(clock);
+ entity.setSugObj(SugObj);
+
+ 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(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(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(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(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(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(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("");
+ }
+ entityList.add(entity);
}
+
+ cokingTraceDeviationService.save(entityList);
}
public void saveAnalyInd(String relId, String process, String analyDate, String analyClass, String analyContent) {
@@ -236,6 +257,8 @@
analyIndEntity.setSort(i + 1);
entityList.add(analyIndEntity);
}
+ // 清理旧数据
+ cokingAnalyIndService.delete(process, analyDate, analyClass);
cokingAnalyIndService.save(entityList);
}
}
\ No newline at end of file
--
Gitblit v1.9.3