fix:数据总览支持项目编码模糊查询,返回数据包含项目编码

This commit is contained in:
2026-03-11 10:07:21 +08:00
parent d8d49113f6
commit c293af38aa
7 changed files with 66 additions and 29 deletions

View File

@@ -0,0 +1,23 @@
package com.sdm.common.entity.req.project;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
/**
* 根据节点类型和 UUIDs 查询节点列表请求参数
*/
@Schema(description = "根据节点类型和 UUIDs 查询节点列表请求参数")
@Data
public class GetAllNodeByNodeTypeReq {
@Schema(description = "节点 UUID 列表", example = "[\"uuid1\", \"uuid2\"]")
private List<String> uuids;
@Schema(description = "节点类型", example = "PROJECT")
private String nodeType;
@Schema(description = "关键词", example = "测试")
private String keyword;
}

View File

@@ -2,6 +2,7 @@ package com.sdm.common.feign.impl.project;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.req.project.DelNodeReq;
import com.sdm.common.entity.req.project.GetAllNodeByNodeTypeReq;
import com.sdm.common.entity.req.project.SpdmNodeListReq;
import com.sdm.common.entity.req.project.SpdmQueryRunInfoListReq;
import com.sdm.common.entity.req.project.SpdmQueryRunListReq;
@@ -22,17 +23,17 @@ public class SimulationNodeFeignClientImpl implements ISimulationNodeFeignClient
ISimulationNodeFeignClient simulationNodeFeignClient;
/**
* 根据节点类型和节点ID获取所有节点信息
* 根据节点类型和节点 ID 获取所有节点信息Feign 接口方法)
*
* @param nodeType 节点类型
* @param uuids 节点ID
* @return SdmResponse<List<AllNodeByProjectIdAndTypeResp>> key 为节点idvalue 为节点名称
* @param req 查询请求参数
* @return SdmResponse<List<AllNodeByProjectIdAndTypeResp>> key 为节点 idvalue 为节点名称
*/
public SdmResponse<List<AllNodeByProjectIdAndTypeResp>> getAllNodeByNodeTypeAndUUidsWithKeyWord(List<String> uuids, String nodeType, String keyword) {
SdmResponse<List<AllNodeByProjectIdAndTypeResp>> response;
@Override
public SdmResponse<List<AllNodeByProjectIdAndTypeResp>> getAllNodeByNodeTypeAndUUidsWithKeyWord(GetAllNodeByNodeTypeReq req) {
SdmResponse<List<AllNodeByProjectIdAndTypeResp>> response;
try {
log.info("根据节点类型和节点ID获取所有节点信息请求参数uuids={}, nodeType={}, keyword={}", uuids, nodeType, keyword);
response = simulationNodeFeignClient.getAllNodeByNodeTypeAndUUidsWithKeyWord(uuids, nodeType, keyword);
log.info("根据节点类型和节点 ID 获取所有节点信息请求参数uuids={}, nodeType={}, keyword={}", req.getUuids(), req.getNodeType(), req.getKeyword());
response = simulationNodeFeignClient.getAllNodeByNodeTypeAndUUidsWithKeyWord(req);
if (!response.isSuccess() || response.getData() == null || response.getData().isEmpty()) {
return SdmResponse.failed("获取节点信息失败");
}

View File

@@ -2,6 +2,7 @@ package com.sdm.common.feign.inter.project;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.req.project.DelNodeReq;
import com.sdm.common.entity.req.project.GetAllNodeByNodeTypeReq;
import com.sdm.common.entity.req.project.SpdmNodeListReq;
import com.sdm.common.entity.req.project.SpdmQueryRunInfoListReq;
import com.sdm.common.entity.req.project.SpdmQueryRunListReq;
@@ -20,11 +21,11 @@ import java.util.List;
public interface ISimulationNodeFeignClient {
/**
* 根据节点类型获取所有节点
* @param nodeType 节点类型
* @param req 查询请求参数
* @return SdmResponse<List<AllNodeByProjectIdAndTypeResp>>
*/
@GetMapping("/node/getAllNodeByNodeType")
SdmResponse<List<AllNodeByProjectIdAndTypeResp>> getAllNodeByNodeTypeAndUUidsWithKeyWord(@RequestParam(value = "uuids", required = false) List<String> uuids, @RequestParam(value = "nodeType") String nodeType, @RequestParam(value = "keyword", required = false) String keyword);
@PostMapping("/node/getAllNodeByNodeType")
SdmResponse<List<AllNodeByProjectIdAndTypeResp>> getAllNodeByNodeTypeAndUUidsWithKeyWord(@RequestBody GetAllNodeByNodeTypeReq req);
/**
* 根据项目ID和节点类型获取所有节点信息