From 1859455568cab9f4cfcaedab6777327dc339b0be Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期一, 27 三月 2023 12:45:03 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/fg_v2.0
---
src/main/java/com/whyc/webSocket/ScreenSocket.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/ScreenSocket.java b/src/main/java/com/whyc/webSocket/ScreenSocket.java
index 289d213..5748e97 100644
--- a/src/main/java/com/whyc/webSocket/ScreenSocket.java
+++ b/src/main/java/com/whyc/webSocket/ScreenSocket.java
@@ -102,7 +102,7 @@
try {
int battAlarmNum = battAlarmDataService.serchRealTime(userId).getCode();
int devAlarmNum = devAlarmDataService.getAlarmNum(userId);
- int powerAlarmNum = (int) powerAlarmService.getAlarmNum().getData();
+ int powerAlarmNum = powerAlarmService.getAlarmNumByUserId(userId);
devAlarmNumMap.put("battAlarmNum",battAlarmNum);
devAlarmNumMap.put("devAlarmNum",devAlarmNum);
devAlarmNumMap.put("powerAlarmNum",powerAlarmNum);
--
Gitblit v1.9.1