diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/constant/DirectoryEntryRemoveModeEnum.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/constant/DirectoryEntryRemoveModeEnum.java new file mode 100644 index 00000000..fc98fc74 --- /dev/null +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/constant/DirectoryEntryRemoveModeEnum.java @@ -0,0 +1,25 @@ +package com.hccake.ballcat.codegen.constant; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +/** + * @author Hccake + * @version 1.0 + * @date 2020/6/23 14:36 + * 模板目录项类型 + */ +@Getter +@RequiredArgsConstructor +public enum DirectoryEntryRemoveModeEnum { + /** + * 保留子节点(子节点上移) + */ + RESERVED_CHILD_NODE(1), + /** + * 同时删除子节点 + */ + REMOVE_CHILD_NODE(2); + + private final Integer type; +} diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateDirectoryEntryServiceImpl.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateDirectoryEntryServiceImpl.java index 390c8934..865ddf17 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateDirectoryEntryServiceImpl.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateDirectoryEntryServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; +import com.hccake.ballcat.codegen.constant.DirectoryEntryRemoveModeEnum; import com.hccake.ballcat.codegen.constant.DirectoryEntryTypeEnum; import com.hccake.ballcat.codegen.mapper.TemplateDirectoryEntryMapper; import com.hccake.ballcat.codegen.model.converter.TemplateModelConverter; @@ -158,12 +159,12 @@ public class TemplateDirectoryEntryServiceImpl extends ServiceImpllambdaUpdate() .set(TemplateDirectoryEntry::getParentId, entry.getParentId()) .eq(TemplateDirectoryEntry::getParentId, entryId)); - } else if (mode == 2) { + } else if (DirectoryEntryRemoveModeEnum.REMOVE_CHILD_NODE.getType().equals(mode)) { // ==========删除所有子节点============= // 1. 获取所有目录项(目录项不会太多,一次查询比较方便) List entryList = baseMapper.selectList(Wrappers.emptyWrapper()); @@ -197,9 +198,9 @@ public class TemplateDirectoryEntryServiceImpl extends ServiceImpl treeList = - TreeUtil.buildTree(list, 0, TemplateModelConverter.INSTANCE::entryPoToTree); + TreeUtil.buildTree(list, GlobalConstants.TREE_ROOT_ID, TemplateModelConverter.INSTANCE::entryPoToTree); // 填充模板文件 List templateFiles = new ArrayList<>(); diff --git a/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/GlobalConstants.java b/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/GlobalConstants.java index 78c51233..a87f0af0 100644 --- a/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/GlobalConstants.java +++ b/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/GlobalConstants.java @@ -19,4 +19,10 @@ public class GlobalConstants { * 生产环境 */ public final static String ENV_PROD = "prod"; + + + /** + * 树根节点ID + */ + public static final Integer TREE_ROOT_ID = 0; }