diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java index 76012c0..36c8fbb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java @@ -100,6 +100,13 @@ public class MydoJobServiceImpl implements IMydoJobService { for (String jobId : jobIds) { mydoJobMapper.insertHistory(jobId); + //当执行任务的【删除】操作时(特殊场景需要手动处理异常导致不需要入库时,此时不需要向回传异常) + // 此处顺便处理对应任务号生成的堆垛机执行队列,省去sql直接表中删记录的操作 + if (ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByTaskNo(jobId) != null) { + MydoJob mydoJob = selectMydoJobByJobId(jobId); + ddjDeviceExecutionQueueService.deleteDdjDeviceExecutionQueueByTaskNo(mydoJob.getTaskNo()); + } + } return mydoJobMapper.deleteMydoJobByJobIds(jobIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java index 418269d..7bdaaa0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java @@ -90,7 +90,7 @@ public class DdjThread implements Runnable { } } try { - Thread.sleep(1500); + Thread.sleep(3000); } catch (InterruptedException e) { throw new RuntimeException(e); }