From e196f42e9a977c0b2f8452dce875b110fb76e92f Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 28 六月 2025 16:40:41 +0800
Subject: [PATCH] 实时数据统计曲线-核容设备初稿
---
src/main/java/com/whyc/service/SubTablePageInfoService.java | 78 +++++++++++++++++++++++++++------------
1 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index f49315f..21adb88 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -7,6 +7,7 @@
import com.whyc.dto.Real.*;
import com.whyc.dto.RealDataStatic.MonDataDto;
import com.whyc.dto.RealDataStatic.ResRealDataAc;
+import com.whyc.dto.RealDataStatic.ResRealDataHr;
import com.whyc.dto.RealDataStatic.ResRealDataMon;
import com.whyc.dto.Statistic.ComPareChangeCurve;
import com.whyc.dto.Statistic.ComPareChart;
@@ -981,35 +982,28 @@
return list;
}
//瀹炴椂鏁版嵁缁熻鏇茬嚎--鏍稿璁惧
- public List<ResRealDataAc> getSticRealHrData(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)
- .collect(Collectors.joining(","));
- String sql=" select distinct record_time,record_num, "+propertyStr+" "+
+ public List<ResRealDataHr> getSticRealHrData(String tableName, Integer granularity, Date recordDatetime, Date recordDatetime1, Integer maxRecordNum, Integer minRecordNum) {
+ String sql=" select distinct record_time,record_num,online_vol,group_vol,group_curr,group_tmp,hjq_tmp,dev_conresist,dev_condvoldp "+
" from "+tableName+" " +
" where record_time >= '"+ThreadLocalUtil.format(recordDatetime,1)+"' " +
" and record_time <= '"+ThreadLocalUtil.format(recordDatetime1,1)+"' "+
" and (record_num-"+minRecordNum+")%"+granularity+"=0 or record_num="+maxRecordNum+" or record_num="+minRecordNum ;
- List<ResRealDataAc> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
+ sql+=" order by record_num asc";
+ List<ResRealDataHr> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
@Override
public List getResults(ResultSet rs) throws SQLException {
- List<ResRealDataAc> list=new ArrayList<>();
+ List<ResRealDataHr> list=new ArrayList<>();
while (rs.next()){
- ResRealDataAc data=new ResRealDataAc();
- data.setRecordDatetime(rs.getTimestamp("record_time"));
+ ResRealDataHr data=new ResRealDataHr();
+ data.setRecordTime(rs.getTimestamp("record_time"));
data.setRecordNum(rs.getInt("record_num"));
- 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);
+ data.setOnlineVol(rs.getFloat("online_vol"));
+ data.setGroupVol(rs.getFloat("group_vol"));
+ data.setGroupCurr(rs.getFloat("group_curr"));
+ data.setGroupTmp(rs.getFloat("group_tmp"));
+ data.setHjqTmp(rs.getFloat("hjq_tmp"));
+ data.setDevConresist(rs.getFloat("dev_conresist"));
+ data.setDevCondvoldp(rs.getFloat("dev_condvoldp"));
list.add(data);
}
return list;
@@ -1017,7 +1011,45 @@
});
return list;
}
-
+ //鏌ヨ鏍稿璁惧瀛楁鐨勫紓鍔�
+ public List<ResRealDataHr> getHrPropertyChangesByRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, List<Integer> allChangeNums) {
+ String sql=" select distinct record_time,record_num,online_vol,group_vol,group_curr,group_tmp,hjq_tmp,dev_conresist,dev_condvoldp "+
+ " from "+tableName+" where record_time>='"+ActionUtil.sdf.format(recordDatetime)+"'" +
+ " and record_time<='"+ActionUtil.sdf.format(recordDatetime1)+"'";
+ if (allChangeNums.size() > 0) {
+ //鍘婚櫎閲嶅椤�
+ List<Integer> uniqueList = allChangeNums.stream()
+ .distinct()
+ .collect(Collectors.toList());
+ //鎷兼帴鐢熸垚sql
+ String changeNumsStr = uniqueList.stream()
+ .map(String::valueOf)
+ .collect(Collectors.joining(","));
+ sql += " and record_num in (" + changeNumsStr + ")";
+ }
+ sql += " order by record_num asc ";
+ List<ResRealDataHr> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
+ @Override
+ public List getResults(ResultSet rs) throws SQLException {
+ List<ResRealDataHr> list=new ArrayList<>();
+ while (rs.next()){
+ ResRealDataHr data=new ResRealDataHr();
+ data.setRecordTime(rs.getTimestamp("record_time"));
+ data.setRecordNum(rs.getInt("record_num"));
+ data.setOnlineVol(rs.getFloat("online_vol"));
+ data.setGroupVol(rs.getFloat("group_vol"));
+ data.setGroupCurr(rs.getFloat("group_curr"));
+ data.setGroupTmp(rs.getFloat("group_tmp"));
+ data.setHjqTmp(rs.getFloat("hjq_tmp"));
+ data.setDevConresist(rs.getFloat("dev_conresist"));
+ data.setDevCondvoldp(rs.getFloat("dev_condvoldp"));
+ list.add(data);
+ }
+ return list;
+ }
+ });
+ return list;
+ }
//瀹炴椂鏁版嵁缁熻鏇茬嚎--钃勭數姹犵粍
public List<ResRealDataMon> getSticRealMonData(String tableName, Integer granularity, Date recordDatetime, Date recordDatetime1, Integer maxRecordNum, Integer minRecordNum) {
String sql=" select distinct battgroup_id,record_time,record_num,mon_num,mon_vol,mon_tmp,mon_res,mon_jh_curr "+
@@ -1040,7 +1072,6 @@
ResRealDataMon data = map.get(key);
if (data == null) {
data = new ResRealDataMon();
- data.setBattgroupId(battgroupId);
data.setRecordTime(recordTime);
data.setRecordNum(recordNum);
data.setMonList(new ArrayList<>());
@@ -1117,7 +1148,6 @@
ResRealDataMon data = map.get(key);
if (data == null) {
data = new ResRealDataMon();
- data.setBattgroupId(battgroupId);
data.setRecordTime(recordTime);
data.setRecordNum(recordNum);
data.setMonList(new ArrayList<>());
--
Gitblit v1.9.1