From 5da72b5cb4340856d7986954b36cba7d0f79cac8 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 11 六月 2025 15:02:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/whyc/webSocket/RealTimeSocket.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/RealTimeSocket.java b/src/main/java/com/whyc/webSocket/RealTimeSocket.java
index e7307e4..bd8d203 100644
--- a/src/main/java/com/whyc/webSocket/RealTimeSocket.java
+++ b/src/main/java/com/whyc/webSocket/RealTimeSocket.java
@@ -445,6 +445,9 @@
//瀹炴椂鑾峰彇鐢垫簮淇℃伅
PwrdevAcdcdata pwrdevAcdcdata = pwrdevAcdcdataService.getPwrRealInfo(realDto.getPowerId());
map.put("pwrdevAcdcdata",pwrdevAcdcdata!=null?pwrdevAcdcdata:"");
+ //鐢垫簮瀵硅薄(鏁存祦鍣ㄤ娇鐢ㄦ儏鍐�)
+ PowerInf powerInf = powerInfService.getPowerInfById(realDto.getPowerId());
+ map.put("powerInf",powerInf!=null?powerInf:"");
map.put("pageType",realDto.getPageType());
return new Response().setII(1,true,map,"鐢垫簮鐣岄潰淇℃伅鎺ㄩ��");
}catch (Exception e){
--
Gitblit v1.9.1