修改:1、arangodb -> mysql,去除arangodb
2、部分字段逻辑重构
This commit is contained in:
@@ -8,7 +8,7 @@ import net.tccn.base.dbq.jdbc.api.DbAccount;
|
||||
import net.tccn.base.dbq.jdbc.api.DbKit;
|
||||
import net.tccn.base.dbq.table.Column;
|
||||
import net.tccn.base.dbq.table.Table;
|
||||
import net.tccn.meta.MetaTable;
|
||||
import net.tccn.meta.MTable;
|
||||
import org.redkale.net.http.RestMapping;
|
||||
import org.redkale.net.http.RestService;
|
||||
|
||||
@@ -23,13 +23,13 @@ import java.util.stream.Stream;
|
||||
public class _DbService extends BaseService {
|
||||
|
||||
@RestMapping(name = "catalog_list", comment = "获取数据源的database")
|
||||
public JBean catalogList(DbAccount dbAccount, String dbPlatId) {
|
||||
public JBean catalogList(DbAccount dbAccount, int dbid) {
|
||||
JBean jBean = new JBean();
|
||||
DbKit dbKit = null;
|
||||
if (dbAccount != null) {
|
||||
dbKit = new DbKit(dbAccount, "");
|
||||
} else {
|
||||
dbKit = MetaKit.getDbKit(dbPlatId, "");
|
||||
dbKit = MetaKit.getDbKit(dbid, "");
|
||||
}
|
||||
|
||||
List<Map> list = dbKit.queryList("SHOW DATABASES;", Map.class);
|
||||
@@ -40,29 +40,29 @@ public class _DbService extends BaseService {
|
||||
}
|
||||
|
||||
@RestMapping(name = "table_list", comment = "数据库表列表")
|
||||
public List<Table> tableList(String dbPlatId, String catalog, String[] tables) {
|
||||
DbKit dbKit = MetaKit.getDbKit(dbPlatId, "");
|
||||
public List<Table> tableList(int dbid, String catalog, String[] tables) {
|
||||
DbKit dbKit = MetaKit.getDbKit(dbid, "");
|
||||
|
||||
String sql = tplKit.getTpl("db.table_list", Kv.of("catalog", catalog).set("tables", tables));
|
||||
return dbKit.queryList(sql, Table.class);
|
||||
}
|
||||
|
||||
@RestMapping(ignore = true)
|
||||
public List<Table> tableInfoList(String dbPlatId, String catalog, String[] tables) {
|
||||
public List<Table> tableInfoList(int dbid, String catalog, String[] tables) {
|
||||
List<Table> list = new ArrayList<>(tables.length);
|
||||
for (String table : tables) {
|
||||
list.add(tableInfo(dbPlatId, catalog, table));
|
||||
list.add(tableInfo(dbid, catalog, table));
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
@RestMapping(name = "table_info", comment = "数据库表详情")
|
||||
public JBean MetatableInfo(String dbPlatId, String catalog, String tableName) {
|
||||
public JBean MetatableInfo(int dbid, String catalog, String tableName) {
|
||||
JBean jBean = new JBean();
|
||||
try {
|
||||
Table table = tableInfo(dbPlatId, catalog, tableName);
|
||||
Table table = tableInfo(dbid, catalog, tableName);
|
||||
|
||||
jBean.setBody(MetaTable.toAs(table));
|
||||
jBean.setBody(MTable.toAs(table));
|
||||
} catch (Exception e) {
|
||||
jBean.set(-1, "查询表信息失败");
|
||||
new IllegalArgumentException("查询表信息失败", e);
|
||||
@@ -71,8 +71,8 @@ public class _DbService extends BaseService {
|
||||
}
|
||||
|
||||
@RestMapping(ignore = true, comment = "查询表信息")
|
||||
public Table tableInfo(String dbPlatId, String catalog, String tableName) {
|
||||
DbKit dbKit = MetaKit.getDbKit(dbPlatId, catalog);
|
||||
public Table tableInfo(int dbid, String catalog, String tableName) {
|
||||
DbKit dbKit = MetaKit.getDbKit(dbid, catalog);
|
||||
|
||||
String sql = tplKit.getTpl("db.table_list", Kv.of("table", tableName));
|
||||
String columnSql = String.format("SHOW FULL COLUMNS FROM %s.`%s`", catalog, tableName);
|
||||
@@ -92,10 +92,10 @@ public class _DbService extends BaseService {
|
||||
}
|
||||
|
||||
@RestMapping(name = "table_create", comment = "新建表[mysql]")
|
||||
public JBean tableCreate(String dbPlatId, String catalog, String sql) {
|
||||
public JBean tableCreate(int dbid, String catalog, String sql) {
|
||||
JBean jBean = new JBean();
|
||||
|
||||
DbKit dbKit = MetaKit.getDbKit(dbPlatId, catalog);
|
||||
DbKit dbKit = MetaKit.getDbKit(dbid, catalog);
|
||||
dbKit.createTable(sql);
|
||||
|
||||
return jBean;
|
||||
|
||||
Reference in New Issue
Block a user