From 027b7c235ba8a2a753b8f8e1b4ac1c1950c30cfa Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 08 九月 2022 12:35:00 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/SiteController.java | 1 src/main/java/com/zy/core/thread/SiemensDevpThread.java | 20 +++--- src/main/resources/application.yml | 106 +++++++++++++++++++++++++---------- 3 files changed, 86 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java index 520935e..9f78842 100644 --- a/src/main/java/com/zy/asrs/controller/SiteController.java +++ b/src/main/java/com/zy/asrs/controller/SiteController.java @@ -156,6 +156,7 @@ for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) { if (siteId.equals(entry.getKey())) { StaProtocol staProtocol = entry.getValue(); + staProtocol = staProtocol.clone(); if (workNo != null) { staProtocol.setWorkNo(workNo); } diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java index bc75d85..844b702 100644 --- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java +++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java @@ -106,9 +106,9 @@ * 璇诲彇鐘舵�� ====> 鏁村潡plc */ private void read() throws InterruptedException { - OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 166); + OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 50); if (result.IsSuccess) { - for (int i = 0; i < 83; i++) { + for (int i = 0; i < 25; i++) { Integer siteId = staNos.get(i); // 绔欑偣缂栧彿 StaProtocol staProtocol = station.get(siteId); if (null == staProtocol) { @@ -120,9 +120,9 @@ } } Thread.sleep(200); - OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 166); + OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 50); if (result0.IsSuccess) { - for (int i = 0; i < 83; i++) { + for (int i = 0; i < 25; i++) { Integer siteId = staNos.get(i); // 绔欑偣缂栧彿 StaProtocol staProtocol = station.get(siteId); if (null == staProtocol) { @@ -134,9 +134,9 @@ } } Thread.sleep(200); - OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) 166); + OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) 50); if (result1.IsSuccess) { - for (int i = 0; i < 83; i++) { + for (int i = 0; i < 25; i++) { Integer siteId = staNos.get(i); // 绔欑偣缂栧彿 boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1); StaProtocol staProtocol = station.get(siteId); @@ -238,16 +238,16 @@ } public static void main(String[] args) { - System.out.println(staNos.indexOf(129)); +// System.out.println(staNos.indexOf(129)); System.out.println(staNos.size()); for (int i = 0; i<staNos.size(); i++) { // System.out.println(i*2); // System.out.println(i*2 + 200); // System.out.println(i); } - int index = staNos.indexOf(128); - System.out.println(index*2); - System.out.println(index*2 + 200); +// int index = staNos.indexOf(128); +// System.out.println(index*2); +// System.out.println(index*2 + 200); } // public static void main(String[] args) throws Exception { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0d72624..2d2c6e2 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -8,10 +8,11 @@ name: @pom.build.finalName@ datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://47.97.1.152:51433;databasename=bfasrs - # url: jdbc:sqlserver://localhost:1433;databasename=ynasrs + # url: jdbc:sqlserver://47.97.1.152:51433;databasename=bfasrs + url: jdbc:sqlserver://localhost:1433;databasename=bfasrs username: sa - password: Zoneyung@zy56$ + # password: Zoneyung@zy56$ + password: sa@123 mvc: static-path-pattern: /** redis: @@ -35,64 +36,107 @@ enable: false wms: - url: 10.10.10.238:8080/xgmwms -# url: localhost:8082/xgmwms + url: localhost:8081/bfmwms # 涓嬩綅鏈洪厤缃� wcs-slave: # 鍙屾繁 - doubleDeep: true + doubleDeep: false # 鍙屾繁搴撲綅鎺掑彿 doubleLocs: 1,4,5,8,9,12,13,16,17,20 # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁� groupCount: 4 # 鍫嗗灈鏈�1 - crn[0]: - id: 1 - ip: 10.10.10.10 - port: 8888 - # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 - offset: 2 - demo: false - # 鍫嗗灈鏈哄叆搴撶珯鐐� - crnInStn[0]: - devpPlcId: ${wcs-slave.devp[0].id} - staNo: 100 - row: 2 - bay: 1 - lev: 1 - # 鍫嗗灈鏈哄嚭搴撶珯鐐� - crnOutStn[0]: - devpPlcId: ${wcs-slave.devp[0].id} - staNo: 101 - row: 3 - bay: 1 - lev: 1 +# crn[0]: +# id: 1 +# ip: 10.10.10.10 +# port: 102 +# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 +# offset: 2 +# demo: false +# # 鍫嗗灈鏈哄叆搴撶珯鐐� +# crnInStn[0]: +# devpPlcId: ${wcs-slave.devp[0].id} +# staNo: 100 +# row: 2 +# bay: 1 +# lev: 1 +# # 鍫嗗灈鏈哄嚭搴撶珯鐐� +# crnOutStn[0]: +# devpPlcId: ${wcs-slave.devp[0].id} +# staNo: 101 +# row: 3 +# bay: 1 +# lev: 1 +# # 鍫嗗灈鏈�2 +# crn[1]: +# id: 1 +# ip: 10.10.10.20 +# port: 102 +# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 +# offset: 2 +# demo: false +# # 鍫嗗灈鏈哄叆搴撶珯鐐� +# crnInStn[0]: +# devpPlcId: ${wcs-slave.devp[0].id} +# staNo: 100 +# row: 2 +# bay: 1 +# lev: 1 +# # 鍫嗗灈鏈哄嚭搴撶珯鐐� +# crnOutStn[0]: +# devpPlcId: ${wcs-slave.devp[0].id} +# staNo: 101 +# row: 3 +# bay: 1 +# lev: 1 +# # 鍫嗗灈鏈�3 +# crn[2]: +# id: 1 +# ip: 10.10.10.30 +# port: 102 +# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 +# offset: 2 +# demo: false +# # 鍫嗗灈鏈哄叆搴撶珯鐐� +# crnInStn[0]: +# devpPlcId: ${wcs-slave.devp[0].id} +# staNo: 100 +# row: 2 +# bay: 1 +# lev: 1 +# # 鍫嗗灈鏈哄嚭搴撶珯鐐� +# crnOutStn[0]: +# devpPlcId: ${wcs-slave.devp[0].id} +# staNo: 101 +# row: 3 +# bay: 1 +# lev: 1 # 绌挎杞�1 ste[0]: id: 1 - ip: 10.10.10.10 + ip: 10.10.10.40 port: 502 rack: 0 slot: 0 # 绌挎杞�2 ste[1]: id: 2 - ip: 10.10.10.11 + ip: 10.10.10.41 port: 502 rack: 0 slot: 0 # 绌挎杞�3 ste[2]: id: 3 - ip: 10.10.10.12 + ip: 10.10.10.42 port: 502 rack: 0 slot: 0 # 杈撻�佺嚎 devp[0]: id: 1 - ip: 10.10.10.50 + ip: 10.10.10.61 port: 102 rack: 0 slot: 0 -- Gitblit v1.9.1