From 5708f21940cacc6061d022f29c9c12edfc6d87bd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期一, 28 三月 2022 17:11:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 7eeb582..9645650 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -9,6 +9,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -48,11 +49,15 @@
add(150);add(151);add(152);add(153);add(154);add(155);add(156);add(157);add(158);add(159);
add(160);add(161);add(162);add(163);add(164);add(165);add(166);add(167);add(168);add(169);
add(170);add(171);add(172);add(173);add(174);add(175);add(176);add(177);add(178);add(179);
- add(180);add(181);add(182);add(183);add(184);add(185);add(186);add(187);add(188);add(189);
- add(190);add(191);add(192);
+ add(180);add(181);add(182);
+ add(183);add(184);add(185);add(186);add(187);add(188);add(189);add(190);add(191);add(192);
}};
public IoModeType ioMode = IoModeType.NONE;
+ /**
+ * 182绔欏爢鍨涙満鎵ц涓嚭搴撴暟閲�
+ */
+ public int PRE_COUNT=0;
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -116,9 +121,9 @@
private void read() throws InterruptedException {
// // 鏇存柊鍏ュ嚭搴撴ā寮�
// updateIoMode();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 166);
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 186);
if (result.IsSuccess) {
- for (int i = 0; i < 83; i++) {
+ for (int i = 0; i < 93; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -130,9 +135,9 @@
}
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 166);
+ OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
if (result0.IsSuccess) {
- for (int i = 0; i < 83; i++) {
+ for (int i = 0; i < 93; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -144,9 +149,9 @@
}
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) 166);
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) 186);
if (result1.IsSuccess) {
- for (int i = 0; i < 83; i++) {
+ for (int i = 0; i < 93; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
StaProtocol staProtocol = station.get(siteId);
@@ -226,6 +231,25 @@
log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
+// //鍑哄簱鍒�182绔欏爢鍨涙満浠诲姟鏁版嵁鍙戦�佺粰PLC
+// try{
+// WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
+// if(null != wrkMastService){
+// int count = wrkMastService.getOutToStn182(182);
+// if(count != PRE_COUNT){
+// OperateResult write = siemensS7Net.Write("DB300.2",(short)count);
+// if (write.IsSuccess) {
+// PRE_COUNT = count;
+// } else {
+// log.error("鏇存柊鍫嗗灈鏈哄嚭搴撳埌182绔欎换鍔℃暟閲忛敊璇�,浠诲姟鏁伴噺==>>" + count);
+// }
+// }
+// }
+// }catch (Exception e) {
+// e.printStackTrace();
+// log.error("鏇存柊鍫嗗灈鏈哄嚭搴撳埌182绔欎换鍔℃暟閲忓け璐�");
+// }
+
} else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣鍙栬緭閫佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
// log.error("璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
--
Gitblit v1.9.1