From 8f64eea1327d2ba6002d01d5fb3c80a473ebba4d Mon Sep 17 00:00:00 2001 From: gulongcheng <474084054@qq.com> Date: Tue, 10 Mar 2026 16:30:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=95=B0=E6=8D=AE=E6=80=BB=E8=A7=88?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=A1=B9=E7=9B=AE=E7=BC=96=E7=A0=81=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/SimulationNodeFeignClientImpl.java | 6 +++--- .../project/ISimulationNodeFeignClient.java | 2 +- .../model/req/GetSimulationNodeTreeReq.java | 6 ++++++ .../impl/DimensionTemplateServiceImpl.java | 2 +- .../controller/SimulationNodeController.java | 4 ++-- .../sdm/project/dao/SimulationNodeMapper.java | 2 ++ .../com/sdm/project/service/INodeService.java | 2 +- .../project/service/impl/NodeServiceImpl.java | 8 ++------ .../resources/mapper/SimulationNodeMapper.xml | 18 ++++++++++++++++++ 9 files changed, 36 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/com/sdm/common/feign/impl/project/SimulationNodeFeignClientImpl.java b/common/src/main/java/com/sdm/common/feign/impl/project/SimulationNodeFeignClientImpl.java index 799a7294..45cb2f8b 100644 --- a/common/src/main/java/com/sdm/common/feign/impl/project/SimulationNodeFeignClientImpl.java +++ b/common/src/main/java/com/sdm/common/feign/impl/project/SimulationNodeFeignClientImpl.java @@ -28,11 +28,11 @@ public class SimulationNodeFeignClientImpl implements ISimulationNodeFeignClient * @param nodeId 节点ID * @return SdmResponse> key 为节点id，value 为节点名称 */ - public SdmResponse> getAllNodeByNodeType(Long nodeId, String nodeType) { + public SdmResponse> getAllNodeByNodeType(Long nodeId, String nodeType, String keyword) { SdmResponse> response; try { - log.info("根据节点类型和节点ID获取所有节点信息请求参数：nodeId={}, nodeType={}", nodeId, nodeType); - response = simulationNodeFeignClient.getAllNodeByNodeType(nodeId, nodeType); + log.info("根据节点类型和节点ID获取所有节点信息请求参数：nodeId={}, nodeType={}, keyword={}", nodeId, nodeType, keyword); + response = simulationNodeFeignClient.getAllNodeByNodeType(nodeId, nodeType, keyword); if (!response.isSuccess() || response.getData() == null || response.getData().isEmpty()) { return SdmResponse.failed("获取节点信息失败"); } diff --git a/common/src/main/java/com/sdm/common/feign/inter/project/ISimulationNodeFeignClient.java b/common/src/main/java/com/sdm/common/feign/inter/project/ISimulationNodeFeignClient.java index 7de692f1..1c371cf2 100644 --- a/common/src/main/java/com/sdm/common/feign/inter/project/ISimulationNodeFeignClient.java +++ b/common/src/main/java/com/sdm/common/feign/inter/project/ISimulationNodeFeignClient.java @@ -26,7 +26,7 @@ public interface ISimulationNodeFeignClient { * @return SdmResponse> */ @GetMapping("/node/getAllNodeByNodeType") - SdmResponse> getAllNodeByNodeType(@RequestParam(value = "nodeId", required = false) Long nodeId, @RequestParam(value = "nodeType") String nodeType); + SdmResponse> getAllNodeByNodeType(@RequestParam(value = "nodeId", required = false) Long nodeId, @RequestParam(value = "nodeType") String nodeType, @RequestParam(value = "keyword", required = false) String keyword); /** * 根据项目ID和节点类型获取所有节点信息 diff --git a/data/src/main/java/com/sdm/data/model/req/GetSimulationNodeTreeReq.java b/data/src/main/java/com/sdm/data/model/req/GetSimulationNodeTreeReq.java index fb71576f..77b37cce 100644 --- a/data/src/main/java/com/sdm/data/model/req/GetSimulationNodeTreeReq.java +++ b/data/src/main/java/com/sdm/data/model/req/GetSimulationNodeTreeReq.java @@ -19,4 +19,10 @@ public class GetSimulationNodeTreeReq { * 聚合文件ID列表 */ private List fileIds; + + /** + * 项目名称/编码关键字（模糊查询） + */ + @Schema(description = "项目名称/编码关键字") + private String keyword; } diff --git a/data/src/main/java/com/sdm/data/service/impl/DimensionTemplateServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/DimensionTemplateServiceImpl.java index 51e1d116..fe57be94 100644 --- a/data/src/main/java/com/sdm/data/service/impl/DimensionTemplateServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/DimensionTemplateServiceImpl.java @@ -236,7 +236,7 @@ public class DimensionTemplateServiceImpl extends ServiceImpl rootNodeTypes = dimensionNodeTypeLevels.get(0); for (String rootNodeType : rootNodeTypes) { - SdmResponse> allNodeByNodeTypeResponse = simuluationNodeFeignClient.getAllNodeByNodeType(null, rootNodeType); + SdmResponse> allNodeByNodeTypeResponse = simuluationNodeFeignClient.getAllNodeByNodeType(null, rootNodeType, req.getKeyword()); if (!allNodeByNodeTypeResponse.isSuccess()) { log.error("获取节点信息失败,nodeType:{}", rootNodeType); diff --git a/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java b/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java index c2461529..12010cf9 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java @@ -156,8 +156,8 @@ public class SimulationNodeController implements ISimulationNodeFeignClient { */ @GetMapping("/getAllNodeByNodeType") @Operation(summary = "根据节点类型获取所有节点", description = "根据节点类型获取所有节点") - public SdmResponse> getAllNodeByNodeType(@Parameter(description = "节点id") @RequestParam(value = "nodeId", required = false) Long nodeId, @RequestParam(value = "nodeType") String nodeType) { - return nodeService.getAllNodeByBodeType(nodeType, nodeId); + public SdmResponse> getAllNodeByNodeType(@Parameter(description = "节点id") @RequestParam(value = "nodeId", required = false) Long nodeId, @RequestParam(value = "nodeType") String nodeType, @RequestParam(value = "keyword", required = false) String keyword) { + return nodeService.getAllNodeByBodeType(nodeType, nodeId, keyword); } /** diff --git a/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java b/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java index 066e5764..3bcd8331 100644 --- a/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java +++ b/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java @@ -121,4 +121,6 @@ public interface SimulationNodeMapper extends BaseMapper { List getNodeMemberListByMemberType(@Param("nodeIdList") List nodeIdList,@Param("userId") Long userId,@Param("memberType") Integer memberType); ListgetEncNodeListByTaskId(@Param("taskId") String taskId); + + List getAllNodeByNodeTypeWithKeyword(@Param("nodeType") String nodeType, @Param("nodeId") Long nodeId, @Param("keyword") String keyword); } diff --git a/project/src/main/java/com/sdm/project/service/INodeService.java b/project/src/main/java/com/sdm/project/service/INodeService.java index f2061a60..0e93c109 100644 --- a/project/src/main/java/com/sdm/project/service/INodeService.java +++ b/project/src/main/java/com/sdm/project/service/INodeService.java @@ -38,7 +38,7 @@ public interface INodeService extends IService { SdmResponse batchUpdateWorkspaceExtra(BatchUpdateWorkspaceExtraReq req); - SdmResponse> getAllNodeByBodeType(String nodeType, Long nodeId); + SdmResponse> getAllNodeByBodeType(String nodeType, Long nodeId, String keyword); SdmResponse> getAllNodeByProjectIdAndType(List uuids, String nextNodeType); 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 51a8e0e1..9be1e4e3 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 @@ -2278,14 +2278,10 @@ public class NodeServiceImpl extends ServiceImpl> getAllNodeByBodeType(String nodeType, Long nodeId) { + public SdmResponse> getAllNodeByBodeType(String nodeType, Long nodeId, String keyword) { try { List allNodeByProjectIdAndTypeRespList = new ArrayList<>(); - List nodeList = this.lambdaQuery() - .eq(ObjectUtils.isNotEmpty(nodeId), SimulationNode::getId, nodeId) - .eq(ObjectUtils.isNotEmpty(nodeType), SimulationNode::getNodeType, nodeType) - .orderByDesc(SimulationNode::getCreateTime) - .list(); + List nodeList = nodeMapper.getAllNodeByNodeTypeWithKeyword(nodeType, nodeId, keyword); if (CollectionUtils.isEmpty(nodeList)) { return SdmResponse.failed("未找到节点"); } diff --git a/project/src/main/resources/mapper/SimulationNodeMapper.xml b/project/src/main/resources/mapper/SimulationNodeMapper.xml index fbb48309..ccc448e7 100644 --- a/project/src/main/resources/mapper/SimulationNodeMapper.xml +++ b/project/src/main/resources/mapper/SimulationNodeMapper.xml @@ -920,5 +920,23 @@ AND t1.tag5 IS NOT NULL + + \ No newline at end of file