fix(web): 修改了分页超出无数据的问题

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.matrix.autotest.utils.PageTools;
 import org.matrix.database.entity.Connect;
 import org.matrix.database.service.IConnectService;
 import org.matrix.database.vo.CommonResult;
@@ -45,13 +46,14 @@ public class ConnectController {
     @ApiOperation(value = "分页查询数据库信息")
     @GetMapping
     public ResponseEntity<CommonResultObj<Page<Connect>>> findPageConnects(
-            int pageSize,
-            int pageNum,
+            @RequestParam(defaultValue = "10") int pageSize,
+            @RequestParam(defaultValue = "1") int pageNum,
             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 results.getRecords().size() != 0
                 ? CommonResult.success(results, "查询成功")
                 : CommonResult.failed(results, "查询失败或无数据");

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.matrix.autotest.utils.PageTools;
 import org.matrix.database.entity.DynamicVariable;
 import org.matrix.database.service.IDynamicVariableService;
 import org.matrix.database.vo.CommonResult;
@@ -46,13 +47,14 @@ public class DynamicVariableController {
     @ApiOperation(value = "分页查询动参")
     @GetMapping("/{projectId}")
     public ResponseEntity<CommonResultObj<Page<DynamicVariable>>> findPageConnects(
-            int pageSize,
-            int pageNum,
+            @RequestParam(defaultValue = "10") int pageSize,
+            @RequestParam(defaultValue = "1") int pageNum,
             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 results.getRecords().size() != 0
                 ? CommonResult.success(results, "查询成功")
                 : CommonResult.failed(results, "查询失败或无数据");

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.matrix.autotest.utils.PageTools;
 import org.matrix.database.entity.Environment;
 import org.matrix.database.service.IEnvironmentService;
 import org.matrix.database.vo.CommonResult;
@@ -46,13 +47,14 @@ public class EnvironmentController {
     @ApiOperation(value = "分页查询环境")
     @GetMapping("/{projectId}")
     public ResponseEntity<CommonResultObj<Page<Environment>>> findPageConnects(
-            int pageSize,
-            int pageNum,
+            @RequestParam(defaultValue = "10") int pageSize,
+            @RequestParam(defaultValue = "1") int pageNum,
             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 results.getRecords().size() != 0
                 ? CommonResult.success(results, "查询成功")
                 : CommonResult.failed(results, "查询失败或无数据");

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.matrix.autotest.utils.PageTools;
 import org.matrix.database.entity.ExecutionRecord;
 import org.matrix.database.service.IExecutionRecordService;
 import org.matrix.database.vo.CommonResult;
@@ -47,8 +48,8 @@ public class ExecutionRecordController {
     @ApiOperation("分页查询执行记录")
     @GetMapping
     public ResponseEntity<CommonResultObj<Page<ExecutionRecord>>> findPageExecutionRecord(
-            int pageSize,
-            int pageNum,
+            @RequestParam(defaultValue = "10") int pageSize,
+            @RequestParam(defaultValue = "1") int pageNum,
             Long userId,
             Long testDataId,
             Long testCaseId,
@@ -64,6 +65,7 @@ public class ExecutionRecordController {
                         .eq(status != null, ExecutionRecord::getStatus, status)
                         .eq(type != null, ExecutionRecord::getType, type)
         )).orElse(new Page<>());
+        PageTools.pageTool(pageSize, pageNum, results);
         return results.getRecords().size() != 0
                 ? CommonResult.success(results, "查询成功")
                 : CommonResult.failed(results, "查询失败或无数据");

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.matrix.autotest.utils.PageTools;
 import org.matrix.database.entity.Action;
 import org.matrix.database.entity.Move;
 import org.matrix.database.service.IActionService;
@@ -58,13 +59,14 @@ public class MoveController {
     @ApiOperation(value = "分页查询行为")
     @GetMapping("/{projectId}")
     public ResponseEntity<CommonResultObj<Page<Move>>> findPageConnects(
-            int pageSize,
-            int pageNum,
+            @RequestParam(defaultValue = "10") int pageSize,
+            @RequestParam(defaultValue = "1") int pageNum,
             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 results.getRecords().size() != 0
                 ? CommonResult.success(results, "查询成功")
                 : CommonResult.failed(results, "查询失败或无数据");

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

@@ -11,10 +11,7 @@ import org.matrix.database.service.IEnvironmentService;
 import org.matrix.database.vo.CommonPage;
 import org.matrix.exception.GlobalException;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -178,8 +175,8 @@ public class SwaggerController {
     public CommonPage<List<InterfaceInformation>> parameter(
             Long projectId,
             Long id,
-            int pageSize,
-            int pageNum,
+            @RequestParam(defaultValue = "10") int pageSize,
+            @RequestParam(defaultValue = "1") int pageNum,
             String name,
             String swaggerUrl) {
         //将所有的默认选项置为false

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.matrix.autotest.utils.PageTools;
 import org.matrix.database.entity.TestCase;
 import org.matrix.database.entity.TestData;
 import org.matrix.database.service.ITestCaseService;
@@ -59,13 +60,14 @@ public class TestCaseController {
     @ApiOperation(value = "分页查询用例")
     @GetMapping("/{projectId}")
     public ResponseEntity<CommonResultObj<Page<TestCase>>> findPageTestCase(
-            int pageSize,
-            int pageNum,
+            @RequestParam(defaultValue = "10") int pageSize,
+            @RequestParam(defaultValue = "1") int pageNum,
             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 results.getRecords().size() != 0
                 ? CommonResult.success(results, "查询成功")
                 : CommonResult.failed(results, "查询失败或无数据");

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.matrix.autotest.utils.PageTools;
 import org.matrix.database.entity.TestTask;
 import org.matrix.database.service.ITestTaskService;
 import org.matrix.database.vo.CommonResult;
@@ -56,12 +57,13 @@ public class TestTaskController {
     @ApiOperation(value = "分页查询测试任务")
     @GetMapping("/page")
     public ResponseEntity<CommonResultObj<Page<TestTask>>> findPageTestTasks(
-            int pageSize,
-            int pageNum,
+            @RequestParam(defaultValue = "10") int pageSize,
+            @RequestParam(defaultValue = "1") int pageNum,
             String name) {
         Page<TestTask> results = Optional.of(testTaskService.page(Page.of(pageNum, pageSize), Wrappers.lambdaQuery(TestTask.class)
                         .like(StringUtils.hasLength(name), TestTask::getName, name)))
                 .orElse(new Page<>());
+        PageTools.pageTool(pageSize, pageNum, results);
         return results.getRecords().size() != 0
                 ? CommonResult.success(results, "查询成功")
                 : CommonResult.failed(results, "查询失败或无数据");