From 6c9b9eb4b63459e3ff3e7e37e50c13ee873dd118 Mon Sep 17 00:00:00 2001 From: zzh <2441574824@qq.com> Date: Wed, 21 Aug 2024 22:22:57 +0800 Subject: [PATCH] 0821 --- .../muyu/etl/common/domain/DataSources.java | 7 ++--- .../com/muyu/etl/common/domain/DataType.java | 5 +--- .../etl/common/domain/req/DataSourcesReq.java | 28 +++++++++++++++++++ .../common/domain/resp/DataSourcesRes.java | 20 +++++++++++++ .../controller/DataSourcesController.java | 13 +++++++++ .../server/service/DataSourcesService.java | 17 +++++++++++ .../service/impl/DataSourcesServiceImpl.java | 28 +++++++++++++++++++ 7 files changed, 110 insertions(+), 8 deletions(-) create mode 100644 cloud-etl-common/src/main/java/com/muyu/etl/common/domain/req/DataSourcesReq.java create mode 100644 cloud-etl-common/src/main/java/com/muyu/etl/common/domain/resp/DataSourcesRes.java diff --git a/cloud-etl-common/src/main/java/com/muyu/etl/common/domain/DataSources.java b/cloud-etl-common/src/main/java/com/muyu/etl/common/domain/DataSources.java index 3b7ebfd..b429963 100644 --- a/cloud-etl-common/src/main/java/com/muyu/etl/common/domain/DataSources.java +++ b/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 ; + diff --git a/cloud-etl-common/src/main/java/com/muyu/etl/common/domain/DataType.java b/cloud-etl-common/src/main/java/com/muyu/etl/common/domain/DataType.java index f102074..03a01b3 100644 --- a/cloud-etl-common/src/main/java/com/muyu/etl/common/domain/DataType.java +++ b/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; - - - } diff --git a/cloud-etl-common/src/main/java/com/muyu/etl/common/domain/req/DataSourcesReq.java b/cloud-etl-common/src/main/java/com/muyu/etl/common/domain/req/DataSourcesReq.java new file mode 100644 index 0000000..06fd3cc --- /dev/null +++ b/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; +} diff --git a/cloud-etl-common/src/main/java/com/muyu/etl/common/domain/resp/DataSourcesRes.java b/cloud-etl-common/src/main/java/com/muyu/etl/common/domain/resp/DataSourcesRes.java new file mode 100644 index 0000000..77326a1 --- /dev/null +++ b/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 { +} diff --git a/cloud-etl-server/src/main/java/com/muyu/etl/server/controller/DataSourcesController.java b/cloud-etl-server/src/main/java/com/muyu/etl/server/controller/DataSourcesController.java index e25e9ea..94aea31 100644 --- a/cloud-etl-server/src/main/java/com/muyu/etl/server/controller/DataSourcesController.java +++ b/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> all(@RequestBody DataSourcesReq req){ + + return Result.success(dataSourcesService.selectList(req)); + } /** diff --git a/cloud-etl-server/src/main/java/com/muyu/etl/server/service/DataSourcesService.java b/cloud-etl-server/src/main/java/com/muyu/etl/server/service/DataSourcesService.java index 5a979a0..e57c440 100644 --- a/cloud-etl-server/src/main/java/com/muyu/etl/server/service/DataSourcesService.java +++ b/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 { + /** + * 修改数据源 + * @param dataSources + * @return + */ boolean update(DataSources dataSources); + + /** + * 查询所有已有数据源 + * @param req + * @return + */ + Page selectList(DataSourcesReq req); } diff --git a/cloud-etl-server/src/main/java/com/muyu/etl/server/service/impl/DataSourcesServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/etl/server/service/impl/DataSourcesServiceImpl.java index 62fdac8..275d590 100644 --- a/cloud-etl-server/src/main/java/com/muyu/etl/server/service/impl/DataSourcesServiceImpl.java +++ b/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 implements DataSourcesService { + @Autowired + private DataSourcesMapper dataSourcesMapper; + /** * 添加数据来源 * @param dataSources @@ -35,4 +47,20 @@ public class DataSourcesServiceImpl extends ServiceImpl selectList(DataSourcesReq req) { + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(req.getName()), DataSources::getName,req.getName()); + queryWrapper.like(StringUtils.isNotEmpty(req.getDatabaseName()), DataSources::getDatabaseName,req.getDatabaseName()); + + Page page = new Page<>(req.getPageNum(), req.getPageSize()); + + + Page pageList = dataSourcesMapper.selectPage(page, queryWrapper); + + + return pageList; + } + }