Commit 56c625a3 authored by pengxin's avatar pengxin

更改表名。

parent 9f8213dc
......@@ -29,5 +29,5 @@ public interface DatasetCleanMapper extends BaseDaoMapper<DatasetClean> {
* @return 对象列表。
*/
List<DatasetClean> getDatasetCleanList(
@Param("DatasetCleanFilter") DatasetClean datasetCleanFilter, @Param("orderBy") String orderBy);
@Param("datasetCleanFilter") DatasetClean datasetCleanFilter, @Param("orderBy") String orderBy);
}
......@@ -15,7 +15,7 @@
</resultMap>
<insert id="insertList">
INSERT INTO lmp_data_clean_config
INSERT INTO lmp_dataset_clean_config
(clean_config_id,
clean_config,
filter_config,
......@@ -51,16 +51,16 @@
<sql id="inputFilterRef">
<if test="datasetCleanConfigFilter != null">
<if test="datasetCleanConfigFilter.cleanConfigId != null">
AND lmp_data_clean_config.clean_config_id = #{datasetCleanConfigFilter.cleanConfigId}
AND lmp_dataset_clean_config.clean_config_id = #{datasetCleanConfigFilter.cleanConfigId}
</if>
<if test="datasetCleanConfigFilter.datasetId != null">
AND lmp_data_clean_config.dataset_id = #{datasetCleanConfigFilter.datasetId}
AND lmp_dataset_clean_config.dataset_id = #{datasetCleanConfigFilter.datasetId}
</if>
</if>
</sql>
<select id="getDatasetCleanConfigList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.DatasetCleanConfig">
SELECT * FROM lmp_data_clean_config
SELECT * FROM lmp_dataset_clean_config
<where>
<include refid="filterRef"/>
</where>
......
......@@ -16,7 +16,7 @@
</resultMap>
<insert id="insertList">
INSERT INTO lmp_data_clean
INSERT INTO lmp_dataset_clean
(clean_id,
dataset_id,
dataset_name,
......@@ -54,16 +54,16 @@
<sql id="inputFilterRef">
<if test="datasetCleanFilter != null">
<if test="datasetCleanFilter.cleanId != null">
AND lmp_data_clean.clean_id = #{datasetCleanFilter.cleanId}
AND lmp_dataset_clean.clean_id = #{datasetCleanFilter.cleanId}
</if>
<if test="datasetCleanFilter.datasetId != null">
AND lmp_data_clean.dataset_id = #{datasetCleanFilter.datasetId}
AND lmp_dataset_clean.dataset_id = #{datasetCleanFilter.datasetId}
</if>
</if>
</sql>
<select id="getDatasetCleanList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.DatasetClean">
SELECT * FROM lmp_data_clean
SELECT * FROM lmp_dataset_clean
<where>
<include refid="filterRef"/>
</where>
......
......@@ -125,7 +125,6 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp
DatasetCleanConfig cleanConfig = datasetCleanConfigService.getOne(filter);
}
}
}
/**
......@@ -214,14 +213,16 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp
DatasetCleanConfig filter = new DatasetCleanConfig();
filter.setCleanId(datasetClean.getCleanId());
DatasetCleanConfig cleanConfig = datasetCleanConfigService.getOne(filter);
jsonStrings.add(cleanConfig.getCleanConfig());
jsonStrings.add(cleanConfig.getDeduplicateConfig());
jsonStrings.add(cleanConfig.getFilterConfig());
jsonStrings.add(cleanConfig.getDesensitiveConfig());
List<String> nonEmptyJsonStrings = jsonStrings.stream()
.filter(s -> s != null && !s.isEmpty())
.collect(Collectors.toList());
datasetClean.setCleanMethod(JsonNameExtractor.extractNames(nonEmptyJsonStrings));
if(null != cleanConfig) {
jsonStrings.add(cleanConfig.getCleanConfig());
jsonStrings.add(cleanConfig.getDeduplicateConfig());
jsonStrings.add(cleanConfig.getFilterConfig());
jsonStrings.add(cleanConfig.getDesensitiveConfig());
List<String> nonEmptyJsonStrings = jsonStrings.stream()
.filter(s -> s != null && !s.isEmpty())
.collect(Collectors.toList());
datasetClean.setCleanMethod(JsonNameExtractor.extractNames(nonEmptyJsonStrings));
}
}
}
}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment