From e6e655c4b385d227200c95e7646307dc5ae45c2e Mon Sep 17 00:00:00 2001 From: lxyer <237809796@qq.com> Date: Wed, 17 Apr 2019 16:57:22 +0800 Subject: [PATCH] . --- root/index.html | 12 +- root/metadata/metatable/metaTable.html | 222 +++--------------- root/res/css/red-kit.css | 4 - src/main/java/net/tccn/base/Liangs.java | 6 +- .../java/net/tccn/dbq/parser/ParseMysql.java | 18 +- .../net/tccn/service/MetadataService.java | 4 + 6 files changed, 58 insertions(+), 208 deletions(-) diff --git a/root/index.html b/root/index.html index 8144a96..604c549 100644 --- a/root/index.html +++ b/root/index.html @@ -88,13 +88,13 @@ sysPlats: red.getData('sysPlats'), pages: [ /*{name: "DDL", url: "/qtask/ddl.html"},*/ - {name: "MetaData", url: "/meta", nodes: [ + {name: "元服务", url: "/meta", nodes: [ /*{url:"/metadata/metatable/list.html", name:"TableList"},*/ - {url:"/metadata/metatable/metaTable.html", name:"MetaTable", icon: "icon-table"}, - {url:"/metadata/metatable/import.html", name:"导入实体"}, - {url:"/metadata/metaLink.html", name:"MetaLink"}, - {url:"/metadata/metaService.html", name:"MetaService", icon:"icon-usecase"}, - {url:"/metadata/dataList.html", name:"数据查询", icon:"icon-bug"}, + {url:"/metadata/metatable/metaTable.html", name:"实体管理", icon: "icon-table"}, + /*{url:"/metadata/metatable/import.html", name:"导入实体"},*/ + {url:"/metadata/metaLink.html", name:"实体关系"}, + {url:"/metadata/metaService.html", name:"业务管理", icon:"icon-usecase"}, + {url:"/metadata/dataList.html", name:"业务预览", icon:"icon-bug"}, ] }, { diff --git a/root/metadata/metatable/metaTable.html b/root/metadata/metatable/metaTable.html index 09652ec..9495700 100644 --- a/root/metadata/metatable/metaTable.html +++ b/root/metadata/metatable/metaTable.html @@ -1,42 +1,36 @@
+
+ + + +
- - - - - - - + + - + - - @@ -48,7 +42,17 @@
-
+ +
+
    +
  • + +
    • +
+
+ + +
@@ -61,10 +65,6 @@ - - - - @@ -75,7 +75,7 @@ @@ -93,156 +93,10 @@
备注
- +
-
- - - - - - - - - - - - - - - - - -
字段名中文名展示名
-
-
-
-
列表展示的属性
-
- - - - - - - - - - - - - - - - - -
字段名中文名
- - {{getFieldLabel(item)}}
-
-
-
+
- -
-
-
导出的属性配置
-
- - - - - - - - - - - - - - - - - -
字段名中文名
- - {{getFieldLabel(item)}}
-
-
-
- - -
-
-
- 导入的属性配置 -
-
- - - - - - - - - - - - - - - - - -
字段名中文名
- - {{getFieldLabel(item)}}
-
-
-
- - -
-
-
查询配置
-
- - - - - - - - - - - - - - - - - - - -
字段名中文名默认展示支持查询类型
- - {{getFieldLabel(item.name)}} - - - -
-
-
-
- - -
-
+ +
基本属性配置
@@ -299,10 +153,6 @@ tables: [],//所有的业务类型，【测试用】 meta: { items: [], - shows: [], - exports: [], - imports: [], - filters: [{name:"", filterType:[""]}] },//完整的元数据数据， move: false, status: 7, //页面默认状态 @@ -318,9 +168,6 @@ dbPlats:[], row: {key: "", platId: "", dbPlatId:"", catalog: "", name:"", comment:"", alias: ""}, filter: {db: "", catalog: "", name: ""},//tableList 过滤条件 - - filters:[],//查询配置 - filterArr:[] }, watch: { metaTable(v) { @@ -554,6 +401,9 @@ red.showMsg(); } }, + dealTableLabel(table) { + return `${table.name} [${table.comment}] (${table.linkCount})` + }, getFieldLabel: function (col) { if (!col) { return ""; diff --git a/root/res/css/red-kit.css b/root/res/css/red-kit.css index 517b70a..dd01641 100644 --- a/root/res/css/red-kit.css +++ b/root/res/css/red-kit.css @@ -109,10 +109,6 @@ body { padding-bottom: 10px; } -.meta-list .col-md-5 .panel-body { - padding: 0px; -} - table td,th{ white-space:nowrap; overflow:hidden; diff --git a/src/main/java/net/tccn/base/Liangs.java b/src/main/java/net/tccn/base/Liangs.java index cccd002..df0979f 100644 --- a/src/main/java/net/tccn/base/Liangs.java +++ b/src/main/java/net/tccn/base/Liangs.java @@ -12,10 +12,8 @@ public class Liangs { public static Set streamConcat(Stream ... streams) { Stream stream = Stream.empty(); - for (int i = 0; i < streams.length-1; i++) { - stream = Stream.concat( - stream, streams[i] - ); + for (int i = 0; i < streams.length; i++) { + stream = Stream.concat(stream, streams[i]); } return stream.collect(Collectors.toSet()); } diff --git a/src/main/java/net/tccn/dbq/parser/ParseMysql.java b/src/main/java/net/tccn/dbq/parser/ParseMysql.java index 9387801..595e7bf 100644 --- a/src/main/java/net/tccn/dbq/parser/ParseMysql.java +++ b/src/main/java/net/tccn/dbq/parser/ParseMysql.java @@ -148,14 +148,16 @@ public class ParseMysql implements Parser { if (!isEmpty.test(links)) { links.forEach(x -> { MetaTable rightTable = tables.get(metaTable.getAlias().equals(x.getTables()[0]) ? x.getTables()[1] : x.getTables()[0]); - bufFrom.append(" left join ").append(rightTable.getCatalog()).append(".").append(rightTable.getName()).append(" ").append(rightTable.getAlias()).append(" on "); - int tag = bufFrom.length(); - x.getLink().forEach((k,v) -> { - if (bufFrom.length() > tag) { - bufFrom.append(" and "); - } - bufFrom.append(k).append("=").append(v); - }); + if (rightTable != null) { + bufFrom.append(" left join ").append(rightTable.getCatalog()).append(".").append(rightTable.getName()).append(" ").append(rightTable.getAlias()).append(" on "); + int tag = bufFrom.length(); + x.getLink().forEach((k, v) -> { + if (bufFrom.length() > tag) { + bufFrom.append(" and "); + } + bufFrom.append(k).append("=").append(v); + }); + } }); } diff --git a/src/main/java/net/tccn/service/MetadataService.java b/src/main/java/net/tccn/service/MetadataService.java index 449c68b..f46a5c8 100644 --- a/src/main/java/net/tccn/service/MetadataService.java +++ b/src/main/java/net/tccn/service/MetadataService.java @@ -90,6 +90,10 @@ public class MetadataService extends BaseService { //arango .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;