From d58bf74993ed4b4f8f494da78da34f90164f6363 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 29 五月 2025 14:20:43 +0800
Subject: [PATCH] 实时页面
---
src/main/java/com/whyc/webSocket/RealTimeSocket.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/RealTimeSocket.java b/src/main/java/com/whyc/webSocket/RealTimeSocket.java
index dc48682..1aa6ebb 100644
--- a/src/main/java/com/whyc/webSocket/RealTimeSocket.java
+++ b/src/main/java/com/whyc/webSocket/RealTimeSocket.java
@@ -343,7 +343,7 @@
}
avgData=avgData/rtdataList.size();
}
- map.put("rtdataList",rtdataList);
+ map.put("rtdataList",rtdataList!=null?rtdataList:"");
map.put("maxData",maxData);
map.put("minData",minData);
map.put("avgData",avgData);
@@ -379,13 +379,13 @@
}
avgData=avgData/rtdataList.size();
}
- map.put("rtdataList",rtdataList);
+ map.put("rtdataList",rtdataList!=null?rtdataList:"");
map.put("maxData",maxData);
map.put("minData",minData);
map.put("avgData",avgData);
//涓婁竴娆″唴闃绘祴璇曟暟鎹�
BattresdataInf rinfData= battresdataInfService.getLastTestData(realDto.getBattgroupId());
- map.put("rinfData",rinfData);
+ map.put("rinfData",rinfData!=null?rinfData:"");
map.put("pageType",realDto.getPageType());
return new Response().setII(1,true,map,"鍐呴樆鐣岄潰淇℃伅鎺ㄩ��");
}catch (Exception e){
@@ -418,7 +418,7 @@
}
avgData=avgData/rtdataList.size();
}
- map.put("rtdataList",rtdataList);
+ map.put("rtdataList",rtdataList!=null?rtdataList:"");
map.put("maxData",maxData);
map.put("minData",minData);
map.put("avgData",avgData);
@@ -434,7 +434,7 @@
try {
//瀹炴椂鑾峰彇鐢垫簮淇℃伅
PwrdevAcdcdata pwrdevAcdcdata = pwrdevAcdcdataService.getPwrRealInfo(realDto.getPowerId());
- map.put("pwrdevAcdcdata",pwrdevAcdcdata);
+ map.put("pwrdevAcdcdata",pwrdevAcdcdata!=null?pwrdevAcdcdata:"");
map.put("pageType",realDto.getPageType());
return new Response().setII(1,true,map,"鐢垫簮鐣岄潰淇℃伅鎺ㄩ��");
}catch (Exception e){
@@ -444,20 +444,20 @@
//鑾峰彇绯荤粺姒傝堪鐣岄潰淇℃伅
private Response getSystemPage(RealTimeDto realDto) {
Map<String, Object> map=new HashMap<>();
+ map.put("pageType",realDto.getPageType());
try {
//瀹炴椂鑾峰彇鐢垫睜缁勪俊鎭�
BattRtstate battRtstate = battRtstateService.getBattRealInfo(realDto.getBattgroupId());
- map.put("battRtstate",battRtstate);
+ map.put("battRtstate",battRtstate!=null?battRtstate:"");
//瀹炴椂鑾峰彇璁惧淇℃伅
DeviceState deviceState = deviceStateService.getDevRealInfo(realDto.getDevId());
- map.put("deviceState",deviceState);
+ map.put("deviceState",deviceState!=null?deviceState:"");
//鑾峰彇涓婁竴娆℃爣鍑嗘牳瀹逛俊鎭�
BatttestdataInf tinfData= batttestdataInfService.getLastStandardTestData(realDto.getBattgroupId());
- map.put("tinfData",tinfData);
+ map.put("tinfData",tinfData!=null?tinfData:"");
//鑾峰彇杩戝崐灏忔椂鐢垫簮鏁版嵁锛屾暣娴佸櫒鏁版嵁锛屾牳瀹硅澶囨暟鎹紙鎺ㄩ�佸疄鏃讹紝鎺ュ彛鏌ヨ鏈�杩戝崐灏忔椂鏁版嵁锛�
PwrdevAcdcdata pwrdevAcdcdata = pwrdevAcdcdataService.getPwrRealInfo(realDto.getPowerId());
- map.put("pwrdevAcdcdata",pwrdevAcdcdata);
- map.put("pageType",realDto.getPageType());
+ map.put("pwrdevAcdcdata",pwrdevAcdcdata!=null?pwrdevAcdcdata:"");
return new Response().setII(1,true,map,"绯荤粺姒傝堪鎺ㄩ��");
}catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1