Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-10-08 e6675831742a89e4d2a9ecc25229727e16805dd0

 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());