From 93052fb8b5680f2b40e1fc649b987f2428a33f2c Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 24 四月 2025 16:31:17 +0800
Subject: [PATCH] 备煤工序异常溯源定时修改

---
 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java |   55 +++++++++++++++----------------------------------------
 1 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java
index f7e499b..539719a 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java
@@ -1,13 +1,10 @@
 package com.iailab.module.ansteel.job.task;
 
 import com.iailab.framework.common.util.date.DateUtils;
-import com.iailab.module.ansteel.coking.entity.CokingAnalyIndEntity;
 import com.iailab.module.ansteel.coking.entity.CokingProcessConfEntity;
 import com.iailab.module.ansteel.coking.entity.CokingProdDayEntity;
-import com.iailab.module.ansteel.coking.entity.CokingTraceIndEntity;
 import com.iailab.module.ansteel.coking.service.CokingProcessConfService;
 import com.iailab.module.ansteel.coking.service.CokingProdDayService;
-import com.iailab.module.ansteel.coking.service.CokingTraceIndService;
 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;
@@ -19,7 +16,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 生成焦化日前生产信息
@@ -39,9 +39,6 @@
 
     @Resource
     private CokingProdDayService cokingProdDayService;
-
-    @Resource
-    private CokingTraceIndService cokingTraceIndService;
 
     @Resource
     private DataPointApi dataPointApi;
@@ -66,15 +63,6 @@
             calendar.set(Calendar.SECOND, 0);
             calendar.add(Calendar.DAY_OF_YEAR, -1);
             String clock = DateUtils.format(calendar.getTime(), DateUtils.FORMAT_YEAR_MONTH_DAY);
-            String clock2 = "";
-            int hour = calendar.get(Calendar.HOUR_OF_DAY);
-            if (hour == 0) {
-                clock2 = clock.concat("-").concat("A");
-            } else if (hour == 8) {
-                clock2 = clock.concat("-").concat("B");
-            } else if (hour == 16) {
-                clock2 = clock.concat("-").concat("C");
-            }
             logger.info("清理旧数据");
             cokingProdDayService.deleteByClock(clock);
             for (CokingProcessConfEntity conf : list) {
@@ -100,15 +88,11 @@
                             value = indValues.get(indValues.size() - 1).getDataValue().toString();
                         }
                         break;
-                    case MODEL:
-                        value = "100";
-                        break;
                    default:
                         break;
 
                 }
-                saveProdDay(conf, value, clock);
-                saveTraceInd(conf, value, clock2);
+                saveProdDay(conf, value, clock, conf.getIndCode());
             }
         } catch (Exception ex) {
             logger.error("RunCokingProdDayTask运行异常");
@@ -118,24 +102,15 @@
 
     }
 
-    private void saveTraceInd(CokingProcessConfEntity conf, String value, String clock) {
-        CokingTraceIndEntity cokingTraceIndEntity = new CokingTraceIndEntity();
-        cokingTraceIndEntity.setTitle(conf.getIndType());
-        cokingTraceIndEntity.setClock(clock);
-        cokingTraceIndEntity.setIndName(conf.getIndName());
-        cokingTraceIndEntity.setIndValue(value);
-        cokingTraceIndEntity.setIndUnit(conf.getIndUnit());
-        cokingTraceIndService.save(cokingTraceIndEntity);
-    }
-
-    private void saveProdDay(CokingProcessConfEntity conf, String value, String clock) {
-        CokingProdDayEntity cokingProdDayEntity = new CokingProdDayEntity();
-        cokingProdDayEntity.setInfoType(conf.getInfoType());
-        cokingProdDayEntity.setSort(conf.getSort());
-        cokingProdDayEntity.setIndName(conf.getIndName());
-        cokingProdDayEntity.setIndUnit(conf.getIndUnit());
-        cokingProdDayEntity.setIndValue(value);
-        cokingProdDayEntity.setClock(clock);
-        cokingProdDayService.save(cokingProdDayEntity);
+    private void saveProdDay(CokingProcessConfEntity conf, String value, String clock, String indCode) {
+        CokingProdDayEntity entity = new CokingProdDayEntity();
+        entity.setInfoType(conf.getInfoType());
+        entity.setSort(conf.getSort());
+        entity.setIndCode(indCode);
+        entity.setIndName(conf.getIndName());
+        entity.setIndUnit(conf.getIndUnit());
+        entity.setIndValue(value);
+        entity.setClock(clock);
+        cokingProdDayService.save(entity);
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3