From bf8e8537d20948780de30cb97894ead9e5c9f347 Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Mon, 29 Dec 2025 20:59:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=8E=B7=E5=8F=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sdm/common/service/UserNameCacheService.java | 3 ++- .../java/com/sdm/project/model/vo/SpdmTaskVo.java | 7 +++++++ .../sdm/project/service/impl/NodeServiceImpl.java | 15 +++++++++++++++ .../sdm/project/service/impl/TaskServiceImpl.java | 10 ++++------ .../resources/mapper/SimulationProjectMapper.xml | 2 +- .../impl/SimulationSystemConfigServiceImpl.java | 1 + 6 files changed, 30 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/com/sdm/common/service/UserNameCacheService.java b/common/src/main/java/com/sdm/common/service/UserNameCacheService.java index cf6543a1..260aff37 100644 --- a/common/src/main/java/com/sdm/common/service/UserNameCacheService.java +++ b/common/src/main/java/com/sdm/common/service/UserNameCacheService.java @@ -3,6 +3,7 @@ package com.sdm.common.service; import com.sdm.common.common.SdmResponse; import com.sdm.common.entity.req.system.UserQueryReq; import com.sdm.common.entity.resp.system.CIDUserResp; +import com.sdm.common.feign.impl.system.SysUserFeignClientImpl; import com.sdm.common.feign.inter.system.ISysUserFeignClient; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -18,7 +19,7 @@ import java.util.stream.Collectors; public class UserNameCacheService { @Autowired - private ISysUserFeignClient sysUserFeignClient; + private SysUserFeignClientImpl sysUserFeignClient; /** * 批量获取用户名 - 带缓存 TODO 后续加入Redis的时候改成Redis diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmTaskVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmTaskVo.java index 866c5e2c..28baff05 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmTaskVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmTaskVo.java @@ -32,6 +32,11 @@ public class SpdmTaskVo extends BaseEntity { */ private String taskName; + /** + * 当前节点名称（=任务名称） + */ + private String nodeName; + /** * 任务编码 @@ -98,7 +103,9 @@ public class SpdmTaskVo extends BaseEntity { private Float difficult; private String department; + @JsonProperty(value = "section") private String sectionName; + @JsonProperty(value = "group") private String groupName; @JsonProperty(value = "bCapacity") private String bCapacity; diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java index 4bc5c1ff..00f61d87 100644 --- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java @@ -32,6 +32,7 @@ import com.sdm.outbridge.entity.LyricVMainPlanDM; import com.sdm.outbridge.entity.LyricVTodoEmulationInfoDM; import com.sdm.outbridge.service.lyric.LyricVMainPlanDMService; import com.sdm.outbridge.service.lyric.LyricVTodoInfoService; +import com.sdm.project.common.MemberTypeEnum; import com.sdm.project.dao.SimulationDemandMapper; import com.sdm.project.dao.SimulationNodeMapper; import com.sdm.project.dao.SimulationProjectMapper; @@ -1588,6 +1589,20 @@ public class NodeServiceImpl extends ServiceImpl longUserIdList = Arrays.stream(userIdArr).filter(s -> !s.isEmpty()).map(Long::valueOf).collect(Collectors.toList()); + simulationTaskMemberService.saveTaskMemberList(taskNode.getUuid(), MemberTypeEnum.EXECUTOR.getCode(), longUserIdList); + } + // 设置仿真负责人 + if (StringUtils.isNotBlank(taskNode.getPMemberList())) { + String[] userIdArr = taskNode.getPMemberList().split(","); + List longUserIdList = Arrays.stream(userIdArr).filter(s -> !s.isEmpty()).map(Long::valueOf).collect(Collectors.toList()); + simulationTaskMemberService.saveTaskMemberList(taskNode.getUuid(), MemberTypeEnum.PRINCIPAL.getCode(), longUserIdList); + } + } for (TaskNode taskNode : addTaskList) { createDirResult = createDir(taskNode.getUuid(), taskNode.getNodeType(), taskNode.getPid(), taskNode.getNodeName()); if (createDirResult.getCode() != ResultCode.SUCCESS.getCode()) { 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 ac211a33..b970af0e 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 @@ -1364,9 +1364,7 @@ public class TaskServiceImpl implements ITaskService { log.error("根据id：{}，未查询到任务", req.getRelatedResourceUuid()); return SdmResponse.failed("未查询到任务"); } - SpdmTaskDetailVo spdmTaskDetailVo = new SpdmTaskDetailVo(); - BeanUtils.copyProperties(taskVo, spdmTaskDetailVo); - spdmTaskDetailVo.setId(taskVo.getId()); + taskVo.setNodeName(taskVo.getTaskName()); List memberList = mapper.getMemberList(Collections.singletonList(taskVo.getUuid()), null); if (CollectionUtils.isNotEmpty(memberList)) { List userIdList = memberList.stream().map(SpdmTaskMemberVo::getUserId).toList(); @@ -1387,7 +1385,7 @@ public class TaskServiceImpl implements ITaskService { } } if (CollectionUtils.isNotEmpty(spdmPUserVoList)) { - spdmTaskDetailVo.setPMemberList(spdmPUserVoList.stream().map(CIDUserResp::getNickname).collect(Collectors.joining(","))); + taskVo.setPMemberList(spdmPUserVoList); } } List eMemberList = memberList.stream().filter(member -> MemberTypeEnum.EXECUTOR.getCode().equals(member.getType())).toList(); @@ -1399,11 +1397,11 @@ public class TaskServiceImpl implements ITaskService { } } if (CollectionUtils.isNotEmpty(spdmEUserVoList)) { - spdmTaskDetailVo.setEMemberList(spdmEUserVoList.stream().map(CIDUserResp::getNickname).collect(Collectors.joining(","))); + taskVo.setEMemberList(spdmEUserVoList); } } } - return SdmResponse.success(spdmTaskDetailVo); + return SdmResponse.success(taskVo); } private SdmResponse createDir(String uuid, String uuidOwnType, String parentUuid, String dirName) { diff --git a/project/src/main/resources/mapper/SimulationProjectMapper.xml b/project/src/main/resources/mapper/SimulationProjectMapper.xml index 5d3bd703..3f5d6cfc 100644 --- a/project/src/main/resources/mapper/SimulationProjectMapper.xml +++ b/project/src/main/resources/mapper/SimulationProjectMapper.xml @@ -48,7 +48,7 @@ ,creator,create_time,department,sectionName,groupName,bCapacity,flowTemplate,englishName,demand_id,tag1,tag2,tag3,tag4,tag5,tag6,tag7,tag8,tag9,tag10,imageFileId) values (#{it.uuid},#{it.taskName},#{it.taskCode},'','',#{it.nodeId},#{it.days},#{it.standard},'',1,0, - #{it.beginTime},#{it.endTime},0,1,#{it.confidence},#{it.analyseTarget},#{it.analyseSoftwares},'0',#{it.description},#{it.difficult},#{it.tenantId}, + #{it.beginTime},#{it.endTime},0,1,#{it.confidence},#{it.analyseTarget},#{it.analyseSoftware},'0',#{it.description},#{it.difficult},#{it.tenantId}, #{it.creator},#{it.createTime},#{it.department},#{it.section},#{it.group},#{it.bCapacity},#{it.flowTemplate},#{it.englishName},#{it.demandId},#{it.tag1,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag2,typeHandler=com.sdm.project.handler.ListStringTypeHandler}, #{it.tag3,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag4,typeHandler=com.sdm.project.handler.ListStringTypeHandler}, #{it.tag5,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag6,typeHandler=com.sdm.project.handler.ListStringTypeHandler}, diff --git a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java index 5b54c9bc..84e0d185 100644 --- a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java @@ -324,6 +324,7 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS if (CollectionUtils.isNotEmpty(formConfigureService.lambdaQuery().eq(SysFormConfigure::getFormName, configure.formName).list())) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(SysFormConfigure::getFormName, configure.getFormName()); + updateWrapper.eq(SysFormConfigure::getTenantId, ThreadLocalContext.getTenantId()); if (configure.getFormConfig() != null) { updateWrapper.set(SysFormConfigure::getFormConfig, configure.getFormConfig()); }