数据源类型

cloud-etl-common/src/main/java/com/muyu/domain/Source.java

@@ -2,13 +2,8 @@ package com.muyu.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.muyu.common.core.annotation.Excel;
 import com.muyu.common.core.web.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
 import java.util.Map;
@@ -18,12 +13,57 @@ public class Source extends BaseEntity {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-
+    /** 接入源名称 */
-    /**
+    @Excel(name = "接入源名称")
-     *数据接入源
-     */
     private String dataResourceName;
 
+    /** 数据来源系统名称 */
+    @Excel(name = "数据来源系统名称")
+    private String dataSourcesSystemName;
+
+    /** 主机ip地址 */
+    @Excel(name = "主机ip地址")
+    private String host;
+
+    /** 端口 */
+    @Excel(name = "端口")
+    private String port;
+
+    /** 数据接入类型 */
+    @Excel(name = "数据接入类型")
+    private String databaseType;
+
+    /** 数据库名称 */
+    @Excel(name = "数据库名称")
+    private String databaseName;
+
+    /** 初始化连接数量 */
+    @Excel(name = "初始化连接数量")
+    private Long initLinkNum;
+
+    /** 最大连接数量 */
+    @Excel(name = "最大连接数量")
+    private Long maxLinkNum;
+
+    /** 最大等待时间 */
+    @Excel(name = "最大等待时间")
+    private Long maxWaitTime;
+
+    /** 最大等待次数 */
+    @Excel(name = "最大等待次数")
+    private Long maxWaitTimes;
+
+    @Excel(name ="连接参数")
+    private String connectionParams;
+
+    @Excel(name ="用户名")
+    private String username;
+
+    @Excel(name ="密码")
+    private String password;
+
+
+
     @Override
     public String toString() {
         return "Source{" +
@@ -209,63 +249,5 @@ public class Source extends BaseEntity {
         this.password = password;
     }
 
-    /**
-     * 数据来源表
-     */
-    private String dataSourcesSystemName;
 
-    /**
-     * 主机Ip地址
-     */
-    private String host;
-
-    /**
-     * 端口
-     */
-    private String port;
-
-
-    /**
-     * 数据类型
-     */
-    private String databaseType;
-
-    /**
-     * 数据库名称
-     */
-    private String databaseName;
-
-    /**
-     * 初始化连接数量
-     */
-    private Long initLinkNum;
-
-    /**
-     * 多大连接数量
-     */
-    private Long maxLinkNum;
-
-    /**
-     * 最长等待时间
-     */
-    private Long maxWaitTime;
-
-    /**
-     * 最多连接数量
-     */
-    private Long maxWaitTimes;
-    /**
-     * 连接参数
-     */
-    private String connectionParams;
-
-    /**
-     * 用户名
-     */
-    private String username;
-
-    /**
-     * 密码
-     */
-    private String password;
 }

cloud-etl-common/src/main/java/com/muyu/domain/req/SourceReq.java

@@ -2,25 +2,60 @@ package com.muyu.domain.req;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.muyu.common.core.annotation.Excel;
 import com.muyu.common.core.web.domain.BaseEntity;
-import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
 import java.util.Map;
 
-//连接数据源
+
 
 
 public class SourceReq extends BaseEntity {
     /** 主键 */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-    /**
+
-     *
+    /** 接入源名称 */
-     *数据接入源
+    @Excel(name = "接入源名称")
-     */
     private String dataResourceName;
 
+    /** 数据来源系统名称 */
+    @Excel(name = "数据来源系统名称")
+    private String dataSourcesSystemName;
+
+    /** 主机ip地址 */
+    @Excel(name = "主机ip地址")
+    private String host;
+
+    /** 端口 */
+    @Excel(name = "端口")
+    private String port;
+
+    /** 数据接入类型 */
+    @Excel(name = "数据接入类型")
+    private String databaseType;
+
+    /** 数据库名称 */
+    @Excel(name = "数据库名称")
+    private String databaseName;
+
+    /** 初始化连接数量 */
+    @Excel(name = "初始化连接数量")
+    private Long initLinkNum;
+
+    /** 最大连接数量 */
+    @Excel(name = "最大连接数量")
+    private Long maxLinkNum;
+
+    /** 最大等待时间 */
+    @Excel(name = "最大等待时间")
+    private Long maxWaitTime;
+
+    /** 最大等待次数 */
+    @Excel(name = "最大等待次数")
+    private Long maxWaitTimes;
+
     @Override
     public String toString() {
         return "SourceReq{" +
@@ -35,7 +70,6 @@ public class SourceReq extends BaseEntity {
                 ", maxLinkNum=" + maxLinkNum +
                 ", maxWaitTime=" + maxWaitTime +
                 ", maxWaitTimes=" + maxWaitTimes +
-                ", connectionParams='" + connectionParams + '\'' +
                 '}';
     }
 
@@ -127,13 +161,7 @@ public class SourceReq extends BaseEntity {
         this.maxWaitTimes = maxWaitTimes;
     }
 
-    public String getConnectionParams() {
-        return connectionParams;
-    }
 
-    public void setConnectionParams(String connectionParams) {
-        this.connectionParams = connectionParams;
-    }
 
     public SourceReq(BaseEntityBuilder<?, ?> b, Long id, String dataResourceName, String dataSourcesSystemName, String host, String port, String databaseType, String databaseName, Long initLinkNum, Long maxLinkNum, Long maxWaitTime, Long maxWaitTimes, String connectionParams) {
         super(b);
@@ -148,7 +176,7 @@ public class SourceReq extends BaseEntity {
         this.maxLinkNum = maxLinkNum;
         this.maxWaitTime = maxWaitTime;
         this.maxWaitTimes = maxWaitTimes;
-        this.connectionParams = connectionParams;
+
     }
 
     public SourceReq(Long id, String dataResourceName, String dataSourcesSystemName, String host, String port, String databaseType, String databaseName, Long initLinkNum, Long maxLinkNum, Long maxWaitTime, Long maxWaitTimes, String connectionParams) {
@@ -163,7 +191,6 @@ public class SourceReq extends BaseEntity {
         this.maxLinkNum = maxLinkNum;
         this.maxWaitTime = maxWaitTime;
         this.maxWaitTimes = maxWaitTimes;
-        this.connectionParams = connectionParams;
     }
 
     public SourceReq(String searchValue, String createBy, Date createTime, String updateBy, Date updateTime, String remark, Map<String, Object> params, Long id, String dataResourceName, String dataSourcesSystemName, String host, String port, String databaseType, String databaseName, Long initLinkNum, Long maxLinkNum, Long maxWaitTime, Long maxWaitTimes, String connectionParams) {
@@ -179,53 +206,9 @@ public class SourceReq extends BaseEntity {
         this.maxLinkNum = maxLinkNum;
         this.maxWaitTime = maxWaitTime;
         this.maxWaitTimes = maxWaitTimes;
-        this.connectionParams = connectionParams;
+
     }
 
-    /**
-     * 数据来源表
-     */
-    private String dataSourcesSystemName;
 
-    /**
-     * 主机Ip地址
-     */
-    private String host;
-
-    /**
-     * 端口
-     */
-    private String port;
-
-
-    /**
-     * 数据类型
-     */
-    private String databaseType;
-
-    /**
-     * 数据库名称
-     */
-    private String databaseName;
-
-    /**
-     * 初始化连接数量
-     */
-    private Long initLinkNum;
-
-    /**
-     * 多大连接数量
-     */
-    private Long maxLinkNum;
-
-    /**
-     * 最长等待时间
-     */
-    private Long maxWaitTime;
-
-    /**
-     * 最多连接数量
-     */
-    private Long maxWaitTimes;
 
 }

cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/SourceController.java

@@ -31,7 +31,6 @@ public class SourceController extends BaseController {
         return getDataTable(list);
     }
 
-
     /*
      * 导出
      */

cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceServiceImpl.java

@@ -34,4 +34,5 @@ public class SourceServiceImpl extends ServiceImpl<SourceMapper, Source> impleme
         int insert = sourceMapper.insert(sourceReq);
         return insert;
     }
+
 }