lxy/meta-kit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、解决默认提供的删除功能异常 2、重构DbKit，解决存在的catalog未设置导致的查询失败

Browse Source
This commit is contained in:
lxyer
2019-06-13 11:27:22 +08:00
parent 7590f73651
commit 61a90c8591
10 changed files with 85 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/tccn/base/MetaKit.java
View File

@@ -208,7 +208,7 @@ public final class MetaKit {
String comment = metaService.getComment();
//List<Field> items = new ArrayList<>();
Kv<String, Kv<String, Kv>> _items2 = Kv.of();
/*Kv<String, Kv<String, Kv>> _items2 = Kv.of();
metaTables.forEach((k, v) -> {
Kv<String, Kv> _items = Kv.of();
v.getItems().forEach(x -> {
@@ -222,7 +222,7 @@ public final class MetaKit {
});
_items2.set(k, _items);
});
});*/
//shows
/*List _shows = new ArrayList();
@@ -232,7 +232,7 @@ public final class MetaKit {
.filter(y -> x.split("[.]")[1].equals(y.getName()))
.findFirst().ifPresent(y -> _shows.add(Kv.of("col", x).set("order", true)));
});*/
List<Kv> _shows = shows.stream().map(x -> {
/*List<Kv> _shows = shows.stream().map(x -> {
Kv kv = Kv.of();
kv.putAll(x);
@@ -246,7 +246,7 @@ public final class MetaKit {
kv.remove("inType");
kv.remove("inExt");
return kv;
}).collect(Collectors.toList());
}).collect(Collectors.toList());*/
//filters
@@ -337,7 +337,7 @@ public final class MetaKit {
return Kv.of()
.set("pk", _pks.toString())
.set("title", comment)
.set("items", _items2)
//.set("items", _items2)
.set("shows", shows)
.set("filters", _filters)
.set("edits", edits)
@@ -460,11 +460,11 @@ public final class MetaKit {
return tables;
}
public static DbKit getDbKit(String dbPlatId) {
/*public static DbKit getDbKit(String dbPlatId) {
Optional<DbAccount> dbAccount = dbPlats.stream().filter(x -> x.getKey().equals(dbPlatId)).findAny();
return new DbKit(dbAccount.get());
}
}*/
public static DbKit getDbKit(String dbPlatId, String catalog) {
Optional<DbAccount> dbAccount = dbPlats.stream().filter(x -> x.getKey().equals(dbPlatId)).findAny();
return new DbKit(dbAccount.get(), catalog);