From fe1a042f1e62466517f46f81110225b5b084ba5e Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 27 五月 2025 17:01:18 +0800
Subject: [PATCH] 实时监控页面推送top头部修改
---
src/main/java/com/whyc/webSocket/RealTimeSocket.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/RealTimeSocket.java b/src/main/java/com/whyc/webSocket/RealTimeSocket.java
index 9e7576f..3c79c21 100644
--- a/src/main/java/com/whyc/webSocket/RealTimeSocket.java
+++ b/src/main/java/com/whyc/webSocket/RealTimeSocket.java
@@ -176,8 +176,11 @@
Float restCap = batttestdataInfService.getLastTestDataRestCap(realDto.getBattgroupId());
topDto.setRestCap(restCap);
BattInf binf=battInfService.getBinfByBattgroupId(realDto.getBattgroupId());
- Float restTime= BattCapFactory.getTheoryTime(deviceState.getDevCaptestCurr(), restCap, binf.getMoncapstd());
- topDto.setRestTime(restTime);
+ //瀹炴椂缁勭鐢垫祦锛屽墿浣欏閲忥紝鏍囩О瀹归噺
+ if(battRtstate!=null){
+ Float restTime= BattCapFactory.getTheoryTime(battRtstate.getGroupCurr(), restCap, binf.getMoncapstd());
+ topDto.setRestTime(restTime);
+ }
}
//鑾峰彇涓�绾ф湭澶勭悊瀹炴椂鍛婅鏁�
--
Gitblit v1.9.1