From e7f03acfa5ee4ad4fd6d1ee9e9ae9a5655488f6d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 09 十一月 2021 17:04:46 +0800
Subject: [PATCH] 1109修改
---
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketClient.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 d20fd7e..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,10 +76,11 @@
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.getUserid());
+ comPropertyAlarm.setSerialNo(deviceInfo.getOri_number());
+ comPropertyAlarm.setReceiveNo(deviceInfo.getUserid());
comPropertyAlarm.setStatus(0);
comPropertyAlarm.setCreateTime(new Date());
comPropertyAlarm.setType(1);
--
Gitblit v1.7.1