From d179a1c170c6492777384ff2f81112973290d200 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Wed, 31 Dec 2025 16:46:10 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81bug=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sdm/project/model/po/NodeAllBase.java | 2 +- .../project/model/po/PerformanceNodePo.java | 3 +- .../sdm/project/model/po/ProjectNodePo.java | 3 +- .../com/sdm/project/model/po/TaskNodePo.java | 2 +- .../service/impl/ProjectServiceImpl.java | 32 +++++++++++++++++++ .../project/service/impl/TaskServiceImpl.java | 5 ++- 6 files changed, 42 insertions(+), 5 deletions(-) diff --git a/project/src/main/java/com/sdm/project/model/po/NodeAllBase.java b/project/src/main/java/com/sdm/project/model/po/NodeAllBase.java index 7c660c9a..d0437f4a 100644 --- a/project/src/main/java/com/sdm/project/model/po/NodeAllBase.java +++ b/project/src/main/java/com/sdm/project/model/po/NodeAllBase.java @@ -189,7 +189,7 @@ public class NodeAllBase extends BaseEntity { public String members; - public String extras; +// public String extras; @JsonProperty(value = "tag1") private String tag1; diff --git a/project/src/main/java/com/sdm/project/model/po/PerformanceNodePo.java b/project/src/main/java/com/sdm/project/model/po/PerformanceNodePo.java index b61d84bc..60dceca5 100644 --- a/project/src/main/java/com/sdm/project/model/po/PerformanceNodePo.java +++ b/project/src/main/java/com/sdm/project/model/po/PerformanceNodePo.java @@ -2,6 +2,7 @@ package com.sdm.project.model.po; import com.fasterxml.jackson.annotation.JsonProperty; import com.sdm.common.entity.pojo.BaseEntity; +import com.sdm.project.model.entity.SimulationPerformanceExtra; import lombok.Data; import java.util.List; @@ -64,7 +65,7 @@ public class PerformanceNodePo extends NodeAllBase { /** * 拓展属性集合 */ - public String extras; + public List extras; // public void addNodeExtra(PerformanceNodeExtraPo nodeExtra) // { diff --git a/project/src/main/java/com/sdm/project/model/po/ProjectNodePo.java b/project/src/main/java/com/sdm/project/model/po/ProjectNodePo.java index d1dd7749..83f64b69 100644 --- a/project/src/main/java/com/sdm/project/model/po/ProjectNodePo.java +++ b/project/src/main/java/com/sdm/project/model/po/ProjectNodePo.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.sdm.common.entity.pojo.BaseEntity; import com.sdm.common.entity.resp.system.CIDUserResp; import com.sdm.project.model.bo.ProjectNode; +import com.sdm.project.model.vo.SpdmNodeExtraVo; import lombok.Data; import java.util.ArrayList; @@ -92,7 +93,7 @@ public class ProjectNodePo extends NodeAllBase { /** * 拓展属性集合 */ - private String extras; + private List extras; /** * 项目详情图片 diff --git a/project/src/main/java/com/sdm/project/model/po/TaskNodePo.java b/project/src/main/java/com/sdm/project/model/po/TaskNodePo.java index f5f1054d..b5efe69f 100644 --- a/project/src/main/java/com/sdm/project/model/po/TaskNodePo.java +++ b/project/src/main/java/com/sdm/project/model/po/TaskNodePo.java @@ -109,7 +109,7 @@ public class TaskNodePo extends NodeAllBase { /** * 拓展属性集合 */ - private String extras; + private List extras; public List children = new ArrayList<>(); diff --git a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java index 8bd36548..a73c5d98 100644 --- a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java @@ -12,6 +12,7 @@ import com.sdm.common.entity.enums.FilePermissionEnum; import com.sdm.common.entity.enums.NodeTypeEnum; import com.sdm.common.entity.enums.ValueTypeEnum; import com.sdm.common.entity.req.data.*; +import com.sdm.common.entity.req.project.SimulationPerformance; import com.sdm.common.entity.req.system.UserQueryReq; import com.sdm.common.entity.req.task.TaskExportExcelParam; import com.sdm.common.entity.req.task.TaskTreeExportExcelFormat; @@ -27,13 +28,18 @@ import com.sdm.project.common.MemberTypeEnum; import com.sdm.project.common.VersionEnum; import com.sdm.project.dao.SimulationNodeMapper; import com.sdm.project.dao.SimulationProjectMapper; +import com.sdm.project.dao.SimulationTaskMapper; import com.sdm.project.model.bo.*; +import com.sdm.project.model.entity.SimulationPerformanceExtra; import com.sdm.project.model.entity.SimulationTaskMember; import com.sdm.project.model.po.*; import com.sdm.project.model.req.*; import com.sdm.project.model.vo.SpdmExportNewTaskVo; import com.sdm.project.model.vo.SpdmNewTaskVo; +import com.sdm.project.model.vo.SpdmNodeExtraVo; import com.sdm.project.service.IProjectService; +import com.sdm.project.service.ISimulationPerformanceExtraService; +import com.sdm.project.service.ISimulationPerformanceService; import com.sdm.project.service.ISimulationTaskMemberService; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; @@ -64,12 +70,18 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { @Autowired private SimulationNodeMapper nodeMapper; + @Autowired + private SimulationTaskMapper taskMapper; + @Autowired private DataClientFeignClientImpl dataClientFeignClient; @Autowired private ISimulationTaskMemberService simulationTaskMemberService; + @Autowired + private ISimulationPerformanceExtraService performanceExtraService; + @Autowired SysUserFeignClientImpl sysUserFeignClient; @@ -533,6 +545,14 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { List eachPerformanceNodeList; List currentTaskAssociatedPerformanceList = taskTreePerformanceList.stream().filter(performance -> ObjectUtils.isNotEmpty(taskMap.get(performance.getTaskId())) && performance.getRunId() == null).toList(); if (CollectionUtils.isNotEmpty(currentTaskAssociatedPerformanceList)) { + // 设置拓展属性 + List performanceIdList = currentTaskAssociatedPerformanceList.stream().map(PerformanceNodePo::getUuid).toList(); + List performanceExtraList = performanceExtraService.lambdaQuery().in(SimulationPerformanceExtra::getPerformanceId, performanceIdList).list(); + Map> performanceExtraMap = new HashMap<>(); + if (CollectionUtils.isNotEmpty(performanceExtraList)) { + performanceExtraMap = performanceExtraList.stream().collect(Collectors.groupingBy(SimulationPerformanceExtra::getPerformanceId)); + } + Map> performanceMap = currentTaskAssociatedPerformanceList.stream().collect(Collectors.groupingBy(PerformanceNodePo::getTaskId)); for (TaskNodePo taskNodePo : currentNodeAssociatedTaskList) { eachPerformanceNodeList = performanceMap.get(taskNodePo.getUuid()); @@ -541,6 +561,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { if (StringUtils.isBlank(performanceNodePo.getEnglishName())) { performanceNodePo.setEnglishName(""); } + performanceNodePo.setExtras(performanceExtraMap.get(performanceNodePo.getUuid())); } taskNodePo.getChildren().addAll(eachPerformanceNodeList); } @@ -661,11 +682,20 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { } } if (CollectionUtils.isNotEmpty(currentNodeAssociatedTaskList)) { + List taskIdList = currentNodeAssociatedTaskList.stream().map(TaskNodePo::getUuid).toList(); + List taskExtraList = taskMapper.getTaskExtraList(taskIdList); + Map> taskExtraMap = new HashMap<>(); + if (CollectionUtils.isNotEmpty(taskExtraList)) { + taskExtraMap = taskExtraList.stream().collect(Collectors.groupingBy(TaskNodeExtraPo::getTaskId)); + } + Map> finalTaskExtraMap = taskExtraMap; currentNodeAssociatedTaskList.forEach(task -> { task.setNodeName(task.getTaskName()); task.setNodeCode(task.getTaskCode()); task.setSection(task.getSectionName()); task.setGroup(task.getGroupName()); + // 设置拓展属性 + task.setExtras(finalTaskExtraMap.get(task.getUuid())); }); for (TaskNodePo nodePo : currentNodeAssociatedTaskList) { if (StringUtils.isBlank(nodePo.getEnglishName())) { @@ -675,6 +705,8 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { children.addAll(currentNodeAssociatedTaskList); } projectNodePo.setChildren(children); + // 设置拓展属性 + projectNodePo.setExtras(nodeMapper.getNodeExtraListByNodeIdList(Collections.singletonList(projectNodePo.getUuid()))); } private TaskNodeTag getRealTagId(ProjectNodePo projectNodePo) { diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index 8539c564..30f39ed4 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -2354,18 +2354,21 @@ public class TaskServiceImpl implements ITaskService { } spdmExportNewTaskVo.setStandard(String.join(",", fileNameList)); } + log.info("flowTemplate为：{}",spdmExportNewTaskVo.getFlowTemplate()); if (StringUtils.isNotBlank(spdmExportNewTaskVo.getFlowTemplate())) { List flowTemplateNameList = new ArrayList<>(); String[] flowTemplateArr = spdmExportNewTaskVo.getFlowTemplate().split(";"); for (String flowTemplate : flowTemplateArr) { + log.info("查询flowTemplate为：{}",flowTemplate); SdmResponse flowTemplateResp = flowFeignClient.queryFlowTemplateInfoByTemplateCode(flowTemplate); + log.info("flowTemplateResp为：{}",flowTemplateResp); if (flowTemplateResp.getData() == null) { continue; } flowTemplateNameList.add(flowTemplateResp.getData().getTemplateName()); } if (CollectionUtils.isNotEmpty(flowTemplateNameList)) { - spdmExportNewTaskVo.setFlowTemplate(flowTemplateNameList.stream().collect(Collectors.joining(","))); + spdmExportNewTaskVo.setFlowTemplate(String.join(",", flowTemplateNameList)); } } }