From 1d624dfdb040825ffecba6c792c480be662b2dbc Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 10 四月 2025 17:39:56 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 65 ++++++++++----------------------
1 files changed, 21 insertions(+), 44 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4a6afa3..bf4da6a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,7 @@
validation-timeout: 3000
connection-test-query: select 1
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/shuttle_rcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/fyxc_shuttle?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: root
mvc:
@@ -44,54 +44,31 @@
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 鍥涘悜绌挎杞�1
- shuttle[0]:
- id: 1
- ip: 10.10.20.11
- port: 8888
- rack: 0
- slot: 0
- threadImpl: NyShuttleThread
+# # 鍥涘悜绌挎杞�1
+# shuttle[0]:
+# id: 1
+# ip: 192.168.10.81
+# port: 8888
+# rack: 0
+# slot: 0
+# threadImpl: NyShuttleThread
# 鍥涘悜绌挎杞�2
- shuttle[1]:
+ shuttle[0]:
id: 2
- ip: 10.10.20.12
+ ip: 192.168.10.83
port: 8888
rack: 0
slot: 0
threadImpl: NyShuttleThread
- # 璐у弶鎻愬崌鏈轰富绾跨▼
- forkLiftMaster[0]:
- id: 99
- ip: 10.10.20.20
- port: 102
- rack: 0
- slot: 0
- threadImpl: LfdZyForkLiftMasterThread
- # 璐у弶鎻愬崌鏈�1
- forkLift[0]:
+ # 鎻愬崌鏈�1
+ lift[0]:
id: 1
- ip: 10.10.20.20
+ ip: 192.168.10.51
port: 102
- rack: 0
- slot: 0
- threadImpl: LfdZyForkLiftSlaveThread
- masterId: 99
- staRow: 9
- staBay: 6
- sta[0]:
- staNo: 1001
- lev: 1
- liftNo: ${wcs-slave.forkLift[0].id}
- sta[1]:
- staNo: 1002
- lev: 2
- liftNo: ${wcs-slave.forkLift[0].id}
- sta[2]:
- staNo: 1003
- lev: 3
- liftNo: ${wcs-slave.forkLift[0].id}
- sta[3]:
- staNo: 1004
- lev: 4
- liftNo: ${wcs-slave.forkLift[0].id}
\ No newline at end of file
+ threadImpl: NyLiftThread
+ row: 2
+ bay: 3
+ standByRow: 2
+ standByBay: 1
+ staRow: 2
+ staBay: 1
--
Gitblit v1.9.1