From 29b4db789c7d24f413f0da0484ff6d86540de128 Mon Sep 17 00:00:00 2001 From: Saisai Liu <1374434128@qq.com> Date: Mon, 22 Apr 2024 17:15:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9B=B4=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=EF=BC=8C=E5=9C=A8=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=9A=84=E5=90=8C=E6=97=B6=E5=BC=82=E6=AD=A5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/system/domain/AsNoticeUser.java | 4 + .../com/muyu/system/domain/vo/TreeSelect.java | 3 + .../com/muyu/etl/domain/BasicConfigInfo.java | 3 + .../java/com/muyu/etl/domain/Structure.java | 151 ++-------------- .../java/com/muyu/etl/domain/TableInfo.java | 53 ++++++ .../com/muyu/etl/domain/TreeConstruct.java | 57 ------ .../etl/domain/req/BasicConfigQueryReq.java | 3 + .../muyu/etl/domain/resp/BasicConfigResp.java | 3 + .../com/muyu/etl/mapper/StructureMapper.java | 5 +- .../com/muyu/etl/mapper/TableInfoMapper.java | 63 +++++++ .../muyu/etl/mapper/TreeConstructMapper.java | 63 ------- .../muyu/etl/service/TableInfoService.java | 63 +++++++ .../etl/service/TreeConstructService.java | 63 ------- .../impl/BasicConfigInfoServiceImpl.java | 163 +++++++++++++++--- .../service/impl/TableInfoServiceImpl.java | 98 +++++++++++ .../impl/TreeConstructServiceImpl.java | 98 ----------- .../main/resources/mapper/TableInfoMapper.xml | 101 +++++++++++ .../resources/mapper/TreeConstructMapper.xml | 81 --------- 18 files changed, 544 insertions(+), 531 deletions(-) create mode 100644 muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TableInfo.java delete mode 100644 muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TreeConstruct.java create mode 100644 muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/TableInfoMapper.java delete mode 100644 muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/TreeConstructMapper.java create mode 100644 muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/TableInfoService.java delete mode 100644 muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/TreeConstructService.java create mode 100644 muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/TableInfoServiceImpl.java delete mode 100644 muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/TreeConstructServiceImpl.java create mode 100644 muyu-modules/muyv-etl/muyu-etl-service/src/main/resources/mapper/TableInfoMapper.xml delete mode 100644 muyu-modules/muyv-etl/muyu-etl-service/src/main/resources/mapper/TreeConstructMapper.xml diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/AsNoticeUser.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/AsNoticeUser.java index 4fed1a1..36452a5 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/AsNoticeUser.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/AsNoticeUser.java @@ -1,6 +1,9 @@ package com.muyu.system.domain; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.system.domain.req.AsNoticeUserReq; import lombok.AllArgsConstructor; @@ -29,6 +32,7 @@ public class AsNoticeUser extends BaseEntity private static final long serialVersionUID = 0L; /** 主键 */ + @TableId(value = "id", type = IdType.AUTO) private Long id; /** 通知id */ diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java index 4f593ff..f876ebe 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java @@ -1,5 +1,7 @@ package com.muyu.system.domain.vo; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonInclude; import com.muyu.common.system.domain.SysDept; import com.muyu.system.domain.SysMenu; @@ -19,6 +21,7 @@ public class TreeSelect implements Serializable { /** * 节点ID */ + @TableId(value = "id", type = IdType.AUTO) private Long id; /** diff --git a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/BasicConfigInfo.java b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/BasicConfigInfo.java index e1b7b0e..cace084 100644 --- a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/BasicConfigInfo.java +++ b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/BasicConfigInfo.java @@ -1,5 +1,7 @@ package com.muyu.etl.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.etl.domain.req.BasicConfigQueryReq; @@ -27,6 +29,7 @@ public class BasicConfigInfo extends BaseEntity private static final long serialVersionUID = 1L; /** 主键 */ + @TableId(value = "id", type = IdType.AUTO) private Long id; /** 接入源名称 */ diff --git a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/Structure.java b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/Structure.java index c057206..9766cb5 100644 --- a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/Structure.java +++ b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/Structure.java @@ -1,5 +1,11 @@ package com.muyu.etl.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.muyu.common.core.annotation.Excel; @@ -11,11 +17,16 @@ import com.muyu.common.core.web.domain.BaseEntity; * @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 */ @@ -66,145 +77,5 @@ public class Structure extends BaseEntity @Excel(name = "映射字典") private String dictionaryTable; - public void setId(Long id) - { - this.id = id; - } - public Long getId() - { - return id; - } - public void setTableId(Long tableId) - { - this.tableId = tableId; - } - - public Long getTableId() - { - return tableId; - } - public void setColumnName(String columnName) - { - this.columnName = columnName; - } - - public String getColumnName() - { - return columnName; - } - public void setColumnRemark(String columnRemark) - { - this.columnRemark = columnRemark; - } - - public String getColumnRemark() - { - return columnRemark; - } - public void setIsPrimary(String isPrimary) - { - this.isPrimary = isPrimary; - } - - public String getIsPrimary() - { - return isPrimary; - } - public void setColumnType(String columnType) - { - this.columnType = columnType; - } - - public String getColumnType() - { - return columnType; - } - public void setJavaType(String javaType) - { - this.javaType = javaType; - } - - public String getJavaType() - { - return javaType; - } - public void setColumnLength(String columnLength) - { - this.columnLength = columnLength; - } - - public String getColumnLength() - { - return columnLength; - } - public void setColumnDecimals(String columnDecimals) - { - this.columnDecimals = columnDecimals; - } - - public String getColumnDecimals() - { - return columnDecimals; - } - public void setIsNull(String isNull) - { - this.isNull = isNull; - } - - public String getIsNull() - { - return isNull; - } - public void setDefaultValue(String defaultValue) - { - this.defaultValue = defaultValue; - } - - public String getDefaultValue() - { - return defaultValue; - } - public void setIsDictionary(String isDictionary) - { - this.isDictionary = isDictionary; - } - - public String getIsDictionary() - { - return isDictionary; - } - public void setDictionaryTable(String dictionaryTable) - { - this.dictionaryTable = dictionaryTable; - } - - public String getDictionaryTable() - { - return dictionaryTable; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("tableId", getTableId()) - .append("columnName", getColumnName()) - .append("columnRemark", getColumnRemark()) - .append("isPrimary", getIsPrimary()) - .append("columnType", getColumnType()) - .append("javaType", getJavaType()) - .append("columnLength", getColumnLength()) - .append("columnDecimals", getColumnDecimals()) - .append("isNull", getIsNull()) - .append("defaultValue", getDefaultValue()) - .append("isDictionary", getIsDictionary()) - .append("dictionaryTable", getDictionaryTable()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } } diff --git a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TableInfo.java b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TableInfo.java new file mode 100644 index 0000000..763af63 --- /dev/null +++ b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TableInfo.java @@ -0,0 +1,53 @@ +package com.muyu.etl.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.TreeEntity; + +/** + * 库表基础信息对象 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 Long dataNum; + + /** 是否核心 'Y'是 'N'不是 */ + @Excel(name = "是否核心 'Y'是 'N'不是") + private String center; + + +} diff --git a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TreeConstruct.java b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TreeConstruct.java deleted file mode 100644 index d5e6de1..0000000 --- a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TreeConstruct.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.muyu.etl.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.TreeEntity; - -/** - * 树级结构对象 tree_construct - * - * @author Saisai - * @date 2024-04-22 - */ -public class TreeConstruct extends TreeEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键 */ - private Long id; - - /** 树级结构 */ - @Excel(name = "树级结构") - private String name; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("parentId", getParentId()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/req/BasicConfigQueryReq.java b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/req/BasicConfigQueryReq.java index 1bb5441..433e4c6 100644 --- a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/req/BasicConfigQueryReq.java +++ b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/req/BasicConfigQueryReq.java @@ -1,5 +1,7 @@ package com.muyu.etl.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; @@ -22,6 +24,7 @@ public class BasicConfigQueryReq { private static final long serialVersionUID = 1L; /** 主键 */ + @TableId(value = "id", type = IdType.AUTO) private Long id; /** 接入源名称 */ diff --git a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/BasicConfigResp.java b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/BasicConfigResp.java index f8c70e0..156cc80 100644 --- a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/BasicConfigResp.java +++ b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/BasicConfigResp.java @@ -1,5 +1,7 @@ package com.muyu.etl.domain.resp; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -22,6 +24,7 @@ import java.util.Date; public class BasicConfigResp { private static final long serialVersionUID = 1L; /** 主键 */ + @TableId(value = "id", type = IdType.AUTO) private Long id; /** 接入源名称 */ diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/StructureMapper.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/StructureMapper.java index da5f6bd..932e35b 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/StructureMapper.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/StructureMapper.java @@ -1,10 +1,9 @@ package com.muyu.etl.mapper; -import java.util.List; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.etl.domain.Structure; -import com.muyu.etl.domain.TreeConstruct; + +import java.util.List; /** * 结构Mapper接口 diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/TableInfoMapper.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/TableInfoMapper.java new file mode 100644 index 0000000..fd32d46 --- /dev/null +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/TableInfoMapper.java @@ -0,0 +1,63 @@ +package com.muyu.etl.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.etl.domain.TableInfo; + +/** + * 库表基础信息Mapper接口 + * + * @author Saisai + * @date 2024-04-22 + */ +public interface TableInfoMapper extends BaseMapper +{ + /** + * 查询库表基础信息 + * + * @param id 库表基础信息主键 + * @return 库表基础信息 + */ + public TableInfo selectTableInfoById(Long id); + + /** + * 查询库表基础信息列表 + * + * @param tableInfo 库表基础信息 + * @return 库表基础信息集合 + */ + public List selectTableInfoList(TableInfo tableInfo); + + /** + * 新增库表基础信息 + * + * @param tableInfo 库表基础信息 + * @return 结果 + */ + public int insertTableInfo(TableInfo tableInfo); + + /** + * 修改库表基础信息 + * + * @param tableInfo 库表基础信息 + * @return 结果 + */ + public int updateTableInfo(TableInfo tableInfo); + + /** + * 删除库表基础信息 + * + * @param id 库表基础信息主键 + * @return 结果 + */ + public int deleteTableInfoById(Long id); + + /** + * 批量删除库表基础信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTableInfoByIds(Long[] ids); +} diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/TreeConstructMapper.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/TreeConstructMapper.java deleted file mode 100644 index 49fcf14..0000000 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/TreeConstructMapper.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.muyu.etl.mapper; - -import java.util.List; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.etl.domain.TreeConstruct; - -/** - * 树级结构Mapper接口 - * - * @author Saisai - * @date 2024-04-22 - */ -public interface TreeConstructMapper extends BaseMapper -{ - /** - * 查询树级结构 - * - * @param id 树级结构主键 - * @return 树级结构 - */ - public TreeConstruct selectTreeConstructById(Long id); - - /** - * 查询树级结构列表 - * - * @param treeConstruct 树级结构 - * @return 树级结构集合 - */ - public List selectTreeConstructList(TreeConstruct treeConstruct); - - /** - * 新增树级结构 - * - * @param treeConstruct 树级结构 - * @return 结果 - */ - public int insertTreeConstruct(TreeConstruct treeConstruct); - - /** - * 修改树级结构 - * - * @param treeConstruct 树级结构 - * @return 结果 - */ - public int updateTreeConstruct(TreeConstruct treeConstruct); - - /** - * 删除树级结构 - * - * @param id 树级结构主键 - * @return 结果 - */ - public int deleteTreeConstructById(Long id); - - /** - * 批量删除树级结构 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteTreeConstructByIds(Long[] ids); -} diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/TableInfoService.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/TableInfoService.java new file mode 100644 index 0000000..53df0c9 --- /dev/null +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/TableInfoService.java @@ -0,0 +1,63 @@ +package com.muyu.etl.service; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.etl.domain.TableInfo; + +/** + * 库表基础信息Service接口 + * + * @author Saisai + * @date 2024-04-22 + */ +public interface TableInfoService extends IService +{ + /** + * 查询库表基础信息 + * + * @param id 库表基础信息主键 + * @return 库表基础信息 + */ + public TableInfo selectTableInfoById(Long id); + + /** + * 查询库表基础信息列表 + * + * @param tableInfo 库表基础信息 + * @return 库表基础信息集合 + */ + public List selectTableInfoList(TableInfo tableInfo); + + /** + * 新增库表基础信息 + * + * @param tableInfo 库表基础信息 + * @return 结果 + */ + public int insertTableInfo(TableInfo tableInfo); + + /** + * 修改库表基础信息 + * + * @param tableInfo 库表基础信息 + * @return 结果 + */ + public int updateTableInfo(TableInfo tableInfo); + + /** + * 批量删除库表基础信息 + * + * @param ids 需要删除的库表基础信息主键集合 + * @return 结果 + */ + public int deleteTableInfoByIds(Long[] ids); + + /** + * 删除库表基础信息信息 + * + * @param id 库表基础信息主键 + * @return 结果 + */ + public int deleteTableInfoById(Long id); +} diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/TreeConstructService.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/TreeConstructService.java deleted file mode 100644 index 311acaa..0000000 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/TreeConstructService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.muyu.etl.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.etl.domain.TreeConstruct; - -import java.util.List; - -/** - * 树级结构Service接口 - * - * @author Saisai - * @date 2024-04-22 - */ -public interface TreeConstructService extends IService -{ - /** - * 查询树级结构 - * - * @param id 树级结构主键 - * @return 树级结构 - */ - public TreeConstruct selectTreeConstructById(Long id); - - /** - * 查询树级结构列表 - * - * @param treeConstruct 树级结构 - * @return 树级结构集合 - */ - public List selectTreeConstructList(TreeConstruct treeConstruct); - - /** - * 新增树级结构 - * - * @param treeConstruct 树级结构 - * @return 结果 - */ - public int insertTreeConstruct(TreeConstruct treeConstruct); - - /** - * 修改树级结构 - * - * @param treeConstruct 树级结构 - * @return 结果 - */ - public int updateTreeConstruct(TreeConstruct treeConstruct); - - /** - * 批量删除树级结构 - * - * @param ids 需要删除的树级结构主键集合 - * @return 结果 - */ - public int deleteTreeConstructByIds(Long[] ids); - - /** - * 删除树级结构信息 - * - * @param id 树级结构主键 - * @return 结果 - */ - public int deleteTreeConstructById(Long id); -} diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java index 77030d9..a85dc3b 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java @@ -1,19 +1,24 @@ package com.muyu.etl.service.impl; +import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.security.utils.SecurityUtils; import com.muyu.etl.domain.BasicConfigInfo; +import com.muyu.etl.domain.Structure; +import com.muyu.etl.domain.TableInfo; import com.muyu.etl.mapper.BasicConfigInfoMapper; import com.muyu.etl.service.BasicConfigInfoService; +import com.muyu.etl.service.StructureService; +import com.muyu.etl.service.TableInfoService; +import lombok.SneakyThrows; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.ServletException; import java.sql.*; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.Date; +import java.util.*; /** * Service业务层处理 @@ -28,6 +33,12 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl(TableInfo.class){{ + eq(TableInfo::getTableName,tableInfo.getTableName()); + eq(TableInfo::getBasicId,basicConfigInfo.getId()); + }}); + DatabaseMetaData metaData = conn.getMetaData(); + ResultSet rs = metaData.getTables(databaseName, + null, "%", new String[]{"TABLE", "VIEW"}); + while (rs.next()) { + //表名 + String tableName1 = rs.getString("TABLE_NAME"); + String tableRemark = rs.getString("REMARKS"); + Connection finalConn = conn; + PreparedStatement ps = conn.prepareStatement("select * from " + tableName1); + ResultSet rset = ps.executeQuery(); + Long rowCount = 0L; + while(rset.next()) + { + rowCount++; + } + TableInfo build = TableInfo.builder() + .basicId(basicConfigInfo.getId()) + .tableName(tableName1) + .tableRemark(tableRemark.isEmpty()? "":tableRemark) + .parentId(tableInfo.getId()) + .center("Y") + .updateBy(SecurityUtils.getUsername()) + .dataNum(rowCount) + .updateTime(new Date()) + .build(); + tableInfoService.saveOrUpdate(build,new LambdaUpdateChainWrapper(TableInfo.class){{ + eq(TableInfo::getTableName,build.getTableName()); + eq(TableInfo::getBasicId,basicConfigInfo.getId()); + }}); + new Runnable() { + @SneakyThrows + @Override + public void run() { + try { + syncData(finalConn,databaseName,build); + } catch (SQLException e) { + throw new ServletException("连接失败"); + } + } + }; + } } catch (SQLException e) { throw new ServletException("连接失败"); } return true; } - //{ - // list: [ - // { - // (数据库名)testName: null, - // (表名)children: [ - // { - // (表名)name: null, - // data: [ - // { - // (字段名)name: null, - // val: null, - // type: null, - // 注释：null， - // ... - // } - // ] - // } - // ] - // } - // ] - //} + public void syncData (Connection conn, String databaseName, TableInfo table) throws SQLException { + PreparedStatement ps = conn.prepareStatement( + " SELECT " + + " COLUMN_NAME AS '字段', " + + " COLUMN_COMMENT AS '字段注释', " + + " CASE WHEN COLUMN_KEY = 'PRI' THEN '是' ELSE '否' END AS '是否主键'," + + " CASE \n" + + " WHEN DATA_TYPE = 'int' THEN 'Integer' " + + " WHEN DATA_TYPE = 'varchar' THEN 'String' " + + " WHEN DATA_TYPE = 'decimal' THEN 'BigDecimal' " + + " WHEN DATA_TYPE = 'tinyint' AND COLUMN_TYPE = 'tinyint(1)' THEN 'Boolean'" + + " ELSE DATA_TYPE -- 如果无法映射，则返回原始数据库类型 \n" + + " END AS 'Java类型', " + + " DATA_TYPE AS '数据库类型', -- 原始的数据库类型 \n" + + " COLUMN_TYPE AS '详细的数据库类型', -- 更详细的数据库类型，可能包含长度、精度等 \n" + + " CHARACTER_MAXIMUM_LENGTH AS '长度', \n" + + " NUMERIC_SCALE AS '小数位', \n" + + " IS_NULLABLE AS '是否为空', \n" + + " COLUMN_DEFAULT AS '默认值' \n" + + "FROM INFORMATION_SCHEMA.COLUMNS WHERE \n" + + " TABLE_SCHEMA = '" + databaseName + "' -- 替换为你的数据库名称 \n" + + " AND TABLE_NAME = '" + table.getTableName() + "'"); + ResultSet resultSet = ps.executeQuery(); + ArrayList structureList = new ArrayList<>(); + while (resultSet.next()){ + String columnName = resultSet.getObject(0).toString(); + String columnComment = resultSet.getObject(1).toString(); + String columnKey = resultSet.getObject(2).toString(); + String end = resultSet.getObject(3).toString(); + String dataType = resultSet.getObject(4).toString(); + String columnType = resultSet.getObject(5).toString(); + String characterMaximumLength = resultSet.getObject(6).toString(); + String NumericScale = resultSet.getObject(7).toString(); + String isNullable = resultSet.getObject(8).toString(); + String columnDefault = resultSet.getObject(9).toString(); + System.out.println(columnName); + System.out.println(columnComment); + System.out.println(columnKey); + System.out.println(end); + System.out.println(dataType); + System.out.println(columnType); + System.out.println(characterMaximumLength); + System.out.println(NumericScale); + System.out.println(isNullable); + System.out.println(columnDefault); + Structure build = Structure.builder() + .tableId(table.getId()) + .columnName(columnName) + .columnRemark(columnComment) + .isPrimary("是".equals(columnKey) ? "Y" : "N") + .javaType(end) + .columnType(dataType) + .columnType(columnType) + .columnLength(characterMaximumLength) + .columnDecimals(NumericScale) + .isNull("YES".equals(isNullable) ? "Y" : "N") + .defaultValue(columnDefault) + .build(); + log.info(build); + structureList.add(build); + } + } + @Override public List getDataByEtl() { List list = this.list(); @@ -162,10 +271,12 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl tableName = new ArrayList<>(); while (rs.next()) { + //表名 + String tableName1 = rs.getString("TABLE_NAME"); tableName.add( rs.getString("TABLE_NAME")); } mapList.add(new HashMap<>(){{ diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/TableInfoServiceImpl.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/TableInfoServiceImpl.java new file mode 100644 index 0000000..35b655a --- /dev/null +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/TableInfoServiceImpl.java @@ -0,0 +1,98 @@ +package com.muyu.etl.service.impl; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.muyu.etl.mapper.TableInfoMapper; +import com.muyu.etl.domain.TableInfo; +import com.muyu.etl.service.TableInfoService; + +/** + * 库表基础信息Service业务层处理 + * + * @author Saisai + * @date 2024-04-22 + */ +@Service +public class TableInfoServiceImpl extends ServiceImpl implements TableInfoService +{ + @Autowired + private TableInfoMapper tableInfoMapper; + + /** + * 查询库表基础信息 + * + * @param id 库表基础信息主键 + * @return 库表基础信息 + */ + @Override + public TableInfo selectTableInfoById(Long id) + { + return tableInfoMapper.selectTableInfoById(id); + } + + /** + * 查询库表基础信息列表 + * + * @param tableInfo 库表基础信息 + * @return 库表基础信息 + */ + @Override + public List selectTableInfoList(TableInfo tableInfo) + { + return tableInfoMapper.selectTableInfoList(tableInfo); + } + + /** + * 新增库表基础信息 + * + * @param tableInfo 库表基础信息 + * @return 结果 + */ + @Override + public int insertTableInfo(TableInfo tableInfo) + { + tableInfo.setCreateTime(DateUtils.getNowDate()); + return tableInfoMapper.insertTableInfo(tableInfo); + } + + /** + * 修改库表基础信息 + * + * @param tableInfo 库表基础信息 + * @return 结果 + */ + @Override + public int updateTableInfo(TableInfo tableInfo) + { + tableInfo.setUpdateTime(DateUtils.getNowDate()); + return tableInfoMapper.updateTableInfo(tableInfo); + } + + /** + * 批量删除库表基础信息 + * + * @param ids 需要删除的库表基础信息主键 + * @return 结果 + */ + @Override + public int deleteTableInfoByIds(Long[] ids) + { + return tableInfoMapper.deleteTableInfoByIds(ids); + } + + /** + * 删除库表基础信息信息 + * + * @param id 库表基础信息主键 + * @return 结果 + */ + @Override + public int deleteTableInfoById(Long id) + { + return tableInfoMapper.deleteTableInfoById(id); + } +} diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/TreeConstructServiceImpl.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/TreeConstructServiceImpl.java deleted file mode 100644 index f29a5ac..0000000 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/TreeConstructServiceImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.muyu.etl.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.utils.DateUtils; -import com.muyu.etl.domain.TreeConstruct; -import com.muyu.etl.mapper.TreeConstructMapper; -import com.muyu.etl.service.TreeConstructService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 树级结构Service业务层处理 - * - * @author Saisai - * @date 2024-04-22 - */ -@Service -public class TreeConstructServiceImpl extends ServiceImpl implements TreeConstructService -{ - @Autowired - private TreeConstructMapper treeConstructMapper; - - /** - * 查询树级结构 - * - * @param id 树级结构主键 - * @return 树级结构 - */ - @Override - public TreeConstruct selectTreeConstructById(Long id) - { - return treeConstructMapper.selectTreeConstructById(id); - } - - /** - * 查询树级结构列表 - * - * @param treeConstruct 树级结构 - * @return 树级结构 - */ - @Override - public List selectTreeConstructList(TreeConstruct treeConstruct) - { - return treeConstructMapper.selectTreeConstructList(treeConstruct); - } - - /** - * 新增树级结构 - * - * @param treeConstruct 树级结构 - * @return 结果 - */ - @Override - public int insertTreeConstruct(TreeConstruct treeConstruct) - { - treeConstruct.setCreateTime(DateUtils.getNowDate()); - return treeConstructMapper.insertTreeConstruct(treeConstruct); - } - - /** - * 修改树级结构 - * - * @param treeConstruct 树级结构 - * @return 结果 - */ - @Override - public int updateTreeConstruct(TreeConstruct treeConstruct) - { - treeConstruct.setUpdateTime(DateUtils.getNowDate()); - return treeConstructMapper.updateTreeConstruct(treeConstruct); - } - - /** - * 批量删除树级结构 - * - * @param ids 需要删除的树级结构主键 - * @return 结果 - */ - @Override - public int deleteTreeConstructByIds(Long[] ids) - { - return treeConstructMapper.deleteTreeConstructByIds(ids); - } - - /** - * 删除树级结构信息 - * - * @param id 树级结构主键 - * @return 结果 - */ - @Override - public int deleteTreeConstructById(Long id) - { - return treeConstructMapper.deleteTreeConstructById(id); - } -} diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/resources/mapper/TableInfoMapper.xml b/muyu-modules/muyv-etl/muyu-etl-service/src/main/resources/mapper/TableInfoMapper.xml new file mode 100644 index 0000000..e54c378 --- /dev/null +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/resources/mapper/TableInfoMapper.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + select id, parent_id, table_name, table_remark, data_num, center, remark, create_by, create_time, update_by, update_time from table_info + + + + + + + + insert into table_info + + parent_id, + basic_id, + table_name, + table_remark, + data_num, + center, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{parentId}, + #{basicId}, + #{tableName}, + #{tableRemark}, + #{dataNum}, + #{center}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update table_info + + parent_id = #{parentId}, + basic_id = #{basicId}, + table_name = #{tableName}, + table_remark = #{tableRemark}, + data_num = #{dataNum}, + center = #{center}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from table_info where id = #{id} + + + + delete from table_info where id in + + #{id} + + + diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/resources/mapper/TreeConstructMapper.xml b/muyu-modules/muyv-etl/muyu-etl-service/src/main/resources/mapper/TreeConstructMapper.xml deleted file mode 100644 index bc072ae..0000000 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/resources/mapper/TreeConstructMapper.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - select id, name, parent_id, remark, create_by, create_time, update_by, update_time from tree_construct - - - - - - - - insert into tree_construct - - name, - parent_id, - remark, - create_by, - create_time, - update_by, - update_time, - - - #{name}, - #{parentId}, - #{remark}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update tree_construct - - name = #{name}, - parent_id = #{parentId}, - remark = #{remark}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from tree_construct where id = #{id} - - - - delete from tree_construct where id in - - #{id} - - -