diff --git a/src/main/java/com/dispose/controller/DisposeTaskController.java b/src/main/java/com/dispose/controller/DisposeTaskController.java index 7d077834..64532dff 100644 --- a/src/main/java/com/dispose/controller/DisposeTaskController.java +++ b/src/main/java/com/dispose/controller/DisposeTaskController.java @@ -111,7 +111,12 @@ public class DisposeTaskController { MReturnType ret = taskService.createTask(task); - rspInfo.setTaskId(String.valueOf(ret.getSecondParam())); + if (ret.getFirstParam() == ErrorCode.ERR_OK) { + TaskInfoDetail tf = taskCacheManager.getTaskById(ret.getSecondParam()); + rspInfo.setId(String.valueOf(tf.getDeviceId())); + rspInfo.setTaskId(String.valueOf(ret.getSecondParam())); + } + rspInfo.setStatus(ret.getFirstParam().getCode()); rspInfo.setMessage(ret.getFirstParam().getMsg()); diff --git a/src/main/java/com/dispose/service/impl/TaskServiceImpl.java b/src/main/java/com/dispose/service/impl/TaskServiceImpl.java index 2ee927d7..5c7468b8 100644 --- a/src/main/java/com/dispose/service/impl/TaskServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/TaskServiceImpl.java @@ -324,8 +324,6 @@ public class TaskServiceImpl implements TaskService { LocalDateTime lt = LocalDateTime.parse(task.getPlanEndTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - log.info(lt.toString()); - return LocalDateTime.parse(task.getPlanEndTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) .isBefore(LocalDateTime.now()); diff --git a/src/main/java/com/dispose/task/TaskManagerTask.java b/src/main/java/com/dispose/task/TaskManagerTask.java index 577daf7b..fd1498f0 100644 --- a/src/main/java/com/dispose/task/TaskManagerTask.java +++ b/src/main/java/com/dispose/task/TaskManagerTask.java @@ -35,7 +35,7 @@ public class TaskManagerTask { * Task runtime manager. */ @Async("bizExecutor") - @Scheduled(fixedDelay = 5000) + @Scheduled(fixedDelay = 500) public void taskRuntimeManager() { Iterator it = taskCacheManager.getAllTask().iterator();