From 0e10bf39c53b0b79cbdc051ddb10845d361042c3 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 06 五月 2026 09:51:50 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 723985c..6c56abd 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -26,10 +26,7 @@
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -48,21 +45,22 @@
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(200);add(201);add(202);add(203);add(210);
- add(300);add(301);add(302);add(303);add(304);add(305);
+ add(1101);add(1102);
+ add(200);add(201);add(202);add(203);add(2101);add(2102);add(2103);add(2104);add(210);
+ add(300);add(301);add(302);add(303);add(304);add(305);add(1200);add(1201);add(1202);
}};
public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
- add(1); add(2);
+ add(1); add(2);add(3);
}};
public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
- add(101); add(103);
+ add(101); add(103);add(1102);
}};
/**
* 鏉＄爜鏁伴噺
*/
- private int barcodeSize = 2;
+ private int barcodeSize = 3;
/**
* 鍏ュ嚭搴撴ā寮�
@@ -133,6 +131,7 @@
booleans[1] = true; // 鍏抽棬淇″彿
booleans[0] = false;
siemensS7Net.Write("DB100.826",booleans);
+ log.info("涓嬪彂鍏抽棬淇″彿鎴愬姛锛�" + Arrays.toString(booleans));
}
} else if(flag == 1) {
OperateResultExOne<byte[]> readOpenResult = siemensS7Net.Read("DB100.826", (short) 1);
@@ -141,6 +140,7 @@
booleans[0] = true; // 寮�闂ㄤ俊鍙�
booleans[1] = false;
siemensS7Net.Write("DB100.826",booleans);
+ log.info("涓嬪彂寮�闂ㄤ俊鍙锋垚鍔燂細" + Arrays.toString(booleans));
}
}
Thread.sleep(500);
@@ -157,6 +157,7 @@
staProtocol.setCloseAskDoor(booleans[1]);
staProtocol.setIfOpenDoor(booleans[2]);
staProtocol.setIfCloseDoor(booleans[3]);
+ log.info("涓嬪彂寮�鍏抽棬鍚庡洖璇伙細" + Arrays.toString(booleans));
}
}
@@ -218,7 +219,7 @@
// 璇讳竴妤艰繛缁�8涓珯鐐�
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (8*8));
if (result.IsSuccess) {
- for (int i = 0; i < 8; i++) {
+ for (int i = 0; i < 10; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -248,7 +249,7 @@
// 璇讳簩妤艰繛缁�4涓珯鐐�
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.800", (short) (4*8));
if (result2.IsSuccess) {
- for (int i = 8; i < 12; i++) {
+ for (int i = 10; i < 18; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -278,7 +279,7 @@
// 璇讳簩妤�210
OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB101.880", (short) (8));
if (result3.IsSuccess) {
- Integer siteId = staNos.get(12); // 绔欑偣缂栧彿210
+ Integer siteId = staNos.get(18); // 绔欑偣缂栧彿210
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
staProtocol = new StaProtocol();
@@ -306,7 +307,7 @@
// 璇讳簩妤�3鍖�
OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB101.1600", (short) (6*8));
if (result2.IsSuccess) {
- for (int i = 13; i < staNos.size(); i++) {
+ for (int i = 19; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -382,7 +383,7 @@
// 璇讳竴妤艰繛缁�8涓珯鐐癸紝鏁呴殰淇℃伅鍙嶉
OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.3312", (short) (8*2));
if (resultErr2.IsSuccess) {
- for (int i = 0; i < 8; i++) {
+ for (int i = 0; i < 10; i++) {
boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i*2 + 1, 1);
StaProtocol staProtocol = station.get(staNos.get(i)); // 绔欑偣缂栧彿
staProtocol.setBreakerErr(status[0]);
@@ -399,7 +400,7 @@
// 璇讳簩妤艰繛缁�4涓珯鐐癸紝鏁呴殰淇℃伅鍙嶉
OperateResultExOne<byte[]> resultErr3 = siemensS7Net.Read("DB101.3512", (short) (4*2));
if (resultErr3.IsSuccess) {
- for (int i = 8; i < 12; i++) {
+ for (int i = 10; i < 18; i++) {
boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr3.Content, (i-8) * 2 + 1, 1);
StaProtocol staProtocol = station.get(staNos.get(i)); // 绔欑偣缂栧彿
staProtocol.setBreakerErr(status[0]);
@@ -415,7 +416,7 @@
// 璇讳笁鍖烘晠闅滀俊鎭弽棣�
OperateResultExOne<byte[]> resultErr4 = siemensS7Net.Read("DB101.2096", (short) (6*2));
if (resultErr4.IsSuccess) {
- for (int i = 13; i < staNos.size(); i++) {
+ for (int i = 19; i < staNos.size(); i++) {
boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr4.Content, (i-13) * 2 + 1, 1);
StaProtocol staProtocol = station.get(staNos.get(i)); // 绔欑偣缂栧彿
staProtocol.setBreakerErr(status[0]);
--
Gitblit v1.9.1