From b6234104a59e023e0d565d9cbf34c1a830e31ecd Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 23 六月 2025 11:05:06 +0800
Subject: [PATCH] 电源心跳参数推送
---
src/main/java/com/whyc/service/SubTablePageInfoService.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index 839845b..407bf36 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -769,7 +769,7 @@
}
//鐢垫睜鏁版嵁鍘嗗彶瀹炴椂澶勭悊
public List<RealDateDTO> getBattRealDataHis(BattRealdataId realdata, int granularity,Integer maxRecordNum,Integer minRecordNum) {
- String sql=" select record_time, group_vol, online_vol,group_curr, mon_vol, mon_tmp, mon_res, mon_num,record_num " +
+ String sql=" select record_time, group_vol, online_vol,group_curr,load_curr, mon_vol, mon_tmp, mon_res, mon_num,record_num " +
" from db_data_history.tb_batt_realdata_"+realdata.getTableName()+" " +
" where record_time >= '"+ThreadLocalUtil.format(realdata.getRecordTime(),1)+"' " +
" and record_time <= '"+ThreadLocalUtil.format(realdata.getRecordTime1(),1)+"' "+
@@ -799,7 +799,7 @@
//绯荤粺姒傝鑾峰彇鍓峃绗旀牳瀹硅澶囦俊鎭�
public List<RealDateDTO> getBattDevData100(String tableName, Integer granularity, Date recordDatetime, Date recordDatetime1,Integer maxRecordNum,Integer minRecordNum) {
- String sql=" select record_time, group_vol, online_vol,group_curr, mon_vol, mon_tmp, mon_res, mon_num,record_num " +
+ String sql=" select record_time, group_vol, online_vol,group_curr, load_curr,record_num " +
" from "+tableName+" " +
" where record_time >= '"+ThreadLocalUtil.format(recordDatetime,1)+"' " +
" and record_time <= '"+ThreadLocalUtil.format(recordDatetime1,1)+"' "+
@@ -814,10 +814,7 @@
ph.setGroupVol(rs.getFloat("group_vol"));
ph.setOnlineVol(rs.getFloat("online_vol"));
ph.setGroupCurr(rs.getFloat("group_curr"));
- ph.setMonVol(rs.getFloat("mon_vol"));
- ph.setMonTmp(rs.getFloat("mon_tmp"));
- ph.setMonRes(rs.getFloat("mon_res"));
- ph.setMonNum(rs.getInt("mon_num"));
+ ph.setLoadCurr(rs.getFloat("load_curr"));
ph.setRecordNum(rs.getInt("record_num"));
list.add(ph);
}
--
Gitblit v1.9.1