From c1372b176b9b70a89f97c134bbf07b8032c9c3dc Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Fri, 13 Mar 2026 19:25:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E6=95=B0=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BA=8C=E6=AC=A1=E6=9F=A5=E8=AF=A2=20bugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/model/po/PerformanceNodePo.java | 8 ++++++ .../com/sdm/project/model/po/TaskRunPo.java | 8 ++++++ .../project/model/vo/SpdmAnalysisTaskVo.java | 17 ++++++++++++- .../project/service/impl/TaskServiceImpl.java | 25 ++++++++++--------- 4 files changed, 45 insertions(+), 13 deletions(-) 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 7d5d2626..e1a3997b 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,7 +2,9 @@ package com.sdm.project.model.po; import com.fasterxml.jackson.annotation.JsonProperty; import com.sdm.common.entity.pojo.BaseEntity; +import com.sdm.common.entity.req.data.TagReq; import com.sdm.project.model.entity.SimulationPerformanceExtra; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @@ -114,4 +116,10 @@ public class PerformanceNodePo extends NodeAllBase { private String searchType = "performance"; + /** + * 标签请求参数 设置tag1-tag10 ,taskId, runId记录文件所属节点信息 + */ + @Schema(description = "标签请求参数") + private TagReq tagReq; + } diff --git a/project/src/main/java/com/sdm/project/model/po/TaskRunPo.java b/project/src/main/java/com/sdm/project/model/po/TaskRunPo.java index bbb416f1..0a94bf0a 100644 --- a/project/src/main/java/com/sdm/project/model/po/TaskRunPo.java +++ b/project/src/main/java/com/sdm/project/model/po/TaskRunPo.java @@ -1,6 +1,8 @@ package com.sdm.project.model.po; import com.sdm.common.entity.pojo.BaseEntity; +import com.sdm.common.entity.req.data.TagReq; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @@ -83,4 +85,10 @@ public class TaskRunPo extends BaseEntity { private String pMembers; private String searchType = "run"; + + /** + * 标签请求参数 设置tag1-tag10 ,taskId, runId记录文件所属节点信息 + */ + @Schema(description = "标签请求参数") + private TagReq tagReq; } diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmAnalysisTaskVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmAnalysisTaskVo.java index 00278c41..b27a9403 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmAnalysisTaskVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmAnalysisTaskVo.java @@ -3,8 +3,13 @@ package com.sdm.project.model.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.sdm.common.entity.pojo.BaseEntity; +import com.sdm.common.entity.req.data.TagReq; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + @JsonIgnoreProperties(ignoreUnknown = true) @Data public class SpdmAnalysisTaskVo extends BaseEntity { @@ -71,6 +76,12 @@ public class SpdmAnalysisTaskVo extends BaseEntity { @JsonProperty("pMembers") private String pMembers; + /** + * 仿真负责人id + */ + @JsonProperty("pMemberIdList") + private List pMemberIdList = new ArrayList<>(); + private String tag1; private String tag2; private String tag3; @@ -84,6 +95,10 @@ public class SpdmAnalysisTaskVo extends BaseEntity { private String searchType = "task"; - + /** + * 标签请求参数 设置tag1-tag10 ,taskId, runId记录文件所属节点信息 + */ + @Schema(description = "标签请求参数") + private TagReq tagReq; } 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 d8eecac2..4d5c6688 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 @@ -1833,6 +1833,8 @@ public class TaskServiceImpl implements ITaskService { continue; } performanceNodePo.setRunName(simulationRun.getRunName()); + TagReq tagReq = req.getTagReq(); + performanceNodePo.setTagReq(tagReq); } jsonObject.put("data", performanceList); return SdmResponse.success(jsonObject); @@ -1959,18 +1961,6 @@ public class TaskServiceImpl implements ITaskService { return SdmResponse.success(jsonObject); } - // 根据仿真负责人过滤 - Long pMembers = req.getPMembers(); - if (ObjectUtils.isNotEmpty(pMembers)) { - allTaskVoList = allTaskVoList.stream().filter(task -> pMembers.equals(task.getCreator())).collect(Collectors.toList()); - } - - if (CollectionUtils.isEmpty(allTaskVoList)) { - log.info("数据分析中未查询到任务信息"); - jsonObject.put("data", new ArrayList<>()); - return SdmResponse.success(jsonObject); - } - jsonObject.put("total", allTaskVoList.size()); taskVoList = allTaskVoList.stream().skip((long) (req.getCurrent() - 1) * req.getSize()).limit(req.getSize()).toList(); if (CollectionUtils.isEmpty(taskVoList)) { @@ -2067,15 +2057,24 @@ public class TaskServiceImpl implements ITaskService { eachTaskNodeMemberPoList = memberMap.get(task.getUuid()); if (CollectionUtils.isNotEmpty(eachTaskNodeMemberPoList) && MapUtils.isNotEmpty(cidUserMap)) { List nickNameList = new ArrayList<>(); + List idList = new ArrayList<>(); for (TaskNodeMemberPo taskNodeMemberPo : eachTaskNodeMemberPoList) { String nickName = cidUserMap.get(taskNodeMemberPo.getUserId()); if (StringUtils.isBlank(nickName)) { continue; } nickNameList.add(nickName); + idList.add(taskNodeMemberPo.getUserId()); } task.setPMembers(String.join(",", nickNameList)); + task.setPMemberIdList(idList); } + task.setTagReq(tagReq); + } + // 根据仿真负责人过滤 + Long pMembers = req.getPMembers(); + if (ObjectUtils.isNotEmpty(pMembers)) { + allTaskVoList = allTaskVoList.stream().filter(task -> task.getPMemberIdList().contains(pMembers)).collect(Collectors.toList()); } jsonObject.put("currentPage", req.getCurrent()); jsonObject.put("pageSize", req.getSize()); @@ -2346,6 +2345,8 @@ public class TaskServiceImpl implements ITaskService { if (CollectionUtils.isEmpty(nickNameList)) continue; taskRunPo.setPMembers(cidUserResp.getData().stream().map(CIDUserResp::getNickname).collect(Collectors.joining(","))); } + TagReq tagReq = req.getTagReq(); + taskRunPo.setTagReq(tagReq); } JSONObject jsonObject = new JSONObject(); From dfd4595a2cb6865fde3dacd46af2594ec781cb91 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Fri, 13 Mar 2026 19:27:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81acceptTodoInfo=20bugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sdm/project/service/impl/LyricInternalServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java index aa204030..bc308ee1 100644 --- a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java @@ -224,7 +224,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService { // 用于判断查询事业部用户信息的一些常量 private static final String DESIGN_PHASE = "设计"; - private static final String STRUCTURE = "结构"; + private static final String STRUCTURE = "结构仿真"; private static final String TECHNOLOGY_CENTER = "技术中心"; /** @@ -4048,7 +4048,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService { if (DESIGN_PHASE.equals(currenPhase)) { deptName = projectUndertaker + "-" + STRUCTURE; } else { - deptName = projectUndertaker + "-" + TECHNOLOGY_CENTER + "-" + STRUCTURE; + deptName = projectUndertaker + "-" + STRUCTURE + "-" + TECHNOLOGY_CENTER; } // 待调用system的查询部门用户feign接口 DeptQueryReq req = new DeptQueryReq();