From 8a0aa8fe9830606ce4daca939f597886b14b9a9b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 20 十月 2024 12:45:19 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/RgvThread.java | 3 ++-
src/main/resources/application.yml | 20 ++++++++++----------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 35fea73..e8d13cc 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.BasRgvOpt;
import com.zy.asrs.service.BasRgvOptService;
import com.zy.asrs.service.BasRgvService;
+import com.zy.asrs.utils.NumUtils;
import com.zy.asrs.utils.RouteUtils;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
@@ -159,7 +160,7 @@
rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 12));
rgvProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 14));
rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransUInt32(result.Content, 16));
- rgvProtocol.setRgvPos(slave.getId().longValue()*100000);
+// rgvProtocol.setRgvPos((long)NumUtils.GetRandomIntInRange(1737000));
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
try {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bb2b858..b19beee 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -51,7 +51,7 @@
# RGV绌挎杞�1
rgv[0]:
id: 1
- ip: 192.168.4.250
+ ip: 172.17.196.3
port: 502
rack: 0
slot: 0
@@ -59,7 +59,7 @@
# RGV绌挎杞�1
rgv[1]:
id: 2
- ip: 192.168.4.250
+ ip: 172.17.196.6
port: 502
rack: 0
slot: 0
@@ -67,7 +67,7 @@
# RGV绌挎杞�1
rgv[2]:
id: 3
- ip: 192.168.4.250
+ ip: 172.17.196.9
port: 502
rack: 0
slot: 0
@@ -75,7 +75,7 @@
# RGV绌挎杞�1
rgv[3]:
id: 4
- ip: 192.168.4.250
+ ip: 172.17.196.12
port: 502
rack: 0
slot: 0
@@ -83,7 +83,7 @@
# RGV绌挎杞�1
rgv[4]:
id: 5
- ip: 192.168.4.250
+ ip: 172.17.196.15
port: 502
rack: 0
slot: 0
@@ -91,7 +91,7 @@
# RGV绌挎杞�1
rgv[5]:
id: 6
- ip: 192.168.4.250
+ ip: 172.17.196.18
port: 502
rack: 0
slot: 0
@@ -99,7 +99,7 @@
# RGV绌挎杞�1
rgv[6]:
id: 7
- ip: 192.168.4.250
+ ip: 172.17.196.21
port: 502
rack: 0
slot: 0
@@ -107,7 +107,7 @@
# RGV绌挎杞�1
rgv[7]:
id: 8
- ip: 192.168.4.250
+ ip: 172.17.196.25
port: 502
rack: 0
slot: 0
@@ -115,7 +115,7 @@
# RGV绌挎杞�1
rgv[8]:
id: 9
- ip: 192.168.4.250
+ ip: 172.17.196.28
port: 502
rack: 0
slot: 0
@@ -123,7 +123,7 @@
# RGV绌挎杞�1
rgv[9]:
id: 10
- ip: 192.168.4.250
+ ip: 172.17.196.31
port: 502
rack: 0
slot: 0
--
Gitblit v1.9.1