新增redis service和deployment接口

src/main/java/cn/qg/holmes/controller/k8s/DockerProjectController.java

@@ -26,10 +26,10 @@ public class DockerProjectController {
      * @return
      */
     @GetMapping("/list")
-    public JsonResult getDockerProjectList(@RequestParam(defaultValue = "1") Integer pageNum,
+    public JsonResult getDockerProjectList(String projectName, String projectType, boolean isActive,
+                                           @RequestParam(defaultValue = "1") Integer pageNum,
                                            @RequestParam(defaultValue = "10") Integer pageSize) {
-        IPage<DockerProject> dockerProjectIPage = new Page<>(pageNum, pageSize);
-        IPage projectIPage =  dockerProjectService.page(dockerProjectIPage);
+        IPage projectIPage =  dockerProjectService.getDockerProjectList(projectName, projectType, isActive, pageNum, pageSize);
         Map<String, Object> map = new HashMap<>();
         map.put("total", projectIPage.getTotal());
         map.put("list", projectIPage.getRecords());

src/main/java/cn/qg/holmes/entity/k8s/DockerProject.java

@@ -33,6 +33,7 @@ public class DockerProject {
     private String startCommand;
     private String stopCommand;
     private Integer deployToDocker;
+    @TableField(value = "`is_active`")
     private Integer isActive;
     @TableField(value = "`database`")
     private String database;

src/main/java/cn/qg/holmes/mapper/k8s/DockerProjectMapper.java

@@ -2,6 +2,9 @@ package cn.qg.holmes.mapper.k8s;
 
 import cn.qg.holmes.entity.k8s.DockerProject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 public interface DockerProjectMapper extends BaseMapper<DockerProject> {
+
+    IPage<DockerProject> getDockerProjectList(IPage<DockerProject> page, String projectName, String projectType, boolean isActive);
 }

src/main/java/cn/qg/holmes/service/k8s/DockerProjectService.java

 package cn.qg.holmes.service.k8s;
 
 import cn.qg.holmes.entity.k8s.DockerProject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 public interface DockerProjectService extends IService<DockerProject> {
+    IPage<DockerProject> getDockerProjectList(String projectName, String projectType, boolean isActive, Integer pageNum, Integer pageSize);
 }

src/main/java/cn/qg/holmes/service/k8s/impl/DockerProjectServiceImpl.java

@@ -3,9 +3,30 @@ package cn.qg.holmes.service.k8s.impl;
 import cn.qg.holmes.entity.k8s.DockerProject;
 import cn.qg.holmes.mapper.k8s.DockerProjectMapper;
 import cn.qg.holmes.service.k8s.DockerProjectService;
+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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class DockerProjectServiceImpl extends ServiceImpl<DockerProjectMapper, DockerProject> implements DockerProjectService {
+
+    @Autowired
+    DockerProjectMapper dockerProjectMapper;
+
+    /**
+     * 条件分页查询
+     * @param projectName 项目名称
+     * @param projectType 项目类型，Java UI、node等等
+     * @param isActive 是否可用
+     * @param pageNum 第几页
+     * @param pageSize 每页展示多少个
+     * @return
+     */
+    @Override
+    public IPage<DockerProject> getDockerProjectList(String projectName, String projectType, boolean isActive, Integer pageNum, Integer pageSize) {
+        IPage<DockerProject> page = new Page<>(pageNum, pageSize);
+        return dockerProjectMapper.getDockerProjectList(page, projectName, projectType, isActive);
+    }
 }

src/main/resources/mapper/k8s/DockerProjectMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.qg.holmes.mapper.k8s.DockerProjectMapper">
+
+    <select id="getDockerProjectList" resultType="cn.qg.holmes.entity.k8s.DockerProject">
+        SELECT * FROM `docker_project`
+        WHERE 1=1
+        <if test="projectName != null and projectName != ''">
+            AND `project_name` like CONCAT('%', #{projectName}, '%')
+        </if>
+        <if test="projectType != null and projectType != ''">
+            AND `project_type` = #{projectType}
+        </if>
+        <if test="isActive != null and isActive != ''">
+            AND `is_active` = #{isActive}
+        </if>
+    </select>
+
+</mapper>
\ No newline at end of file