0821

cloud-etl-common/src/main/java/com/muyu/etl/common/domain/DataSources.java

@@ -28,7 +28,7 @@ public class DataSources extends BaseEntity {
     private Long id ;
 
     /** 数据来源类型 */
-    private String type ;
+    private Long dataTypeId ;
 
     /** 数据来源名称 */
     private String name ;
@@ -48,14 +48,13 @@ public class DataSources extends BaseEntity {
     /** 数据库登录密码 */
     private String userPwd ;
 
-    /** 字符集编码 */
+    /** 参数 */
     private String param ;
 
     /** 状态 1启用 2禁用 */
     private String status ;
 
-    /** 注释 */
+
-    private String remark ;
 
 
 

cloud-etl-common/src/main/java/com/muyu/etl/common/domain/DataType.java

@@ -15,7 +15,7 @@ import lombok.Data;
 @AllArgsConstructor
 @TableName(value="data_type")
 public class DataType {
-    private Long id;
+    private Long dataTypeId;
 
     private String name;
 
@@ -24,7 +24,4 @@ public class DataType {
     private String prefix;
 
     private String suffix;
-
-
-
 }

cloud-etl-common/src/main/java/com/muyu/etl/common/domain/req/DataSourcesReq.java

@@ -0,0 +1,28 @@
+package com.muyu.etl.common.domain.req;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author：zhangzhihao
+ * @name：DataSourcesReq
+ * @Date：2024/8/21 20:55
+ * 不准抄代码，添加注释，清楚每一行代码意思
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DataSourcesReq {
+
+    /** 数据来源名称 */
+    private String name ;
+
+    /** 存放数据库名称 */
+    private String databaseName ;
+
+    private Integer pageNum=1;
+    private Integer pageSize=3;
+}

cloud-etl-common/src/main/java/com/muyu/etl/common/domain/resp/DataSourcesRes.java

@@ -0,0 +1,20 @@
+package com.muyu.etl.common.domain.resp;
+
+import com.muyu.etl.common.domain.DataSources;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author：zhangzhihao
+ * @name：DataSourcesRes
+ * @Date：2024/8/21 21:14
+ * 不准抄代码，添加注释，清楚每一行代码意思
+ */
+@Data
+//@Builder
+//@AllArgsConstructor
+//@NoArgsConstructor
+public class DataSourcesRes {
+}

cloud-etl-server/src/main/java/com/muyu/etl/server/controller/DataSourcesController.java

@@ -1,7 +1,10 @@
 package com.muyu.etl.server.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.muyu.common.core.domain.Result;
 import com.muyu.etl.common.domain.DataSources;
+import com.muyu.etl.common.domain.req.DataSourcesReq;
+import com.muyu.etl.common.domain.resp.DataSourcesRes;
 import com.muyu.etl.server.service.DataSourcesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageImpl;
@@ -33,6 +36,16 @@ public class DataSourcesController {
         return Result.success(dataSourcesService.getById(id));
     }
 
+    /**
+     * 查询所有已有数据源
+     * @param req
+     * @return
+     */
+    @PostMapping("/all")
+    public Result<Page<DataSources>> all(@RequestBody DataSourcesReq req){
+
+        return Result.success(dataSourcesService.selectList(req));
+    }
 
 
     /**

cloud-etl-server/src/main/java/com/muyu/etl/server/service/DataSourcesService.java

@@ -1,7 +1,12 @@
 package com.muyu.etl.server.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.etl.common.domain.DataSources;
+import com.muyu.etl.common.domain.req.DataSourcesReq;
+import com.muyu.etl.common.domain.resp.DataSourcesRes;
+
+import java.util.List;
 
 /**
  * @Author：zhangzhihao
@@ -10,5 +15,17 @@ import com.muyu.etl.common.domain.DataSources;
  * 不准抄代码，添加注释，清楚每一行代码意思
  */
 public interface DataSourcesService extends IService<DataSources> {
+    /**
+     * 修改数据源
+     * @param dataSources
+     * @return
+     */
     boolean update(DataSources dataSources);
+
+    /**
+     * 查询所有已有数据源
+     * @param req
+     * @return
+     */
+    Page<DataSources> selectList(DataSourcesReq req);
 }

cloud-etl-server/src/main/java/com/muyu/etl/server/service/impl/DataSourcesServiceImpl.java

@@ -1,13 +1,22 @@
 package com.muyu.etl.server.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.IPage;
+import com.muyu.common.core.utils.StringUtils;
 import com.muyu.etl.common.domain.DataSources;
+import com.muyu.etl.common.domain.req.DataSourcesReq;
+import com.muyu.etl.common.domain.resp.DataSourcesRes;
 import com.muyu.etl.server.mapper.DataSourcesMapper;
 import com.muyu.etl.server.service.DataSourcesService;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Author：zhangzhihao
  * @name：DataSourcesServiceImpl
@@ -19,6 +28,9 @@ import org.springframework.stereotype.Service;
 public class DataSourcesServiceImpl extends ServiceImpl<DataSourcesMapper, DataSources> implements DataSourcesService {
 
 
+    @Autowired
+    private DataSourcesMapper dataSourcesMapper;
+
     /**
      * 添加数据来源
      * @param dataSources
@@ -35,4 +47,20 @@ public class DataSourcesServiceImpl extends ServiceImpl<DataSourcesMapper, DataS
         return this.update(updateWrapper);
     }
 
+    @Override
+    public Page<DataSources> selectList(DataSourcesReq req) {
+
+        LambdaQueryWrapper<DataSources> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotEmpty(req.getName()), DataSources::getName,req.getName());
+        queryWrapper.like(StringUtils.isNotEmpty(req.getDatabaseName()), DataSources::getDatabaseName,req.getDatabaseName());
+
+        Page<DataSources> page = new Page<>(req.getPageNum(), req.getPageSize());
+
+
+        Page<DataSources> pageList = dataSourcesMapper.selectPage(page, queryWrapper);
+
+
+        return pageList;
+    }
+
 }