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

1、引入lombok支持，重构JavaBean 将 常规getter/setter去除

Browse Source 
2、去除Gson 依赖
This commit is contained in:
lxyer
2019-04-25 17:18:35 +08:00
parent 936d4dc992
commit 9a38d69eb0
30 changed files with 176 additions and 1048 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/net/tccn/service/MetadataService.java
View File

@@ -4,6 +4,7 @@ import net.tccn.base.JBean;
import net.tccn.base.Kv;
import net.tccn.base.MetaKit;
import net.tccn.dbq.Field;
import net.tccn.meta.Filter;
import net.tccn.meta.MetaLink;
import net.tccn.meta.MetaService;
import net.tccn.meta.MetaTable;
@@ -27,24 +28,22 @@ public class MetadataService extends BaseService { //arango
public JBean tableList(@RestParam(name = "platToken") String token, String catalog, String dbPlatId, String name) {
JBean jBean = new JBean();
List<Kv> list =
MetaKit.getMetaTables().stream().filter(x ->
(isEmpty.test(catalog) || catalog.equals(x.getCatalog())) &&
List<Kv> list = MetaKit.getMetaTables().stream().filter(x ->
(isEmpty.test(catalog) || catalog.equals(x.getCatalog())) &&
(isEmpty.test(dbPlatId) || dbPlatId.equals(x.getDbPlatId())) &&
(isEmpty.test(name) || x.getName().contains(name)) &&
(isEmpty.test(token) || x.getSysPlatId().equals(platId(token)))
).map(x -> Kv.of("name", x.getName())
.set("comment", x.getComment())
.set("catalog", x.getCatalog())
.set("alias", x.getAlias())
.set("dbPlatId", x.getDbPlatId())
.set("linkCount", MetaKit.getMetaLinks().stream().filter(link -> { // 关联表数量
String[] tables = link.getTables();
return x.getAlias().equals(tables[0]) || x.getAlias().equals(tables[1]);
}).count())
).collect(Collectors.toList());
jBean.setBody(list);
return jBean;
).map(x -> Kv.of("name", x.getName())
.set("comment", x.getComment())
.set("catalog", x.getCatalog())
.set("alias", x.getAlias())
.set("dbPlatId", x.getDbPlatId())
.set("linkCount", MetaKit.getMetaLinks().stream().filter(link -> { // 关联表数量
String[] tables = link.getTables();
return x.getAlias().equals(tables[0]) || x.getAlias().equals(tables[1]);
}).count())
).collect(Collectors.toList());
return jBean.setBody(list);
}
@@ -76,11 +75,8 @@ public class MetadataService extends BaseService { //arango
}
@RestMapping(name = "service_save", comment = "service信息保存")
public JBean serviceSave(@RestParam(name = "platToken") String token, @RestParam(name = "service") String serviceBean) {
public JBean serviceSave(@RestParam(name = "platToken") String token, @RestParam(name = "service") MetaService service) {
JBean jBean = new JBean();
MetaService service = gson.fromJson(serviceBean, MetaService.class);
do {
// 标识码非空校验
if (isEmpty.test(service.getTable())) {
@@ -196,12 +192,9 @@ public class MetadataService extends BaseService { //arango
}
@RestMapping(name = "filter_update", comment = "查询配置修改")
public JBean filterUpdate(@RestParam(name = "name") String name,
@RestParam(name = "filters") String filters,
@RestParam(name = "platToken") String token) {
List _filters = gson.fromJson(filters, List.class);
public JBean filterUpdate(String name, List<Filter> filters, @RestParam(name = "platToken") String token) {
MetaService metaService = MetaKit.getMetaService(name, token);
metaService.setFilters(_filters);
metaService.setFilters(filters);
metaService.update();
return JBean.by(0, "");