优化控制柜注册回复命令

CZT

2023-09-14 af90f57201e2bd91342ec0a384517c4b6977f905

优化控制柜注册回复命令

 igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.java

@@ -6,8 +6,6 @@
import com.ld.igds.protocol.fzzy.dto.ReMessage;
import com.ld.igds.protocol.fzzy.dto.SendMessage;

import org.apache.commons.lang3.RandomUtils;

/**
 * 系统接口
 */
@@ -68,7 +66,9 @@
        info.setIedId(reMessage.getIedId());
        info.setFunctionId(functionId);
        info.setRespCode("0000");
        info.setOrderId(RandomUtils.nextInt(4000, 9999) + "");
        //启用随机数命令，在Linux中会阻塞线程，不执行
//        info.setOrderId(RandomUtils.nextInt(4000, 9999) + "");
        info.setOrderId(reMessage.getOrderId());
        info.setUserData("0");
        info.setSign("0000");
        info.setContent(object);
@@ -82,7 +82,9 @@
        info.setIedId(deviceSer.getId());
        info.setFunctionId(functionId);
        info.setRespCode("0000");
        info.setOrderId(RandomUtils.nextInt(4000, 9999) + "");
        //启用随机数命令，在Linux中会阻塞线程，不执行
//        info.setOrderId(RandomUtils.nextInt(4000, 9999) + "");
        info.setOrderId(deviceSer.getOrgId());
        info.setUserData("0");
        info.setSign("0000");


 igds-web/pom.xml

@@ -185,10 +185,10 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
-->
        </dependency>-->

        <!-- 私有协议-风正致远IOT、制氮机

        <!-- 私有协议-风正致远IOT、制氮机-->
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-iot</artifactId>
@@ -203,7 +203,7 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>-->
        </dependency>

        <!--  私有协议-贝博粮情
        <dependency>
@@ -237,8 +237,8 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
-->
        </dependency>-->

        <!--  私有协议-正来电子
        <dependency>
            <groupId>com.ld.igds</groupId>

 igds-web/src/main/resources/application-linux.yml

@@ -48,10 +48,10 @@

  # Redis相关配置
  redis:
    database: 2
    database: 1
    host: 127.0.0.1
    port: 6379
    password: Abc123..
    password:
    # 连接池最大连接数（使用负值表示没有限制）
    pool:
      max-active: 200

 igds-web/src/main/resources/application-pro5330.yml

@@ -48,7 +48,7 @@

  # Redis相关配置
  redis:
    database: 0
    database: 1
    host: 127.0.0.1
    port: 6379
    password: