diff --git a/root/api/meta.js b/root/api/meta.js index 3bbce38..f6c289d 100644 --- a/root/api/meta.js +++ b/root/api/meta.js @@ -48,16 +48,18 @@ const meta = { callback(json) }) }, - tableLinkList() { + tableLinkList() { // metaLink 管理的表列表使用 return red.postX('/meta/table_link_list') }, - linkSave({link}) { + linkSave({link}) { // return red.postX('/meta/link_save', {link: JSON.stringify(link)}) }, - linkInfo({alias}) { - return red.postX('/meta/link_info', {alias}) + linkList({alias}) { + return red.postX('/meta/link_list', {alias}) + }, + linkInfoList({alias}) { + return red.postX('/meta/link_info_list', {alias}) }, - tableInfo({name, alias}) { return red.postX('/meta/tableinfo', {name, alias}) } diff --git a/root/metadata/metaLink.html b/root/metadata/metaLink.html index 642bb53..d43489d 100644 --- a/root/metadata/metaLink.html +++ b/root/metadata/metaLink.html @@ -1,7 +1,4 @@ + +
+ +
+ + + +
+
+
DB-Table
+ + +
+ +
+ + + + + + + + + + + + + + + + + +
关联的表关联字段操作
+ +
+ + + + + + \ No newline at end of file diff --git a/src/main/java/net/tccn/service/MetadataService.java b/src/main/java/net/tccn/service/MetadataService.java index 3029477..449c68b 100644 --- a/src/main/java/net/tccn/service/MetadataService.java +++ b/src/main/java/net/tccn/service/MetadataService.java @@ -211,7 +211,7 @@ public class MetadataService extends BaseService { //arango return JBean.by(0, ""); } - @RestMapping(name = "table_link_list", comment = "实体表，包含link信息的列表") + @RestMapping(name = "table_link_list", comment = "实体表，包含link信息的列表,(metalink 管理页面使用)") public JBean tableLinkList(@RestParam(name = "platToken") String token) { JBean jBean = new JBean(); @@ -238,7 +238,7 @@ public class MetadataService extends BaseService { //arango } - @RestMapping(name = "link_info", comment = "关联信息") + @RestMapping(name = "link_info_list", comment = "关联信息") public JBean linkInfo(String alias) { JBean jBean = new JBean(); //MetaTable metaTable = MetaKit.getMetaTableByAlias(alias); @@ -258,13 +258,18 @@ public class MetadataService extends BaseService { //arango } @RestMapping(name = "link_list", comment = "实体关系列表") - public JBean linkList() { + public JBean linkList(String alias) { JBean jBean = new JBean(); List links = MetaKit.getMetaLinks(); - jBean.setBody(links); - return jBean; + if (!isEmpty.test(alias)) { + links = links.stream() + .filter(x -> x.getTables()[0].equals(alias) || x.getTables()[1].equals(alias)) + .collect(Collectors.toList()); + } + + return jBean.setBody(links); } @RestMapping(name = "link_save", comment = "实体关系列表")