From 5752f03cf3236b9d7dc12dff1f88f188c80b727b Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 27 六月 2025 17:10:13 +0800
Subject: [PATCH] 拦截放行退出登录，实时数据统计曲线-交流单元修改
---
src/main/java/com/whyc/service/PwrdevHistorydataIdService.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
index 79faafb..f085e87 100644
--- a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
+++ b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
@@ -313,6 +313,7 @@
//鑾峰彇涓や釜鏃堕棿鍒嗗壊澶氬皯寮犺〃
List<List<Date>> monthTimeList = DateUtil.getMonthTime(startAndEndTime.get("startTime"),startAndEndTime.get("endTime"));
List<ResRealDataAc> dataList = new LinkedList<>();
+ Map<String, Map<String,List<String>>> allTimeMap=new HashMap<>();
ThreadPoolExecutor pool = ThreadPoolExecutorFactory.getPoolExecutor();
CountDownLatch latch = new CountDownLatch(monthTimeList.size());
for (int i = 0; i < monthTimeList.size(); i++) {
@@ -323,11 +324,13 @@
int finalII = finalI;
Date recordDatetime=monthTimeList.get(finalII).get(0);
Date recordDatetime1=monthTimeList.get(finalII).get(1);
- String table = stic.getPowerId() + "_" + ThreadLocalUtil.format(recordDatetime,2);
+ String timeTable=ThreadLocalUtil.format(recordDatetime,2);
+ String table = stic.getPowerId() + "_" + timeTable;
String tableName="db_data_history.tb_pwrdev_historydata_"+table;
//鍒ゆ柇琛ㄦ槸鍚﹀瓨鍦�
int tableNum = subTablePageInfoService.judgeTable_pwrhis(table);
List<ResRealDataAc> list = new ArrayList();
+ Map<String,List<String>> timeMap=new HashMap<>();
if (tableNum > 0) {
//鑾峰彇鎸囧畾鏃堕棿娈靛唴鏈�澶ф渶灏弐ecordNum纭繚鏁版嵁鐨勫畬鏁�
List recordNums= subTablePageInfoService.getPwrMaxAndMinRecordNum(tableName,recordDatetime,recordDatetime1);
@@ -341,28 +344,32 @@
list=subTablePageInfoService.getSticRealAcData(tableName, finalGranularity,recordDatetime,recordDatetime1,maxRecordNum,minRecordNum,propertyInfo);
//鎵�鏈夊睘鎬х殑寮傚姩鐐�
List<Integer> allChangeNums=new ArrayList<>();
- List< Map<String,List<Integer>>> allChangeNumMap=new ArrayList<>();
//鑾峰彇鎸囧畾鏃堕棿鍙栧嚭姣忎釜鍙傛暟鐨勫紓鍔ㄦ鏁板拰寮傚姩鐨剅ecordNum
for (Map.Entry<String, List<String>> entry : propertyInfo.entrySet()) {
String param = entry.getKey();
List<String> valueList = entry.getValue();
- Map<String,List<Integer>> changeNumMap=new HashMap<>();
for (String value : valueList) {
- float upperLimit=250;
+ float upperLimit=350;
float lowerLimit=50;
//鏌ヨ鐢垫簮瀛楁鐨勫紓鍔�
- List<Integer> changeNums= subTablePageInfoService.getChangesRecordNum(tableName,recordDatetime,recordDatetime1,value,upperLimit,lowerLimit);
- allChangeNums.addAll(changeNums);
- changeNumMap.put(value,changeNums);
- allChangeNumMap.add(changeNumMap);
+ List changes= subTablePageInfoService.getChangesRecordNum(tableName,recordDatetime,recordDatetime1,value,upperLimit,lowerLimit);
+ List<Integer> numList= (List<Integer>) changes.get(0);//record_num鐨勯泦鍚�
+ List<String> timeList= (List<String>) changes.get(1);//record_datetime鐨勯泦鍚�
+ if(numList!=null&&numList.size()>0){
+ allChangeNums.addAll(numList);
+ }
+ //瀛樻斁姣忎釜鍙傛暟鐨勫紓鍔ㄦ椂闂寸偣
+ timeMap.put(value,timeList);
}
}
- if(allChangeNums.size()>0){//鍙湁瀛樺湪寮傚姩鐐归噰鍙栨煡璇㈠紓鍔ㄦ暟鎹�
+ //鍙湁瀛樺湪寮傚姩鐐归噰鍙栨煡璇㈠紓鍔ㄦ暟鎹�
+ if(allChangeNums.size()>0){
//鏌ヨ澶х被鍙傛暟涓嬫墍鏈夊紓鍔╮ecordNum鐨勮褰曚箣鍜�
List<ResRealDataAc> paramList=subTablePageInfoService.getPropertyChangesByRecordNum(tableName,recordDatetime,recordDatetime1,allChangeNums,propertyInfo);
list.addAll(paramList);
}
}
+ allTimeMap.put(timeTable,timeMap);
dataList.addAll(list);
latch.countDown();
});
@@ -373,6 +380,8 @@
.distinct()
.collect(Collectors.toList());
List dataListSorted = uniqueList.stream().sorted(Comparator.comparing(ResRealDataAc::getRecordNum)).collect(Collectors.toList());
- return new Response().setII(1,dataList.size()>0,dataListSorted,"瀹炴椂鏁版嵁鏁版嵁鏇茬嚎缁熻-浜ゆ祦鍗曞厓");
+ //鎵�鏈夊紓鍔ㄧ偣鍚堝苟鍘婚噸
+ Map<String, List<String>> mergedMap =ActionUtil.getMergeMap(allTimeMap);
+ return new Response().setIII(1,dataList.size()>0,dataListSorted,mergedMap,"瀹炴椂鏁版嵁鏁版嵁鏇茬嚎缁熻-浜ゆ祦鍗曞厓");
}
}
\ No newline at end of file
--
Gitblit v1.9.1