toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

诡异nodetypeEnum常量定义

Browse Source
This commit is contained in:
gulongcheng
2025-11-12 11:25:10 +08:00
parent 51c8979484
commit a1a329f6e3
5 changed files with 25 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
capability/src/main/java/com/sdm/capability/service/impl/TaskPoolServiceImpl.java
View File

@@ -5,7 +5,7 @@ import com.sdm.capability.model.bo.taskPool.PoolInfo;
import com.sdm.capability.model.req.taskPool.*; import com.sdm.capability.model.req.taskPool.*;
import com.sdm.capability.service.TaskPoolService; import com.sdm.capability.service.TaskPoolService;
import com.sdm.common.common.SdmResponse; import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.constants.SystemConstants; import com.sdm.common.entity.enums.NodeTypeEnum;
import com.sdm.common.entity.pojo.capability.CapPoolNode; import com.sdm.common.entity.pojo.capability.CapPoolNode;
import com.sdm.common.entity.pojo.capability.CapPoolPerformance; import com.sdm.common.entity.pojo.capability.CapPoolPerformance;
import com.sdm.common.entity.pojo.capability.CapPoolTask; import com.sdm.common.entity.pojo.capability.CapPoolTask;
@@ -61,7 +61,7 @@ public class TaskPoolServiceImpl implements TaskPoolService {
List<PoolInfo> poolInfos = new ArrayList<>(); List<PoolInfo> poolInfos = new ArrayList<>();
for (CapPoolNode node : nodes) { for (CapPoolNode node : nodes) {
PoolInfo poolInfo = new PoolInfo(); PoolInfo poolInfo = new PoolInfo();
poolInfo.setType(SystemConstants.NODE_TAG); poolInfo.setType("node");
poolInfo.setNode(node); poolInfo.setNode(node);
List<PoolInfo> children = new ArrayList<>(); List<PoolInfo> children = new ArrayList<>();
List<CapPoolNode> childNodes = taskPoolMapper.getPoolNode(poolName, node.getId(), company); List<CapPoolNode> childNodes = taskPoolMapper.getPoolNode(poolName, node.getId(), company);
@@ -82,7 +82,7 @@ public class TaskPoolServiceImpl implements TaskPoolService {
List<PoolInfo> poolInfos = new ArrayList<>(); List<PoolInfo> poolInfos = new ArrayList<>();
for (CapPoolTask task : tasks) { for (CapPoolTask task : tasks) {
PoolInfo poolInfo = new PoolInfo(); PoolInfo poolInfo = new PoolInfo();
poolInfo.setType(SystemConstants.TASK_TAG); poolInfo.setType(NodeTypeEnum.TASK.getValue());
poolInfo.setTask(task); poolInfo.setTask(task);
List<PoolInfo> children = new ArrayList<>(); List<PoolInfo> children = new ArrayList<>();
List<CapPoolPerformance> performances = taskPoolMapper.getPoolPerformance(task.getId()); List<CapPoolPerformance> performances = taskPoolMapper.getPoolPerformance(task.getId());
@@ -90,7 +90,7 @@ public class TaskPoolServiceImpl implements TaskPoolService {
for (CapPoolPerformance performance : performances) { for (CapPoolPerformance performance : performances) {
PoolInfo child = new PoolInfo(); PoolInfo child = new PoolInfo();
child.setPerformance(performance); child.setPerformance(performance);
child.setType(SystemConstants.PERFORMANCE_TAG); child.setType(NodeTypeEnum.PERFORMANCE.getValue());
children.add(child); children.add(child);
} }
} }

20
common/src/main/java/com/sdm/common/entity/constants/SystemConstants.java
View File

@@ -1,20 +0,0 @@
package com.sdm.common.entity.constants;
/**
* @Author xuyundi
* @Date 2024/2/21
* @Note
*/
public class SystemConstants {
public static final String TASK_POOL_TAG = "pool";
public static final String PROJECT_TAG = "project";
public static final String PHASE_TAG = "phase";
public static final String DISCIPLINE_TAG = "discipline";
public static final String MACHINE_TAG = "machine";
public static final String WORKSPACE_TAG = "workspace";
public static final String NODE_TAG = "node";
public static final String TASK_TAG = "task";
public static final String USER_TAG = "user";
public static final String PERFORMANCE_TAG = "performance";
public static final String TASK_POOL_FILE_PATH = "LoadcaseFiles";
}

7
project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
View File

@@ -4,7 +4,6 @@ import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sdm.common.common.SdmResponse; import com.sdm.common.common.SdmResponse;
import com.sdm.common.common.ThreadLocalContext; import com.sdm.common.common.ThreadLocalContext;
import com.sdm.common.entity.constants.SystemConstants;
import com.sdm.common.entity.enums.DirTypeEnum; import com.sdm.common.entity.enums.DirTypeEnum;
import com.sdm.common.entity.enums.NodeTypeEnum; import com.sdm.common.entity.enums.NodeTypeEnum;
import com.sdm.common.entity.req.data.CreateDirReq; import com.sdm.common.entity.req.data.CreateDirReq;
@@ -96,9 +95,9 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
for (SpdmProjectNodeEditReq addNode : addNodeList) { for (SpdmProjectNodeEditReq addNode : addNodeList) {
// 项目/阶段名称重名校验 // 项目/阶段名称重名校验
if (CollectionUtils.isNotEmpty(this.lambdaQuery().eq(SimulationNode::getNodeName, addNode.getNodeName()).list())) { if (CollectionUtils.isNotEmpty(this.lambdaQuery().eq(SimulationNode::getNodeName, addNode.getNodeName()).list())) {
if (SystemConstants.PROJECT_TAG.equals(addNode.getNodeType())) { if (NodeTypeEnum.PROJECT.getValue().equals(addNode.getNodeType())) {
return SdmResponse.failed("同名项目已存在，请检查"); return SdmResponse.failed("同名项目已存在，请检查");
} else if (SystemConstants.PHASE_TAG.equals(addNode.getNodeType())) { } else if (NodeTypeEnum.PHASE.getValue().equals(addNode.getNodeType())) {
return SdmResponse.failed("同名阶段已存在，请检查"); return SdmResponse.failed("同名阶段已存在，请检查");
} }
} }
@@ -373,7 +372,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
if (nodeMapper.addNodeBatch(addNodeList) <= 0) { if (nodeMapper.addNodeBatch(addNodeList) <= 0) {
return null; return null;
} }
Optional<SpdmProjectNodeEditReq> projectOptional = addNodeList.stream().filter(node -> SystemConstants.PROJECT_TAG.equals(node.getNodeType())).findFirst(); Optional<SpdmProjectNodeEditReq> projectOptional = addNodeList.stream().filter(node -> NodeTypeEnum.PROJECT.getValue().equals(node.getNodeType())).findFirst();
if (projectOptional.isPresent()) { if (projectOptional.isPresent()) {
SpdmProjectNodeEditReq projectNode = projectOptional.get(); SpdmProjectNodeEditReq projectNode = projectOptional.get();
// 创建项目节点的文件夹 // 创建项目节点的文件夹

28
project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
View File

@@ -6,8 +6,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.sdm.common.common.ResultCode; import com.sdm.common.common.ResultCode;
import com.sdm.common.common.SdmResponse; import com.sdm.common.common.SdmResponse;
import com.sdm.common.common.ThreadLocalContext; import com.sdm.common.common.ThreadLocalContext;
import com.sdm.common.entity.constants.SystemConstants;
import com.sdm.common.entity.enums.DirTypeEnum; import com.sdm.common.entity.enums.DirTypeEnum;
import com.sdm.common.entity.enums.NodeTypeEnum;
import com.sdm.common.entity.req.data.CreateDirReq; import com.sdm.common.entity.req.data.CreateDirReq;
import com.sdm.common.entity.req.data.DelDirReq; import com.sdm.common.entity.req.data.DelDirReq;
import com.sdm.common.entity.req.data.RenameDirReq; import com.sdm.common.entity.req.data.RenameDirReq;
@@ -118,9 +118,9 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
for (Map.Entry<String, List<TaskEditNodeReq>> taskEntry : editNodeListMap.entrySet()) { for (Map.Entry<String, List<TaskEditNodeReq>> taskEntry : editNodeListMap.entrySet()) {
nodeType = taskEntry.getKey(); nodeType = taskEntry.getKey();
log.info("nodeType为：{}", nodeType); log.info("nodeType为：{}", nodeType);
if (SystemConstants.TASK_TAG.equals(nodeType)) { if (NodeTypeEnum.TASK.getValue().equals(nodeType)) {
editTaskList(taskEntry.getValue()); editTaskList(taskEntry.getValue());
}else if (SystemConstants.PERFORMANCE_TAG.equals(nodeType)) { }else if (NodeTypeEnum.PERFORMANCE.getValue().equals(nodeType)) {
editPerformanceList(taskEntry.getValue()); editPerformanceList(taskEntry.getValue());
}else { }else {
SpdmEditNodeReq spdmEditNodeReq = new SpdmEditNodeReq(); SpdmEditNodeReq spdmEditNodeReq = new SpdmEditNodeReq();
@@ -619,9 +619,9 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
log.error("参数不能为空"); log.error("参数不能为空");
return SdmResponse.failed("参数不能为空"); return SdmResponse.failed("参数不能为空");
} }
List<SpdmDeleteProjectDetailReq> nodeList = deleteNodeList.stream().filter(node -> !SystemConstants.TASK_TAG.equals(node.getNodeType()) && !SystemConstants.PERFORMANCE_TAG.equals(node.getNodeType())).toList(); List<SpdmDeleteProjectDetailReq> nodeList = deleteNodeList.stream().filter(node -> !NodeTypeEnum.TASK.getValue().equals(node.getNodeType()) && !NodeTypeEnum.PERFORMANCE.getValue().equals(node.getNodeType())).toList();
List<SpdmDeleteProjectDetailReq> taskList = deleteNodeList.stream().filter(node -> SystemConstants.TASK_TAG.equals(node.getNodeType())).toList(); List<SpdmDeleteProjectDetailReq> taskList = deleteNodeList.stream().filter(node -> NodeTypeEnum.TASK.getValue().equals(node.getNodeType())).toList();
List<SpdmDeleteProjectDetailReq> performanceList = deleteNodeList.stream().filter(node -> SystemConstants.PERFORMANCE_TAG.equals(node.getNodeType())).toList(); List<SpdmDeleteProjectDetailReq> performanceList = deleteNodeList.stream().filter(node -> NodeTypeEnum.PERFORMANCE.getValue().equals(node.getNodeType())).toList();
if (CollectionUtils.isNotEmpty(performanceList)) { if (CollectionUtils.isNotEmpty(performanceList)) {
List<String> performanceNodeIdList = performanceList.stream().map(SpdmDeleteProjectDetailReq::getUuid).toList(); List<String> performanceNodeIdList = performanceList.stream().map(SpdmDeleteProjectDetailReq::getUuid).toList();
log.info("删除指标：{}",performanceNodeIdList); log.info("删除指标：{}",performanceNodeIdList);
@@ -995,7 +995,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
taskNode.setExtras(projectNodeExtraPos); taskNode.setExtras(projectNodeExtraPos);
taskNode.setNodeName(taskNode.getTaskName()); taskNode.setNodeName(taskNode.getTaskName());
taskNode.setNodeCode(taskNode.getTaskCode()); taskNode.setNodeCode(taskNode.getTaskCode());
taskNode.setNodeType(SystemConstants.TASK_TAG); taskNode.setNodeType(NodeTypeEnum.TASK.getValue());
taskNode.setPid(nodeId); taskNode.setPid(nodeId);
taskNode.setGroup(taskNodePo.getGroupName()); taskNode.setGroup(taskNodePo.getGroupName());
if (StringUtils.isNotBlank(taskNode.getAnalyseSoftware())) { if (StringUtils.isNotBlank(taskNode.getAnalyseSoftware())) {
@@ -1025,7 +1025,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
} }
} }
performanceNode.setExtras(eachTaskNodeExtraPoList); performanceNode.setExtras(eachTaskNodeExtraPoList);
performanceNode.setNodeType(SystemConstants.PERFORMANCE_TAG); performanceNode.setNodeType(NodeTypeEnum.PERFORMANCE.getValue());
performanceNode.setPid(taskNodePo.getUuid()); performanceNode.setPid(taskNodePo.getUuid());
performanceNodeChildren.add(performanceNode); performanceNodeChildren.add(performanceNode);
} }
@@ -1377,13 +1377,13 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
} }
for (TaskNode taskNode : projectNodeList) { for (TaskNode taskNode : projectNodeList) {
if (ObjectUtils.isEmpty(projectNodeMap.get(taskNode.getParentId())) if (ObjectUtils.isEmpty(projectNodeMap.get(taskNode.getParentId()))
&& ObjectUtils.isEmpty(projectNodePoMap.get(taskNode.getParentId())) && !SystemConstants.PROJECT_TAG.equals(taskNode.getNodeType())) { && ObjectUtils.isEmpty(projectNodePoMap.get(taskNode.getParentId())) && !NodeTypeEnum.PROJECT.getValue().equals(taskNode.getNodeType())) {
log.error("新增节点时，根据parentId：{}，未查询到节点", taskNode.getParentId()); log.error("新增节点时，根据parentId：{}，未查询到节点", taskNode.getParentId());
response = SdmResponse.failed("新增节点时，创建文件失败"); response = SdmResponse.failed("新增节点时，创建文件失败");
return response; return response;
} }
createDir(taskNode.getUuid(),taskNode.getNodeType(), createDir(taskNode.getUuid(),taskNode.getNodeType(),
SystemConstants.PROJECT_TAG.equals(taskNode.getNodeType()) ? null : (ObjectUtils.isNotEmpty(projectNodePoMap.get(taskNode.getParentId())) NodeTypeEnum.PROJECT.getValue().equals(taskNode.getNodeType()) ? null : (ObjectUtils.isNotEmpty(projectNodePoMap.get(taskNode.getParentId()))
? projectNodePoMap.get(taskNode.getParentId()).getUuid() ? projectNodePoMap.get(taskNode.getParentId()).getUuid()
: projectNodeMap.get(taskNode.getParentId()).getUuid()), : projectNodeMap.get(taskNode.getParentId()).getUuid()),
taskNode.getNodeName()); taskNode.getNodeName());
@@ -1566,13 +1566,13 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
} }
for (TaskNode taskNode : projectNodeList) { for (TaskNode taskNode : projectNodeList) {
if (ObjectUtils.isEmpty(projectNodeMap.get(taskNode.getParentId())) if (ObjectUtils.isEmpty(projectNodeMap.get(taskNode.getParentId()))
&& ObjectUtils.isEmpty(projectNodePoMap.get(taskNode.getParentId())) && !SystemConstants.PROJECT_TAG.equals(taskNode.getNodeType())) { && ObjectUtils.isEmpty(projectNodePoMap.get(taskNode.getParentId())) && !NodeTypeEnum.PROJECT.getValue().equals(taskNode.getNodeType())) {
log.error("新增节点时，根据parentId：{}，未查询到节点", taskNode.getParentId()); log.error("新增节点时，根据parentId：{}，未查询到节点", taskNode.getParentId());
response = SdmResponse.failed("新增节点时，创建文件失败"); response = SdmResponse.failed("新增节点时，创建文件失败");
return response; return response;
} }
createDir(taskNode.getUuid(), createDir(taskNode.getUuid(),
SystemConstants.PROJECT_TAG.equals(taskNode.getNodeType()) ? null : (ObjectUtils.isNotEmpty(projectNodePoMap.get(taskNode.getParentId())) NodeTypeEnum.PROJECT.getValue().equals(taskNode.getNodeType()) ? null : (ObjectUtils.isNotEmpty(projectNodePoMap.get(taskNode.getParentId()))
? projectNodePoMap.get(taskNode.getParentId()).getUuid() ? projectNodePoMap.get(taskNode.getParentId()).getUuid()
: projectNodeMap.get(taskNode.getParentId()).getUuid()), : projectNodeMap.get(taskNode.getParentId()).getUuid()),
taskNode.getNodeName()); taskNode.getNodeName());
@@ -1770,9 +1770,9 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
eachProjectNode.setTenantId(tenantId); eachProjectNode.setTenantId(tenantId);
String nodeType = eachProjectNode.getNodeType(); String nodeType = eachProjectNode.getNodeType();
List<TaskNode> childrenNodeList = eachProjectNode.getChildren(); List<TaskNode> childrenNodeList = eachProjectNode.getChildren();
if (SystemConstants.TASK_TAG.equals(nodeType)) { if (NodeTypeEnum.TASK.getValue().equals(nodeType)) {
handleTaskExtraAndMember(eachProjectNode, taskNodeList, taskNodeMemberList, taskNodeExtraList, tagList,taskIdMap); handleTaskExtraAndMember(eachProjectNode, taskNodeList, taskNodeMemberList, taskNodeExtraList, tagList,taskIdMap);
} else if (SystemConstants.PERFORMANCE_TAG.equals(nodeType)) { } else if (NodeTypeEnum.PERFORMANCE.getValue().equals(nodeType)) {
eachProjectNode.setTaskId(parentId); eachProjectNode.setTaskId(parentId);
handlePerformanceExtra(eachProjectNode, taskPerformanceList, performanceExtraList); handlePerformanceExtra(eachProjectNode, taskPerformanceList, performanceExtraList);
} else { } else {

8
project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
View File

@@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
import com.sdm.common.common.SdmResponse; import com.sdm.common.common.SdmResponse;
import com.sdm.common.common.ThreadLocalContext; import com.sdm.common.common.ThreadLocalContext;
import com.sdm.common.entity.constants.ProjectConstants; import com.sdm.common.entity.constants.ProjectConstants;
import com.sdm.common.entity.constants.SystemConstants; import com.sdm.common.entity.enums.NodeTypeEnum;
import com.sdm.common.entity.req.system.UserQueryReq; import com.sdm.common.entity.req.system.UserQueryReq;
import com.sdm.common.entity.resp.system.CIDUserResp; import com.sdm.common.entity.resp.system.CIDUserResp;
import com.sdm.common.feign.impl.system.SysUserFeignClientImpl; import com.sdm.common.feign.impl.system.SysUserFeignClientImpl;
@@ -741,11 +741,11 @@ public class TaskServiceImpl implements ITaskService {
for (SpdmAnalysisTaskVo task : taskVoList) { for (SpdmAnalysisTaskVo task : taskVoList) {
eachProjectNodePo = nodeMap.get(task.getNodeId()); eachProjectNodePo = nodeMap.get(task.getNodeId());
if (ObjectUtils.isNotEmpty(eachProjectNodePo)) { if (ObjectUtils.isNotEmpty(eachProjectNodePo)) {
if (SystemConstants.PROJECT_TAG.equals(eachProjectNodePo.getNodeType())) { if (NodeTypeEnum.PROJECT.getValue().equals(eachProjectNodePo.getNodeType())) {
task.setProjectName(eachProjectNodePo.getNodeName()); task.setProjectName(eachProjectNodePo.getNodeName());
} else if (SystemConstants.PHASE_TAG.equals(eachProjectNodePo.getNodeType())) { } else if (NodeTypeEnum.PHASE.getValue().equals(eachProjectNodePo.getNodeType())) {
task.setPhaseName(eachProjectNodePo.getNodeName()); task.setPhaseName(eachProjectNodePo.getNodeName());
} else if (SystemConstants.DISCIPLINE_TAG.equals(eachProjectNodePo.getNodeType())) { } else if (NodeTypeEnum.DISCIPLINE.getValue().equals(eachProjectNodePo.getNodeType())) {
task.setDisciplineName(eachProjectNodePo.getNodeName()); task.setDisciplineName(eachProjectNodePo.getNodeName());
} }
} }