test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(项目设置): 实例模块默认虚拟节点时名字改为参数化处理

This commit is contained in:
song-tianyang 2023-10-27 11:28:13 +08:00 committed by Craftsman
parent db4c9d4c76
commit 48a0944fdb
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/services/project-management/src/main/java/io/metersphere/project/service/FileModuleService.java
View File

@ -44,13 +44,13 @@ public class FileModuleService extends ModuleTreeService implements CleanupProje
public List<BaseTreeNode> getTree(String projectId) { public List<BaseTreeNode> getTree(String projectId) {
List<BaseTreeNode> fileModuleList = extFileModuleMapper.selectBaseByProjectId(projectId); List<BaseTreeNode> fileModuleList = extFileModuleMapper.selectBaseByProjectId(projectId);
return super.buildTreeAndCountResource(fileModuleList, true); return super.buildTreeAndCountResource(fileModuleList, true, Translator.get("default.module"));
} }
public List<BaseTreeNode> getTreeOnlyIdsAndResourceCount(String projectId, List<ModuleCountDTO> moduleCountDTOList) { public List<BaseTreeNode> getTreeOnlyIdsAndResourceCount(String projectId, List<ModuleCountDTO> moduleCountDTOList) {
//节点内容只有Id和parentId //节点内容只有Id和parentId
List<BaseTreeNode> fileModuleList = extFileModuleMapper.selectIdAndParentIdByProjectId(projectId); List<BaseTreeNode> fileModuleList = extFileModuleMapper.selectIdAndParentIdByProjectId(projectId);
return super.buildTreeAndCountResource(fileModuleList, moduleCountDTOList, true); return super.buildTreeAndCountResource(fileModuleList, moduleCountDTOList, true, Translator.get("default.module"));
} }
public String add(FileModuleCreateRequest request, String operator) { public String add(FileModuleCreateRequest request, String operator) {

13
backend/services/project-management/src/main/java/io/metersphere/project/service/ModuleTreeService.java
View File

@ -5,7 +5,6 @@ import io.metersphere.project.dto.NodeSortDTO;
import io.metersphere.sdk.constants.ModuleConstants; import io.metersphere.sdk.constants.ModuleConstants;
import io.metersphere.system.dto.sdk.BaseModule; import io.metersphere.system.dto.sdk.BaseModule;
import io.metersphere.system.dto.sdk.BaseTreeNode; import io.metersphere.system.dto.sdk.BaseTreeNode;
import io.metersphere.sdk.util.Translator;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -21,16 +20,16 @@ public abstract class ModuleTreeService {
protected static final int LIMIT_POS = 64; protected static final int LIMIT_POS = 64;
public BaseTreeNode getDefaultModule() { public BaseTreeNode getDefaultModule(String name) {
//默认模块下不允许创建子模块。 它本身也就是叶子节点。 //默认模块下不允许创建子模块。 它本身也就是叶子节点。
return new BaseTreeNode(ModuleConstants.DEFAULT_NODE_ID, Translator.get("default.module"), ModuleConstants.NODE_TYPE_DEFAULT, ModuleConstants.ROOT_NODE_PARENT_ID); return new BaseTreeNode(ModuleConstants.DEFAULT_NODE_ID, name, ModuleConstants.NODE_TYPE_DEFAULT, ModuleConstants.ROOT_NODE_PARENT_ID);
} }
//构建树结构，并为每个节点计算资源数量 //构建树结构，并为每个节点计算资源数量
public List<BaseTreeNode> buildTreeAndCountResource(List<BaseTreeNode> traverseList, @NotNull List<ModuleCountDTO> moduleCountDTOList, boolean haveVirtualRootNode) { public List<BaseTreeNode> buildTreeAndCountResource(List<BaseTreeNode> traverseList, @NotNull List<ModuleCountDTO> moduleCountDTOList, boolean haveVirtualRootNode, String virtualRootName) {
//构建模块树 //构建模块树
List<BaseTreeNode> baseTreeNodeList = this.buildTreeAndCountResource(traverseList, haveVirtualRootNode); List<BaseTreeNode> baseTreeNodeList = this.buildTreeAndCountResource(traverseList, haveVirtualRootNode, virtualRootName);
//构建模块节点统计的数据结构 //构建模块节点统计的数据结构
Map<String, Integer> resourceCountMap = moduleCountDTOList.stream().collect(Collectors.toMap(ModuleCountDTO::getModuleId, ModuleCountDTO::getDataCount)); Map<String, Integer> resourceCountMap = moduleCountDTOList.stream().collect(Collectors.toMap(ModuleCountDTO::getModuleId, ModuleCountDTO::getDataCount));
//为每个节点赋值资源数量 //为每个节点赋值资源数量
@ -44,10 +43,10 @@ public abstract class ModuleTreeService {
* @param traverseList 要遍历的节点集合（会被清空） * @param traverseList 要遍历的节点集合（会被清空）
* @param haveVirtualRootNode 是否包含虚拟跟节点 * @param haveVirtualRootNode 是否包含虚拟跟节点
*/ */
public List<BaseTreeNode> buildTreeAndCountResource(List<BaseTreeNode> traverseList, boolean haveVirtualRootNode) { public List<BaseTreeNode> buildTreeAndCountResource(List<BaseTreeNode> traverseList, boolean haveVirtualRootNode, String virtualRootName) {
List<BaseTreeNode> baseTreeNodeList = new ArrayList<>(); List<BaseTreeNode> baseTreeNodeList = new ArrayList<>();
if (haveVirtualRootNode) { if (haveVirtualRootNode) {
BaseTreeNode defaultNode = this.getDefaultModule(); BaseTreeNode defaultNode = this.getDefaultModule(virtualRootName);
baseTreeNodeList.add(defaultNode); baseTreeNodeList.add(defaultNode);
} }
int lastSize = 0; int lastSize = 0;