优化：1、mtable、mlink、mservice、qtask 展示的排序最新展示到前面

2、其他修改

src/main/java/net/tccn/base/Kv.java

@@ -25,7 +25,7 @@ public class Kv<K, V> extends LinkedHashMap<K, V> {
         return new Kv();
     }
 
-    public static Kv of(Object k, Object v) {
+    public static Kv<String, Object> of(Object k, Object v) {
         return new Kv().set(k, v);
     }
 
@@ -68,7 +68,7 @@ public class Kv<K, V> extends LinkedHashMap<K, V> {
     }
 
     //  将obj 属性映射到Kv 中
-    public static Kv toKv(Object m, String... fields) {
+    public static Kv<String, Object> toKv(Object m, String... fields) {
         Kv kv = Kv.of();
         if (m == null) {
             return kv;

src/main/java/net/tccn/base/dbq/parser/ParseMysql.java

@@ -24,10 +24,10 @@ public class ParseMysql implements Parser {
 
     Predicate<Kv<String, MTable>> sameDbFun = (kv) -> {
         int dbid = 0;
-        for (MTable metaTable : kv.values()) {
+        for (MTable mTable : kv.values()) {
             if (dbid == 0) {
-                dbid = metaTable.getDbid();
-            } else if (dbid != metaTable.getDbid()) {
+                dbid = mTable.getDbid();
+            } else if (dbid != mTable.getDbid()) {
                 return false;
             }
         }

src/main/java/net/tccn/meta/MTable.java

@@ -19,7 +19,7 @@ import java.util.stream.Collectors;
 @Setter
 @Entity
 @Table(name = "mtable", comment = "TABLE记录表")
-@Cacheable(value = true, interval = 60 * 60 * 1000, direct = true)
+//@Cacheable(value = true, interval = 60 * 60 * 1000, direct = true)
 public class MTable extends BaseEntity {
     @Id
     @Column(comment = "[表ID]")

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

@@ -7,6 +7,7 @@ import org.redkale.net.http.RestMapping;
 import org.redkale.net.http.RestParam;
 import org.redkale.net.http.RestService;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -28,16 +29,18 @@ public class MetadataService extends BaseService { //arango
                 (isEmpty(name) || x.getTablename().contains(name)) &&
                 (isEmpty(token) || x.getPlatid().equals(platId(token))) &&
                 (isEmpty(x.getStatus()) || x.getStatus() != 9)
-        ).map(x -> Kv.of("tablename", x.getTablename())
-                .set("comment", x.getComment())
-                .set("catalog", x.getCatalog())
-                .set("alias", x.getAlias())
-                .set("dbid", x.getDbid())
-                .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());
+                ).map(x -> Kv.of("tablename", x.getTablename())
+                        .set("comment", x.getComment())
+                        .set("catalog", x.getCatalog())
+                        .set("alias", x.getAlias())
+                        .set("dbid", x.getDbid())
+                        .set("tableid", x.getTableid())
+                        .set("linkCount", MetaKit.getMetaLinks().stream().filter(link -> { // 关联表数量
+                            String[] tables = link.getTables();
+                            return x.getAlias().equals(tables[0]) || x.getAlias().equals(tables[1]);
+                        }).count())
+                ).sorted(Comparator.comparing(x -> -x.getInt("tableid")))
+                .collect(Collectors.toList());
         return jBean.setBody(list);
     }
 
@@ -48,6 +51,7 @@ public class MetadataService extends BaseService { //arango
 
         List<MService> list = MetaKit.getMetaServices().stream()
                 .filter(x -> platId(token).equals(x.getPlatid()))
+                .sorted(Comparator.comparing(MService::getServid).reversed())
                 .collect(Collectors.toList());
         jBean.setBody(list);
 
@@ -234,6 +238,7 @@ public class MetadataService extends BaseService { //arango
                     Kv kv = Kv.of("tablename", x.getTablename())
                             .set("comment", x.getComment())
                             .set("alias", x.getAlias())
+                            .set("tableid", x.getTableid())
                             .set("linkCount", 0);
 
                     //关联表数量
@@ -244,7 +249,8 @@ public class MetadataService extends BaseService { //arango
                     kv.set("linkCount", count);
 
                     return kv;
-                }).collect(Collectors.toList());
+                }).sorted(Comparator.comparingInt(x -> -x.getInt("tableid")))
+                .collect(Collectors.toList());
 
         return jBean.setBody(list);
     }
@@ -263,6 +269,7 @@ public class MetadataService extends BaseService { //arango
                     .set("comment", linkTable.getComment())
                     .set("linkSize", x.getLinks().size())
                     .set("links", x.getLinks());
+
             return kv;
         }).collect(Collectors.toList());