From 656039ea9f1393b0e04f5e6443e05a71c463ff77 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期三, 23 四月 2025 16:57:26 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/ansteel
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java
index 0f79733..de344c6 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java
@@ -49,6 +49,8 @@
private CokingTraceChartService cokingTraceChartService;
@Resource
private CokingTraceSuggestService cokingTraceSuggestService;
+ @Resource
+ private CokingTraceDataService cokingTraceDataService;
@Override
public void run(String processTypes) {
@@ -131,13 +133,18 @@
overviewEntity.setSubProcessType(entry.getKey());
overviewEntity.setClock(clock);
result.add(overviewEntity);
+
+ // 清理旧数据
+ cokingOverviewService.deleteByProcessType(processType, clock);
+ cokingTraceDataService.deleteByExObj(processType, clock);
}
cokingOverviewService.insert(result);
// 指标运行趋势
List<CokingProcessConfEntity> indRunTrend = list.stream().filter(e -> e.getInfoType().equals("1")).collect(Collectors.toList());
List<CokingTraceChartEntity> cokingTraceChartEntityList = new ArrayList<>(indRunTrend.size());
- List<CokingTraceSuggestEntity> suggestEntitieList = new ArrayList<>();
+ // List<CokingTraceSuggestEntity> suggestEntitieList = new ArrayList<>();
+ List<CokingTraceDataEntity> exDatalist = new ArrayList<>(indRunTrend.size());
indRunTrend.forEach(e -> {
CokingTraceChartEntity cokingTraceChartEntity = new CokingTraceChartEntity();
cokingTraceChartEntity.setRelId(relId);
@@ -158,10 +165,11 @@
cokingTraceChartEntityList.add(cokingTraceChartEntity);
// 异常数据处理
- suggestEntitieList.addAll(handleAbnormalData(e, cokingTraceChartEntity.getStartTime(), cokingTraceChartEntity.getEndTime(),relId,clock));
+ exDatalist.addAll(handleAbnormalData(e, cokingTraceChartEntity.getStartTime(), cokingTraceChartEntity.getEndTime(),relId,clock));
});
cokingTraceChartService.insert(cokingTraceChartEntityList);
- cokingTraceSuggestService.insert(suggestEntitieList);
+ // cokingTraceSuggestService.insert(suggestEntitieList);
+ cokingTraceDataService.insertList(exDatalist);
}
} catch (Exception ex) {
@@ -171,8 +179,8 @@
}
- private List<CokingTraceSuggestEntity> handleAbnormalData(CokingProcessConfEntity e, Date startTime, Date endTime, String relId, String clock) {
- List<CokingTraceSuggestEntity> suggestEntities = new ArrayList<>();
+ private List<CokingTraceDataEntity> handleAbnormalData(CokingProcessConfEntity e, Date startTime, Date endTime, String relId, String clock) {
+ List<CokingTraceDataEntity> suggestEntities = new ArrayList<>();
switch (ProcessConfDataTypeEnum.getEumByCode(e.getDataType())) {
case DATAPOINT:
ApiPointValueQueryDTO queryDTO = new ApiPointValueQueryDTO();
@@ -198,7 +206,15 @@
content = DateUtils.format(calendar.getTime()) + " " + e.getIndName() + "数据异常(无数据)";
}
if (StringUtils.isNotBlank(content)) {
- suggestEntities.add(new CokingTraceSuggestEntity(UUID.randomUUID().toString(),relId,ProcessTypeEnum.getEumByCode(e.getIndType()).getReportName(),e.getIndType()+"_AD",clock,content,new Date()));
+ CokingTraceDataEntity ctd = new CokingTraceDataEntity();
+ ctd.setId(UUID.randomUUID().toString());
+ ctd.setRelId(relId);
+ ctd.setProcess(ProcessTypeEnum.getEumByCode(e.getIndType()).getReportName());
+ ctd.setClock(clock);
+ ctd.setExObj(e.getIndType()+"_AD");
+ ctd.setExTime(calendar.getTime());
+ ctd.setExType(content);
+ suggestEntities.add(ctd);
}
calendar.add(Calendar.DAY_OF_YEAR,1);
}
@@ -228,7 +244,16 @@
content = time + " " + e.getIndName() + "数据异常(无数据)";
}
if (StringUtils.isNotBlank(content)) {
- suggestEntities.add(new CokingTraceSuggestEntity(UUID.randomUUID().toString(),relId,ProcessTypeEnum.getEumByCode(e.getIndType()).getReportName(),e.getIndType()+"_AD",clock,content,new Date()));
+ CokingTraceDataEntity ctd = new CokingTraceDataEntity();
+ ctd.setId(UUID.randomUUID().toString());
+ ctd.setRelId(relId);
+ ctd.setProcess(ProcessTypeEnum.getEumByCode(e.getIndType()).getReportName());
+ ctd.setClock(clock);
+ ctd.setExObj(e.getIndType()+"_AD");
+ ctd.setExTime(intCalendar.getTime());
+ ctd.setExType(content);
+ suggestEntities.add(ctd);
+ // suggestEntities.add(new CokingTraceSuggestEntity(UUID.randomUUID().toString(),relId,ProcessTypeEnum.getEumByCode(e.getIndType()).getReportName(),e.getIndType()+"_AD",clock,content,new Date()));
}
intCalendar.add(Calendar.DAY_OF_YEAR,1);
}
--
Gitblit v1.9.3