manager/zyplayer-doc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据查看优化，执行器支持复制为insert、update、json格式

Browse Source
This commit is contained in:
暮光：城中城
2021-05-24 22:42:01 +08:00
parent 9992ca9183
commit 206f410573
18 changed files with 214 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java
View File

@@ -103,6 +103,7 @@ public class DatabaseDocController {
}
DbBaseService dbBaseService = dbBaseFactory.getDbBaseService(sourceId);
Map<String, Object> dbResultMap = dbBaseService.getEditorData(sourceId);
dbResultMap.put("product", dbBaseService.getDatabaseProduct().name().toLowerCase());
// 缓存10分钟，如果10分钟内库里面增删改了表或字段，则提示不出来
CacheUtil.put(cacheKey, dbResultMap, 6000);
return DocDbResponseJson.ok(dbResultMap);

8
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableDdlVo.java
View File

@@ -21,6 +21,14 @@ public class TableDdlVo {
return null;
}
public String getHive() {
return hive;
}
public void setHive(String hive) {
this.hive = hive;
}
public String getCurrent() {
return current;
}

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/BaseMapper.java
View File

@@ -23,7 +23,7 @@ public interface BaseMapper {
* @author 暮光：城中城
* @since 2018年8月8日
*/
Map<String, String> getTableDdl(@Param("dbName") String dbName, @Param("tableName") String tableName);
List<Map<String, String>> getTableDdl(@Param("dbName") String dbName, @Param("tableName") String tableName);
/**
* 获取库列表

3
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/DbBaseFactory.java
View File

@@ -19,11 +19,10 @@ public class DbBaseFactory {
DatabaseRegistrationBean databaseRegistrationBean;
@Resource
private List<DbBaseService> dbBaseServiceList;
private Map<DatabaseProductEnum, DbBaseService> dbBaseServiceMap;
private final Map<DatabaseProductEnum, DbBaseService> dbBaseServiceMap = new HashMap<>();
@PostConstruct
private void init() {
dbBaseServiceMap = new HashMap<>();
dbBaseServiceList.forEach(item -> dbBaseServiceMap.put(item.getDatabaseProduct(), item));
}

22
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/DbBaseService.java
View File

@@ -67,7 +67,7 @@ public abstract class DbBaseService {
*
* @return 服务类型
*/
abstract DatabaseProductEnum getDatabaseProduct();
public abstract DatabaseProductEnum getDatabaseProduct();
/**
* 获取库列表
@@ -345,8 +345,16 @@ public abstract class DbBaseService {
* @since 2020年4月24日
*/
public String getQueryPageSql(DataViewParam dataViewParam) {
// 需要各数据服务自己实现，各数据库产品的实现都不一样
throw new ConfirmException("暂未支持的数据库类型");
StringBuilder sqlSb = new StringBuilder();
sqlSb.append(String.format("select * from %s.%s", dataViewParam.getDbName(), dataViewParam.getTableName()));
if (StringUtils.isNotBlank(dataViewParam.getCondition())) {
sqlSb.append(String.format(" where %s", dataViewParam.getCondition()));
}
if (StringUtils.isNotBlank(dataViewParam.getOrderColumn()) && StringUtils.isNotBlank(dataViewParam.getOrderType())) {
sqlSb.append(String.format(" order by %s %s", dataViewParam.getOrderColumn(), dataViewParam.getOrderType()));
}
sqlSb.append(String.format(" limit %s offset %s", dataViewParam.getPageSize(), dataViewParam.getOffset()));
return sqlSb.toString();
}
/**
@@ -357,7 +365,11 @@ public abstract class DbBaseService {
* @since 2020年4月24日
*/
public String getQueryCountSql(DataViewParam dataViewParam) {
// 需要各数据服务自己实现，各数据库产品的实现都不一样
throw new ConfirmException("暂未支持的数据库类型");
StringBuilder sqlSb = new StringBuilder();
sqlSb.append(String.format("select count(1) as counts from %s.%s", dataViewParam.getDbName(), dataViewParam.getTableName()));
if (StringUtils.isNotBlank(dataViewParam.getCondition())) {
sqlSb.append(String.format(" where %s", dataViewParam.getCondition()));
}
return sqlSb.toString();
}
}

22
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/HiveServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.zyplayer.doc.db.service;
import com.zyplayer.doc.core.exception.ConfirmException;
import com.zyplayer.doc.db.controller.vo.TableDdlVo;
import com.zyplayer.doc.db.controller.vo.TableStatusVo;
import com.zyplayer.doc.db.framework.db.dto.QueryTableColumnDescDto;
import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto;
@@ -8,9 +9,12 @@ import com.zyplayer.doc.db.framework.db.dto.TableDescDto;
import com.zyplayer.doc.db.framework.db.dto.TableInfoDto;
import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum;
import com.zyplayer.doc.db.framework.db.mapper.base.BaseMapper;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Service
public class HiveServiceImpl extends DbBaseService {
@@ -30,6 +34,24 @@ public class HiveServiceImpl extends DbBaseService {
return tableList;
}
@Override
public TableDdlVo getTableDdl(Long sourceId, String dbName, String tableName) {
BaseMapper baseMapper = this.getViewAuthBaseMapper(sourceId);
List<Map<String, String>> tableDdlList = baseMapper.getTableDdl(dbName, tableName);
TableDdlVo tableDdlVo = new TableDdlVo();
tableDdlVo.setCurrent(DatabaseProductEnum.HIVE.name().toLowerCase());
if (CollectionUtils.isNotEmpty(tableDdlList)) {
// hive和impala结果集不一样
if (tableDdlList.size() == 1) {
tableDdlVo.setHive(tableDdlList.get(0).get("result"));
} else {
String createTabStmt = tableDdlList.stream().map(map -> map.get("createtab_stmt")).collect(Collectors.joining("\n"));
tableDdlVo.setHive(createTabStmt);
}
}
return tableDdlVo;
}
@Override
public List<TableColumnDescDto> getTableColumnDescList(Long sourceId, String tableName) {
throw new ConfirmException("不支持的操作");

33
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/MysqlServiceImpl.java
View File

@@ -11,9 +11,11 @@ import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteParam;
import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteResult;
import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteType;
import com.zyplayer.doc.db.framework.db.mapper.mysql.MysqlMapper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
@@ -29,12 +31,15 @@ public class MysqlServiceImpl extends DbBaseService {
@Override
public TableDdlVo getTableDdl(Long sourceId, String dbName, String tableName) {
BaseMapper baseMapper = this.getViewAuthBaseMapper(sourceId);
Map<String, String> tableDdl = baseMapper.getTableDdl(dbName, tableName);
List<Map<String, String>> tableDdlList = baseMapper.getTableDdl(dbName, tableName);
TableDdlVo tableDdlVo = new TableDdlVo();
tableDdlVo.setCurrent(DatabaseProductEnum.MYSQL.name().toLowerCase());
tableDdlVo.setMysql(tableDdl.get("Create Table"));
tableDdlVo.setMysql("// 生成失败");
tableDdlVo.setOracle("// TODO 等待大佬来实现转换");
// TODO 将建表语句转换为其他数据库的，还不知道怎么做，先这样留着，看有没大佬来实现
if (CollectionUtils.isNotEmpty(tableDdlList)) {
tableDdlVo.setMysql(tableDdlList.get(0).get("Create Table"));
}
return tableDdlVo;
}
@@ -126,28 +131,4 @@ public class MysqlServiceImpl extends DbBaseService {
return ExecuteResult.error(e.getMessage(), procSql);
}
}
@Override
public String getQueryPageSql(DataViewParam dataViewParam) {
StringBuilder sqlSb = new StringBuilder();
sqlSb.append(String.format("select * from %s.%s", dataViewParam.getDbName(), dataViewParam.getTableName()));
if (StringUtils.isNotBlank(dataViewParam.getCondition())) {
sqlSb.append(String.format(" where %s", dataViewParam.getCondition()));
}
if (StringUtils.isNotBlank(dataViewParam.getOrderColumn()) && StringUtils.isNotBlank(dataViewParam.getOrderType())) {
sqlSb.append(String.format(" order by %s %s", dataViewParam.getOrderColumn(), dataViewParam.getOrderType()));
}
sqlSb.append(String.format(" limit %s offset %s", dataViewParam.getPageSize(), dataViewParam.getOffset()));
return sqlSb.toString();
}
@Override
public String getQueryCountSql(DataViewParam dataViewParam) {
StringBuilder sqlSb = new StringBuilder();
sqlSb.append(String.format("select count(1) as counts from %s.%s", dataViewParam.getDbName(), dataViewParam.getTableName()));
if (StringUtils.isNotBlank(dataViewParam.getCondition())) {
sqlSb.append(String.format(" where %s", dataViewParam.getCondition()));
}
return sqlSb.toString();
}
}

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/OracleServiceImpl.java
View File

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
public class OracleServiceImpl extends DbBaseService {
@Override
DatabaseProductEnum getDatabaseProduct() {
public DatabaseProductEnum getDatabaseProduct() {
return DatabaseProductEnum.ORACLE;
}
}

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/PostgresqlServiceImpl.java
View File

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
public class PostgresqlServiceImpl extends DbBaseService {
@Override
DatabaseProductEnum getDatabaseProduct() {
public DatabaseProductEnum getDatabaseProduct() {
return DatabaseProductEnum.POSTGRESQL;
}
}

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/SqlserverServiceImpl.java
View File

@@ -14,7 +14,7 @@ import java.util.stream.Collectors;
public class SqlserverServiceImpl extends DbBaseService {
@Override
DatabaseProductEnum getDatabaseProduct() {
public DatabaseProductEnum getDatabaseProduct() {
return DatabaseProductEnum.SQLSERVER;
}

2
zyplayer-doc-db/src/main/resources/doc-db.html
View File

@@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon-db.png><title>数据库文档管理</title><link href=css/app.b6b9fe42.css rel=preload as=style><link href=css/chunk-vendors.8924efc6.css rel=preload as=style><link href=js/app.bfcb0d3d.js rel=preload as=script><link href=js/chunk-vendors.d40f789d.js rel=preload as=script><link href=css/chunk-vendors.8924efc6.css rel=stylesheet><link href=css/app.b6b9fe42.css rel=stylesheet></head><body><noscript><strong>We're sorry but zyplayer-db-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.d40f789d.js></script><script src=js/app.bfcb0d3d.js></script></body></html>
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon-db.png><title>数据库文档管理</title><link href=css/app.b6b9fe42.css rel=preload as=style><link href=css/chunk-vendors.8924efc6.css rel=preload as=style><link href=js/app.c876342e.js rel=preload as=script><link href=js/chunk-vendors.d40f789d.js rel=preload as=script><link href=css/chunk-vendors.8924efc6.css rel=stylesheet><link href=css/app.b6b9fe42.css rel=stylesheet></head><body><noscript><strong>We're sorry but zyplayer-db-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.d40f789d.js></script><script src=js/app.c876342e.js></script></body></html>

2
zyplayer-doc-db/src/main/resources/js/app.bfcb0d3d.js → zyplayer-doc-db/src/main/resources/js/app.c876342e.js
View File

File diff suppressed because one or more lines are too long