[修改]修改一键报警读取数据格式

manailin

2022-03-23 03e7ef9233ceae5653ff4f26c7087dfc33874952

[修改]修改一键报警读取数据格式

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

@@ -1,24 +1,21 @@
package com.panzhihua.service_property.config;

import java.io.IOException;
import java.util.Date;

import javax.annotation.Resource;
import javax.websocket.*;

import cn.hutool.extra.spring.SpringUtil;
import com.alibaba.fastjson.JSONObject;;
import com.panzhihua.service_property.dao.ComPropertyAlarmDao;
import com.panzhihua.service_property.dto.DeviceDto;
import com.panzhihua.service_property.entity.ComPropertyAlarm;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_property.dao.ComPropertyAlarmDao;
import com.panzhihua.service_property.dto.DeviceDto;
import com.panzhihua.service_property.entity.ComPropertyAlarm;

import cn.hutool.extra.spring.SpringUtil;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
import javax.websocket.*;
import java.io.IOException;
import java.util.Date;

/**
 * 应用模块名称
@@ -40,7 +37,9 @@

    private static final Logger logger = LoggerFactory.getLogger(WebSocketClient.class);

    /** 保存报警记录服务 */
    /**
     * 保存报警记录服务
     */
    @Resource
    private ComPropertyAlarmDao comPropertyAlarmDao;
    /**
@@ -67,9 +66,37 @@
    public void onMessage(String message, Session session) {
        // 提取数据
        logger.info("收到的原始数据：{}", message);
        dealData(message);
        dealNewData(message);
    }

    @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) {
            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);
@@ -101,8 +128,7 @@
    /**
     * <异步发送message>
     *
     * @param message
     *            message @throws
     * @param message message @throws
     */
    public void send(String message) {
        this.session.getAsyncRemote().sendText(message);
@@ -111,8 +137,7 @@
    /**
     * <发送message>
     *
     * @param message
     *            message @throws
     * @param message message @throws
     */
    public void sendMessage(String message) {
        try {