From e16302f9d475c7cc4dd18c5abf1a23cb5502e362 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 28 五月 2025 14:57:56 +0800
Subject: [PATCH] 密码验证加-
---
src/main/java/com/whyc/util/SubTablePageInfoUtils.java | 61 +++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/whyc/util/SubTablePageInfoUtils.java b/src/main/java/com/whyc/util/SubTablePageInfoUtils.java
index adaca38..7fa17b7 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;
@@ -83,7 +84,8 @@
param.setAlmStartTime(queryTime.get(0));
param.setAlmStartTime1(queryTime.get(1));
param.setRecordYear(tableName);
- int currentCount = battAlarmDataHistoryMapper.getCount(param);
+ //int currentCount = battAlarmDataHistoryMapper.getCount(param);
+ int currentCount = subService.getCount(param);
queryCountMap.put(tableYear,currentCount);
}
else if (pojo instanceof DevAlarmPar) {
@@ -121,7 +123,8 @@
param.setStartTime(queryTime.get(0));
param.setEndTime(queryTime.get(1));
param.setRecordYear(tableName);
- int currentCount = battAlarmDataHistoryMapper.getCountForInterface(param);
+ //int currentCount = battAlarmDataHistoryMapper.getCountForInterface(param);
+ int currentCount = subService.getCountForInterface_batt(param);
queryCountMap.put(tableYear,currentCount);
}else if(tablePrefix.equals("tb_devalarm_data_history")){
param.setStartTime(queryTime.get(0));
@@ -131,6 +134,19 @@
int currentCount = subService.getCountForInterface(param);
queryCountMap.put(tableYear,currentCount);
}
+ }
+ else if (pojo instanceof UpsAlarmDTO) {
+ //ups涓嶅瓨鍦ㄥ垵濮嬭〃锛岃烦杩�
+ if(tableYear.equals("default")){
+ continue;
+ }
+ 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);
}
}
@@ -184,7 +200,8 @@
data.setLimitStart(limitList.get(0));
data.setLimitEnd(limitList.get(1));
data.setRecordYear(recordYear);
- List<AlarmRes> list = battAlarmDataHistoryMapper.getList2(data);
+ //List<AlarmRes> list = battAlarmDataHistoryMapper.getList2(data);
+ List<AlarmRes> list = subService.getList2(data);
dataList.addAll(list);
}
else if (pojo instanceof DevAlarmPar) {
@@ -198,6 +215,20 @@
data.setRecordYear(recordYear);
//List<DevalarmDataHistory> list = devAlarmDataHistoryMapper.getList2(data);
List<DevalarmDataHistory> list = subService.getList2(data);
+
+ 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);
}
@@ -317,7 +348,8 @@
param.setAlmStartTime(queryTime.get(0));
param.setAlmStartTime1(queryTime.get(1));
param.setRecordYear(tableName);
- int currentCount = battAlarmDataHistoryMapper.getCount(param);
+ //int currentCount = battAlarmDataHistoryMapper.getCount(param);
+ int currentCount = subService.getCount(param);
queryCountMap.put(tableYear, currentCount);
} else if (pojo instanceof DevAlarmPar) {
//DevAlarmPar param = (DevAlarmPar) pojo;
@@ -327,7 +359,8 @@
param.setAlmStartTime1(queryTime.get(1));
param.setRecordYear(tableName);
//int currentCount = devAlarmDataHistoryMapper.getCount(param);
- int currentCount = subService.getCount(param);
+ //int currentCount = subService.getCount(param);
+ int currentCount = subService.getCount_stationId(param);
queryCountMap.put(tableYear, currentCount);
} else if (pojo instanceof PwrdevAlarmHistory) {
@@ -358,7 +391,8 @@
param.setStartTime(queryTime.get(0));
param.setEndTime(queryTime.get(1));
param.setRecordYear(tableName);
- int currentCount = battAlarmDataHistoryMapper.getCountForInterface(param);
+ //int currentCount = battAlarmDataHistoryMapper.getCountForInterface(param);
+ int currentCount = subService.getCountForInterface_batt(param);
queryCountMap.put(tableYear, currentCount);
} else if (tablePrefix.equals("tb_devalarm_data_history")) {
param.setStartTime(queryTime.get(0));
@@ -430,7 +464,8 @@
data.setLimitStart(limitList.get(0));
data.setLimitEnd(limitList.get(1));
data.setRecordYear(recordYear);
- List<AlarmRes> list = battAlarmDataHistoryMapper.getList2(data);
+ //List<AlarmRes> list = battAlarmDataHistoryMapper.getList2(data);
+ List<AlarmRes> list = subService.getList2(data);
dataList.addAll(list);
}
else if (pojo instanceof DevAlarmPar) {
@@ -443,7 +478,8 @@
data.setLimitEnd(limitList.get(1));
data.setRecordYear(recordYear);
//List<DevalarmDataHistory> list = devAlarmDataHistoryMapper.getList2(data);
- List<DevalarmDataHistory> list = subService.getList2(data);
+ //List<DevalarmDataHistory> list = subService.getList2(data);
+ List<DevalarmDataHistory> list = subService.getList2_stationId(data);
dataList.addAll(list);
}
else if (pojo instanceof PwrdevAlarmHistory) {
@@ -525,13 +561,16 @@
List<BattalarmDataHistory> levelInfoSubList;
List<Integer> levelSubList;
if(tableLike.equals("tb_battalarm_data_history")) {
- levelInfoSubList = battAlarmDataHistoryMapper.getLevelSubList(uId, tableName);
+ //levelInfoSubList = battAlarmDataHistoryMapper.getLevelSubList(uId, tableName);
+ levelInfoSubList = subService.getLevelSubList_batt(uId, tableName);
}
else if(tableLike.equals("tb_devalarm_data_history")){
- levelInfoSubList = devAlarmDataHistoryMapper.getLevelSubList(uId, tableName);
+ //levelInfoSubList = devAlarmDataHistoryMapper.getLevelSubList(uId, tableName);
+ levelInfoSubList = subService.getLevelSubList_dev(uId, tableName);
}
else{
- levelInfoSubList = powerAlarmHistoryMapper.getLevelSubList(uId, tableName,almTypes);
+ //levelInfoSubList = powerAlarmHistoryMapper.getLevelSubList(uId, tableName,almTypes);
+ levelInfoSubList = subService.getLevelSubList_pwr(uId, tableName,almTypes);
}
levelSubList = levelInfoSubList.stream().map(BattalarmDataHistory::getAlmLevel).collect(Collectors.toList());
levelList.addAll(levelSubList);
--
Gitblit v1.9.1