.

src/main/java/net/tccn/service/MetadataService.java

@@ -2,18 +2,18 @@ package net.tccn.service;
 
 import net.tccn.base.JBean;
 import net.tccn.base.Kv;
+import net.tccn.base.MetaKit;
 import net.tccn.dbq.Field;
 import net.tccn.dbq.jdbc.api.DbAccount;
-import net.tccn.plat.SysPlat;
-import net.tccn.base.MetaKit;
+import net.tccn.meta.MetaLink;
 import net.tccn.meta.MetaService;
 import net.tccn.meta.MetaTable;
+import net.tccn.plat.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.util.Comparator;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
@@ -77,31 +77,21 @@ public class MetadataService extends BaseService { //arango
     //-----------  元数据管理 ---------------
     @RestMapping(name = "tablelist", comment = "table列表")
     public JBean tableList(@RestParam(name = "platToken") String token, String catalog, String dbPlatId, String name) {
-        JBean jBean = JBean.by(0, "");
-        SysPlat sysPlat = qtaskService.getSysPlat(token);
-        if (sysPlat == null) {
-            return jBean.set(-1, "平台信息未知");
-        }
+        JBean jBean = new JBean();
 
-        List<Kv> list = MetaKit.getMetaTables()
-                .stream()
-                .filter(x -> {
-                    return (isEmpty.test(catalog) || catalog.equals(x.getCatalog())) &&
-                            (isEmpty.test(dbPlatId) || dbPlatId.equals(x.getDbPlatId())) &&
-                            (isEmpty.test(name) || x.getName().contains(name));
-                })
-                .sorted(Comparator.comparing(MetaTable::getName))
-                .map(x -> {
-                    //组装返回的数据
-                    Kv kv = Kv.of("name", x.getName())
-                            .set("comment", x.getComment())
-                            .set("catalog", x.getCatalog());
-                    MetaKit.getDbPlats().stream().filter(d -> d.getKey().equals(x.getDbPlatId())).findAny().ifPresent(d -> kv.set("dbPlatName", d.getName()));
-                    return kv;
-                })
-                .collect(Collectors.toList());
-
-        return jBean.setBody(list);
+        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("dbPlatId", x.getDbPlatId())
+                ).collect(Collectors.toList());
+        jBean.setBody(list);
+        return jBean;
     }
 
 
@@ -210,6 +200,29 @@ public class MetadataService extends BaseService { //arango
         return JBean.by(0, "");
     }
 
+    @RestMapping(name = "link_list", comment = "实体关系列表")
+    public JBean linkList() {
+        JBean jBean = new JBean();
+
+        List<MetaLink> links = MetaKit.getMetaLinks();
+
+        jBean.setBody(links);
+        return jBean;
+    }
+
+    @RestMapping(name = "link_list", comment = "实体关系列表")
+    public JBean linkSave(MetaLink link, @RestParam(name = "platToken") String token) {
+        if (link.getKey() != null) {
+            link.update();
+        } else {
+            link.save();
+        }
+        MetaKit.reload(MetaLink.class);
+
+        return JBean.OK;
+    }
+
+
     @RestMapping(name = "plat_list", comment = "平台列表")
     public JBean platList() {
         JBean jBean = new JBean();