From 8c635598000e40edfb3edf5934124ad48d60f62d Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 21 六月 2025 19:14:50 +0800
Subject: [PATCH] 实时页面修改
---
src/main/java/com/whyc/webSocket/RealTimeSocket.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/RealTimeSocket.java b/src/main/java/com/whyc/webSocket/RealTimeSocket.java
index 21c91bb..48fa2e9 100644
--- a/src/main/java/com/whyc/webSocket/RealTimeSocket.java
+++ b/src/main/java/com/whyc/webSocket/RealTimeSocket.java
@@ -261,14 +261,19 @@
topDto.setPwrALmNum(pwrALmNum);
//瀹炴椂鑾峰彇鐢垫簮淇℃伅(鏄惁瀛樺湪鐢垫簮鍛婅淇℃伅)
- //PwrdevAcdcdata pwrdevAcdcdata = pwrdevAcdcdataService.getPwrRealInfo(realDto.getPowerId());
- topDto.setPwrState((pwrALmNum > 0 ? 1 : 0));
- topDto.setPwrStateName((pwrALmNum > 0 ? "鐢垫簮寮傚父" : "鐢垫簮姝ｅ父"));
-
+ PwrdevAcdcdata pwrdevAcdcdata = pwrdevAcdcdataService.getPwrRealInfo(realDto.getPowerId());
+ topDto.setPwrState(pwrdevAcdcdata.getIsJunCharge());
+ //鏌ョ湅褰撳墠鏄惁瀛樺湪浜ゆ祦鍋滅數鍛婅锛坕s_jun_charge 鐢垫簮鏄惁鍧囧厖[1-鍧囧厖 0-娴厖],鑻ュ綋鍓嶇數婧愬瓨鍦ㄤ氦娴佸仠鐢靛憡璀﹀垯鏄剧ず鍋滅數鍏朵粬鎸夌収鐘舵�佸睍绀恒�傦級
+ int stopFalg=pwrdevAlarmService.judge3100014(realDto.getPowerId());
+ if(stopFalg==1){
+ topDto.setPwrStateName("鍋滅數");
+ }else{
+ topDto.setPwrStateName((pwrdevAcdcdata.getIsJunCharge()==1 ? "鍧囧厖" : "娴厖"));
+ }
Integer allALmNum = battALmNum + devALmNum + pwrALmNum;
topDto.setAllALmNum(allALmNum);
topDto.setSystemState((allALmNum > 0 ? 1 : 0));
- topDto.setSystemStateName((allALmNum > 0 ? "绯荤粺寮傚父" : "绯荤粺姝ｅ父"));
+ topDto.setSystemStateName((allALmNum > 0 ? "寮傚父" : "姝ｅ父"));
}
return new Response().setII(1, true, topDto, "瀹炴椂椤甸潰澶撮儴鏁版嵁鎺ㄩ��");
} catch (Exception e) {
--
Gitblit v1.9.1