diff --git a/backend/pom.xml b/backend/pom.xml
index 2bb2b6b50d..c4bda7ce63 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -342,11 +342,11 @@
spring-boot-starter-data-ldap
-
+
+ ru.yandex.clickhouse
+ clickhouse-jdbc
+ 0.3.1
+
diff --git a/backend/src/main/java/io/dataease/base/domain/Datasource.java b/backend/src/main/java/io/dataease/base/domain/Datasource.java
index 86b2bca643..d8a2f6c4ac 100644
--- a/backend/src/main/java/io/dataease/base/domain/Datasource.java
+++ b/backend/src/main/java/io/dataease/base/domain/Datasource.java
@@ -1,29 +1,28 @@
package io.dataease.base.domain;
import java.io.Serializable;
-
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class Datasource implements Serializable {
- @ApiModelProperty("ID")
private String id;
- @ApiModelProperty("名称")
+
private String name;
- @ApiModelProperty("描述")
+
private String desc;
- @ApiModelProperty("类型")
+
private String type;
- @ApiModelProperty("创建时间")
+
private Long createTime;
- @ApiModelProperty("更新时间")
+
private Long updateTime;
- @ApiModelProperty("创建者")
+
private String createBy;
- @ApiModelProperty("状态")
+
private String status;
- @ApiModelProperty("配置")
+
+ private String computeType;
+
private String configuration;
private static final long serialVersionUID = 1L;
diff --git a/backend/src/main/java/io/dataease/base/domain/DatasourceExample.java b/backend/src/main/java/io/dataease/base/domain/DatasourceExample.java
index c59e358431..c0fe88e1a8 100644
--- a/backend/src/main/java/io/dataease/base/domain/DatasourceExample.java
+++ b/backend/src/main/java/io/dataease/base/domain/DatasourceExample.java
@@ -643,6 +643,76 @@ public class DatasourceExample {
addCriterion("`status` not between", value1, value2, "status");
return (Criteria) this;
}
+
+ public Criteria andComputeTypeIsNull() {
+ addCriterion("compute_type is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andComputeTypeIsNotNull() {
+ addCriterion("compute_type is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andComputeTypeEqualTo(String value) {
+ addCriterion("compute_type =", value, "computeType");
+ return (Criteria) this;
+ }
+
+ public Criteria andComputeTypeNotEqualTo(String value) {
+ addCriterion("compute_type <>", value, "computeType");
+ return (Criteria) this;
+ }
+
+ public Criteria andComputeTypeGreaterThan(String value) {
+ addCriterion("compute_type >", value, "computeType");
+ return (Criteria) this;
+ }
+
+ public Criteria andComputeTypeGreaterThanOrEqualTo(String value) {
+ addCriterion("compute_type >=", value, "computeType");
+ return (Criteria) this;
+ }
+
+ public Criteria andComputeTypeLessThan(String value) {
+ addCriterion("compute_type <", value, "computeType");
+ return (Criteria) this;
+ }
+
+ public Criteria andComputeTypeLessThanOrEqualTo(String value) {
+ addCriterion("compute_type <=", value, "computeType");
+ return (Criteria) this;
+ }
+
+ public Criteria andComputeTypeLike(String value) {
+ addCriterion("compute_type like", value, "computeType");
+ return (Criteria) this;
+ }
+
+ public Criteria andComputeTypeNotLike(String value) {
+ addCriterion("compute_type not like", value, "computeType");
+ return (Criteria) this;
+ }
+
+ public Criteria andComputeTypeIn(List values) {
+ addCriterion("compute_type in", values, "computeType");
+ return (Criteria) this;
+ }
+
+ public Criteria andComputeTypeNotIn(List values) {
+ addCriterion("compute_type not in", values, "computeType");
+ return (Criteria) this;
+ }
+
+ public Criteria andComputeTypeBetween(String value1, String value2) {
+ addCriterion("compute_type between", value1, value2, "computeType");
+ return (Criteria) this;
+ }
+
+ public Criteria andComputeTypeNotBetween(String value1, String value2) {
+ addCriterion("compute_type not between", value1, value2, "computeType");
+ return (Criteria) this;
+ }
}
public static class Criteria extends GeneratedCriteria {
diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasourceMapper.xml b/backend/src/main/java/io/dataease/base/mapper/DatasourceMapper.xml
index 67713c420f..29abb1dcfb 100644
--- a/backend/src/main/java/io/dataease/base/mapper/DatasourceMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/DatasourceMapper.xml
@@ -10,6 +10,7 @@
+
@@ -73,7 +74,7 @@
- id, `name`, `desc`, `type`, create_time, update_time, create_by, `status`
+ id, `name`, `desc`, `type`, create_time, update_time, create_by, `status`, compute_type
configuration
@@ -129,12 +130,12 @@
insert into datasource (id, `name`, `desc`,
`type`, create_time, update_time,
- create_by, `status`, configuration
- )
+ create_by, `status`, compute_type,
+ configuration)
values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{desc,jdbcType=VARCHAR},
#{type,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT},
- #{createBy,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{configuration,jdbcType=LONGVARCHAR}
- )
+ #{createBy,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{computeType,jdbcType=VARCHAR},
+ #{configuration,jdbcType=LONGVARCHAR})
insert into datasource
@@ -163,6 +164,9 @@
`status`,
+
+ compute_type,
+
configuration,
@@ -192,6 +196,9 @@
#{status,jdbcType=VARCHAR},
+
+ #{computeType,jdbcType=VARCHAR},
+
#{configuration,jdbcType=LONGVARCHAR},
@@ -230,6 +237,9 @@
`status` = #{record.status,jdbcType=VARCHAR},
+
+ compute_type = #{record.computeType,jdbcType=VARCHAR},
+
configuration = #{record.configuration,jdbcType=LONGVARCHAR},
@@ -248,6 +258,7 @@
update_time = #{record.updateTime,jdbcType=BIGINT},
create_by = #{record.createBy,jdbcType=VARCHAR},
`status` = #{record.status,jdbcType=VARCHAR},
+ compute_type = #{record.computeType,jdbcType=VARCHAR},
configuration = #{record.configuration,jdbcType=LONGVARCHAR}
@@ -262,7 +273,8 @@
create_time = #{record.createTime,jdbcType=BIGINT},
update_time = #{record.updateTime,jdbcType=BIGINT},
create_by = #{record.createBy,jdbcType=VARCHAR},
- `status` = #{record.status,jdbcType=VARCHAR}
+ `status` = #{record.status,jdbcType=VARCHAR},
+ compute_type = #{record.computeType,jdbcType=VARCHAR}
@@ -291,6 +303,9 @@
`status` = #{status,jdbcType=VARCHAR},
+
+ compute_type = #{computeType,jdbcType=VARCHAR},
+
configuration = #{configuration,jdbcType=LONGVARCHAR},
@@ -306,6 +321,7 @@
update_time = #{updateTime,jdbcType=BIGINT},
create_by = #{createBy,jdbcType=VARCHAR},
`status` = #{status,jdbcType=VARCHAR},
+ compute_type = #{computeType,jdbcType=VARCHAR},
configuration = #{configuration,jdbcType=LONGVARCHAR}
where id = #{id,jdbcType=VARCHAR}
@@ -317,7 +333,8 @@
create_time = #{createTime,jdbcType=BIGINT},
update_time = #{updateTime,jdbcType=BIGINT},
create_by = #{createBy,jdbcType=VARCHAR},
- `status` = #{status,jdbcType=VARCHAR}
+ `status` = #{status,jdbcType=VARCHAR},
+ compute_type = #{computeType,jdbcType=VARCHAR}
where id = #{id,jdbcType=VARCHAR}
\ No newline at end of file
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml
index d2dd06d0b8..0c994290b9 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml
@@ -8,7 +8,7 @@