Commit 56c625a3 authored by pengxin's avatar pengxin

更改表名。

parent 9f8213dc
...@@ -29,5 +29,5 @@ public interface DatasetCleanMapper extends BaseDaoMapper<DatasetClean> { ...@@ -29,5 +29,5 @@ public interface DatasetCleanMapper extends BaseDaoMapper<DatasetClean> {
* @return 对象列表。 * @return 对象列表。
*/ */
List<DatasetClean> getDatasetCleanList( List<DatasetClean> getDatasetCleanList(
@Param("DatasetCleanFilter") DatasetClean datasetCleanFilter, @Param("orderBy") String orderBy); @Param("datasetCleanFilter") DatasetClean datasetCleanFilter, @Param("orderBy") String orderBy);
} }
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</resultMap> </resultMap>
<insert id="insertList"> <insert id="insertList">
INSERT INTO lmp_data_clean_config INSERT INTO lmp_dataset_clean_config
(clean_config_id, (clean_config_id,
clean_config, clean_config,
filter_config, filter_config,
...@@ -51,16 +51,16 @@ ...@@ -51,16 +51,16 @@
<sql id="inputFilterRef"> <sql id="inputFilterRef">
<if test="datasetCleanConfigFilter != null"> <if test="datasetCleanConfigFilter != null">
<if test="datasetCleanConfigFilter.cleanConfigId != 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>
<if test="datasetCleanConfigFilter.datasetId != null"> <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>
</if> </if>
</sql> </sql>
<select id="getDatasetCleanConfigList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.DatasetCleanConfig"> <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> <where>
<include refid="filterRef"/> <include refid="filterRef"/>
</where> </where>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</resultMap> </resultMap>
<insert id="insertList"> <insert id="insertList">
INSERT INTO lmp_data_clean INSERT INTO lmp_dataset_clean
(clean_id, (clean_id,
dataset_id, dataset_id,
dataset_name, dataset_name,
...@@ -54,16 +54,16 @@ ...@@ -54,16 +54,16 @@
<sql id="inputFilterRef"> <sql id="inputFilterRef">
<if test="datasetCleanFilter != null"> <if test="datasetCleanFilter != null">
<if test="datasetCleanFilter.cleanId != null"> <if test="datasetCleanFilter.cleanId != null">
AND lmp_data_clean.clean_id = #{datasetCleanFilter.cleanId} AND lmp_dataset_clean.clean_id = #{datasetCleanFilter.cleanId}
</if> </if>
<if test="datasetCleanFilter.datasetId != null"> <if test="datasetCleanFilter.datasetId != null">
AND lmp_data_clean.dataset_id = #{datasetCleanFilter.datasetId} AND lmp_dataset_clean.dataset_id = #{datasetCleanFilter.datasetId}
</if> </if>
</if> </if>
</sql> </sql>
<select id="getDatasetCleanList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.DatasetClean"> <select id="getDatasetCleanList" resultMap="BaseResultMap" parameterType="com.yice.webadmin.app.model.DatasetClean">
SELECT * FROM lmp_data_clean SELECT * FROM lmp_dataset_clean
<where> <where>
<include refid="filterRef"/> <include refid="filterRef"/>
</where> </where>
......
...@@ -125,7 +125,6 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp ...@@ -125,7 +125,6 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp
DatasetCleanConfig cleanConfig = datasetCleanConfigService.getOne(filter); DatasetCleanConfig cleanConfig = datasetCleanConfigService.getOne(filter);
} }
} }
} }
/** /**
...@@ -214,6 +213,7 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp ...@@ -214,6 +213,7 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp
DatasetCleanConfig filter = new DatasetCleanConfig(); DatasetCleanConfig filter = new DatasetCleanConfig();
filter.setCleanId(datasetClean.getCleanId()); filter.setCleanId(datasetClean.getCleanId());
DatasetCleanConfig cleanConfig = datasetCleanConfigService.getOne(filter); DatasetCleanConfig cleanConfig = datasetCleanConfigService.getOne(filter);
if(null != cleanConfig) {
jsonStrings.add(cleanConfig.getCleanConfig()); jsonStrings.add(cleanConfig.getCleanConfig());
jsonStrings.add(cleanConfig.getDeduplicateConfig()); jsonStrings.add(cleanConfig.getDeduplicateConfig());
jsonStrings.add(cleanConfig.getFilterConfig()); jsonStrings.add(cleanConfig.getFilterConfig());
...@@ -225,6 +225,7 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp ...@@ -225,6 +225,7 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp
} }
} }
} }
}
/** /**
* 新增清理对象 * 新增清理对象
......
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