diff --git a/src/main/java/com/dispose/manager/DisposeTaskManager.java b/src/main/java/com/dispose/manager/DisposeTaskManager.java index 63dd59fe..ca42b368 100644 --- a/src/main/java/com/dispose/manager/DisposeTaskManager.java +++ b/src/main/java/com/dispose/manager/DisposeTaskManager.java @@ -41,6 +41,13 @@ public interface DisposeTaskManager { */ List getExpiredTasks(); + /** + * Gets un expired tasks. + * + * @return the un expired tasks + */ + List getUnExpiredTasks(); + /** * Gets new dispose tasks. * diff --git a/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java b/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java index c76b1598..b5703a08 100644 --- a/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java +++ b/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java @@ -88,6 +88,16 @@ public class DisposeTaskManagerImpl implements DisposeTaskManager { return disposeTaskMapper.getExpiredTasks(); } + /** + * Gets un expired tasks. + * + * @return the un expired tasks + */ + @Override + public List getUnExpiredTasks() { + return disposeTaskMapper.getUnExpiredTasks(); + } + /** * Gets new dispose tasks. * diff --git a/src/main/java/com/dispose/mapper/DisposeTaskMapper.java b/src/main/java/com/dispose/mapper/DisposeTaskMapper.java index d6a07442..2beda504 100644 --- a/src/main/java/com/dispose/mapper/DisposeTaskMapper.java +++ b/src/main/java/com/dispose/mapper/DisposeTaskMapper.java @@ -104,4 +104,11 @@ public interface DisposeTaskMapper { * @return the expired tasks */ List getExpiredTasks(); + + /** + * Gets un expired tasks. + * + * @return the un expired tasks + */ + List getUnExpiredTasks(); } diff --git a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java index 0116645f..d62fc05e 100644 --- a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java @@ -462,7 +462,7 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService { } // 对新建的任务,创建对应处置设备任务信息 - for (DisposeTask v : disposeTaskManager.getExpiredTasks()) { + for (DisposeTask v : disposeTaskManager.getUnExpiredTasks()) { // 设置任务状态, 开始创建任务 disposeTaskManager.changeDisposeTaskStatus(v.getId(), DisposeTaskStatus.TASK_STARTING); diff --git a/src/main/resources/mappers/DisposeTask.xml b/src/main/resources/mappers/DisposeTask.xml index 4990f035..31be363d 100644 --- a/src/main/resources/mappers/DisposeTask.xml +++ b/src/main/resources/mappers/DisposeTask.xml @@ -139,6 +139,15 @@ WHERE currentStatus = ${@com.dispose.common.DisposeTaskStatus@TASK_NEW.getValue()} + +