From af90f57201e2bd91342ec0a384517c4b6977f905 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 14 九月 2023 15:44:07 +0800
Subject: [PATCH] 优化控制柜注册回复命令
---
igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.java | 10 ++++++----
igds-web/src/main/resources/application-pro5330.yml | 2 +-
igds-web/src/main/resources/application-linux.yml | 4 ++--
igds-web/pom.xml | 12 ++++++------
4 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.java b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.java
index f03ee24..6ffd693 100644
--- a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.java
+++ b/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) + "");
+ //鍚敤闅忔満鏁板懡浠わ紝鍦↙inux涓細闃诲绾跨▼锛屼笉鎵ц
+// 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) + "");
+ //鍚敤闅忔満鏁板懡浠わ紝鍦↙inux涓細闃诲绾跨▼锛屼笉鎵ц
+// info.setOrderId(RandomUtils.nextInt(4000, 9999) + "");
+ info.setOrderId(deviceSer.getOrgId());
info.setUserData("0");
info.setSign("0000");
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index cf599df..52d0223 100644
--- a/igds-web/pom.xml
+++ b/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>
diff --git a/igds-web/src/main/resources/application-linux.yml b/igds-web/src/main/resources/application-linux.yml
index 9ff1541..9f4c006 100644
--- a/igds-web/src/main/resources/application-linux.yml
+++ b/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
diff --git a/igds-web/src/main/resources/application-pro5330.yml b/igds-web/src/main/resources/application-pro5330.yml
index 215037d..9f4c006 100644
--- a/igds-web/src/main/resources/application-pro5330.yml
+++ b/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:
--
Gitblit v1.9.3