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

1、仿真策划时，任务的主题名称需要在名称前拼接上项目号-工位号

Browse Source
This commit is contained in:
lidongyang
2026-03-04 14:22:13 +08:00
parent 08509b5849
commit ac09ac967a
4 changed files with 127 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java
View File

@@ -387,7 +387,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
SdmResponse<PageDataResp<List<CIDUserResp>>> pageDataRespSdmResponse = sysUserFeignClient.listUser(userListReq);
if (pageDataRespSdmResponse.isSuccess() && pageDataRespSdmResponse.getData().getData() != null) {
List<CIDUserResp> userList = pageDataRespSdmResponse.getData().getData();
usernameToUserIdMap = userList.stream().collect(Collectors.toMap(CIDUserResp::getJobNumber, CIDUserResp::getUserId));
usernameToUserIdMap = userList.stream().collect(Collectors.toMap(CIDUserResp::getUsername, CIDUserResp::getUserId));
}
for (SimulationNode projectNode : projectNodeList) {

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

@@ -3512,7 +3512,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
SdmResponse<PageDataResp<List<CIDUserResp>>> pageDataRespSdmResponse = sysUserFeignClient.listUser(userListReq);
if (pageDataRespSdmResponse.isSuccess() && pageDataRespSdmResponse.getData().getData() != null) {
List<CIDUserResp> userList = pageDataRespSdmResponse.getData().getData();
usernameToUserIdMap = userList.stream().collect(Collectors.toMap(CIDUserResp::getJobNumber, CIDUserResp::getUserId));
usernameToUserIdMap = userList.stream().collect(Collectors.toMap(CIDUserResp::getUsername, CIDUserResp::getUserId));
}
// 筛选出所有工位节点
for (LyricVTodoEmulationInfoDM todoItem : todoInfoList) {

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

@@ -1500,61 +1500,62 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
}
List<String> tag9List = projectNode.getTag9();
if (CollectionUtils.isNotEmpty(tag9List)) {
if (tag9List.contains(null)) {
tag9List = tag9List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("tag9".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag9List)) {
tag9List.addAll(taskIdMap.get(taskNodeTag.getKey()));
} else {
tag9List = taskIdMap.get(taskNodeTag.getKey());
}
if (CollectionUtils.isNotEmpty(tag9List)) {
projectNode.setTag9(new ArrayList<>(tag9List));
}
}
}
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("tag9".equals(taskNodeTag.getValue())) {
tag9List = taskIdMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag9List)) {
projectNode.setTag9(new ArrayList<>(tag9List));
}
}
}
}
List<String> tag10List = projectNode.getTag10();
if (CollectionUtils.isNotEmpty(tag10List)) {
if (tag10List.contains(null)) {
tag10List = tag10List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
for (TaskNodeTag taskNodeTag : tagList) {
if ("tag10".equals(taskNodeTag.getValue())) {
if (CollectionUtils.isNotEmpty(tag10List)) {
tag10List.addAll(taskIdMap.get(taskNodeTag.getKey()));
} else {
tag10List = taskIdMap.get(taskNodeTag.getKey());
}
if (CollectionUtils.isNotEmpty(tag10List)) {
projectNode.setTag10(new ArrayList<>(tag10List));
}
}
}
}
}else {
for (TaskNodeTag taskNodeTag : tagList) {
if ("tag10".equals(taskNodeTag.getValue())) {
tag10List = taskIdMap.get(taskNodeTag.getKey());
if (CollectionUtils.isNotEmpty(tag10List)) {
projectNode.setTag10(new ArrayList<>(tag10List));
}
}
}
}
// List<String> tag9List = projectNode.getTag9();
// if (CollectionUtils.isNotEmpty(tag9List)) {
// if (tag9List.contains(null)) {
// tag9List = tag9List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
// for (TaskNodeTag taskNodeTag : tagList) {
// if ("tag9".equals(taskNodeTag.getValue())) {
// if (CollectionUtils.isNotEmpty(tag9List)) {
// tag9List.addAll(taskIdMap.get(taskNodeTag.getKey()));
// } else {
// tag9List = taskIdMap.get(taskNodeTag.getKey());
// }
// if (CollectionUtils.isNotEmpty(tag9List)) {
// projectNode.setTag9(new ArrayList<>(tag9List));
// }
// }
// }
// }
// }else {
// for (TaskNodeTag taskNodeTag : tagList) {
// if ("tag9".equals(taskNodeTag.getValue())) {
// tag9List = taskIdMap.get(taskNodeTag.getKey());
// if (CollectionUtils.isNotEmpty(tag9List)) {
// projectNode.setTag9(new ArrayList<>(tag9List));
// }
// }
// }
// }
//
// List<String> tag10List = projectNode.getTag10();
// if (CollectionUtils.isNotEmpty(tag10List)) {
// if (tag10List.contains(null)) {
// tag10List = tag10List.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
// for (TaskNodeTag taskNodeTag : tagList) {
// if ("tag10".equals(taskNodeTag.getValue())) {
// if (CollectionUtils.isNotEmpty(tag10List)) {
// tag10List.addAll(taskIdMap.get(taskNodeTag.getKey()));
// } else {
// tag10List = taskIdMap.get(taskNodeTag.getKey());
// }
// if (CollectionUtils.isNotEmpty(tag10List)) {
// projectNode.setTag10(new ArrayList<>(tag10List));
// }
// }
// }
// }
// }else {
// for (TaskNodeTag taskNodeTag : tagList) {
// if ("tag10".equals(taskNodeTag.getValue())) {
// tag10List = taskIdMap.get(taskNodeTag.getKey());
// if (CollectionUtils.isNotEmpty(tag10List)) {
// projectNode.setTag10(new ArrayList<>(tag10List));
// }
// }
// }
// }
}
@@ -2069,6 +2070,75 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
projectNode.setCreator(userId);
projectNode.setCreateTime(createTime);
});
// 利元亨定制，主题名称需要在名称前拼接上项目号-工位号
List<String> nodeIdList = new ArrayList<>();
for (TaskNode taskNode : taskNodeList) {
String subjectName = "";
List<String> projectNodeIdList = taskNode.getTag1();
if (CollectionUtils.isNotEmpty(projectNodeIdList)) {
String projectNodeId = projectNodeIdList.get(0);
if (CollectionUtils.isNotEmpty(projectNodeList)) {
TaskNode projectNode = projectNodeList.stream().filter(node -> node.getUuid().equals(projectNodeId)).findFirst().orElse(null);
if (ObjectUtils.isNotEmpty(projectNode)) {
subjectName += projectNode.getNodeCode() + "-";
}else {
nodeIdList.add(projectNodeId);
}
}else {
nodeIdList.add(projectNodeId);
}
}
List<String> workspaceNodeIdList = taskNode.getTag5();
if (CollectionUtils.isNotEmpty(workspaceNodeIdList)) {
String workspaceNodeId = workspaceNodeIdList.get(0);
if (CollectionUtils.isNotEmpty(projectNodeList)) {
TaskNode workspaceNode = projectNodeList.stream().filter(node -> node.getUuid().equals(workspaceNodeId)).findFirst().orElse(null);
if (ObjectUtils.isNotEmpty(workspaceNode)) {
subjectName += workspaceNode.getNodeCode() + "-";
}else {
nodeIdList.add(workspaceNodeId);
}
}else {
nodeIdList.add(workspaceNodeId);
}
}
if (StringUtils.isNotBlank(subjectName)) {
taskNode.setTag10(Collections.singletonList(subjectName + taskNode.getTaskName()));
}
}
if (CollectionUtils.isNotEmpty(nodeIdList)) {
nodeIdList = nodeIdList.stream().distinct().toList();
List<SpdmNodeVo> nodeList = nodeMapper.getNodeListByIds(nodeIdList);
Map<String, String> nodeCodeMap = new HashMap<>();
if (CollectionUtils.isNotEmpty(nodeList)) {
nodeCodeMap = nodeList.stream().collect(Collectors.toMap(SpdmNodeVo::getUuid, SpdmNodeVo::getNodeCode, (oldValue, newValue) -> oldValue));
}
for (TaskNode taskNode : taskNodeList) {
String subjectName = "";
if (CollectionUtils.isEmpty(taskNode.getTag10())) {
List<String> projectNodeIdList = taskNode.getTag1();
if (CollectionUtils.isNotEmpty(projectNodeIdList)) {
String projectNodeId = projectNodeIdList.get(0);
String projectNodeCode = nodeCodeMap.get(projectNodeId);
if (StringUtils.isNotBlank(projectNodeCode)) {
subjectName += projectNodeCode + "-";
}
}
List<String> workspaceNodeIdList = taskNode.getTag5();
if (CollectionUtils.isNotEmpty(workspaceNodeIdList)) {
String workspaceNodeId = workspaceNodeIdList.get(0);
String workspaceNodeCode = nodeCodeMap.get(workspaceNodeId);
if (StringUtils.isNotBlank(workspaceNodeCode)) {
subjectName += workspaceNodeCode + "-";
}
}
}
taskNode.setTag10(Collections.singletonList(subjectName + taskNode.getTaskName()));
}
}
if (mapper.batchAddSimulationTask(taskNodeList) <= 0) {
response = SdmResponse.failed("新增任务失败");
return response;

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

@@ -1062,7 +1062,7 @@ public class TaskServiceImpl implements ITaskService {
SdmResponse<PageDataResp<List<CIDUserResp>>> pageDataRespSdmResponse = sysUserFeignClient.listUser(userListReq);
if (pageDataRespSdmResponse.isSuccess() && pageDataRespSdmResponse.getData().getData() != null) {
List<CIDUserResp> userList = pageDataRespSdmResponse.getData().getData();
usernameToUserIdMap = userList.stream().collect(Collectors.toMap(CIDUserResp::getJobNumber, CIDUserResp::getUserId));
usernameToUserIdMap = userList.stream().collect(Collectors.toMap(CIDUserResp::getUsername, CIDUserResp::getUserId));
}
List<SpdmNewTaskVo> newTaskList = convertToNewVoBatch(pageTaskList, batchData,usernameToUserIdMap);
stopWatch.stop();