From 79f0f47f609bd7b166dfcb8e1998a66943930c4a Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 28 九月 2023 18:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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");
--
Gitblit v1.9.3