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

fix[project]: 数据查询（任务、算例、指标）和任务列表支持根据学科过滤

Browse Source
This commit is contained in:
lidongyang
2026-03-18 14:28:26 +08:00
parent 1455bc4171
commit 5333d9473f
5 changed files with 160 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java
View File

@@ -61,7 +61,7 @@ public interface SimulationTaskMapper extends BaseMapper<SimulationTask> {
List<SpdmTaskVo> getTaskListByDemandId(@Param("demandId") String demandId);
List<SpdmAnalysisTaskVo> getAnalysisTask(@Param("taskNodeId") String taskNodeId);
List<SpdmAnalysisTaskVo> getAnalysisTask(@Param("taskNodeId") String taskNodeId,@Param("ownDisciplineName") String ownDisciplineName);
List<SpdmTaskVo> getTaskListByIdList(@Param("taskIdList") List<String> taskIdList);

2
project/src/main/java/com/sdm/project/model/req/SpdmAnalysisTaskListReq.java
View File

@@ -151,6 +151,8 @@ public class SpdmAnalysisTaskListReq extends BaseEntity {
private String discipline;
private String ownDisciplineName;
private String reportTemplate;
private String reportContent;

2
project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java
View File

@@ -153,7 +153,7 @@ public class SpdmTaskListReq {
private List<String> filterDiscipline;
// 二次查询过滤学科
private String discipline;
private String ownDisciplineName;
private String taskId;

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

@@ -1178,8 +1178,8 @@ public class TaskServiceImpl implements ITaskService {
StopWatch stopWatch = new StopWatch("所有任务方法计时");
stopWatch.start("查所有任务");
// 二次查询过滤学科
if (StringUtils.isNotBlank(req.getDiscipline())) {
req.setFilterDiscipline(Collections.singletonList(req.getDiscipline()));
if (StringUtils.isNotBlank(req.getOwnDisciplineName())) {
req.setFilterDiscipline(Collections.singletonList(req.getOwnDisciplineName()));
}
List<SpdmTaskVo> allTaskList = mapper.optimisedGtTaskList(tenantId, req);
stopWatch.stop();
@@ -2066,11 +2066,13 @@ public class TaskServiceImpl implements ITaskService {
int limit = req.getSize();
Long tenantId = ThreadLocalContext.getTenantId();
Long userId = ThreadLocalContext.getUserId();
JSONObject jsonObject = new JSONObject();
jsonObject.put("total", 0);
TagReq tagReq = req.getTagReq();
if (ObjectUtils.isEmpty(tagReq)){
log.error("tagReq为空");
return oldAnalysisTaskList(req);
jsonObject.put("data", new ArrayList<>());
return SdmResponse.success(jsonObject);
}
// key可能为多个，根据逗号转化为集合
List<String> tag1KeyList = new ArrayList<>();
@@ -2129,10 +2131,8 @@ public class TaskServiceImpl implements ITaskService {
String taskNodeId = tagReq.getTaskId();
List<SpdmAnalysisTaskVo> taskVoList;
List<SpdmAnalysisTaskVo> allTaskVoList = new ArrayList<>();
JSONObject jsonObject = new JSONObject();
jsonObject.put("total", 0);
if (StringUtils.isNotBlank(taskNodeId)) {
allTaskVoList = mapper.getAnalysisTask(taskNodeId);
allTaskVoList = mapper.getAnalysisTask(taskNodeId,req.getOwnDisciplineName());
} else {
taskVoList = mapper.taskListByTag(req, tenantId, new ArrayList<>(), pos, limit,userId,
tag1KeyList,tag2KeyList,tag3KeyList,tag4KeyList,tag5KeyList,tag6KeyList,tag7KeyList
@@ -2347,146 +2347,146 @@ public class TaskServiceImpl implements ITaskService {
return SdmResponse.success(jsonObject);
}
public SdmResponse oldAnalysisTaskList(SpdmAnalysisTaskListReq req) {
int pos = (req.getCurrent() - 1) * req.getSize();
int limit = req.getSize();
Long tenantId = ThreadLocalContext.getTenantId();
Long userId = ThreadLocalContext.getUserId();
String projectNodeId = req.getProjectNodeId();
String phaseNodeId = req.getPhaseNodeId();
String machineNodeId = req.getMachineNodeId();
String workspaceNodeId = req.getWorkspaceNodeId();
String disciplineNodeId = req.getDisciplineNodeId();
String nodeId = "";
String nodeTag = "";
if (StringUtils.isNotBlank(projectNodeId)) {
nodeId = projectNodeId;
nodeTag = "tag1";
}
if (StringUtils.isNotBlank(phaseNodeId)) {
nodeId = phaseNodeId;
nodeTag = "tag2";
}
if (StringUtils.isNotBlank(machineNodeId)) {
nodeId = machineNodeId;
nodeTag = "tag4";
}
if (StringUtils.isNotBlank(workspaceNodeId)) {
nodeId = workspaceNodeId;
nodeTag = "tag5";
}
if (StringUtils.isNotBlank(disciplineNodeId)) {
nodeId = disciplineNodeId;
nodeTag = "tag6";
}
List<String> allNodeIdList = new ArrayList<>();
if (StringUtils.isNotBlank(nodeId)) {
allNodeIdList.add(nodeId);
recursionAllNodeIdList(Collections.singletonList(nodeId), allNodeIdList);
}
String taskNodeId = req.getTaskNodeId();
List<SpdmAnalysisTaskVo> taskVoList;
List<SpdmAnalysisTaskVo> allTaskVoList = new ArrayList<>();
JSONObject jsonObject = new JSONObject();
jsonObject.put("total", 0);
if (StringUtils.isNotBlank(taskNodeId)) {
allTaskVoList = mapper.getAnalysisTask(taskNodeId);
} else {
taskVoList = mapper.taskList(req, tenantId, new ArrayList<>(), pos, limit,userId);
if (CollectionUtils.isEmpty(taskVoList)) {
log.error("数据分析中未查询到任务信息");
jsonObject.put("data", new ArrayList<>());
return SdmResponse.success(jsonObject);
}
if (StringUtils.isNotBlank(nodeId) && StringUtils.isNotBlank(nodeTag)) {
String currentNodeTagId = "";
for (SpdmAnalysisTaskVo spdmTaskVo : taskVoList) {
try {
currentNodeTagId = getTagProperty(spdmTaskVo, nodeTag);
if (StringUtils.isNotBlank(currentNodeTagId) && currentNodeTagId.contains(nodeId)) {
allTaskVoList.add(spdmTaskVo);
}
} catch (Exception e) {
throw new RuntimeException(e);
}
}
} else {
allTaskVoList = taskVoList;
}
}
if (CollectionUtils.isEmpty(allTaskVoList)) {
log.error("数据分析中未查询到任务信息");
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)) {
log.error("数据分析中未查询到任务信息");
jsonObject.put("data", new ArrayList<>());
return SdmResponse.success(jsonObject);
}
List<ProjectNodePo> allNodeList = projectMapper.getNodeListByNodeIdList(allNodeIdList);
Map<String, ProjectNodePo> nodeMap = allNodeList.stream()
.collect(Collectors.toMap(
ProjectNodePo::getUuid, // key：取uuid
Function.identity(), // value：取对象本身
(existing, replacement) -> existing // 重复时保留已存在的（第一个）元素
));
// 设置仿真负责人
List<String> taskIdList = taskVoList.stream().map(SpdmAnalysisTaskVo::getUuid).toList();
List<TaskNodeMemberPo> taskNodeMemberPoList = projectMapper.queryTaskNodeMembersByNodeIdList(taskIdList);
Map<String, List<TaskNodeMemberPo>> memberMap = new HashMap<>();
Map<Long, String> cidUserMap = new HashMap<>();
if (CollectionUtils.isNotEmpty(taskNodeMemberPoList)) {
taskNodeMemberPoList = taskNodeMemberPoList.stream().filter(member -> MemberTypeEnum.PRINCIPAL.getCode().equals(member.getType())).toList();
if (CollectionUtils.isNotEmpty(taskNodeMemberPoList)) {
memberMap = taskNodeMemberPoList.stream().collect(Collectors.groupingBy(TaskNodeMemberPo::getTaskId));
SdmResponse<List<CIDUserResp>> cidUserResp = sysUserFeignClient.listUserByIds(UserQueryReq.builder()
.userIds(taskNodeMemberPoList.stream().map(TaskNodeMemberPo::getUserId).toList()).build());
List<CIDUserResp> cidUserRespList;
if (cidUserResp.isSuccess() && CollectionUtils.isNotEmpty(cidUserRespList = cidUserResp.getData())) {
cidUserMap = cidUserRespList.stream().collect(Collectors.toMap(CIDUserResp::getUserId, CIDUserResp::getNickname));
}
}
}
ProjectNodePo eachProjectNodePo;
List<TaskNodeMemberPo> eachTaskNodeMemberPoList;
for (SpdmAnalysisTaskVo task : taskVoList) {
eachProjectNodePo = nodeMap.get(task.getNodeId());
// SpdmNodeVo phaseNode = nodeMapper.getNodeById(task.getTag2());
ProjectNodePo phaseNode = nodeMap.get(task.getTag2());
if (phaseNode != null) {
task.setPhaseName(phaseNode.getNodeName());
}
// SpdmNodeVo projectNode = nodeMapper.getNodeById(task.getTag1());
ProjectNodePo projectNode = nodeMap.get(task.getTag1());
if (projectNode != null) {
task.setProjectName(projectNode.getNodeName());
}
if (eachProjectNodePo != null && NodeTypeEnum.DISCIPLINE.getValue().equals(eachProjectNodePo.getNodeType())) {
task.setDisciplineName(eachProjectNodePo.getNodeName());
}
eachTaskNodeMemberPoList = memberMap.get(task.getUuid());
if (CollectionUtils.isNotEmpty(eachTaskNodeMemberPoList) && MapUtils.isNotEmpty(cidUserMap)) {
List<String> nickNameList = new ArrayList<>();
for (TaskNodeMemberPo taskNodeMemberPo : eachTaskNodeMemberPoList) {
String nickName = cidUserMap.get(taskNodeMemberPo.getUserId());
if (StringUtils.isBlank(nickName)) {
continue;
}
nickNameList.add(nickName);
}
task.setPMembers(String.join(",", nickNameList));
}
}
jsonObject.put("currentPage", req.getCurrent());
jsonObject.put("pageSize", req.getSize());
jsonObject.put("data", taskVoList);
return SdmResponse.success(jsonObject);
}
// public SdmResponse oldAnalysisTaskList(SpdmAnalysisTaskListReq req) {
// int pos = (req.getCurrent() - 1) * req.getSize();
// int limit = req.getSize();
// Long tenantId = ThreadLocalContext.getTenantId();
// Long userId = ThreadLocalContext.getUserId();
// String projectNodeId = req.getProjectNodeId();
// String phaseNodeId = req.getPhaseNodeId();
// String machineNodeId = req.getMachineNodeId();
// String workspaceNodeId = req.getWorkspaceNodeId();
// String disciplineNodeId = req.getDisciplineNodeId();
// String nodeId = "";
// String nodeTag = "";
// if (StringUtils.isNotBlank(projectNodeId)) {
// nodeId = projectNodeId;
// nodeTag = "tag1";
// }
// if (StringUtils.isNotBlank(phaseNodeId)) {
// nodeId = phaseNodeId;
// nodeTag = "tag2";
// }
// if (StringUtils.isNotBlank(machineNodeId)) {
// nodeId = machineNodeId;
// nodeTag = "tag4";
// }
// if (StringUtils.isNotBlank(workspaceNodeId)) {
// nodeId = workspaceNodeId;
// nodeTag = "tag5";
// }
// if (StringUtils.isNotBlank(disciplineNodeId)) {
// nodeId = disciplineNodeId;
// nodeTag = "tag6";
// }
// List<String> allNodeIdList = new ArrayList<>();
// if (StringUtils.isNotBlank(nodeId)) {
// allNodeIdList.add(nodeId);
// recursionAllNodeIdList(Collections.singletonList(nodeId), allNodeIdList);
// }
// String taskNodeId = req.getTaskNodeId();
// List<SpdmAnalysisTaskVo> taskVoList;
// List<SpdmAnalysisTaskVo> allTaskVoList = new ArrayList<>();
// JSONObject jsonObject = new JSONObject();
// jsonObject.put("total", 0);
// if (StringUtils.isNotBlank(taskNodeId)) {
// allTaskVoList = mapper.getAnalysisTask(taskNodeId);
// } else {
// taskVoList = mapper.taskList(req, tenantId, new ArrayList<>(), pos, limit,userId);
// if (CollectionUtils.isEmpty(taskVoList)) {
// log.error("数据分析中未查询到任务信息");
// jsonObject.put("data", new ArrayList<>());
// return SdmResponse.success(jsonObject);
// }
// if (StringUtils.isNotBlank(nodeId) && StringUtils.isNotBlank(nodeTag)) {
// String currentNodeTagId = "";
// for (SpdmAnalysisTaskVo spdmTaskVo : taskVoList) {
// try {
// currentNodeTagId = getTagProperty(spdmTaskVo, nodeTag);
// if (StringUtils.isNotBlank(currentNodeTagId) && currentNodeTagId.contains(nodeId)) {
// allTaskVoList.add(spdmTaskVo);
// }
// } catch (Exception e) {
// throw new RuntimeException(e);
// }
// }
// } else {
// allTaskVoList = taskVoList;
// }
// }
// if (CollectionUtils.isEmpty(allTaskVoList)) {
// log.error("数据分析中未查询到任务信息");
// 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)) {
// log.error("数据分析中未查询到任务信息");
// jsonObject.put("data", new ArrayList<>());
// return SdmResponse.success(jsonObject);
// }
// List<ProjectNodePo> allNodeList = projectMapper.getNodeListByNodeIdList(allNodeIdList);
// Map<String, ProjectNodePo> nodeMap = allNodeList.stream()
// .collect(Collectors.toMap(
// ProjectNodePo::getUuid, // key：取uuid
// Function.identity(), // value：取对象本身
// (existing, replacement) -> existing // 重复时保留已存在的（第一个）元素
// ));
// // 设置仿真负责人
// List<String> taskIdList = taskVoList.stream().map(SpdmAnalysisTaskVo::getUuid).toList();
// List<TaskNodeMemberPo> taskNodeMemberPoList = projectMapper.queryTaskNodeMembersByNodeIdList(taskIdList);
// Map<String, List<TaskNodeMemberPo>> memberMap = new HashMap<>();
// Map<Long, String> cidUserMap = new HashMap<>();
// if (CollectionUtils.isNotEmpty(taskNodeMemberPoList)) {
// taskNodeMemberPoList = taskNodeMemberPoList.stream().filter(member -> MemberTypeEnum.PRINCIPAL.getCode().equals(member.getType())).toList();
// if (CollectionUtils.isNotEmpty(taskNodeMemberPoList)) {
// memberMap = taskNodeMemberPoList.stream().collect(Collectors.groupingBy(TaskNodeMemberPo::getTaskId));
// SdmResponse<List<CIDUserResp>> cidUserResp = sysUserFeignClient.listUserByIds(UserQueryReq.builder()
// .userIds(taskNodeMemberPoList.stream().map(TaskNodeMemberPo::getUserId).toList()).build());
// List<CIDUserResp> cidUserRespList;
// if (cidUserResp.isSuccess() && CollectionUtils.isNotEmpty(cidUserRespList = cidUserResp.getData())) {
// cidUserMap = cidUserRespList.stream().collect(Collectors.toMap(CIDUserResp::getUserId, CIDUserResp::getNickname));
// }
// }
// }
// ProjectNodePo eachProjectNodePo;
// List<TaskNodeMemberPo> eachTaskNodeMemberPoList;
// for (SpdmAnalysisTaskVo task : taskVoList) {
// eachProjectNodePo = nodeMap.get(task.getNodeId());
//
//// SpdmNodeVo phaseNode = nodeMapper.getNodeById(task.getTag2());
// ProjectNodePo phaseNode = nodeMap.get(task.getTag2());
// if (phaseNode != null) {
// task.setPhaseName(phaseNode.getNodeName());
// }
//// SpdmNodeVo projectNode = nodeMapper.getNodeById(task.getTag1());
// ProjectNodePo projectNode = nodeMap.get(task.getTag1());
// if (projectNode != null) {
// task.setProjectName(projectNode.getNodeName());
// }
// if (eachProjectNodePo != null && NodeTypeEnum.DISCIPLINE.getValue().equals(eachProjectNodePo.getNodeType())) {
// task.setDisciplineName(eachProjectNodePo.getNodeName());
// }
//
// eachTaskNodeMemberPoList = memberMap.get(task.getUuid());
// if (CollectionUtils.isNotEmpty(eachTaskNodeMemberPoList) && MapUtils.isNotEmpty(cidUserMap)) {
// List<String> nickNameList = new ArrayList<>();
// for (TaskNodeMemberPo taskNodeMemberPo : eachTaskNodeMemberPoList) {
// String nickName = cidUserMap.get(taskNodeMemberPo.getUserId());
// if (StringUtils.isBlank(nickName)) {
// continue;
// }
// nickNameList.add(nickName);
// }
// task.setPMembers(String.join(",", nickNameList));
// }
// }
// jsonObject.put("currentPage", req.getCurrent());
// jsonObject.put("pageSize", req.getSize());
// jsonObject.put("data", taskVoList);
// return SdmResponse.success(jsonObject);
// }
@Override

14
project/src/main/resources/mapper/SimulationTaskMapper.xml
View File

@@ -742,7 +742,11 @@
</select>
<select id="getAnalysisTask" resultType="com.sdm.project.model.vo.SpdmAnalysisTaskVo">
select * from simulation_task where uuid = #{taskNodeId} order by create_time desc
select * from simulation_task where uuid = #{taskNodeId}
<if test="ownDisciplineName != null and ownDisciplineName != ''">
and discipline = #{ownDisciplineName}
</if>
order by create_time desc
</select>
<select id="getTaskListByIdList" resultType="com.sdm.common.entity.resp.project.SpdmTaskVo">
@@ -1145,8 +1149,8 @@
<if test="req.expStatus != null and req.expStatus != ''">
and st.expStatus = #{req.expStatus}
</if>
<if test="req.discipline != null and req.discipline != ''">
<bind name="searchKey17" value="'%' + req.discipline + '%'"/>
<if test="req.ownDisciplineName != null and req.ownDisciplineName != ''">
<bind name="searchKey17" value="'%' + req.ownDisciplineName + '%'"/>
and st.discipline like #{searchKey17}
</if>
<if test="req.reportTemplate != null and req.reportTemplate != ''">
@@ -1349,8 +1353,8 @@
<if test="req.expStatus != null and req.expStatus != ''">
and st.expStatus = #{req.expStatus}
</if>
<if test="req.discipline != null and req.discipline != ''">
<bind name="searchKey17" value="'%' + req.discipline + '%'"/>
<if test="req.ownDisciplineName != null and req.ownDisciplineName != ''">
<bind name="searchKey17" value="'%' + req.ownDisciplineName + '%'"/>
and st.discipline like #{searchKey17}
</if>
<if test="req.reportTemplate != null and req.reportTemplate != ''">