提交 2e8e1b19 authored 作者: mry's avatar mry

fix(web): 修复了,url查询无效的问题

上级 8300717c
...@@ -124,7 +124,8 @@ public class SwaggerController { ...@@ -124,7 +124,8 @@ public class SwaggerController {
Object summary = objRequestMaps.get("summary"); Object summary = objRequestMaps.get("summary");
List<Parameter> parameterAllList = new ArrayList<>(); List<Parameter> parameterAllList = new ArrayList<>();
InterfaceInformation interfaceInformation = new InterfaceInformation(); InterfaceInformation interfaceInformation = new InterfaceInformation();
@SuppressWarnings(value = "all") List<String> parameterLists = parameters == null ? new ArrayList<>() : (List<String>) parameters; @SuppressWarnings(value = "all")
List<String> parameterLists = parameters == null ? new ArrayList<>() : (List<String>) parameters;
for (Object parameterList : parameterLists) { for (Object parameterList : parameterLists) {
@SuppressWarnings(value = "unchecked") Map<String, String> parameterMaps = (Map<String, String>) parameterList; @SuppressWarnings(value = "unchecked") Map<String, String> parameterMaps = (Map<String, String>) parameterList;
String methodIn = parameterMaps.get("in"); String methodIn = parameterMaps.get("in");
...@@ -154,40 +155,46 @@ public class SwaggerController { ...@@ -154,40 +155,46 @@ public class SwaggerController {
} }
/** /**
* 快速添加接口 * 查询快速添加的接口
* *
* @param projectId 项目id * @param projectId 项目id
* @param id 环境id * @param id 环境id
* @param pageSize 每页多少条数据 * @param pageSize 每页多少条数据
* @param pageNum 当前第几页 * @param pageNum 当前第几页
* @param name 查询条件: 标签名称 * @param name 查询条件: 标签名称
* @param swaggerUrl 查询条件: 方法的url * @param url 查询条件: 方法的url
* @return Swagger中的数据 * @return Swagger中的数据
*/ */
@GetMapping @GetMapping
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@ApiOperation(value = "快速添加接口") @ApiOperation(value = "查询快速添加的接口")
public CommonPage<List<InterfaceInformation>> parameter(Long projectId, Long id, @RequestParam(defaultValue = "10") int pageSize, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(required = false, defaultValue = "") String name, @RequestParam(required = false, defaultValue = "") String swaggerUrl) { public CommonPage<List<InterfaceInformation>> parameter(
Long projectId,
Long id,
@RequestParam(defaultValue = "10") int pageSize,
@RequestParam(defaultValue = "1") int pageNum,
@RequestParam(required = false, defaultValue = "") String name,
@RequestParam(required = false, defaultValue = "") String url) {
//将所有的默认选项置为false //将所有的默认选项置为false
environmentService.setIsDefaultByWrapper(false, Wrappers.lambdaQuery(Environment.class).eq(Environment::getProjectId, projectId)); environmentService.setIsDefaultByWrapper(false, Wrappers.lambdaQuery(Environment.class).eq(Environment::getProjectId, projectId));
//将选中的环境置为true,后续默认选择这个环境 //将选中的环境置为true,后续默认选择这个环境
environmentService.setIsDefaultByWrapper(true, Wrappers.lambdaQuery(Environment.class).eq(Environment::getId, id)); environmentService.setIsDefaultByWrapper(true, Wrappers.lambdaQuery(Environment.class).eq(Environment::getId, id));
Environment environment = environmentService.getById(id); Environment environment = environmentService.getById(id);
String url = String.format("%s/v2/api-docs", environment.getIp()); String swaggerUrl = String.format("%s/v2/api-docs", environment.getIp());
//获得json字符串 //获得json字符串
String json = loadJson(url); String json = loadJson(swaggerUrl);
List<InterfaceInformation> list = getList(json); List<InterfaceInformation> list = getList(json);
List<InterfaceInformation> swaggerUrlSearch; List<InterfaceInformation> swaggerUrlSearch;
List<InterfaceInformation> swaggerNameSearch; List<InterfaceInformation> swaggerNameSearch;
if ("".equals(swaggerUrl) && "".equals(name)) { if ("".equals(url) && "".equals(name)) {
swaggerNameSearch = list; swaggerNameSearch = list;
} else if (!"".equals(swaggerUrl) && "".equals(name)) { } else if (!"".equals(url) && "".equals(name)) {
swaggerUrlSearch = search(swaggerUrl, list); swaggerUrlSearch = search(url, list);
swaggerNameSearch = swaggerUrlSearch; swaggerNameSearch = swaggerUrlSearch;
} else if ("".equals(swaggerUrl) && !"".equals(name)) { } else if ("".equals(url) && !"".equals(name)) {
swaggerNameSearch = search(name, list); swaggerNameSearch = search(name, list);
} else { } else {
swaggerUrlSearch = search(swaggerUrl, list); swaggerUrlSearch = search(url, list);
swaggerNameSearch = search(name, swaggerUrlSearch); swaggerNameSearch = search(name, swaggerUrlSearch);
} }
int total = swaggerNameSearch.size(); int total = swaggerNameSearch.size();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论