1、重构代码将数据处理全部交给 repository 来操作

2、升级支持免 Db启动提供服务
This commit is contained in:
2019-04-26 20:04:52 +08:00
parent 9a38d69eb0
commit ff240dd3ea
17 changed files with 350 additions and 212 deletions

View File

@@ -97,14 +97,10 @@ public class MetadataService extends BaseService { //arango
break;
}
if (service.getKey() != null) {
service.update();
} else {
if (service.getKey() == null) {
service.setSysPlatId(platId(token));
service.save();
}
MetaKit.reload(MetaService.class);
MetaKit.save(service);
} while (false);
return jBean;
}
@@ -125,13 +121,14 @@ public class MetadataService extends BaseService { //arango
//修改item的排序
@RestMapping(name = "itemsort", comment = "字段排序")
public String[] itemSortSave(String alias , String[] items, @RestParam(name = "platToken") String token) {
public JBean itemSortSave(String alias , String[] items, @RestParam(name = "platToken") String token) {
MetaTable metaTable = MetaKit.getMetaTableByAlias(alias);
MetaKit.sortItem.apply(metaTable, items);
metaTable.update();
return items;
MetaKit.save(metaTable);
return JBean.OK;
}
@RestMapping(name = "itemupdate", comment = "字段修改")
@@ -139,8 +136,7 @@ public class MetadataService extends BaseService { //arango
MetaTable metaTable = MetaKit.getMetaTableByAlias(alias);
MetaKit.itemUpdate.apply(metaTable, items);
metaTable.update();
MetaKit.reload(metaTable);
MetaKit.save(metaTable);
return JBean.OK;
}
@@ -149,10 +145,8 @@ public class MetadataService extends BaseService { //arango
if (shows == null || shows.size() == 0) return null;
MetaService metaService = MetaKit.getMetaService(name, token);
metaService.setShows(shows);
metaService.update();
MetaKit.reload(metaService);
MetaKit.save(metaService);
return JBean.OK;
}
@@ -162,20 +156,20 @@ public class MetadataService extends BaseService { //arango
MetaService metaService = MetaKit.getMetaService(name, token);
metaService.setExports(exports);
metaService.update();
MetaKit.reload(metaService);
MetaKit.save(metaService);
return JBean.OK;
}
@RestMapping(name = "importsort", comment = "导入字段保存")
public List<String> importSort(String serviceKey , List<String> items, @RestParam(name = "platToken") String token) {
public JBean importSort(String serviceKey , List<String> items, @RestParam(name = "platToken") String token) {
if (isEmpty.test(items)) return null;
MetaTable metaTable = MetaKit.getMetaTable(serviceKey, token);
//fixme: metaTable.setImports(items);
metaTable.update();
return items;
MetaKit.save(metaTable);
return JBean.OK;
}
@RestMapping(name = "dbplatupdate", comment = "数据平台修改")
@@ -187,8 +181,8 @@ public class MetadataService extends BaseService { //arango
_metaTable.setDbPlatId(metaTable.getDbPlatId());
_metaTable.setCatalog(metaTable.getCatalog());
_metaTable.update();
return JBean.by(0, "");
MetaKit.save(_metaTable);
return JBean.OK;
}
@RestMapping(name = "filter_update", comment = "查询配置修改")
@@ -196,18 +190,17 @@ public class MetadataService extends BaseService { //arango
MetaService metaService = MetaKit.getMetaService(name, token);
metaService.setFilters(filters);
metaService.update();
return JBean.by(0, "");
MetaKit.save(metaService);
return JBean.OK;
}
@RestMapping(name = "table_link_list", comment = "实体表包含link信息的列表,(metalink 管理页面使用)")
public JBean tableLinkList(@RestParam(name = "platToken") String token) {
JBean jBean = new JBean();
List<Kv> list =
MetaKit.getMetaTables().stream().filter(x ->
(isEmpty.test(token) || x.getSysPlatId().equals(platId(token)))
).map(x -> {
List<Kv> list = MetaKit.getMetaTables().stream()
.filter(x -> (isEmpty.test(token) || x.getSysPlatId().equals(platId(token))))
.map(x -> {
Kv kv = Kv.of("name", x.getName())
.set("comment", x.getComment())
.set("alias", x.getAlias())
@@ -265,12 +258,10 @@ public class MetadataService extends BaseService { //arango
public JBean linkSave(MetaLink link, @RestParam(name = "platToken") String token) {
if (link.getKey() != null) {
link.find(String.format("UPDATE '%s' WITH { link:null } IN MetaLink", link.getKey()), Map.class); //避免删除属性无效
link.update();
} else {
link.save();
// fixme: 将逻辑迁移到 MetaKit中:
}
MetaKit.reload(MetaLink.class);
MetaKit.save(link);
return JBean.OK;
}
@@ -278,19 +269,17 @@ public class MetadataService extends BaseService { //arango
@RestMapping(name = "plat_list", comment = "平台列表")
public JBean platList() {
JBean jBean = new JBean();
List<SysPlat> plats = SysPlat.dao.find();
List<SysPlat> plats = MetaKit.getSysPlats();
jBean.setBody(plats);
return jBean;
return jBean.setBody(plats);
}
// ------------------------------------ 对外服务 --------------------------------------
@RestMapping(name = "cfg", auth = false, comment = " 功能配置")
public JBean cfg(String name, @RestParam(name = "platToken") String token) {
JBean jBean = JBean.by(0, "");
JBean jBean = new JBean();
Map cfg = MetaKit.cfg(name, token);
jBean.set(0, "", MetaKit.cfg(name, token));
return jBean;
return jBean.setBody(cfg);
}
}