From e691b98e02153c9c439d7f5acb468924572d75d9 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 09 一月 2025 17:31:17 +0800
Subject: [PATCH] item动态时间粒度
---
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 8ea2538..fcf9866 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
@@ -1,5 +1,6 @@
package com.iailab.module.model.api;
+import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.data.api.plan.PlanItemApi;
@@ -252,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();
}
@@ -569,6 +570,11 @@
return chartParamService.list(chartCode);
}
+ @Override
+ public PageResult<StAlarmAndSuggestRespVO> getAlarmAndSuggestPage(StAlarmAndSuggestPageReqVO reqVO) {
+ return stScheduleSchemeService.getAlarmAndSuggestPage(reqVO);
+ }
+
private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) {
Date[] result = new Date[3];
Date predictTime = predictItem.getLastTime();
--
Gitblit v1.9.3