CZT
2023-09-12 0215fce538f4f07069bf16cd2bfe505a907bcbd5
优化邦海智能粮情V2版
已修改3个文件
已添加1个文件
63 ■■■■■ 文件已修改
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/pom.xml 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/img/aerial-5329_001.png 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
@@ -30,11 +30,17 @@
    public void run(String... strings) throws Exception {
        if (configData.getActive().indexOf("pro") >= 0) {
            bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
            //徐闻、FZZY云服务器使用
//            bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
            //江西赣州、广东高州使用
            bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
            //广东高州使用
           // bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
        }
        if (configData.getActive().indexOf("dev") >= 0) {
            bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
//            bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
            bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
            //bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
        }
    }
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java
@@ -81,6 +81,7 @@
                ser.setPort(message.getPort());
                ser.setStatus(Constant.YN_Y);
                coreSerService.updateByData(ser);
                log.info("主机------->>平台:注册成功,分机信息={}", ser);
            }
            return;
        }
@@ -164,7 +165,7 @@
            //如果当前包的数据个数大于等于当前仓库的配置点位则表示单包返回
            if (curPoint >= sumPoint) {
                log.info("分机------>>>平台:粮情数据单包=" + grainHex);
                //返回粮情接收信息
                replayGrain(message);
@@ -188,11 +189,12 @@
            if (grainHex.length() >= sumPoint * 4) {
                //返回粮情接收信息
                replayGrain(message);
                log.info("分机------>>>平台:粮情数据多包,完整数据=" + grainHex);
                analysisGrain2(ser, message, exeRequest, depotConf, sysConf, batchId, grainHex);
                return;
            } else {
                log.info("分机------>>>平台:将第一包数据存入内存=" + grainHex);
                contextMapGrain.put(key, grainHex);
                replayGrain(message);
            }
@@ -207,7 +209,8 @@
     *
     * @param message
     */
    private void replayGrain(IoMessage message) {
    private void replayGrain(IoMessage message) throws InterruptedException {
        Thread.sleep(50);
        String hexStr = CommandBuild.getMsgGrainReply(message.getAddr());
        log.info("平台--------->>>主机,返回粮情报文收到信息,报文={}", hexStr);
        serverEngine.push(message.getIp(),message.getPort(),BytesUtil.hexStrToBytes(hexStr));
igds-web/pom.xml
@@ -144,7 +144,7 @@
        </dependency>
        <!-- 接口包,包括上海接口和气象接口-->
        <!-- 接口包,包括上海接口和、气象接口、三维接口-->
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-api-inte</artifactId>
@@ -170,21 +170,21 @@
        </dependency>
        <!-- MODBUS-TCP -->
<!--        <dependency>-->
<!--            <groupId>com.ld.igds</groupId>-->
<!--            <artifactId>igds-protocol-modbus</artifactId>-->
<!--            <version>${igds.version}</version>-->
<!--            <exclusions>-->
<!--                <exclusion>-->
<!--                    <artifactId>slf4j-log4j12</artifactId>-->
<!--                    <groupId>org.slf4j</groupId>-->
<!--                </exclusion>-->
<!--                <exclusion>-->
<!--                    <artifactId>log4j</artifactId>-->
<!--                    <groupId>log4j</groupId>-->
<!--                </exclusion>-->
<!--            </exclusions>-->
<!--        </dependency>-->
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-modbus</artifactId>
            <version>${igds.version}</version>
            <exclusions>
                <exclusion>
                    <artifactId>slf4j-log4j12</artifactId>
                    <groupId>org.slf4j</groupId>
                </exclusion>
                <exclusion>
                    <artifactId>log4j</artifactId>
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        <!-- 私有协议-风正致远IOT、制氮机
@@ -221,7 +221,7 @@
            </exclusions>
        </dependency>-->
        <!--  私有协议-邦海智能
        <!--  私有协议-邦海智能-->
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-bhzn</artifactId>
@@ -236,9 +236,9 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>-->
        </dependency>
        <!--  私有协议-正来电子 -->
        <!--  私有协议-正来电子
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-zldz</artifactId>
@@ -253,9 +253,9 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency> -->
        <!--  海康车牌识别-SDK -->
        <!--  海康车牌识别-SDK
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-sdk</artifactId>
@@ -270,7 +270,7 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency>-->
    </dependencies>
    <dependencyManagement>
igds-web/src/main/resources/static/img/aerial-5329_001.png