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/RunCokingTraceModelBMTask.java | 120 ++++++++++++++++++++++++++++--------------------------------
1 files changed, 56 insertions(+), 64 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/RunCokingTraceModelBMTask.java
similarity index 70%
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/RunCokingTraceModelBMTask.java
index 10e65f8..3472167 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/RunCokingTraceModelBMTask.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("runCokingTraceModelBMTask")
+public class RunCokingTraceModelBMTask implements ITask{
private Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
@@ -65,43 +65,35 @@
@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> coalColoumMap = new HashMap<String, Object>() {{
+ put("coalColoum0", "一级指标-偏差值");
+ put("coalColoum1", "二级指标-偏差值");
+ put("coalColoum2", "影响因素1-偏差值");
}};
private static final HashMap<String, Object> historyPointMap = new HashMap<String, Object>() {{
- put("LJSY001", "荒煤气发生");
- put("LJSY005", "耗热量");
+ put("BMSY001", "备煤耗电");
}};
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" +
+ " \"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" +
+ " }" +
"}";
@Override
- @Transactional
public void run(String params) {
- logger.info("RunCokingTraceModel3Task，参数为：{}", params);
+ logger.info("RunCokingTraceModelBMTask，参数为：{}", params);
try {
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.MILLISECOND, 0);
@@ -109,11 +101,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 +119,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 +139,13 @@
saveTraceChart(tMap,result,startDate,endDate);
}
} catch (Exception ex) {
- logger.error("RunCokingTraceModel3Task运行异常");
+ logger.error("RunCokingTraceModelBMTask运行异常");
ex.printStackTrace();
}
- logger.info("RunCokingTraceModel3Task运行完成");
+ logger.info("RunCokingTraceModelBMTask运行完成");
}
- 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 +158,37 @@
cokingTraceReportService.save(reportEntity);
}
- private void saveTraceSuggest(Map<String, Object> tMap,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);
- }
+ 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);
+ }
}
- 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);
+ @Transactional
+ 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)){
+ JSONArray responseArr = JSON.parseArray(coalColoum);
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("BM");
+ deviationEntity.setGroupName(coalColoumMap.get("coalColoum"+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 +197,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 +211,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 +249,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 +257,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