From a9df6151d30ea1e2053d168496763dd8f0b27a45 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 23 六月 2025 09:57:00 +0800
Subject: [PATCH] 实时页面系统概论推送指定时间到当前的数据
---
src/main/java/com/whyc/service/PwrdevHistorydataIdService.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
index 8e69404..7c00d39 100644
--- a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
+++ b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
@@ -96,7 +96,15 @@
int tableNum = subTablePageInfoService.judgeTable_pwrhis(table);
List<PwrHisRealAcInDto> list = new ArrayList();
if (tableNum > 0) {
- list=subTablePageInfoService.getHalfHourPwrHisAcinData(tableName, finalGranularity,recordDatetime,recordDatetime1);
+ //鑾峰彇鎸囧畾鏃堕棿娈靛唴鏈�澶ф渶灏弐ecordNum纭繚鏁版嵁鐨勫畬鏁�
+ List recordNums= subTablePageInfoService.getPwrMaxAndMinRecordNum(tableName,recordDatetime,recordDatetime1);
+ Integer maxRecordNum= 0;
+ Integer minRecordNum= 0;
+ if(recordNums.size()>0){
+ maxRecordNum=(Integer)recordNums.get(0);
+ minRecordNum=(Integer)recordNums.get(1);
+ }
+ list=subTablePageInfoService.getHalfHourPwrHisAcinData(tableName, finalGranularity,recordDatetime,recordDatetime1,maxRecordNum,minRecordNum);
}
dataList.addAll(list);
latch.countDown();
@@ -114,8 +122,8 @@
Integer interverCount=100*5;//榛樿鍊�
Integer granularity=5;//榛樿鍊�
if(heartParam!=null){
- interverCount=heartParam.getAcinInterverCfg()*heartParam.getAcinCountCfg();
- granularity=heartParam.getAcinInterverCfg();
+ interverCount=heartParam.getAcoutInterverCfg()*heartParam.getAcoutCountCfg();
+ granularity=heartParam.getAcoutInterverCfg();//榛樿鏃堕棿闂撮殧涓�鍒嗛挓涓�绗旓紝鎵�浠ユ椂闂撮棿闅斿氨鏄嚑绗斿彇涓�绗�
}
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime now = LocalDateTime.now();
@@ -144,7 +152,15 @@
int tableNum = subTablePageInfoService.judgeTable_pwrhis(table);
List<PwrHisRealDcoutInDto> list = new ArrayList();
if (tableNum > 0) {
- list=subTablePageInfoService.getHalfHourPwrHisDcoutData(tableName, finalGranularity,recordDatetime,recordDatetime1);
+ //鑾峰彇鎸囧畾鏃堕棿娈靛唴鏈�澶ф渶灏弐ecordNum纭繚鏁版嵁鐨勫畬鏁�
+ List recordNums= subTablePageInfoService.getPwrMaxAndMinRecordNum(tableName,recordDatetime,recordDatetime1);
+ Integer maxRecordNum= 0;
+ Integer minRecordNum= 0;
+ if(recordNums.size()>0){
+ maxRecordNum=(Integer)recordNums.get(0);
+ minRecordNum=(Integer)recordNums.get(1);
+ }
+ list=subTablePageInfoService.getHalfHourPwrHisDcoutData(tableName, finalGranularity,recordDatetime,recordDatetime1,maxRecordNum,minRecordNum);
}
dataList.addAll(list);
latch.countDown();
--
Gitblit v1.9.1