From f719194d465a4394347c86880731af7c558523c4 Mon Sep 17 00:00:00 2001 From: HuangXin Date: Wed, 6 May 2020 11:25:59 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E5=81=9C=E6=AD=A2=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81=E5=A4=84=E7=90=86?= =?UTF-8?q?type=3D-1=E7=9A=84=E5=85=A8=E9=83=A8=E7=B1=BB=E5=9E=8B=E5=A4=84?= =?UTF-8?q?=E7=BD=AE=E4=BB=BB=E5=8A=A1=202.=20=E5=A2=9E=E5=8A=A0=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E8=8A=82=E7=82=B9=E5=81=9C=E6=AD=A2=E5=A4=84=E7=BD=AE?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8E=A5=E5=8F=A3=203.=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=81=9C=E6=AD=A2=E6=89=80=E6=9C=89=E5=A4=84=E7=BD=AE=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3=204.=20=E6=9B=B4=E6=96=B0=E5=81=9C?= =?UTF-8?q?=E6=AD=A2=E4=BB=BB=E5=8A=A1=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=9B=9E=E5=81=9C=E6=AD=A2=E7=9A=84=E5=90=84?= =?UTF-8?q?=E4=B8=AA=E5=A4=84=E7=BD=AE=E4=BB=BB=E5=8A=A1=E7=9A=84=E8=AF=A6?= =?UTF-8?q?=E7=BB=86=E4=BF=A1=E6=81=AF=205.=20=E6=9B=B4=E6=96=B0=E5=81=9C?= =?UTF-8?q?=E6=AD=A2=E4=BB=BB=E5=8A=A1=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E6=96=B9=E6=B3=95=206.=20=E6=9B=B4=E6=96=B0=E5=81=9C=E6=AD=A2?= =?UTF-8?q?=E5=A4=84=E7=BD=AE=E4=BB=BB=E5=8A=A1=E7=9B=B8=E5=85=B3=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3=207.=20=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E5=AD=97=E6=AF=8D=E5=BA=8F=E6=89=A7=E8=A1=8C=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=208.=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=A4=84=E7=BD=AE=E4=BB=BB=E5=8A=A1=E5=A4=84=E7=BD=AE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=AE=A1=E7=AE=97=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dispose/controller/DisposeTaskController.java | 2 +- .../java/com/dispose/manager/TaskCacheManager.java | 3 +-- .../com/dispose/manager/impl/TaskCacheManagerImpl.java | 10 +--------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/dispose/controller/DisposeTaskController.java b/src/main/java/com/dispose/controller/DisposeTaskController.java index 7fe20d56..7d077834 100644 --- a/src/main/java/com/dispose/controller/DisposeTaskController.java +++ b/src/main/java/com/dispose/controller/DisposeTaskController.java @@ -257,7 +257,7 @@ public class DisposeTaskController { TaskInfoRsp rspInfo = new TaskInfoRsp(); reqInfo.getItems().forEach(v -> { - TaskInfoData taskData = TaskInfoData.builder().type(v.getType()).build(); + TaskInfoData taskData = TaskInfoData.builder().type(v.getType()).build(); List> ret = taskService.stopTaskByDisposeNode(Long.parseLong(v.getId()), v.getType()); diff --git a/src/main/java/com/dispose/manager/TaskCacheManager.java b/src/main/java/com/dispose/manager/TaskCacheManager.java index 3c8b32fb..a91229b9 100644 --- a/src/main/java/com/dispose/manager/TaskCacheManager.java +++ b/src/main/java/com/dispose/manager/TaskCacheManager.java @@ -35,9 +35,8 @@ public interface TaskCacheManager { * Remove task error code. * * @param id the id - * @return the error code */ - ErrorCode removeTask(Long id); + void removeTask(Long id); /** * Upgrade task status error code. diff --git a/src/main/java/com/dispose/manager/impl/TaskCacheManagerImpl.java b/src/main/java/com/dispose/manager/impl/TaskCacheManagerImpl.java index 378281ed..7843bbb3 100644 --- a/src/main/java/com/dispose/manager/impl/TaskCacheManagerImpl.java +++ b/src/main/java/com/dispose/manager/impl/TaskCacheManagerImpl.java @@ -72,18 +72,10 @@ public class TaskCacheManagerImpl implements TaskCacheManager { * Remove task error code. * * @param id the id - * @return the error code */ @Override - public ErrorCode removeTask(Long id) { - - if (!taskCacheMap.containsKey(id)) { - return ErrorCode.ERR_OK; - } - + public void removeTask(Long id) { taskCacheMap.remove(id); - - return ErrorCode.ERR_OK; } /**