fix(web): 优化代码

kt-web/src/main/java/org/matrix/autotest/controller/SwaggerController.java

@@ -342,8 +342,8 @@ public class SwaggerController {
     /**
      * 获取所有的关联参数对象
      *
-     * @param swaggerJson swagger的json信息
-     * @return 所有的definitions
+     * @param swaggerJson swagger/v2/api的json信息
+     * @return 所有的definitions，传递的参数格式
      */
     public static Map<String, JSONObject> getDefinitions(JSONObject swaggerJson) {
         Map<String, JSONObject> map = new HashMap<>();
@@ -386,7 +386,7 @@ public class SwaggerController {
      *
      * @param name 查询条件: 标签名称
      * @param list 查询的集合
-     * @return 模糊查询的结果
+     * @return 根据tag模糊查询的结果
      */
     public List<PathInfoVo> tagSearch(String name, List<PathInfoVo> list) {
         @SuppressWarnings(value = "all") List<PathInfoVo> results = new ArrayList();
@@ -405,7 +405,7 @@ public class SwaggerController {
      *
      * @param name 查询条件: 接口名称
      * @param list 查询的集合
-     * @return 模糊查询的结果
+     * @return 根据summary模糊查询的结果
      */
     public List<PathInfoVo> nameSearch(String name, List<PathInfoVo> list) {
         @SuppressWarnings(value = "all") List<PathInfoVo> results = new ArrayList();
@@ -424,7 +424,7 @@ public class SwaggerController {
      *
      * @param name 查询条件: url
      * @param list 查询的集合
-     * @return 模糊查询的结果
+     * @return 根据url模糊查询的结果
      */
     public List<PathInfoVo> urlSearch(String name, List<PathInfoVo> list) {
         @SuppressWarnings(value = "all") List<PathInfoVo> results = new ArrayList();
@@ -473,27 +473,31 @@ public class SwaggerController {
         String json = loadJson(swaggerUrl);
         JSONObject swaggerJson = JSON.parseObject(json, Feature.DisableCircularReferenceDetect);
         List<PathInfoVo> list = getPathInfo(swaggerJson);
-        List<PathInfoVo> swaggerSearch;
+        List<PathInfoVo> swaggerSearch = list;
         List<PathInfoVo> swaggerUrlSearch;
         List<PathInfoVo> swaggerTagSearch;
-        if ("".equals(url) && "".equals(tag) && "".equals(name)) {
-            swaggerSearch = list;
-        } else if ("".equals(tag) && "".equals(name)) {
+        if ("".equals(tag) && "".equals(name)) {
             swaggerSearch = urlSearch(url, list);
-        } else if ("".equals(name) && "".equals(url)) {
+        }
+        if ("".equals(name) && "".equals(url)) {
             swaggerSearch = tagSearch(tag, list);
-        } else if ("".equals(url) && "".equals(tag)) {
+        }
+        if ("".equals(url) && "".equals(tag)) {
             swaggerSearch = nameSearch(name, list);
-        } else if ("".equals(name)) {
+        }
+        if ("".equals(name)) {
             swaggerUrlSearch = urlSearch(url, list);
             swaggerSearch = tagSearch(tag, swaggerUrlSearch);
-        } else if ("".equals(tag)) {
+        }
+        if ("".equals(tag)) {
             swaggerUrlSearch = urlSearch(url, list);
             swaggerSearch = nameSearch(name, swaggerUrlSearch);
-        } else if ("".equals(url)) {
+        }
+        if ("".equals(url)) {
             swaggerTagSearch = tagSearch(tag, list);
             swaggerSearch = nameSearch(name, swaggerTagSearch);
-        } else {
+        }
+        if (!"".equals(url) && !"".equals(tag) && !"".equals(name)){
             swaggerUrlSearch = urlSearch(url, list);
             swaggerTagSearch = tagSearch(tag, swaggerUrlSearch);
             swaggerSearch = nameSearch(name, swaggerTagSearch);