CZT
2023-10-09 1c357ae25d6858a4243552309e85c1476c9584a2
优化贝博平房仓粮情解析
已修改2个文件
已添加1个文件
38 ■■■■ 文件已修改
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/img/aerial-5322_001.png 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java
@@ -386,6 +386,8 @@
        int symbol = 0;
        for (int i = 0; i < strPoints.length() / 4; i++) {
            temp = strPoints.substring(i * 4, i * 4 + 4);
            //高低位转换后转为16位二进制字符串
            temp = BytesUtil.tran_LH(temp);
            if (temp == null) {
                temp = "0000";
            }
@@ -470,17 +472,6 @@
        int tem = -100;
        String substring = "";
        //解析外湿外温
        String thStr = msg.getThStr().substring(6, 12);
        humidity = BytesUtil.hexToInt(thStr.substring(0, 2));
        grain.setHumidityOut(humidity * 1.0);
        substring = thStr.substring(2);
        tem = BytesUtil.hexToInt(substring);
        grain.setTempOut(tem * 0.1);
        if(substring.startsWith("1")){
            grain.setTempOut(tem * -0.1);
        }
        //解析仓内温仓内湿
        int thConf = Integer.valueOf(depotConf.getThConf());
        int start = 0, end = 6;
@@ -488,7 +479,7 @@
            start += 6*thConf; //12-18
            end += start;
        }
        thStr = msg.getThStr().substring(start, end);
        String thStr = msg.getThStr().substring(start, end);
        humidity = BytesUtil.hexToInt(thStr.substring(0, 2));
        grain.setHumidityIn(humidity * 1.0);
        substring = thStr.substring(2);
@@ -582,17 +573,6 @@
        int tem = -100;
        String substring = "";
        //解析外湿外温
        String thStr = msg.getThStr().substring(6, 12);
        humidity = BytesUtil.hexToInt(thStr.substring(0, 2));
        grain.setHumidityOut(humidity * 1.0);
        substring = thStr.substring(2);
        tem = BytesUtil.hexToInt(substring);
        grain.setTempOut(tem * 0.1);
        if(substring.startsWith("1")){
            grain.setTempOut(tem * -0.1);
        }
        //解析仓内温仓内湿
        int thConf = Integer.valueOf(depotConf.getThConf());
        int start = 0, end = 6;
@@ -600,7 +580,7 @@
            start += 6*thConf; //12-18
            end += start;
        }
        thStr = msg.getThStr().substring(start, end);
        String thStr = msg.getThStr().substring(start, end);
        humidity = BytesUtil.hexToInt(thStr.substring(0, 2));
        grain.setHumidityIn(humidity * 1.0);
        substring = thStr.substring(2);
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
@@ -31,17 +31,17 @@
        if (configData.getActive().indexOf("pro") >= 0) {
            //徐闻、FZZY云服务器使用
//            bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
            bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
            //江西赣州、广东高州使用
            bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
//            bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
            //广东高州使用
           // bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
        }
        if (configData.getActive().indexOf("dev") >= 0) {
//            bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
            bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
            //bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
            bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
//            bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
//            bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
        }
    }
}
igds-web/src/main/resources/static/img/aerial-5322_001.png