From d772a8c0b226e55dfc28fdfe6e41a2c491317ed8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 01 九月 2020 15:54:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 30 +++++++-------
pom.xml | 20 ++++++++-
src/main/resources/application.yml | 29 ++++++++------
3 files changed, 48 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2de5f6c..f3426a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,26 +106,40 @@
<!-- led sdk -->
<dependency>
- <groupId>com.wcs.bx</groupId>
+ <groupId>com.wcs.led</groupId>
<artifactId>5m3</artifactId>
<scope>system</scope>
<version>0.5.0</version>
<systemPath>${project.basedir}/src/main/resources/lib/bx05-0.5.0-SNAPSHOT.jar</systemPath>
</dependency>
<dependency>
- <groupId>com.wcs.bx</groupId>
+ <groupId>com.wcs.led</groupId>
<artifactId>5m3message</artifactId>
<scope>system</scope>
<version>0.5.0</version>
<systemPath>${project.basedir}/src/main/resources/lib/bx05.message-0.5.0-SNAPSHOT.jar</systemPath>
</dependency>
<dependency>
- <groupId>com.wcs.bx</groupId>
+ <groupId>com.wcs.led</groupId>
<artifactId>5m3doc</artifactId>
<scope>system</scope>
<version>0.5.0</version>
<systemPath>${project.basedir}/src/main/resources/lib/bx05-0.5.0-SNAPSHOT-javadoc.jar</systemPath>
</dependency>
+ <dependency>
+ <groupId>com.wcs.led</groupId>
+ <artifactId>simple-xml</artifactId>
+ <scope>system</scope>
+ <version>2.7.1</version>
+ <systemPath>${project.basedir}/src/main/resources/lib/simple-xml-2.7.1.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>com.wcs.led</groupId>
+ <artifactId>uia-message</artifactId>
+ <scope>system</scope>
+ <version>0.6.0</version>
+ <systemPath>${project.basedir}/src/main/resources/lib/uia-message-0.6.0.jar</systemPath>
+ </dependency>
</dependencies>
<build>
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index b16cebf..ff0948b 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -78,26 +78,26 @@
// Bx5GScreenRS screen = new Bx5GScreenRS("MyScreen");
// 鍦ㄥ鎺у埗鍣ㄤ氦浜掍箣鍓嶏紝闇�瑕佸厛涓庢帶鍒跺櫒寤虹珛杩炴帴
- screen.connect("192.168.100.199",5005);
+ screen.connect("192.168.10.61",5005);
// 涓庢帶鍒跺櫒浜や簰瀹屾垚鍚庯紝闇�鏂紑涓庢帶鍒跺櫒涔嬮棿鐨勮繛鎺�
screen.disconnect();
// 浠ヤ笅涓轰竴浜涚畝鍗曟帶鍒跺懡浠ょ殑浣跨敤鏂规硶
// 寮�鍏虫満鍛戒护
- screen.turnOff();// 鍏虫満
- screen.turnOn();// 寮�鏈�
- screen.syncTime();// 鏍℃椂
- screen.ping();// ping鍛戒护
- // 鏌ヨ鎺у埗鍣ㄧ姸鎬�
- screen.checkControllerStatus();
- // 鏌ヨ鎺у埗鍣ㄥ綋鍓嶅浐浠剁増鏈�
- screen.checkFirmware();
- // 鏌ヨ鎺у埗鍣ㄥ唴瀛�
- screen.checkMemVolumes();
- // 閿佸畾灞忓箷褰撳墠鐢婚潰
- screen.lock();
- // 瑙ｉ櫎閿佸畾灞忓箷褰撳墠鐢婚潰
- screen.unlock();
+// screen.turnOff();// 鍏虫満
+// screen.turnOn();// 寮�鏈�
+// screen.syncTime();// 鏍℃椂
+// screen.ping();// ping鍛戒护
+// // 鏌ヨ鎺у埗鍣ㄧ姸鎬�
+// screen.checkControllerStatus();
+// // 鏌ヨ鎺у埗鍣ㄥ綋鍓嶅浐浠剁増鏈�
+// screen.checkFirmware();
+// // 鏌ヨ鎺у埗鍣ㄥ唴瀛�
+// screen.checkMemVolumes();
+// // 閿佸畾灞忓箷褰撳墠鐢婚潰
+// screen.lock();
+// // 瑙ｉ櫎閿佸畾灞忓箷褰撳墠鐢婚潰
+// screen.unlock();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 163893c..3c300fe 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,15 +1,18 @@
server:
port: 9090
servlet:
- context-path: /@pom.build.finalName@
+ context-path: /gdwcs
spring:
application:
- name: @pom.build.finalName@
+ name: gdwcs
datasource:
# sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=gdasrs
+ #url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs
+ #username: sa
+ #password: eisoft
+ url: jdbc:sqlserver://localhost:1433;databasename=gdasrs
username: sa
password: sa@123
mvc:
@@ -26,7 +29,7 @@
# field-strategy: 0
logging:
- path: /stock/out/logs
+ path: /stock/out/wcs/logs
super:
pwd: xltys1995
@@ -39,7 +42,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.3.39
+ ip: 192.168.10.39
port: 5015
rack: 0
slot: 0
@@ -62,7 +65,7 @@
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 192.168.3.40
+ ip: 192.168.10.40
port: 5016
rack: 0
slot: 0
@@ -85,7 +88,7 @@
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.3.65
+ ip: 192.168.10.65
port: 6000
rack: 0
slot: 1
@@ -115,22 +118,22 @@
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 192.168.2.150
+ ip: 192.168.10.150
port: 51236
# LED1
led[0]:
id: 1
- ip: 192.168.1.1
- port: 8888
+ ip: 192.168.10.61
+ port: 5005
# LED2
led[1]:
id: 2
- ip: 192.168.1.1
- port: 8888
+ ip: 192.168.10.62
+ port: 5005
# 纾呯О
scale[0]:
id: 1
- ip: 192.168.1.1
+ ip: 192.168.10.152
port: 8888
--
Gitblit v1.9.1