功能完善

liuhaonan

2022-02-14 37041ac6ae6baa2996f447e495f6f5280113c4a2

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/AtmoAPIUtils.java

@@ -1,11 +1,12 @@
package com.sandu.ximon.admin.utils;

import com.sandu.ximon.admin.entity.AtmoHeartBeatDataPackage;
import com.sandu.ximon.admin.entity.DataTransportMainFrame;
import com.sandu.ximon.admin.entity.DataTransportMainResponse;
import com.sandu.ximon.admin.entity.DataTransportOrderType;
import com.sandu.ximon.admin.manager.iot.frame.inner.AtmoCommonFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.AtmoFunctionCode;
import com.sandu.ximon.admin.manager.iot.frame.inner.response.AtmoQueryHeartBeatResponse;
import com.sandu.ximon.admin.manager.iot.rrpc.util.SupplementUtils;
import org.apache.logging.log4j.util.Base64Util;
import org.springframework.stereotype.Component;

@Component("AtmoAPIUtils")
@@ -13,6 +14,7 @@

    /**
     * 查询大气数据心跳包
     *
     * @param mac
     */
    public AtmoHeartBeatDataPackage queryHeartBeat(String mac) {
@@ -21,7 +23,7 @@

        //  发送RRPC
        String result = rrpc(mac, frame);
        if(null != result) {
        if (null != result) {
            //  返回结果
            result = HexStrConvertUtil.bytesToHexString(Base64Util.decode(result));
            DataTransportMainResponse dataTransportMainResponse = new DataTransportMainResponse().convertInstance(result.substring(2));
@@ -32,68 +34,68 @@
        return null;
    }

    /**
     * 查询大气数据心跳包间隔时间
     * @param mac
     */
    public Integer queryHeartBeatTime(String mac) {
        //  生成控制帧
        String frame = generateNoPayLoadFrame(AtmoFunctionCode.QueryHeartBeatTime, "FFFF");
        //  发送RRPC
        String result = rrpc(mac, frame);
        if(null != result) {
            //  返回结果
            result = HexStrConvertUtil.bytesToHexString(Base64Util.decode(result));
            DataTransportMainResponse dataTransportMainResponse = new DataTransportMainResponse().convertInstance(result.substring(2));
            AtmoQueryHeartBeatTimeResponse response = new AtmoQueryHeartBeatTimeResponse().convertInstance(dataTransportMainResponse.getPayload());
            return response.getHeartBeatTimeInt();
        }
        return -1;
    }
//    /**
//     * 查询大气数据心跳包间隔时间
//     * @param mac
//     */
//    public Integer queryHeartBeatTime(String mac) {
//        //  生成控制帧
//        String frame = generateNoPayLoadFrame(AtmoFunctionCode.QueryHeartBeatTime, "FFFF");
//        //  发送RRPC
//        String result = rrpc(mac, frame);
//        if(null != result) {
//            //  返回结果
//            result = HexStrConvertUtil.bytesToHexString(Base64Util.decode(result));
//            DataTransportMainResponse dataTransportMainResponse = new DataTransportMainResponse().convertInstance(result.substring(2));
//            AtmoQueryHeartBeatTimeResponse response = new AtmoQueryHeartBeatTimeResponse().convertInstance(dataTransportMainResponse.getPayload());
//            return response.getHeartBeatTimeInt();
//        }
//        return -1;
//    }
//
//
//    /**
//     * 软重启
//     * @param mac
//     *
//     */
//    public String reboot(String mac) {
//        //  生成控制帧
//        String frame = generateNoPayLoadFrame(AtmoFunctionCode.Reboot, "FFFF");
//        //  发送RRPC
//        String result = rrpc(mac, frame);
//        if(null != result) {
//            //  返回结果
//            result = HexStrConvertUtil.bytesToHexString(Base64Util.decode(result));
//            DataTransportMainResponse dataTransportMainResponse = new DataTransportMainResponse().convertInstance(result.substring(2));
//            AtmoCommonResponse response = new AtmoCommonResponse().convertInstance(dataTransportMainResponse.getPayload());
//            return response.getResponseStatus();
//        }
//        return CommonResponse.No_Response.getCode();
//    }


    /**
     * 软重启
     * @param mac
     *
     */
    public String reboot(String mac) {
        //  生成控制帧
        String frame = generateNoPayLoadFrame(AtmoFunctionCode.Reboot, "FFFF");
        //  发送RRPC
        String result = rrpc(mac, frame);
        if(null != result) {
            //  返回结果
            result = HexStrConvertUtil.bytesToHexString(Base64Util.decode(result));
            DataTransportMainResponse dataTransportMainResponse = new DataTransportMainResponse().convertInstance(result.substring(2));
            AtmoCommonResponse response = new AtmoCommonResponse().convertInstance(dataTransportMainResponse.getPayload());
            return response.getResponseStatus();
        }
        return CommonResponse.No_Response.getCode();
    }

    /**
     * 设置心跳时间
     * @param mac
     * @param heartBeatTime s
     */
    public String settingHeartBeatTime(String mac, Integer heartBeatTime) {
        String payload = "FFFF" + SupplementUtils.suppleZero(HexStrConvertUtil.tenToHex(heartBeatTime),4);
        //  生成控制帧
        String frame = generateNoPayLoadFrame(AtmoFunctionCode.SettingHeartBeatTime, payload);
        //  发送RRPC
        String result = rrpc(mac, frame);
        if(null != result) {
            //  返回结果
            result = HexStrConvertUtil.bytesToHexString(Base64Util.decode(result));
            DataTransportMainResponse dataTransportMainResponse = new DataTransportMainResponse().convertInstance(result.substring(2));
            AtmoCommonResponse response = new AtmoCommonResponse().convertInstance(dataTransportMainResponse.getPayload());
            return response.getResponseStatus();
        }
        return CommonResponse.No_Response.getCode();
    }

    private  String generateNoPayLoadFrame(AtmoFunctionCode atmoFunctionCode, String payload){
    //    /**
//     * 设置心跳时间
//     * @param mac
//     * @param heartBeatTime s
//     */
//    public String settingHeartBeatTime(String mac, Integer heartBeatTime) {
//        String payload = "FFFF" + SupplementUtils.suppleZero(HexStrConvertUtil.tenToHex(heartBeatTime),4);
//        //  生成控制帧
//        String frame = generateNoPayLoadFrame(AtmoFunctionCode.SettingHeartBeatTime, payload);
//        //  发送RRPC
//        String result = rrpc(mac, frame);
//        if(null != result) {
//            //  返回结果
//            result = HexStrConvertUtil.bytesToHexString(Base64Util.decode(result));
//            DataTransportMainResponse dataTransportMainResponse = new DataTransportMainResponse().convertInstance(result.substring(2));
//            AtmoCommonResponse response = new AtmoCommonResponse().convertInstance(dataTransportMainResponse.getPayload());
//            return response.getResponseStatus();
//        }
//        return CommonResponse.No_Response.getCode();
//    }
//
    private String generateNoPayLoadFrame(AtmoFunctionCode atmoFunctionCode, String payload) {
        String frame = DataTransportMainFrame.generateInstance(
                DataTransportOrderType.AtmosphereData,
                new AtmoCommonFrame(atmoFunctionCode, payload)