From e32d08b4c52359cd4639068f53e28f28e32bb385 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 27 六月 2025 17:43:01 +0800
Subject: [PATCH] 拦截放行退出登录，实时数据统计曲线-核容设备
---
src/main/java/com/whyc/service/SubTablePageInfoService.java | 89 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 82 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index 47ba6f3..b49a7a0 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<Object> getChangesRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, String value, float upperLimit, float lowerLimit) {
+ public List<Object> getPwrChangesRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, String value, float upperLimit, float lowerLimit) {
String sql=" select distinct record_datetime,record_num "+
" from "+tableName+" where record_datetime>='"+ActionUtil.sdf.format(recordDatetime)+"'" +
" and record_datetime<='"+ActionUtil.sdf.format(recordDatetime1)+"'" +
@@ -724,7 +724,7 @@
return list;
}
//鏌ヨ鐢垫簮瀛楁鐨勫紓鍔�
- public List<ResRealDataAc> getPropertyChangesByRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, List<Integer> allChangeNums, Map<String, List<String>> propertyInfo) {
+ public List<ResRealDataAc> getPwrPropertyChangesByRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, List<Integer> allChangeNums, Map<String, List<String>> propertyInfo) {
String propertyStr = propertyInfo.values().stream()
.flatMap(List::stream)
.collect(Collectors.joining(","));
@@ -979,14 +979,14 @@
return list;
}
//瀹炴椂鏁版嵁缁熻鏇茬嚎--鏍稿璁惧
- public List<ResRealDataAc> getSticRealHrData(BattRealdataId realdata, Integer granularity, Integer maxRecordNum, Integer minRecordNum, Map<String, List<String>> propertyInfo) {
+ 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, "+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)+"' "+
+ String sql=" select distinct record_time,record_num, "+propertyStr+" "+
+ " 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() {
@Override
@@ -994,6 +994,79 @@
List<ResRealDataAc> list=new ArrayList<>();
while (rs.next()){
ResRealDataAc data=new ResRealDataAc();
+ data.setRecordDatetime(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);
+ list.add(data);
+ }
+ return list;
+ }
+ });
+ return list;
+ }
+
+ //鏌ヨ鐢垫睜缁勫瓧娈电殑寮傚姩鐨勮褰�
+ public List<Object> getBattChangesRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, String value, float upperLimit, float lowerLimit) {
+ String sql=" select distinct record_time,record_num "+
+ " from "+tableName+" where record_time>='"+ActionUtil.sdf.format(recordDatetime)+"'" +
+ " and record_time<='"+ActionUtil.sdf.format(recordDatetime1)+"'" +
+ " and "+value+">"+upperLimit+" or "+value+"<"+lowerLimit+" ";
+ sql+=" order by record_num asc";
+ List<Object> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
+ @Override
+ public List getResults(ResultSet rs) throws SQLException {
+ List list=new ArrayList<>();
+ List numList=new ArrayList<>();
+ List timeList=new ArrayList<>();
+ while (rs.next()){
+ numList.add(rs.getInt("record_num"));
+ timeList.add(rs.getString("record_time"));
+ }
+ list.add(numList);
+ list.add(timeList);
+ return list;
+ }
+ });
+ return list;
+ }
+ //鏌ヨ鐢垫睜缁勫瓧娈电殑寮傚姩
+ public List<ResRealDataAc> getBattPropertyChangesByRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, List<Integer> allChangeNums, 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+
+ " 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_time asc";
+ 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.setRecordNum(rs.getInt("record_num"));
data.setRecordDatetime(rs.getTimestamp("record_time"));
Map<String,Map<String,Float>>dataMap=new HashMap<>();
for (Map.Entry<String, List<String>> entry : propertyInfo.entrySet()) {
@@ -1014,6 +1087,8 @@
});
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 " +
--
Gitblit v1.9.1