From b6b7c9ea2b2b3ca9b4a2c62b5496f78909900491 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 10 十二月 2024 16:27:23 +0800
Subject: [PATCH] 告警
---
src/main/java/com/whyc/util/SubTablePageInfoUtil.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
index 9b5ba2b..016e37d 100644
--- a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
+++ b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
@@ -3,7 +3,7 @@
import com.github.pagehelper.PageInfo;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.CommonMapper;
-import com.whyc.pojo.db_alarm.BattAlarmHis;
+import com.whyc.pojo.db_alarm.BattAlarmHistory;
import com.whyc.service.SubTableService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -68,13 +68,13 @@
}
pool.execute(()-> {
//====== 鏍规嵁涓嶅悓绫诲瀷绫诲瀷瀵硅薄瀵瑰簲璋冩暣 ======
- if (pojo instanceof BattAlarmHis) {
- BattAlarmHis battAlarmHis = new BattAlarmHis();
- BeanUtils.copyProperties(pojo,battAlarmHis);
- battAlarmHis.setAlmStartTime(queryTime.get(0));
- battAlarmHis.setAlmEndTime(queryTime.get(1));
- battAlarmHis.setRecordYear(tableName);
- int currentCount = service.getBattHisCount(battAlarmHis);
+ if (pojo instanceof BattAlarmHistory) {
+ BattAlarmHistory battAlarmHistory = new BattAlarmHistory();
+ BeanUtils.copyProperties(pojo, battAlarmHistory);
+ battAlarmHistory.setAlmStartTime(queryTime.get(0));
+ battAlarmHistory.setAlmEndTime(queryTime.get(1));
+ battAlarmHistory.setRecordYear(tableName);
+ int currentCount = service.getBattHisCount(battAlarmHistory);
queryCountMap.put(tableYear, currentCount);
}
latch.countDown();
@@ -115,16 +115,16 @@
List<Date> queryTime = queryTimeForSubTables.get(key);
//====== 鏍规嵁涓嶅悓绫诲瀷绫诲瀷瀵硅薄瀵瑰簲璋冩暣 ======
String recordYear = key.equals("default") ? tablePrefix : tablePrefix + "_" + key;
- if(pojo instanceof BattAlarmHis) {
- BattAlarmHis battAlarmHis = new BattAlarmHis();
- BeanUtils.copyProperties(pojo,battAlarmHis);
- battAlarmHis.setAlmStartTime(queryTime.get(0));
- battAlarmHis.setAlmEndTime(queryTime.get(1));
- battAlarmHis.setRecordYear(recordYear);
+ if(pojo instanceof BattAlarmHistory) {
+ BattAlarmHistory battAlarmHistory = new BattAlarmHistory();
+ BeanUtils.copyProperties(pojo, battAlarmHistory);
+ battAlarmHistory.setAlmStartTime(queryTime.get(0));
+ battAlarmHistory.setAlmEndTime(queryTime.get(1));
+ battAlarmHistory.setRecordYear(recordYear);
List<Integer> limitList = tableAndLimitMap.get(key);
- battAlarmHis.setLimitStart(limitList.get(0));
- battAlarmHis.setLimitEnd(limitList.get(1));
- List<BattAlarmHis> list = service.getBattHisList(battAlarmHis);
+ battAlarmHistory.setLimitStart(limitList.get(0));
+ battAlarmHistory.setLimitEnd(limitList.get(1));
+ List<BattAlarmHistory> list = service.getBattHisList(battAlarmHistory);
dataList.addAll(list);
}
}
--
Gitblit v1.9.1