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

fix:获取任务详情

Browse Source
This commit is contained in:
zhuxinru
2025-12-29 20:59:15 +08:00
parent 76b5f0ee83
commit bf8e8537d2
6 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/com/sdm/common/service/UserNameCacheService.java
View File

@@ -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

7
project/src/main/java/com/sdm/project/model/vo/SpdmTaskVo.java
View File

@@ -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;

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

@@ -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<SimulationNodeMapper, Simulatio
return null;
}
SdmResponse createDirResult;
for (TaskNode taskNode : addTaskList) {
// 设置仿真执行人
if (StringUtils.isNotBlank(taskNode.getEMemberList())) {
String[] userIdArr = taskNode.getEMemberList().split(",");
List<Long> 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<Long> 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()) {

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

@@ -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<SpdmTaskMemberVo> memberList = mapper.getMemberList(Collections.singletonList(taskVo.getUuid()), null);
if (CollectionUtils.isNotEmpty(memberList)) {
List<Long> 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<SpdmTaskMemberVo> 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) {

2
project/src/main/resources/mapper/SimulationProjectMapper.xml
View File

@@ -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
<foreach collection='list' item='it' index='index' separator=','>
(#{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},

1
system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java
View File

@@ -324,6 +324,7 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
if (CollectionUtils.isNotEmpty(formConfigureService.lambdaQuery().eq(SysFormConfigure::getFormName, configure.formName).list())) {
LambdaUpdateWrapper<SysFormConfigure> 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());
}