清洗模块更新

dataoperation-server/src/main/java/com/zq/dataoperation/controller/CommonQueryController.java

@@ -14,6 +14,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Api(tags = "通用查询")
@@ -29,8 +31,9 @@ public class CommonQueryController {
 
     @ApiOperation("获取全部数据源")
     @GetMapping("/datasource")
-    public ResultVo getDatasource() {
-        return ResultVo.success(commonQueryService.getDatasource());
+    public List<QueryDb> getDatasource() {
+        List<QueryDb> datasource = commonQueryService.getDatasource();
+        return datasource;
     }
 
     @ApiOperation("添加数据源")

dataoperation-server/src/main/java/com/zq/dataoperation/controller/DataCleanController.java

 package com.zq.dataoperation.controller;
 
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zq.common.utils.AssertUtils;
 import com.zq.common.vo.PageVo;
 import com.zq.common.vo.ResultVo;
 import com.zq.dataoperation.entity.DataCleanExpressCategory;
+import com.zq.dataoperation.entity.DataCleanRule;
+import com.zq.dataoperation.service.DataCleanRuleService;
 import com.zq.dataoperation.service.DataCleanService;
+import com.zq.spiderflow.dao.MetaDataDao;
+import com.zq.spiderflow.entity.MetaData;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -21,19 +27,30 @@ public class DataCleanController {
 
     @Resource
     private DataCleanService dataCleanService;
+    @Resource
+    private DataCleanRuleService dataCleanRuleService;
+    @Resource
+    private MetaDataDao metaDataDao;
 
     /**
-     * 新增模板目录
-     * @param entity
+     * 新增规则表达式
+     *
+     * @param dataCleanRule
      */
     @PostMapping("/add")
-    public ResultVo add(@RequestBody DataCleanExpressCategory entity){
-        AssertUtils.notNull(entity.getCategoryName(),"缺少目录名称");
-        return ResultVo.success(dataCleanService.save(entity));
+    public ResultVo add(@RequestBody DataCleanRule dataCleanRule) {
+        AssertUtils.notNull(dataCleanRule.getCleanExpress(), "缺少目录名称");
+        MetaData metaData = metaDataDao.selectById(dataCleanRule.getMetadataId());
+        if (metaData!=null){
+            dataCleanRule.setMetadataId(metaData.getId());
+        }
+        dataCleanRule.setCreateTime(DateUtil.date());
+        return ResultVo.success(dataCleanRuleService.save(dataCleanRule));
     }
 
     /**
      * 修改模板目录
+     *
      * @param entity
      * @return
      */
@@ -46,6 +63,7 @@ public class DataCleanController {
 
     /**
      * 获取全部目录列表
+     *
      * @return
      */
     @GetMapping("/getAll")
@@ -60,5 +78,20 @@ public class DataCleanController {
     }
 
 
+    /**
+     * 新增清洗表达式模板目录
+     *
+     * @param
+     */
+    @PostMapping("/addTemplateDir")
+    public ResultVo addTemplateDir(@RequestBody DataCleanExpressCategory dataCleanExpressCategory) {
+        AssertUtils.notNull(dataCleanExpressCategory.getCategoryName(), "缺少目录名称");
+        AssertUtils.notNull(dataCleanExpressCategory.getRuleCategoryId(), "缺少规则表ID");
+        DataCleanExpressCategory one = dataCleanService.getOne(new LambdaQueryWrapper<DataCleanExpressCategory>().eq(DataCleanExpressCategory::getId, dataCleanExpressCategory.getId()));
+        if (one !=null){
+            dataCleanExpressCategory.setParentId(one.getId());
+        }
+        return null;
+    }
 
 }

dataoperation-server/src/main/java/com/zq/dataoperation/dao/DataCleanRuleDao.java

+package com.zq.dataoperation.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zq.dataoperation.entity.DataCleanRule;
+
+public interface DataCleanRuleDao extends BaseMapper<DataCleanRule> {
+
+}

dataoperation-server/src/main/java/com/zq/dataoperation/entity/DataCleanRule.java

@@ -33,7 +33,7 @@ public class DataCleanRule{
      * 元数据id
      */
     @ApiModelProperty("元数据id")
-    private Integer metadataId;
+    private Long metadataId;
 
     /**
      * 清洗表达式

dataoperation-server/src/main/java/com/zq/dataoperation/service/DataCleanRuleService.java

+package com.zq.dataoperation.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zq.dataoperation.dao.DataCleanExpressCategoryDao;
+import com.zq.dataoperation.dao.DataCleanRuleDao;
+import com.zq.dataoperation.entity.DataCleanExpressCategory;
+import com.zq.dataoperation.entity.DataCleanRule;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class DataCleanRuleService extends ServiceImpl<DataCleanRuleDao, DataCleanRule> {
+
+    private DataCleanRuleDao dataCleanRuleDao;
+
+}

dataoperation-server/src/main/java/com/zq/dataoperation/service/DataCleanService.java

@@ -2,6 +2,7 @@ package com.zq.dataoperation.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zq.dataoperation.dao.DataCleanExpressCategoryDao;
+import com.zq.dataoperation.dao.DataCleanRuleDao;
 import com.zq.dataoperation.entity.DataCleanExpressCategory;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

spider-flow-web/src/main/java/com/zq/spiderflow/controller/DataSourceController.java

@@ -93,4 +93,6 @@ public class DataSourceController {
 		}
 	}
 
+
+
 }