Merge branch 'test' into test_bak

101captain

2021-09-30 3f50420b42259a88f7e623b16c14b00f52071f4c

 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,9 +76,10 @@
        if (deviceInfo.getCallstatus().equals("RINGING")) {
            logger.info("收到设备报警信息：{}", message);
            ComPropertyAlarm comPropertyAlarm = new ComPropertyAlarm();
            comPropertyAlarm.setSerialNo(deviceInfo.getCallid());
            comPropertyAlarm.setStatus(1);
            comPropertyAlarm.setSerialNo(deviceInfo.getUserid());
            comPropertyAlarm.setStatus(0);
            comPropertyAlarm.setCreateTime(new Date());
            comPropertyAlarm.setType(1);
            comPropertyAlarmDao.insert(comPropertyAlarm);
        }
    }