From a657d11cb3d3f70a536da25ef54acfa46602f62c Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 07 六月 2025 15:35:30 +0800
Subject: [PATCH] 系统概览获取半小时核容设备信息添加负载电流load_curr
---
src/main/java/com/whyc/service/SubTablePageInfoService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index bccff51..88522b3 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -560,11 +560,11 @@
return list;
}
//绯荤粺姒傝鑾峰彇鍗婂皬鏃舵牳瀹硅澶囦俊鎭�(缁勭淇℃伅鍙栦竴涓崟浣撲俊鎭嵆鍙�)
- public List<BattHisRealDto> getHalfHourBattDevData(String tableName,Integer granularity) {
+ public List<BattHisRealDto> getHalfHourBattDevData(String tableName,Integer granularity,String halfHourAgoTime) {
String sql="select distinct mon_num,record_time,group_vol,online_vol,group_curr,group_tmp,load_curr " +
"from (select a.*, (@i:= @i+1) as number " +
" from (select * from "+tableName+" "+
- " where record_time>date_sub(now(),interval 0.5 hour) and mon_num=1) a, " +
+ " where record_time>='"+halfHourAgoTime+"' and mon_num=1) a, " +
" (select @i:=0) b) c "+
" where c.number%"+granularity+"=0 or c.number=1 ";
sql+=" order by record_time asc";
@@ -588,12 +588,12 @@
return list;
}
//绯荤粺姒傝鑾峰彇鍗婂皬鏃朵氦娴佽緭鍏ョ粺璁�
- public List<PwrHisRealAcInDto> getHalfHourPwrHisAcinData(String tableName,Integer granularity) {
+ public List<PwrHisRealAcInDto> getHalfHourPwrHisAcinData(String tableName,Integer granularity,String halfHourAgoTime) {
String sql="select distinct record_datetime,acin1_vola,acin1_volb,acin1_volc,acin2_vola,acin2_volb,acin2_volc " +
",acin1_curra,acin1_currb,acin1_currc,acin2_curra,acin2_currb,acin2_currc " +
"from (select a.*, (@i:= @i+1) as number " +
" from (select * from "+tableName+" "+
- " where record_datetime>date_sub(now(),interval 0.5 hour)) a, " +
+ " where record_datetime>='"+halfHourAgoTime+"') a, " +
" (select @i:=0) b) c "+
" where c.number%"+granularity+"=0 or c.number=1 ";
sql+=" order by record_datetime asc";
@@ -624,11 +624,11 @@
return list;
}
- public List<PwrHisRealDcoutInDto> getHalfHourPwrHisDcoutData(String tableName,Integer granularity) {
+ public List<PwrHisRealDcoutInDto> getHalfHourPwrHisDcoutData(String tableName,Integer granularity,String halfHourAgoTime) {
String sql="select distinct * " +
"from (select a.*, (@i:= @i+1) as number " +
" from (select * from "+tableName+" "+
- " where record_datetime>date_sub(now(),interval 0.5 hour)) a, " +
+ " where record_datetime>='"+halfHourAgoTime+"') a, " +
" (select @i:=0) b) c "+
" where c.number%"+granularity+"=0 or c.number=1 ";
sql+=" order by record_datetime asc";
--
Gitblit v1.9.1