From e6675831742a89e4d2a9ecc25229727e16805dd0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 08 十月 2021 17:52:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketClient.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketClient.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketClient.java
index 60f89e9..621cc0a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketClient.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketClient.java
@@ -76,7 +76,7 @@
DeviceDto deviceInfo = JSONObject.parseObject(message, DeviceDto.class);
boolean checkFlag =
"RINGING".equals(deviceInfo.getCallstatus()) && StringUtils.isNotEmpty(deviceInfo.getOri_number());
- if ("abort".equals(deviceInfo.getStatus()) || checkFlag) {
+ if (checkFlag) {
logger.info("收到设备报警信息：{}", message);
ComPropertyAlarm comPropertyAlarm = new ComPropertyAlarm();
comPropertyAlarm.setSerialNo(deviceInfo.getOri_number());
--
Gitblit v1.7.1