启动脚本+数据总览
This commit is contained in:
@@ -69,9 +69,9 @@ public class SimulationNodeController implements ISimulationNodeFeignClient {
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
@PostMapping("/list")
|
||||
@Operation(summary = "项目列表", description = "项目列表")
|
||||
public SdmResponse list(SpdmNodeListReq req) {
|
||||
public SdmResponse list(@RequestBody SpdmNodeListReq req) {
|
||||
return nodeService.list(req);
|
||||
}
|
||||
|
||||
|
||||
@@ -366,9 +366,8 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
||||
Optional<SpdmProjectNodeEditReq> projectOptional = addNodeList.stream().filter(node -> SystemConstants.PROJECT_TAG.equals(node.getNodeType())).findFirst();
|
||||
if (projectOptional.isPresent()) {
|
||||
SpdmProjectNodeEditReq projectNode = projectOptional.get();
|
||||
String uuid = projectNode.getUuid();
|
||||
// 创建项目节点的文件夹
|
||||
createDir(uuid, NodeTypeEnum.NODE.getValue() , null, projectNode.getNodeName());
|
||||
createDir( projectNode.getUuid(), projectNode.getNodeType(), null, projectNode.getNodeName());
|
||||
} else {
|
||||
List<ProjectNodePo> projectNodePoList = mapper.queryNodeListByNodeId(addNodeList.get(0).getPid());
|
||||
if (CollectionUtils.isEmpty(projectNodePoList)) {
|
||||
@@ -378,7 +377,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
||||
ProjectNodePo projectNodePo = projectNodePoList.get(0);
|
||||
String projectUuid = projectNodePo.getUuid();
|
||||
for (SpdmProjectNodeEditReq node : addNodeList) {
|
||||
createDir(node.getUuid(),NodeTypeEnum.NODE.getValue() , projectUuid, node.getNodeName());
|
||||
createDir(node.getUuid(),node.getNodeType() , projectUuid, node.getNodeName());
|
||||
}
|
||||
}
|
||||
if (CollectionUtils.isNotEmpty(allNodeManagerList) && nodeMapper.addNodeMemberBatch(allNodeManagerList) <= 0) {
|
||||
|
||||
@@ -8,7 +8,6 @@ import com.sdm.common.common.SdmResponse;
|
||||
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.NodeTypeEnum;
|
||||
import com.sdm.common.entity.req.data.CreateDirReq;
|
||||
import com.sdm.common.entity.req.data.DelDirReq;
|
||||
import com.sdm.common.entity.req.data.RenameDirReq;
|
||||
@@ -1383,7 +1382,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
|
||||
response = SdmResponse.failed("新增节点时,创建文件失败");
|
||||
return response;
|
||||
}
|
||||
createDir(taskNode.getUuid(),NodeTypeEnum.NODE.getValue(),
|
||||
createDir(taskNode.getUuid(),taskNode.getNodeType(),
|
||||
SystemConstants.PROJECT_TAG.equals(taskNode.getNodeType()) ? null : (ObjectUtils.isNotEmpty(projectNodePoMap.get(taskNode.getParentId()))
|
||||
? projectNodePoMap.get(taskNode.getParentId()).getUuid()
|
||||
: projectNodeMap.get(taskNode.getParentId()).getUuid()),
|
||||
@@ -1439,7 +1438,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
|
||||
response = SdmResponse.failed("新增分析项时,创建文件失败");
|
||||
return response;
|
||||
}
|
||||
createDir(taskNode.getUuid(),NodeTypeEnum.TASK.getValue(), projectNodePoMap.get(taskNode.getParentId()).getUuid(), taskNode.getNodeName());
|
||||
createDir(taskNode.getUuid(),taskNode.getNodeType(), projectNodePoMap.get(taskNode.getParentId()).getUuid(), taskNode.getNodeName());
|
||||
|
||||
}
|
||||
} else {
|
||||
@@ -1449,7 +1448,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
|
||||
response = SdmResponse.failed("新增分析项时,创建文件失败");
|
||||
return response;
|
||||
}
|
||||
createDir(taskNode.getUuid(),NodeTypeEnum.TASK.getValue(),
|
||||
createDir(taskNode.getUuid(),taskNode.getNodeType(),
|
||||
ObjectUtils.isNotEmpty(projectNodePoMap.get(taskNode.getParentId())) ? projectNodePoMap.get(taskNode.getParentId()).getUuid() : projectNodeMap.get(taskNode.getParentId()).getUuid(),
|
||||
taskNode.getNodeName());
|
||||
}
|
||||
@@ -1494,7 +1493,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
|
||||
response = SdmResponse.failed("新增指标时,创建文件失败");
|
||||
return response;
|
||||
}
|
||||
createDir(taskNode.getUuid(), NodeTypeEnum.PERFORMANCE.getValue(), taskNodePoMap.get(taskNode.getTaskId()).getUuid(), taskNode.getNodeName());
|
||||
createDir(taskNode.getUuid(), taskNode.getNodeType(), taskNodePoMap.get(taskNode.getTaskId()).getUuid(), taskNode.getNodeName());
|
||||
}
|
||||
} else {
|
||||
for (TaskNode taskNode : projectNodePerformanceList) {
|
||||
@@ -1503,7 +1502,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
|
||||
response = SdmResponse.failed("新增指标时,创建文件失败");
|
||||
return response;
|
||||
}
|
||||
createDir(taskNode.getUuid(),NodeTypeEnum.PERFORMANCE.getValue(),
|
||||
createDir(taskNode.getUuid(),taskNode.getNodeType(),
|
||||
ObjectUtils.isNotEmpty(taskNodePoMap.get(taskNode.getTaskId())) ? taskNodePoMap.get(taskNode.getTaskId()).getUuid() : taskNodeMap.get(taskNode.getTaskId()).getUuid(),
|
||||
taskNode.getNodeName());
|
||||
}
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
spring:
|
||||
profiles:
|
||||
active: dev
|
||||
active: local
|
||||
@@ -42,4 +42,4 @@ fi
|
||||
echo "正在启动项目... "
|
||||
|
||||
# 启动项目并保留控制台输出
|
||||
nohup java ${JVM_OPTS} -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 &
|
||||
nohup java ${JVM_OPTS} -Dspring.profiles.active=dev -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 &
|
||||
|
||||
Reference in New Issue
Block a user