From 810c351c985e2665b87fa20f22ecd758b0a6cf31 Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Wed, 3 Jul 2024 15:43:40 +0800
Subject: [PATCH] =?UTF-8?q?#=E4=BA=91=E6=9C=8D=E5=8A=A1=E7=AB=99=E7=82=B9?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=91=8A=E8=AD=A6&=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java   | 2 +-
 .../src/main/java/com/hnac/hzims/alarm/ws/alart/AlarmHandler.java       | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java
index 16dbe36..2e69bc6 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java
+++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java
@@ -306,7 +306,7 @@ public class AlarmServiceImpl extends BaseServiceImpl<AlarmMapper, AlarmEntity>
         // 功能
         R<List<DeviceInstanceFuncVO>> funcs = deviceClient.getOnlineFunc(emCode);
         if(funcs.isSuccess() && CollectionUtil.isNotEmpty(funcs.getData())) {
-            return funcs.getData().stream().anyMatch(func -> realId.equals(func.getFacDeviceFuncId()));
+            return funcs.getData().stream().anyMatch(func -> realId.equals(func.getSourceAttrSignage()));
         }
         return false;
     }
diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/alart/AlarmHandler.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/alart/AlarmHandler.java
index c41e8c9..f6052a0 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/alart/AlarmHandler.java
+++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/alart/AlarmHandler.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.hnac.hzims.alarm.show.service.AlarmService;
 import com.hnac.hzims.business.ws.alart.vo.AlartParamVo;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +13,6 @@ import org.springframework.web.socket.WebSocketSession;
 import org.springframework.web.socket.handler.TextWebSocketHandler;
 
 import java.io.IOException;
-import java.util.List;
 
 /**
  * @author ysj