From 5c92309910361bb197208ffdd95fd84e531b624a Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 22 四月 2025 16:59:06 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/ansteel

---
 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java |  109 +++++++++++++++++++++++++-----------------------------
 1 files changed, 51 insertions(+), 58 deletions(-)

diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModel3Task.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
similarity index 72%
copy from ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModel3Task.java
copy to ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
index 10e65f8..f887940 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModel3Task.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
@@ -25,14 +25,14 @@
 import java.util.stream.Collectors;
 
 /**
- * 炼焦工序-异常溯源
+ * 化产工序异常溯源
  *
  * @author lirm
  * @Description
- * @createTime 2025年04月21日
+ * @createTime 2025年04月22日
  */
-@Component("runCokingTraceModel3Task")
-public class RunCokingTraceModel3Task implements ITask {
+@Component("runCokingTraceModelHCTask")
+public class RunCokingTraceModelHCTask implements ITask{
     private Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
@@ -65,43 +65,37 @@
     @Autowired
     private IndItemApi indItemApi;
 
-    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> chemProdColoumMap = new HashMap<String, Object>() {{
+        put("chemProdFirstColoum0", "一级指标-偏差值");
+        put("chemProdFirstColoum1", "二级指标-偏差值");
+        put("chemProdFirstColoum2", "影响因素1-偏差值");
     }};
 
     private static final HashMap<String, Object> historyPointMap = new HashMap<String, Object>() {{
-        put("LJSY001", "荒煤气发生");
-        put("LJSY005", "耗热量");
+        put("HCSY001", "蒸汽消耗");
+        put("HCSY020", "初冷器出口煤气温度");
+        put("HCSY021", "洗苯塔后煤气含苯");
+        put("HCSY022", "脱硫后H2S含量");
     }};
 
     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" +
+            "    \"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" +
+            "    }" +
             "}";
 
     @Override
-    @Transactional
     public void run(String params) {
-        logger.info("RunCokingTraceModel3Task,参数为:{}", params);
+        logger.info("RunCokingTraceModelHCTask,参数为:{}", params);
         try {
             Calendar calendar = Calendar.getInstance();
             calendar.set(Calendar.MILLISECOND, 0);
@@ -109,11 +103,10 @@
             calendar.set(Calendar.MINUTE,0);
             calendar.add(Calendar.DAY_OF_YEAR, -1);
             String yesterday = DateUtils.format(calendar.getTime(), DateUtils.FORMAT_YEAR_MONTH_DAY);
-//            int hour = calendar.get(Calendar.HOUR_OF_DAY);
+            int hour = calendar.get(Calendar.HOUR_OF_DAY);
             Date startDate = calendar.getTime();
             calendar.add(Calendar.HOUR, 8);
             Date endDate = calendar.getTime();
-            int hour = 8;
             String clock = "";
             String analyClass = "";
             if (hour == 0) {
@@ -128,12 +121,12 @@
             }
             Map<String, Object> tMap = new HashMap<>();
             tMap.put("relId", UUID.randomUUID().toString());
-            tMap.put("process", "炼焦工序");
-            tMap.put("reportName", "炼焦工序");
+            tMap.put("process", "化产工序");
+            tMap.put("reportName", "化产工序");
             tMap.put("analyDate", yesterday);
             tMap.put("analyClass", analyClass);
             tMap.put("clock", clock);
-            tMap.put("analyContent", "COG回收量异常;吨焦耗热量异常");
+            tMap.put("analyContent", "化产蒸汽消耗量异常");
             tMap.put("startDate", startDate);
             tMap.put("endDate", endDate);
 
@@ -148,13 +141,13 @@
                 saveTraceChart(tMap,result,startDate,endDate);
             }
         } catch (Exception ex) {
-            logger.error("RunCokingTraceModel3Task运行异常");
+            logger.error("RunCokingTraceModelHCTask运行异常");
             ex.printStackTrace();
         }
-        logger.info("RunCokingTraceModel3Task运行完成");
+        logger.info("RunCokingTraceModelHCTask运行完成");
     }
 
-    private void saveTraceReport(Map<String, Object> tMap,JSONObject result) {
+    public void saveTraceReport(Map<String, Object> tMap,JSONObject result) {
         CokingTraceReportEntity reportEntity = new CokingTraceReportEntity();
         reportEntity.setId(tMap.get("relId").toString());
         reportEntity.setProcess(tMap.get("process").toString());
@@ -167,37 +160,36 @@
         cokingTraceReportService.save(reportEntity);
     }
 
-    private void saveTraceSuggest(Map<String, Object> tMap,JSONObject result) {
-        String cokeTotal = result.get("cokeTotal").toString();
-        if(StringUtils.isNotBlank(cokeTotal)){
+    public void saveTraceSuggest(Map<String, Object> tMap,JSONObject result) {
+        String chemProdTotal = result.get("chemProdTotal").toString();
+        if(StringUtils.isNotBlank(chemProdTotal)){
             CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity();
             suggestEntity.setRelId(tMap.get("relId").toString());
             suggestEntity.setProcess(tMap.get("process").toString());
-            suggestEntity.setSugObj("LJ");
+            suggestEntity.setSugObj("HC");
             suggestEntity.setClock(tMap.get("clock").toString());
-            suggestEntity.setContent(cokeTotal);
+            suggestEntity.setContent(chemProdTotal);
             suggestEntity.setCreateDate(new Date());
             cokingTraceSuggestService.save(suggestEntity);
         }
     }
 
-    private void saveTraceDeviation(Map<String, Object> tMap,JSONObject result) {
-        List<ChartParamDTO> list = mcsApi.getChartParamList(CommonConstant.COKE_INDEX_CHARTCODE);
-        Map<String, String> steamIndexMaps = list.stream().collect(Collectors.toMap(ChartParamDTO::getParamCode, e -> e.getParamValue()));
-        for(int i=0;i<=5;i++){
-            String cokeColoum = result.get("cokeColoum"+i).toString();
-            if(StringUtils.isNotBlank(cokeColoum)){
-                JSONArray responseArr = JSON.parseArray(cokeColoum);
+    public void saveTraceDeviation(Map<String, Object> tMap,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);
                 for (int j = 0; j < responseArr.size(); j++) {
                     JSONArray element = JSON.parseArray(responseArr.get(j).toString());
                     CokingTraceDeviationEntity deviationEntity = new CokingTraceDeviationEntity();
                     deviationEntity.setRelId(tMap.get("relId").toString());
                     deviationEntity.setProcess(tMap.get("process").toString());
                     deviationEntity.setClock(tMap.get("clock").toString());
-                    deviationEntity.setSugObj("LJ");
-                    deviationEntity.setGroupName(cokeColoumMap.get("cokeColoum"+i).toString());
+                    deviationEntity.setSugObj("HC");
+                    deviationEntity.setGroupName(chemProdColoumMap.get("chemProdFirstColoum"+i).toString());
                     deviationEntity.setIndName(steamIndexMaps.get(element.get(0).toString()));
-//                    deviationEntity.setIndName(element.get(0).toString());
                     deviationEntity.setIndValue(element.get(1).toString());
                     deviationEntity.setCreateDate(new Date());
                     cokingTraceDeviationService.save(deviationEntity);
@@ -206,7 +198,7 @@
         }
     }
 
-    private void saveAnalyInd(Map<String, Object> tMap,JSONObject result) {
+    public void saveAnalyInd(Map<String, Object> tMap,JSONObject result) {
         String[] analyContent = tMap.get("analyContent").toString().split(";");
         for(int i=0;i<analyContent.length;i++){
             CokingAnalyIndEntity analyIndEntity = new CokingAnalyIndEntity();
@@ -220,9 +212,9 @@
         }
     }
 
-    private void saveTraceInd(Map<String, Object> tMap,JSONObject result) {
+    public void saveTraceInd(Map<String, Object> tMap,JSONObject result) {
         Map<String,Object> map = new HashMap<>();
-        map.put("indType","炼焦工序异常溯源");
+        map.put("indType","化产工序异常溯源");
         List<CokingTraceConfEntity> list = cokingTraceConfService.list(map);
         if (CollectionUtils.isEmpty(list)) {
             logger.info("ConfLis is Empty");
@@ -258,6 +250,7 @@
             cokingTraceIndEntity.setRelId(tMap.get("relId").toString());
             cokingTraceIndEntity.setTitle(conf.getIndType());
             cokingTraceIndEntity.setClock(tMap.get("clock").toString());
+            cokingTraceIndEntity.setIndCode(conf.getIndCode());
             cokingTraceIndEntity.setIndName(conf.getIndName());
             cokingTraceIndEntity.setIndValue(value);
             cokingTraceIndEntity.setIndUnit(conf.getIndUnit());
@@ -265,7 +258,7 @@
         }
     }
 
-    private void saveTraceChart(Map<String, Object> tMap, JSONObject result,Date startDate,Date endDate) {
+    public void saveTraceChart(Map<String, Object> tMap, JSONObject result,Date startDate,Date endDate) {
         historyPointMap.forEach((key,value) ->{
             CokingTraceChartEntity cokingTraceChartEntity = new CokingTraceChartEntity();
             cokingTraceChartEntity.setRelId(tMap.get("relId").toString());

--
Gitblit v1.9.3