From bd0f24fb70621ea26dc6fd4c41b391620ab583dd Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 24 四月 2025 15:02:27 +0800
Subject: [PATCH] 焦化溯源时间修改
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java | 34 +++++-
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java | 33 ++++--
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdMonTask.java | 94 ++++++++++++++++++
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java | 104 +++++++++++---------
4 files changed, 196 insertions(+), 69 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdMonTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdMonTask.java
index 2fe4769..f47957d 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdMonTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdMonTask.java
@@ -1,13 +1,29 @@
package com.iailab.module.ansteel.job.task;
+import com.iailab.framework.common.util.date.DateUtils;
+import com.iailab.module.ansteel.coking.entity.CokingProcessConfEntity;
+import com.iailab.module.ansteel.coking.entity.CokingProdDayEntity;
+import com.iailab.module.ansteel.coking.service.CokingProcessConfService;
+import com.iailab.module.ansteel.coking.service.CokingProdDayService;
+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 org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
/**
* 生成焦化月累计生产信息
* 0 5 0 * * ?
- *
*
* @author PanZhibao
* @Description
@@ -18,9 +34,85 @@
private Logger logger = LoggerFactory.getLogger(getClass());
+ @Resource
+ private CokingProcessConfService cokingProcessConfService;
+
+ @Resource
+ private CokingProdDayService cokingProdDayService;
+
+ @Resource
+ private DataPointApi dataPointApi;
+
+ @Resource
+ private IndItemApi indItemApi;
+
@Override
public void run(String params) {
+ logger.info("RunCokingProdMonTask，参数为：{}", params);
+ try {
+ CokingProcessConfEntity queryParams = new CokingProcessConfEntity();
+ queryParams.setIndType("prod_mon");
+ List<CokingProcessConfEntity> list = cokingProcessConfService.list(queryParams);
+ if (CollectionUtils.isEmpty(list)) {
+ logger.info("ConfLis is Empty");
+ return;
+ }
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
+ calendar.set(Calendar.SECOND, 0);
+ calendar.add(Calendar.DAY_OF_YEAR, -1);
+ String clock = DateUtils.format(calendar.getTime(), DateUtils.FORMAT_YEAR_MONTH_DAY);
+ logger.info("清理旧数据");
+ cokingProdDayService.deleteByClock(clock);
+ for (CokingProcessConfEntity conf : list) {
+ if (StringUtils.isBlank(conf.getDataType())) {
+ logger.info("DataType is Empty");
+ continue;
+ }
+ if (StringUtils.isBlank(conf.getPointNo())) {
+ logger.info("PointNo is Empty");
+ continue;
+ }
+ String value = "";
+ switch (ProcessConfDataTypeEnum.getEumByCode(conf.getDataType())) {
+ case DATAPOINT:
+ List<String> points = new ArrayList<>();
+ points.add(conf.getPointNo());
+ Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
+ value = pointsRealValue.get(conf.getPointNo()).toString();
+ break;
+ case IND:
+ List<ApiIndItemValueDTO> indValues = indItemApi.queryIndItemDefaultValue(conf.getPointNo());
+ if (!CollectionUtils.isEmpty(indValues)) {
+ value = indValues.get(indValues.size() - 1).getDataValue().toString();
+ }
+ break;
+ default:
+ break;
+
+ }
+ saveProdDay(conf, value, clock, conf.getIndCode());
+ }
+
+ } catch (Exception ex) {
+ logger.error("RunCokingProdMonTask运行异常");
+ ex.printStackTrace();
+ }
+ logger.info("RunCokingProdMonTask运行完成");
+
+ }
+
+ 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
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java
index 1fdee17..abc2e9f 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java
@@ -32,7 +32,7 @@
* @createTime 2025年04月22日
*/
@Component("runCokingTraceModelBMTask")
-public class RunCokingTraceModelBMTask implements ITask{
+public class RunCokingTraceModelBMTask implements ITask {
private Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
@@ -75,7 +75,7 @@
put("F0000101008", "备煤耗电");
}};
- private static final String jsonStr="{\n" +
+ private static final String jsonStr = "{\n" +
" \"result\": {\n" +
" \"coalPrepElec\":[1600.8,1613.5], \n" +
" \"coalPrepElecIndex\":[[0.8,0.73],[723,608],[1782,1782],[752,743],[729,783]],\n" +
@@ -98,45 +98,55 @@
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.MILLISECOND, 0);
calendar.set(Calendar.SECOND, 0);
- calendar.set(Calendar.MINUTE,0);
- calendar.add(Calendar.DAY_OF_YEAR, -1);
- String yesterday = DateUtils.format(calendar.getTime(), DateUtils.FORMAT_YEAR_MONTH_DAY);
+ calendar.set(Calendar.MINUTE, 0);
int hour = calendar.get(Calendar.HOUR_OF_DAY);
Date startDate = calendar.getTime();
- calendar.add(Calendar.HOUR, 8);
Date endDate = calendar.getTime();
String clock = "";
String analyClass = "";
- if (hour == 0) {
- clock = yesterday.concat("-").concat("A");
+ 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 == 8) {
- clock = yesterday.concat("-").concat("B");
+ } 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 == 16) {
- clock = yesterday.concat("-").concat("C");
+ } 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 = "丙班";
}
Map<String, Object> tMap = new HashMap<>();
tMap.put("relId", UUID.randomUUID().toString());
tMap.put("process", "备煤工序");
tMap.put("reportName", "备煤工序");
- tMap.put("analyDate", yesterday);
+ tMap.put("analyDate", DateUtils.format(startDate));
tMap.put("analyClass", analyClass);
tMap.put("clock", clock);
tMap.put("analyContent", "备煤耗电异常");
tMap.put("startDate", startDate);
tMap.put("endDate", endDate);
- JSONObject jsonObject= JSONObject.parseObject(jsonStr);
+ JSONObject jsonObject = JSONObject.parseObject(jsonStr);
JSONObject result = (JSONObject) JSON.toJSON(jsonObject.get("result"));
- if(!Objects.isNull(result)){
- saveTraceReport(tMap,result);
- saveTraceSuggest(tMap,result);
- saveTraceDeviation(tMap,result);
- saveAnalyInd(tMap,result);
- saveTraceInd(tMap,result);
- saveTraceChart(tMap,result,startDate,endDate);
+ if (!Objects.isNull(result)) {
+ saveTraceReport(tMap, result);
+ saveTraceSuggest(tMap, result);
+ saveTraceDeviation(tMap, result);
+ saveAnalyInd(tMap, result);
+ saveTraceInd(tMap, result);
+ saveTraceChart(tMap, result, startDate, endDate);
}
} catch (Exception ex) {
logger.error("RunCokingTraceModelBMTask运行异常");
@@ -145,7 +155,7 @@
logger.info("RunCokingTraceModelBMTask运行完成");
}
- public 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());
@@ -158,27 +168,27 @@
cokingTraceReportService.save(reportEntity);
}
- public void saveTraceSuggest(Map<String, Object> tMap,JSONObject result) {
- String coalTotal = result.get("coalPrepElecTotal1").toString();
- if(StringUtils.isNotBlank(coalTotal)){
- CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity();
- suggestEntity.setRelId(tMap.get("relId").toString());
- suggestEntity.setProcess(tMap.get("process").toString());
- suggestEntity.setSugObj("BM");
- suggestEntity.setClock(tMap.get("clock").toString());
- suggestEntity.setContent(coalTotal);
- suggestEntity.setCreateDate(new Date());
- cokingTraceSuggestService.save(suggestEntity);
- }
+ public void saveTraceSuggest(Map<String, Object> tMap, JSONObject result) {
+ String coalTotal = result.get("coalPrepElecTotal1").toString();
+ if (StringUtils.isNotBlank(coalTotal)) {
+ CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity();
+ suggestEntity.setRelId(tMap.get("relId").toString());
+ suggestEntity.setProcess(tMap.get("process").toString());
+ suggestEntity.setSugObj("BM");
+ suggestEntity.setClock(tMap.get("clock").toString());
+ suggestEntity.setContent(coalTotal);
+ suggestEntity.setCreateDate(new Date());
+ cokingTraceSuggestService.save(suggestEntity);
+ }
}
@Transactional
- public void saveTraceDeviation(Map<String, Object> tMap,JSONObject result) {
+ public void saveTraceDeviation(Map<String, Object> tMap, JSONObject result) {
List<ChartParamDTO> list = mcsApi.getChartParamList(CommonConstant.COAL_INDEX_CHARTCODE);
Map<String, String> steamIndexMaps = list.stream().collect(Collectors.toMap(ChartParamDTO::getParamCode, e -> e.getParamName()));
- for(int i=0;i<=2;i++){
- String coalColoum = result.get("coalColoum"+i).toString();
- if(StringUtils.isNotBlank(coalColoum)){
+ for (int i = 0; i <= 2; i++) {
+ String coalColoum = result.get("coalColoum" + i).toString();
+ if (StringUtils.isNotBlank(coalColoum)) {
JSONArray responseArr = JSON.parseArray(coalColoum);
List<CokingTraceDeviationEntity> entityList = new ArrayList<>();
for (int j = 0; j < responseArr.size(); j++) {
@@ -188,7 +198,7 @@
deviationEntity.setProcess(tMap.get("process").toString());
deviationEntity.setClock(tMap.get("clock").toString());
deviationEntity.setSugObj("BM");
- deviationEntity.setGroupName(coalColoumMap.get("coalColoum"+i).toString());
+ deviationEntity.setGroupName(coalColoumMap.get("coalColoum" + i).toString());
deviationEntity.setIndName(steamIndexMaps.get(element.get(0).toString()));
deviationEntity.setIndValue(element.get(1).toString());
deviationEntity.setCreateDate(new Date());
@@ -199,25 +209,25 @@
}
}
- public void saveAnalyInd(Map<String, Object> tMap,JSONObject result) {
+ public void saveAnalyInd(Map<String, Object> tMap, JSONObject result) {
String[] analyContent = tMap.get("analyContent").toString().split(";");
List<CokingAnalyIndEntity> entityList = new ArrayList<>();
- for(int i=0;i<analyContent.length;i++){
+ for (int i = 0; i < analyContent.length; i++) {
CokingAnalyIndEntity analyIndEntity = new CokingAnalyIndEntity();
analyIndEntity.setRelId(tMap.get("relId").toString());
analyIndEntity.setAnalyType(tMap.get("process").toString());
analyIndEntity.setAnalyDate(tMap.get("analyDate").toString());
analyIndEntity.setAnalyClass(tMap.get("analyClass").toString());
analyIndEntity.setAnalyContent(analyContent[i]);
- analyIndEntity.setSort(i+1);
+ analyIndEntity.setSort(i + 1);
entityList.add(analyIndEntity);
}
cokingAnalyIndService.save(entityList);
}
- public void saveTraceInd(Map<String, Object> tMap,JSONObject result) {
- Map<String,Object> map = new HashMap<>();
- map.put("indType","备煤工序异常溯源");
+ public void saveTraceInd(Map<String, Object> tMap, JSONObject result) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("indType", "备煤工序异常溯源");
List<CokingTraceConfEntity> list = cokingTraceConfService.list(map);
if (CollectionUtils.isEmpty(list)) {
logger.info("ConfLis is Empty");
@@ -263,9 +273,9 @@
cokingTraceIndService.save(entityList);
}
- public 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) {
List<CokingTraceChartEntity> entityList = new ArrayList<>();
- historyPointMap.forEach((key,value) ->{
+ historyPointMap.forEach((key, value) -> {
CokingTraceChartEntity cokingTraceChartEntity = new CokingTraceChartEntity();
cokingTraceChartEntity.setRelId(tMap.get("relId").toString());
cokingTraceChartEntity.setName(value.toString());
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java
index 40f6ccb..70664be 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java
@@ -18,7 +18,6 @@
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.*;
@@ -106,25 +105,42 @@
logger.info("RunCokingTraceModelGXJTask，参数为：{}", params);
try {
Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
+ calendar.set(Calendar.SECOND, 0);
+ calendar.set(Calendar.MINUTE, 0);
int hour = calendar.get(Calendar.HOUR_OF_DAY);
- String yesterday = DateUtils.format(DateUtils.addDateDays(new Date(), -1), DateUtils.FORMAT_YEAR_MONTH_DAY);
+ Date startDate = calendar.getTime();
+ Date endDate = calendar.getTime();
String clock = "";
String analyClass = "";
- if (hour == 0) {
- clock = yesterday.concat("-").concat("A");
+ 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 == 8) {
- clock = yesterday.concat("-").concat("B");
+ } 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 == 16) {
- clock = yesterday.concat("-").concat("C");
+ } 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 = "丙班";
}
Map<String, Object> tMap = new HashMap<>();
tMap.put("relId", UUID.randomUUID().toString());
tMap.put("process", "干熄焦工序");
tMap.put("reportName", "锅炉蒸汽产量");
- tMap.put("analyDate", yesterday);
+ tMap.put("analyDate", DateUtils.format(startDate));
tMap.put("analyClass", analyClass);
tMap.put("clock", clock);
tMap.put("analyContent", "干熄焦产蒸汽量异常");
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 5231e90..8eddebf 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
@@ -18,7 +18,6 @@
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.*;
@@ -100,30 +99,40 @@
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.MILLISECOND, 0);
calendar.set(Calendar.SECOND, 0);
- calendar.set(Calendar.MINUTE,0);
- calendar.add(Calendar.DAY_OF_YEAR, -1);
- String yesterday = DateUtils.format(calendar.getTime(), DateUtils.FORMAT_YEAR_MONTH_DAY);
+ calendar.set(Calendar.MINUTE, 0);
int hour = calendar.get(Calendar.HOUR_OF_DAY);
Date startDate = calendar.getTime();
- calendar.add(Calendar.HOUR, 8);
Date endDate = calendar.getTime();
String clock = "";
String analyClass = "";
- if (hour == 0) {
- clock = yesterday.concat("-").concat("A");
+ 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 == 8) {
- clock = yesterday.concat("-").concat("B");
+ } 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 == 16) {
- clock = yesterday.concat("-").concat("C");
+ } 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 = "丙班";
}
Map<String, Object> tMap = new HashMap<>();
tMap.put("relId", UUID.randomUUID().toString());
tMap.put("process", "化产工序");
tMap.put("reportName", "化产工序");
- tMap.put("analyDate", yesterday);
+ tMap.put("analyDate", DateUtils.format(startDate));
tMap.put("analyClass", analyClass);
tMap.put("clock", clock);
tMap.put("analyContent", "化产蒸汽消耗量异常");
--
Gitblit v1.9.3