diff --git a/pom.xml b/pom.xml index 5e568b7..94b0b16 100644 --- a/pom.xml +++ b/pom.xml @@ -73,8 +73,76 @@ + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + prepare-package + + copy-dependencies + + + ${project.build.directory}/meta-kit/lib + false + false + true + + + + + + maven-resources-plugin + 2.5 + + + copy-resources + process-sources + + copy-resources + + + ${basedir}/target/meta-kit/ + + + + ${basedir}/ + + bin/** + conf/** + root/** + + + + + + + copy-resources1 + process-sources + + copy-resources + + + ${basedir}/target/meta-kit/lib + + + + ${project.basedir}/src/main/resources/ + + tpl/** + META-INF/** + + + + + + + + - + diff --git a/root/api/plat.js b/root/api/plat.js index 9dffe0b..057293f 100644 --- a/root/api/plat.js +++ b/root/api/plat.js @@ -6,13 +6,14 @@ const plat = { return red.getX('/plat/list', params) }, platSave({plat}) { - return red.postX('/plat/save', {plat}) + return red.postX('/plat/save', {plat:JSON.stringify(plat)}) }, dbList(params) { // 数据源列表 return red.getX('/plat/db_list', params) }, dbSave({plat}) { + // todo：解决重复点击保存出现的异常 plat["url"] = escape(plat["url"]) return red.postX('/plat/db_save', {plat: JSON.stringify(plat)}) }, diff --git a/root/index.html b/root/index.html index d4f607a..4d00795 100644 --- a/root/index.html +++ b/root/index.html @@ -118,6 +118,7 @@ {name: "关于", url: "/single", nodes: [ {url:"/single/about.html", name:"关于MetaKit", icon:"icon-server"}, {url:"/single/code.html", name:"整体实现", icon:"icon-server"}, + {url:"/single/core.html", name:"组件关系", icon:"icon-server"}, {url:"/single/metaFlow.html", name:"MetaKit使用", icon:"icon-server"}, ] }, diff --git a/root/metadata/metaService.html b/root/metadata/metaService.html index b112c69..eeaccad 100644 --- a/root/metadata/metaService.html +++ b/root/metadata/metaService.html @@ -10,7 +10,7 @@
-

功能概览

+

功能介绍

@@ -26,7 +26,8 @@ 对于关联表，只需要在MetaLink中建立关联即可，此处选择了业务主表后会自动查询所有已经关联关联的业务表，
然后便可以轻松配置 列表要展示，导出哪些字段，查询过滤条件用哪些表的哪些字段，等等。。

- + MetaService概念模型 +
@@ -104,7 +105,7 @@ 备注--> - + diff --git a/root/metadata/metatable/import.html b/root/metadata/metatable/import.html index aac4c09..5955383 100644 --- a/root/metadata/metatable/import.html +++ b/root/metadata/metatable/import.html @@ -211,7 +211,8 @@ -

已选择 个实体待导入

+ +

已选择 个实体待导入，上面红色 部分已经导入过的数据表

Table-Detail
diff --git a/root/metadata/metatable/metaTable.html b/root/metadata/metatable/metaTable.html index 905adf6..e53f9f5 100644 --- a/root/metadata/metatable/metaTable.html +++ b/root/metadata/metatable/metaTable.html @@ -1,4 +1,25 @@ +
+ +
+ + +
@@ -385,6 +406,9 @@ }, loadImportPage() { $("#main").load('/metadata/metatable/import.html') + }, + showInfo() { + $('#f-info').modal({moveable: true}) } }, diff --git a/root/plat/db.html b/root/plat/db.html index a6276f4..875742b 100644 --- a/root/plat/db.html +++ b/root/plat/db.html @@ -14,7 +14,12 @@

- 数据平台：可以获取数据的平台（除java-method类型的qtask 实列都会对应绑定相应的数据平台） + DbPlat概念模型图 +

+ +


+

+ 数据平台：可以获取数据的平台{{/*（除java-method类型的qtask 实列都会对应绑定相应的数据平台）*/}}

@@ -52,10 +57,10 @@ v-html="field.fmt ? field.fmt(item[field.col]) : item[field.col]"> - 编辑 | + 编辑 diff --git a/root/plat/index.html b/root/plat/index.html index 292c8be..9ba0756 100644 --- a/root/plat/index.html +++ b/root/plat/index.html @@ -24,10 +24,10 @@ - 编辑 | + 编辑 diff --git a/root/res/img/DbPlat概念图.png b/root/res/img/DbPlat概念图.png new file mode 100644 index 0000000..1156bbe Binary files /dev/null and b/root/res/img/DbPlat概念图.png differ diff --git a/root/res/img/MetaService.png b/root/res/img/MetaService.png new file mode 100644 index 0000000..0938727 Binary files /dev/null and b/root/res/img/MetaService.png differ diff --git a/root/res/img/MetaTable.png b/root/res/img/MetaTable.png new file mode 100644 index 0000000..63377df Binary files /dev/null and b/root/res/img/MetaTable.png differ diff --git a/root/res/img/Table-Link-Service.png b/root/res/img/Table-Link-Service.png new file mode 100644 index 0000000..bff9c1f Binary files /dev/null and b/root/res/img/Table-Link-Service.png differ diff --git a/root/res/img/code.png b/root/res/img/code.png index f8b6d38..c3fd690 100644 Binary files a/root/res/img/code.png and b/root/res/img/code.png differ diff --git a/root/res/img/code_history.png b/root/res/img/code_history.png index f69cffe..164f845 100644 Binary files a/root/res/img/code_history.png and b/root/res/img/code_history.png differ diff --git a/root/res/img/meta_flow.png b/root/res/img/meta_flow.png index cf6930d..0b4eb04 100644 Binary files a/root/res/img/meta_flow.png and b/root/res/img/meta_flow.png differ diff --git a/root/res/img/meta_link.png b/root/res/img/meta_link.png index 83112d0..04f018e 100644 Binary files a/root/res/img/meta_link.png and b/root/res/img/meta_link.png differ diff --git a/root/single/core.html b/root/single/core.html new file mode 100644 index 0000000..4d6b655 --- /dev/null +++ b/root/single/core.html @@ -0,0 +1,14 @@ +
+

+ 核心组件关系 +

+ +
+ \ No newline at end of file diff --git a/src/test/java/RunTest.java b/src/test/java/RunTest.java index 254092f..5dd57ab 100644 --- a/src/test/java/RunTest.java +++ b/src/test/java/RunTest.java @@ -1,7 +1,4 @@ -import net.tccn.base.FileKit; -import net.tccn.base.Kv; -import net.tccn.base.MetaKit; -import net.tccn.base.TplKit; +import net.tccn.base.*; import net.tccn.dbq.fbean.FBean; import net.tccn.dbq.jdbc.api.DbAccount; import net.tccn.dbq.jdbc.api.DbKit; @@ -11,6 +8,7 @@ import net.tccn.meta.MetaTable; import net.tccn.qtask.TaskEntity; import net.tccn.qtask.TaskKit; import net.tccn.user.User; +import org.apache.poi.ss.usermodel.Workbook; import org.junit.Test; import org.redkale.convert.json.JsonConvert; import org.redkale.source.CacheMemorySource; @@ -18,6 +16,7 @@ import org.redkale.util.TypeToken; import java.io.File; import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.lang.reflect.Type; import java.util.Date; @@ -314,4 +313,61 @@ public class RunTest { } + public List dbKitTest() { + DbAccount dbAccount = new DbAccount(); + dbAccount.setCate("mysql"); + dbAccount.setUrl("jdbc:mysql://192.168.202.11:3306/gxbii_dev"); + dbAccount.setUser("root"); + dbAccount.setPwd("eversec123098"); + + DbKit dbKit = new DbKit(dbAccount); + + String sql = "select platID,platDomain,platIP from basic_domain limit 10"; + String countSql = "select count(*) from basic_domain"; + + // find list + List list = dbKit.findList(sql, Map.class); + int total = dbKit.queryColumn(countSql, int.class); + + System.out.println("总记录数：" + total); + System.out.println(list); + + return list; + } + + // 通用导出组件测试 + @Test + public void exportTest() { + List list = dbKitTest(); + + Kv kv = Kv.of("platID", "平台id") + .set("platDomain", "平台域名").set("platIP", "平台IP"); + + try { + Workbook workbook = ExcelKit.exportExcel(list, kv); + + workbook.write(new FileOutputStream(new File("tmp/basic_domain.xls"))); + + } catch (Exception e) { + e.printStackTrace(); + } + + } + + @Test + public void switchTest() { + String a = "2"; + switch (a){ + case "1": + System.out.println(1); + case "2": + System.out.println(2); + case "3": + System.out.println(3); + case "4": + System.out.println(4); + } + System.out.println("end"); + } + }