修复路径BUG

jiazx0107@163.com

2023-11-10 04a01be7461dc8ba86f4295599e13c74827cff6b

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

@@ -1,17 +1,13 @@
package com.fzzy.gateway.hx2023.service;

import com.alibaba.fastjson2.JSONObject;
import com.fzzy.api.data.GatewayProtocol;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.gateway.api.DeviceReportService;
import com.fzzy.gateway.api.GatewayDeviceReportService;
import com.fzzy.gateway.data.BaseReqData;
import com.fzzy.gateway.data.BaseResp;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.GrainData;
import com.fzzy.gateway.hx2023.data.WebSocketPacket;
import com.fzzy.gateway.hx2023.data.WebSocketPacketHeader;
import com.fzzy.gateway.hx2023.data.WeightInfo;
import com.fzzy.gateway.hx2023.kafka.KafkaDeviceReport;
import com.fzzy.gateway.hx2023.websocket.WebSocketDeviceReport;
import com.fzzy.gateway.hx2023.kafka.KafkaDeviceReportService;
import com.fzzy.mqtt.MqttGatewayService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

@@ -19,66 +15,65 @@

@Slf4j
@Component
public class DeviceReportServiceImpl implements DeviceReportService {

public class DeviceReportServiceImpl implements GatewayDeviceReportService {

    @Resource
    private WebSocketDeviceReport webSocketDeviceReport;
    private KafkaDeviceReportService kafkaDeviceReportService;
    @Resource
    private KafkaDeviceReport kafkaDeviceReport;
    private MqttGatewayService publishService;

    @Override
    public String getProvinceProtocol() {
    public String getProtocol() {
        return PushProtocol.GATEWAY_SC_2023.getCode();
    }

    @Override
    public String report2GatewayBySn(double weigh, GatewayDevice device) {
    public BaseResp reportGrainData(BaseReqData reqData) {

        if (null == device) {
            log.error("-----------没有获取到设备配置信息-----");
            return "ERROR:没有获取到设备配置信息";
        }
        String topic = ScConstant.TOPIC_REPORT;
        topic = topic.replace("${productId}", reqData.getProductId()).replace("${deviceId}", reqData.getDeviceId());

        //使用WEBSOCKET返回
        if (GatewayProtocol.GATE_WEBSOCKET.equals(device.getPushProtocol())) {
        publishService.publishMqttWithTopic(reqData.getData(), topic);

            WebSocketPacket packet = new WebSocketPacket();
        log.info("----------------------------推送MQTT粮情信息---------------------------");
        log.info("-----TOPIC-----{}", topic);
        log.info("-----Message-----{}", reqData.getData());

            //productId的值在webSocket执行发送方法中补充
            WebSocketPacketHeader header = new WebSocketPacketHeader();
            header.setDeviceName(device.getDeviceName());
            packet.setHeaders(header);
            packet.setMessageType(ScConstant.MESSAGE_TYPE_REPORT_PROPERTY);
            packet.setDeviceId(device.getDeviceId());

            //设置信息主体
            WeightInfo weightInfo = new WeightInfo();
            weightInfo.setGrossWeight(weigh);
            weightInfo.setNetWeight(weigh);
            weightInfo.setNetWeight(weigh);

            JSONObject jsonObject = new JSONObject();
            jsonObject.put("weightInfo", JSONObject.toJSONString(weightInfo));

            packet.setProperties(jsonObject);

            packet.setTimestamp(System.currentTimeMillis());


            webSocketDeviceReport.sendByPacket(packet);
        }

        if (GatewayProtocol.GATE_MQTT.equals(device.getPushProtocol())) {
            //TODO ---->>>后期添加支持
        }

        return null;
        return new BaseResp();
    }

    @Override
    public String pushGrainData2Cloud(GrainData data) {
    public BaseResp reportWeightData(BaseReqData reqData) {

        return kafkaDeviceReport.sendGrainData2Cloud(data);
        String topic = ScConstant.TOPIC_MESSAGE_REPORT;

        topic = topic.replace("${productId}", reqData.getProductId()).replace("${deviceId}", reqData.getDeviceId());

        publishService.publishMqttWithTopic(reqData.getData(), topic);

        log.info("----------------------------推送MQTT地磅信息---------------------------");
        log.info("-----TOPIC-----{}", topic);
        log.info("-----Message-----{}", reqData.getData());
        return new BaseResp();
    }

    @Override
    public BaseResp reportLprData(BaseReqData reqData) {
        String topic = ScConstant.TOPIC_MESSAGE_REPORT;
        topic = topic.replace("${productId}", reqData.getProductId()).replace("${deviceId}", reqData.getDeviceId());

        publishService.publishMqttWithTopic(reqData.getData(), topic);

        log.info("----------------------------推送MQTT车牌识别信息---------------------------");
        log.info("-----TOPIC-----{}", topic);
        log.info("-----Message-----{}", reqData.getData());
        return new BaseResp();
    }

    @Override
    public BaseResp reportGrainDataByKafka(BaseReqData reqData) {
        String topic = ScConstant.TOPIC_MESSAGE_REPORT;
        kafkaDeviceReportService.publishWithTopic(reqData.getData(), topic);
        return new BaseResp();
    }
}