粮情协议优化

vince

2024-03-15 bf34444f482223d291830c13cb147392298d99ee

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

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

import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiCommonDevice;
import com.fzzy.api.data.DepotType;
import com.fzzy.api.data.GatewayDeviceType;
import com.fzzy.gateway.data.GrainCableData;
import com.fzzy.gateway.entity.GatewayDevice;
@@ -147,10 +148,13 @@
        String cableCir = gatewayDevice.getCableCir();

        GrainCableData result = new GrainCableData();
        result.setCableRule(cableRule);
        result.setCableCir(cableCir);

        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]);
@@ -159,12 +163,10 @@
            cableZ = Integer.valueOf(attCir[0]);
            cableY = 1;
            cableX = 0;
            //针对多圈计算
            for (int i = 0; i < cableCir.length(); i++) {
                cableX += Integer.valueOf(attCir[i]);
            //针对多圈计算总过多少根电缆
            for (int i = 0; i < attCir.length; i++) {
                cableX += Integer.valueOf(attCable[i]);
            }

            result.setCir(true);
        }

        result.setCableY(cableY);
@@ -172,6 +174,8 @@
        result.setCableX(cableX);
        result.setSumNum(cableZ * cableY * cableX);

        result.setTotalCircle(attCable.length);

        return result;
    }
}