From 15907a288894bdf758978f46088dce57b3fe0174 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 02 八月 2022 14:17:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 66e80c6..d971acd 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -8,13 +8,9 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
-import com.google.common.base.Utf8;
-import com.sun.xml.internal.bind.v2.runtime.output.Encoded;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.WrkMastService;
import com.zy.core.DevpThread;
-import com.zy.core.Slave;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -23,10 +19,8 @@
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
-import com.zy.core.properties.SlaveProperties;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import java.text.MessageFormat;
import java.util.ArrayList;
@@ -48,14 +42,10 @@
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
- add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109);
- add(110);add(111);add(112);add(113);add(114);add(115);add(116);add(117);add(118);add(119);
- add(120);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);add(134);add(135);add(136);
+ add(101);add(102);add(103);add(104);
+ add(201);add(202);add(203);add(204);
+ add(301);add(302);add(303);add(304);add(305);add(306);
}};
-
- @Autowired
- private SlaveProperties slaveProperties;
/**
* 鏉＄爜鏁伴噺
@@ -178,7 +168,6 @@
}
Thread.sleep(200);
- barcodeSize = slaveProperties.getBarcode().size();
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(short)(barcodeSize*8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
--
Gitblit v1.9.1