From c62385d175e4321c07a889dc4c982115fce807da Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 05 五月 2025 18:38:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java | 124 ++++++++++++++++++++++++++---------------
1 files changed, 78 insertions(+), 46 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 b62563e..7582390 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
@@ -4,15 +4,14 @@
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.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.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.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;
@@ -21,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -56,6 +56,9 @@
@Autowired
private McsApi mcsApi;
+ @Autowired
+ private MdkApi mdkApi;
+
private final static String process = "化产工序";
private final static String reportName = "化产工序异常溯源";
@@ -64,31 +67,21 @@
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 final static String chemProdRow = "chemProdRow";
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" + " }" + "}";
+ "\"chemProdHomePage\":[1782.7,0.8]," +
+ "\"chemProdElec\":[794680.52]," +
+ "\"chemProdIndex\":[16.3,2.57,0.017,0.745,658731.5]," +
+ "\"chemProdRow0\":[[0.0,42.3],[5.0,1342.5],[10.0,122.5]]," +
+ "\"chemProdRow1\":[[0.0,42.3],[7.0,12.5],[9.0,17.45]]," +
+ "\"chemProdRow2\":[[0.0,42.3],[12.0,23.5],[35.0,54.33]]," +
+ "\"chemProdSteam\":[46.3]," +
+ "\"chemProdTotal\":\"蒸汽消耗量异常，经模型计算，原因和调整建议如下：电捕绝缘箱温度异常，当前值190，建议调整电捕绝缘箱温度至区间[80,110], 蒸氨塔塔顶温度异常，当前值190，建议调整蒸氨塔塔顶温度至区间[101,103]\"," +
+ "\"chemProdHomeIndexInfo\":\"2025-04-28 甲班 化产蒸汽消耗量异常\""+
+ " }" +
+ "}";
@Override
public void run(String params) {
@@ -183,27 +176,64 @@
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<String> coalRowKeys = new ArrayList<>();
+ result.forEach((key, value) -> {
+ if (StringUtils.isNotBlank(key) && key.contains(chemProdRow)) {
+ 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) {
@@ -223,6 +253,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