From f3e5ef4ad795249326aa9020373daec2bcddf827 Mon Sep 17 00:00:00 2001 From: lxyer <237809796@qq.com> Date: Tue, 11 Jun 2019 18:48:51 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AE=9E=E4=BD=93=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E5=AD=98=E5=9C=A8=E8=A1=A8=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=AF=BC=E5=85=A5=EF=BC=8C=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B0=86=E6=9B=B4=E6=96=B0=E5=8E=9F=E6=9D=A5?= =?UTF-8?q?=E7=9A=84=E8=A1=A8=E7=BB=93=E6=9E=84=202=E3=80=81=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- root/metadata/metaService.html | 60 ++++++++++++++++++- root/metadata/metatable/import.html | 6 +- src/main/java/net/tccn/base/MetaKit.java | 11 ++-- src/main/java/net/tccn/meta/FromItem.java | 18 ++++++ src/main/java/net/tccn/meta/MetaService.java | 2 +- .../net/tccn/service/MetadataService.java | 7 +-- .../java/net/tccn/service/_TableService.java | 20 +++++++ 7 files changed, 108 insertions(+), 16 deletions(-) create mode 100644 src/main/java/net/tccn/meta/FromItem.java diff --git a/root/metadata/metaService.html b/root/metadata/metaService.html index 10c49df..8087ba0 100644 --- a/root/metadata/metaService.html +++ b/root/metadata/metaService.html @@ -1,3 +1,26 @@ +
@@ -287,6 +310,7 @@ 展示名称 表单组件 数据格式化 + 表单校验 @@ -295,7 +319,7 @@ - + + +
+ +
+ + + + + + + + + + + + + +
规则选择
+
+
+ @@ -324,7 +369,7 @@ 策略一（执行完整SQL）

@@ -410,6 +455,7 @@ sheet: "a",//别名 inTypes: ["INPUT", "DICT", "INPUT_DAY", "INPUT_TIME", "FUNC", "QTASK", "HIDDEN"], + ckTypes: [{label:"必填", name: "NOTNULL"},{label:"IP", name: "IP"},{label:"IPv4", name: "IPv4"},{label:"电话号码", name: "phone"}], dataTypes: ["bigint(20)", "varchar(255)", "varchar(64)", "varchar(32)", "varchar(16)", "int(11)", "int(3)", "int(2)", "datetime"], filterCate: ["EQUAL", "NOTEQUAL", "LIKE", "IN"], serviceInfo: { @@ -710,7 +756,7 @@ // 新的 let label = this.getFieldLabel(v[i]) let fmt = this.getFiledInExt(v[i]) || "" - edits.push({col: v[i], label: label, fmt: fmt}) + edits.push({col: v[i], label: label, fmt: fmt, cks:[]}) } //去除删除的 @@ -731,6 +777,14 @@ loadInfo(name) { getServiceInfo({name}, (json) => { json.dels = json.dels || {cate:"", sql1:"", sql:"", qtask:""} + json.edits = json.edits || [] + + for (let i in json.edits) { + if (!json.edits[i].cks) { + json.edits[i].cks = [] + } + } + this.serviceInfo = json; }) }, diff --git a/root/metadata/metatable/import.html b/root/metadata/metatable/import.html index 5955383..32aeae3 100644 --- a/root/metadata/metatable/import.html +++ b/root/metadata/metatable/import.html @@ -118,10 +118,11 @@
Excel-Sheet
  • +
    • @@ -203,10 +204,11 @@
    DB-Table
    • +
      • diff --git a/src/main/java/net/tccn/base/MetaKit.java b/src/main/java/net/tccn/base/MetaKit.java index bea581a..06f0f57 100644 --- a/src/main/java/net/tccn/base/MetaKit.java +++ b/src/main/java/net/tccn/base/MetaKit.java @@ -6,10 +6,7 @@ import net.tccn.dbq.Field; import net.tccn.dbq.fbean.FilterType; import net.tccn.dbq.jdbc.api.DbAccount; import net.tccn.dbq.jdbc.api.DbKit; -import net.tccn.meta.Filter; -import net.tccn.meta.MetaLink; -import net.tccn.meta.MetaService; -import net.tccn.meta.MetaTable; +import net.tccn.meta.*; import net.tccn.plat.DbPlat; import net.tccn.plat.SysPlat; import net.tccn.user.User; @@ -144,6 +141,10 @@ public final class MetaKit { } // ----------------------------------- + public void cleanData() { + + + } /** * 通过 别名 查询 MetaTable @@ -201,7 +202,7 @@ public final class MetaKit { Kv metaTables = getMetaTables(metaService, false); List> shows = metaService.getShows(); - List> edits = metaService.getEdits(); + List edits = metaService.getEdits(); List> details = metaService.getDetails(); List filters = metaService.getFilters(); String comment = metaService.getComment(); diff --git a/src/main/java/net/tccn/meta/FromItem.java b/src/main/java/net/tccn/meta/FromItem.java new file mode 100644 index 0000000..715f00e --- /dev/null +++ b/src/main/java/net/tccn/meta/FromItem.java @@ -0,0 +1,18 @@ +package net.tccn.meta; + +import lombok.Data; + +import java.util.List; + +/** + * @author: liangxianyou + */ +@Data +public class FromItem { + private String col; + private String label; + private String inType; + private String fmt; + private List cks; + +} diff --git a/src/main/java/net/tccn/meta/MetaService.java b/src/main/java/net/tccn/meta/MetaService.java index 2151382..a12b84b 100644 --- a/src/main/java/net/tccn/meta/MetaService.java +++ b/src/main/java/net/tccn/meta/MetaService.java @@ -23,7 +23,7 @@ public class MetaService extends Doc { private String sysPlatId; //平台id private List> shows = new ArrayList<>(); - private List> edits = new ArrayList<>(); + private List edits = new ArrayList<>(); private List> details = new ArrayList<>(); private Map dels = new HashMap<>(); private List filters = new ArrayList<>();//{name:"", label:"", checked:true, } diff --git a/src/main/java/net/tccn/service/MetadataService.java b/src/main/java/net/tccn/service/MetadataService.java index 458ff53..73a4b2b 100644 --- a/src/main/java/net/tccn/service/MetadataService.java +++ b/src/main/java/net/tccn/service/MetadataService.java @@ -4,10 +4,7 @@ import net.tccn.base.JBean; import net.tccn.base.Kv; import net.tccn.base.MetaKit; import net.tccn.dbq.Field; -import net.tccn.meta.Filter; -import net.tccn.meta.MetaLink; -import net.tccn.meta.MetaService; -import net.tccn.meta.MetaTable; +import net.tccn.meta.*; import net.tccn.plat.SysPlat; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestParam; @@ -173,7 +170,7 @@ public class MetadataService extends BaseService { //arango } @RestMapping(name = "editsave", comment = "表单配置保存") - public JBean editSave(String name, List> edits, @RestParam(name = "platToken") String token) { + public JBean editSave(String name, List edits, @RestParam(name = "platToken") String token) { if (edits == null || edits.size() == 0) return null; MetaService metaService = MetaKit.getMetaService(name, token); diff --git a/src/main/java/net/tccn/service/_TableService.java b/src/main/java/net/tccn/service/_TableService.java index e55a65f..ef8b7ba 100644 --- a/src/main/java/net/tccn/service/_TableService.java +++ b/src/main/java/net/tccn/service/_TableService.java @@ -102,6 +102,26 @@ public class _TableService extends BaseService { }).toArray(MetaTable[]::new); MetaKit.save(metaTables); + + // 已经有的表 更新 + MetaTable[] metaTables2 = tables.stream() + .filter(t -> hv.contains(t.getName())) // 去除同名 + .map(t -> { + MetaTable table = MetaKit.getMetaTable(t.getName(), token); + + MetaTable metaTable = MetaTable.toAs(t); + + table.setCatalog(catalog); + table.setDbPlatId(dbPlatId); + table.setAlias(table.getAlias());// 表别名 + table.setSysPlatId(platId(token)); + + table.setItems(metaTable.getItems()); + table.setComment(metaTable.getComment()); + return table; + }).toArray(MetaTable[]::new); + + MetaKit.save(metaTables2); } return JBean.OK; }