From 17af6aabf02cc8d920874a4486998456816a8cd4 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 28 五月 2025 15:12:04 +0800
Subject: [PATCH] 实时页面修改
---
src/main/java/com/whyc/webSocket/RealTimeSocket.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/RealTimeSocket.java b/src/main/java/com/whyc/webSocket/RealTimeSocket.java
index 161833f..a9c73fe 100644
--- a/src/main/java/com/whyc/webSocket/RealTimeSocket.java
+++ b/src/main/java/com/whyc/webSocket/RealTimeSocket.java
@@ -294,24 +294,37 @@
}
//鑾峰彇鐢垫簮鐣岄潰淇℃伅
private Response getPowerPage(RealTimeDto realDto) {
- return new Response().set(1);
+ Map<String, Object> map=new HashMap<>();
+ try {
+ //瀹炴椂鑾峰彇鐢垫簮淇℃伅
+ PwrdevAcdcdata pwrdevAcdcdata = pwrdevAcdcdataService.getPwrRealInfo(realDto.getPowerId());
+ map.put("pwrdevAcdcdata",pwrdevAcdcdata);
+ return new Response().setII(1,true,map,"鐢垫簮鐣岄潰淇℃伅鎺ㄩ��");
+ }catch (Exception e){
+ return new Response().set(1,false,"鐢垫簮鐣岄潰淇℃伅鎺ㄩ��");
+ }
}
//鑾峰彇绯荤粺姒傝堪鐣岄潰淇℃伅
private Response getSystemPage(RealTimeDto realDto) {
+ Map<String, Object> map=new HashMap<>();
try {
//瀹炴椂鑾峰彇鐢垫睜缁勪俊鎭�
BattRtstate battRtstate = battRtstateService.getBattRealInfo(realDto.getBattgroupId());
+ map.put("battRtstate",battRtstate);
//瀹炴椂鑾峰彇璁惧淇℃伅
DeviceState deviceState = deviceStateService.getDevRealInfo(realDto.getDevId());
+ map.put("deviceState",deviceState);
//鑾峰彇涓婁竴娆℃爣鍑嗘牳瀹逛俊鎭�
BatttestdataInf tinfData= batttestdataInfService.getLastStandardTestData(realDto.getBattgroupId());
+ map.put("tinfData",tinfData);
//鑾峰彇杩戝崐灏忔椂鐢垫簮鏁版嵁
//鑾峰彇杩戝崐灏忔椂鏁存祦鍣ㄦ暟鎹�
//鑾峰彇杩戝崐灏忔椂鏍稿璁惧鏁版嵁
+ return new Response().setII(1,true,map,"绯荤粺姒傝堪鎺ㄩ��");
}catch (Exception e) {
e.printStackTrace();
}
- return new Response().set(1);
+ return new Response().set(1,false,"绯荤粺姒傝堪鎺ㄩ��");
}
@OnClose
--
Gitblit v1.9.1