From 8ee2064b48bf7e8beb1b88326fcbbc5f548d764f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 14 十一月 2022 08:50:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 56bb030..816b175 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -43,11 +43,14 @@
private int barcodeSize = 2;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
add(100);add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109);
- add(110);add(111);
+ add(110);add(111);add(112);add(113);add(114);add(115);add(116);add(117);add(118);add(119);
add(200);add(201);add(202);add(203);add(204);add(205);add(206);add(207);add(208);add(209);
- add(210);add(211);
- add(300);
+ add(1000);add(2000);
}};
+
+ public boolean charge0;
+ public boolean charge1;
+ public boolean charge2;
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -111,7 +114,7 @@
private void read() throws InterruptedException {
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 50);
if (result.IsSuccess) {
- for (int i = 0; i < 25; i++) {
+ for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -125,7 +128,7 @@
Thread.sleep(200);
OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 50);
if (result0.IsSuccess) {
- for (int i = 0; i < 25; i++) {
+ for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -139,7 +142,7 @@
Thread.sleep(200);
OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) 50);
if (result1.IsSuccess) {
- for (int i = 0; i < 25; i++) {
+ for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
StaProtocol staProtocol = station.get(siteId);
@@ -159,7 +162,7 @@
}
//璇绘潯鐮�
- Thread.sleep(200);
+ Thread.sleep(100);
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.100",(short)(barcodeSize*8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
@@ -170,6 +173,16 @@
}
}
+ }
+
+ // 鍏呯數淇″彿浣�
+ Thread.sleep(100);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.50", (short)1);
+ if (result3.IsSuccess) {
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, 0, 1);
+ charge0 = status[0];
+ charge1 = status[1];
+ charge2 = status[2];
}
if (result.IsSuccess && result0.IsSuccess && result1.IsSuccess) {
@@ -249,6 +262,22 @@
}
}
+ /**
+ * 鍏呯數鎺у埗
+ * @param index 鍏呯數妗╁簭鍙� 0 寮�濮�
+ * @param open true 寮�濮嬪厖鐢碉紱false 缁撴潫鍏呯數
+ */
+ public boolean charge(int index, boolean open) {
+ OperateResult write = siemensS7Net.Write("DB102.50." + (index + 3), open);
+ if (!write.IsSuccess) {
+ log.error("杈撻�佺嚎plc缂栧彿={} {}鍙峰厖鐢垫々{}鎺у埗澶辫触", slave.getId(), index + 1, open?"鎵撳紑":"鍏抽棴");
+ return false;
+ } else {
+ log.error("杈撻�佺嚎plc缂栧彿={} {}鍙峰厖鐢垫々{}鎺у埗鎴愬姛", slave.getId(), index + 1, open?"鎵撳紑":"鍏抽棴");
+ }
+ return true;
+ }
+
@Override
public void close() {
siemensS7Net.ConnectClose();
--
Gitblit v1.9.1