From 0e098bc8867700017407c7954d8e03d9dd1b8cb4 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 07 六月 2025 14:50:19 +0800
Subject: [PATCH] 电池组历史实时数据
---
src/main/java/com/whyc/service/BattRealdataIdService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattRealdataIdService.java b/src/main/java/com/whyc/service/BattRealdataIdService.java
index cf13d1a..fe934ed 100644
--- a/src/main/java/com/whyc/service/BattRealdataIdService.java
+++ b/src/main/java/com/whyc/service/BattRealdataIdService.java
@@ -175,7 +175,6 @@
public Response getBattRealDataHis(Integer battgroupId, Integer granularity,String startTime,String endTime) throws ParseException, InterruptedException {
List<RealDateDTO> dataList = new LinkedList<>();
List<List<Date>> monthTimeList = DateUtil.getMonthTime(ThreadLocalUtil.parse(startTime,1), ThreadLocalUtil.parse(endTime,1));
-
ThreadPoolExecutor pool = ThreadPoolExecutorFactory.getPoolExecutor();
CountDownLatch latch = new CountDownLatch(monthTimeList.size());
for (int i = 0; i < monthTimeList.size(); i++) {
@@ -191,7 +190,15 @@
int tableNum = subTablePageInfoService.judgeTable_realdata(table);
List<RealDateDTO> list = new ArrayList();
if (tableNum > 0) {
- list = subTablePageInfoService.serchByCondition2(realdata,granularity);
+ //鑾峰彇鎸囧畾鏃堕棿娈靛唴鏈�澶ф渶灏弐ecordNum纭繚鏁版嵁鐨勫畬鏁�
+ List recordNums= subTablePageInfoService.getMaxAndMinRecordNum(realdata);
+ Integer maxRecordNum= 0;
+ Integer minRecordNum= 0;
+ if(recordNums.size()>0){
+ maxRecordNum=(Integer)recordNums.get(0);
+ minRecordNum=(Integer)recordNums.get(1);
+ }
+ list = subTablePageInfoService.getBattRealDataHis(realdata,granularity,maxRecordNum,minRecordNum);
}
dataList.addAll(list);
latch.countDown();
--
Gitblit v1.9.1