粮情协议优化

vince

2024-03-15 bf34444f482223d291830c13cb147392298d99ee

粮情协议优化

 src/main/java/com/fzzy/gateway/GatewayUtils.java

@@ -164,7 +164,7 @@
            cableY = 1;
            cableX = 0;
            //针对多圈计算总过多少根电缆
            for (int i = 0; i < cableCir.length(); i++) {
            for (int i = 0; i < attCir.length; i++) {
                cableX += Integer.valueOf(attCable[i]);
            }
        }

 src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java

@@ -201,13 +201,13 @@
        int sumNum = cableData.getSumNum();

        // 根据层行列获取指定长度
        int start = 0;
        int start = (Integer.valueOf(device.getCableStart()) - 1) *  cableData.getCableZ()  * 4;
        int len = 4 * sumNum;

        log.info("分机------>>>平台：返回粮情完整信息，分机={}", device.getDeviceName());

        String strPoints = grainStr.substring(start, start + len);

        log.info("strPoints = "+ strPoints);
        // 将粮情解析成数组
        List<Double> temps = new ArrayList<>();
        double tempValue;
@@ -278,7 +278,7 @@
        int cableY = cableData.getCableY();

        int sumNum = temps.size();

            log.info("temps:" + temps.toString());
        //数据封装
        GrainData grain = new GrainData();
        grain.setMessageId(ScConstant.getMessageId());

 src/main/java/com/fzzy/protocol/xsyg/analysis/AnalysisService.java

@@ -43,12 +43,7 @@
     */
    public void analysis(InetAddress address, int port, String strMsg) {

        if (strMsg.startsWith("FE")) {

            //DO NOTHING
        } else {
            this.analysisGrainStep1(address, strMsg);
        }
    }

    /**
@@ -99,7 +94,7 @@
                points.add(-100.00);
                continue;
            }
            temp = BytesUtil.hexToInt(BytesUtil.tran_LH(tag)) * 0.0625;
            temp = BytesUtil.hexToInt(tag) * 0.0625;
            temp = NumberUtil.keepPrecision(temp, 1);
            points.add(temp);
        }
@@ -186,11 +181,15 @@


        JSONObject properties = new JSONObject();
        properties.put("data", outPut);
        properties.put("timestamp", grain.getTimestamp());

        properties.put("timestamp", grain.getTimestamp());
        outPut.setDetectTime( grain.getTimestamp());
        if (StringUtils.isEmpty(height+"")) height = 0.0;
        properties.put("liquidHeight", height);

        outPut.setLiquidHeight(height+"");
        grain.setOutput(JSONObject.toJSONString(outPut));
        properties.put("output", outPut);
        grain.setProperties(properties);

        //封装好的数据

 src/main/java/com/fzzy/protocol/xsyg/client/ClientHandler.java

@@ -2,8 +2,7 @@

import com.fzzy.api.utils.BytesUtil;
import com.fzzy.api.utils.SpringUtil;
import com.fzzy.protocol.youxian0.analysis.AnalysisService;
import com.fzzy.protocol.youxian0.client.ClientEngine;
import com.fzzy.protocol.xsyg.analysis.AnalysisService;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
import lombok.extern.slf4j.Slf4j;

 src/main/java/com/fzzy/protocol/xsyg/service/XsygGatewayGrainService.java

@@ -6,7 +6,7 @@
import com.fzzy.gateway.data.BaseResp;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.protocol.ProtocolUtils;
import com.fzzy.protocol.wujia.client.ClientEngine;
import com.fzzy.protocol.xsyg.client.ClientEngine;
import com.ld.io.api.InvokeResult;
import io.netty.channel.Channel;
import lombok.extern.slf4j.Slf4j;