From d063e28629db4f1b9ff5c102d72406c9a0698edd Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 30 九月 2021 11:24:17 +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 |    3 ++-
 1 files changed, 2 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 b3c7742..db7f3e6 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
@@ -65,6 +65,7 @@
     @OnMessage
     public void onMessage(String message, Session session) {
         // 提取数据
+        logger.info("收到的原始数据：{}", message);
         dealData(message);
     }
 
@@ -75,7 +76,7 @@
         if (deviceInfo.getCallstatus().equals("RINGING")) {
             logger.info("收到设备报警信息：{}", message);
             ComPropertyAlarm comPropertyAlarm = new ComPropertyAlarm();
-            comPropertyAlarm.setSerialNo(deviceInfo.getCallid());
+            comPropertyAlarm.setSerialNo(deviceInfo.getUserid());
             comPropertyAlarm.setStatus(1);
             comPropertyAlarm.setCreateTime(new Date());
             comPropertyAlarm.setType(1);

--
Gitblit v1.7.1