From f75264f6a780423230296246caae0017adf009d2 Mon Sep 17 00:00:00 2001 From: mabofu Date: Mon, 16 Jan 2023 14:56:10 +0800 Subject: [PATCH] update task type enum --- .../com/dsms/modules/node/task/AddOsdTask.java | 3 ++- .../dsms/modules/node/task/RemoveOsdTask.java | 2 +- .../task/CreateStoragePoolTask.java | 2 +- .../com/dsms/common/constant/TaskTypeEnum.java | 18 +++++++++++++++--- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dsms-engine-application/src/main/java/com/dsms/modules/node/task/AddOsdTask.java b/dsms-engine-application/src/main/java/com/dsms/modules/node/task/AddOsdTask.java index a110632..25d35bb 100644 --- a/dsms-engine-application/src/main/java/com/dsms/modules/node/task/AddOsdTask.java +++ b/dsms-engine-application/src/main/java/com/dsms/modules/node/task/AddOsdTask.java @@ -3,6 +3,7 @@ package com.dsms.modules.node.task; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.dsms.common.constant.RemoteResponseStatusEnum; +import com.dsms.common.constant.SystemConst; import com.dsms.common.constant.TaskStatusEnum; import com.dsms.common.constant.TaskTypeEnum; import com.dsms.common.remotecall.model.FinishedDetail; @@ -25,7 +26,7 @@ import java.util.Objects; @Slf4j -@Service("add_osd") +@Service(TaskTypeEnum.TypeConstants.ADD_OSD) public class AddOsdTask implements TaskStrategy { @Autowired private NodeApi nodeApi; diff --git a/dsms-engine-application/src/main/java/com/dsms/modules/node/task/RemoveOsdTask.java b/dsms-engine-application/src/main/java/com/dsms/modules/node/task/RemoveOsdTask.java index 8fa2d18..1195d87 100644 --- a/dsms-engine-application/src/main/java/com/dsms/modules/node/task/RemoveOsdTask.java +++ b/dsms-engine-application/src/main/java/com/dsms/modules/node/task/RemoveOsdTask.java @@ -27,7 +27,7 @@ import java.util.Objects; @Slf4j -@Service("remove_osd") +@Service(TaskTypeEnum.TypeConstants.REMOVE_OSD) public class RemoveOsdTask implements TaskStrategy { @Autowired private NodeApi nodeApi; diff --git a/dsms-engine-application/src/main/java/com/dsms/modules/storagepool/task/CreateStoragePoolTask.java b/dsms-engine-application/src/main/java/com/dsms/modules/storagepool/task/CreateStoragePoolTask.java index 6461e3b..5ed45c3 100644 --- a/dsms-engine-application/src/main/java/com/dsms/modules/storagepool/task/CreateStoragePoolTask.java +++ b/dsms-engine-application/src/main/java/com/dsms/modules/storagepool/task/CreateStoragePoolTask.java @@ -48,7 +48,7 @@ import java.util.List; import java.util.Objects; @Slf4j -@Service("create_pool") +@Service(TaskTypeEnum.TypeConstants.CREATE_POOL) public class CreateStoragePoolTask implements TaskStrategy { @Autowired private IStepService stepService; diff --git a/dsms-engine-common/src/main/java/com/dsms/common/constant/TaskTypeEnum.java b/dsms-engine-common/src/main/java/com/dsms/common/constant/TaskTypeEnum.java index f84a829..f777478 100644 --- a/dsms-engine-common/src/main/java/com/dsms/common/constant/TaskTypeEnum.java +++ b/dsms-engine-common/src/main/java/com/dsms/common/constant/TaskTypeEnum.java @@ -26,20 +26,32 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum TaskTypeEnum { + /** * node add osd task */ - ADD_OSD("add_osd", "节点管理磁盘"), + ADD_OSD(TypeConstants.ADD_OSD, "节点管理磁盘"), /** * node remove osd task */ - REMOVE_OSD("remove_osd", "节点移除磁盘"), + REMOVE_OSD(TypeConstants.REMOVE_OSD, "节点移除磁盘"), /** * create pool task */ - CREATE_POOL("create_pool", "创建存储池"); + CREATE_POOL(TypeConstants.CREATE_POOL, "创建存储池"); private final String type; private final String name; + + public static final class TypeConstants { + private TypeConstants(){ + } + + public static final String ADD_OSD = "add_osd"; + public static final String REMOVE_OSD = "remove_osd"; + public static final String CREATE_POOL = "create_pool"; + + } + } -- Gitee