github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 03:52:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat: 数据集字段类型：type(原始类型)，de_type(dataease 计算使用)、de_extract_type(往 doris 抽取数据使用)

Browse Source
This commit is contained in:
taojinlong 2021-05-13 14:45:01 +08:00
parent 9e5bde6df3
commit e963e586f5
7 changed files with 93 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/base/domain/DatasetTableField.java
View File

@ -24,6 +24,8 @@ public class DatasetTableField implements Serializable {
private Integer deType;
private Integer deExtractType;
private Boolean checked;
private Integer columnIndex;

60
backend/src/main/java/io/dataease/base/domain/DatasetTableFieldExample.java
View File

@ -644,6 +644,66 @@ public class DatasetTableFieldExample {
return (Criteria) this;
}
public Criteria andDeExtractTypeIsNull() {
addCriterion("de_extract_type is null");
return (Criteria) this;
}
public Criteria andDeExtractTypeIsNotNull() {
addCriterion("de_extract_type is not null");
return (Criteria) this;
}
public Criteria andDeExtractTypeEqualTo(Integer value) {
addCriterion("de_extract_type =", value, "deExtractType");
return (Criteria) this;
}
public Criteria andDeExtractTypeNotEqualTo(Integer value) {
addCriterion("de_extract_type <>", value, "deExtractType");
return (Criteria) this;
}
public Criteria andDeExtractTypeGreaterThan(Integer value) {
addCriterion("de_extract_type >", value, "deExtractType");
return (Criteria) this;
}
public Criteria andDeExtractTypeGreaterThanOrEqualTo(Integer value) {
addCriterion("de_extract_type >=", value, "deExtractType");
return (Criteria) this;
}
public Criteria andDeExtractTypeLessThan(Integer value) {
addCriterion("de_extract_type <", value, "deExtractType");
return (Criteria) this;
}
public Criteria andDeExtractTypeLessThanOrEqualTo(Integer value) {
addCriterion("de_extract_type <=", value, "deExtractType");
return (Criteria) this;
}
public Criteria andDeExtractTypeIn(List<Integer> values) {
addCriterion("de_extract_type in", values, "deExtractType");
return (Criteria) this;
}
public Criteria andDeExtractTypeNotIn(List<Integer> values) {
addCriterion("de_extract_type not in", values, "deExtractType");
return (Criteria) this;
}
public Criteria andDeExtractTypeBetween(Integer value1, Integer value2) {
addCriterion("de_extract_type between", value1, value2, "deExtractType");
return (Criteria) this;
}
public Criteria andDeExtractTypeNotBetween(Integer value1, Integer value2) {
addCriterion("de_extract_type not between", value1, value2, "deExtractType");
return (Criteria) this;
}
public Criteria andCheckedIsNull() {
addCriterion("`checked` is null");
return (Criteria) this;

29
backend/src/main/java/io/dataease/base/mapper/DatasetTableFieldMapper.xml
View File

@ -10,6 +10,7 @@
<result column="type" jdbcType="VARCHAR" property="type" />
<result column="size" jdbcType="INTEGER" property="size" />
<result column="de_type" jdbcType="INTEGER" property="deType" />
<result column="de_extract_type" jdbcType="INTEGER" property="deExtractType" />
<result column="checked" jdbcType="BIT" property="checked" />
<result column="column_index" jdbcType="INTEGER" property="columnIndex" />
<result column="last_sync_time" jdbcType="BIGINT" property="lastSyncTime" />
@ -73,8 +74,8 @@
</where>
</sql>
<sql id="Base_Column_List">
id, table_id, origin_name, `name`, dataease_name, `type`, `size`, de_type, `checked`,
column_index, last_sync_time
id, table_id, origin_name, `name`, dataease_name, `type`, `size`, de_type, de_extract_type,
`checked`, column_index, last_sync_time
</sql>
<select id="selectByExample" parameterType="io.dataease.base.domain.DatasetTableFieldExample" resultMap="BaseResultMap">
select
@ -109,12 +110,14 @@
<insert id="insert" parameterType="io.dataease.base.domain.DatasetTableField">
insert into dataset_table_field (id, table_id, origin_name,
`name`, dataease_name, `type`,
`size`, de_type, `checked`,
column_index, last_sync_time)
`size`, de_type, de_extract_type,
`checked`, column_index, last_sync_time
)
values (#{id,jdbcType=VARCHAR}, #{tableId,jdbcType=VARCHAR}, #{originName,jdbcType=VARCHAR},
#{name,jdbcType=VARCHAR}, #{dataeaseName,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
#{size,jdbcType=INTEGER}, #{deType,jdbcType=INTEGER}, #{checked,jdbcType=BIT},
#{columnIndex,jdbcType=INTEGER}, #{lastSyncTime,jdbcType=BIGINT})
#{size,jdbcType=INTEGER}, #{deType,jdbcType=INTEGER}, #{deExtractType,jdbcType=INTEGER},
#{checked,jdbcType=BIT}, #{columnIndex,jdbcType=INTEGER}, #{lastSyncTime,jdbcType=BIGINT}
)
</insert>
<insert id="insertSelective" parameterType="io.dataease.base.domain.DatasetTableField">
insert into dataset_table_field
@ -143,6 +146,9 @@
<if test="deType != null">
de_type,
</if>
<if test="deExtractType != null">
de_extract_type,
</if>
<if test="checked != null">
`checked`,
</if>
@ -178,6 +184,9 @@
<if test="deType != null">
#{deType,jdbcType=INTEGER},
</if>
<if test="deExtractType != null">
#{deExtractType,jdbcType=INTEGER},
</if>
<if test="checked != null">
#{checked,jdbcType=BIT},
</if>
@ -222,6 +231,9 @@
<if test="record.deType != null">
de_type = #{record.deType,jdbcType=INTEGER},
</if>
<if test="record.deExtractType != null">
de_extract_type = #{record.deExtractType,jdbcType=INTEGER},
</if>
<if test="record.checked != null">
`checked` = #{record.checked,jdbcType=BIT},
</if>
@ -246,6 +258,7 @@
`type` = #{record.type,jdbcType=VARCHAR},
`size` = #{record.size,jdbcType=INTEGER},
de_type = #{record.deType,jdbcType=INTEGER},
de_extract_type = #{record.deExtractType,jdbcType=INTEGER},
`checked` = #{record.checked,jdbcType=BIT},
column_index = #{record.columnIndex,jdbcType=INTEGER},
last_sync_time = #{record.lastSyncTime,jdbcType=BIGINT}
@ -277,6 +290,9 @@
<if test="deType != null">
de_type = #{deType,jdbcType=INTEGER},
</if>
<if test="deExtractType != null">
de_extract_type = #{deExtractType,jdbcType=INTEGER},
</if>
<if test="checked != null">
`checked` = #{checked,jdbcType=BIT},
</if>
@ -298,6 +314,7 @@
`type` = #{type,jdbcType=VARCHAR},
`size` = #{size,jdbcType=INTEGER},
de_type = #{deType,jdbcType=INTEGER},
de_extract_type = #{deExtractType,jdbcType=INTEGER},
`checked` = #{checked,jdbcType=BIT},
column_index = #{columnIndex,jdbcType=INTEGER},
last_sync_time = #{lastSyncTime,jdbcType=BIGINT}

2
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -514,8 +514,10 @@ public class DataSetTableService {
datasetTableField.setType(filed.getFieldType());
if (ObjectUtils.isEmpty(ds)) {
datasetTableField.setDeType(transFieldType(filed.getFieldType()));
datasetTableField.setDeExtractType(transFieldType(filed.getFieldType()));
} else {
datasetTableField.setDeType(transFieldType(ds.getType(), filed.getFieldType()));
datasetTableField.setDeExtractType(transFieldType(ds.getType(), filed.getFieldType()));
}
datasetTableField.setSize(filed.getFieldSize());
datasetTableField.setChecked(true);

4
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -113,7 +113,7 @@ public class ExtractDataService {
String Column_Fields = "dataease_uuid varchar(50), `";
for (DatasetTableField datasetTableField : datasetTableFields) {
Column_Fields = Column_Fields + datasetTableField.getDataeaseName() + "` ";
switch (datasetTableField.getDeType()){
switch (datasetTableField.getDeExtractType()){
case 0:
if(datasetTableField.getSize() > 65533){
Column_Fields = Column_Fields + "String" + ",`";
@ -531,7 +531,7 @@ public class ExtractDataService {
private StepMeta udjc(List<DatasetTableField> datasetTableFields){
String needToChangeolumnType = "";
for (DatasetTableField datasetTableField : datasetTableFields) {
if(datasetTableField.getDeType() != null && datasetTableField.getDeType() == 4){
if(datasetTableField.getDeExtractType() != null && datasetTableField.getDeExtractType() == 4){
needToChangeolumnType = needToChangeolumnType + alterColumnTypeCode.replace("FILED", datasetTableField.getOriginName());
}
}

1
backend/src/main/resources/db/migration/V17__dataset_table_field.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `dataset_table_field` ADD COLUMN `de_extract_type` INT(10) NOT NULL AFTER `de_type`;

6
backend/src/main/resources/generatorConfig.xml
View File

@ -65,9 +65,9 @@
<!--要生成的数据库表 -->
<table tableName="dataset_table_incremental_config">
<columnOverride column="incremental_delete" javaType="java.lang.String" jdbcType="VARCHAR" />
<columnOverride column="incremental_add" javaType="java.lang.String" jdbcType="VARCHAR" />
<table tableName="dataset_table_field">
<!-- <columnOverride column="incremental_delete" javaType="java.lang.String" jdbcType="VARCHAR" />-->
<!-- <columnOverride column="incremental_add" javaType="java.lang.String" jdbcType="VARCHAR" />-->
</table>