From 73bb5617e6aeb4ee8f7dfd4ad54b61d477969d86 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 10 六月 2025 20:22:06 +0800
Subject: [PATCH] 自动充放电自动化流程
---
src/main/java/com/whyc/util/SubTablePageInfoUtil.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
index c436eca..48bb96e 100644
--- a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
+++ b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
@@ -9,6 +9,9 @@
import com.whyc.pojo.db_alarm.DevLithiumAlarmDataYear;
import com.whyc.pojo.db_lithium_ram_db.DevLithiumInf;
import com.whyc.pojo.db_power_alarm.PowerAlarmHistory;
+import com.whyc.pojo.db_power_history.BattRealTimeDataHistory;
+import com.whyc.pojo.db_power_history.BattStationTempHistory;
+import com.whyc.pojo.db_power_history.PowerRealTimeDataHistory;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.service.DevLithiumInfService;
import com.whyc.service.SubTableService;
@@ -175,7 +178,7 @@
Date startTime, Date endTime,
String dbName, String tablePrefix,
Object pojo) throws ParseException, InterruptedException {
- Map<String, List<Date>> queryTimeForSubTables = DateUtil.getQueryTimeForSubTablesByMonthDesc(startTime, endTime);
+ Map<String, List<Date>> queryTimeForSubTables = DateUtil.getQueryTimeForSubTablesByMonthDesc2(startTime, endTime);
//鏌ヨ鍒嗚〃鏄惁瀛樺湪,瀛樺湪鍒欐煡璇㈢粨鏋�
Map<String,Integer> queryCountMap = new LinkedHashMap<>();
Set<String> tableYearKeySet = queryTimeForSubTables.keySet();
@@ -220,6 +223,31 @@
int currentCount = service.getBattHisCount(battAlarmHistory);
queryCountMap.put(tableYear, currentCount);
}
+ else if (pojo instanceof BattStationTempHistory) {
+ BattStationTempHistory tempHistory = new BattStationTempHistory();
+ tempHistory.setStartTime(queryTime.get(0));
+ tempHistory.setEndTime(queryTime.get(1));
+ tempHistory.setRecordYearMonth(tableName);
+ int currentCount = service.getBattStationTempHisCount(tempHistory);
+ queryCountMap.put(tableYear, currentCount);
+ }
+ else if (pojo instanceof BattRealTimeDataHistory) {
+ BattRealTimeDataHistory tempHistory = new BattRealTimeDataHistory();
+ tempHistory.setStartTime(queryTime.get(0));
+ tempHistory.setEndTime(queryTime.get(1));
+ tempHistory.setRecordYearMonth(tableName);
+ int currentCount = service.getBattRealTimeDataHisCount(tempHistory);
+ queryCountMap.put(tableYear, currentCount);
+ }
+ else if (pojo instanceof PowerRealTimeDataHistory) {
+ PowerRealTimeDataHistory tempHistory = new PowerRealTimeDataHistory();
+ tempHistory.setStartTime(queryTime.get(0));
+ tempHistory.setEndTime(queryTime.get(1));
+ tempHistory.setRecordYearMonth(tableName);
+ int currentCount = service.getPowerRealTimeDataHisCount(tempHistory);
+ queryCountMap.put(tableYear, currentCount);
+ }
+
latch.countDown();
});
}
@@ -270,6 +298,39 @@
List<BattAlarmHistory> list = service.getBattHisList(battAlarmHistory);
dataList.addAll(list);
}
+ else if (pojo instanceof BattStationTempHistory){
+ BattStationTempHistory tempHistory = new BattStationTempHistory();
+ tempHistory.setStartTime(queryTime.get(0));
+ tempHistory.setEndTime(queryTime.get(1));
+ tempHistory.setRecordYearMonth(recordYear);
+ List<Integer> limitList = tableAndLimitMap.get(key);
+ tempHistory.setLimitStart(limitList.get(0));
+ tempHistory.setLimitEnd(limitList.get(1));
+ List<BattStationTempHistory> list = service.getBattStationTempHisList(tempHistory);
+ dataList.addAll(list);
+ }
+ else if (pojo instanceof BattRealTimeDataHistory){
+ BattRealTimeDataHistory tempHistory = new BattRealTimeDataHistory();
+ tempHistory.setStartTime(queryTime.get(0));
+ tempHistory.setEndTime(queryTime.get(1));
+ tempHistory.setRecordYearMonth(recordYear);
+ List<Integer> limitList = tableAndLimitMap.get(key);
+ tempHistory.setLimitStart(limitList.get(0));
+ tempHistory.setLimitEnd(limitList.get(1));
+ List<BattRealTimeDataHistory> list = service.getBattRealTimeDataHisList(tempHistory);
+ dataList.addAll(list);
+ }
+ else if (pojo instanceof PowerRealTimeDataHistory){
+ PowerRealTimeDataHistory tempHistory = new PowerRealTimeDataHistory();
+ tempHistory.setStartTime(queryTime.get(0));
+ tempHistory.setEndTime(queryTime.get(1));
+ tempHistory.setRecordYearMonth(recordYear);
+ List<Integer> limitList = tableAndLimitMap.get(key);
+ tempHistory.setLimitStart(limitList.get(0));
+ tempHistory.setLimitEnd(limitList.get(1));
+ List<PowerRealTimeDataHistory> list = service.getPowerRealTimeDataHisList(tempHistory);
+ dataList.addAll(list);
+ }
}
pageInfo.setList(dataList);
return pageInfo;
--
Gitblit v1.9.1