From 12f980ced60db7aaa83f5fa3dc3eddfab0655c3e Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期二, 16 九月 2025 09:54:21 +0800
Subject: [PATCH] 123

---
 src/main/resources/application.yml |  120 ++++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 84 insertions(+), 36 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4a6afa3..06116b0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,9 +1,11 @@
 server:
-  port: 9090
+  port: 8080
   servlet:
     context-path: /@pom.build.finalName@
 
 spring:
+  jmx:
+    enabled: false
   application:
     name: @pom.build.finalName@
   datasource:
@@ -11,7 +13,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:
@@ -31,10 +33,13 @@
 
 
 logging:
-  path: ./stock/out/@pom.build.finalName@/logs
+  path: /stock/out/@pom.build.finalName@/logs
 
 super:
   pwd: xltys1995
+
+asrs:
+  wmsUrl: 192.168.10.201:8080/fyxcwms
 
 swagger:
   enable: false
@@ -47,7 +52,7 @@
   # 鍥涘悜绌挎杞�1
   shuttle[0]:
     id: 1
-    ip: 10.10.20.11
+    ip: 192.168.10.81
     port: 8888
     rack: 0
     slot: 0
@@ -55,43 +60,86 @@
   # 鍥涘悜绌挎杞�2
   shuttle[1]:
     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
+    threadImpl: NyLiftThread
+    row: 2
+    bay: 3
+    standByInRow: 2
+    standByInBay: 1
+    standByOutRow: 2
+    standByOutBay: 2
+    staRow: 2
+    staBay: 1
+  devp[0]:
+    id: 1
+    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: FyDevpThread
+    # 鍏ュ簱鍙�1
+    inSta[0]:
+      staNo: 1012
+      backSta: 1011
+      led: ${wcs-slave.led[0].id}
+    # 鍏ュ簱鍙�2
+    inSta[1]:
+      staNo: 1014
+      backSta: 1013
+      led: ${wcs-slave.led[1].id}
+    # 鍏ュ簱鍙�3
+    inSta[2]:
+      staNo: 1022
+      backSta: 1021
+      led: ${wcs-slave.led[2].id}
+    # 鍏ュ簱鍙�4
+    inSta[3]:
+      staNo: 1025
+      backSta: 1024
+      led: ${wcs-slave.led[3].id}
+    # 鍑哄簱鍙�1
+    outSta[0]:
+      staNo: 1011
+    outSta[1]:
+      staNo: 1013
+    outSta[2]:
+      staNo: 1021
+    outSta[3]:
+      staNo: 1024
+  # LED1
+  led[0]:
+    id: 1
+    ip: 192.168.10.160
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+  # LED2
+  led[1]:
+    id: 2
+    ip: 192.168.10.161
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+  # LED3
+  led[2]:
+    id: 3
+    ip: 192.168.10.162
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+  # LED4
+  led[3]:
+    id: 4
+    ip: 192.168.10.163
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+
+
+
+

--
Gitblit v1.9.1