bug修改

101captain

2022-07-20 c40f8e3d2e08e108780091776437242528bf61d6

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketClient.java

@@ -71,6 +71,39 @@
    }

    @Async
    void dealNewData(String message) {
        comPropertyAlarmDao = SpringUtil.getBean(ComPropertyAlarmDao.class);
        JSONObject deviceMess = JSONObject.parseObject(message);
        boolean checkFlag =
                ("trace_call".equals(deviceMess.getString("cmd")) && (StringUtils.isNotEmpty(deviceMess.getString("userid"))));
        if (checkFlag) {
            log.info("已经接收到报警记录，记录信息:{}",deviceMess.toJSONString());
            boolean panzhihuaDevice = deviceMess.getString("userid").startsWith("7") || deviceMess.getString("userid").startsWith("8");
            if(panzhihuaDevice) {
                log.info("报警记录是攀枝花设备7-8开头的设备");
                logger.info("收到设备报警信息：{}", message);
                for (int i = 1; i < 10; i++) {
                    if (org.apache.commons.lang.StringUtils.isNotEmpty(deviceMess.getString("num" + i))) {
                        ComPropertyAlarm comPropertyAlarm = new ComPropertyAlarm();
                        comPropertyAlarm.setSerialNo(deviceMess.getString("userid"));
                        comPropertyAlarm.setReceiveNo(deviceMess.getString("num" + i));
                        comPropertyAlarm.setStatus(0);
                        // 10位的秒级别的时间戳
                        Date createDate = new Date(deviceMess.getLong("ts" + i) * 1000);
                        //对应的就是时间戳对应的Date
                        comPropertyAlarm.setCreateTime(createDate);
                        comPropertyAlarm.setType(1);
                        comPropertyAlarmDao.insert(comPropertyAlarm);
                    } else {
                        break;
                    }
                }
            }
        }
    }

    @Deprecated
    @Async
    void dealData(String message) {
        comPropertyAlarmDao = SpringUtil.getBean(ComPropertyAlarmDao.class);
        DeviceDto deviceInfo = JSONObject.parseObject(message, DeviceDto.class);