From 41fd77a7d514ec716c7c0c1576b8a146c302f955 Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Tue, 20 Aug 2024 22:07:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/domain/AssetDataDict.java | 42 +++++++++ .../java/com/muyu/domain/AssetImpower.java | 62 +++++++++++++ .../java/com/muyu/domain/BasicConfigInfo.java | 91 +++++++++++++++++++ .../main/java/com/muyu/domain/DictInfo.java | 48 ++++++++++ .../com/muyu/domain/Req/AssetImpowerReq.java | 55 +++++++++++ .../muyu/domain/Req/BasicConfigQueryReq.java | 76 ++++++++++++++++ .../main/java/com/muyu/domain/Structure.java | 79 ++++++++++++++++ .../main/java/com/muyu/domain/TableInfo.java | 57 ++++++++++++ cloud-etl-server/pom.xml | 23 ++--- .../src/main/java/com/muyu/Main.java | 7 -- .../main/java/com/muyu/MuyuApplication.java | 18 ++++ .../com/muyu/controller/ETLController.java | 35 +++++++ .../main/java/com/muyu/mapper/EtlMapper.java | 18 ++++ .../java/com/muyu/service/EtlService.java | 16 ++++ .../service/serviceImpl/EtlServiceImpl.java | 29 ++++++ .../src/main/resources/bootstrap.yml | 28 ++++++ .../src/main/resources/mapper/EtlMapper.xml | 12 +++ pom.xml | 11 +-- 18 files changed, 678 insertions(+), 29 deletions(-) create mode 100644 cloud-etl-common/src/main/java/com/muyu/domain/AssetDataDict.java create mode 100644 cloud-etl-common/src/main/java/com/muyu/domain/AssetImpower.java create mode 100644 cloud-etl-common/src/main/java/com/muyu/domain/BasicConfigInfo.java create mode 100644 cloud-etl-common/src/main/java/com/muyu/domain/DictInfo.java create mode 100644 cloud-etl-common/src/main/java/com/muyu/domain/Req/AssetImpowerReq.java create mode 100644 cloud-etl-common/src/main/java/com/muyu/domain/Req/BasicConfigQueryReq.java create mode 100644 cloud-etl-common/src/main/java/com/muyu/domain/Structure.java create mode 100644 cloud-etl-common/src/main/java/com/muyu/domain/TableInfo.java delete mode 100644 cloud-etl-server/src/main/java/com/muyu/Main.java create mode 100644 cloud-etl-server/src/main/java/com/muyu/MuyuApplication.java create mode 100644 cloud-etl-server/src/main/java/com/muyu/controller/ETLController.java create mode 100644 cloud-etl-server/src/main/java/com/muyu/mapper/EtlMapper.java create mode 100644 cloud-etl-server/src/main/java/com/muyu/service/EtlService.java create mode 100644 cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EtlServiceImpl.java create mode 100644 cloud-etl-server/src/main/resources/bootstrap.yml create mode 100644 cloud-etl-server/src/main/resources/mapper/EtlMapper.xml diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/AssetDataDict.java b/cloud-etl-common/src/main/java/com/muyu/domain/AssetDataDict.java new file mode 100644 index 0000000..8f3bae2 --- /dev/null +++ b/cloud-etl-common/src/main/java/com/muyu/domain/AssetDataDict.java @@ -0,0 +1,42 @@ +package com.muyu.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 资产数据字典对象 asset_data_dict + * + * @author Saisai + * @date 2024-04-24 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class AssetDataDict extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + /** 数据接入id */ + @Excel(name = "数据接入id") + private Long basicId; + + /** 字典名称 */ + @Excel(name = "字典名称") + private String dictName; + + /** 字典类型 */ + @Excel(name = "字典类型") + private String dictType; + +} diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/AssetImpower.java b/cloud-etl-common/src/main/java/com/muyu/domain/AssetImpower.java new file mode 100644 index 0000000..5069e1e --- /dev/null +++ b/cloud-etl-common/src/main/java/com/muyu/domain/AssetImpower.java @@ -0,0 +1,62 @@ +package com.muyu.domain; + +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 资产赋权对象 asset_impower + * + * @author Saisai + * @date 2024-04-28 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class AssetImpower extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long id; + + /** + * 表id + */ + @Excel(name = "表id") + private Long tableId; + + /** + * 部门id + */ + @Excel(name = "部门id") + private Long deptId; + + /** + * 接入id + */ + @Excel(name = "接入id") + private Long basicId; + + /** + * 用户id + */ + @Excel(name = "用户id") + private Long userId; + + public static AssetImpower saveAssetImpower + (Long deptId,Long userId,AssetImpower assetImpower){ + return AssetImpower.builder() + .basicId(assetImpower.getBasicId()) + .tableId(assetImpower.getTableId()) + .deptId(deptId) + .userId(userId) + .build(); + } + +} diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/BasicConfigInfo.java b/cloud-etl-common/src/main/java/com/muyu/domain/BasicConfigInfo.java new file mode 100644 index 0000000..c295c28 --- /dev/null +++ b/cloud-etl-common/src/main/java/com/muyu/domain/BasicConfigInfo.java @@ -0,0 +1,91 @@ +package com.muyu.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; + +import com.muyu.domain.Req.BasicConfigQueryReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; +import java.util.function.Supplier; + + +/** + *对象 basic_config_info + * + * @author Saisai + * @date 2024-04-20 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class BasicConfigInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** 接入源名称 */ + @Excel(name = "接入源名称") + private String dataResourceName; + + /** 数据来源系统名称 */ + @Excel(name = "数据来源系统名称") + private String dataSourcesSystemName; + + /** 主机ip地址 */ + @Excel(name = "主机ip地址") + private String host; + + /** 端口 */ + @Excel(name = "端口") + private String port; + + /** 数据接入类型 */ + @Excel(name = "数据接入类型") + private String databaseType; + + /** 数据库名称 */ + @Excel(name = "数据库名称") + private String databaseName; + + /** 初始化连接数量 */ + @Excel(name = "初始化连接数量") + private Long initLinkNum; + + /** 最大连接数量 */ + @Excel(name = "最大连接数量") + private Long maxLinkNum; + + /** 最大等待时间 */ + @Excel(name = "最大等待时间") + private Long maxWaitTime; + + /** 最大等待次数 */ + @Excel(name = "最大等待次数") + private Long maxWaitTimes; + + @Excel(name ="连接参数") + private String connectionParams; + + @Excel(name ="用户名") + private String username; + + @Excel(name ="密码") + private String password; + + private String createBy; + private String updateBy; + private Date createTime; + private Date updateTime; + + +} diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/DictInfo.java b/cloud-etl-common/src/main/java/com/muyu/domain/DictInfo.java new file mode 100644 index 0000000..2793a0c --- /dev/null +++ b/cloud-etl-common/src/main/java/com/muyu/domain/DictInfo.java @@ -0,0 +1,48 @@ +package com.muyu.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 字典详细内容对象 dict_info + * + * @author Saisai + * @date 2024-04-24 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class DictInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + /** 接入id */ + @Excel(name = "字典id") + private Long dictId; + + /** 字典名称 */ + @Excel(name = "字典名称") + private String infoName; + + /** 字典类型 */ + @Excel(name = "字典类型") + private String infoValue; + + @JsonProperty("isEdit") + private boolean isEdit; + + + +} diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/Req/AssetImpowerReq.java b/cloud-etl-common/src/main/java/com/muyu/domain/Req/AssetImpowerReq.java new file mode 100644 index 0000000..7b0b91f --- /dev/null +++ b/cloud-etl-common/src/main/java/com/muyu/domain/Req/AssetImpowerReq.java @@ -0,0 +1,55 @@ +package com.muyu.domain.Req; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.muyu.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @ClassName AssetImpowerReq + * @Description 描述 + * @Author SaiSai.Liu + * @Date 2024/4/29 14:04 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class AssetImpowerReq { + private static final long serialVersionUID = 1L; + + + /** + * 主键 + */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + /** + * 表id + */ + @Excel(name = "表id") + private Long tableId; + + /** + * 接入id + */ + @Excel(name = "接入id") + private Long basicId; + + /** + * 部门id + */ + @Excel(name = "部门id") + private Long deptId; + + /** + * 用户id + */ + @Excel(name = "用户id") + private Long userId; + +} diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/Req/BasicConfigQueryReq.java b/cloud-etl-common/src/main/java/com/muyu/domain/Req/BasicConfigQueryReq.java new file mode 100644 index 0000000..c9786db --- /dev/null +++ b/cloud-etl-common/src/main/java/com/muyu/domain/Req/BasicConfigQueryReq.java @@ -0,0 +1,76 @@ +package com.muyu.domain.Req; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.muyu.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * @ClassName BasicQueryReq + * @Description 描述 + * @Author SaiSai.Liu + * @Date 2024/4/21 10:42 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class BasicConfigQueryReq { + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** 接入源名称 */ + @Excel(name = "接入源名称") + private String dataResourceName; + + /** 数据来源系统名称 */ + @Excel(name = "数据来源系统名称") + private String dataSourcesSystemName; + + /** 主机ip地址 */ + @Excel(name = "主机ip地址") + private String host; + + /** 端口 */ + @Excel(name = "端口") + private String port; + + /** 数据接入类型 */ + @Excel(name = "数据接入类型") + private String databaseType; + + /** 数据库名称 */ + @Excel(name = "数据库名称") + private String databaseName; + + /** 初始化连接数量 */ + @Excel(name = "初始化连接数量") + private Long initLinkNum; + + /** 最大连接数量 */ + @Excel(name = "最大连接数量") + private Long maxLinkNum; + + /** 最大等待时间 */ + @Excel(name = "最大等待时间") + private Long maxWaitTime; + + /** 最大等待次数 */ + @Excel(name = "最大等待次数") + private Long maxWaitTimes; + + private String connectionParams; + private String createBy; + private String updateBy; + private Date createTime; + private Date updateTime; + +} diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/Structure.java b/cloud-etl-common/src/main/java/com/muyu/domain/Structure.java new file mode 100644 index 0000000..65aefd7 --- /dev/null +++ b/cloud-etl-common/src/main/java/com/muyu/domain/Structure.java @@ -0,0 +1,79 @@ +package com.muyu.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 结构对象 structure + * + * @author Saisai + * @date 2024-04-22 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class Structure extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** 表id */ + @Excel(name = "表id") + private Long tableId; + + /** 字段名称 */ + @Excel(name = "字段名称") + private String columnName; + + /** 字段注释 */ + @Excel(name = "字段注释") + private String columnRemark; + + /** 是否主键 'Y'是主键 'N'不是主键 */ + @Excel(name = "是否主键 'Y'是主键 'N'不是主键") + private String isPrimary; + + /** 数据类型 */ + @Excel(name = "数据类型") + private String columnType; + + /** 映射类型 */ + @Excel(name = "映射类型") + private String javaType; + + /** 字段长度 */ + @Excel(name = "字段长度") + private String columnLength; + + /** 小数位数 */ + @Excel(name = "小数位数") + private String columnDecimals; + + /** 是否为空 'Y'是 'N'不是 */ + @Excel(name = "是否为空 'Y'是 'N'不是") + private String isNull; + + /** 默认值 */ + @Excel(name = "默认值") + private String defaultValue; + + /** 是否字典 'Y'是 'N'不是 */ + @Excel(name = "是否字典 'Y'是 'N'不是") + private String isDictionary; + + /** 映射字典 */ + @Excel(name = "映射字典") + private String dictionaryTable; + + +} diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/TableInfo.java b/cloud-etl-common/src/main/java/com/muyu/domain/TableInfo.java new file mode 100644 index 0000000..6cc8a69 --- /dev/null +++ b/cloud-etl-common/src/main/java/com/muyu/domain/TableInfo.java @@ -0,0 +1,57 @@ +package com.muyu.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.TreeEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 库表基础信息对象 table_info + * + * @author Saisai + * @date 2024-04-22 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class TableInfo extends TreeEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + private Long basicId; + + /** 表名称/数据库 */ + @Excel(name = "表名称/数据库") + private String tableName; + + /** 表备注 */ + @Excel(name = "表备注") + private String tableRemark; + + /** 表备注 */ + @Excel(name = "数据来源类型") + private String type; + + + /** 数据量 */ + @Excel(name = "数据量") + private Long dataNum; + + /** 是否核心 'Y'是 'N'不是 */ + @Excel(name = "是否核心 'Y'是 'N'不是") + private String center; + + + private Long parentId; + + +} diff --git a/cloud-etl-server/pom.xml b/cloud-etl-server/pom.xml index 3b5988e..42ef980 100644 --- a/cloud-etl-server/pom.xml +++ b/cloud-etl-server/pom.xml @@ -11,11 +11,6 @@ cloud-etl-server - - 17 - 17 - UTF-8 - @@ -71,10 +66,10 @@ - - com.muyu - cloud-common-log - + + + + @@ -82,11 +77,11 @@ cloud-common-api-doc - - - com.muyu - cloud-common-xxl - + + + + + diff --git a/cloud-etl-server/src/main/java/com/muyu/Main.java b/cloud-etl-server/src/main/java/com/muyu/Main.java deleted file mode 100644 index 95690d4..0000000 --- a/cloud-etl-server/src/main/java/com/muyu/Main.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.muyu; - -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} \ No newline at end of file diff --git a/cloud-etl-server/src/main/java/com/muyu/MuyuApplication.java b/cloud-etl-server/src/main/java/com/muyu/MuyuApplication.java new file mode 100644 index 0000000..623d7d7 --- /dev/null +++ b/cloud-etl-server/src/main/java/com/muyu/MuyuApplication.java @@ -0,0 +1,18 @@ +package com.muyu; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @Author：qdm + * @Package：com.muyu + * @Project：cloud-etl + * @name：MuyuApplication + * @Date：2024/8/20 20:28 + */ +@SpringBootApplication +public class MuyuApplication { + public static void main(String[] args) { + SpringApplication.run(MuyuApplication.class, args); + } +} diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/ETLController.java b/cloud-etl-server/src/main/java/com/muyu/controller/ETLController.java new file mode 100644 index 0000000..8dac31f --- /dev/null +++ b/cloud-etl-server/src/main/java/com/muyu/controller/ETLController.java @@ -0,0 +1,35 @@ +package com.muyu.controller; + +import cn.hutool.db.PageResult; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.domain.AssetImpower; +import com.muyu.service.EtlService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.tags.EscapeBodyTag; + +import java.util.List; + +import static com.muyu.common.core.utils.PageUtils.startPage; + +/** + * @Author：qdm + * @Package：com.muyu.controller + * @Project：cloud-etl + * @name：ETLController + * @Date：2024/8/20 20:42 + */ +@RestController +@RequestMapping("/etl") +public class ETLController { + + @Autowired + EtlService etlService; + @GetMapping("/list") + public List list(AssetImpower assetImpower){ + return etlService.selectAssetImpowerList(assetImpower); + } +} diff --git a/cloud-etl-server/src/main/java/com/muyu/mapper/EtlMapper.java b/cloud-etl-server/src/main/java/com/muyu/mapper/EtlMapper.java new file mode 100644 index 0000000..5cba1df --- /dev/null +++ b/cloud-etl-server/src/main/java/com/muyu/mapper/EtlMapper.java @@ -0,0 +1,18 @@ +package com.muyu.mapper; + +import com.muyu.domain.AssetImpower; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Author：qdm + * @Package：com.muyu.mapper + * @Project：cloud-etl + * @name：EtlMapper + * @Date：2024/8/20 20:47 + */ +@Mapper +public interface EtlMapper { + List list(AssetImpower assetImpower); +} diff --git a/cloud-etl-server/src/main/java/com/muyu/service/EtlService.java b/cloud-etl-server/src/main/java/com/muyu/service/EtlService.java new file mode 100644 index 0000000..709d932 --- /dev/null +++ b/cloud-etl-server/src/main/java/com/muyu/service/EtlService.java @@ -0,0 +1,16 @@ +package com.muyu.service; + +import com.muyu.domain.AssetImpower; + +import java.util.List; + +/** + * @Author：qdm + * @Package：com.muyu.service + * @Project：cloud-etl + * @name：EtlService + * @Date：2024/8/20 20:46 + */ +public interface EtlService { + List selectAssetImpowerList(AssetImpower assetImpower); +} diff --git a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EtlServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EtlServiceImpl.java new file mode 100644 index 0000000..c34ecb3 --- /dev/null +++ b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EtlServiceImpl.java @@ -0,0 +1,29 @@ +package com.muyu.service.serviceImpl; + +import com.muyu.domain.AssetImpower; +import com.muyu.mapper.EtlMapper; +import com.muyu.service.EtlService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author：qdm + * @Package：com.muyu.service.serviceImpl + * @Project：cloud-etl + * @name：EtlService + * @Date：2024/8/20 20:46 + */ +@Service +public class EtlServiceImpl implements EtlService { + + @Autowired + private EtlMapper etlMapper; + + @Override + public List selectAssetImpowerList(AssetImpower assetImpower) { + List assetImpowers = etlMapper.list(assetImpower); + return assetImpowers; + } +} diff --git a/cloud-etl-server/src/main/resources/bootstrap.yml b/cloud-etl-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..9b191b5 --- /dev/null +++ b/cloud-etl-server/src/main/resources/bootstrap.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9205 + +# Spring +spring: + application: + # 应用名称 + name: cloud-etl + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 43.142.100.73:8848 + config: + # 配置中心地址 + server-addr: 43.142.100.73:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.etl.mapper: DEBUG diff --git a/cloud-etl-server/src/main/resources/mapper/EtlMapper.xml b/cloud-etl-server/src/main/resources/mapper/EtlMapper.xml new file mode 100644 index 0000000..b36eb07 --- /dev/null +++ b/cloud-etl-server/src/main/resources/mapper/EtlMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/pom.xml b/pom.xml index d31bb0e..f927af7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,13 @@ com.muyu - cloud-server-parent - 3.6.4 + cloud-server + 3.6.3 com.muyu cloud-etl - 1.0.0 pom @@ -23,10 +22,6 @@ cloud-etl-server - - 17 - 17 - UTF-8 - + From ccfc24b9b5bda3577744543ec454f19d9d580974 Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Tue, 20 Aug 2024 22:10:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/muyu/controller/ETLController.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/ETLController.java b/cloud-etl-server/src/main/java/com/muyu/controller/ETLController.java index 8dac31f..7e32d83 100644 --- a/cloud-etl-server/src/main/java/com/muyu/controller/ETLController.java +++ b/cloud-etl-server/src/main/java/com/muyu/controller/ETLController.java @@ -1,19 +1,14 @@ package com.muyu.controller; -import cn.hutool.db.PageResult; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.domain.AssetImpower; import com.muyu.service.EtlService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.tags.EscapeBodyTag; import java.util.List; -import static com.muyu.common.core.utils.PageUtils.startPage; /** * @Author：qdm From 4b213f99f720c4bb0c144ed49d89bcabe7aab5d4 Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Tue, 20 Aug 2024 22:16:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/muyu/controller/ETLController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/ETLController.java b/cloud-etl-server/src/main/java/com/muyu/controller/ETLController.java index 7e32d83..d510c5c 100644 --- a/cloud-etl-server/src/main/java/com/muyu/controller/ETLController.java +++ b/cloud-etl-server/src/main/java/com/muyu/controller/ETLController.java @@ -1,5 +1,6 @@ package com.muyu.controller; +import com.muyu.common.core.web.controller.BaseController; import com.muyu.domain.AssetImpower; import com.muyu.service.EtlService; import org.springframework.beans.factory.annotation.Autowired; @@ -19,7 +20,7 @@ import java.util.List; */ @RestController @RequestMapping("/etl") -public class ETLController { +public class ETLController extends BaseController { @Autowired EtlService etlService; From 2d3c352db8b57a22eddeccce9f76a5df25fdb949 Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Tue, 20 Aug 2024 22:33:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=97=E8=A1=A8+=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/controller/ETLController.java | 15 ++++++++++++--- .../src/main/java/com/muyu/mapper/EtlMapper.java | 4 ++++ .../main/java/com/muyu/service/EtlService.java | 3 +++ .../muyu/service/serviceImpl/EtlServiceImpl.java | 8 ++++++++ .../src/main/resources/mapper/EtlMapper.xml | 12 ++++++++++-- 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/ETLController.java b/cloud-etl-server/src/main/java/com/muyu/controller/ETLController.java index d510c5c..ec09446 100644 --- a/cloud-etl-server/src/main/java/com/muyu/controller/ETLController.java +++ b/cloud-etl-server/src/main/java/com/muyu/controller/ETLController.java @@ -1,13 +1,14 @@ package com.muyu.controller; import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.domain.AssetImpower; import com.muyu.service.EtlService; +import lombok.extern.java.Log; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import javax.xml.transform.Result; import java.util.List; @@ -28,4 +29,12 @@ public class ETLController extends BaseController { public List list(AssetImpower assetImpower){ return etlService.selectAssetImpowerList(assetImpower); } + + @RequiresPermissions("etl:impower:remove") + @DeleteMapping("/{ids}") + public Result remove(@PathVariable Long[] ids) + { + return etlService.deleteAssetImpowerByIds(ids); + } + } diff --git a/cloud-etl-server/src/main/java/com/muyu/mapper/EtlMapper.java b/cloud-etl-server/src/main/java/com/muyu/mapper/EtlMapper.java index 5cba1df..f39017e 100644 --- a/cloud-etl-server/src/main/java/com/muyu/mapper/EtlMapper.java +++ b/cloud-etl-server/src/main/java/com/muyu/mapper/EtlMapper.java @@ -2,7 +2,9 @@ package com.muyu.mapper; import com.muyu.domain.AssetImpower; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import javax.xml.transform.Result; import java.util.List; /** @@ -15,4 +17,6 @@ import java.util.List; @Mapper public interface EtlMapper { List list(AssetImpower assetImpower); + + Result deleteAssetImpowerByIds(@Param("ids") Long[] ids); } diff --git a/cloud-etl-server/src/main/java/com/muyu/service/EtlService.java b/cloud-etl-server/src/main/java/com/muyu/service/EtlService.java index 709d932..de8bb24 100644 --- a/cloud-etl-server/src/main/java/com/muyu/service/EtlService.java +++ b/cloud-etl-server/src/main/java/com/muyu/service/EtlService.java @@ -2,6 +2,7 @@ package com.muyu.service; import com.muyu.domain.AssetImpower; +import javax.xml.transform.Result; import java.util.List; /** @@ -13,4 +14,6 @@ import java.util.List; */ public interface EtlService { List selectAssetImpowerList(AssetImpower assetImpower); + + Result deleteAssetImpowerByIds(Long[] ids); } diff --git a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EtlServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EtlServiceImpl.java index c34ecb3..9ec2d3a 100644 --- a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EtlServiceImpl.java +++ b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EtlServiceImpl.java @@ -6,6 +6,7 @@ import com.muyu.service.EtlService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.xml.transform.Result; import java.util.List; /** @@ -26,4 +27,11 @@ public class EtlServiceImpl implements EtlService { List assetImpowers = etlMapper.list(assetImpower); return assetImpowers; } + + @Override + public Result deleteAssetImpowerByIds(Long[] ids) { + return etlMapper.deleteAssetImpowerByIds(ids); + } + + } diff --git a/cloud-etl-server/src/main/resources/mapper/EtlMapper.xml b/cloud-etl-server/src/main/resources/mapper/EtlMapper.xml index b36eb07..cd600ad 100644 --- a/cloud-etl-server/src/main/resources/mapper/EtlMapper.xml +++ b/cloud-etl-server/src/main/resources/mapper/EtlMapper.xml @@ -3,8 +3,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + select id, basic_id, dict_name, dict_type, remark, create_by, create_time, update_by, update_time from asset_data_dict + + + select id, basic_id, dict_name, dict_type, remark, create_by, create_time, update_by, update_time from asset_data_dict + + + + where id = #{id} +