From a21f9150961e555475455e2d80ea3c5dd14e59d2 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 24 十一月 2023 12:11:06 +0800
Subject: [PATCH] ups告警实时和历史
---
src/main/java/com/whyc/util/SubTablePageInfoUtils.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/util/SubTablePageInfoUtils.java b/src/main/java/com/whyc/util/SubTablePageInfoUtils.java
index 84e6a13..fd03f56 100644
--- a/src/main/java/com/whyc/util/SubTablePageInfoUtils.java
+++ b/src/main/java/com/whyc/util/SubTablePageInfoUtils.java
@@ -2,6 +2,7 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.InterfaceParam;
+import com.whyc.dto.UpsAlarmDTO;
import com.whyc.dto.paramter.AlarmPar;
import com.whyc.dto.paramter.DevAlarmPar;
import com.whyc.dto.result.AlarmRes;
@@ -134,6 +135,15 @@
queryCountMap.put(tableYear,currentCount);
}
}
+ else if (pojo instanceof UpsAlarmDTO) {
+ UpsAlarmDTO param = (UpsAlarmDTO) pojo;
+ param.setAlmStartTime(queryTime.get(0));
+ param.setAlmEndTime(queryTime.get(1));
+ param.setRecordYear(tableName);
+ //int currentCount = powerAlarmHistoryMapper.getCount(param);
+ int currentCount = subService.getCountForUps(param);
+ queryCountMap.put(tableYear, currentCount);
+ }
}
//鍒嗛〉淇℃伅
@@ -204,6 +214,20 @@
dataList.addAll(list);
}
+ else if (pojo instanceof UpsAlarmDTO) {
+ UpsAlarmDTO data = (UpsAlarmDTO) pojo;
+ data.setAlmStartTime(queryTime.get(0));
+ data.setAlmEndTime(queryTime.get(1));
+
+ List<Integer> limitList = tableAndLimitMap.get(key);
+ data.setLimitStart(limitList.get(0));
+ data.setLimitEnd(limitList.get(1));
+ data.setRecordYear(recordYear);
+ //List<DevalarmDataHistory> list = devAlarmDataHistoryMapper.getList2(data);
+ List<UpspwrdevAlarmHistory> list = subService.getList2(data);
+
+ dataList.addAll(list);
+ }
else if (pojo instanceof PwrdevAlarmHistory) {
PwrdevAlarmHistory data = (PwrdevAlarmHistory) pojo;
if(data.getRecordId()==1) {
--
Gitblit v1.9.1