From f60b59b4ca427ec23636e2c1f2ed9d19037759d8 Mon Sep 17 00:00:00 2001 From: Mdai Date: Thu, 15 Dec 2022 16:11:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A=E5=92=8Clo?= =?UTF-8?q?mbok?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zyplayer-doc-db/pom.xml | 6 + .../controller/param/DataDownloadParam.java | 48 +----- .../db/controller/param/DataViewParam.java | 157 +----------------- .../controller/param/ProcedureListParam.java | 59 +------ .../db/controller/vo/DatabaseExportVo.java | 33 +--- .../doc/db/controller/vo/TableColumnVo.java | 49 ++---- .../doc/db/controller/vo/TableDdlVo.java | 73 +++----- .../doc/db/controller/vo/TableStatusVo.java | 156 +---------------- .../doc/db/controller/vo/UserDbAuthVo.java | 43 +---- .../db/bean/DatabaseFactoryBean.java | 68 +------- .../db/framework/db/bean/DbConfigBean.java | 35 +--- .../db/framework/db/dto/ColumnInfoDto.java | 36 +--- .../db/framework/db/dto/DatabaseInfoDto.java | 12 +- .../doc/db/framework/db/dto/ProcedureDto.java | 67 +------- .../db/dto/QueryTableColumnDescDto.java | 27 +-- .../framework/db/dto/TableColumnDescDto.java | 90 ++-------- .../doc/db/framework/db/dto/TableDescDto.java | 28 +--- .../doc/db/framework/db/dto/TableInfoDto.java | 35 +--- .../db/mapper/base/ExecuteParam.java | 69 +------- .../db/mapper/base/ExecuteResult.java | 50 +----- .../db/framework/json/DocDbResponseJson.java | 37 +---- .../db/service/download/DownloadService.java | 20 +-- 22 files changed, 126 insertions(+), 1072 deletions(-) diff --git a/zyplayer-doc-db/pom.xml b/zyplayer-doc-db/pom.xml index a47e940a..5b61a41b 100644 --- a/zyplayer-doc-db/pom.xml +++ b/zyplayer-doc-db/pom.xml @@ -51,6 +51,12 @@ com.alibaba easyexcel + + org.projectlombok + lombok + RELEASE + compile + diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataDownloadParam.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataDownloadParam.java index e23d2028..03bb05a5 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataDownloadParam.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataDownloadParam.java @@ -1,49 +1,17 @@ package com.zyplayer.doc.db.controller.param; +import lombok.Data; + +/** + * 查询参数 + * @author 暮光：城中城 + * @since 2021-05-20 + */ +@Data public class DataDownloadParam { private Long sourceId; private String dbName; private String tableName; private String downloadType; private String conditionColumn; - - public Long getSourceId() { - return sourceId; - } - - public void setSourceId(Long sourceId) { - this.sourceId = sourceId; - } - - public String getDbName() { - return dbName; - } - - public void setDbName(String dbName) { - this.dbName = dbName; - } - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public String getDownloadType() { - return downloadType; - } - - public void setDownloadType(String downloadType) { - this.downloadType = downloadType; - } - - public String getConditionColumn() { - return conditionColumn; - } - - public void setConditionColumn(String conditionColumn) { - this.conditionColumn = conditionColumn; - } } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataViewParam.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataViewParam.java index 88e3d055..f95b11db 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataViewParam.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataViewParam.java @@ -1,11 +1,14 @@ package com.zyplayer.doc.db.controller.param; +import lombok.Data; + /** * 数据预览查询参数 * * @author 暮光：城中城 * @since 2021-05-20 */ +@Data public class DataViewParam { // 基本信息 private String executeId; @@ -33,160 +36,8 @@ public class DataViewParam { // 数据查询时使用，导出暂不支持排序 private String orderColumn; private String orderType; - + public Integer getOffset() { return ((this.pageNum - 1) * this.pageSize); } - - public Long getSourceId() { - return sourceId; - } - - public void setSourceId(Long sourceId) { - this.sourceId = sourceId; - } - - public String getExecuteId() { - return executeId; - } - - public void setExecuteId(String executeId) { - this.executeId = executeId; - } - - public Integer getPageSize() { - return pageSize; - } - - public void setPageSize(Integer pageSize) { - this.pageSize = pageSize; - } - - public Integer getPageNum() { - return pageNum; - } - - public void setPageNum(Integer pageNum) { - this.pageNum = pageNum; - } - - public String getDbName() { - return dbName; - } - - public void setDbName(String dbName) { - this.dbName = dbName; - } - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public String getOrderColumn() { - return orderColumn; - } - - public void setOrderColumn(String orderColumn) { - this.orderColumn = orderColumn; - } - - public String getOrderType() { - return orderType; - } - - public void setOrderType(String orderType) { - this.orderType = orderType; - } - - public String getCondition() { - return condition; - } - - public void setCondition(String condition) { - this.condition = condition; - } - - public String getDownloadType() { - return downloadType; - } - - public void setDownloadType(String downloadType) { - this.downloadType = downloadType; - } - - public String getConditionColumn() { - return conditionColumn; - } - - public void setConditionColumn(String conditionColumn) { - this.conditionColumn = conditionColumn; - } - - public Integer getDropTableFlag() { - return dropTableFlag; - } - - public void setDropTableFlag(Integer dropTableFlag) { - this.dropTableFlag = dropTableFlag; - } - - public Integer getCreateTableFlag() { - return createTableFlag; - } - - public void setCreateTableFlag(Integer createTableFlag) { - this.createTableFlag = createTableFlag; - } - - public String getRetainColumn() { - return retainColumn; - } - - public void setRetainColumn(String retainColumn) { - this.retainColumn = retainColumn; - } - - public String getTableNames() { - return tableNames; - } - - public void setTableNames(String tableNames) { - this.tableNames = tableNames; - } - - public Integer getDownloadFileType() { - return downloadFileType; - } - - public void setDownloadFileType(Integer downloadFileType) { - this.downloadFileType = downloadFileType; - } - - public String getRetainColumnJson() { - return retainColumnJson; - } - - public void setRetainColumnJson(String retainColumnJson) { - this.retainColumnJson = retainColumnJson; - } - - public String getConditionJson() { - return conditionJson; - } - - public void setConditionJson(String conditionJson) { - this.conditionJson = conditionJson; - } - - public String getConditionColumnJson() { - return conditionColumnJson; - } - - public void setConditionColumnJson(String conditionColumnJson) { - this.conditionColumnJson = conditionColumnJson; - } } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/ProcedureListParam.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/ProcedureListParam.java index d3d4b3ed..94f6f51f 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/ProcedureListParam.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/ProcedureListParam.java @@ -1,11 +1,14 @@ package com.zyplayer.doc.db.controller.param; +import lombok.Data; + /** * 存储过程列表查询参数 * * @author 暮光：城中城 * @since 2021-04-25 */ +@Data public class ProcedureListParam { private Long sourceId; private String dbName; @@ -14,60 +17,4 @@ public class ProcedureListParam { private Integer offset; private String name; private String type; - - public Long getSourceId() { - return sourceId; - } - - public void setSourceId(Long sourceId) { - this.sourceId = sourceId; - } - - public String getDbName() { - return dbName; - } - - public void setDbName(String dbName) { - this.dbName = dbName; - } - - public Integer getPageNum() { - return pageNum; - } - - public void setPageNum(Integer pageNum) { - this.pageNum = pageNum; - } - - public Integer getPageSize() { - return pageSize; - } - - public void setPageSize(Integer pageSize) { - this.pageSize = pageSize; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public Integer getOffset() { - return offset; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/DatabaseExportVo.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/DatabaseExportVo.java index c3263a2c..d3d8ad12 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/DatabaseExportVo.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/DatabaseExportVo.java @@ -2,6 +2,8 @@ package com.zyplayer.doc.db.controller.vo; import com.zyplayer.doc.db.controller.vo.TableColumnVo.TableInfoVo; import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto; +import lombok.AllArgsConstructor; +import lombok.Data; import java.util.List; import java.util.Map; @@ -12,31 +14,14 @@ import java.util.Map; * @author 暮光：城中城 * @since 2018-11-27 */ +@Data +@AllArgsConstructor public class DatabaseExportVo { - + + // 表字段注释信息列表 private Map> columnList; - + + // 数据库表列表 private List tableList; - - public DatabaseExportVo(Map> columnList, List tableList) { - this.columnList = columnList; - this.tableList = tableList; - } - - public Map> getColumnList() { - return columnList; - } - - public void setColumnList(Map> columnList) { - this.columnList = columnList; - } - - public List getTableList() { - return tableList; - } - - public void setTableList(List tableList) { - this.tableList = tableList; - } - + } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableColumnVo.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableColumnVo.java index b980a2ec..714321c0 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableColumnVo.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableColumnVo.java @@ -3,6 +3,7 @@ package com.zyplayer.doc.db.controller.vo; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto; +import lombok.Data; import java.util.List; @@ -12,53 +13,25 @@ import java.util.List; * @author 暮光：城中城 * @since 2018-11-27 */ +@Data public class TableColumnVo { - + + // 表字段注释信息 private List columnList; - + + // 表名+表注释 private TableInfoVo tableInfo; - + + @Data public static class TableInfoVo { - + @ColumnWidth(20) @ExcelProperty("表名") private String tableName; - + @ColumnWidth(80) @ExcelProperty("表注释") private String description; - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } + } - - public List getColumnList() { - return columnList; - } - - public void setColumnList(List columnList) { - this.columnList = columnList; - } - - public TableInfoVo getTableInfo() { - return tableInfo; - } - - public void setTableInfo(TableInfoVo tableInfo) { - this.tableInfo = tableInfo; - } - } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableDdlVo.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableDdlVo.java index a1d04b21..db47bc39 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableDdlVo.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableDdlVo.java @@ -1,6 +1,7 @@ package com.zyplayer.doc.db.controller.vo; import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; +import lombok.Data; import java.util.Objects; @@ -10,6 +11,7 @@ import java.util.Objects; * @author 暮光：城中城 * @since 2021-04-23 */ +@Data public class TableDdlVo { private String current; private String mysql; @@ -17,61 +19,24 @@ public class TableDdlVo { private String oracle; private String postgresql; private String hive; - + + // 获取连接类型的ddl public String getTableDDLByType() { - if (Objects.equals(current, DatabaseProductEnum.MYSQL.name().toLowerCase())) return mysql; - if (Objects.equals(current, DatabaseProductEnum.SQLSERVER.name().toLowerCase())) return sqlserver; - if (Objects.equals(current, DatabaseProductEnum.ORACLE.name().toLowerCase())) return oracle; - if (Objects.equals(current, DatabaseProductEnum.POSTGRESQL.name().toLowerCase())) return postgresql; - if (Objects.equals(current, DatabaseProductEnum.HIVE.name().toLowerCase())) return hive; + if (Objects.equals(current, DatabaseProductEnum.MYSQL.name().toLowerCase())) { + return mysql; + } + if (Objects.equals(current, DatabaseProductEnum.SQLSERVER.name().toLowerCase())) { + return sqlserver; + } + if (Objects.equals(current, DatabaseProductEnum.ORACLE.name().toLowerCase())) { + return oracle; + } + if (Objects.equals(current, DatabaseProductEnum.POSTGRESQL.name().toLowerCase())) { + return postgresql; + } + if (Objects.equals(current, DatabaseProductEnum.HIVE.name().toLowerCase())) { + return hive; + } return null; } - - public String getHive() { - return hive; - } - - public void setHive(String hive) { - this.hive = hive; - } - - public String getCurrent() { - return current; - } - - public void setCurrent(String current) { - this.current = current; - } - - public String getMysql() { - return mysql; - } - - public void setMysql(String mysql) { - this.mysql = mysql; - } - - public String getSqlserver() { - return sqlserver; - } - - public void setSqlserver(String sqlserver) { - this.sqlserver = sqlserver; - } - - public String getOracle() { - return oracle; - } - - public void setOracle(String oracle) { - this.oracle = oracle; - } - - public String getPostgresql() { - return postgresql; - } - - public void setPostgresql(String postgresql) { - this.postgresql = postgresql; - } } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableStatusVo.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableStatusVo.java index 46765ac3..74cc196f 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableStatusVo.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableStatusVo.java @@ -1,5 +1,7 @@ package com.zyplayer.doc.db.controller.vo; +import lombok.Data; + import java.util.Date; /** @@ -8,7 +10,9 @@ import java.util.Date; * @author 暮光：城中城 * @since 2019-09-04 */ +@Data public class TableStatusVo { + // 表名 private String name; private String engine; private Long version; @@ -28,156 +32,4 @@ public class TableStatusVo { private String createOptions; private String comment; private String dbType; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getEngine() { - return engine; - } - - public void setEngine(String engine) { - this.engine = engine; - } - - public Long getVersion() { - return version; - } - - public void setVersion(Long version) { - this.version = version; - } - - public String getRowFormat() { - return rowFormat; - } - - public void setRowFormat(String rowFormat) { - this.rowFormat = rowFormat; - } - - public Long getRows() { - return rows; - } - - public void setRows(Long rows) { - this.rows = rows; - } - - public Long getAvgRowLength() { - return avgRowLength; - } - - public void setAvgRowLength(Long avgRowLength) { - this.avgRowLength = avgRowLength; - } - - public Long getDataLength() { - return dataLength; - } - - public void setDataLength(Long dataLength) { - this.dataLength = dataLength; - } - - public Long getMaxDataLength() { - return maxDataLength; - } - - public void setMaxDataLength(Long maxDataLength) { - this.maxDataLength = maxDataLength; - } - - public Long getIndexLength() { - return indexLength; - } - - public void setIndexLength(Long indexLength) { - this.indexLength = indexLength; - } - - public Long getDataFree() { - return dataFree; - } - - public void setDataFree(Long dataFree) { - this.dataFree = dataFree; - } - - public Long getAutoIncrement() { - return autoIncrement; - } - - public void setAutoIncrement(Long autoIncrement) { - this.autoIncrement = autoIncrement; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - public Date getCheckTime() { - return checkTime; - } - - public void setCheckTime(Date checkTime) { - this.checkTime = checkTime; - } - - public String getCollation() { - return collation; - } - - public void setCollation(String collation) { - this.collation = collation; - } - - public String getChecksum() { - return checksum; - } - - public void setChecksum(String checksum) { - this.checksum = checksum; - } - - public String getCreateOptions() { - return createOptions; - } - - public void setCreateOptions(String createOptions) { - this.createOptions = createOptions; - } - - public String getComment() { - return comment; - } - - public void setComment(String comment) { - this.comment = comment; - } - - public String getDbType() { - return dbType; - } - - public void setDbType(String dbType) { - this.dbType = dbType; - } } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/UserDbAuthVo.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/UserDbAuthVo.java index c8dfdefa..a70f2de8 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/UserDbAuthVo.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/UserDbAuthVo.java @@ -1,55 +1,18 @@ package com.zyplayer.doc.db.controller.vo; +import lombok.Data; + /** * 用户数据库授权信息 * * @author 暮光：城中城 * @since 2019-08-22 */ +@Data public class UserDbAuthVo { private String userName; private Long userId; private Integer executeAuth; private Integer descEditAuth; private Integer procEditAuth; - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public Integer getExecuteAuth() { - return executeAuth; - } - - public void setExecuteAuth(Integer executeAuth) { - this.executeAuth = executeAuth; - } - - public Integer getDescEditAuth() { - return descEditAuth; - } - - public void setDescEditAuth(Integer descEditAuth) { - this.descEditAuth = descEditAuth; - } - - public Integer getProcEditAuth() { - return procEditAuth; - } - - public void setProcEditAuth(Integer procEditAuth) { - this.procEditAuth = procEditAuth; - } } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DatabaseFactoryBean.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DatabaseFactoryBean.java index d4b1b30d..3c892c81 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DatabaseFactoryBean.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DatabaseFactoryBean.java @@ -2,6 +2,7 @@ package com.zyplayer.doc.db.framework.db.bean; import com.alibaba.druid.pool.DruidDataSource; import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; +import lombok.Data; import org.mybatis.spring.SqlSessionTemplate; /** @@ -10,6 +11,7 @@ import org.mybatis.spring.SqlSessionTemplate; * @author 暮光：城中城 * @since 2018年8月8日 */ +@Data public class DatabaseFactoryBean { private Long id; private DruidDataSource dataSource; @@ -19,69 +21,5 @@ public class DatabaseFactoryBean { private String cnName; private String groupName; private DatabaseProductEnum databaseProduct; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getCnName() { - return cnName; - } - - public void setCnName(String cnName) { - this.cnName = cnName; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public DruidDataSource getDataSource() { - return dataSource; - } - - public void setDataSource(DruidDataSource dataSource) { - this.dataSource = dataSource; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getDbName() { - return dbName; - } - - public void setDbName(String dbName) { - this.dbName = dbName; - } - - public DatabaseProductEnum getDatabaseProduct() { - return databaseProduct; - } - - public void setDatabaseProduct(DatabaseProductEnum databaseProduct) { - this.databaseProduct = databaseProduct; - } - - public SqlSessionTemplate getSqlSessionTemplate() { - return sqlSessionTemplate; - } - - public void setSqlSessionTemplate(SqlSessionTemplate sqlSessionTemplate) { - this.sqlSessionTemplate = sqlSessionTemplate; - } - + } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DbConfigBean.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DbConfigBean.java index 2f42132a..13b6ab81 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DbConfigBean.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DbConfigBean.java @@ -1,45 +1,16 @@ package com.zyplayer.doc.db.framework.db.bean; +import lombok.Data; + /** * 数据库配置信息 * @author 暮光：城中城 * @since 2018年8月8日 */ +@Data public class DbConfigBean { private String driverClassName; private String url; private String username; private String password; - - public String getDriverClassName() { - return driverClassName; - } - - public void setDriverClassName(String driverClassName) { - this.driverClassName = driverClassName; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ColumnInfoDto.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ColumnInfoDto.java index f632152e..7bfd12bd 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ColumnInfoDto.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ColumnInfoDto.java @@ -1,47 +1,17 @@ package com.zyplayer.doc.db.framework.db.dto; +import lombok.Data; + /** * 字段信息 * * @author 暮光：城中城 * @since 2018-11-27 */ +@Data public class ColumnInfoDto { private String isNullable; private String columnType; private String columnDefault; private String extra; - - public String getIsNullable() { - return isNullable; - } - - public void setIsNullable(String isNullable) { - this.isNullable = isNullable; - } - - public String getColumnDefault() { - return columnDefault; - } - - public void setColumnDefault(String columnDefault) { - this.columnDefault = columnDefault; - } - - public String getColumnType() { - return columnType; - } - - public void setColumnType(String columnType) { - this.columnType = columnType; - } - - public String getExtra() { - return extra; - } - - public void setExtra(String extra) { - this.extra = extra; - } - } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/DatabaseInfoDto.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/DatabaseInfoDto.java index 131275c5..098bbc66 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/DatabaseInfoDto.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/DatabaseInfoDto.java @@ -1,20 +1,14 @@ package com.zyplayer.doc.db.framework.db.dto; +import lombok.Data; + /** * 数据库信息 * * @author 暮光：城中城 * @since 2018-11-27 */ +@Data public class DatabaseInfoDto { private String dbName; - - public String getDbName() { - return dbName; - } - - public void setDbName(String dbName) { - this.dbName = dbName; - } - } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ProcedureDto.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ProcedureDto.java index eafb6e51..292ac125 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ProcedureDto.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ProcedureDto.java @@ -1,11 +1,14 @@ package com.zyplayer.doc.db.framework.db.dto; +import lombok.Data; + /** * 存储过程信息 * * @author 暮光：城中城 * @since 2021-04-25 */ +@Data public class ProcedureDto { private String db; private String name; @@ -15,68 +18,4 @@ public class ProcedureDto { private String paramList; private String returns; private String created; - - public String getDb() { - return db; - } - - public void setDb(String db) { - this.db = db; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getDefiner() { - return definer; - } - - public void setDefiner(String definer) { - this.definer = definer; - } - - public String getCreated() { - return created; - } - - public void setCreated(String created) { - this.created = created; - } - - public String getBody() { - return body; - } - - public void setBody(String body) { - this.body = body; - } - - public String getParamList() { - return paramList; - } - - public void setParamList(String paramList) { - this.paramList = paramList; - } - - public String getReturns() { - return returns; - } - - public void setReturns(String returns) { - this.returns = returns; - } } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/QueryTableColumnDescDto.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/QueryTableColumnDescDto.java index 4fc2a1ec..19dd1623 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/QueryTableColumnDescDto.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/QueryTableColumnDescDto.java @@ -1,37 +1,16 @@ package com.zyplayer.doc.db.framework.db.dto; +import lombok.Data; + /** * 表字段注释信息 * * @author 暮光：城中城 * @since 2018-11-27 */ +@Data public class QueryTableColumnDescDto { private String tableName; private String columnName; private String description; - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public String getColumnName() { - return columnName; - } - - public void setColumnName(String columnName) { - this.columnName = columnName; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableColumnDescDto.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableColumnDescDto.java index 8f6ed7ba..9f1f701c 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableColumnDescDto.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableColumnDescDto.java @@ -2,6 +2,7 @@ package com.zyplayer.doc.db.framework.db.dto; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; /** * 表字段注释信息 @@ -9,112 +10,41 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; * @author 暮光：城中城 * @since 2018-11-27 */ +@Data public class TableColumnDescDto { @ColumnWidth(20) @ExcelProperty("表名") private String tableName; - + @ColumnWidth(20) @ExcelProperty("字段名") private String name; - + @ColumnWidth(15) @ExcelProperty("是否自增") private String selfIncrement; - + @ColumnWidth(20) @ExcelProperty("类型") private String type; - + @ColumnWidth(10) @ExcelProperty("空值") private String nullable; - + @ColumnWidth(10) @ExcelProperty("长度") private String length; - + @ColumnWidth(10) @ExcelProperty("小数点") private String numericScale; - + @ColumnWidth(10) @ExcelProperty("主键") private String primaryKey; - + @ColumnWidth(80) @ExcelProperty("注释") private String description; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getNullable() { - return nullable; - } - - public void setNullable(String nullable) { - this.nullable = nullable; - } - - public String getLength() { - return length; - } - - public void setLength(String length) { - this.length = length; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public String getNumericScale() { - return numericScale; - } - - public void setNumericScale(String numericScale) { - this.numericScale = numericScale; - } - - public String getSelfIncrement() { - return selfIncrement; - } - - public void setSelfIncrement(String selfIncrement) { - this.selfIncrement = selfIncrement; - } - - public String getPrimaryKey() { - return primaryKey; - } - - public void setPrimaryKey(String primaryKey) { - this.primaryKey = primaryKey; - } } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableDescDto.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableDescDto.java index 1b91c788..c0eae402 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableDescDto.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableDescDto.java @@ -1,38 +1,16 @@ package com.zyplayer.doc.db.framework.db.dto; +import lombok.Data; + /** * 表注释信息 * * @author 暮光：城中城 * @since 2018-11-27 */ +@Data public class TableDescDto { private String tableName; private String description; private String majorId; - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getMajorId() { - return majorId; - } - - public void setMajorId(String majorId) { - this.majorId = majorId; - } - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableInfoDto.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableInfoDto.java index b732b84e..c4ca7d70 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableInfoDto.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableInfoDto.java @@ -1,46 +1,17 @@ package com.zyplayer.doc.db.framework.db.dto; +import lombok.Data; + /** * 表信息 * * @author 暮光：城中城 * @since 2018-11-27 */ +@Data public class TableInfoDto { private String dbName; private String tableName; private String tableComment; private String tableId; - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public String getTableId() { - return tableId; - } - - public void setTableId(String tableId) { - this.tableId = tableId; - } - - public String getTableComment() { - return tableComment; - } - - public void setTableComment(String tableComment) { - this.tableComment = tableComment; - } - - public String getDbName() { - return dbName; - } - - public void setDbName(String dbName) { - this.dbName = dbName; - } } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteParam.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteParam.java index 6fe33c9e..60d68c58 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteParam.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteParam.java @@ -1,5 +1,6 @@ package com.zyplayer.doc.db.framework.db.mapper.base; +import lombok.Data; import org.apache.ibatis.mapping.ParameterMapping; import java.util.List; @@ -10,6 +11,7 @@ import java.util.List; * @author 暮光：城中城 * @since 2019-09-28 */ +@Data public class ExecuteParam { private String sql; private List paramList; @@ -19,71 +21,4 @@ public class ExecuteParam { private String executeId; private String prefixSql; private ExecuteType executeType; - - public ExecuteParam() { - } - - public Long getDatasourceId() { - return datasourceId; - } - - public void setDatasourceId(Long datasourceId) { - this.datasourceId = datasourceId; - } - - public String getExecuteId() { - return executeId; - } - - public void setExecuteId(String executeId) { - this.executeId = executeId; - } - - public ExecuteType getExecuteType() { - return executeType; - } - - public void setExecuteType(ExecuteType executeType) { - this.executeType = executeType; - } - - public List getParameterMappings() { - return parameterMappings; - } - - public void setParameterMappings(List parameterMappings) { - this.parameterMappings = parameterMappings; - } - - public String getSql() { - return sql; - } - - public void setSql(String sql) { - this.sql = sql; - } - - public List getParamList() { - return paramList; - } - - public void setParamList(List paramList) { - this.paramList = paramList; - } - - public Integer getMaxRows() { - return maxRows; - } - - public void setMaxRows(Integer maxRows) { - this.maxRows = maxRows; - } - - public String getPrefixSql() { - return prefixSql; - } - - public void setPrefixSql(String prefixSql) { - this.prefixSql = prefixSql; - } } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteResult.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteResult.java index a2802e15..d1defbcd 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteResult.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteResult.java @@ -1,5 +1,7 @@ package com.zyplayer.doc.db.framework.db.mapper.base; +import lombok.Data; + import java.util.Collections; import java.util.List; import java.util.Map; @@ -10,70 +12,32 @@ import java.util.Map; * @author 暮光：城中城 * @since 2019年8月18日 */ +@Data public class ExecuteResult { private int updateCount; private long useTime; private String errMsg; private String sql; private List> result; - + public ExecuteResult(String sql) { this.updateCount = -1; this.useTime = 0; this.result = Collections.emptyList(); this.sql = sql; } - + public ExecuteResult(int updateCount, List> result, long useTime, String sql) { this.updateCount = updateCount; this.result = result; this.useTime = useTime; this.sql = sql; } - - public int getUpdateCount() { - return updateCount; - } - - public void setUpdateCount(int updateCount) { - this.updateCount = updateCount; - } - - public List> getResult() { - return result; - } - - public void setResult(List> result) { - this.result = result; - } - - public long getUseTime() { - return useTime; - } - - public void setUseTime(long useTime) { - this.useTime = useTime; - } - - public String getErrMsg() { - return errMsg; - } - - public void setErrMsg(String errMsg) { - this.errMsg = errMsg; - } - + public static ExecuteResult error(String errMsg, String sql) { ExecuteResult executeResult = new ExecuteResult(sql); executeResult.setErrMsg(errMsg); return executeResult; } - - public String getSql() { - return sql; - } - - public void setSql(String sql) { - this.sql = sql; - } + } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/json/DocDbResponseJson.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/json/DocDbResponseJson.java index d4f42537..20000004 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/json/DocDbResponseJson.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/json/DocDbResponseJson.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.serializer.SerializeConfig; import com.alibaba.fastjson.serializer.SimpleDateFormatSerializer; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zyplayer.doc.core.json.ResponseJson; +import lombok.Data; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -16,6 +17,7 @@ import java.util.Date; * @author 暮光：城中城 * @since 2018年8月8日 */ +@Data public class DocDbResponseJson implements ResponseJson { private static SerializeConfig mapping = new SerializeConfig(); static { @@ -53,26 +55,6 @@ public class DocDbResponseJson implements ResponseJson { this.errCode = errCode; } - public Integer getErrCode() { - return errCode; - } - - public void setErrCode(Integer errCode) { - this.errCode = errCode; - } - - public String getErrMsg() { - return errMsg; - } - - public void setErrMsg(String errMsg) { - this.errMsg = errMsg; - } - - public Object getData() { - return data; - } - public void setData(Object data) { if (null != data) { if (data instanceof IPage) { @@ -96,7 +78,7 @@ public class DocDbResponseJson implements ResponseJson { public static DocDbResponseJson warn(String errMsg) { return new DocDbResponseJson(300, errMsg); } - + /** * 错误 * @@ -135,7 +117,7 @@ public class DocDbResponseJson implements ResponseJson { public String toJson() { return JSON.toJSONString(this, mapping); } - + public void send(HttpServletResponse response) { try { response.setStatus(200); @@ -147,17 +129,10 @@ public class DocDbResponseJson implements ResponseJson { e.printStackTrace(); } } - + @Override public String toString() { return "DefaultResponseJson [errCode=" + errCode + ", errMsg=" + errMsg + ", data=" + data + "]"; } - - public Long getTotal() { - return total; - } - - public void setTotal(Long total) { - this.total = total; - } + } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/DownloadService.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/DownloadService.java index 309ba9a0..b8ade8c6 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/DownloadService.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/DownloadService.java @@ -17,39 +17,39 @@ import java.util.Set; */ @Service public interface DownloadService { - + DatabaseProductEnum getDatabaseProductEnum(); - + /** * 导出数据为insert语句格式 * * @author 暮光：城中城 * @since 2020年6月5日 */ - public String downloadDataByInsert(DataViewParam param, ExecuteParam executeParam, List dataCols, Set conditionSet) throws Exception; - + String downloadDataByInsert(DataViewParam param, ExecuteParam executeParam, List dataCols, Set conditionSet) throws Exception; + /** * 导出数据为update语句格式 * * @author 暮光：城中城 * @since 2020年6月5日 */ - public String downloadDataByUpdate(DataViewParam param, ExecuteParam executeParam, List dataCols, Set conditionSet) throws Exception; - + String downloadDataByUpdate(DataViewParam param, ExecuteParam executeParam, List dataCols, Set conditionSet) throws Exception; + /** * 导出数据为json格式 * * @author 暮光：城中城 * @since 2020年6月5日 */ - public String downloadDataByJson(DataViewParam param, ExecuteParam executeParam, List dataCols, Set conditionSet) throws Exception; - - + String downloadDataByJson(DataViewParam param, ExecuteParam executeParam, List dataCols, Set conditionSet) throws Exception; + + /** * 是否是数值类型 * * @param type 类型 * @return 结果 */ - public boolean isNumber(String type); + boolean isNumber(String type); }