From 67199f031dffc865dc1f9abaafbe43bbb59471ff Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期日, 05 五月 2024 14:30:39 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SiemensDevpThread.java | 30 +++++------------------------- 1 files changed, 5 insertions(+), 25 deletions(-) diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SiemensDevpThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SiemensDevpThread.java index 07a7218..eac27b4 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SiemensDevpThread.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SiemensDevpThread.java @@ -13,11 +13,8 @@ import com.zy.asrs.wcs.core.service.StationService; import com.zy.asrs.wcs.core.utils.RedisUtil; import com.zy.asrs.wcs.rcs.News; -import com.zy.asrs.wcs.rcs.cache.MessageQueue; import com.zy.asrs.wcs.rcs.cache.OutputQueue; import com.zy.asrs.wcs.rcs.entity.Device; -import com.zy.asrs.wcs.rcs.model.Task; -import com.zy.asrs.wcs.rcs.model.enums.SlaveType; import com.zy.asrs.wcs.rcs.model.protocol.StaProtocol; import com.zy.asrs.wcs.rcs.thread.DevpThread; import lombok.extern.slf4j.Slf4j; @@ -69,38 +66,21 @@ @Override @SuppressWarnings("InfiniteLoopStatement") public void run() { - connect(); + News.info("{}鍙疯緭閫佺嚎绾跨▼鍚姩", device.getDeviceNo()); + this.connect(); while (true) { try { - int step = 1; - Task task = MessageQueue.poll(SlaveType.Devp, device.getId().intValue()); - if (task != null) { - step = task.getStep(); - } - switch (step) { - // 璇绘暟鎹� - case 1: - read(); - break; - default: - break; - } - // 蹇冭烦 -// heartbeat(); - Thread.sleep(400); + read(); + Thread.sleep(500); } catch (Exception e) { e.printStackTrace(); } - } } private void read() throws InterruptedException { ArrayList<Station> staNos = getStaNo(); int staNoSize = staNos.size(); - if (station.isEmpty()) { - return; - } OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize*8)); if (result.IsSuccess) { for (int i = 0; i < staNoSize; i++) { @@ -165,7 +145,7 @@ } } - if (result.IsSuccess && !Cools.isEmpty(result) && result.IsSuccess) { + if (!Cools.isEmpty(result) && result.IsSuccess) { OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), device.getId())); -- Gitblit v1.9.1