调增地磅接口启动2

jiazx0107@163.com

2023-11-17 6c9892f782cf0eea02fb7f6c41fa74b4ed8c33d6

调增地磅接口启动2

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

@@ -1,11 +1,15 @@
package com.fzzy.gateway.hx2023.service;

import com.alibaba.fastjson2.JSONObject;
import com.fzzy.api.data.PushProtocol;
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.WebSocketPacket;
import com.fzzy.gateway.hx2023.data.WebSocketPacketHeader;
import com.fzzy.gateway.hx2023.data.WeightInfo;
import com.fzzy.gateway.hx2023.kafka.KafkaDeviceReportService;
import com.fzzy.mqtt.MqttGatewayService;
import lombok.extern.slf4j.Slf4j;
@@ -49,6 +53,34 @@

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

        if (null == reqData.getData()) {
            GatewayDevice device = reqData.getDevice();

            WebSocketPacket packet = new WebSocketPacket();

            WebSocketPacketHeader header = new WebSocketPacketHeader();
            header.setDeviceName(device.getDeviceName());
            header.setProductId(device.getProductId());
            packet.setHeaders(header);
            packet.setMessageType(ScConstant.MESSAGE_TYPE_REPORT_PROPERTY);
            packet.setDeviceId(device.getDeviceId());

            //设置信息主体
            WeightInfo weightInfo = new WeightInfo();
            weightInfo.setGrossWeight(reqData.getWeight());
            weightInfo.setNetWeight(reqData.getWeight());
            weightInfo.setNetWeight(reqData.getWeight());
            weightInfo.setWeightUnit("KG");
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("weightInfo", JSONObject.toJSONString(weightInfo));

            packet.setProperties(jsonObject);

            packet.setTimestamp(System.currentTimeMillis());

            reqData.setData(JSONObject.toJSONString(packet));
        }

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

        log.info("----------------------------推送MQTT地磅信息---------------------------");

 src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java

@@ -35,7 +35,7 @@
     */
    public void analysisInfo(String ip, Integer port, byte[] bytes) {
        String strMsg = BytesUtil.bytesToString(bytes);
        //log.debug("开始解析地磅返回信息=" + strMsg);

        if (strMsg.length() < 22) {
            return;
        }
@@ -56,12 +56,11 @@
        //最终重量结果
        double weigh = Double.valueOf(w) / d;


        log.debug("WEIGHT-MESSAGE=" + strMsg);
        log.debug("----------地磅称重数值解析------{}", weigh);

        //当前地磅协议不支持传递SN，使用局域网IP作为SN
        String sn = ip;


        //根据信息获取设备
        GatewayDevice device = GatewayUtils.getCacheByDeviceSn(sn);