From 15bebd1398993db87e72f501d1dc64cc018e46ca Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 17 十一月 2025 13:13:00 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 145 ++++++++++++++++++++++--------------------------
1 files changed, 66 insertions(+), 79 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d717142..4a6afa3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,31 +1,37 @@
server:
port: 9090
+ servlet:
+ context-path: /@pom.build.finalName@
spring:
application:
-# name: @pom.artifactId@
- name:
+ name: @pom.build.finalName@
datasource:
- # sql-server
- driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.2.250:1433;databasename=gdasrs
- username: sa
- password: sa@123
+ hikari:
+ 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
+ username: root
+ password: root
mvc:
static-path-pattern: /**
redis:
- host: localhost
+ host: 127.0.0.1
port: 6379
- database: 0
-# password: xltys1995
+ database: 6
+# password: 123456
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
- global-config:
- field-strategy: 0
+# global-config:
+# field-strategy: 0
+# configuration:
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
logging:
- path: /stock/out/logs
+ path: ./stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
@@ -33,78 +39,59 @@
swagger:
enable: false
+pythonCalcPath: D:\\path\\cpu.py
+pythonCalcSimilarity: D:\\path\\similarity.py
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 鍫嗗灈鏈�
- crn[0]:
+ # 鍥涘悜绌挎杞�1
+ shuttle[0]:
id: 1
- ip: 192.168.6.9
+ ip: 10.10.20.11
+ port: 8888
+ rack: 0
+ slot: 0
+ threadImpl: NyShuttleThread
+ # 鍥涘悜绌挎杞�2
+ shuttle[1]:
+ id: 2
+ ip: 10.10.20.12
+ port: 8888
+ rack: 0
+ slot: 0
+ threadImpl: NyShuttleThread
+ # 璐у弶鎻愬崌鏈轰富绾跨▼
+ forkLiftMaster[0]:
+ id: 99
+ ip: 10.10.20.20
port: 102
rack: 0
slot: 0
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 5
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 6
- row: 1
- bay: 1
- lev: 1
- # 杈撻�佺嚎
- devp[0]:
+ threadImpl: LfdZyForkLiftMasterThread
+ # 璐у弶鎻愬崌鏈�1
+ forkLift[0]:
id: 1
- ip: 192.168.2.125
+ ip: 10.10.20.20
port: 102
rack: 0
- slot: 1
- # 鍏ュ簱鍙�
- inSta[0]:
- staNo: 2
- barcode: ${wcs-slave.barcode[0].id}
- # 绌烘澘鍏ュ簱鍙�
- emptyInSta[0]:
- staNo: 2
- # 鍑哄簱鍙�
- outSta[0]:
- staNo: 6
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[0]:
- staNo: 2
- # 鏉＄爜鎵弿浠�
- barcode[0]:
- id: 1
- ip: 192.168.2.150
- port: 51236
- # LED
- led[0]:
- id: 1
- ip: 192.168.1.1
- port: 8888
- # 纾呯О
- scale[0]:
- id: 1
- ip: 192.168.1.1
- port: 8888
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ 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
--
Gitblit v1.9.1