From d2f0b77bf2394b6f2901e5415bd41fe1a9be9d10 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Thu, 22 Apr 2021 14:03:05 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.3=E3=80=91=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dsctn/api/pojo/request/DatabaseInfoRequest.java |  5 +++++
 .../modular/controller/DatabaseInfoController.java  | 13 +++++++++++++
 .../service/impl/DatabaseInfoServiceImpl.java       |  3 +++
 3 files changed, 21 insertions(+)

diff --git a/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/pojo/request/DatabaseInfoRequest.java b/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/pojo/request/DatabaseInfoRequest.java
index 7f8346b96..b7a035f13 100644
--- a/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/pojo/request/DatabaseInfoRequest.java
+++ b/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/pojo/request/DatabaseInfoRequest.java
@@ -87,6 +87,11 @@ public class DatabaseInfoRequest extends BaseRequest {
     @NotBlank(message = "数据库连接密码", groups = {add.class, edit.class})
     private String password;
 
+    /**
+     * 状态标识：1-正常，2-无法连接
+     */
+    private Integer statusFlag;
+
     /**
      * 备注，摘要
      */
diff --git a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/controller/DatabaseInfoController.java b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/controller/DatabaseInfoController.java
index ee90249ee..eb0cdfb54 100644
--- a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/controller/DatabaseInfoController.java
+++ b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/controller/DatabaseInfoController.java
@@ -39,6 +39,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 
 /**
@@ -102,6 +103,18 @@ public class DatabaseInfoController {
         return new SuccessResponseData(pageResult);
     }
 
+    /**
+     * 查询所有数据源列表
+     *
+     * @author fengshuonan
+     * @date 2020/11/1 22:18
+     */
+    @GetResource(name = "查询所有数据源列表", path = "/databaseInfo/list")
+    public ResponseData findList(DatabaseInfoRequest databaseInfoRequest) {
+        List<DatabaseInfo> databaseInfos = databaseInfoService.findList(databaseInfoRequest);
+        return new SuccessResponseData(databaseInfos);
+    }
+
     /**
      * 查询数据源详情
      *
diff --git a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java
index b90fdb119..18190b717 100644
--- a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java
+++ b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java
@@ -258,6 +258,9 @@ public class DatabaseInfoServiceImpl extends ServiceImpl<DatabaseInfoMapper, Dat
         // 拼接sql 条件
         queryWrapper.like(ObjectUtil.isNotEmpty(dbName), DatabaseInfo::getDbName, dbName);
 
+        // 拼接状态条件
+        queryWrapper.eq(ObjectUtil.isNotEmpty(databaseInfoRequest.getStatusFlag()), DatabaseInfo::getStatusFlag, databaseInfoRequest.getStatusFlag());
+
         return queryWrapper;
     }