From 3ee0ff0bd24d4df9b795146ece6da43a78bf8bd0 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 12 十二月 2023 20:55:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 412bdd3..f128698 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -58,6 +58,26 @@
add(309);add(312);
}};
+ public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+ add(302);add(304);
+ add(305);add(306);
+ add(307);add(308);
+ add(310);add(311);
+ add(312);add(313);
+ add(314);add(315);
+ add(316);add(318);
+ add(319);add(320);
+ add(321);add(322);
+ add(323);add(324);
+ add(326);add(327);
+ add(328);add(329);
+ add(330);add(332);
+ add(334);add(335);
+ add(336);add(337);
+ add(338);add(342);
+ add(343);add(344);
+ }};
+
//楂樹綆淇″彿绔欑偣
public static final ArrayList<Integer> locType1StaNos = new ArrayList<Integer>() {{
add(100);add(103);
@@ -250,6 +270,26 @@
}
}
+// Thread.sleep(100);
+// for (Integer staNo : staNos2) {
+// OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB" + staNo + ".0", (short) 48);
+// if (result5.IsSuccess) {
+// StaProtocol staProtocol = station.get(staNo);
+// if (null == staProtocol) {
+// staProtocol = new StaProtocol();
+// staProtocol.setSiteId(staNo);
+// station.put(staNo, staProtocol);
+// }
+//
+// boolean[] status1 = siemensS7Net.getByteTransform().TransBool(result5.Content, 8, 1);
+// boolean[] status2 = siemensS7Net.getByteTransform().TransBool(result5.Content, 21, 1);
+// staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 34)); // 宸ヤ綔鍙�
+// staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 40)); // 鐩爣绔�
+// staProtocol.setAutoing(status1[0]); // 鑷姩
+// staProtocol.setLoading(status2[2]); // 鏈夌墿
+// }
+// }
+
if (result.IsSuccess && result1.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -338,8 +378,8 @@
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
log.error("鍐欏叆杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
- //閲嶆柊娣诲姞鏁版嵁鍒颁换鍔￠槦鍒�
- boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
+// //閲嶆柊娣诲姞鏁版嵁鍒颁换鍔￠槦鍒�
+// boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
read();//璇诲彇1娆¤澶囩姸鎬�
return;
} else {
--
Gitblit v1.9.1