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

fix：数据总览，任务按照维度配置，计算挂在最深路径

Browse Source
This commit is contained in:
gulongcheng
2026-04-01 17:19:08 +08:00
parent 7ac9eb30a3
commit e84a453b19
7 changed files with 205 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/src/main/java/com/sdm/data/model/entity/DimensionTemplateHierarchy.java
View File

@@ -37,7 +37,7 @@ public class DimensionTemplateHierarchy implements Serializable {
@TableField("templateId")
private Long templateId;
@Schema(description = "显示名称:tag1,tag2,tag3...tag10")
@Schema(description = "显示名称:project,pahse,machine")
@TableField("displayName")
private String displayName;

4
data/src/main/java/com/sdm/data/model/req/GetSimulationNodeTreeReq.java
View File

@@ -1,5 +1,6 @@
package com.sdm.data.model.req;
import com.sdm.common.entity.req.data.TagReq;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.NotEmpty;
@@ -25,4 +26,7 @@ public class GetSimulationNodeTreeReq {
*/
@Schema(description = "项目名称/编码关键字")
private String keyword;
@Schema(description = "标签查询条件")
private TagReq tagReq;
}

4
data/src/main/java/com/sdm/data/model/req/ListSimulationNodeTreeReq.java
View File

@@ -1,6 +1,7 @@
package com.sdm.data.model.req;
import com.sdm.common.entity.req.data.BaseReq;
import com.sdm.common.entity.req.data.TagReq;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.NotEmpty;
@@ -38,4 +39,7 @@ public class ListSimulationNodeTreeReq extends BaseReq {
*/
@Schema(description = "是否开启作业模式")
boolean jobMode=false;
@Schema(description = "标签查询条件")
private TagReq tagReq;
}

2
data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java
View File

@@ -337,7 +337,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
if (i > 0) {
q.or();
}
q.eq(column, value).or().likeLeft(column, "," + value);
q.eq(column, value).or().likeLeft(column, "," + value).or().likeRight(column, value + ",").or().like(column, "," + value + ",");
}
});
}

167
data/src/main/java/com/sdm/data/service/impl/DimensionTemplateServiceImpl.java
View File

@@ -2,16 +2,15 @@ package com.sdm.data.service.impl;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.github.pagehelper.PageInfo;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.common.ThreadLocalContext;
import com.sdm.common.entity.enums.DataTypeEnum;
import com.sdm.common.entity.enums.DirTypeEnum;
import com.sdm.common.entity.enums.NodeTypeEnum;
import com.sdm.common.entity.req.data.CreateDirReq;
import com.sdm.common.entity.req.data.DelDirReq;
import com.sdm.common.entity.req.data.DelFileReq;
import com.sdm.common.entity.req.data.UploadFilesReq;
import com.sdm.common.entity.req.data.*;
import com.sdm.common.entity.req.project.DelNodeReq;
import com.sdm.common.entity.req.project.GetAllNodeByNodeTypeReq;
import com.sdm.common.entity.req.project.GetTaskDetailReq;
@@ -300,15 +299,16 @@ public class DimensionTemplateServiceImpl extends ServiceImpl<DimensionTemplateM
if (CollectionUtils.isNotEmpty(nextLevelUuids)) {
uuids.addAll(nextLevelUuids);
}
// 3、获取当前节点下的任务（仅展示“应挂载在当前层”的任务，避免任务提前出现在上层）
List<List<String>> displayTagLevels = buildDisplayTagLevels(dimensionNodeTypeLevels);
List<String> taskUuids = getTaskByTagReq(req.getTagReq(), displayTagLevels, currentLevelIndex);
uuids.addAll(taskUuids);
log.info("获取节点下task的uudis:{}", taskUuids);
}
// 3、获取当前节点下的任务、算列
SdmResponse<List<AllNodeByProjectIdAndTypeResp>> nodeTaskList = simuluationNodeFeignClient.getNodeTaskList(chooseUuids);
if (nodeTaskList.isSuccess()) {
uuids.addAll(nodeTaskList.getData().stream().map(AllNodeByProjectIdAndTypeResp::getUuid).toList());
log.info("获取节点下task的uudis:{}", uuids);
}
// 4、获取任务下的算列
SdmResponse<List<AllNodeByProjectIdAndTypeResp>> taskRunList = simuluationNodeFeignClient.getTaskRunList(chooseUuids);
if (taskRunList.isSuccess()) {
uuids.addAll(taskRunList.getData().stream().map(AllNodeByProjectIdAndTypeResp::getUuid).toList());
@@ -336,6 +336,149 @@ public class DimensionTemplateServiceImpl extends ServiceImpl<DimensionTemplateM
return SdmResponse.success(mergedResult);
}
private List<String> getTaskByTagReq(TagReq tagReq, List<List<String>> displayTagLevels, int currentLevelIndex) {
LambdaQueryChainWrapper<FileMetadataInfo> wrapper = new LambdaQueryChainWrapper<>(fileMetadataInfoService.getBaseMapper());
// 查task
wrapper.eq(FileMetadataInfo::getRelatedResourceUuidOwnType, NodeTypeEnum.TASK.getValue());
// tag1-tag10 可能是逗号拼接链，按完整 token 命中
if (ObjectUtils.isNotEmpty(tagReq)) {
inByCurrentLevelCsv(wrapper, FileMetadataInfo::getTag1, tagReq.getTag1());
inByCurrentLevelCsv(wrapper, FileMetadataInfo::getTag2, tagReq.getTag2());
inByCurrentLevelCsv(wrapper, FileMetadataInfo::getTag3, tagReq.getTag3());
inByCurrentLevelCsv(wrapper, FileMetadataInfo::getTag4, tagReq.getTag4());
inByCurrentLevelCsv(wrapper, FileMetadataInfo::getTag5, tagReq.getTag5());
inByCurrentLevelCsv(wrapper, FileMetadataInfo::getTag6, tagReq.getTag6());
inByCurrentLevelCsv(wrapper, FileMetadataInfo::getTag7, tagReq.getTag7());
inByCurrentLevelCsv(wrapper, FileMetadataInfo::getTag8, tagReq.getTag8());
inByCurrentLevelCsv(wrapper, FileMetadataInfo::getTag9, tagReq.getTag9());
inByCurrentLevelCsv(wrapper, FileMetadataInfo::getTag10, tagReq.getTag10());
}
List<FileMetadataInfo> taskInfos = wrapper.list();
if (CollectionUtils.isEmpty(taskInfos)) {
return Collections.emptyList();
}
// 仅展示“应挂在当前展开层级”的任务：
// deepestMatchedLevel == currentLevelIndex 时才展示，避免任务提前出现在上层。
return taskInfos.stream()
.filter(task -> getDeepestMatchedLevel(task, displayTagLevels) == currentLevelIndex)
.sorted(Comparator
.comparing(FileMetadataInfo::getCreateTime, Comparator.nullsLast(LocalDateTime::compareTo)).reversed()
.thenComparing(FileMetadataInfo::getOriginalName, Comparator.nullsLast(String::compareTo))
.thenComparing(FileMetadataInfo::getId, Comparator.nullsLast(Long::compareTo)))
.map(FileMetadataInfo::getRelatedResourceUuid)
.filter(StringUtils::isNotBlank)
.distinct()
.toList();
}
/**
* tag 字段可能存为 "a,b,c"。
* 只查询当前节点下的任务，对于连续的节点类型，机台1下又是机台2的展示，机台1的任务只能挂机台1下，机台2的任务只能挂机台2下展示
* 连续的机台一定会在数据总览中展开的，所以不存在只有机台1，没有机台2的情况，这时候不需要考虑如果机台2不存在，任务2需要挂在机台1下展示
* 1) column = v
* 3) column LIKE '%,v' （结尾）
*/
private <R> void inByCurrentLevelCsv(LambdaQueryChainWrapper<FileMetadataInfo> wrapper,
SFunction<FileMetadataInfo, R> column,
String csvValue) {
List<String> values = parseCsv(csvValue);
if (CollectionUtils.isEmpty(values)) {
return;
}
wrapper.and(q -> {
for (int i = 0; i < values.size(); i++) {
String value = values.get(i);
if (i > 0) {
q.or();
}
q.eq(column, value).or().likeLeft(column, "," + value);
}
});
}
private List<String> parseCsv(String value) {
if (StringUtils.isBlank(value)) {
return Collections.emptyList();
}
return Arrays.stream(value.split(","))
.map(String::trim)
.filter(StringUtils::isNotBlank)
.distinct()
.toList();
}
/**
* 将展示维度节点类型顺序映射为 tag 顺序（如：tag1-tag2-tag4-tag3）
* 一层个可能是展示多个tag (tag1-tag2+tag3-tag4)
*/
private List<List<String>> buildDisplayTagLevels(List<List<String>> dimensionNodeTypeLevels) {
if (CollectionUtils.isEmpty(dimensionNodeTypeLevels)) {
return Collections.emptyList();
}
Map<String, String> nodeTypeToTagMap = tagMapService.getTagMapName();
List<List<String>> displayTagLevels = new ArrayList<>();
for (List<String> levelNodeTypes : dimensionNodeTypeLevels) {
if (CollectionUtils.isEmpty(levelNodeTypes)) {
continue;
}
List<String> levelTags = levelNodeTypes.stream()
.map(nodeTypeToTagMap::get)
.filter(StringUtils::isNotBlank)
.distinct()
.toList();
if (CollectionUtils.isNotEmpty(levelTags)) {
displayTagLevels.add(levelTags);
}
}
return displayTagLevels;
}
/**
* 计算任务在当前展示顺序下可命中的最深层级。
* 命中规则：从上往下逐层判断，该层任一tag命中即可继续；首次不命中即停止。
* 返回：最后命中层级索引；无命中返回 -1。
*/
private int getDeepestMatchedLevel(FileMetadataInfo task, List<List<String>> displayTagLevels) {
if (task == null || CollectionUtils.isEmpty(displayTagLevels)) {
return -1;
}
int deepestLevel = -1;
for (int level = 0; level < displayTagLevels.size(); level++) {
List<String> levelTags = displayTagLevels.get(level);
boolean levelMatched = CollectionUtils.isNotEmpty(levelTags) && levelTags.stream().anyMatch(tagKey ->
CollectionUtils.isNotEmpty(parseCsv(getTagValueByKey(task, tagKey)))
);
if (!levelMatched) {
break;
}
deepestLevel = level;
}
return deepestLevel;
}
private String getTagValueByKey(FileMetadataInfo task, String tagKey) {
if (task == null || StringUtils.isBlank(tagKey)) {
return null;
}
return switch (tagKey) {
case "tag1" -> task.getTag1();
case "tag2" -> task.getTag2();
case "tag3" -> task.getTag3();
case "tag4" -> task.getTag4();
case "tag5" -> task.getTag5();
case "tag6" -> task.getTag6();
case "tag7" -> task.getTag7();
case "tag8" -> task.getTag8();
case "tag9" -> task.getTag9();
case "tag10" -> task.getTag10();
default -> null;
};
}
/**
* 递归获取维度模板中指定节点的下一层级子节点UUID。
* <p>
@@ -776,6 +919,7 @@ public class DimensionTemplateServiceImpl extends ServiceImpl<DimensionTemplateM
GetSimulationNodeTreeReq getSimulationNodeTreeReq = new GetSimulationNodeTreeReq();
getSimulationNodeTreeReq.setDimensionTemplateId(req.getDimensionTemplateId());
getSimulationNodeTreeReq.setFileIds(null);
getSimulationNodeTreeReq.setTagReq(req.getTagReq());
SdmResponse<List<FileMetadataChildrenDTO>> nodeDirInfos = getSimulationNodeTree(getSimulationNodeTreeReq);
List<Long> dirInfos = extractDirIdsFromResponse(nodeDirInfos);
@@ -790,6 +934,7 @@ public class DimensionTemplateServiceImpl extends ServiceImpl<DimensionTemplateM
GetSimulationNodeTreeReq getSimulationNodeTreeReq = new GetSimulationNodeTreeReq();
getSimulationNodeTreeReq.setDimensionTemplateId(req.getDimensionTemplateId());
getSimulationNodeTreeReq.setFileIds(req.getFileIds());
getSimulationNodeTreeReq.setTagReq(req.getTagReq());
SdmResponse<List<FileMetadataChildrenDTO>> nodeDirInfos = getSimulationNodeTree(getSimulationNodeTreeReq);
List<Long> dirInfos = extractDirIdsFromResponse(nodeDirInfos);

6
project/src/main/java/com/sdm/project/controller/SimulationNodeController.java
View File

@@ -195,7 +195,7 @@ public class SimulationNodeController implements ISimulationNodeFeignClient {
/**
* 所有项目的人员任务完成情况统计
* 涉及 simulation_task
* 只统计 负责人、执行人
* 只统计 执行人
* simulation_task_member MemberTypeEnum.PRINCIPAL 负责人/ MemberTypeEnum.EXECUTOR 仿真执行人
*/
@PostMapping("/getAllUserTaskCompleteStatistics")
@@ -221,7 +221,7 @@ public class SimulationNodeController implements ISimulationNodeFeignClient {
* 用户组任务完成情况统计
* 涉及 simulation_task.exe_status
*
* 只统计 负责人、执行人
* 只统计 执行人
* simulation_task_member MemberTypeEnum.PRINCIPAL 负责人/ MemberTypeEnum.EXECUTOR 仿真执行人
*
* 需要传：
@@ -240,7 +240,7 @@ public class SimulationNodeController implements ISimulationNodeFeignClient {
* 用户组难度系数统计
* 涉及 simulation_task.difficult
*
* 只统计 负责人、执行人
* 只统计 执行人
* simulation_task_member MemberTypeEnum.PRINCIPAL 负责人/ MemberTypeEnum.EXECUTOR 仿真执行人
*
*

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

@@ -2613,7 +2613,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
log.info("getAllNodeByProjectIdAndType sameTypeChildren size:{}, currentNodeType:{}, inputUuidsSize:{}",
sameTypeChildren.size(), currentNodeType, uuids.size());
Set<String> matchedParentUuids = sameTypeChildren.stream()
/*Set<String> matchedParentUuids = sameTypeChildren.stream()
.map(SimulationNode::getParentId)
.filter(StringUtils::isNotBlank)
.collect(Collectors.toSet());
@@ -2622,7 +2622,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
.filter(uuid -> !matchedParentUuids.contains(uuid))
.toList();
log.info("getAllNodeByProjectIdAndType remainingUuids size:{}, matchedParentUuids size:{}",
remainingUuids.size(), matchedParentUuids.size());
remainingUuids.size(), matchedParentUuids.size());*/
List<SimulationNode> simulationNodeList = new ArrayList<>(sameTypeChildren);
@@ -2635,47 +2635,41 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
return SdmResponse.success(buildNodeRespList(simulationNodeList));
}
if (CollectionUtils.isNotEmpty(remainingUuids)) {
String currentNodeTag = tagMap.get(currentNodeType);
String nextNodeTag = tagMap.get(nextNodeType);
if (StringUtils.isBlank(currentNodeTag) || StringUtils.isBlank(nextNodeTag)) {
log.error("节点类型未配置tag映射,currentNodeType:{},nextNodeType:{}", currentNodeType, nextNodeType);
if (CollectionUtils.isEmpty(simulationNodeList)) {
return SdmResponse.success();
}
// 再查询指定 nextNodeType 类型节点
String currentNodeTag = tagMap.get(currentNodeType);
String nextNodeTag = tagMap.get(nextNodeType);
if (StringUtils.isBlank(currentNodeTag) || StringUtils.isBlank(nextNodeTag)) {
log.error("节点类型未配置tag映射,currentNodeType:{},nextNodeType:{}", currentNodeType, nextNodeType);
if (CollectionUtils.isEmpty(simulationNodeList)) {
return SdmResponse.success();
}
} else {
// 规则1：剩余节点不能直接拿uuid去匹配tag，必须先取出当前层对应的tag值（兼容tag链路逗号拼接）
List<String> currentTagValues = extractTagValuesByNodeTag(currentNodes, currentNodeTag);
if (CollectionUtils.isEmpty(currentTagValues)) {
log.info("getAllNodeByProjectIdAndType currentTagValues empty, currentNodeTag:{}, remainingUuidsSize:{}",
currentNodeTag, uuids.size());
} else {
// 规则1：剩余节点不能直接拿uuid去匹配tag，必须先取出当前层对应的tag值（兼容tag链路逗号拼接）
List<String> currentTagValues = extractTagValuesByNodeTag(currentNodes, remainingUuids, currentNodeTag);
if (CollectionUtils.isEmpty(currentTagValues)) {
log.info("getAllNodeByProjectIdAndType currentTagValues empty, currentNodeTag:{}, remainingUuidsSize:{}",
currentNodeTag, remainingUuids.size());
} else {
// 规则2：按当前层tag值定位同链路节点，再映射到下一层tag值并反查uuid
List<SimulationNode> matchedChainNodes = queryNodesByCurrentTagValues(currentNodeTag, currentTagValues);
List<String> preUUids = matchedChainNodes.stream()
.map(simulationNode -> resolveTagValue(simulationNode, nextNodeTag))
.filter(StringUtils::isNotBlank)
.map(tag-> {
return tag.split(",")[0];
})
.toList();
// 规则2：按当前层tag值定位同链路节点，再映射到下一层tag值并反查uuid
List<SimulationNode> matchedChainNodes = queryNodesByCurrentTagValues(currentNodeTag, currentTagValues);
List<String> preUUids = matchedChainNodes.stream()
.map(simulationNode -> resolveTagValue(simulationNode, nextNodeTag))
.filter(StringUtils::isNotBlank)
.map(tag -> {
return tag.split(",")[0];
})
.toList();
List<SimulationNode> preSimulationNodeList = CollectionUtils.isEmpty(preUUids)
? Collections.emptyList()
: this.lambdaQuery().in(SimulationNode::getUuid, preUUids).list();
simulationNodeList.addAll(preSimulationNodeList);
// 规则3：同时保留原有“按nextNodeType正向查下一层”能力
/* List<SimulationNode> nextTypeNodeList = matchedChainNodes.stream()
.filter(node -> StringUtils.equals(node.getNodeType(), nextNodeType))
.toList();
simulationNodeList.addAll(nextTypeNodeList);
*/
log.info("getAllNodeByProjectIdAndType matchedChainNodes size:{}, nextNodeType:{}",
matchedChainNodes.size(), nextNodeType);
}
List<SimulationNode> preSimulationNodeList = CollectionUtils.isEmpty(preUUids)
? Collections.emptyList()
: this.lambdaQuery().in(SimulationNode::getUuid, preUUids).list();
simulationNodeList.addAll(preSimulationNodeList);
log.info("getAllNodeByProjectIdAndType matchedChainNodes size:{}, nextNodeType:{}",
matchedChainNodes.size(), nextNodeType);
}
}
if (CollectionUtils.isEmpty(simulationNodeList)) {
return SdmResponse.success();
}
@@ -2690,9 +2684,8 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
* 2) 提取的是 tag 字段值，不是 uuid，兼容 tag4 这类“逗号拼接链路”场景；
* 3) 统一去空和去重，减少后续 in 查询的数据量。
*/
private List<String> extractTagValuesByNodeTag(List<SimulationNode> currentNodes, List<String> remainingUuids, String currentNodeTag) {
private List<String> extractTagValuesByNodeTag(List<SimulationNode> currentNodes, String currentNodeTag) {
return currentNodes.stream()
.filter(node -> remainingUuids.contains(node.getUuid()))
.map(node -> resolveTagValue(node, currentNodeTag))
.filter(StringUtils::isNotBlank)
.distinct()
@@ -2903,7 +2896,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
req.setUserIds(userIds);
List<UserGroupTaskCompleteVo> userGroupTaskCompleteStatistics = this.baseMapper.getUserGroupTaskCompleteStatistics(req,Arrays.asList(MemberTypeEnum.PRINCIPAL.getCode(),MemberTypeEnum.EXECUTOR.getCode()));
List<UserGroupTaskCompleteVo> userGroupTaskCompleteStatistics = this.baseMapper.getUserGroupTaskCompleteStatistics(req,Arrays.asList(MemberTypeEnum.EXECUTOR.getCode()));
// 按用户分组统计任务状态
Map<Long, UserGroupTaskCompleteStatisticsVo> userStatisticsMap = new HashMap<>();
@@ -2959,7 +2952,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
userId2Nickname = new HashMap<>();
}
List<UserGroupTaskCompleteVo> userGroupTaskCompleteStatistics = this.baseMapper.getAllUserTaskCompleteStatistics(req,Arrays.asList(MemberTypeEnum.PRINCIPAL.getCode(),MemberTypeEnum.EXECUTOR.getCode()));
List<UserGroupTaskCompleteVo> userGroupTaskCompleteStatistics = this.baseMapper.getAllUserTaskCompleteStatistics(req,Arrays.asList(MemberTypeEnum.EXECUTOR.getCode()));
// 按用户分组统计任务状态
Map<Long, UserGroupTaskCompleteStatisticsVo> userStatisticsMap = new HashMap<>();
@@ -3010,7 +3003,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
}
req.setUserIds(userIds);
List<UserGroupDifficultyVo> userGroupDifficultyStatistics = this.baseMapper.getUserGroupDifficultyStatistics(req,Arrays.asList(MemberTypeEnum.PRINCIPAL.getCode(),MemberTypeEnum.EXECUTOR.getCode()));
List<UserGroupDifficultyVo> userGroupDifficultyStatistics = this.baseMapper.getUserGroupDifficultyStatistics(req,Arrays.asList(MemberTypeEnum.EXECUTOR.getCode()));
// 按用户分组统计任务状态
Map<Long, UserGroupDifficultyStatisticsVo> userStatisticsMap = new HashMap<>();