From 1344fc0c324fe2cb2b090efda8e7c4128da1c30b Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 27 五月 2025 14:58:43 +0800
Subject: [PATCH] 电池，设备，电源历史告警
---
src/main/java/com/whyc/util/SubTablePageInfoUtils.java | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/whyc/util/SubTablePageInfoUtils.java b/src/main/java/com/whyc/util/SubTablePageInfoUtils.java
index 2ec9399..1a4a837 100644
--- a/src/main/java/com/whyc/util/SubTablePageInfoUtils.java
+++ b/src/main/java/com/whyc/util/SubTablePageInfoUtils.java
@@ -46,17 +46,10 @@
Set<String> tableYearKeySet = queryTimeForSubTables.keySet();
for (String tableYear : tableYearKeySet) {
List<Date> queryTime = queryTimeForSubTables.get(tableYear);
-
- String tableName;
- if(!tableYear.equals("default")){
- //鏁板��
- tableName = tablePrefix+"_"+tableYear;
- String existTableName = commonMapper.existTable(dbName, tableName);
- if(existTableName == null){
- continue;
- }
- }else{
- tableName = tablePrefix;
+ String tableName=tablePrefix+"_"+tableYear;;
+ String existTableName = commonMapper.existTable(dbName, tableName);
+ if(existTableName == null){
+ continue;
}
//====== 鏍规嵁涓嶅悓绫诲瀷绫诲瀷瀵硅薄瀵瑰簲璋冩暣 ======
if(pojo instanceof PwrAlmPar) {
@@ -147,7 +140,6 @@
CountDownLatch latch = new CountDownLatch(tableYearListInDB.size());
for (String tableYear : tableYearListInDB) {
List<Date> queryTime = queryTimeForSubTables.get(tableYear);
-
String tableName;
if(!tableYear.equals("default")){
//鏁板��
@@ -156,7 +148,6 @@
tableName = tablePrefix;
}
pool.execute(()-> {
-
//====== 鏍规嵁涓嶅悓绫诲瀷绫诲瀷瀵硅薄瀵瑰簲璋冩暣 ======
if (pojo instanceof BattAlmPar) { //鐢垫睜鍛婅鍘嗗彶
BattAlmPar param = new BattAlmPar();
@@ -175,7 +166,6 @@
param.setRecordYear(tableName);
int currentCount = subService.getDevAlmHisCount(param);
queryCountMap.put(tableYear, currentCount);
-
}
latch.countDown();
--
Gitblit v1.9.1