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 | 159 +++------
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java | 229 +++++---------
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceIndService.java | 2
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceChartServiceImpl.java | 37 ++
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java | 115 +------
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java | 265 +++++++----------
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceChartService.java | 3
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceReportServiceImpl.java | 2
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceIndServiceImpl.java | 66 ++++
9 files changed, 377 insertions(+), 501 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceChartService.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceChartService.java
index 47bcfd9..b9590c9 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceChartService.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceChartService.java
@@ -2,6 +2,7 @@
import com.iailab.module.ansteel.coking.entity.CokingTraceChartEntity;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -16,4 +17,6 @@
void save(CokingTraceChartEntity cokingTraceChartEntity);
void insert(List<CokingTraceChartEntity> list);
+
+ void save(String relId, String clock, String indType, Date startDate, Date endDate);
}
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceIndService.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceIndService.java
index e27c72b..60c4595 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceIndService.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceIndService.java
@@ -15,4 +15,6 @@
List<CokingTraceIndEntity> list(Map<String, Object> params);
void save(List<CokingTraceIndEntity> entityList);
+
+ void saveTraceInd(String relId, String indType,String clock);
}
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceChartServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceChartServiceImpl.java
index 0068b9b..f88cad3 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceChartServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceChartServiceImpl.java
@@ -3,13 +3,14 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iailab.module.ansteel.coking.dao.CokingTraceChartDao;
import com.iailab.module.ansteel.coking.entity.CokingTraceChartEntity;
+import com.iailab.module.ansteel.coking.entity.CokingTraceConfEntity;
import com.iailab.module.ansteel.coking.service.CokingTraceChartService;
+import com.iailab.module.ansteel.coking.service.CokingTraceConfService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 焦化工序异常溯源折线图
@@ -22,6 +23,9 @@
@Autowired
private CokingTraceChartDao cokingTraceChartDao;
+
+ @Autowired
+ private CokingTraceConfService cokingTraceConfService;
@Override
public List<CokingTraceChartEntity> list(Map<String, Object> params) {
@@ -40,4 +44,31 @@
public void insert(List<CokingTraceChartEntity> list) {
cokingTraceChartDao.insert(list);
}
+
+ @Override
+ public void save(String relId, String clock, String indType, Date startDate, Date endDate) {
+ // 查询需要保存chart的配置
+ Map<String, Object> map = new HashMap<>();
+ map.put("indType", indType);
+ map.put("ext1", "chart");
+ List<CokingTraceConfEntity> list = cokingTraceConfService.list(map);
+ if (CollectionUtils.isEmpty(list)) {
+ return;
+ }
+
+ List<CokingTraceChartEntity> entityList = new ArrayList<>();
+ list.forEach(value -> {
+ CokingTraceChartEntity cokingTraceChartEntity = new CokingTraceChartEntity();
+ cokingTraceChartEntity.setRelId(relId);
+ cokingTraceChartEntity.setName(value.toString());
+ cokingTraceChartEntity.setClock(clock);
+ cokingTraceChartEntity.setDataType(value.getDataType());
+ cokingTraceChartEntity.setDataNo(value.getPointNo());
+ cokingTraceChartEntity.setStartTime(startDate);
+ cokingTraceChartEntity.setEndTime(endDate);
+ cokingTraceChartEntity.setCreateDate(new Date());
+ entityList.add(cokingTraceChartEntity);
+ });
+ cokingTraceChartDao.insert(entityList);
+ }
}
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceIndServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceIndServiceImpl.java
index e46c477..2aeb98e 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceIndServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceIndServiceImpl.java
@@ -2,11 +2,22 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iailab.module.ansteel.coking.dao.CokingTraceIndDao;
+import com.iailab.module.ansteel.coking.entity.CokingTraceConfEntity;
import com.iailab.module.ansteel.coking.entity.CokingTraceIndEntity;
+import com.iailab.module.ansteel.coking.service.CokingTraceConfService;
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;
+import com.iailab.module.data.api.point.DataPointApi;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -21,6 +32,15 @@
@Resource
private CokingTraceIndDao cokingTraceIndDao;
+ @Autowired
+ private CokingTraceConfService cokingTraceConfService;
+
+ @Autowired
+ private DataPointApi dataPointApi;
+
+ @Autowired
+ private IndItemApi indItemApi;
+
@Override
public List<CokingTraceIndEntity> list(Map<String, Object> params) {
String relId = (String) params.get("relId");
@@ -34,4 +54,50 @@
public void save(List<CokingTraceIndEntity> entityList) {
cokingTraceIndDao.insert(entityList);
}
+
+ @Override
+ public void saveTraceInd(String relId, String indType, String clock) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("indType", indType);
+ List<CokingTraceConfEntity> list = cokingTraceConfService.list(map);
+ if (CollectionUtils.isEmpty(list)) {
+ return;
+ }
+ List<CokingTraceIndEntity> cokingTraceIndEntities = new ArrayList<>();
+ for (CokingTraceConfEntity conf : list) {
+ if (StringUtils.isBlank(conf.getDataType())) {
+ continue;
+ }
+ if (StringUtils.isBlank(conf.getPointNo())) {
+ 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(relId);
+ cokingTraceIndEntity.setTitle(conf.getIndType());
+ cokingTraceIndEntity.setClock(clock);
+ cokingTraceIndEntity.setIndCode(conf.getIndCode());
+ cokingTraceIndEntity.setIndName(conf.getIndName());
+ cokingTraceIndEntity.setIndValue(value);
+ cokingTraceIndEntity.setIndUnit(conf.getIndUnit());
+ cokingTraceIndEntities.add(cokingTraceIndEntity);
+ }
+ cokingTraceIndDao.insert(cokingTraceIndEntities);
+ }
}
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceReportServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceReportServiceImpl.java
index 4a245da..51bbe7d 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceReportServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceReportServiceImpl.java
@@ -7,6 +7,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -45,6 +46,7 @@
entity.setAnalyClass(analyClass);
entity.setClock(clock);
entity.setAnalyContent(analyContent);
+ entity.setCreateDate(new Date());
cokingTraceReportDao.insert(entity);
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 a45f2c6..c07ec92 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
@@ -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;
@@ -83,21 +82,19 @@
put("F0000101008", "备煤耗电");
}};
- 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" +
- " \"coalPrepElecTotal1\":\"1#粉碎机耗电因粉碎机偏高增加220KW/h，经模型计算，建建议调整单班用煤量，预计可使粉碎机耗电量指标降低170KW/h\",\n" +
- " \"coalPrepElecTotal2\":\"1#粉碎机耗电量数据异常\",\n" +
- " \"coalColoum0\":[[0,450],[0,137],[0,342]],\n" +
- " \"coalColoum1\":[[2,306],[3,134],[1,142]],\n" +
- " \"coalColoum2\":[[4,142],[4,132],[4,349]],\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" +
+ "\"coalPrepElecTotal1\":\"1#粉碎机耗电因粉碎机偏高增加220KW/h，经模型计算，建建议调整单班用煤量，预计可使粉碎机耗电量指标降低170KW/h\",\n" +
+ "\"coalPrepElecTotal2\":\"1#粉碎机耗电量数据异常\",\n" +
+ "\"coalColoum0\":[[0,450],[0,137],[0,342]],\n" +
+ "\"coalColoum1\":[[2,306],[3,134],[1,142]],\n" +
+ "\"coalColoum2\":[[4,142],[4,132],[4,349]],\n" +
"\"coalPrepElecHomePage\":[[50,42],[10,10]],\n" +
"\"coalHomeIndex\":[[90.4,90.2],[80.3,78],[103,100],[280,270]],\n" +
"\"coalIndexInfo\":\"2月18日甲班：备煤耗电异常\",\n" +
- "\"coalErr\":\"2月18日粉碎机耗电数据异常（无数据）\"\n" +
- " }" +
- "}";
+ "\"coalErr\":\"2月18日粉碎机耗电数据异常（无数据）\"\n" + " }" + "}";
@Override
public void run(String params) {
@@ -151,19 +148,19 @@
String relId = cokingTraceReportService.save(process, reportName, analyDate, analyClass, clock, analyContent);
// 保存一级分析指标
- this.saveAnalyInd(relId, process, analyDate, analyClass, analyContent);
+ saveAnalyInd(relId, process, analyDate, analyClass, analyContent);
// 保存优化建议
- this.saveTraceSuggest(relId, process, clock, result);
+ saveTraceSuggest(relId, process, clock, result);
// 保存偏差值
- this.saveTraceDeviation(relId, process, clock, result);
+ saveTraceDeviation(relId, process, clock, result);
// 保存溯源指标
- this.saveTraceInd(relId, result);
+ cokingTraceIndService.saveTraceInd(relId, indType, clock);
// 保存溯源折线图
- this.saveTraceChart(relId, clock, startDate, endDate);
+ cokingTraceChartService.save(relId, clock, indType, startDate, endDate);
} catch (Exception ex) {
logger.error("RunCokingTraceModelBMTask运行异常");
@@ -177,6 +174,7 @@
String coalTotal = result.get("coalPrepElecTotal1").toString();
if (StringUtils.isBlank(coalTotal)) {
logger.info("coalPrepElecTotal1 is null");
+ return;
}
CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity();
suggestEntity.setRelId(relId);
@@ -218,6 +216,7 @@
public void saveAnalyInd(String relId, String process, String analyDate, String analyClass, String analyContent) {
if (StringUtils.isBlank(analyContent)) {
logger.info("analyContent is null");
+ return;
}
String[] analyContentArr = analyContent.split(";");
List<CokingAnalyIndEntity> entityList = new ArrayList<>();
@@ -232,79 +231,5 @@
entityList.add(analyIndEntity);
}
cokingAnalyIndService.save(entityList);
- }
-
- public void saveTraceInd(String relId, JSONObject result) {
- Map<String, Object> map = new HashMap<>();
- map.put("indType", indType);
- List<CokingTraceConfEntity> list = cokingTraceConfService.list(map);
- if (CollectionUtils.isEmpty(list)) {
- logger.info("ConfLis is Empty");
- 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(relId);
- cokingTraceIndEntity.setTitle(conf.getIndType());
- cokingTraceIndEntity.setClock(relId);
- cokingTraceIndEntity.setIndCode(conf.getIndCode());
- cokingTraceIndEntity.setIndName(conf.getIndName());
- cokingTraceIndEntity.setIndValue(value);
- cokingTraceIndEntity.setIndUnit(conf.getIndUnit());
- entityList.add(cokingTraceIndEntity);
- }
- cokingTraceIndService.save(entityList);
- }
-
- public void saveTraceChart(String relId, String clock, Date startDate, Date endDate) {
- // 查询需要保存chart的配置
- Map<String, Object> map = new HashMap<>();
- map.put("indType", indType);
- map.put("ext1", "chart");
- List<CokingTraceConfEntity> list = cokingTraceConfService.list(map);
- if (CollectionUtils.isEmpty(list)) {
- logger.info("TraceChartConfLis is Empty");
- }
-
- List<CokingTraceChartEntity> entityList = new ArrayList<>();
- list.forEach(value -> {
- CokingTraceChartEntity cokingTraceChartEntity = new CokingTraceChartEntity();
- cokingTraceChartEntity.setRelId(relId);
- cokingTraceChartEntity.setName(value.toString());
- cokingTraceChartEntity.setClock(clock);
- cokingTraceChartEntity.setDataType(value.getDataType());
- cokingTraceChartEntity.setDataNo(value.getPointNo());
- cokingTraceChartEntity.setStartTime(startDate);
- cokingTraceChartEntity.setEndTime(endDate);
- cokingTraceChartEntity.setCreateDate(new Date());
- entityList.add(cokingTraceChartEntity);
- });
- cokingTraceChartService.insert(entityList);
}
}
\ No newline at end of file
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 70664be..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;
@@ -18,7 +18,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
+import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.stream.Collectors;
@@ -62,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", "二级指标-偏差值");
@@ -136,24 +141,33 @@
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", DateUtils.format(startDate));
- 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();
@@ -162,29 +176,16 @@
}
- 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.setRelId(relId);
+ suggestEntity.setProcess(process);
suggestEntity.setSugObj(i+"#");
- suggestEntity.setClock(tMap.get("clock").toString());
+ suggestEntity.setClock(clock);
suggestEntity.setContent(steamTotal);
suggestEntity.setCreateDate(new Date());
entityList.add(suggestEntity);
@@ -193,7 +194,8 @@
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++){
@@ -204,9 +206,9 @@
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.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()));
@@ -225,9 +227,9 @@
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.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()));
@@ -241,68 +243,23 @@
}
- public void saveAnalyInd(Map<String, Object> tMap,JSONObject result) {
- String[] analyContent = tMap.get("analyContent").toString().split(";");
+ public void saveAnalyInd(String relId, String process, String analyDate, String analyClass, String analyContent) {
+ if (StringUtils.isBlank(analyContent)) {
+ logger.info("analyContent is null");
+ return;
+ }
+ String[] analyContentArr = analyContent.split(";");
List<CokingAnalyIndEntity> entityList = new ArrayList<>();
- for(int i=0;i<analyContent.length;i++){
+ for(int i=0;i<analyContentArr.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.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);
- }
-
- 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");
- 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);
}
}
\ No newline at end of file
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 8eddebf..4731a6a 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,6 +18,7 @@
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.*;
@@ -31,7 +32,7 @@
* @createTime 2025年04月22日
*/
@Component("runCokingTraceModelHCTask")
-public class RunCokingTraceModelHCTask implements ITask{
+public class RunCokingTraceModelHCTask implements ITask {
private Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
@@ -50,19 +51,18 @@
private CokingTraceIndService cokingTraceIndService;
@Autowired
- private CokingTraceConfService cokingTraceConfService;
-
- @Autowired
private CokingTraceChartService cokingTraceChartService;
@Autowired
private McsApi mcsApi;
- @Autowired
- private DataPointApi dataPointApi;
+ private final static String process = "化产工序";
- @Autowired
- private IndItemApi indItemApi;
+ private final static String reportName = "化产工序异常溯源";
+
+ private final static String SugObj = "HC";
+
+ private final static String indType = "化产工序异常溯源";
private static final HashMap<String, Object> chemProdColoumMap = new HashMap<String, Object>() {{
put("chemProdFirstColoum0", "一级指标-偏差值");
@@ -77,20 +77,17 @@
put("F0000101006", "脱硫后H2S含量");
}};
- 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" +
- " }" +
- "}";
+ 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" + " }" + "}";
@Override
public void run(String params) {
@@ -128,27 +125,36 @@
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", 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)) {
+ logger.info("模型结果为空");
+ return;
}
+
+ // 保存报告
+ String analyDate = DateUtils.format(startDate);
+ String analyContent = result.getString("chemProdHomeIndexInfo");
+ 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);
+
+ // 保存溯源折线图
+ cokingTraceChartService.save(relId, clock, indType, startDate, endDate);
+
} catch (Exception ex) {
logger.error("RunCokingTraceModelHCTask运行异常");
ex.printStackTrace();
@@ -156,49 +162,39 @@
logger.info("RunCokingTraceModelHCTask运行完成");
}
- 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) {
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("HC");
- suggestEntity.setClock(tMap.get("clock").toString());
- suggestEntity.setContent(chemProdTotal);
- suggestEntity.setCreateDate(new Date());
- cokingTraceSuggestService.save(suggestEntity);
+ if (StringUtils.isBlank(chemProdTotal)) {
+ logger.info("coalPrepElecTotal1 is null");
+ return;
}
+ CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity();
+ suggestEntity.setRelId(relId);
+ suggestEntity.setProcess(process);
+ suggestEntity.setSugObj(SugObj);
+ suggestEntity.setClock(clock);
+ suggestEntity.setContent(chemProdTotal);
+ suggestEntity.setCreateDate(new Date());
+ cokingTraceSuggestService.save(suggestEntity);
}
- 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.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)){
+ 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(tMap.get("relId").toString());
- deviationEntity.setProcess(tMap.get("process").toString());
- deviationEntity.setClock(tMap.get("clock").toString());
- deviationEntity.setSugObj("HC");
- deviationEntity.setGroupName(chemProdColoumMap.get("chemProdFirstColoum"+i).toString());
+ 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());
@@ -209,82 +205,23 @@
}
}
- public void saveAnalyInd(Map<String, Object> tMap,JSONObject result) {
- String[] analyContent = tMap.get("analyContent").toString().split(";");
- List<CokingAnalyIndEntity> list = 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);
- list.add(analyIndEntity);
- }
- cokingAnalyIndService.save(list);
- }
-
- 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> cokingTraceIndEntities = 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());
- cokingTraceIndEntities.add(cokingTraceIndEntity);
+ 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);
}
- cokingTraceIndService.save(cokingTraceIndEntities);
- }
-
- 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());
- cokingTraceChartEntity.setName(value.toString());
- cokingTraceChartEntity.setClock(tMap.get("clock").toString());
- cokingTraceChartEntity.setDataNo(key);
- cokingTraceChartEntity.setDataType("DATAPOINT");
- cokingTraceChartEntity.setStartTime(startDate);
- cokingTraceChartEntity.setEndTime(endDate);
- cokingTraceChartEntity.setCreateDate(new Date());
- cokingTraceChartService.save(cokingTraceChartEntity);
- });
+ cokingAnalyIndService.save(entityList);
}
}
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java
index 1ee01e1..ce57dff 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.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;
@@ -65,6 +64,14 @@
@Autowired
private IndItemApi indItemApi;
+ private final static String process = "炼焦工序";
+
+ private final static String reportName = "炼焦工序异常溯源";
+
+ private final static String SugObj = "LJ";
+
+ private final static String indType = "炼焦工序异常溯源";
+
private static final HashMap<String, Object> cokeColoumMap = new HashMap<String, Object>() {{
put("cokeColoum0", "一级指标-偏差值");
put("cokeColoum1", "二级指标-偏差值");
@@ -79,24 +86,22 @@
put("F0000101009", "耗热量");
}};
- 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" +
- "}";
+ 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" + "}";
@Override
public void run(String params) {
@@ -105,46 +110,65 @@
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("analyClass", analyClass);
- tMap.put("clock", clock);
- tMap.put("analyContent", "COG回收量异常;吨焦耗热量异常");
- 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)) {
+ 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);
+
+ // 保存溯源折线图
+ cokingTraceChartService.save(relId, clock, indType, startDate, endDate);
+
} catch (Exception ex) {
logger.error("RunCokingTraceModelLJTask运行异常");
ex.printStackTrace();
@@ -152,49 +176,39 @@
logger.info("RunCokingTraceModelLJTask运行完成");
}
- 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) {
String cokeTotal = result.get("cokeTotal").toString();
- if(StringUtils.isNotBlank(cokeTotal)){
- CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity();
- suggestEntity.setRelId(tMap.get("relId").toString());
- suggestEntity.setProcess(tMap.get("process").toString());
- suggestEntity.setSugObj("LJ");
- suggestEntity.setClock(tMap.get("clock").toString());
- suggestEntity.setContent(cokeTotal);
- suggestEntity.setCreateDate(new Date());
- cokingTraceSuggestService.save(suggestEntity);
+ if (StringUtils.isBlank(cokeTotal)) {
+ logger.info("cokeTotal is null");
+ return;
}
+ CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity();
+ suggestEntity.setRelId(relId);
+ suggestEntity.setProcess(process);
+ suggestEntity.setSugObj(SugObj);
+ suggestEntity.setClock(clock);
+ suggestEntity.setContent(cokeTotal);
+ suggestEntity.setCreateDate(new Date());
+ cokingTraceSuggestService.save(suggestEntity);
}
- 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.COKE_INDEX_CHARTCODE);
Map<String, String> steamIndexMaps = list.stream().collect(Collectors.toMap(ChartParamDTO::getParamCode, e -> e.getParamName()));
- for(int i=0;i<=5;i++){
- String cokeColoum = result.get("cokeColoum"+i).toString();
- if(StringUtils.isNotBlank(cokeColoum)){
+ for (int i = 0; i <= 5; i++) {
+ String cokeColoum = result.get("cokeColoum" + i).toString();
+ if (StringUtils.isNotBlank(cokeColoum)) {
JSONArray responseArr = JSON.parseArray(cokeColoum);
List<CokingTraceDeviationEntity> entityList = new ArrayList<>();
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.setRelId(relId);
+ deviationEntity.setProcess(process);
+ deviationEntity.setClock(clock);
+ deviationEntity.setSugObj(SugObj);
+ deviationEntity.setGroupName(cokeColoumMap.get("cokeColoum" + i).toString());
deviationEntity.setIndName(steamIndexMaps.get(element.get(0).toString()));
deviationEntity.setIndValue(element.get(1).toString());
deviationEntity.setCreateDate(new Date());
@@ -205,84 +219,23 @@
}
}
- public void saveAnalyInd(Map<String, Object> tMap,JSONObject result) {
- String[] analyContent = tMap.get("analyContent").toString().split(";");
+ public void saveAnalyInd(String relId, String process, String analyDate, String analyClass, String analyContent) {
+ if (StringUtils.isBlank(analyContent)) {
+ logger.info("analyContent is null");
+ return;
+ }
+ String[] analyContentArr = analyContent.split(";");
List<CokingAnalyIndEntity> entityList = new ArrayList<>();
- for(int i=0;i<analyContent.length;i++){
+ for (int i = 0; i < analyContentArr.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.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);
- }
-
- 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");
- 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);
- }
-
- public void saveTraceChart(Map<String, Object> tMap, JSONObject result,Date startDate,Date endDate) {
- List<CokingTraceChartEntity> entityList = new ArrayList<>();
- historyPointMap.forEach((key,value) ->{
- CokingTraceChartEntity cokingTraceChartEntity = new CokingTraceChartEntity();
- cokingTraceChartEntity.setRelId(tMap.get("relId").toString());
- cokingTraceChartEntity.setName(value.toString());
- cokingTraceChartEntity.setClock(tMap.get("clock").toString());
- cokingTraceChartEntity.setDataNo(key);
- cokingTraceChartEntity.setDataType("DATAPOINT");
- cokingTraceChartEntity.setStartTime(startDate);
- cokingTraceChartEntity.setEndTime(endDate);
- cokingTraceChartEntity.setCreateDate(new Date());
- entityList.add(cokingTraceChartEntity);
- });
- cokingTraceChartService.insert(entityList);
}
}
\ No newline at end of file
--
Gitblit v1.9.3