diff --git a/common/src/main/java/com/sdm/common/entity/req/data/TagReq.java b/common/src/main/java/com/sdm/common/entity/req/data/TagReq.java index c389d5cf..ccc27c46 100644 --- a/common/src/main/java/com/sdm/common/entity/req/data/TagReq.java +++ b/common/src/main/java/com/sdm/common/entity/req/data/TagReq.java @@ -15,72 +15,108 @@ public class TagReq { @Schema(description = "标签1") private String tag1; + @Schema(description = "标签1编号") + private String tag1Code; + @Schema(description = "标签1名称") private String tag1Name; @Schema(description = "标签2") private String tag2; + @Schema(description = "标签2编号") + private String tag2Code; + @Schema(description = "标签2名称") private String tag2Name; @Schema(description = "标签3") private String tag3; + @Schema(description = "标签3编号") + private String tag3Code; + @Schema(description = "标签3名称") private String tag3Name; @Schema(description = "标签4") private String tag4; + @Schema(description = "标签4编号") + private String tag4Code; + @Schema(description = "标签4名称") private String tag4Name; @Schema(description = "标签5") private String tag5; + @Schema(description = "标签5编号") + private String tag5Code; + @Schema(description = "标签5名称") private String tag5Name; @Schema(description = "标签6") private String tag6; + @Schema(description = "标签6编号") + private String tag6Code; + @Schema(description = "标签6名称") private String tag6Name; @Schema(description = "标签7") private String tag7; + @Schema(description = "标签7编号") + private String tag7Code; + @Schema(description = "标签7名称") private String tag7Name; @Schema(description = "标签8") private String tag8; + @Schema(description = "标签8编号") + private String tag8Code; + @Schema(description = "标签8名称") private String tag8Name; @Schema(description = "标签9") private String tag9; + @Schema(description = "标签9编号") + private String tag9Code; + @Schema(description = "标签9名称") private String tag9Name; @Schema(description = "标签10") private String tag10; + @Schema(description = "标签10编号") + private String tag10Code; + @Schema(description = "标签10名称") private String tag10Name; @Schema(description= "任务ID") private String taskId; + @Schema(description= "任务编号") + private String taskCode; + @Schema(description= "任务名称") private String taskName; @Schema(description= "算例ID") private String runId; + @Schema(description= "算例编号") + private String runCode; + @Schema(description= "算例名称") private String runName; } diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmMergeQueryNodeReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmMergeQueryNodeReq.java index f7f38aa6..79635a2e 100644 --- a/project/src/main/java/com/sdm/project/model/req/SpdmMergeQueryNodeReq.java +++ b/project/src/main/java/com/sdm/project/model/req/SpdmMergeQueryNodeReq.java @@ -10,4 +10,8 @@ public class SpdmMergeQueryNodeReq { @Schema(description = "查询类型") private String type; + // 返回值类型:1-name,2-code + @Schema(description = "返回值类型") + private Integer resultType = 1; + } 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 f68a70f7..dcab0fff 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 @@ -1288,7 +1288,8 @@ public class TaskServiceImpl implements ITaskService { // 通用的标签设置方法 private void setTagField(TagReq tagReq, String tagValue, String tagName, BiConsumer tagSetter, - BiConsumer tagNameSetter) { + BiConsumer tagNameSetter, + BiConsumer tagCodeSetter) { if (tagValue != null) { tagSetter.accept(tagReq, tagValue); } @@ -1300,18 +1301,19 @@ public class TaskServiceImpl implements ITaskService { private void fillTaskTagReq(List newTaskList) { for (SpdmNewTaskVo spdmNewTaskVo : newTaskList) { TagReq tagReq = new TagReq(); - setTagField(tagReq, spdmNewTaskVo.getNewTag1(), spdmNewTaskVo.getTag1(), TagReq::setTag1, TagReq::setTag1Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag2(), spdmNewTaskVo.getTag2(), TagReq::setTag2, TagReq::setTag2Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag3(), spdmNewTaskVo.getTag3(), TagReq::setTag3, TagReq::setTag3Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag4(), spdmNewTaskVo.getTag4(), TagReq::setTag4, TagReq::setTag4Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag5(), spdmNewTaskVo.getTag5(), TagReq::setTag5, TagReq::setTag5Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag6(), spdmNewTaskVo.getTag6(), TagReq::setTag6, TagReq::setTag6Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag7(), spdmNewTaskVo.getTag7(), TagReq::setTag7, TagReq::setTag7Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag8(), spdmNewTaskVo.getTag8(), TagReq::setTag8, TagReq::setTag8Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag9(), spdmNewTaskVo.getTag9(), TagReq::setTag9, TagReq::setTag9Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag10(), spdmNewTaskVo.getTag10(), TagReq::setTag10, TagReq::setTag10Name); + setTagField(tagReq, spdmNewTaskVo.getNewTag1(), spdmNewTaskVo.getTag1(), TagReq::setTag1, TagReq::setTag1Name, TagReq::setTag1Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag2(), spdmNewTaskVo.getTag2(), TagReq::setTag2, TagReq::setTag2Name, TagReq::setTag2Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag3(), spdmNewTaskVo.getTag3(), TagReq::setTag3, TagReq::setTag3Name, TagReq::setTag3Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag4(), spdmNewTaskVo.getTag4(), TagReq::setTag4, TagReq::setTag4Name, TagReq::setTag4Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag5(), spdmNewTaskVo.getTag5(), TagReq::setTag5, TagReq::setTag5Name, TagReq::setTag5Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag6(), spdmNewTaskVo.getTag6(), TagReq::setTag6, TagReq::setTag6Name, TagReq::setTag6Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag7(), spdmNewTaskVo.getTag7(), TagReq::setTag7, TagReq::setTag7Name, TagReq::setTag7Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag8(), spdmNewTaskVo.getTag8(), TagReq::setTag8, TagReq::setTag8Name,TagReq::setTag8Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag9(), spdmNewTaskVo.getTag9(), TagReq::setTag9, TagReq::setTag9Name, TagReq::setTag9Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag10(), spdmNewTaskVo.getTag10(), TagReq::setTag10, TagReq::setTag10Name, TagReq::setTag10Code); tagReq.setTaskId(spdmNewTaskVo.getUuid()); tagReq.setTaskName(spdmNewTaskVo.getTaskName()); + tagReq.setTaskCode(spdmNewTaskVo.getTaskCode()); spdmNewTaskVo.setTagReq(tagReq); } } @@ -5000,6 +5002,7 @@ public class TaskServiceImpl implements ITaskService { if (MapUtils.isEmpty(tagMap)) { return SdmResponse.failed("未查询到节点标签的配置"); } + Integer resultType = req.getResultType(); List mergeQueryRespList = new ArrayList<>(); // 如果是任务或算例就传:task或run,其他的传tag1到tag10 String type = req.getType(); @@ -5023,7 +5026,12 @@ public class TaskServiceImpl implements ITaskService { } if (MERGE_QUERY_TASK.equals(type)) { // 查询任务 - Map> taskMap = taskVoList.stream().collect(Collectors.groupingBy(SpdmNewTaskVo::getTaskName)); + Map> taskMap; + if (resultType == 1) { + taskMap = taskVoList.stream().collect(Collectors.groupingBy(SpdmNewTaskVo::getTaskName)); + }else { + taskMap = taskVoList.stream().collect(Collectors.groupingBy(SpdmNewTaskVo::getTaskCode)); + } for (Map.Entry> taskEntry : taskMap.entrySet()) { NodeMergeQueryResp taskMergeQueryResp = new NodeMergeQueryResp(); taskMergeQueryResp.setName(taskEntry.getKey()); @@ -5057,7 +5065,12 @@ public class TaskServiceImpl implements ITaskService { if (CollectionUtils.isEmpty(nodeList)) { return SdmResponse.success(Collections.emptyList()); } - Map> nodeMap = nodeList.stream().collect(Collectors.groupingBy(SimulationNode::getNodeName)); + Map> nodeMap; + if (resultType == 1) { + nodeMap = nodeList.stream().filter(node -> StringUtils.isNotBlank(node.getNodeName())).collect(Collectors.groupingBy(SimulationNode::getNodeName)); + }else { + nodeMap = nodeList.stream().filter(node -> StringUtils.isNotBlank(node.getNodeCode())).collect(Collectors.groupingBy(SimulationNode::getNodeCode)); + } for (Map.Entry> nodeEntry : nodeMap.entrySet()) { NodeMergeQueryResp nodeMergeQueryResp = new NodeMergeQueryResp(); nodeMergeQueryResp.setName(nodeEntry.getKey());