fix(web): 解决了,null值问题

kt-base/src/main/java/org/matrix/database/entity/Action.java

@@ -46,6 +46,4 @@ public class Action extends BaseEntity {
     @ApiModelProperty("环境参数id")
     private Long envId;
 
-
-
 }

kt-base/src/main/java/org/matrix/enums/ActionType.java

 package org.matrix.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.AllArgsConstructor;
-import lombok.Getter;
 
 /**
  * ActionType.
@@ -12,7 +12,6 @@ import lombok.Getter;
  * @since 2022/2/25 at 5:18 PM
  * Suffering is the most powerful teacher of life.
  */
-@Getter
 @AllArgsConstructor
 public enum ActionType {
 
@@ -40,4 +39,13 @@ public enum ActionType {
     private final int code;
 
     private final String des;
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDes() {
+        return des;
+    }
+
 }

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

@@ -87,28 +87,6 @@ public class ConnectController {
         return CommonResult.success(results, "查询成功");
     }
 
-    /**
-     * 分页查询所有数据库信息
-     *
-     * @param pageSize 每页多少条数据
-     * @param pageNum  当前第几页
-     * @param name     数据库名称
-     * @return 分页查询的结果, 数据库信息
-     */
-    @ApiOperation(value = "分页查询数据库信息")
-    @GetMapping("/condition")
-    public ResponseEntity<CommonResultObj<Page<Connect>>> findConditionConnects(
-            @RequestParam(defaultValue = "10") int pageSize,
-            @RequestParam(defaultValue = "1") int pageNum,
-            @RequestParam(required = false,defaultValue = "") String name) {
-        Page<Connect> results = Optional.ofNullable(connectService.page(Page.of(pageNum, pageSize)
-                , Wrappers.lambdaQuery(Connect.class)
-                        .like(StringUtils.hasLength(name)
-                                , Connect::getName, name))).orElse(new Page<>());
-        PageTools.pageTool(pageSize, pageNum, results);
-        return CommonResult.success(results, "查询成功");
-    }
-
     /**
      * 添加连接池
      *

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

@@ -59,30 +59,6 @@ public class DynamicVariableController {
         return CommonResult.success(results, "查询成功");
     }
 
-    /**
-     * 分页查询所有动参
-     *
-     * @param pageSize  每页多少条数据
-     * @param pageNum   当前第几页
-     * @param name      动参名称
-     * @param projectId 项目id
-     * @return 分页查询的结果, 动参
-     */
-    @ApiOperation(value = "分页查询动参")
-    @GetMapping("/condition/{projectId}")
-    public ResponseEntity<CommonResultObj<Page<DynamicVariable>>> findConditionConnects(
-            @RequestParam(defaultValue = "10") int pageSize,
-            @RequestParam(defaultValue = "1") int pageNum,
-            @RequestParam(required = false,defaultValue = "")String name,
-            @PathVariable Long projectId) {
-        Page<DynamicVariable> results = Optional.ofNullable(dynamicVariableService.page(Page.of(pageNum, pageSize)
-                , Wrappers.lambdaQuery(DynamicVariable.class).eq(DynamicVariable::getProjectId, projectId)
-                        .like(StringUtils.hasLength(name)
-                                , DynamicVariable::getName, name))).orElse(new Page<>());
-        PageTools.pageTool(pageSize, pageNum, results);
-        return CommonResult.success(results, "查询成功");
-    }
-
     /**
      * 添加动态变量
      *

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

@@ -59,30 +59,6 @@ public class EnvironmentController {
         return CommonResult.success(results, "查询成功");
     }
 
-    /**
-     * 分页查询所有环境
-     *
-     * @param pageSize  每页多少条数据
-     * @param pageNum   当前第几页
-     * @param name      环境名称
-     * @param projectId 项目id
-     * @return 分页查询的结果, 环境
-     */
-    @ApiOperation(value = "分页查询环境")
-    @GetMapping("/condition/{projectId}")
-    public ResponseEntity<CommonResultObj<Page<Environment>>> findConditionConnects(
-            @RequestParam(defaultValue = "10") int pageSize,
-            @RequestParam(defaultValue = "1") int pageNum,
-            @RequestParam(required = false,defaultValue = "")String name,
-            @PathVariable Long projectId) {
-        Page<Environment> results = Optional.ofNullable(environmentService.page(Page.of(pageNum, pageSize)
-                , Wrappers.lambdaQuery(Environment.class).eq(Environment::getProjectId, projectId)
-                        .like(StringUtils.hasLength(name)
-                                , Environment::getName, name))).orElse(new Page<>());
-        PageTools.pageTool(pageSize, pageNum, results);
-        return CommonResult.success(results, "查询成功");
-    }
-
     /**
      * 添加环境
      *

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

@@ -83,30 +83,6 @@ public class MoveController {
         return CommonResult.success(results, "查询成功");
     }
 
-    /**
-     * 分页查询所有行为
-     *
-     * @param pageSize  每页多少条数据
-     * @param pageNum   当前第几页
-     * @param name      行为名称
-     * @param projectId 项目id
-     * @return 分页查询的结果, 行为
-     */
-    @ApiOperation(value = "分页查询行为")
-    @GetMapping("/condition/{projectId}")
-    public ResponseEntity<CommonResultObj<Page<Move>>> findConditionConnects(
-            @RequestParam(defaultValue = "10") int pageSize,
-            @RequestParam(defaultValue = "1") int pageNum,
-            @RequestParam(required = false,defaultValue = "")String name,
-            @PathVariable Long projectId) {
-        Page<Move> results = Optional.ofNullable(moveService.page(Page.of(pageNum, pageSize)
-                , Wrappers.lambdaQuery(Move.class).eq(Move::getProjectId, projectId)
-                        .like(StringUtils.hasLength(name)
-                                , Move::getName, name))).orElse(new Page<>());
-        PageTools.pageTool(pageSize, pageNum, results);
-        return CommonResult.success(results, "查询成功");
-    }
-
     /**
      * 输入行为主键id,查询出行为以及行为下包含的所有动作
      *

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

@@ -82,35 +82,6 @@ public class TestCaseController {
         return CommonResult.success(results, "查询成功");
     }
 
-    /**
-     * 分页查询所有用例
-     *
-     * @param pageSize  每页多少条数据
-     * @param pageNum   当前第几页
-     * @param name      行为名称
-     * @param projectId 项目id
-     * @return 分页查询的结果, 用例
-     */
-    @GetMapping("/condition/{projectId}")
-    @ApiOperation(value = "分页查询用例")
-    @Cacheable(cacheNames = "casePageCache",
-            key = "#pageNum + '_' + #pageSize",
-            condition = "#pageSize != null && #pageNum !=null",
-            unless = "#result.statusCodeValue != 200")
-    public ResponseEntity<CommonResultObj<Page<TestCase>>> findConditionTestCase(
-            @RequestParam(defaultValue = "10") int pageSize,
-            @RequestParam(defaultValue = "1") int pageNum,
-            @RequestParam(required = false,defaultValue = "")String name,
-            @PathVariable Long projectId) {
-
-        Page<TestCase> results = Optional.ofNullable(testCaseService.page(Page.of(pageNum, pageSize)
-                , Wrappers.lambdaQuery(TestCase.class).eq(TestCase::getProjectId, projectId)
-                        .like(StringUtils.hasLength(name)
-                                , TestCase::getName, name))).orElse(new Page<>());
-        PageTools.pageTool(pageSize, pageNum, results);
-        return CommonResult.success(results, "查询成功");
-    }
-
     /**
      * 输入用例主键id,查询出用例以及用例下包含的所有数据组
      *