From abc24b424fdbdc7e71426168100600c25ed6385f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?= <806783409@qq.com> Date: Mon, 2 Sep 2019 22:47:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=99=A8=E5=BA=93=E8=A1=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E9=94=AE=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/manage/entity/DbFavorite.java | 18 ++- .../db/controller/DatabaseDocController.java | 48 ++++-- .../controller/DbSqlExecutorController.java | 12 +- .../framework/db/dto/TableColumnDescDto.java | 144 +++++++++--------- .../doc/db/framework/db/dto/TableInfoDto.java | 72 +++++---- .../framework/db/mapper/base/BaseMapper.java | 6 +- .../db/mapper/base/ExecuteResult.java | 2 +- .../framework/db/mapper/base/SqlExecutor.java | 27 ++-- .../db/mapper/mysql/MysqlBaseMapper.xml | 35 +++-- .../src/main/resources/doc-db-index.js | 8 +- .../src/main/resources/doc-db-manifest.js | 4 +- .../src/main/resources/doc-db.html | 2 +- .../sql/zyplayer_doc_manage.1.0.4.sql | 2 + zyplayer-doc-ui/db-ui/src/App.vue | 6 +- .../db-ui/src/views/data/Executor.vue | 55 ++++--- 15 files changed, 255 insertions(+), 186 deletions(-) diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbFavorite.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbFavorite.java index 830f7d83..4cd34c0e 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbFavorite.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbFavorite.java @@ -1,13 +1,14 @@ package com.zyplayer.doc.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; -import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; + import java.io.Serializable; +import java.util.Date; /** *
- * + * *
* * @author 暮光:城中城 @@ -22,6 +23,11 @@ public class DbFavorite implements Serializable { */ @TableId(value = "id", type = IdType.AUTO) private Long id; + + /** + * 数据源ID + */ + private Long datasourceId; /** * 收藏标题 @@ -115,4 +121,12 @@ public class DbFavorite implements Serializable { ", yn=" + yn + "}"; } + + public Long getDatasourceId() { + return datasourceId; + } + + public void setDatasourceId(Long datasourceId) { + this.datasourceId = datasourceId; + } } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java index fab4555e..66151ed8 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java @@ -27,6 +27,7 @@ import com.zyplayer.doc.db.framework.db.dto.*; import com.zyplayer.doc.db.framework.db.mapper.base.BaseMapper; import com.zyplayer.doc.db.framework.db.mapper.mysql.MysqlMapper; import com.zyplayer.doc.db.framework.json.DocDbResponseJson; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.mybatis.spring.SqlSessionTemplate; @@ -89,6 +90,7 @@ public class DatabaseDocController { /** * 获取编辑器所需的所有信息,用于自动补全 + * 此接口会返回所有库表结构,介意的话请自己手动屏蔽调此接口 * @param sourceId * @return */ @@ -109,19 +111,35 @@ public class DatabaseDocController { List