From 05b98aee3034e9fd06ca7018999796b1490bed36 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 26 六月 2025 16:47:29 +0800
Subject: [PATCH] 实时数据曲线统计-核容设备初稿
---
src/main/java/com/whyc/service/SubTablePageInfoService.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index 009cd4a..0fd03d3 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -700,7 +700,7 @@
return list;
}
//瀹炴椂鏁版嵁鏁版嵁鏇茬嚎缁熻-浜ゆ祦鍗曞厓
- public List<ResRealDataAc> getPwrHisAcData(String tableName, Integer granularity, Date recordDatetime, Date recordDatetime1
+ public List<ResRealDataAc> getSticRealAcData(String tableName, Integer granularity, Date recordDatetime, Date recordDatetime1
, Integer maxRecordNum, Integer minRecordNum, Map<String, List<String>> propertyInfo) {
String propertyStr = propertyInfo.values().stream()
.flatMap(List::stream)
@@ -879,7 +879,7 @@
}
//鐢垫睜鏁版嵁鍘嗗彶瀹炴椂澶勭悊
public List<RealDateDTO> getBattRealDataHis(BattRealdataId realdata, int granularity,Integer maxRecordNum,Integer minRecordNum) {
- String sql=" select record_time, group_vol, online_vol,group_curr,load_curr, mon_vol, mon_tmp, mon_res, mon_num,record_num " +
+ String sql=" select distinct 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)+"' "+
@@ -906,7 +906,42 @@
});
return list;
}
-
+ //瀹炴椂鏁版嵁缁熻鏇茬嚎--鏍稿璁惧
+ public List<ResRealDataAc> getSticRealHrData(BattRealdataId realdata, Integer granularity, Integer maxRecordNum, Integer minRecordNum, Map<String, List<String>> propertyInfo) {
+ String propertyStr = propertyInfo.values().stream()
+ .flatMap(List::stream)
+ .collect(Collectors.joining(","));
+ String sql=" select distinct record_time, "+propertyStr+" "+
+ " 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)+"' "+
+ " and (record_num-"+minRecordNum+")%"+granularity+"=0 or record_num="+maxRecordNum+" or record_num="+minRecordNum ;
+ List<ResRealDataAc> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
+ @Override
+ public List getResults(ResultSet rs) throws SQLException {
+ List<ResRealDataAc> list=new ArrayList<>();
+ while (rs.next()){
+ ResRealDataAc data=new ResRealDataAc();
+ data.setRecordDatetime(rs.getTimestamp("record_time"));
+ Map<String,Map<String,Float>>dataMap=new HashMap<>();
+ for (Map.Entry<String, List<String>> entry : propertyInfo.entrySet()) {
+ String key = entry.getKey();
+ List<String> valueList = entry.getValue();
+ Map<String,Float> propertyMap=new HashMap<>();
+ for (String value : valueList) {
+ Float propertyValue = rs.getFloat(value);
+ propertyMap.put(value,propertyValue);
+ }
+ dataMap.put(key,propertyMap);
+ }
+ data.setPropertyInfo(dataMap);
+ list.add(data);
+ }
+ return list;
+ }
+ });
+ return list;
+ }
//绯荤粺姒傝鑾峰彇鍓峃绗旀牳瀹硅澶囦俊鎭�
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, load_curr,record_num " +
@@ -1139,4 +1174,5 @@
});
return list;
}
+
}
--
Gitblit v1.9.1