添加数据库链接信息配置

@@ -386,3 +386,115 @@ CREATE TABLE "public"."qg_preserve_detail_status" (
 );
 
 COMMENT ON TABLE "public"."qg_preserve_detail_status" IS '保养记录明细状态';
+
+CREATE TABLE "qg_db_connect" (
+ "id"          varchar(36) PRIMARY KEY,
+ "name"               varchar(50)  NOT NULL,
+ "type"               varchar(20)  NOT NULL,
+ "ip"                 varchar(20)  NOT NULL,
+ "port"               varchar(20)  NOT NULL,
+ "db_name"            varchar(50)  NOT NULL,
+ "user_name"          varchar(50)  NOT NULL,
+ "password"           varchar(50)  NOT NULL,
+ "url"                varchar(200) NOT NULL,
+ "open_ssh"           bool         NOT NULL DEFAULT false,
+ "open_ssl"           bool         NOT NULL DEFAULT false,
+ "max_pool_size"      int4                  DEFAULT 50,
+ "min_idle"           int4                  DEFAULT 0,
+ "connect_test_query" varchar(200),
+ "connect_timeout"    int4                  DEFAULT 30000,
+ "tenant_id"          varchar(36),
+ "create_time"        timestamp(6),
+ "creator"            varchar(36) NULL,
+ "updater"            varchar(36) NULL,
+ "update_time"        timestamp(6)
+);
+COMMENT ON TABLE qg_db_connect IS '数据库链接信息';
+COMMENT ON COLUMN qg_db_connect.tenant_id IS '租户ID';
+COMMENT ON COLUMN qg_db_connect.name IS '自定义数据库名称';
+COMMENT ON COLUMN qg_db_connect.type IS '数据库类型';
+COMMENT ON COLUMN qg_db_connect.ip IS '主机ip';
+COMMENT ON COLUMN qg_db_connect.port IS '端口号';
+COMMENT ON COLUMN qg_db_connect.db_name IS '数据库名称';
+COMMENT ON COLUMN qg_db_connect.user_name IS '用户名';
+COMMENT ON COLUMN qg_db_connect.password IS '密码';
+COMMENT ON COLUMN qg_db_connect.url IS 'url';
+COMMENT ON COLUMN qg_db_connect.open_ssh IS '是否启用ssh，默认false';
+COMMENT ON COLUMN qg_db_connect.open_ssl IS '是否启用ssl，默认false';
+COMMENT ON COLUMN qg_db_connect.max_pool_size IS '最大活动链接数，默认50';
+COMMENT ON COLUMN qg_db_connect.min_idle IS '最小空闲连接数，默认0';
+COMMENT ON COLUMN qg_db_connect.connect_test_query IS '链接校验语句，默认为：SELECT 1';
+COMMENT ON COLUMN qg_db_connect.connect_timeout IS '最大等待时间(毫秒)，默认为：30000毫秒';
+
+CREATE TABLE "qg_db_connect_ssh" (
+ "id"            varchar(36) PRIMARY KEY,
+ "connect_id"    varchar(36)  NOT NULL,
+ "ip"            varchar(20)  NOT NULL,
+ "port"          varchar(20)  NOT NULL,
+ "ssh_name"      varchar(50)  NOT NULL,
+ "ssh_password"  varchar(50)  NOT NULL,
+ "verify_method" varchar(200) NOT NULL,
+ "private_key"   varchar(200) NOT NULL,
+ "tenant_id"     varchar(36),
+ "create_time"   timestamp(6),
+ "creator"       varchar(36) NULL,
+ "updater"       varchar(36) NULL,
+ "update_time"   timestamp(6)
+);
+COMMENT ON TABLE qg_db_connect_ssh IS 'SSH通道配置信息';
+COMMENT ON COLUMN qg_db_connect.tenant_id IS '租户ID';
+COMMENT ON COLUMN qg_db_connect.connect_id IS '数据库链接信息id';
+COMMENT ON COLUMN qg_db_connect_ssh.ip IS 'ssh的ip';
+COMMENT ON COLUMN qg_db_connect_ssh.port IS 'ssh的port';
+COMMENT ON COLUMN qg_db_connect_ssh.ssh_name IS '用户名';
+COMMENT ON COLUMN qg_db_connect_ssh.ssh_password IS '租户ID';
+COMMENT ON COLUMN qg_db_connect_ssh.ssh_password IS '密码/密码短语';
+COMMENT ON COLUMN qg_db_connect_ssh.verify_method IS '验证方式（PASSWORD：密码；PUBLIC_KEY）';
+COMMENT ON COLUMN qg_db_connect_ssh.private_key IS '私钥文件';
+
+CREATE TABLE "qg_db_connect_ssl" (
+ "id"            varchar(36) PRIMARY KEY,
+ "connect_id"    varchar(36)  NOT NULL,
+ "ip"            varchar(20)  NOT NULL,
+ "port"          varchar(20)  NOT NULL,
+ "ssh_name"      varchar(50)  NOT NULL,
+ "ssh_password"  varchar(50)  NOT NULL,
+ "verify_method" varchar(200) NOT NULL,
+ "private_key"   varchar(200) NOT NULL,
+ "tenant_id"     varchar(36),
+ "create_time"   timestamp(6),
+ "creator"       varchar(36) NULL,
+ "updater"       varchar(36) NULL,
+ "update_time"   timestamp(6)
+);
+COMMENT ON TABLE qg_db_connect IS 'SSH通道配置信息';
+COMMENT ON COLUMN qg_db_connect.tenant_id IS '租户ID';
+COMMENT ON COLUMN qg_db_connect.connect_id IS '数据库链接信息id';
+COMMENT ON COLUMN qg_db_connect.ip IS 'ssh的ip';
+COMMENT ON COLUMN qg_db_connect.port IS 'ssh的port';
+COMMENT ON COLUMN qg_db_connect.ssh_name IS '用户名';
+COMMENT ON COLUMN qg_db_connect.ssh_password IS '租户ID';
+COMMENT ON COLUMN qg_db_connect.ssh_password IS '密码/密码短语';
+COMMENT ON COLUMN qg_db_connect.verify_method IS '验证方式（PASSWORD：密码；PUBLIC_KEY）';
+COMMENT ON COLUMN qg_db_connect.private_key IS '私钥文件';
+
+CREATE TABLE "qg_db_connect_ssl" (
+ "id"             varchar(36) PRIMARY KEY,
+ "connect_id"     varchar(36) NOT NULL,
+ "ca_cert"        varchar(50) NOT NULL,
+ "verify_ca_cert" bool        NOT NULL DEFAULT FALSE,
+ "client_key"     varchar(50) NOT NULL,
+ "client_cert"    varchar(50) NOT NULL,
+ "tenant_id"      varchar(36),
+ "create_time"    timestamp(6),
+ "creator"        varchar(36) NULL,
+ "updater"        varchar(36) NULL,
+ "update_time"    timestamp(6)
+);
+COMMENT ON TABLE qg_db_connect_ssl IS 'SSL通道配置信息';
+COMMENT ON COLUMN qg_db_connect_ssl.tenant_id IS '租户ID';
+COMMENT ON COLUMN qg_db_connect_ssl.connect_id IS '数据库链接信息id';
+COMMENT ON COLUMN qg_db_connect_ssl.ca_cert IS 'CA证书';
+COMMENT ON COLUMN qg_db_connect_ssl.verify_ca_cert IS '验证CA证书';
+COMMENT ON COLUMN qg_db_connect_ssl.client_key IS '客户端秘钥';
+COMMENT ON COLUMN qg_db_connect_ssl.client_cert IS '客户端证书';

@@ -1133,4 +1133,57 @@ CREATE TABLE IF NOT EXISTS qg_preserve_detail_status (
   "updater" varchar(36),
   "update_time" timestamp(6),
   CONSTRAINT "qg_preserve_detail_status_pkey" PRIMARY KEY ("id")
+);
+
+CREATE TABLE IF NOT EXISTS qg_db_connect (
+    "id"                 varchar(36) PRIMARY KEY,
+    "name"               varchar(50)  NOT NULL,
+    "type"               varchar(20)  NOT NULL,
+    "ip"                 varchar(20)  NOT NULL,
+    "port"               varchar(20)  NOT NULL,
+    "db_name"            varchar(50)  NOT NULL,
+    "user_name"          varchar(50)  NOT NULL,
+    "password"           varchar(50)  NOT NULL,
+    "url"                varchar(200) NOT NULL,
+    "open_ssh"           bool         NOT NULL DEFAULT false,
+    "open_ssl"           bool         NOT NULL DEFAULT false,
+    "max_pool_size"      int4                  DEFAULT 50,
+    "min_idle"           int4                  DEFAULT 0,
+    "connect_test_query" varchar(200),
+    "connect_timeout"    int4                  DEFAULT 30000,
+    "tenant_id"          varchar(36),
+    "create_time"        timestamp(6),
+    "creator"            varchar(36) NULL,
+    "updater"            varchar(36) NULL,
+    "update_time"        timestamp(6)
+);
+
+CREATE TABLE IF NOT EXISTS qg_db_connect_ssl (
+    "id"            varchar(36) PRIMARY KEY,
+    "connect_id"    varchar(36)  NOT NULL,
+    "ip"            varchar(20)  NOT NULL,
+    "port"          varchar(20)  NOT NULL,
+    "ssh_name"      varchar(50)  NOT NULL,
+    "ssh_password"  varchar(50)  NOT NULL,
+    "verify_method" varchar(200) NOT NULL,
+    "private_key"   varchar(200) NOT NULL,
+    "tenant_id"     varchar(36),
+    "create_time"   timestamp(6),
+    "creator"       varchar(36) NULL,
+    "updater"       varchar(36) NULL,
+    "update_time"   timestamp(6)
+);
+
+CREATE TABLE IF NOT EXISTS qg_db_connect_ssl (
+    "id"             varchar(36) PRIMARY KEY,
+    "connect_id"     varchar(36) NOT NULL,
+    "ca_cert"        varchar(50) NOT NULL,
+    "verify_ca_cert" bool        NOT NULL DEFAULT FALSE,
+    "client_key"     varchar(50) NOT NULL,
+    "client_cert"    varchar(50) NOT NULL,
+    "tenant_id"      varchar(36),
+    "create_time"    timestamp(6),
+    "creator"        varchar(36) NULL,
+    "updater"        varchar(36) NULL,
+    "update_time"    timestamp(6)
 );
\ No newline at end of file

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.TkDbConnectDTO;
+import org.thingsboard.server.common.data.yunteng.enums.DbConnectTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.TkDbConnectService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE_SIZE;
+
+
+@RestController
+@TbCoreComponent
+@RequiredArgsConstructor
+@RequestMapping("api/yt/dbConnect")
+@Api(tags = {"数据库链接信息"})
+@Slf4j
+public class TkDbConnectController extends BaseController {
+    private final TkDbConnectService tkDbConnectService;
+
+    @GetMapping(params = {PAGE_SIZE, PAGE})
+    @ApiOperation("分页查询")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public TkPageData<TkDbConnectDTO> page(
+            @RequestParam(PAGE_SIZE) int pageSize,
+            @RequestParam(PAGE) int page,
+            @RequestParam(value = "name", required = false) String name,
+            @RequestParam(value = "type", required = false) DbConnectTypeEnum type
+    ) throws ThingsboardException {
+        Map<String, Object> queryMap = new HashMap<>();
+        queryMap.put(PAGE_SIZE, pageSize);
+        queryMap.put(PAGE, page);
+        if (StringUtils.isNotBlank(name)) {
+            queryMap.put("name", name);
+        }
+
+        if (type != null) {
+            queryMap.put("type", type);
+        }
+
+        return tkDbConnectService.page(queryMap, getCurrentUser().getCurrentTenantId());
+    }
+
+    @PostMapping("/save")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<TkDbConnectDTO> save(@RequestBody TkDbConnectDTO tkDbConnectDTO) throws ThingsboardException {
+        tkDbConnectDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+        TkDbConnectDTO dto = tkDbConnectService.save(tkDbConnectDTO);
+        return ResponseEntity.ok(dto);
+    }
+
+    @GetMapping("/delete")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<Boolean> delete(@RequestParam("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(tkDbConnectService.delete(id));
+    }
+
+    @GetMapping("/get")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<TkDbConnectDTO> get(@RequestParam("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(tkDbConnectService.get(id));
+    }
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.enums.DbConnectTypeEnum;
+
+/**
+ * 数据库链接信息
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class TkDbConnectDTO extends TenantDTO {
+
+    @ApiModelProperty("自定义数据库名称")
+    private String name;
+
+    @ApiModelProperty("数据库类型")
+    private DbConnectTypeEnum type;
+
+    @ApiModelProperty("主机ip")
+    private String ip;
+
+    @ApiModelProperty("端口号")
+    private String port;
+
+    @ApiModelProperty("数据库名称")
+    private String dbName;
+
+    @ApiModelProperty("用户名")
+    private String userName;
+
+    @ApiModelProperty("密码")
+    private String password;
+
+    @ApiModelProperty("url")
+    private String url;
+
+    @ApiModelProperty("是否启用ssh")
+    private boolean openSsh;
+
+    @ApiModelProperty("是否启用ssl")
+    private boolean openSsl;
+
+    @ApiModelProperty("最大活动链接数")
+    private int maxPoolSize;
+
+    @ApiModelProperty("最小空闲连接数")
+    private int minIdle;
+
+    @ApiModelProperty("链接校验语句")
+    private String connectTestQuery;
+
+    @ApiModelProperty("最大等待时间(毫秒)")
+    private int connectTimeout;
+}

+package org.thingsboard.server.common.data.yunteng.enums;
+
+public enum DbConnectTypeEnum {
+    MySql,
+    Postgresql,
+    Oracle,
+    SQLServer
+}

@@ -695,6 +695,8 @@ public class ModelConstants {
     public static final String TKINSPECTIONRECORD_TABLE_NAME= "qg_inspection_record"; // 巡检记录
     public static final String TKINSPECTIONDETAILS_TABLE_NAME= "qg_inspection_details"; // 巡检记录明细
 
+    public static final String TKDBCONNECT_TABLE_NAME= "qg_db_connect"; // 数据库链接信息
+
     protected static final String[] NONE_AGGREGATION_COLUMNS = new String[]{LONG_VALUE_COLUMN, DOUBLE_VALUE_COLUMN, BOOLEAN_VALUE_COLUMN, STRING_VALUE_COLUMN, JSON_VALUE_COLUMN, KEY_COLUMN, TS_COLUMN};
 
     protected static final String[] COUNT_AGGREGATION_COLUMNS = new String[]{count(LONG_VALUE_COLUMN), count(DOUBLE_VALUE_COLUMN), count(BOOLEAN_VALUE_COLUMN), count(STRING_VALUE_COLUMN), count(JSON_VALUE_COLUMN), max(TS_COLUMN)};

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.enums.DbConnectTypeEnum;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+/**
+ * 数据库链接信息
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = ModelConstants.TKDBCONNECT_TABLE_NAME, autoResultMap = true)
+public class TkDbConnectEntity extends TenantBaseEntity {
+
+    private String name;
+
+    private DbConnectTypeEnum type;
+
+    private String ip;
+
+    private String port;
+
+    private String dbName;
+
+    private String userName;
+
+    private String password;
+
+    private String url;
+
+    private boolean openSsh;
+
+    private boolean openSsl;
+
+    private int maxPoolSize;
+
+    private int minIdle;
+
+    private String connectTestQuery;
+
+    private int connectTimeout;
+}

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.dto.TkDbConnectDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.TkDbConnectEntity;
+import org.thingsboard.server.dao.yunteng.mapper.TkDbConnectMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkDbConnectService;
+
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class TkDbConnectServiceImpl extends AbstractBaseService<TkDbConnectMapper, TkDbConnectEntity>
+        implements TkDbConnectService {
+
+    @Override
+    public TkPageData<TkDbConnectDTO> page(Map<String, Object> queryMap, String tenantId) {
+        QueryWrapper<TkDbConnectEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkDbConnectEntity> lambda = wrapper.lambda();
+        lambda.eq(TkDbConnectEntity::getTenantId, tenantId);
+        if (queryMap != null && queryMap.get("name") != null) {
+            lambda.like(TkDbConnectEntity::getName, queryMap.get("name").toString());
+        }
+
+        if (queryMap != null && queryMap.get("type") != null) {
+            lambda.eq(TkDbConnectEntity::getType, queryMap.get("type").toString());
+        }
+
+        IPage<TkDbConnectEntity> page = baseMapper.selectPage(getPage(queryMap, "create_time", false),
+                wrapper);
+
+        return getPageData(page, TkDbConnectDTO.class);
+    }
+
+    @Override
+    public TkDbConnectDTO save(TkDbConnectDTO tkDbConnectDTO) {
+        checkDto(tkDbConnectDTO);
+        TkDbConnectEntity entity = new TkDbConnectEntity();
+        if (StringUtils.isBlank(tkDbConnectDTO.getId())) {
+            tkDbConnectDTO.copyToEntity(entity);
+            baseMapper.insert(entity);
+        } else {
+            LambdaQueryWrapper<TkDbConnectEntity> filter = new QueryWrapper<TkDbConnectEntity>().lambda()
+                    .eq(TkDbConnectEntity::getId, tkDbConnectDTO.getId());
+            entity = tkDbConnectDTO.getEntity(TkDbConnectEntity.class);
+            baseMapper.update(entity, filter);
+        }
+
+        entity.copyToDTO(tkDbConnectDTO);
+        return tkDbConnectDTO;
+    }
+
+    private void checkDto(TkDbConnectDTO dto) {
+        if (StringUtils.isBlank(dto.getTenantId())) {
+            throw new TkDataValidationException("租户id为空！");
+        }
+    }
+
+    @Override
+    public boolean delete(String id) {
+        int count = baseMapper.deleteById(id);
+        return count > 0;
+    }
+
+    @Override
+    public TkDbConnectDTO get(String id) {
+        if (StringUtils.isBlank(id)) {
+            return new TkDbConnectDTO();
+        }
+
+        TkDbConnectEntity entity = baseMapper.selectById(id);
+        TkDbConnectDTO tkDbConnectDTO = new TkDbConnectDTO();
+        entity.copyToDTO(tkDbConnectDTO);
+        return tkDbConnectDTO;
+    }
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.TkDbConnectEntity;
+
+@Mapper
+public interface TkDbConnectMapper extends BaseMapper<TkDbConnectEntity> {
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.yunteng.dto.TkDbConnectDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.TkDbConnectEntity;
+
+import java.util.Map;
+
+public interface TkDbConnectService extends BaseService<TkDbConnectEntity> {
+
+    TkPageData<TkDbConnectDTO> page(Map<String, Object> queryMap, String tenantId);
+
+    TkDbConnectDTO save(TkDbConnectDTO tkDbConnectDTO);
+
+    boolean delete(String id);
+
+    TkDbConnectDTO get(String id);
+}