From d074cb16f7b3ba11363766dd78802da60f4ec07d Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 23 四月 2026 09:39:47 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 24 ++----------------------
1 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 6c5fd45..2933101 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -21,7 +21,7 @@
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
-import io.swagger.models.auth.In;
+
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -43,8 +43,6 @@
private DevpSlave slave;
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
- public boolean charge0; //璇锋眰鍏呯數
- public boolean charge1; //璇锋眰鍏呯數
private short heartBeatVal = 1;
private boolean result = false;
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
@@ -56,24 +54,6 @@
add(121);add(122);add(123);add(124);add(125);add(126);add(127);add(128);add(129);add(130);
add(131);add(132);add(133);
}};
-
- /**
- * 鏉＄爜鏁伴噺
- */
- private int barcodeSize = 5;
-
- /**
- * 鍏ュ嚭搴撴ā寮�
- * 0锛氭湭鐭�
- * 1锛氬叆搴撳惎鍔ㄤ腑
- * 2.鍏ュ簱妯″紡
- * 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛�
- * 4.鍑哄簱妯″紡
- */
- public IoModeType ioModeOf2F = IoModeType.NONE;
-// public IoModeType ioMode = IoModeType.NONE;
- public IoModeType ioModeOf4F = IoModeType.NONE;
-// public IoModeType ioMode = IoModeType.NONE;
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -158,7 +138,7 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransUInt32(result.Content, i*8)); // 宸ヤ綔鍙�
+ staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransUInt32(result.Content, i*4)); // 宸ヤ綔鍙�
}
}
--
Gitblit v1.9.1