From 867e3d0bd0760950ed0dc7a303106e47063d0928 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期四, 24 四月 2025 17:48:48 +0800
Subject: [PATCH] 定时任务修改
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java | 208 ++++++++++++++++++++++-----------------------------
1 files changed, 90 insertions(+), 118 deletions(-)
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 ddec505..965d546 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
@@ -4,12 +4,12 @@
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;
@@ -19,7 +19,6 @@
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.*;
import java.util.stream.Collectors;
@@ -63,6 +62,11 @@
@Autowired
private IndItemApi indItemApi;
+ private final static String process = "干熄焦工序";
+
+ private final static String reportName = "干熄焦工序异常溯源";
+
+ private final static String indType = "干熄焦工序异常溯源";
private static final HashMap<String, Object> steamFirstColoumMap = new HashMap<String, Object>() {{
put("steamFirstColoum0", "一级指标-偏差值");
put("steamFirstColoum1", "二级指标-偏差值");
@@ -106,38 +110,64 @@
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("analyClass", analyClass);
- tMap.put("clock", clock);
- tMap.put("analyContent", "干熄焦产蒸汽量异常");
- 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);
+ // 调用模型
+ JSONObject jsonObject = JSONObject.parseObject(jsonStr);
+ JSONObject result = (JSONObject) JSON.toJSON(jsonObject.get("result"));
+
+ if (Objects.isNull(result)) {
+ logger.info("模型结果为空");
+ return;
}
+
+ // 保存报告
+ String analyDate = DateUtils.format(startDate);
+ String analyContent = result.getString("coalIndexInfo");
+ String relId = cokingTraceReportService.save(process, reportName, analyDate, analyClass, clock, analyContent);
+
+ // 保存一级分析指标
+ saveAnalyInd(relId, process, analyDate, analyClass, analyContent);
+
+ // 保存优化建议
+ saveTraceSuggest(relId, process, clock, result);
+
+ // 保存偏差值
+ saveTraceDeviation(relId, process, clock, result);
+
+ // 保存溯源指标
+ cokingTraceIndService.saveTraceInd(relId, indType, clock);
+
} catch (Exception ex) {
logger.error("RunCokingTraceModelGXJTask运行异常");
ex.printStackTrace();
@@ -146,38 +176,26 @@
}
- 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());
- reportEntity.setReportName(tMap.get("reportName").toString());
- reportEntity.setAnalyDate(tMap.get("analyDate").toString());
- reportEntity.setAnalyClass(tMap.get("analyClass").toString());
- reportEntity.setClock(tMap.get("clock").toString());
- reportEntity.setAnalyContent(tMap.get("analyContent").toString());
- reportEntity.setCreateDate(new Date());
- cokingTraceReportService.save(reportEntity);
- }
-
- public void saveTraceSuggest(Map<String, Object> tMap,JSONObject result) {
+ public void saveTraceSuggest(String relId, String process, String clock, JSONObject result) {
List<CokingTraceSuggestEntity> entityList = new ArrayList<>();
for(int i=1;i<=2;i++){
String steamTotal = result.get("steamTotal"+i).toString();
if(StringUtils.isNotBlank(steamTotal)){
CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity();
- suggestEntity.setRelId(tMap.get("relId").toString());
- suggestEntity.setProcess(tMap.get("process").toString());
- suggestEntity.setSugObj("GXJ");
- suggestEntity.setClock(tMap.get("clock").toString());
+ suggestEntity.setRelId(relId);
+ suggestEntity.setProcess(process);
+ suggestEntity.setSugObj(i+"#");
+ suggestEntity.setClock(clock);
suggestEntity.setContent(steamTotal);
suggestEntity.setCreateDate(new Date());
entityList.add(suggestEntity);
- cokingTraceSuggestService.insert(entityList);
}
}
+ cokingTraceSuggestService.insert(entityList);
}
- public void saveTraceDeviation(Map<String, Object> tMap,JSONObject result) {
+ @Transactional
+ public void saveTraceDeviation(String relId, String process, String clock, JSONObject result) {
List<ChartParamDTO> list = mcsApi.getChartParamList(CommonConstant.STEAM_INDEX_CHARTCODE);
Map<String, String> steamIndexMaps = list.stream().collect(Collectors.toMap(ChartParamDTO::getParamCode, e -> e.getParamName()));
for(int i=0;i<=5;i++){
@@ -188,17 +206,17 @@
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("GXJ");
+ deviationEntity.setRelId(relId);
+ deviationEntity.setProcess(process);
+ deviationEntity.setClock(clock);
+ deviationEntity.setSugObj("1#");
deviationEntity.setGroupName(steamFirstColoumMap.get("steamFirstColoum"+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);
}
+ cokingTraceDeviationService.save(entityList);
}
}
for(int i=0;i<=5;i++){
@@ -209,85 +227,39 @@
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("GXJ");
+ deviationEntity.setRelId(relId);
+ deviationEntity.setProcess(process);
+ deviationEntity.setClock(clock);
+ deviationEntity.setSugObj("2#");
deviationEntity.setGroupName(steamSecondColoumMap.get("steamSecondColoum" + 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);
}
+ cokingTraceDeviationService.save(entityList);
}
}
}
- 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++){
- 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);
- entityList.add(analyIndEntity);
- cokingAnalyIndService.save(entityList);
- }
- }
-
- 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");
+ public void saveAnalyInd(String relId, String process, String analyDate, String analyClass, String analyContent) {
+ if (StringUtils.isBlank(analyContent)) {
+ logger.info("analyContent is null");
return;
}
- List<CokingTraceIndEntity> entityList = new ArrayList<>();
- for (CokingTraceConfEntity 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;
-
- }
- CokingTraceIndEntity cokingTraceIndEntity = new CokingTraceIndEntity();
- 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());
- entityList.add(cokingTraceIndEntity);
- cokingTraceIndService.save(entityList);
-
+ String[] analyContentArr = analyContent.split(";");
+ List<CokingAnalyIndEntity> entityList = new ArrayList<>();
+ for(int i=0;i<analyContentArr.length;i++){
+ CokingAnalyIndEntity analyIndEntity = new CokingAnalyIndEntity();
+ analyIndEntity.setRelId(relId);
+ analyIndEntity.setAnalyType(process);
+ analyIndEntity.setAnalyDate(analyDate);
+ analyIndEntity.setAnalyClass(analyClass);
+ analyIndEntity.setAnalyContent(analyContentArr[i]);
+ analyIndEntity.setSort(i+1);
+ entityList.add(analyIndEntity);
}
+ cokingAnalyIndService.save(entityList);
}
}
\ No newline at end of file
--
Gitblit v1.9.3