优化粮情返回与请求绑定

jiazx0107@163.com

2023-11-10 eba0a973f03126d085abe02bef5c912be4047420

优化粮情返回与请求绑定

 src/main/java/com/fzzy/gateway/hx2023/ScConstant.java

@@ -1,6 +1,10 @@
package com.fzzy.gateway.hx2023;

import com.alibaba.fastjson2.util.UUIDUtils;
import com.fzzy.api.utils.MyMD5Util;
import org.apache.commons.lang.math.RandomUtils;

import java.util.UUID;

/**
 * 常量
@@ -24,6 +28,14 @@
        return System.currentTimeMillis() + RandomUtils.nextInt(1000) + "";
    }

    public static String getUUID() {
        return UUID.randomUUID().toString().replaceAll("-", "");
    }

//    public static String getMd5MessageId() {
//        return MyMD5Util.getMD5(getUUID());
//    }


    /**
     * 下发指令回复报文topic

 src/main/java/com/fzzy/gateway/hx2023/data/ClientHeaders.java

@@ -7,6 +7,6 @@

    private String productId;
    private String deviceName;
    private String orgId;
    private String orgId="";
    private String msgId;
}

 src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java

@@ -12,7 +12,6 @@
    //设备编码
    private String deviceId;
    private ClientHeaders headers;

    //消息 ID
    private String messageId;

@@ -22,8 +21,8 @@

    private String timestamp;

    private GrainOutPut output;
    private String output;

    private GrainWeather weatherStation;
    private String weatherStation;

}

 src/main/java/com/fzzy/gateway/hx2023/data/GrainWeather.java

@@ -13,6 +13,8 @@

    private String messageId;

    private String messgeId;

    private String pm;

    private String radiation = "0";

 src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java

@@ -32,6 +32,11 @@
     */
    public void onReceiveMessage(String topic, String message) {

        // 这里可以处理接收的数据
        log.info("----------------------------收到订阅内容---------------------------");
        log.info("-----TOPIC-----{}", topic);
        log.info("-----Message-----{}", message);

        try {
            CloudSendData cloudSendData = JSONObject.parseObject(message, CloudSendData.class);


 src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java

@@ -289,7 +289,7 @@
        headers.setDeviceName(device.getDeviceName());
        headers.setProductId(device.getProductId());
        headers.setOrgId(device.getOrgId());
        headers.setMsgId(ScConstant.getMessageId());
        headers.setMsgId(reqData.getMessageId());
        grain.setHeaders(headers);

        GrainOutPut outPut = new GrainOutPut();
@@ -342,7 +342,7 @@

        outPut.setTemperature(temperature);

        grain.setOutput(outPut);
        grain.setOutput(JSONObject.toJSONString(outPut));


        GatewayDevice gatewayDeviceWeather = GatewayUtils.getCacheByDeviceTypeOne(GatewayDeviceType.TYPE_09.getCode());
@@ -350,6 +350,7 @@
        //气象信息
        GrainWeather weatherStation = new GrainWeather();
        weatherStation.setMessageId(ScConstant.getMessageId());
        weatherStation.setMessgeId(weatherStation.getMessageId());

        if (null != gatewayDeviceWeather) {
            weatherStation.setId(gatewayDeviceWeather.getDeviceId());
@@ -365,7 +366,7 @@
        weatherStation.setWindDirection(weather.getWin());
        weatherStation.setWindPower(weather.getWin_meter());
        weatherStation.setWindSpeed(weather.getWin_speed());
        grain.setWeatherStation(weatherStation);
        grain.setWeatherStation(JSONObject.toJSONString(weatherStation));

        return new BaseResp(JSONObject.toJSONString(grain));
    }

 src/main/java/com/fzzy/mqtt/MqttConsumerConfig.java

@@ -84,12 +84,6 @@
            public void handleMessage(Message<?> message) throws MessagingException {
                String topic = message.getHeaders().get("mqtt_receivedTopic").toString();
                String msg = message.getPayload().toString();

                // 这里可以处理接收的数据
                log.info("----------------------------收到订阅内容---------------------------");
                log.info("-----TOPIC-----{}", topic);
                log.info("-----Message-----{}", msg);

                onReceiveMqttService.onReceiveMessage(topic, msg);
            }
        };