增加油罐仓的解析2

jiazx0107@163.com

2024-01-19 6a9cf62f7ca4b45c48a571c63fd484c186070a0e

增加油罐仓的解析2

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

@@ -3,7 +3,9 @@
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiCommonDevice;
import com.fzzy.api.data.GatewayDeviceType;
import com.fzzy.gateway.data.GrainCableData;
import com.fzzy.gateway.entity.GatewayDevice;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;

import java.util.*;
@@ -138,4 +140,38 @@
        }
        return null;
    }


    public static GrainCableData getCableData(GatewayDevice gatewayDevice) {
        String cableRule = gatewayDevice.getCableRule();
        String cableCir = gatewayDevice.getCableCir();

        GrainCableData result = new GrainCableData();

        int cableY, cableX;
        String[] attCable = cableRule.split("-");
        int cableZ = Integer.valueOf(attCable[0]);
        if (StringUtils.isEmpty(cableCir)) {
            cableY = Integer.valueOf(attCable[1]);
            cableX = Integer.valueOf(attCable[2]);
        } else {
            String[] attCir = cableCir.split("-");
            cableZ = Integer.valueOf(attCir[0]);
            cableY = 1;
            cableX = 0;
            //针对多圈计算
            for (int i = 0; i < cableCir.length(); i++) {
                cableX += Integer.valueOf(attCir[i]);
            }

            result.setCir(true);
        }

        result.setCableY(cableY);
        result.setCableZ(cableZ);
        result.setCableX(cableX);
        result.setSumNum(cableZ * cableY * cableX);

        return result;
    }
}

 src/main/java/com/fzzy/gateway/data/GrainCableData.java

ÎļþÃû´Ó src/main/java/com/fzzy/protocol/data/GrainCableData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.protocol.data;
package com.fzzy.gateway.data;


import lombok.Data;

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

@@ -2,11 +2,14 @@

import com.alibaba.fastjson2.JSONObject;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.utils.NumberUtil;
import com.fzzy.async.fzzy40.entity.Fz40Grain;
import com.fzzy.data.ConfigData;
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.GatewayDeviceReportService;
import com.fzzy.gateway.data.BaseReqData;
import com.fzzy.gateway.data.BaseResp;
import com.fzzy.gateway.data.GrainCableData;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.*;
@@ -177,16 +180,17 @@
        result.setMaxTemperature(grainData.getTempMax() + "");
        result.setCollectTime(DateFormatUtils.format(grainData.getReceiveDate(), "yyyy-MM-dd HH:mm:ss"));

        //层-行-列
        String[] attrCable = grainData.getCable().split("-");
        if (StringUtils.isNotEmpty(grainData.getCableCir())) {
            return grainData2GatewayApiInfo2(grainData, device);

        GrainCableData cableData = GatewayUtils.getCableData(device);

        if(cableData.isCir()){
            return grainData2GatewayApiInfo2(grainData, device,cableData);
        }

        //层行列
        int cableZ = Integer.valueOf(attrCable[0]);
        int cableY = Integer.valueOf(attrCable[1]);
        int cableX = Integer.valueOf(attrCable[2]);
        int cableZ = cableData.getCableZ();
        int cableY = cableData.getCableY();
        int cableX = cableData.getCableX();

        //温度集合
        String[] attr = grainData.getPoints().split(",");
@@ -265,8 +269,104 @@
        return resp;
    }

    private BaseResp grainData2GatewayApiInfo2(Fz40Grain grainData, GatewayDevice device) {
    private BaseResp grainData2GatewayApiInfo2(Fz40Grain grainData, GatewayDevice device,GrainCableData cableData) {
        BaseResp resp = new BaseResp();

//        int cableZ = cableData.getCableZ();
//        int cableY = cableData.getCableY();
//        int cableX = cableData.getCableX();
//
//        int sumNum = cableData.getSumNum();
//
//        //数据封装
//        GrainData grain = new GrainData();
//        grain.setMessageId(ScConstant.getMessageId());
//        grain.setDeviceId(device.getDeviceId());
//        grain.setTimestamp(System.currentTimeMillis() + "");
//
//        ClientHeaders headers = new ClientHeaders();
//        headers.setDeviceName(device.getDeviceName());
//        headers.setProductId(device.getProductId());
//        headers.setOrgId(device.getOrgId());
//        headers.setMsgId(ScConstant.getMessageId());
//        grain.setHeaders(headers);
//
//
//        GrainOutPut outPut = new GrainOutPut();
//
//
//        double max = com.fzzy.protocol.bhzn.v0.cmd.ReMessageBuilder.MAX_TEMP, min = com.fzzy.protocol.bhzn.v0.cmd.ReMessageBuilder.MIN_TEMP, sumT = 0.0;
//
//        List<GrainTemp> temperature = new ArrayList<>();
//        //根号
//        int cableNum = 1, position = 0;
//
//        double curTemp;
//        int x = 0, y = 0, z = 0;
//        for (int i = 0; i < sumNum; i++) {
//            curTemp = temps.get(i);
//            position = i;
//
//            z = i % cableZ + 1;
//            x = i / (cableZ * cableY);
//            y = x * (cableZ * cableY);
//            y = (i - y) / cableZ;
//            //根号
//            cableNum = (i / cableZ) + 1;
//
//            temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));
//
//            //求最大最小值
//            if (curTemp < -900) {
//                sumNum--;
//            } else {
//                sumT += curTemp;
//                if (curTemp > max) {
//                    max = curTemp;
//                }
//                if (curTemp < min) {
//                    min = curTemp;
//                }
//            }
//        }
//
//        if (sumNum == 0) {
//            sumNum = 1;
//            log.warn("---当前粮情采集异常--");
//        }
//        //过滤比较用的最大最小值
//        if (max == com.fzzy.protocol.bhzn.v0.cmd.ReMessageBuilder.MAX_TEMP) {
//            max = 0.0;
//        }
//        if (min == com.fzzy.protocol.bhzn.v0.cmd.ReMessageBuilder.MIN_TEMP) {
//            min = 0.0;
//        }
//
//        outPut.setTemperature(temperature);
//        outPut.setAvgTemperature(NumberUtil.keepPrecision((sumT / sumNum), 1) + "");
//        outPut.setMinTemperature(min + "");
//        outPut.setMaxTemperature(min + "");
//
//
//        com.alibaba.fastjson.JSONObject properties = new com.alibaba.fastjson.JSONObject();
//        properties.put("data", com.alibaba.fastjson.JSONObject.toJSONString(outPut));
//        properties.put("timestamp", grain.getTimestamp());
//
//        String height = this.getCacheHeight(device);
//        if (org.apache.commons.lang3.StringUtils.isEmpty(height)) height = "0.0";
//        properties.put("liquidHeight", height);
//
//        grain.setProperties(properties.toJSONString());
//
//        //封装好的数据
//        log.info("---浅圆仓封装完成----开始执行推送");







        resp.setCode(BaseResp.CODE_500);
        resp.setMsg("筒仓解析暂未实现");
        return resp;

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

@@ -21,7 +21,7 @@
import com.fzzy.protocol.bhzn.cmd.CommandBuild;
import com.fzzy.protocol.bhzn.cmd.ReMessageBuilder;
import com.fzzy.protocol.bhzn.data.IoMessage;
import com.fzzy.protocol.data.GrainCableData;
import com.fzzy.gateway.data.GrainCableData;
import com.fzzy.protocol.data.THDto;
import com.fzzy.protocol.bhzn.server.BhznGrainV2ServerEngine;
import com.fzzy.protocol.bhzn.server.BhznGrainV2ServerUtils;
@@ -132,7 +132,7 @@
            }

            // åˆ¤æ–­æ•°æ®æœ‰æ²¡æœ‰æ”¶å–完整
            GrainCableData cableData = this.getCableData(gatewayDevice);
            GrainCableData cableData = GatewayUtils.getCableData(gatewayDevice);
            int sumPoint = cableData.getSumNum();

            //获取当前粮情温度报文
@@ -179,39 +179,6 @@
        } catch (Exception e) {
            log.error(e.getMessage(), e);
        }
    }

    private GrainCableData getCableData(GatewayDevice gatewayDevice) {
        String cableRule = gatewayDevice.getCableRule();
        String cableCir = gatewayDevice.getCableCir();

        GrainCableData result = new GrainCableData();

        int cableY, cableX;
        String[] attCable = cableRule.split("-");
        int cableZ = Integer.valueOf(attCable[0]);
        if (StringUtils.isEmpty(cableCir)) {
            cableY = Integer.valueOf(attCable[1]);
            cableX = Integer.valueOf(attCable[2]);
        } else {
            String[] attCir = cableCir.split("-");
            cableZ = Integer.valueOf(attCir[0]);
            cableY = 1;
            cableX = 0;
            //针对多圈计算
            for (int i = 0; i < cableCir.length(); i++) {
                cableX += Integer.valueOf(attCir[i]);
            }

            result.setCir(true);
        }

        result.setCableY(cableY);
        result.setCableZ(cableZ);
        result.setCableX(cableX);
        result.setSumNum(cableZ * cableY * cableX);

        return result;
    }

    /**

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

@@ -8,7 +8,6 @@
import com.fzzy.api.utils.NumberUtil;
import com.fzzy.api.utils.RedisConst;
import com.fzzy.api.utils.RedisUtil;
import com.fzzy.async.fzzy40.entity.Fz40Grain;
import com.fzzy.data.ConfigData;
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.GatewayDeviceReportService;
@@ -24,9 +23,8 @@
import com.fzzy.protocol.bhzn.v0.data.IoMessage;
import com.fzzy.protocol.bhzn.v0.server.BhznGrainV0ServerEngine;
import com.fzzy.protocol.bhzn.v0.server.BhznGrainV0ServerUtils;
import com.fzzy.protocol.data.GrainCableData;
import com.fzzy.gateway.data.GrainCableData;
import com.fzzy.protocol.data.THDto;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
@@ -132,7 +130,7 @@
            }

            // åˆ¤æ–­æ•°æ®æœ‰æ²¡æœ‰æ”¶å–完整
            GrainCableData cableData = this.getCableData(gatewayDevice);
            GrainCableData cableData = GatewayUtils.getCableData(gatewayDevice);

            //获取当前粮情温度报文
            String grainHex = message.getContent().substring(16);
@@ -177,39 +175,6 @@
        } catch (Exception e) {
            log.error(e.getMessage(), e);
        }
    }

    private GrainCableData getCableData(GatewayDevice gatewayDevice) {
        String cableRule = gatewayDevice.getCableRule();
        String cableCir = gatewayDevice.getCableCir();

        GrainCableData result = new GrainCableData();

        int cableY, cableX;
        String[] attCable = cableRule.split("-");
        int cableZ = Integer.valueOf(attCable[0]);
        if (StringUtils.isEmpty(cableCir)) {
            cableY = Integer.valueOf(attCable[1]);
            cableX = Integer.valueOf(attCable[2]);
        } else {
            String[] attCir = cableCir.split("-");
            cableZ = Integer.valueOf(attCir[0]);
            cableY = 1;
            cableX = 0;
            //针对多圈计算
            for (int i = 0; i < cableCir.length(); i++) {
                cableX += Integer.valueOf(attCir[i]);
            }

            result.setCir(true);
        }

        result.setCableY(cableY);
        result.setCableZ(cableZ);
        result.setCableX(cableX);
        result.setSumNum(cableZ * cableY * cableX);

        return result;
    }

    /**