清洗列表新增总个数查询。

application-webadmin/src/main/java/com/yice/webadmin/app/controller/DatasetCleanConfigController.java

@@ -141,7 +141,8 @@ public class DatasetCleanConfigController {
         DatasetDataClean filter = MyModelUtil.copyTo(cleanDtoFilter, DatasetDataClean.class);
         List<DatasetDataClean> datasetDataCleanList =
                 datasetCleanConfigService.getDatasetCleanList(filter, pageParam);
-        return ResponseResult.success(MyPageUtil.makeResponseData(datasetDataCleanList));
+        Long count = datasetCleanConfigService.getCleanCount(filter);
+        return ResponseResult.success(MyPageUtil.makeResponseData(datasetDataCleanList,count));
     }
 
     /**
@@ -161,7 +162,8 @@ public class DatasetCleanConfigController {
         DatasetDataFilter filter = MyModelUtil.copyTo(filterDtoFilter, DatasetDataFilter.class);
         List<DatasetDataFilter> datasetDataFilterList =
                 datasetCleanConfigService.getDatasetFilterList(filter, pageParam);
-        return ResponseResult.success(MyPageUtil.makeResponseData(datasetDataFilterList));
+        Long count = datasetCleanConfigService.getFilterCount(filter);
+        return ResponseResult.success(MyPageUtil.makeResponseData(datasetDataFilterList,count));
     }
 
     /**
@@ -181,7 +183,8 @@ public class DatasetCleanConfigController {
         DatasetDataDeduplicate filter = MyModelUtil.copyTo(deduplicateDtoFilter, DatasetDataDeduplicate.class);
         List<DatasetDataDeduplicate> datasetDataDeduplicateList =
                 datasetCleanConfigService.getDatasetDeduplicateList(filter, pageParam);
-        return ResponseResult.success(MyPageUtil.makeResponseData(datasetDataDeduplicateList));
+        Long count = datasetCleanConfigService.getDeduplicateCount(filter);
+        return ResponseResult.success(MyPageUtil.makeResponseData(datasetDataDeduplicateList,count));
     }
 
     /**
@@ -201,7 +204,8 @@ public class DatasetCleanConfigController {
         DatasetDataDesensitive filter = MyModelUtil.copyTo(desensitiveDtoFilter, DatasetDataDesensitive.class);
         List<DatasetDataDesensitive> datasetDataDesensitiveList =
                 datasetCleanConfigService.getDatasetDesensitiveList(filter, pageParam);
-        return ResponseResult.success(MyPageUtil.makeResponseData(datasetDataDesensitiveList));
+        Long count = datasetCleanConfigService.getDesensitiveCount(filter);
+        return ResponseResult.success(MyPageUtil.makeResponseData(datasetDataDesensitiveList,count));
     }
 
     /**

application-webadmin/src/main/java/com/yice/webadmin/app/service/DatasetCleanConfigService.java

@@ -95,6 +95,27 @@ public interface DatasetCleanConfigService extends IBaseService<DatasetCleanConf
      */
     List<DatasetDataClean> getDatasetCleanList(DatasetDataClean filter, MyPageParam pageParam);
 
+    /**
+     * 查询数据集重复总个数
+     * @param filter 清洗对象
+     * @return 返回查看对象列表
+     */
+    Long getDeduplicateCount(DatasetDataDeduplicate filter);
+
+    /**
+     * 查询数据集清洗总个数
+     * @param filter 清洗对象
+     * @return 返回查看对象列表
+     */
+    Long getCleanCount(DatasetDataClean filter);
+
+    /**
+     * 查询数据集过滤总个数
+     * @param filter 清洗对象
+     * @return 返回查看对象列表
+     */
+    Long getFilterCount(DatasetDataFilter filter);
+
     /**
      * 查询数据集隐私列表集合
      * @param filter 清洗标识
@@ -103,6 +124,13 @@ public interface DatasetCleanConfigService extends IBaseService<DatasetCleanConf
      */
     List<DatasetDataDesensitive> getDatasetDesensitiveList(DatasetDataDesensitive filter, MyPageParam pageParam);
 
+    /**
+     * 查询数据集隐私总个数
+     * @param filter 清洗对象
+     * @return 返回查看对象列表
+     */
+    Long getDesensitiveCount(DatasetDataDesensitive filter);
+
     /**
      * 保存数据集去隐私100条数据新增对象。
      *

application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/DatasetCleanConfigServiceImpl.java

@@ -212,6 +212,54 @@ public class DatasetCleanConfigServiceImpl extends BaseService<DatasetCleanConfi
         return mongoTemplate.find(query, DatasetDataDesensitive.class);
     }
 
+    /**
+     * 查询数据集隐私总个数
+     * @param filter 清洗对象
+     * @return 返回查看对象列表
+     */
+    @Override
+    public Long getDesensitiveCount(DatasetDataDesensitive filter) {
+        Query query = new Query();
+        query.addCriteria(Criteria.where(MongoConstant.CLEAN_ID).is(filter.getCleanId()));
+        return mongoTemplate.count(query, DatasetDataDesensitive.class);
+    }
+
+    /**
+     * 查询数据集清洗总个数
+     * @param filter 清洗对象
+     * @return 返回查看对象列表
+     */
+    @Override
+    public Long getCleanCount(DatasetDataClean filter) {
+        Query query = new Query();
+        query.addCriteria(Criteria.where(MongoConstant.CLEAN_ID).is(filter.getCleanId()));
+        return mongoTemplate.count(query, DatasetDataClean.class);
+    }
+
+    /**
+     * 查询数据集过滤总个数
+     * @param filter 清洗对象
+     * @return 返回查看对象列表
+     */
+    @Override
+    public Long getFilterCount(DatasetDataFilter filter) {
+        Query query = new Query();
+        query.addCriteria(Criteria.where(MongoConstant.CLEAN_ID).is(filter.getCleanId()));
+        return mongoTemplate.count(query, DatasetDataFilter.class);
+    }
+
+    /**
+     * 查询数据集重复总个数
+     * @param filter 清洗对象
+     * @return 返回查看对象列表
+     */
+    @Override
+    public Long getDeduplicateCount(DatasetDataDeduplicate filter) {
+        Query query = new Query();
+        query.addCriteria(Criteria.where(MongoConstant.CLEAN_ID).is(filter.getCleanId()));
+        return mongoTemplate.count(query, DatasetDataDeduplicate.class);
+    }
+
     /**
      * 保存数据集清洗100条数据新增对象。
      *

application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/DatasetCleanServiceImpl.java

@@ -425,7 +425,7 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp
                     dataClean.setCleanBeforeData(data);
 
                     String cleanAfterData = DataCleanerUtil.buildCleanAfterData(data,rules);
-                    if(StringUtils.isEmpty(cleanAfterData)) break;
+                    if(StringUtils.isEmpty(cleanAfterData) || data.equals(cleanAfterData)) break;
 
                     dataClean.setCleanAfterData(cleanAfterData);
                     dataClean.setCleanId(cleanId);
@@ -465,7 +465,7 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp
                     String data = node.get(DatasetConstant.OUTPUT).textValue();
 
                     String cleanAfterData = DataCleanerUtil.buildCleanAfterData(data,rules);
-                    if(StringUtils.isEmpty(cleanAfterData)) break;
+                    if(StringUtils.isEmpty(cleanAfterData) || data.equals(cleanAfterData)) break;
 
                     desensitive.setCleanBeforeData(data);
                     desensitive.setCleanAfterData(cleanAfterData);
@@ -506,7 +506,7 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp
                     String data = jsonNode.get(DatasetConstant.OUTPUT).textValue();
 
                     String cleanAfterData = DataCleanerUtil.buildCleanAfterData(data,rules);
-                    if(StringUtils.isEmpty(cleanAfterData)) break;
+                    if(StringUtils.isEmpty(cleanAfterData) || data.equals(cleanAfterData)) break;
 
                     deduplicate.setCleanBeforeData(data);
                     deduplicate.setCleanAfterData(cleanAfterData);
@@ -549,7 +549,7 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp
                     String data = rootNode.get(DatasetConstant.OUTPUT).textValue();
 
                     String cleanAfterData = DataCleanerUtil.buildCleanAfterData(data,rules);
-                    if(StringUtils.isEmpty(cleanAfterData)) break;
+                    if(StringUtils.isEmpty(cleanAfterData) || data.equals(cleanAfterData)) break;
 
                     dataFilter.setCleanBeforeData(data);
                     dataFilter.setCleanAfterData(cleanAfterData);