From a127882c8f15593783fcf0a1489835c16db70682 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 31 三月 2025 00:51:54 +0800
Subject: [PATCH] 电池站点温度历史,按摄像头id,月分表
---
src/main/java/com/whyc/util/SubTablePageInfoUtil.java | 21 ++++++++++++++++++++-
1 files changed, 20 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..956cb48 100644
--- a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
+++ b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
@@ -9,6 +9,7 @@
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.BattStationTempHistory;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.service.DevLithiumInfService;
import com.whyc.service.SubTableService;
@@ -175,7 +176,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 +221,14 @@
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);
+ }
latch.countDown();
});
}
@@ -269,6 +278,16 @@
battAlarmHistory.setLimitEnd(limitList.get(1));
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);
}
}
pageInfo.setList(dataList);
--
Gitblit v1.9.1