#云服务站点增加告警&告警视频关联

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;
     }

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