From 00c1c8d09e97f3a1749761165154bdd6e716e333 Mon Sep 17 00:00:00 2001 From: HuangXin Date: Wed, 6 May 2020 16:52:21 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E5=88=A0=E9=99=A4=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E5=99=A8=E6=97=B6=E9=97=B4=E6=97=A5=E5=BF=97=E6=89=93?= =?UTF-8?q?=E5=8D=B0=202.=20=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=E5=99=A8?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8=E6=9B=B4=E6=94=B9=E4=B8=BA500ms?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=203.=20=E4=BF=AE=E6=AD=A3=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=93=8D=E5=BA=94=E6=B6=88=E6=81=AF=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=E8=AE=BE=E5=A4=87id=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dispose/controller/DisposeTaskController.java | 7 ++++++- .../java/com/dispose/service/impl/TaskServiceImpl.java | 2 -- src/main/java/com/dispose/task/TaskManagerTask.java | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) 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();