From 9904da747fbf3d5c3746f351620f038392e3684b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期日, 12 一月 2025 21:13:48 +0800
Subject: [PATCH] 预警列表
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
index d918e48..cf9ea58 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -253,20 +253,20 @@
if (startTime == null) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(predictItem.getLastTime());
- calendar.add(Calendar.MINUTE, -1 * predictItem.getPredictLength());
+ calendar.add(Calendar.SECOND, -1 * predictItem.getPredictLength() * predictItem.getGranularity());
startTime = calendar.getTime();
}
Date endTime = reqVO.getEndTime();
if (endTime == null) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(predictItem.getLastTime());
- calendar.add(Calendar.MINUTE, predictItem.getPredictLength());
+ calendar.add(Calendar.SECOND, predictItem.getPredictLength() * predictItem.getGranularity());
endTime = calendar.getTime();
}
if (endTime.getTime() <= startTime.getTime()) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(startTime);
- calendar.add(Calendar.MINUTE, predictItem.getPredictLength());
+ calendar.add(Calendar.SECOND, predictItem.getPredictLength() * predictItem.getGranularity());
endTime = calendar.getTime();
}
@@ -367,6 +367,12 @@
dataView.setPreMin(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).min().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
}
+ String alarmObj = chartParams.get(CommonConstant.ALARM_OBJ);
+ if (StringUtils.isNotBlank(alarmObj)) {
+ List<AlarmMessageRespDTO> alarmList = ConvertUtils.sourceToTarget(mmPredictAlarmMessageService.getList(alarmObj, predictTime), AlarmMessageRespDTO.class);
+ dataView.setAlarmeList(alarmList);
+ }
+
result.setPredictTime(predictTime);
result.setStartTime(startTime);
result.setEndTime(endTime);
--
Gitblit v1.9.3