From 3363a5ecb9b8e523019197d2d85121ec4c645cca Mon Sep 17 00:00:00 2001 From: lishuai <1793460677@qq.com> Date: Thu, 22 Aug 2024 11:02:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=BA=BF=E7=A8=8B=E9=98=BB=E5=A1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../belt_conveyor/BeltConveyorDeviceDriver.java | 11 ++--------- .../java/org/nl/acs/opc/DeviceExecuteAutoRun.java | 6 +++++- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java index e3877f7c9..703901d68 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java @@ -260,22 +260,15 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements }); } //申请空托盘出库 -// if (mode == 8 && !requireSucess) { - if (true) { - List list = new ArrayList<>(); - Map map = new HashMap<>(); - map.put("code", "to_target"); - map.put("value", "0"); - list.add(map); - this.writing(list); + if (mode == 8 && !requireSucess) { if (container_type == 0) { message = "托盘类型为空"; } else { applyEmptyTask(StorageTypeEnum.DISKS_OUT.getType(), mode); } - } + if (mode == 0) { this.setIsonline(false); message = "脱机"; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExecuteAutoRun.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExecuteAutoRun.java index 21fc96e7a..3e8a41817 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExecuteAutoRun.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExecuteAutoRun.java @@ -3,6 +3,8 @@ package org.nl.acs.opc; import lombok.extern.slf4j.Slf4j; import org.dromara.dynamictp.core.DtpRegistry; import org.dromara.dynamictp.core.executor.DtpExecutor; +import org.dromara.dynamictp.core.executor.OrderedDtpExecutor; +import org.dromara.dynamictp.core.executor.eager.EagerDtpExecutor; import org.dromara.dynamictp.core.support.ExecutorWrapper; import org.nl.acs.auto.run.AbstractAutoRunnable; import org.nl.acs.auto.run.AutoRunService; @@ -134,8 +136,11 @@ public class DeviceExecuteAutoRun extends AbstractAutoRunnable { ScheduledExecutorService scheduler = (ScheduledExecutorService) DtpRegistry.getExecutor("scheduled_pool"); + EagerDtpExecutor eagerDtpExecutor = (EagerDtpExecutor) DtpRegistry.getExecutor("scheduled_pool"); + OrderedDtpExecutor orderedDtpExecutor = (OrderedDtpExecutor) DtpRegistry.getExecutor("scheduled_pool"); // 使用调度器在超时后取消任务 scheduler.schedule(() -> { + //异步任务没有结束 if (!future.isDone()) { try { future.get(5, TimeUnit.SECONDS); @@ -143,7 +148,6 @@ public class DeviceExecuteAutoRun extends AbstractAutoRunnable { future.cancel(true); } } - }, 1, TimeUnit.MILLISECONDS); // 设置超时时间为10秒 } }