This commit is contained in:
2019-03-18 17:10:52 +08:00
parent e057d613b9
commit 7ef48dfc3e
37 changed files with 827 additions and 258 deletions

View File

@@ -2,7 +2,7 @@ package net.tccn.service;
import net.tccn.base.JBean;
import net.tccn.base.Kv;
import net.tccn.dbq.DbPlat;
import net.tccn.dbq.jdbc.api.DbAccount;
import net.tccn.dbq.Field;
import net.tccn.dbq.qtask.SysPlat;
import net.tccn.meta.MetaKit;
@@ -58,7 +58,7 @@ public class MetadataService extends BaseService { //arango
//----------- 数据平台 ---------------
@RestMapping(name = "db_plat_list", comment = "数据平台")
public List<DbPlat> dbPlatList() {
public List<DbAccount> dbPlatList() {
return MetaKit.getDbPlats();
}
@@ -98,6 +98,17 @@ public class MetadataService extends BaseService { //arango
return jBean.setBody(list);
}
@RestMapping(name = "service_list", comment = "业务列表")
public JBean serviceList(@RestParam(name = "platToken") String token) {
JBean jBean = new JBean();
List<MetaService> list = MetaKit.getMetaServices();
jBean.setBody(list);
return jBean;
}
@RestMapping(name = "tableinfo", comment = "table详情")
public JBean tableInfo(@RestParam(name = "platToken") String token, String name) {
return JBean.by(0, "", findMetaTable(name, token));
@@ -126,9 +137,8 @@ public class MetadataService extends BaseService { //arango
public List<String> showSort(String serviceKey , List<String> items, @RestParam(name = "platToken") String token) {
if (items == null || items.size() == 0) return null;
MetaTable metaTable = findMetaTable(serviceKey, token);
//fixme: metaTable.setShows(items);
metaTable.update();
MetaKit.showUpdate.apply(serviceKey, items);
return items;
}

View File

@@ -2,15 +2,13 @@ package net.tccn.service;
import net.tccn.base.JBean;
import net.tccn.base.Kv;
import net.tccn.base.arango.ArangoSource;
import net.tccn.dbq.DbPlat;
import net.tccn.dbq.jdbc.api.DbAccount;
import net.tccn.dbq.qtask.Qtask;
import net.tccn.dbq.qtask.SysPlat;
import org.redkale.net.http.RestMapping;
import org.redkale.net.http.RestParam;
import org.redkale.net.http.RestService;
import javax.annotation.Resource;
import java.sql.SQLException;
import java.util.function.Predicate;
@@ -71,7 +69,7 @@ public class QtaskService extends BaseService {
jBean.set(-1, "查询失败,请设置正确的【数据平台】"); break;
}
DbPlat dbPlat = DbPlat.dao.findByKey(qtask.getPlatId());//arangoSource.findById("db_plat/" + qTask.getPlatId(), DbPlat.class);
DbAccount dbPlat = DbAccount.dao.findByKey(qtask.getPlatId());//arangoSource.findById("db_plat/" + qTask.getPlatId(), DbAccount.class);
if (dbPlat == null) {
jBean.set(-1, "查询失败,请设置正确的【数据平台】"); break;
}