From 286eadc0913fe9974ab2f2fd188fb707dc16ad40 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 24 二月 2026 09:16:14 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 2a65490..833976c 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -17,6 +17,7 @@
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.TaskType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
@@ -55,7 +56,6 @@
}};
-
public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
add(1);
}};
@@ -86,18 +86,18 @@
connect();
while (true) {
try {
- int step = 1;
+ TaskType step = TaskType.READ;
Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
if (task != null) {
step = task.getStep();
}
switch (step) {
// 璇绘暟鎹�
- case 1:
+ case READ:
read();
break;
// 鍐欐暟鎹� ID+鐩爣绔�
- case 2:
+ case WRITE:
write((StaProtocol) task.getData());
break;
default:
@@ -209,7 +209,7 @@
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
if (Cools.isEmpty(barcode)) {
barcodeThread.clearBarcode();
- }else {
+ } else {
if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
log.info("鏂欑鐮侊細{}", barcode);
@@ -280,8 +280,6 @@
News.error("SiemensDevp" + " - 4" + " - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
}
}
-
-
/**
--
Gitblit v1.9.1