From a67f812587903b910979dbc46421baae51b6d9db Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期三, 04 一月 2023 09:46:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 30
src/main/webapp/static/js/console.map.js | 850 +++++++++++--------------------------------------
src/main/resources/application.yml | 86 -----
3 files changed, 218 insertions(+), 748 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index c36591b..d4dca0e 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -52,8 +52,8 @@
public LedThread(Slave slave) {
this.slave = slave;
try {
- Bx5GEnv.initial(3000);
- screen = new Bx5GScreenClient("my");
+// Bx5GEnv.initial(3000);
+// screen = new Bx5GScreenClient("my");
} catch (Exception e) {
e.printStackTrace();
log.info("led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
@@ -63,8 +63,8 @@
@Override
@SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
public void run() {
- connect();
- close();
+// connect();
+// close();
while (true) {
try {
Task task = MessageQueue.poll(SlaveType.Led, slave.getId());
@@ -281,22 +281,22 @@
@Override
public boolean connect() {
boolean connRes = false;
- try {
- connRes = screen.connect(slave.getIp(),slave.getPort());
- screen.turnOn();
- } catch (Exception ignore) {
- }
- if (connRes) {
- log.info("led杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- } else {
- log.error("led杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- }
+// try {
+// connRes = screen.connect(slave.getIp(),slave.getPort());
+// screen.turnOn();
+// } catch (Exception ignore) {
+// }
+// if (connRes) {
+// log.info("led杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+// } else {
+// log.error("led杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+// }
return connRes;
}
@Override
public void close() {
- screen.disconnect();
+// screen.disconnect();
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6db6f1a..4152037 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://10.10.10.210:1433;databasename=tzhtasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzhtasrs
username: sa
password: sa@123
mvc:
@@ -112,68 +112,6 @@
row: 7
bay: 1
lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 304
- row: 11
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 301
- row: 10
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 301
- row: 10
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.130
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 402
- row: 14
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 402
- row: 14
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 402
- row: 14
- bay: 1
- lev: 1
# 杈撻�佺嚎
devp[0]:
id: 1
@@ -226,28 +164,6 @@
pickSta[2]:
staNo: 303
barcode: ${wcs-slave.barcode[2].id}
-
- devp[1]:
- id: 2
- ip: 10.10.10.93
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 402
- barcode: ${wcs-slave.barcode[3].id}
- led: ${wcs-slave.led[7].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 402
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 401
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 402
- barcode: ${wcs-slave.barcode[3].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index e1d808f..d2db3e4 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -1,661 +1,215 @@
mapInfo = {
- "mapName": "HYLYWCS",
- "rackCount": 12,
- "crnCount": 3,
- "stbCount": 16,
- "hpPosition": 0,
+ "mapName": "TZHTWCS",
+ "rackCount": 8,
+ "crnCount": 2,
+ "stbCount": 8,
+ "hpPosition": 1,
"minBayNo": 2,
"floors": 1,
- "racks": [
- {
- "type": "rack",
- "id": "rack1",
- "top": 97,
- "left": 430,
- "width": 1020,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 31
- },
- {
- "type": "rack",
- "id": "rack2",
- "top": 123,
- "left": 430,
- "width": 1020,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 31
- },
- {
- "type": "rack",
- "id": "rack3",
- "top": 180,
- "left": 430,
- "width": 1020,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 31
- },
- {
- "type": "rack",
- "id": "rack4",
- "top": 207,
- "left": 430,
- "width": 1020,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 31
- },
- {
- "type": "rack",
- "id": "rack5",
- "top": 237,
- "left": 430,
- "width": 1088,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 17
- },
- {
- "type": "rack",
- "id": "rack6",
- "top": 263,
- "left": 430,
- "width": 1088,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 17
- },
- {
- "type": "rack",
- "id": "rack7",
- "top": 318,
- "left": 430,
- "width": 1088,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 17
- },
- {
- "type": "rack",
- "id": "rack8",
- "top": 344,
- "left": 430,
- "width": 1088,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 17
- },
- {
- "type": "rack",
- "id": "rack9",
- "top": 373,
- "left": 430,
- "width": 1088,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 64
- },
- {
- "type": "rack",
- "id": "rack10",
- "top": 399,
- "left": 430,
- "width": 1088,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 64
- },
- {
- "type": "rack",
- "id": "rack11",
- "top": 458,
- "left": 430,
- "width": 1088,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 64
- },
- {
- "type": "rack",
- "id": "rack12",
- "top": 484,
- "left": 430,
- "width": 1088,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 64
- },
- {
- "type": "rack",
- "id": "rack13",
- "top": 512,
- "left": 430,
- "width": 1020,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 24
- },
- {
- "type": "rack",
- "id": "rack14",
- "top": 538,
- "left": 430,
- "width": 1020,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 24
- },
- {
- "type": "rack",
- "id": "rack15",
- "top": 610,
- "left": 430,
- "width": 1020,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 24
- },
- {
- "type": "rack",
- "id": "rack16",
- "top": 636,
- "left": 430,
- "width": 1020,
- "height": 24,
- "minBayNo": 2,
- "maxBayNo": 24
- },
- ],
- "rackDescs": [
- {
- "type": "rackDescs",
- "id": "lb_desc1",
- "text": "#1",
- "top": 95,
- "left": 1460,
- "width": 30,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc2",
- "text": "#2",
- "top": 123,
- "left": 1460,
- "width": 33,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc3",
- "text": "#3",
- "top": 179,
- "left": 1460,
- "width": 32,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc4",
- "text": "#4",
- "top": 206,
- "left": 1460,
- "width": 33,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc5",
- "text": "#5",
- "top": 235,
- "left": 1530,
- "width": 32,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc6",
- "text": "#6",
- "top": 264,
- "left": 1530,
- "width": 33,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc7",
- "text": "#7",
- "top": 321,
- "left": 1530,
- "width": 32,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc8",
- "text": "#8",
- "top": 349,
- "left": 1530,
- "width": 33,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc9",
- "text": "#9",
- "top": 375,
- "left": 1530,
- "width": 33,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc10",
- "text": "#10",
- "top": 399,
- "left": 1530,
- "width": 42,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc11",
- "text": "#11",
- "top": 460,
- "left": 1530,
- "width": 38,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc12",
- "text": "#12",
- "top": 485,
- "left": 1530,
- "width": 41,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc16",
- "text": "#16",
- "top": 514,
- "left": 1460,
- "width": 41,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc15",
- "text": "#15",
- "top": 540,
- "left": 1460,
- "width": 41,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc14",
- "text": "#14",
- "top": 610,
- "left": 1460,
- "width": 41,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc13",
- "text": "#13",
- "top": 636,
- "left": 1460,
- "width": 41,
- "height": 23
- },
- ],
- "crns": [
- {
- "type": "crane",
- "id": "crn-1",
- "text": "1",
- "top": 153,
- "left": 500,
- "width": 93,
- "height": 22
- },
- {
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 291,
- "left": 500,
- "width": 93,
- "height": 22
- },
- {
- "type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 428,
- "left": 500,
- "width": 93,
- "height": 22
- },
- {
- "type": "crane",
- "id": "crn-4",
- "text": "4",
- "top": 574,
- "left": 500,
- "width": 93,
- "height": 22
- },
- {
- "type": "track",
- "id": "lb_track1",
- "text": "",
- "top": 164,
- "left": 405,
- "width": 1060,
- "height": 2
- },
- {
- "type": "track",
- "id": "lb_track2",
- "text": "",
- "top": 300,
- "left": 405,
- "width": 1130,
- "height": 2
- },
- {
- "type": "track",
- "id": "lb_track3",
- "text": "",
- "top": 438,
- "left": 405,
- "width": 1130,
- "height": 2
- },
- {
- "type": "track",
- "id": "lb_track4",
- "text": "",
- "top": 586,
- "left": 405,
- "width": 1130,
- "height": 2
- },
-
- ],
- "stns": [{
- "type": "stn",
- "id": "site-306",
- "text": "306",
- "top": 458,
- "left": 211,
- "width": 66,
- "height": 24
+ "racks": [{
+ "type": "rack",
+ "id": "rack8",
+ "top": 371,
+ "left": 179,
+ "width": 950,
+ "height": 20,
+ "minBayNo": 2,
+ "maxBayNo": 39
}, {
- "type": "stn",
- "id": "site-303",
- "text": "303",
- "top": 399,
- "left": 211,
- "width": 66,
- "height": 24
+ "type": "rack",
+ "id": "rack6",
+ "top": 302,
+ "left": 179,
+ "width": 950,
+ "height": 20,
+ "minBayNo": 2,
+ "maxBayNo": 39
}, {
- "type": "stn",
- "id": "site-304",
- "text": "304",
- "top": 458,
- "left": 345,
- "width": 66,
- "height": 24
+ "type": "rack",
+ "id": "rack7",
+ "top": 350,
+ "left": 179,
+ "width": 950,
+ "height": 20,
+ "minBayNo": 2,
+ "maxBayNo": 39
}, {
- "type": "stn",
- "id": "site-305",
- "text": "305",
- "top": 458,
- "left": 278,
- "width": 66,
- "height": 24
- },{
- "type": "stn",
- "id": "site-202",
- "text": "202",
- "top": 262,
- "left": 202,
- "width": 100,
- "height": 24
+ "type": "rack",
+ "id": "rack5",
+ "top": 281,
+ "left": 179,
+ "width": 950,
+ "height": 20,
+ "minBayNo": 2,
+ "maxBayNo": 39
}, {
- "type": "stn",
- "id": "site-302",
- "text": "302",
- "top": 399,
- "left": 278,
- "width": 66,
- "height": 24
+ "type": "rack",
+ "id": "rack4",
+ "top": 257,
+ "left": 179,
+ "width": 950,
+ "height": 20,
+ "minBayNo": 2,
+ "maxBayNo": 39
}, {
- "type": "stn",
- "id": "site-203",
- "text": "203",
- "top": 318,
- "left": 303,
- "width": 100,
- "height": 24
+ "type": "rack",
+ "id": "rack3",
+ "top": 236,
+ "left": 179,
+ "width": 950,
+ "height": 20,
+ "minBayNo": 2,
+ "maxBayNo": 39
}, {
- "type": "stn",
- "id": "site-204",
- "text": "204",
- "top": 318,
- "left": 202,
- "width": 100,
- "height": 24
+ "type": "rack",
+ "id": "rack2",
+ "top": 185,
+ "left": 179,
+ "width": 950,
+ "height": 20,
+ "minBayNo": 2,
+ "maxBayNo": 39
}, {
- "type": "stn",
- "id": "site-201",
- "text": "201",
- "top": 262,
- "left": 303,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 101,
- "left": 327,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 124,
- "left": 327,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-301",
- "text": "301",
- "top": 399,
- "left": 345,
- "width": 66,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 122,
- "left": 154,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 181,
- "left": 225,
- "width": 100,
- "height": 24
+ "type": "rack",
+ "id": "rack1",
+ "top": 164,
+ "left": 179,
+ "width": 950,
+ "height": 20,
+ "minBayNo": 2,
+ "maxBayNo": 39
}],
- "areas": [
- {
- "type": "Control_floor",
- "id": "tabControl_floor1",
- "text": "妤煎眰",
- "top": 286,
+ "rackDescs": [{
+ "type": "rackDescs",
+ "id": "lb_desc1",
+ "text": "#1",
+ "top": 136,
+ "left": 203,
+ "width": 30,
+ "height": 23
+ }, {
+ "type": "rackDescs",
+ "id": "lb_desc16",
+ "text": "#8",
+ "top": 395,
+ "left": 203,
+ "width": 33,
+ "height": 23
+ }],
+ "crns": [{
+ "type": "crane",
+ "id": "crn-1",
+ "text": "1",
+ "top": 209,
+ "left": 929,
+ "width": 93,
+ "height": 22
+ }, {
+ "type": "crane",
+ "id": "crn-2",
+ "text": "2",
+ "top": 325,
+ "left": 929,
+ "width": 93,
+ "height": 22
+ }, {
+ "type": "track",
+ "id": "lb_track1",
+ "text": "",
+ "top": 219,
+ "left": 142,
+ "width": 1035,
+ "height": 2
+ }, {
+ "type": "track",
+ "id": "lb_track2",
+ "text": "",
+ "top": 335,
+ "left": 142,
+ "width": 1035,
+ "height": 2
+ }],
+ "areas": [{
+ "type": "Control_floor",
+ "id": "tabControl_floor1",
+ "text": "妤煎眰",
+ "top": 68,
+ "left": 80,
+ "width": 1341,
+ "height": 446,
+ "floors": [{
+ "type": "floor",
+ "id": "page_floor1",
+ "text": "1F",
+ "top": 4,
"left": 22,
- "width": 302,
- "height": 403,
- "floors": [
- {
- "type": "floor",
- "id": "page_floor1",
- "text": "1F",
- "top": 4,
- "left": 22,
- "width": 276,
- "height": 395,
- "stns": [
- {
- "type": "stn",
- "id": "site-306",
- "text": "306",
- "top": 458,
- "left": 225,
- "width": 66,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-303",
- "text": "303",
- "top": 399,
- "left": 225,
- "width": 66,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-304",
- "text": "304",
- "top": 458,
- "left": 360,
- "width": 66,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-305",
- "text": "305",
- "top": 458,
- "left": 293,
- "width": 66,
- "height": 24
- },{
- "type": "stn",
- "id": "site-202",
- "text": "202",
- "top": 264,
- "left": 225,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-302",
- "text": "302",
- "top": 399,
- "left": 293,
- "width": 66,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-203",
- "text": "203",
- "top": 320,
- "left": 327,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-204",
- "text": "204",
- "top": 320,
- "left": 225,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-201",
- "text": "201",
- "top": 264,
- "left": 327,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 181,
- "left": 327,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 124,
- "left": 327,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-301",
- "text": "301",
- "top": 399,
- "left": 360,
- "width": 66,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 124,
- "left": 225,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 181,
- "left": 225,
- "width": 100,
- "height": 24
- },
- {
- "type": "stn",
- "id": "site-402",
- "text": "402",
- "top": 612,
- "left": 326,
- "width": 100,
- "height": 24
- },
- {
- "type": "stn",
- "id": "site-401",
- "text": "401",
- "top": 612,
- "left": 224,
- "width": 100,
- "height": 24
- }
- ]
- }
- ]
- }
- ]
-
+ "width": 1315,
+ "height": 438,
+ "stns": [{
+ "type": "stn",
+ "id": "site-102",
+ "text": "102",
+ "top": 238,
+ "left": 1232,
+ "width": 100,
+ "height": 18
+ }, {
+ "type": "stn",
+ "id": "site-107",
+ "text": "107",
+ "top": 352,
+ "left": 1131,
+ "width": 100,
+ "height": 18
+ }, {
+ "type": "stn",
+ "id": "site-106",
+ "text": "106",
+ "top": 352,
+ "left": 1232,
+ "width": 100,
+ "height": 18
+ }, {
+ "type": "stn",
+ "id": "site-006",
+ "text": "105",
+ "top": 304,
+ "left": 1131,
+ "width": 100,
+ "height": 18
+ }, {
+ "type": "stn",
+ "id": "site-104",
+ "text": "104",
+ "top": 304,
+ "left": 1232,
+ "width": 100,
+ "height": 18
+ }, {
+ "type": "stn",
+ "id": "site-103",
+ "text": "103",
+ "top": 238,
+ "left": 1131,
+ "width": 100,
+ "height": 18
+ }, {
+ "type": "stn",
+ "id": "site-101",
+ "text": "101",
+ "top": 187,
+ "left": 1131,
+ "width": 100,
+ "height": 18
+ }, {
+ "type": "stn",
+ "id": "site-100",
+ "text": "100",
+ "top": 187,
+ "left": 1232,
+ "width": 100,
+ "height": 18
+ }]
+ }]
+ }]
}
\ No newline at end of file
--
Gitblit v1.9.1