fix(service与controller): 优化了CRUD代码

kt-base/src/main/java/org/matrix/database/service/IConnectService.java

@@ -2,7 +2,6 @@ package org.matrix.database.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.matrix.database.entity.Connect;
-import org.matrix.database.vo.PageResult;
 
 /**
  * <p>

kt-base/src/main/java/org/matrix/database/service/IDynamicVariableService.java

@@ -2,9 +2,7 @@ package org.matrix.database.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.matrix.database.entity.DynamicVariable;
-import org.matrix.database.vo.PageResult;
 
-import java.util.List;
 import java.util.Optional;
 
 /**

kt-base/src/main/java/org/matrix/database/service/IEnvironmentService.java

@@ -2,9 +2,6 @@ package org.matrix.database.service;
 
 import org.matrix.database.entity.Environment;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.matrix.database.vo.PageResult;
-
-import java.util.List;
 
 /**
  * <p>

kt-base/src/main/java/org/matrix/database/service/IMoveService.java

@@ -2,7 +2,6 @@ package org.matrix.database.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.matrix.database.entity.Move;
-import org.matrix.database.vo.PageResult;
 
 /**
  * <p>

kt-base/src/main/java/org/matrix/database/service/ITestCaseService.java

@@ -2,9 +2,6 @@ package org.matrix.database.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.matrix.database.entity.TestCase;
-import org.matrix.database.vo.PageResult;
-
-import java.util.List;
 
 /**
  * <p>

kt-base/src/main/java/org/matrix/database/service/impl/ConnectServiceImpl.java

 package org.matrix.database.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.matrix.database.entity.Connect;
 import org.matrix.database.mapper.ConnectMapper;
 import org.matrix.database.service.IConnectService;
-import org.matrix.database.vo.PageResult;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
 
 /**
  * <p>

kt-base/src/main/java/org/matrix/database/service/impl/DynamicVariableServiceImpl.java

 package org.matrix.database.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.matrix.database.entity.DynamicVariable;
 import org.matrix.database.mapper.DynamicVariableMapper;
 import org.matrix.database.service.IDynamicVariableService;
-import org.matrix.database.vo.PageResult;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
-import java.util.List;
 import java.util.Optional;
 
 /**

kt-base/src/main/java/org/matrix/database/service/impl/EnvironmentServiceImpl.java

 package org.matrix.database.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.matrix.database.entity.Environment;
 import org.matrix.database.mapper.EnvironmentMapper;
 import org.matrix.database.service.IEnvironmentService;
-import org.matrix.database.vo.PageResult;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
 
 /**
  * <p>

kt-base/src/main/java/org/matrix/database/service/impl/MoveServiceImpl.java

 package org.matrix.database.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.matrix.database.entity.Move;
 import org.matrix.database.mapper.MoveMapper;
 import org.matrix.database.service.IMoveService;
-import org.matrix.database.vo.PageResult;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
 
 /**
  * <p>

kt-base/src/main/java/org/matrix/database/service/impl/TestCaseServiceImpl.java

 package org.matrix.database.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.matrix.database.entity.TestCase;
 import org.matrix.database.mapper.TestCaseMapper;
 import org.matrix.database.service.ITestCaseService;
-import org.matrix.database.vo.PageResult;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
 
 /**
  * <p>

kt-base/src/main/java/org/matrix/database/vo/PageResult.java

-package org.matrix.database.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-/**
- * @author mry
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(chain = true)
-public class PageResult {
-
-    /**
-     * 用户查询的数据
-     */
-    private String query;
-
-    /**
-     * 查询页数
-     */
-    private Integer pageNum;
-
-    /**
-     * 查询条数
-     */
-    private Integer pageSize;
-
-    /**
-     * 查询总记录数
-     */
-    private Long total;
-
-    /**
-     * 分页查询的结果
-     */
-    private Object rows;
-
-}

kt-web/pom.xml

@@ -19,11 +19,10 @@
             <artifactId>kt-base</artifactId>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter -->
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.0</version>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.5.1</version>
         </dependency>
 
     </dependencies>

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

 package org.matrix.autotest.controller;
 
+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.database.entity.Connect;
 import org.matrix.database.service.IConnectService;
 import org.matrix.database.vo.CommonResult;
 import org.matrix.database.vo.CommonResultObj;
-import org.matrix.database.vo.PageResult;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -34,6 +36,29 @@ public class ConnectController {
         this.connectService = connectService;
     }
 
+    /**
+     * 分页查询所有数据库信息
+     *
+     * @param pageSize 每页多少条数据
+     * @param pageNum  当前第几页
+     * @param name     数据库名称
+     * @return 分页查询的结果, 数据库信息
+     */
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/page")
+    public ResponseEntity<CommonResultObj<Page<Connect>>> findPageConnects(
+            int pageSize,
+            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<>());
+        return results.getRecords().size() != 0
+                ? CommonResult.success(results, "查询成功")
+                : CommonResult.failed(results, "查询失败或无数据");
+    }
+
     /**
      * 查询所有数据库
      *

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

@@ -7,7 +7,6 @@ import org.matrix.database.entity.DynamicVariable;
 import org.matrix.database.service.IDynamicVariableService;
 import org.matrix.database.vo.CommonResult;
 import org.matrix.database.vo.CommonResultObj;
-import org.matrix.database.vo.PageResult;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -7,7 +7,6 @@ import org.matrix.database.entity.Environment;
 import org.matrix.database.service.IEnvironmentService;
 import org.matrix.database.vo.CommonResult;
 import org.matrix.database.vo.CommonResultObj;
-import org.matrix.database.vo.PageResult;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -10,7 +10,6 @@ import org.matrix.database.service.IMoveService;
 import org.matrix.database.vo.CommonResult;
 import org.matrix.database.vo.CommonResultObj;
 import org.matrix.database.vo.MoveAction;
-import org.matrix.database.vo.PageResult;
 import org.matrix.exception.GlobalException;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -63,7 +62,9 @@ public class MoveController {
                 .eq(Action::getMoveId, moveId)))
                 .orElse(new ArrayList<>());
         MoveAction ma = new MoveAction(move, actionList);
-        return CommonResult.success(ma, "查询成功");
+        return ma != null
+                ? CommonResult.success(ma, "查询成功")
+                : CommonResult.failed(ma, "查询失败或无数据");
     }
 
     /**
@@ -135,11 +136,9 @@ public class MoveController {
         Boolean actionBoolean = Optional.of(actionService.remove(Wrappers.lambdaQuery(Action.class)
                         .eq(Action::getMoveId, moveId)))
                 .orElseThrow(() -> new GlobalException(String.format("没有查到指定的行为,你提供的行为id是%d", moveId)));
-        if (moveBoolean && actionBoolean) {
-            return CommonResult.success("删除成功");
-        } else {
-            return CommonResult.failed("删除失败或不存在" + moveId + "id值");
-        }
+        return moveBoolean && actionBoolean
+                ? CommonResult.success("删除成功")
+                : CommonResult.failed("删除失败或不存在");
     }
 
 }

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

 package org.matrix.autotest.controller;
 
+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.database.entity.Project;
@@ -7,6 +9,7 @@ import org.matrix.database.service.IProjectService;
 import org.matrix.database.vo.CommonResult;
 import org.matrix.database.vo.CommonResultObj;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -33,6 +36,17 @@ public class ProjectController {
         this.projectService = projectService;
     }
 
+    @ApiOperation(value = "分页查询项目")
+    @GetMapping("/page")
+    public ResponseEntity<CommonResultObj<Page<Project>>> findPageProject(int pageSize, int pageNum, String name) {
+        Page<Project> projectPage = Optional.ofNullable(projectService.page(Page.of(pageNum, pageSize)
+                , Wrappers.lambdaQuery(Project.class).like(StringUtils.hasLength(name), Project::getName, name)
+        )).orElse(new Page<>());
+        return projectPage.getRecords().size() != 0
+                ? CommonResult.success(projectPage, "查询成功")
+                : CommonResult.failed(projectPage, "查询失败");
+    }
+
     /**
      * 查询所有项目
      *

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

@@ -7,7 +7,6 @@ import org.matrix.database.entity.TestCase;
 import org.matrix.database.service.ITestCaseService;
 import org.matrix.database.vo.CommonResult;
 import org.matrix.database.vo.CommonResultObj;
-import org.matrix.database.vo.PageResult;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;