From 594f1e25822478ffeff8b64799a05e47b233d5a5 Mon Sep 17 00:00:00 2001 From: tqs <56479841@qq.com> Date: 星期三, 28 九月 2022 09:58:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs --- src/main/java/com/zy/core/thread/SiemensCrnThread.java | 2 +- src/main/java/com/zy/asrs/controller/ConsoleController.java | 8 +++----- src/main/java/com/zy/core/thread/SiemensDevpThread.java | 8 ++++---- src/main/resources/application.yml | 8 ++++---- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java index 2da28c2..e5ea794 100644 --- a/src/main/java/com/zy/asrs/controller/ConsoleController.java +++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java @@ -34,10 +34,7 @@ import com.zy.core.model.protocol.StaProtocol; import com.zy.core.properties.SlaveProperties; import com.zy.core.properties.SystemProperties; -import com.zy.core.thread.BarcodeThread; -import com.zy.core.thread.MelsecCrnThread; -import com.zy.core.thread.ScaleThread; -import com.zy.core.thread.SiemensCrnThread; +import com.zy.core.thread.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -270,7 +267,8 @@ CrnDetailVo vo = new CrnDetailVo(); for (CrnSlave crnSlave : slaveProperties.getCrn()) { if (crnSlave.getId().equals(crnNo)) { - SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId()); + SiemensCrnThread crnThread=(SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId()); +// MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId()); CrnProtocol crnProtocol = crnThread.getCrnProtocol(); vo.setCrnNo(crnNo); vo.setWorkNo(crnProtocol.getTaskNo()); diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java index 65343df..45c57c7 100644 --- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java +++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java @@ -147,7 +147,7 @@ */ private void readStatus(){ try { - OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 70); + OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 50); if (result.IsSuccess) { if (null == crnProtocol) { crnProtocol = new CrnProtocol(); diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java index 539a299..ef9cbb9 100644 --- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java +++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java @@ -42,9 +42,9 @@ private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>(); private short heartBeatVal = 1; public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{ - add(101);add(102);add(103);add(104); - add(201);add(202);add(203);add(204); - add(301);add(302);add(303);add(304);add(305);add(306); + add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109); +// add(201);add(202);add(203);add(204); +// add(301);add(302);add(303);add(304);add(305);add(306); }}; /** @@ -155,7 +155,7 @@ // } // } Thread.sleep(200); - OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB150.0", (short) (staNoSize*2)); + OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2)); if (result1.IsSuccess) { for (int i = 0; i < staNoSize; i++) { Integer siteId = staNos.get(i); // 绔欑偣缂栧彿 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c7f23af..8e292d0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 9090 + port: 8081 servlet: context-path: /@pom.build.finalName@ @@ -34,7 +34,7 @@ enable: false wms: - url: localhost:8081/ynwms + url: localhost:8080/ynwms # 涓嬩綅鏈洪厤缃� wcs-slave: @@ -47,7 +47,7 @@ # 鍫嗗灈鏈�1 crn[0]: id: 1 - ip: 10.10.10.10 + ip: 172.28.15.210 port: 8888 rack: 0 slot: 0 @@ -90,7 +90,7 @@ # 杈撻�佺嚎 devp[0]: id: 1 - ip: 192.168.4.250 + ip: 172.28.15.220 port: 102 rack: 0 slot: 0 -- Gitblit v1.9.1