From 9973ad18ca2207f43a592a7d5b01e568f80dbbb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=9D=E5=B0=98?= <237809796@qq.com> Date: Mon, 1 Apr 2024 15:53:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A1=E3=80=81arangodb?= =?UTF-8?q?=20->=20mysql=EF=BC=8C=E5=8E=BB=E9=99=A4arangodb=20=20=20=20=20?= =?UTF-8?q?=202=E3=80=81=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 +- root/api/db.js | 12 +- root/api/meta.js | 6 +- root/api/plat.js | 2 +- root/api/table.js | 12 +- root/api/user.js | 2 +- root/content/list.html | 2 +- root/index.html | 4 +- root/metadata/metaLink.html | 56 +-- root/metadata/metaService.html | 14 +- root/metadata/metatable/import.html | 2 +- root/metadata/metatable/metaTable.html | 20 +- root/plat/db.html | 8 +- root/plat/index.html | 8 +- root/qtask/debug.html | 4 +- root/qtask/list.html | 2 +- root/res/js/red.js | 14 +- root/user/login.html | 4 +- src/main/java/dev/zhub/mk/qtask/QTask.java | 9 +- .../java/dev/zhub/mk/qtask/QTaskService.java | 2 - src/main/java/net/tccn/base/BaseEntity.java | 5 + src/main/java/net/tccn/base/BaseService.java | 2 +- src/main/java/net/tccn/base/BaseServlet.java | 6 +- src/main/java/net/tccn/base/MetaKit.java | 383 ++++++++++++------ .../java/net/tccn/base/MetaListenter.java | 4 +- .../java/net/tccn/base/dbq/DbExecutors.java | 28 +- .../java/net/tccn/base/dbq/fbean/FBean.java | 4 +- .../java/net/tccn/base/dbq/fbean/Filter.java | 2 +- .../net/tccn/base/dbq/jdbc/api/DbAccount.java | 58 ++- .../net/tccn/base/dbq/jdbc/api/DbKit.java | 5 +- .../net/tccn/base/dbq/parser/ParseMysql.java | 66 +-- .../java/net/tccn/base/dbq/qtask/DbTask.java | 2 +- src/main/java/net/tccn/dict/Dict.java | 12 +- src/main/java/net/tccn/dict/DictKit.java | 18 +- src/main/java/net/tccn/dict/DictService.java | 2 +- src/main/java/net/tccn/file/_FileService.java | 48 +-- src/main/java/net/tccn/meta/MLink.java | 31 ++ src/main/java/net/tccn/meta/MService.java | 53 +++ .../tccn/meta/{MetaTable.java => MTable.java} | 54 ++- src/main/java/net/tccn/meta/MetaLink.java | 21 - src/main/java/net/tccn/meta/MetaService.java | 36 -- .../java/net/tccn/meta/MetadataService.java | 144 +++---- src/main/java/net/tccn/open/DataService.java | 22 +- src/main/java/net/tccn/plat/MPlat.java | 31 ++ src/main/java/net/tccn/plat/MetaDb.java | 8 +- src/main/java/net/tccn/plat/MetaPlat.java | 6 +- src/main/java/net/tccn/plat/PlatService.java | 46 ++- src/main/java/net/tccn/plat/_DbService.java | 28 +- .../java/net/tccn/plat/_TableService.java | 62 +-- src/main/java/net/tccn/qtask/DbTask.java | 4 +- .../java/net/tccn/qtask/QtaskService.java | 6 +- src/main/java/net/tccn/qtask/Task.java | 5 +- src/main/java/net/tccn/qtask/TaskKit.java | 2 +- .../java/net/tccn/qtask/_QtaskService.java | 10 +- .../java/net/tccn/qtask/impl/QTaskMysql.java | 2 +- .../tccn/user/{MetaUser.java => MUser.java} | 44 +- src/main/java/net/tccn/user/UserService.java | 28 +- src/main/resources/tpl/aql/table.aql | 7 + src/test/java/RunTest.java | 104 ++--- 59 files changed, 926 insertions(+), 660 deletions(-) create mode 100644 src/main/java/net/tccn/base/BaseEntity.java create mode 100644 src/main/java/net/tccn/meta/MLink.java create mode 100644 src/main/java/net/tccn/meta/MService.java rename src/main/java/net/tccn/meta/{MetaTable.java => MTable.java} (51%) delete mode 100644 src/main/java/net/tccn/meta/MetaLink.java delete mode 100644 src/main/java/net/tccn/meta/MetaService.java create mode 100644 src/main/java/net/tccn/plat/MPlat.java rename src/main/java/net/tccn/user/{MetaUser.java => MUser.java} (51%) diff --git a/pom.xml b/pom.xml index 6c21fd7..46b0160 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ - + com.jfinal diff --git a/root/api/db.js b/root/api/db.js index 445153a..b4f97db 100644 --- a/root/api/db.js +++ b/root/api/db.js @@ -1,12 +1,12 @@ const db = { - catalogList({dbAccount, dbPlatId}) { // database列表 + catalogList({dbAccount, dbid}) { // database列表 console.log(JSON.stringify(dbAccount)) - return red.postX('/_db/catalog_list', {dbAccount: escape(JSON.stringify(dbAccount)), dbPlatId}) + return red.postX('/_db/catalog_list', {dbAccount: escape(JSON.stringify(dbAccount)), dbid}) }, - tableList({dbPlatId, catalog}) { // 数据库表列表 - return red.postX('/_db/table_list', {dbPlatId, catalog}) + tableList({dbid, catalog}) { // 数据库表列表 + return red.postX('/_db/table_list', {dbid, catalog}) }, - tableInfo({dbPlatId, catalog, tableName}) { - return red.postX('/_db/table_info', {dbPlatId, catalog, tableName}) + tableInfo({dbid, catalog, tableName}) { + return red.postX('/_db/table_info', {dbid, catalog, tableName}) } } \ No newline at end of file diff --git a/root/api/meta.js b/root/api/meta.js index e4d4750..6daa560 100644 --- a/root/api/meta.js +++ b/root/api/meta.js @@ -19,9 +19,9 @@ const meta = { getServiceInfo({name}, callback) { red.getJSON("/meta/service_info",{name}, res => { - let {name, comment, table, edits, imports, shows, exports, filters, details, dels} = red.replacePoint(res) + let {name, comment, tablealias, edits, imports, shows, exports, filters, details, dels} = red.replacePoint(res) - callback({name, comment, table, edits, imports, shows, exports, filters, details, dels}); + callback({name, comment, tablealias, edits, imports, shows, exports, filters, details, dels}); }); }, getServiceDetail({name}, callback) { @@ -97,7 +97,7 @@ const meta = { //client exportData({fbean, cate}) { if (cate == 'excel') { - location.href = "/data/export?fBean=" + JSON.stringify(fbean) + "&platToken=" + red.getPlatToken() + "&cate=excel"; + location.href = "/data/export?fBean=" + JSON.stringify(fbean) + "&plattoken=" + red.getPlatToken() + "&cate=excel"; } else if (cate == 'cvs') { } else if (cate == 'json') { diff --git a/root/api/plat.js b/root/api/plat.js index 73d0508..c352220 100644 --- a/root/api/plat.js +++ b/root/api/plat.js @@ -2,7 +2,7 @@ const plat = { platList(params = {}) { // 平台列表 - params['platToken'] = 'xx' + params['plattoken'] = 'xx' return red.getX('/plat/list', params) }, platSave({plat}) { diff --git a/root/api/table.js b/root/api/table.js index 31d2244..b2b7c4e 100644 --- a/root/api/table.js +++ b/root/api/table.js @@ -1,19 +1,19 @@ const table = { - _sheets({cate, filePath, dbAccount, dbPlatId, catalog}) { - return red.postX('/_table/sheets',{cate, filePath, dbAccount, dbPlatId, catalog}) + _sheets({cate, filePath, dbAccount, dbid, catalog}) { + return red.postX('/_table/sheets',{cate, filePath, dbAccount, dbid, catalog}) }, sheetsExcel({filePath}) { return table._sheets({cate: "excel", filePath}) }, - sheetMySql({dbPlatId, catalog}) { - return table._sheets({cate: "mysql", dbPlatId, catalog}) + sheetMySql({dbid, catalog}) { + return table._sheets({cate: "mysql", dbid, catalog}) }, sheetInfo({filePath, sheetName}) { return red.postX('/_table/sheet_info', {cate: 'excel', filePath, sheetName}) }, - saveTable({dbPlatId, catalog, tableArr}) { // - return red.postX('/_table/table_save', {cate: 'mysql', dbPlatId, catalog, tableArr: JSON.stringify(tableArr)}) + saveTable({dbid, catalog, tableArr}) { // + return red.postX('/_table/table_save', {cate: 'mysql', dbid, catalog, tableArr: JSON.stringify(tableArr)}) }, saveSheet({filePath, sheetNames}) { return red.postX('/_table/table_save', {cate: 'excel', filePath, sheetNames: JSON.stringify(sheetNames)}) diff --git a/root/api/user.js b/root/api/user.js index 2aa54a2..09fadbd 100644 --- a/root/api/user.js +++ b/root/api/user.js @@ -1,7 +1,7 @@ //import red from '../res/js/red' const login = ({username, pwd}) => { - return red.postX("/user/login", {username, pwd, platToken: 'xx'}) + return red.postX("/user/login", {username, pwd, plattoken: 'xx'}) } const logout = () => { diff --git a/root/content/list.html b/root/content/list.html index 8cba8a3..e3912c3 100644 --- a/root/content/list.html +++ b/root/content/list.html @@ -88,7 +88,7 @@
- diff --git a/root/index.html b/root/index.html index 22ecc81..c34a344 100644 --- a/root/index.html +++ b/root/index.html @@ -16,7 +16,7 @@
    @@ -38,7 +38,7 @@
diff --git a/root/metadata/metaLink.html b/root/metadata/metaLink.html index dfd857d..4e7ebea 100644 --- a/root/metadata/metaLink.html +++ b/root/metadata/metaLink.html @@ -60,12 +60,12 @@ 操作 - + - + - +
@@ -141,7 +141,7 @@ links: [], // linkInfos: [], linkInfo: {}, - link2: [], + links2: [], newLinkTable: {}, aliasB: '', @@ -184,20 +184,20 @@ for (let i in this.links) { // 数据转换 if (this.links[i]['tables'][0] == v || this.links[i]['tables'][1] == v) { linkInfo = this.links[i] - let link = {} - let link2 = [] // [{f1:"", f2:""}] - for(k in linkInfo["link"]) { - let [_k, _v] = [k, linkInfo["link"][k]] + let links = {} + let links2 = [] // [{f1:"", f2:""}] + for(k in linkInfo["links"]) { + let [_k, _v] = [k, linkInfo["links"][k]] if (k.startsWith(this.aliasA + '.')) { - link[_k] = _v - link2.push({f1: _k, f2: _v}) + links[_k] = _v + links2.push({f1: _k, f2: _v}) } else { - link[_v] = _k - link2.push({f1: _v, f2: _k}) + links[_v] = _k + links2.push({f1: _v, f2: _k}) } } - linkInfo['link'] = link - this.link2 = link2 + linkInfo['links'] = links + this.link2 = links2 } } this.linkInfo = linkInfo @@ -222,11 +222,11 @@ }) }, dealTableLabel(table) { - return `${table.name} (${table.comment||'-'}) [${table.linkCount}]` + return `${table.tablename} (${table.comment||'-'}) [${table.linkCount}]` }, dealFilter(table) { // table.name 中是否包含 thiss.filter 的值 - if (table.name.indexOf(this.filter) > -1 || table.comment.indexOf(this.filter) > -1) { + if (table.tablename.indexOf(this.filter) > -1 || table.comment.indexOf(this.filter) > -1) { return true } else { return false @@ -257,28 +257,28 @@ // 保存（同修改） }, addLinkField() { - let link2 = this.link2 - link2.push({f1: "", f2: ""}) - this.link2 = link2 + let links2 = this.links2 + links2.push({f1: "", f2: ""}) + this.links2 = links2 }, delLinkField(index) { - let link2 = [] + let links2 = [] for (let i in this.link2) { if (i != index) { - link2.push(this.link2[i]) + links2.push(this.link2[i]) } } - this.link2 = link2 + this.links2 = links2 }, saveLink() { - let link = {} - for(let i in this.link2) { - let item = this.link2[i] + let links = {} + for(let i in this.links2) { + let item = this.links2[i] if (item['f1'] && item['f2']) { - link[item['f1']] = item['f2'] + links[item['f1']] = item['f2'] } } - if (link.size == 0) { + if (links.size === 0) { red.showError("请填写完整的关联字段信息") return false } @@ -288,7 +288,7 @@ if (!linkInfo['tables']) { linkInfo['tables'] = [this.aliasA, this.aliasB] } - linkInfo["link"] = link + linkInfo["links"] = links linkSave({link: linkInfo}).then(res => { red.showOk() }) diff --git a/root/metadata/metaService.html b/root/metadata/metaService.html index e45f741..bd3d46e 100644 --- a/root/metadata/metaService.html +++ b/root/metadata/metaService.html @@ -515,8 +515,8 @@
- +
@@ -571,7 +571,7 @@ filterCate: ["EQUAL", "NOTEQUAL", "LIKE", "IN"], serviceInfo: { name: "", - table: "", + tablealias: "", items: [], shows: [], exports: [], @@ -601,7 +601,7 @@ services: [],//业务列表 service: "", //页面选择的业务类型 serviceLabel: "", - table: "",//表别名 + tablealias: "",//表别名 //filter filterArr: [], @@ -687,7 +687,7 @@ //console.log("dels", dels) let cate = dels["cate"] || "UP_FIELD" let sql1 = dels["sql1"] || "update #(table) set status=9 where id=#(id);" - let sql = dels["sql"] || `update ${v['tables'][this.serviceInfo.table]['name']} set status=9 where id=#(id);` + let sql = dels["sql"] || `update ${v['tables'][this.serviceInfo.tablealias]['tablename']} set status=9 where id=#(id);` let qtask = dels["qtask"] || "" let serviceInfo = this.serviceInfo @@ -695,7 +695,7 @@ this.serviceInfo = serviceInfo }, sheet: function (v) { - this.table = v; + this.tablealias = v; }, filterArr: function (v) { // 添加或删除选项触发 let filters = this.serviceInfo.filters @@ -900,7 +900,7 @@ } } - this.serviceInfo = json; + vm.serviceInfo = json; }) }, loadDetail(name) { diff --git a/root/metadata/metatable/import.html b/root/metadata/metatable/import.html index 192d907..b81bac7 100644 --- a/root/metadata/metatable/import.html +++ b/root/metadata/metatable/import.html @@ -292,7 +292,7 @@ tableData: {}, tableArr: [], dbPlat: red.getData("dbPlat",{}), - dbPlatId: red.getData("dbPlatId",''), + dbid: red.getData("dbPlatId",''), catalog: '', tableName: '', ckTable: [], diff --git a/root/metadata/metatable/metaTable.html b/root/metadata/metatable/metaTable.html index b0bc53d..fa74f23 100644 --- a/root/metadata/metatable/metaTable.html +++ b/root/metadata/metatable/metaTable.html @@ -182,7 +182,7 @@
- @@ -241,7 +241,7 @@ itemEdit: {}, //待修改的字段属性 dbPlats:[], - row: {key: "", platId: "", dbPlatId:"", catalog: "", name:"", comment:"", alias: ""}, + row: {tableid: "", platid: "", dbid:"", catalog: "", tablename:"", comment:"", alias: ""}, filter: {db: "", catalog: "", name: ""},//tableList 过滤条件 upsql: "", // 需要执行的 sql语句 @@ -250,7 +250,7 @@ }, watch: { metaTable(v) { - this.name = v.name + this.tablename = v.tablename this.alias = v.alias }, status: function (v) { @@ -298,11 +298,11 @@ handler: function (row) { //console.log(vm.metaTable.name, " -> ",v.name) vm.upsql = '' - if (vm.metaTable.name !== row.name) { - vm.upsql += 'RENAME TABLE `{0}`.`{1}` TO `{2}`.`{3}`;\n'.format(vm.metaTable.catalog, vm.metaTable.name, vm.metaTable.catalog, row.name) + if (vm.metaTable.tablename !== row.tablename) { + vm.upsql += 'RENAME TABLE `{0}`.`{1}` TO `{2}`.`{3}`;\n'.format(vm.metaTable.catalog, vm.metaTable.tablename, vm.metaTable.catalog, row.tablename) } if (vm.metaTable.comment !== row.comment) { - vm.upsql += 'ALTER TABLE `{0}`.`{1}` COMMENT=\'{2}\';\n'.format(vm.metaTable.catalog, vm.metaTable.name, row.comment) + vm.upsql += 'ALTER TABLE `{0}`.`{1}` COMMENT=\'{2}\';\n'.format(vm.metaTable.catalog, vm.metaTable.tablename, row.comment) } }, deep: true @@ -320,7 +320,7 @@ deep: true }, meta: function (v) { - this.row = {key:v.key, dbPlatId: v.dbPlatId, catalog: v.catalog, name:v.name, comment:v.comment, alias: v.alias}; + this.row = {tableid:v.tableid, dbid: v.dbid, catalog: v.catalog, tablename:v.tablename, comment:v.comment, alias: v.alias}; let oldItems = v['items'] || [] this.oldItems = JSON.parse(JSON.stringify(oldItems)) }, @@ -347,7 +347,7 @@ catalogs: function() { let dbPlats = this.dbPlats; for (i in dbPlats) { - if (dbPlats[i].key == this.row.dbPlatId) { + if (dbPlats[i].dbid === this.row.dbid) { return dbPlats[i]["catalogs"] } } @@ -482,11 +482,11 @@ }, dealTableLabel(table) { // (${table.linkCount}) - return `${table.name} [${table.comment}]` + return `${table.tablename} [${table.comment}]` }, dealFilter(table) { // table.name 中是否包含 thiss.filter 的值 - if (table.name.indexOf(this.filter) > -1 || table.comment.indexOf(this.filter) > -1) { + if (table.tablename.indexOf(this.filter) > -1 || table.comment.indexOf(this.filter) > -1) { return true } else { return false diff --git a/root/plat/db.html b/root/plat/db.html index a0691c7..f60b1da 100644 --- a/root/plat/db.html +++ b/root/plat/db.html @@ -81,7 +81,7 @@
- +
@@ -151,7 +151,7 @@ cfg: { title: "数据中心 管理", cols: [ - {col: "name", label: "数据平台名称"}, + {col: "dbname", label: "数据平台名称"}, {col: "url", label: "数据平台连接地址"}, {col: "user", label: "用户"}, {col: "remark", label: "备注"}, @@ -222,7 +222,7 @@ loadCatalogs: function () { vm.catalogs = []; //let [cate, url, user, pwd] = this.row - let dbAccount = {key: '',cate:'', url:'', user:'', pwd:''} + let dbAccount = {dbid: '',cate:'', url:'', user:'', pwd:''} for (let key in dbAccount) { dbAccount[key] = this.row[key] } @@ -233,7 +233,7 @@ dbPulse: function (row) { /*row["check"] = true; $.getJSON("/_db/pulse", { - dbPlatId: row._id + dbid: row._id }, function (json) { row["pulse"] = json.body; row["check"] = false; diff --git a/root/plat/index.html b/root/plat/index.html index dd030f4..2e01b45 100644 --- a/root/plat/index.html +++ b/root/plat/index.html @@ -48,13 +48,13 @@
- +
- +
@@ -84,8 +84,8 @@ cfg: { title: "业务平台 管理", cols: [ - {col: "name", label: "业务名称"}, - {col: "token", label: "Token"}, + {col: "platname", label: "业务名称"}, + {col: "plattoken", label: "Token"}, {col: "remark", label: "说明"}, {col: "status", label: "状态", fmt: function (v) { return {"0":"未启用", "1":"启用", "-1":"删除"}[v] || ""; diff --git a/root/qtask/debug.html b/root/qtask/debug.html index 8a1c138..3923ec7 100644 --- a/root/qtask/debug.html +++ b/root/qtask/debug.html @@ -26,7 +26,7 @@
- @@ -87,7 +87,7 @@ catalogs: function () { let dbPlats = this.dbPlats; for (i in dbPlats) { - if (dbPlats[i].key == this.row.dbplatid) { + if (dbPlats[i].key == this.row.dbid) { return dbPlats[i]["catalogs"] } } diff --git a/root/qtask/list.html b/root/qtask/list.html index 10bb6e1..268e776 100644 --- a/root/qtask/list.html +++ b/root/qtask/list.html @@ -128,7 +128,7 @@ 数据平台 - diff --git a/root/res/js/red.js b/root/res/js/red.js index 0ac4f28..000b9bc 100644 --- a/root/res/js/red.js +++ b/root/res/js/red.js @@ -46,10 +46,10 @@ var red = { location.href = "/user/login.html"; }, 2000); }*/ - return plat["token"]; + return plat["plattoken"]; }, getJSON: function (url, params = {}, callback) { - params["platToken"] = red.getPlatToken() + params["plattoken"] = red.getPlatToken() axios.get(url, {params}).then(res => { let data = res.data || {} red.loginCheck(data) @@ -124,8 +124,8 @@ var red = { }) }, getX(url, params = {}) { - if (!params['platToken']) - params['platToken'] = red.getPlatToken() + if (!params['plattoken']) + params['plattoken'] = red.getPlatToken() return new Promise(resolve => { axios.get(url, params).then(res => { let data = res.data || {} @@ -146,8 +146,8 @@ var red = { }) }, postX(url, params = {}) { - if (!params['platToken']) - params['platToken'] = red.getPlatToken() + if (!params['plattoken']) + params['plattoken'] = red.getPlatToken() return new Promise(resolve => { axios({ url, @@ -178,7 +178,7 @@ var red = { }) }, post: function(url, params = {}, callback) { - //params['platToken'] = red.getPlatToken() + //params['plattoken'] = red.getPlatToken() axios.post(url, params).then(res => { /*let data = red.loginCheck(res.data) if (data && data.code == -1) { diff --git a/root/user/login.html b/root/user/login.html index cac9d28..d598e1e 100644 --- a/root/user/login.html +++ b/root/user/login.html @@ -80,7 +80,7 @@
@@ -88,7 +88,7 @@
- +
diff --git a/src/main/java/dev/zhub/mk/qtask/QTask.java b/src/main/java/dev/zhub/mk/qtask/QTask.java index fa2eaad..8311145 100644 --- a/src/main/java/dev/zhub/mk/qtask/QTask.java +++ b/src/main/java/dev/zhub/mk/qtask/QTask.java @@ -2,6 +2,7 @@ package dev.zhub.mk.qtask; import lombok.Getter; import lombok.Setter; +import net.tccn.base.BaseEntity; import net.tccn.base.Kv; import net.tccn.base.Utils; import net.tccn.qtask.Task; @@ -16,7 +17,7 @@ import java.util.Map; @Getter @Setter @Entity -public class QTask { +public class QTask extends BaseEntity { @Id @Comment("[记录ID]") @@ -29,7 +30,7 @@ public class QTask { private String catalog = ""; @Comment("[数据平台ID]") - private String dbplatid = ""; + private int dbid; @Comment("[标识名称KEY]") // @Column(updatable = false) @@ -37,7 +38,7 @@ public class QTask { @Comment("[所属平台ID]") @Column(updatable = false) - private String platid; + private Integer platid; @Comment("[业务名称]") private String title = ""; @@ -57,7 +58,7 @@ public class QTask { task.setName(name); task.setTitle(title); task.setContent(content); - task.setDbPlatId(dbplatid); + task.setDbid(dbid); task.setCatalog(catalog); Kv _para = Kv.of(); diff --git a/src/main/java/dev/zhub/mk/qtask/QTaskService.java b/src/main/java/dev/zhub/mk/qtask/QTaskService.java index 79b053e..f2ef18a 100644 --- a/src/main/java/dev/zhub/mk/qtask/QTaskService.java +++ b/src/main/java/dev/zhub/mk/qtask/QTaskService.java @@ -2,7 +2,6 @@ package dev.zhub.mk.qtask; import net.tccn.base.BaseService; import net.tccn.base.Utils; -import org.redkale.convert.json.JsonConvert; import org.redkale.net.http.RestHeader; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestService; @@ -12,7 +11,6 @@ import org.redkale.source.Flipper; import org.redkale.util.AnyValue; import org.redkale.util.Sheet; -import java.util.List; import java.util.Map; @RestService(name = "qtask", comment = "qtask服务") diff --git a/src/main/java/net/tccn/base/BaseEntity.java b/src/main/java/net/tccn/base/BaseEntity.java new file mode 100644 index 0000000..a245633 --- /dev/null +++ b/src/main/java/net/tccn/base/BaseEntity.java @@ -0,0 +1,5 @@ +package net.tccn.base; + +public class BaseEntity { + +} diff --git a/src/main/java/net/tccn/base/BaseService.java b/src/main/java/net/tccn/base/BaseService.java index 62a287e..63d166c 100644 --- a/src/main/java/net/tccn/base/BaseService.java +++ b/src/main/java/net/tccn/base/BaseService.java @@ -77,7 +77,7 @@ public class BaseService implements Service { return t; } - protected String platId(String token) { + protected Integer platId(String token) { return MetaKit.getPlatId(token); } diff --git a/src/main/java/net/tccn/base/BaseServlet.java b/src/main/java/net/tccn/base/BaseServlet.java index 3eb2e3d..8a974b8 100644 --- a/src/main/java/net/tccn/base/BaseServlet.java +++ b/src/main/java/net/tccn/base/BaseServlet.java @@ -1,6 +1,6 @@ package net.tccn.base; -import net.tccn.user.MetaUser; +import net.tccn.user.MUser; import net.tccn.user.UserService; import org.redkale.net.http.HttpRequest; import org.redkale.net.http.HttpResponse; @@ -45,12 +45,12 @@ public class BaseServlet extends HttpServlet { } if (sessionid != null) { - MetaUser user = userService.current(sessionid); + MUser user = userService.current(sessionid); /*request.setCurrentUserSupplier(() -> { return user; });*/ if (user != null) { - request.setCurrentUserid(user.getId()); + request.setCurrentUserid(user.getUserid()); } } String uri = request.getRequestURI(); diff --git a/src/main/java/net/tccn/base/MetaKit.java b/src/main/java/net/tccn/base/MetaKit.java index 58e2344..6ec4c85 100644 --- a/src/main/java/net/tccn/base/MetaKit.java +++ b/src/main/java/net/tccn/base/MetaKit.java @@ -2,28 +2,24 @@ package net.tccn.base; import dev.zhub.mk.qtask.QTask; import lombok.Getter; -import net.tccn.base.arango.Doc; import net.tccn.base.dbq.jdbc.api.DbAccount; import net.tccn.base.dbq.jdbc.api.DbKit; import net.tccn.base.dbq.table.Field; import net.tccn.dict.Dict; import net.tccn.meta.*; -import net.tccn.plat.MetaDb; -import net.tccn.plat.MetaPlat; +import net.tccn.plat.MPlat; import net.tccn.qtask.TaskKit; -import net.tccn.user.MetaUser; +import net.tccn.user.MUser; import org.redkale.annotation.Resource; import org.redkale.convert.json.JsonConvert; import org.redkale.service.AbstractService; +import org.redkale.source.DataJdbcSource; import org.redkale.source.DataSource; import org.redkale.util.AnyValue; import org.redkale.util.Comment; -import org.redkale.util.TypeToken; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Type; import java.util.*; +import java.util.concurrent.CompletableFuture; import java.util.function.BiFunction; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -36,17 +32,17 @@ import static java.util.Arrays.asList; public class MetaKit extends AbstractService { //基础数据缓存 @Getter - private static List metaTables; + private static List mTables; @Getter - private static List metaLinks; + private static List metaLinks; @Getter - private static List metaServices; + private static List metaServices; @Getter private static List dbPlats; @Getter - private static List sysPlats; + private static List mPlats; @Getter - private static List users; + private static List users; @Getter private static List qTasks; @Getter @@ -60,27 +56,83 @@ public class MetaKit extends AbstractService { protected DataSource metaSource; public void reloadxAsync(Class clazz) { - if (clazz == QTask.class) { - qTasks = metaSource.queryList(QTask.class); - TaskKit.init(qTasks); - } + CompletableFuture.runAsync(() -> { + if (clazz == QTask.class) { + qTasks = metaSource.queryList(QTask.class); + TaskKit.init(qTasks); + } else if (clazz == MPlat.class) mPlats = metaSource.queryList(MPlat.class); + else if (clazz == DbAccount.class) dbPlats = metaSource.queryList(DbAccount.class); + else if (clazz == MTable.class) mTables = metaSource.queryList(MTable.class); + else if (clazz == MService.class) metaServices = metaSource.queryList(MService.class); + else if (clazz == MLink.class) metaLinks = metaSource.queryList(MLink.class); + else if (clazz == Dict.class) dicts = metaSource.queryList(Dict.class); + /*if (clazz == MUser.class) { + users = metaSource.queryList(MUser.class); + }*/ + }); } @Override public void init(AnyValue config) { reloadxAsync(QTask.class); + reloadxAsync(MPlat.class); + reloadxAsync(DbAccount.class); + reloadxAsync(MService.class); + reloadxAsync(MTable.class); + reloadxAsync(MLink.class); + // reloadxAsync(Dict.class); + + + /*metaTables.forEach(x -> { + // 写入到 MTable + MTable mTable = new MTable(); + mTable.setTableid(Integer.parseInt(x.getKey())); + mTable.setCatalog(x.getCatalog()); + mTable.setDbid(x.getDbid()); + mTable.setAlias(x.getAlias()); + mTable.setTablename(x.getName()); + mTable.setPlatid(x.getPlatid()); + mTable.setComment(x.getComment()); + mTable.setItems(x.getItems()); + + metaSource.insertAsync(mTable); + });*/ + /*metaServices.forEach(x -> { + // 写入到 MService + MService service = new MService(); + service.setServid(Integer.parseInt(x.getKey())); + service.setName(x.getName()); + service.setTablealias(x.getTable()); + service.setShows(x.getShows()); + service.setExports(x.getExports()); + service.setEdits(x.getEdits()); + service.setDetails(x.getDetails()); + service.setFilters(x.getFilters()); + service.setComment(x.getComment()); + //service.setDels(x.getDels()); + service.setPlatid(x.getPlatid()); + + metaSource.insert(service); + });*/ + /*metaLinks.forEach(x -> { + MxLink link = new MxLink(); + link.setLinkid(Integer.parseInt(x.getKey())); + link.setTables(x.getTables()); + link.setLinks(x.getLink()); + metaSource.insert(link); + });*/ } // ----------------------------------- public static void init() { - reload(MetaTable.class); - reload(MetaLink.class); - reload(MetaService.class); - reload(DbAccount.class); - reload(MetaPlat.class); - reload(MetaUser.class); + // reload(MetaTable.class); + // reload(MLink.class); + // reload(MetaService.class); + // reload(DbAccount.class); + // reload(MetaPlat.class); + // reload(MetaUser.class); // reload(DbTask.class); - reload(Dict.class); + // reload(Dict.class); /* 同步 本地文件配置数据到 数据库 @@ -93,104 +145,110 @@ public class MetaKit extends AbstractService { } - public static void reload(Class clazz) { + /*public static void reload(Class clazz) { reload(clazz, null); } public static void reload(T t) { reload(t.getClass(), t.getKey()); - } + }*/ - public static void main(String[] args) throws IOException { + /*public static void main(String[] args) throws IOException { Type type = new TypeToken>() { }.getType(); dbPlats = FileKit.readAs(new File("D:\\Java\\meta-kit\\conf\\data\\DbAccount.json"), type); //convert.convertFrom(type,"[{\"catalogs\":[\"test\"],\"cate\":\"mysql\",\"id\":\"db_plat/67275393\",\"key\":\"67275393\",\"name\":\"ylz测试\",\"url\":\"jdbc:mysql://119.3.106.117:3306\",\"user\":\"root\"},{\"catalogs\":[\"v09x_platf_core\"],\"cate\":\"mysql\",\"id\":\"db_plat/67275392\",\"key\":\"67275392\",\"name\":\"platf_qc\",\"url\":\"jdbc:mysql://121.196.17.55:6063\",\"user\":\"root\"},{\"catalogs\":[\"official_core\",\"official_ipci\",\"v09x_platf_core\",\"platf_quest\",\"platf_pay\",\"platf_mall\",\"platf_oth\",\"platf_im\",\"z_core\"],\"cate\":\"mysql\",\"id\":\"db_plat/67275391\",\"key\":\"67275391\",\"name\":\"platf_pro\",\"url\":\"jdbc:mysql://122.112.180.156:6033\",\"user\":\"guest\"},{\"catalogs\":[\"db_diamond\"],\"id\":\"db_plat/53533152\",\"key\":\"53533152\",\"name\":\"钻石项目\",\"url\":\"jdbc:mysql://192.168.201.51:3306/db_diamond?characterEncoding=utf-8&autoReconnect=true&serverTimezone=Asia/Shanghai&useSSL=false\",\"user\":\"root\"},{\"catalogs\":[\"db_diamond\"],\"id\":\"db_plat/53532996\",\"key\":\"53532996\",\"name\":\"钻石项目\",\"url\":\"jdbc:mysql://192.168.201.51:3306/db_diamond?characterEncoding=utf-8&autoReconnect=true&serverTimezone=Asia/Shanghai&useSSL=false\",\"user\":\"root\"},{\"catalogs\":[\"platf_im\",\"v09x_platf_core\",\"platf_oss\",\"platf_quest\",\"platf_oth\",\"sport_oss\",\"zhub\",\"cpg_core\",\"z_core\",\"z_config\",\"z_im\",\"z_mall\",\"z_quest\",\"z_oss\",\"z_oth\",\"cmt_oss\",\"cmt_depot_core\",\"cmt_core\",\"sport_core\"],\"cate\":\"mysql\",\"id\":\"db_plat/52481174\",\"key\":\"52481174\",\"name\":\"platf_dev\",\"url\":\"jdbc:mysql://47.111.150.118:6063\",\"user\":\"root\"},{\"catalogs\":[],\"cate\":\"mysql\",\"id\":\"db_plat/4375768\",\"key\":\"4375768\",\"name\":\"mysql数据库\",\"url\":\"jdbc:mysql://192.168.50.124:3306/mytest?characterEncoding=utf-8&autoReconnect=true&useSSL=false&connectTimeout=3000\",\"user\":\"root\"},{\"catalogs\":[],\"cate\":\"mysql\",\"id\":\"db_plat/4267761\",\"key\":\"4267761\",\"name\":\"测试\",\"remark\":\"sadfdsaf\",\"url\":\"123&connectTimeout=5000\",\"user\":\"root\"},{\"catalogs\":[\"db_art\",\"db_jsons_bbs\",\"db_mater\",\"db_redbbs\",\"jfly\",\"redbbs_dev\",\"meta_kit_test\"],\"cate\":\"mysql\",\"id\":\"db_plat/3321254\",\"key\":\"3321254\",\"name\":\"测试-DB【可用】\",\"url\":\"jdbc:mysql://120.24.230.60:3306/redbbs?characterEncoding=utf-8&autoReconnect=true&useSSL=false&connectTimeout=3000\",\"user\":\"guest\"},{\"catalogs\":[\"blockchain\",\"gxbii_dev\",\"gxbii_all\",\"gxbii_cmd\",\"fzexp\",\"db_fz\",\"a_test\",\"meta_xx\",\"ipsm_v4\"],\"cate\":\"mysql\",\"id\":\"db_plat/3305916\",\"key\":\"3305916\",\"name\":\"测试库-11测试库【可用】\",\"remark\":\"描述\",\"url\":\"jdbc:mysql://192.168.202.11:3306/gxbii_dev?characterEncoding=utf-8&autoReconnect=true&connectTimeout=3000\",\"user\":\"root\"},{\"catalogs\":[\"ipsm_v4\"],\"cate\":\"mysql\",\"id\":\"db_plat/32822760\",\"key\":\"32822760\",\"name\":\"ceshi1111\",\"url\":\"jdbc:mysql://192.168.202.11:3306/ipsm_v4?characterEncoding=utf-8&autoReconnect=true\",\"user\":\"root\"},{\"catalogs\":[\"zbd_v1\"],\"cate\":\"mysql\",\"id\":\"db_plat/27166384\",\"key\":\"27166384\",\"name\":\"测试1\",\"url\":\"jdbc:mysql://192.168.50.124:3306/mytest?characterEncoding=utf-8&autoReconnect=true&useSSL=false&connectTimeout=3000\",\"user\":\"root\"},{\"catalogs\":[],\"cate\":\"mysql\",\"id\":\"db_plat/25668979\",\"key\":\"25668979\",\"name\":\"测试Mysql数据库\",\"url\":\"jdbc:mysql://558cfc37a10ef.sh.cdb.myqcloud.com:3817/demo?autoReconnect=true\",\"user\":\"cdb_outerroot\"},{\"catalogs\":[],\"cate\":\"localApi\",\"id\":\"db_plat/23090860\",\"key\":\"23090860\",\"name\":\"平台本地API\"},{\"catalogs\":[],\"cate\":\"http\",\"id\":\"db_plat/21561306\",\"key\":\"21561306\",\"name\":\"http地址调用\",\"url\":\"http://127.0.0.1/plat/db_list\"},{\"catalogs\":[\"tc\",\"tc_bbs\",\"redbbs\",\"redoss\",\"material\",\"keeper_dev\",\"art123\",\"keeper\",\"db_party\"],\"cate\":\"mysql\",\"id\":\"db_plat/21558770\",\"key\":\"21558770\",\"name\":\"TX-cloud\",\"url\":\"jdbc:mysql://558cfc37a10ef.sh.cdb.myqcloud.com:3817/demo?autoReconnect=true\",\"user\":\"cdb_outerroot\"},{\"catalogs\":[\"feature_test\",\"intelligence\",\"ma\",\"mysql\",\"ma1\",\"ma2\",\"maintenance\",\"zhaobiao\",\"zhaobiao2\"],\"cate\":\"mysql\",\"id\":\"db_plat/21449811\",\"key\":\"21449811\",\"name\":\"物联网-jj【可用】\",\"url\":\"jdbc:mysql://192.168.50.21:3306/wlw?characterEncoding=utf-8&autoReconnect=true&serverTimezone=Asia/Shanghai\",\"user\":\"root\"},{\"catalogs\":[],\"id\":\"db_plat/20982257\",\"key\":\"20982257\",\"name\":\"数据平台abc\",\"remark\":\"sadfdsaf\",\"url\":\"123&connectTimeout=5000\",\"user\":\"root\"}]"); System.out.println(dbPlats.size()); - } + }*/ - public static void reload(Class clazz, String key) { + /*public static void reload(Class clazz, String key) { try { File file = new File(String.format("%s%s.json", dataPath, clazz.getSimpleName())); if ("file".equals(dcate)) { - if (MetaTable.class == clazz) { + *//*if (MetaTable.class == clazz) { Type type = new TypeToken>() { }.getType(); metaTables = FileKit.readAs(file, type); - } else if (MetaLink.class == clazz) { - Type type = new TypeToken>() { + } else*//* + *//*if (MLink.class == clazz) { + Type type = new TypeToken>() { }.getType(); - metaLinks = FileKit.readAs(file, type);; - } else if (MetaService.class == clazz) { + metaLinks = FileKit.readAs(file, type); + }*//* *//*else if (MetaService.class == clazz) { Type type = new TypeToken>() { }.getType(); - metaServices = FileKit.readAs(file, type);; - } else if (DbAccount.class == clazz) { + metaServices = FileKit.readAs(file, type); + }*//* *//*else if (DbAccount.class == clazz) { Type type = new TypeToken>() { }.getType(); dbPlats = FileKit.readAs(file, type); - } else if (MetaDb.class == clazz) { + }*//* *//*else if (MetaDb.class == clazz) { Type type = new TypeToken>() { }.getType(); dbPlats = FileKit.readAs(file, type);; - } else if (MetaPlat.class == clazz) { + }*//* *//*else if (MetaPlat.class == clazz) { Type type = new TypeToken>() { }.getType(); - sysPlats = FileKit.readAs(file, type);; - } else if (MetaUser.class == clazz) { + mPlats = FileKit.readAs(file, type);; + } *//* *//*else if (MetaUser.class == clazz) { Type type = new TypeToken>() { }.getType(); users = FileKit.readAs(file, type);; - } /*else if (DbTask.class == clazz) { + }*//* *//*else if (DbTask.class == clazz) { Type type = new TypeToken>() { }.getType(); taskEntities = FileKit.readAs(file, type);; - } */ else if (Dict.class == clazz) { + } *//* *//*else if (Dict.class == clazz) { Type type = new TypeToken>() { }.getType(); - dicts = FileKit.readAs(file, type);; - } + dicts = FileKit.readAs(file, type); + }*//* } else { - if (MetaTable.class == clazz) metaTables = MetaTable.dao.find(); - else if (MetaLink.class == clazz) metaLinks = MetaLink.dao.find(); - else if (MetaService.class == clazz) metaServices = MetaService.dao.find(); - else if (DbAccount.class == clazz) dbPlats = DbAccount.dao.find(); - else if (MetaDb.class == clazz) dbPlats = DbAccount.dao.find(); - else if (MetaPlat.class == clazz) sysPlats = MetaPlat.dao.find(); - else if (MetaUser.class == clazz) users = MetaUser.dao.find(); - /*else if (DbTask.class == clazz) { + *//*if (MetaTable.class == clazz) { + metaTables = MetaTable.dao.find(); + } + else*//* + //if (MLink.class == clazz) metaLinks = MLink.dao.find(); + //else if (MetaService.class == clazz) metaServices = MetaService.dao.find(); + //else if (DbAccount.class == clazz) dbPlats = DbAccount.dao.find(); + //else if (MetaDb.class == clazz) dbPlats = DbAccount.dao.find(); + //else if (MetaPlat.class == clazz) mPlats = MetaPlat.dao.find(); + //else if (MetaUser.class == clazz) users = MetaUser.dao.find(); + *//*else if (DbTask.class == clazz) { // taskEntities = DbTask.dao.find(); // TaskKit.init(); - }*/ - else if (Dict.class == clazz) { + }*//* + //else + *//*if (Dict.class == clazz) { dicts = Dict.dao.find(); - } + }*//* } } catch (Exception e) { e.printStackTrace(); } - } + }*/ - public static void cacheSave() { - cacheSave(MetaTable.class); - cacheSave(MetaLink.class); - cacheSave(MetaService.class); - cacheSave(DbAccount.class); - cacheSave(MetaPlat.class); - cacheSave(MetaUser.class); + /*public static void cacheSave() { + //cacheSave(MetaTable.class); + //cacheSave(MLink.class); + //cacheSave(MService.class); + //cacheSave(DbAccount.class); + //cacheSave(MetaPlat.class); + //cacheSave(MetaUser.class); //cacheSave(DbTask.class); - cacheSave(Dict.class); - } + //cacheSave(Dict.class); + }*/ - private static void cacheSave(Class clazz) { + /*private static void cacheSave(Class clazz) { List list = null; - if (MetaTable.class == clazz) list = metaTables; - else if (MetaLink.class == clazz) list = metaLinks; - else if (MetaService.class == clazz) list = metaServices; - else if (DbAccount.class == clazz) list = dbPlats; - else if (MetaPlat.class == clazz) list = sysPlats; - else if (MetaUser.class == clazz) list = users; + *//*if (MetaTable.class == clazz) list = metaTables; + else*//* + if (MLink.class == clazz) list = metaLinks; + else if (MService.class == clazz) list = metaServices; + //else if (DbAccount.class == clazz) list = dbPlats; + //else if (MetaPlat.class == clazz) list = mPlats; + //else if (MetaUser.class == clazz) list = users; // else if (DbTask.class == clazz) list = taskEntities; else if (Dict.class == clazz) list = dicts; @@ -199,7 +257,7 @@ public class MetaKit extends AbstractService { File file = new File(String.format("%s%s.json", dataPath, list.get(0).getClass().getSimpleName())); file.getParentFile().mkdirs(); FileKit.strToFile(MetaKit.convert.convertTo(list), file); - } + }*/ /** * 得到业务主表 @@ -208,20 +266,21 @@ public class MetaKit extends AbstractService { * @param token * @return */ - public static MetaTable getMainTable(String serviceName, String token) { - MetaService metaService = MetaKit.getMetaService(serviceName, token); - return MetaKit.getMetaTableByAlias(metaService.getTable()); + public static MTable getMainTable(String serviceName, String token) { + MService metaService = MetaKit.getMetaService(serviceName, token); + return MetaKit.getMetaTableByAlias(metaService.getTablealias()); } /** * 通过平台token 得到平台字典数据 * - * @param platToken + * @param plattoken */ - public static Map> getDictData(String platToken) { - String platId = MetaKit.getPlatId(platToken); - Map> dicts = MetaKit.dicts.stream().filter(x -> x.getSysPlatId().equals(platId)).collect(Collectors.groupingBy(Dict::getType)); - return dicts; + public static Map> getDictData(String plattoken) { + /*Integer platId = MetaKit.getPlatId(plattoken); + Map> dicts = MetaKit.dicts.stream().filter(x -> x.getPlatid() == (int) platId).collect(Collectors.groupingBy(Dict::getType)); + return dicts;*/ + return new HashMap<>(); } // ----------------------------------- @@ -235,28 +294,28 @@ public class MetaKit extends AbstractService { * @param alias * @return */ - public static MetaTable getMetaTableByAlias(String alias) { - Optional table = metaTables.stream().filter(x -> x.getAlias().equals(alias)).findAny(); + public static MTable getMetaTableByAlias(String alias) { + Optional table = mTables.stream().filter(x -> x.getAlias().equals(alias)).findAny(); return table.orElse(null); } - public static MetaTable getMetaTable(String name, String token) { - Optional any = getMetaTables().stream().filter(x -> { - return x.getName().equals(name) && x.getSysPlatId().equals(getPlatId(token)); + public static MTable getMetaTable(String name, String token) { + Optional any = getMTables().stream().filter(x -> { + return x.getTablename().equals(name) && x.getPlatid().equals(getPlatId(token)); }).findAny(); return any.get(); } - public static MetaService getMetaService(String name, String token) { - Optional service = metaServices.stream() - .filter(x -> x.getName().equals(name) && x.getSysPlatId().equals(getPlatId(token))) + public static MService getMetaService(String name, String token) { + Optional service = metaServices.stream() + .filter(x -> x.getName().equals(name) && x.getPlatid().equals(getPlatId(token))) .findAny(); return service.orElse(null); } //字段特征排序 - public static BiFunction sortItem = (t, arr) -> { + public static BiFunction sortItem = (t, arr) -> { List items = t.getItems(); //x 是跨越值 @@ -283,8 +342,8 @@ public class MetaKit extends AbstractService { }; public static Map cfg(String name, String token) { - MetaService metaService = getMetaService(name, token); - Kv metaTables = getMetaTables(metaService, false); + MService metaService = getMetaService(name, token); + Kv metaTables = getMTables(metaService, false); List> shows = metaService.getShows(); List edits = metaService.getEdits(); @@ -404,18 +463,18 @@ public class MetaKit extends AbstractService { //pk：业务主表的主键 StringBuffer _pks = new StringBuffer(); - MetaTable mainTable = metaTables.get(metaService.getTable()); + MTable mainTable = metaTables.get(metaService.getTablealias()); mainTable.getItems().stream().filter(x -> x.getPk() != null && x.getPk()).forEach(x -> { - _pks.append(String.format("%s.%s,", metaService.getTable(), x.getName())); + _pks.append(String.format("%s.%s,", metaService.getTablealias(), x.getName())); }); if (_pks.length() > 0) { _pks.deleteCharAt(_pks.length() - 1); } if (_pks.length() == 0) { // 默认主键 - List items = metaTables.get(metaService.getTable()).getItems(); + List items = metaTables.get(metaService.getTablealias()).getItems(); //存在id字段，取id items.stream().filter(x -> x.getName().equalsIgnoreCase("id")).findAny().ifPresent(x -> { - _pks.append(String.format("%s.%s", metaService.getTable(), x.getName())); + _pks.append(String.format("%s.%s", metaService.getTablealias(), x.getName())); }); } @@ -431,7 +490,7 @@ public class MetaKit extends AbstractService { @Comment("获取导出excel表头配置k-v") public static Kv cfgExport(String name, String token) { - MetaService metaService = getMetaService(name, token); + MService metaService = getMetaService(name, token); List> exports = metaService.getExports(); Kv kv = Kv.of(); // {col:label} @@ -442,7 +501,7 @@ public class MetaKit extends AbstractService { } //itemUpdate - public static BiFunction, MetaTable> itemUpdate = (t, fields) -> { + public static BiFunction, MTable> itemUpdate = (t, fields) -> { List items = t.getItems(); for (int i = 0; i < fields.size(); i++) { for (int j = 0; j < items.size(); j++) { @@ -468,11 +527,11 @@ public class MetaKit extends AbstractService { };*/ - public static MetaTable getMetaTableByKey(String key) { - return metaTables.stream().filter(x -> x.getKey().equals(key)).findAny().orElse(null); + public static MTable getMetaTableByKey(int key) { + return mTables.stream().filter(x -> x.getTableid() == key).findAny().orElse(null); } - public static List getMetaLinks(String t, List shows, List filters) { + public static List getMetaLinks(String t, List shows, List filters) { Predicate contain = s -> { @@ -493,7 +552,7 @@ public class MetaKit extends AbstractService { //1、直接关联 表： t.equals(x.getTables()[0]) || t.equals(x.getTables()[1] //2、关联且有过滤： //3、关联有展示： - List links = metaLinks.stream() + List links = metaLinks.stream() .filter(x -> { return (t.equals(x.getTables()[0]) || t.equals(x.getTables()[1])) && (contain.test(x.getTables()[0]) || contain.test(x.getTables()[1])); @@ -502,17 +561,17 @@ public class MetaKit extends AbstractService { return links; } - public static Kv buildeDetail(MetaService metaService) { + public static Kv buildeDetail(MService metaService) { //tables - Kv tables = getMetaTables(metaService, true); + Kv tables = getMTables(metaService, true); return Kv.of("tables", tables) .set("links", Kv.of()); } - public static Kv getMetaTables(MetaService metaService, Boolean all) { - Kv tables = Kv.of(); + public static Kv getMTables(MService metaService, Boolean all) { + Kv tables = Kv.of(); - String table = metaService.getTable();// + String table = metaService.getTablealias();// tables.set(table, getMetaTableByAlias(table)); //收集所有的col @@ -545,34 +604,35 @@ public class MetaKit extends AbstractService { return tables; } - /*public static DbKit getDbKit(String dbPlatId) { - Optional dbAccount = dbPlats.stream().filter(x -> x.getKey().equals(dbPlatId)).findAny(); + /*public static DbKit getDbKit(int dbid) { + Optional dbAccount = dbPlats.stream().filter(x -> x.getKey().equals(dbid)).findAny(); return new DbKit(dbAccount.get()); }*/ - public static DbKit getDbKit(String dbPlatId, String catalog) { - Optional dbAccount = dbPlats.stream().filter(x -> x.getKey().equals(dbPlatId)).findAny(); + public static DbKit getDbKit(int dbid, String catalog) { + Optional dbAccount = dbPlats.stream().filter(x -> x.getDbid() == dbid).findAny(); return new DbKit(dbAccount.get(), catalog); } - public static DbAccount getDbPlat(String dbPlatId) { - Optional dbAccount = dbPlats.stream().filter(x -> x.getKey().equals(dbPlatId)).findFirst(); + public static DbAccount getDbPlat(int dbid) { + Optional db = dbPlats.stream().filter(x -> x.getDbid() == dbid).findFirst(); - return dbAccount.get(); + return db.get(); } @Comment("通过平台token 得到平台id") - public static String getPlatId(String platToken) { // - Optional plat = sysPlats.stream().filter(x -> x.getToken().equals(platToken)).findAny(); - return plat.get().getKey(); + public static Integer getPlatId(String plattoken) { // + Optional plat = mPlats.stream().filter(x -> x.getPlattoken().equals(plattoken)).findAny(); + return plat.get().getPlatid(); } public static String lastAlias; - public static String nextAlias() { + public String nextAlias() { if (lastAlias == null) { - String aql = TplKit.use(true).getTpl("metaTable.lastAlias"); - lastAlias = MetaTable.dao.findFirst(aql, String.class); + //String aql = TplKit.use(true).getTpl("metaTable.lastAlias"); + lastAlias = findColumn("mable.lastAlias", Kv.of(), String.class); + // lastAlias = MetaTable.dao.findFirst(aql, String.class); // TODO.... } return lastAlias = next(lastAlias, ""); } @@ -594,15 +654,72 @@ public class MetaKit extends AbstractService { public static List tableExist(String[] tableArr, String token) { List _tableArr = asList(tableArr); - List hv = metaTables.stream() - .filter(x -> _tableArr.contains(x.getName()) && x.getSysPlatId().equals(getPlatId(token))) - .map(MetaTable::getName) + List hv = mTables.stream() + .filter(x -> _tableArr.contains(x.getTablename()) && x.getPlatid().equals(getPlatId(token))) + .map(MTable::getTablename) .collect(Collectors.toList()); return hv; } // ---------------------- repository ------------------- - public static void save(T... ts) { + public void save(MTable table) { + if (table.getTableid() == null || table.getTableid() == 0) { + metaSource.insert(table); + mTables.add(table); + } else { + metaSource.update(table); + + // 更新缓存 + mTables.stream().filter(x -> x.getTableid().equals(table.getTableid())).forEach(x -> { + x.setCatalog(table.getCatalog()); + x.setComment(table.getComment()); + x.setDbid(table.getDbid()); + x.setItems(table.getItems()); + x.setPlatid(table.getPlatid()); + x.setStatus(table.getStatus()); + x.setTablename(table.getTablename()); + x.setAlias(table.getAlias()); + }); + } + + } + + public void save(MService mservice) { + if (mservice.getServid() == 0) { + metaSource.insert(mservice); + metaServices.add(mservice); + } else { + metaSource.update(mservice); + + metaServices.stream().filter(x -> x.getServid() == mservice.getServid()).forEach(x -> { + x.setComment(mservice.getComment()); + x.setEdits(mservice.getEdits()); + x.setDetails(mservice.getDetails()); + x.setExports(mservice.getExports()); + x.setFilters(mservice.getFilters()); + x.setName(mservice.getName()); + x.setPlatid(mservice.getPlatid()); + x.setShows(mservice.getShows()); + x.setTablealias(mservice.getTablealias()); + }); + } + } + + public void save(MLink link) { + if (link.getLinkid() == 0) { + metaSource.insert(link); + metaLinks.add(link); + } else { + metaSource.update(link); + + metaLinks.stream().filter(x -> x.getLinkid() == link.getLinkid()).forEach(x -> { + x.setLinks(link.getLinks()); + x.setTables(link.getTables()); + }); + } + } + + /*public static void save(T... ts) { if (ts == null || ts.length == 0) return; for (T t : ts) { @@ -619,21 +736,21 @@ public class MetaKit extends AbstractService { t.save(); } else { - if (t instanceof MetaLink) { + *//*if (t instanceof MLink) { //避免删除属性无效 - if (((MetaLink) t).getLink() != null && ((MetaLink) t).getLink().size() > 0) { + if (((MLink) t).getLink() != null && ((MLink) t).getLink().size() > 0) { t.find(String.format("UPDATE '%s' WITH { link:null } IN MetaLink", t.getKey()), Map.class); } - } + }*//* t.update(); } } reload(ts[0].getClass()); - } + }*/ - public static T findFirst(T t) { + /*public static T findFirst(T t) { Objects.nonNull(t); List list = asList(); @@ -654,5 +771,13 @@ public class MetaKit extends AbstractService { }).findAny(); return (T) any.orElse(null); + }*/ + + + protected static TplKit tplKit = TplKit.use(true); + + protected T findColumn(String tpl, Map params, Class type) { + String sql = tplKit.getTpl(tpl, params); + return ((DataJdbcSource) metaSource).nativeQueryOne(type, sql); } } diff --git a/src/main/java/net/tccn/base/MetaListenter.java b/src/main/java/net/tccn/base/MetaListenter.java index 7881255..4c9f1c1 100644 --- a/src/main/java/net/tccn/base/MetaListenter.java +++ b/src/main/java/net/tccn/base/MetaListenter.java @@ -38,9 +38,9 @@ public class MetaListenter implements ApplicationListener { @Override public void preShutdown(Application application) { - if ("db".equals(dcate)) { + /*if ("db".equals(dcate)) { MetaKit.cacheSave(); - } + }*/ } } diff --git a/src/main/java/net/tccn/base/dbq/DbExecutors.java b/src/main/java/net/tccn/base/dbq/DbExecutors.java index cb27cad..561fac5 100644 --- a/src/main/java/net/tccn/base/dbq/DbExecutors.java +++ b/src/main/java/net/tccn/base/dbq/DbExecutors.java @@ -6,8 +6,8 @@ import net.tccn.base.PageBean; import net.tccn.base.dbq.fbean.FBean; import net.tccn.base.dbq.jdbc.api.DbKit; import net.tccn.base.dbq.parser.ParseMysql; -import net.tccn.meta.MetaService; -import net.tccn.meta.MetaTable; +import net.tccn.meta.MService; +import net.tccn.meta.MTable; import java.util.List; import java.util.Map; @@ -25,9 +25,9 @@ public class DbExecutors { String[] sqls = PARSER.parseList(fBean); //当前的业务 => 获取主表 信息 => 数据源信息 => 数据源对象 => 创建数据工具对象 => 查询数据 - MetaService metaService = MetaKit.getMetaService(fBean.getName(), fBean.getPlatToken()); - MetaTable mainTable = MetaKit.getMetaTableByAlias(metaService.getTable()); - DbKit dbKit = MetaKit.getDbKit(mainTable.getDbPlatId(), mainTable.getCatalog()); + MService metaService = MetaKit.getMetaService(fBean.getName(), fBean.getPlattoken()); + MTable mainTable = MetaKit.getMetaTableByAlias(metaService.getTablealias()); + DbKit dbKit = MetaKit.getDbKit(mainTable.getDbid(), mainTable.getCatalog()); System.out.printf("----------------%n countSql:%s%n findSql:%s%n----------------%n", sqls[0], sqls[1]); CompletableFuture countFuture = CompletableFuture.supplyAsync(() -> dbKit.findColumn(sqls[0], int.class)); @@ -37,7 +37,7 @@ public class DbExecutors { Integer total = countFuture.get(); rows.forEach(m -> { - m.forEach((k,v) -> { + m.forEach((k, v) -> { /*if ("[B".equals(v.getClass().getName())) { try { //System.out.println(k + " : " + new String((byte[]) v, "UTF-8")); @@ -47,7 +47,7 @@ public class DbExecutors { } }*/ // 避免前端 解析丢失精度 - if (v instanceof Long && (Long)v > 9007199254740991L) { + if (v instanceof Long && (Long) v > 9007199254740991L) { m.put(k, Kv.toAs(v, String.class)); } }); @@ -55,18 +55,18 @@ public class DbExecutors { return PageBean.by(rows, total); } - public static void del(String name, Map data, String token) { - MetaService metaService = MetaKit.getMetaService(name, token); - MetaTable mainTable = MetaKit.getMetaTableByAlias(metaService.getTable()); - DbKit dbKit = MetaKit.getDbKit(mainTable.getDbPlatId(), mainTable.getCatalog()); + /*public static void del(String name, Map data, String token) { + MService metaService = MetaKit.getMetaService(name, token); + MTable mainTable = MetaKit.getMetaTableByAlias(metaService.getTablealias()); + DbKit dbKit = MetaKit.getDbKit(mainTable.getDbid(), mainTable.getCatalog()); String delSql = PARSER.parseDel(name, data, token); dbKit.exetute(delSql); - } + }*/ public static void save(String name, Map data, String token) { - MetaTable mainTable = MetaKit.getMainTable(name, token); - DbKit dbKit = MetaKit.getDbKit(mainTable.getDbPlatId(), mainTable.getCatalog()); + MTable mainTable = MetaKit.getMainTable(name, token); + DbKit dbKit = MetaKit.getDbKit(mainTable.getDbid(), mainTable.getCatalog()); String sql = PARSER.parseSave(name, data, token); dbKit.exetute(sql); diff --git a/src/main/java/net/tccn/base/dbq/fbean/FBean.java b/src/main/java/net/tccn/base/dbq/fbean/FBean.java index e4ef834..f313da6 100644 --- a/src/main/java/net/tccn/base/dbq/fbean/FBean.java +++ b/src/main/java/net/tccn/base/dbq/fbean/FBean.java @@ -13,8 +13,8 @@ import java.util.List; @Setter public class FBean { - private String platToken; // 平台token - private String name; // 业务名称 + private String plattoken; // 平台token + private String name; // 业务名称 private String type; // 操作类型 list：列表，export：导出 private List filters;//[{f:xx, v: v, type:t}] -- t, diff --git a/src/main/java/net/tccn/base/dbq/fbean/Filter.java b/src/main/java/net/tccn/base/dbq/fbean/Filter.java index 54b8bf6..7a514a4 100644 --- a/src/main/java/net/tccn/base/dbq/fbean/Filter.java +++ b/src/main/java/net/tccn/base/dbq/fbean/Filter.java @@ -57,7 +57,7 @@ public class Filter { filters.forEach(x -> { buf.append(" and d.").append(x.col).append(" " + (x.type == null ? "==" : x.type) + " "); //处理数值型字段查询 - if ("sysPlatId".equals(x.col) || "platId".equals(x.col) || "status".equals(x.col) || false) { + if ("platid".equals(x.col) || "platId".equals(x.col) || "status".equals(x.col)) { buf.append(x.value); } else { buf.append("'" + x.value + "'"); diff --git a/src/main/java/net/tccn/base/dbq/jdbc/api/DbAccount.java b/src/main/java/net/tccn/base/dbq/jdbc/api/DbAccount.java index 935cc52..8bfb02a 100644 --- a/src/main/java/net/tccn/base/dbq/jdbc/api/DbAccount.java +++ b/src/main/java/net/tccn/base/dbq/jdbc/api/DbAccount.java @@ -2,34 +2,51 @@ package net.tccn.base.dbq.jdbc.api; import lombok.Getter; import lombok.Setter; -import net.tccn.base.arango.Doc; +import org.redkale.annotation.Comment; import org.redkale.convert.ConvertColumn; +import org.redkale.persistence.Column; +import org.redkale.persistence.Entity; +import org.redkale.persistence.Id; -import javax.persistence.Table; import java.util.List; -/** - * 数据库平台 - * - * @author: liangxianyou at 2018/11/14 12:58. - */ @Getter @Setter -@Table(name = "MetaDb", catalog = "db_meta") -public class DbAccount extends Doc { - public static DbAccount dao = dao(DbAccount.class); +@Entity(comment = "[数据库平台表]") +public class DbAccount { + @Id + @Comment("[数据库ID]") + private int dbid; - private String name; //名称 - private String cate; //类型 mysql|ArangoDb - private String remark; //备注 - private String url; //数据库连接地址 - private String user; //账号 - private String pwd; //密码 - private List catalogs; //库 - private Integer status;//状态 1启用， 0 未启用 + @Column(length = 64, comment = "[名称]") + private String dbname; - //---------------------------- - private boolean tmp; // TODO: 处理临时连接对象 + @Comment("[类型（mysql|ArangoDb）]") + @Column(length = 32, comment = "[类型]") + private String cate; + + @Comment("[备注]") + @Column(comment = "[备注]") + private String remark; + + @Column(length = 128, comment = "[数据库连接地址]") + private String url; + + @Column(length = 32, comment = "[账号]") + private String user; + + @Column(length = 64, comment = "[密码]") + private String pwd; + + // 将catalogs作为JSON字符串存储，但此处为了方便解析，将其转换为List + @Column(length = 255, comment = "[库]（JSON格式存储多个库名）") + private List catalogs; + + @Column(comment = "[状态] 1启用，0未启用") + private short status; + + @Column(updatable = false, comment = "[创建时间]") + private long createtime; public String accountKey() { int start = url.indexOf("//") + 2; @@ -46,4 +63,5 @@ public class DbAccount extends Doc { public String getPwd() { return pwd; } + } diff --git a/src/main/java/net/tccn/base/dbq/jdbc/api/DbKit.java b/src/main/java/net/tccn/base/dbq/jdbc/api/DbKit.java index 8ded77b..951deca 100644 --- a/src/main/java/net/tccn/base/dbq/jdbc/api/DbKit.java +++ b/src/main/java/net/tccn/base/dbq/jdbc/api/DbKit.java @@ -33,7 +33,7 @@ public class DbKit implements DbSource { try { if (Utils.isEmpty(dbAccount.getPwd())) { - DbAccount account = MetaKit.getDbPlat(dbAccount.getKey()); + DbAccount account = MetaKit.getDbPlat(dbAccount.getDbid()); dbAccount.setPwd(account.getPwd()); } @@ -43,7 +43,8 @@ public class DbKit implements DbSource { this.dbSource = dbSource; } catch (Exception e) { - throw new IllegalArgumentException(String.format("创建DbKit失败：数据库类型[cate:%s]未知", dbAccount.getCate())); + e.printStackTrace(); + // throw new IllegalArgumentException(String.format("创建DbKit失败：数据库类型[cate:%s]未知", dbAccount.getCate())); } } diff --git a/src/main/java/net/tccn/base/dbq/parser/ParseMysql.java b/src/main/java/net/tccn/base/dbq/parser/ParseMysql.java index f5149f2..7ea6cc3 100644 --- a/src/main/java/net/tccn/base/dbq/parser/ParseMysql.java +++ b/src/main/java/net/tccn/base/dbq/parser/ParseMysql.java @@ -1,10 +1,13 @@ package net.tccn.base.dbq.parser; -import net.tccn.base.*; +import net.tccn.base.CfgException; +import net.tccn.base.Kv; +import net.tccn.base.MetaKit; +import net.tccn.base.Utils; import net.tccn.base.dbq.fbean.*; -import net.tccn.meta.MetaLink; -import net.tccn.meta.MetaService; -import net.tccn.meta.MetaTable; +import net.tccn.meta.MLink; +import net.tccn.meta.MService; +import net.tccn.meta.MTable; import java.util.List; import java.util.Map; @@ -19,12 +22,12 @@ import java.util.stream.Collectors; */ public class ParseMysql implements Parser { - Predicate> sameDbFun = (kv) -> { - String dbPlatId = null; - for (MetaTable metaTable : kv.values()) { - if (dbPlatId == null) { - dbPlatId = metaTable.getDbPlatId(); - } else if (!dbPlatId.equals(metaTable.getDbPlatId())) { + Predicate> sameDbFun = (kv) -> { + int dbid = 0; + for (MTable metaTable : kv.values()) { + if (dbid == 0) { + dbid = metaTable.getDbid(); + } else if (dbid != metaTable.getDbid()) { return false; } } @@ -38,16 +41,16 @@ public class ParseMysql implements Parser { */ @Override public String[] parseList(FBean fBean) { - MetaService metaService = MetaKit.getMetaService(fBean.getName(), fBean.getPlatToken()); + MService metaService = MetaKit.getMetaService(fBean.getName(), fBean.getPlattoken()); - Kv tables = MetaKit.getMetaTables(metaService, false);//所有的关联表信息 - MetaTable metaTable = tables.get(metaService.getTable());//基础元数据 + Kv tables = MetaKit.getMTables(metaService, false);//所有的关联表信息 + MTable metaTable = tables.get(metaService.getTablealias());//基础元数据 List> shows = metaService.getShows();//查询的属性-列表 List> exports = metaService.getExports();//查询的属性-导出 List _filters = fBean.getFilters().stream().map(Filter::getCol).collect(Collectors.toList()); - List links = MetaKit.getMetaLinks( - metaService.getTable(), + List links = MetaKit.getMetaLinks( + metaService.getTablealias(), shows.stream().map(x -> x.get("col")).collect(Collectors.toList()), _filters ); @@ -75,8 +78,7 @@ public class ParseMysql implements Parser { bufSelect.append(x.get("col")).append(" as ").append("'").append(x.get("col")).append("',"); }); bufSelect.deleteCharAt(bufSelect.length() - 1); - } - else if ("list".equals(fBean.getType()) && !Utils.isEmpty(shows)) { + } else if ("list".equals(fBean.getType()) && !Utils.isEmpty(shows)) { shows.forEach(x -> { bufSelect.append(x.get("col")).append(" as ").append("'").append(x.get("col")).append("',"); }); @@ -87,15 +89,15 @@ public class ParseMysql implements Parser { //from StringBuilder bufFrom = new StringBuilder(); - bufFrom.append(" from `").append(metaTable.getCatalog()).append("`.`").append(metaTable.getName()).append("` `").append(metaTable.getAlias()).append("`"); + bufFrom.append(" from `").append(metaTable.getCatalog()).append("`.`").append(metaTable.getTablename()).append("` `").append(metaTable.getAlias()).append("`"); //left join if (!Utils.isEmpty(links)) { links.forEach(x -> { - MetaTable rightTable = tables.get(metaTable.getAlias().equals(x.getTables()[0]) ? x.getTables()[1] : x.getTables()[0]); + MTable rightTable = tables.get(metaTable.getAlias().equals(x.getTables()[0]) ? x.getTables()[1] : x.getTables()[0]); if (rightTable != null) { - bufFrom.append(" left join ").append(rightTable.getCatalog()).append(".").append(rightTable.getName()).append(" `").append(rightTable.getAlias()).append("` on "); + bufFrom.append(" left join ").append(rightTable.getCatalog()).append(".").append(rightTable.getTablename()).append(" `").append(rightTable.getAlias()).append("` on "); int tag = bufFrom.length(); - x.getLink().forEach((k, v) -> { + x.getLinks().forEach((k, v) -> { if (bufFrom.length() > tag) { bufFrom.append(" and "); } @@ -129,14 +131,14 @@ public class ParseMysql implements Parser { * @param token * @return */ - public String parseDel(String name, Map data, String token) { - MetaService metaService = MetaKit.getMetaService(name, token); + /*public String parseDel(String name, Map data, String token) { + MService metaService = MetaKit.getMetaService(name, token); Map dels = metaService.getDels(); - MetaTable mainTable = MetaKit.getMetaTableByAlias(metaService.getTable()); + MTable mainTable = MetaKit.getMetaTableByAlias(metaService.getTable()); String sql = ""; if ("UP_FIELD".equalsIgnoreCase(dels.get("cate"))) { - data.put("table", mainTable.getName()); + data.put("table", mainTable.getTablename()); sql = TplKit.parseTpl("update #(table) set status=9 where id=#(id)", data); } else if ("SQL".equalsIgnoreCase(dels.get("cate"))) { sql = TplKit.parseTpl(dels.get("sql"), data); @@ -145,7 +147,7 @@ public class ParseMysql implements Parser { } return sql; - } + }*/ /** * 保存数据解析逻辑： @@ -157,7 +159,7 @@ public class ParseMysql implements Parser { * @return sql 待执行的sql语句 */ public String parseSave(String serviceName, Map data, String token) { - MetaTable mainTable = MetaKit.getMainTable(serviceName, token); + MTable mainTable = MetaKit.getMainTable(serviceName, token); String alias = mainTable.getAlias(); String[] pks = mainTable.pk(); @@ -170,7 +172,7 @@ public class ParseMysql implements Parser { x.startsWith(alias + ".") || !Utils.isEmpty(data.get(alias + "." + x)) ).collect(Collectors.toList()); if (pks.length == 0) { - throw new CfgException("保存数据失败，检查业务主表[%s-%S]主键配置", mainTable.getName(), mainTable.getComment()); + throw new CfgException("保存数据失败，检查业务主表[%s-%S]主键配置", mainTable.getTablename(), mainTable.getComment()); } else if (keys.size() == 0) { throw new CfgException("保存数据失败,提交数据不能改空"); } @@ -192,10 +194,8 @@ public class ParseMysql implements Parser { vs.deleteCharAt(vs.length() - 1); } - return String.format(sqlTpl, mainTable.getName(), ks, vs); - } - - else { //修改 + return String.format(sqlTpl, mainTable.getTablename(), ks, vs); + } else { //修改 String sqlTpl = "update `%s` set %s where `%s` = '%s';"; // para: table、 kvs、 pk、 pv StringBuilder kvs = new StringBuilder(); // `k1`='v1',`k2`='v2', ... String pk = pks[0]; @@ -208,7 +208,7 @@ public class ParseMysql implements Parser { kvs.deleteCharAt(kvs.length() - 1); } - return String.format(sqlTpl, mainTable.getName(), kvs, pk, pv); + return String.format(sqlTpl, mainTable.getTablename(), kvs, pk, pv); } } } diff --git a/src/main/java/net/tccn/base/dbq/qtask/DbTask.java b/src/main/java/net/tccn/base/dbq/qtask/DbTask.java index 4664991..019d8f9 100644 --- a/src/main/java/net/tccn/base/dbq/qtask/DbTask.java +++ b/src/main/java/net/tccn/base/dbq/qtask/DbTask.java @@ -24,7 +24,7 @@ public class DbTask extends Doc { private String sql; //SQL private String para; //默认查询参数 private String cate; //任务类型 find|update - private Integer sysPlatId; //数据平台id + private Integer platid; //数据平台id private Integer platId; //数据平台id private String catalog; //数据库名 private Integer status; //状态 1启用|0未启用|-1删除 diff --git a/src/main/java/net/tccn/dict/Dict.java b/src/main/java/net/tccn/dict/Dict.java index b4728de..c89c4a5 100644 --- a/src/main/java/net/tccn/dict/Dict.java +++ b/src/main/java/net/tccn/dict/Dict.java @@ -2,24 +2,24 @@ package net.tccn.dict; import lombok.Getter; import lombok.Setter; -import net.tccn.base.arango.Doc; +import net.tccn.base.BaseEntity; import javax.persistence.Table; -import java.io.Serializable; /** * @author: liangxianyou */ @Getter @Setter -@Table(name = "Dict", catalog = "db_meta") -public class Dict extends Doc implements Serializable { - public static Dict dao = Doc.dao(Dict.class); +@Table(name = "Dict") +public class Dict extends BaseEntity { + + private int dictid; private String type; // 字典类型 private String value; // 字典值 private String label; // 中文名 private String pValue; // 父级字典值 private String code; // - private String sysPlatId; // 系统平台id + private Integer platid; // 系统平台id } diff --git a/src/main/java/net/tccn/dict/DictKit.java b/src/main/java/net/tccn/dict/DictKit.java index bb1e132..e4b87a3 100644 --- a/src/main/java/net/tccn/dict/DictKit.java +++ b/src/main/java/net/tccn/dict/DictKit.java @@ -12,25 +12,25 @@ import java.util.*; */ public final class DictKit { private static Map kits = new HashMap<>(); - private String platToken; + private String plattoken; private Map> dicts; private DictKit() { } - public synchronized static DictKit use(String platToken) { - DictKit dictKit = kits.get(platToken); + public synchronized static DictKit use(String plattoken) { + DictKit dictKit = kits.get(plattoken); if (dictKit == null) { dictKit = new DictKit(); - dictKit.platToken = platToken; - dictKit.dicts = MetaKit.getDictData(platToken); - kits.put(platToken, dictKit); + dictKit.plattoken = plattoken; + dictKit.dicts = MetaKit.getDictData(plattoken); + kits.put(plattoken, dictKit); } return dictKit; } public synchronized void reload() { - this.dicts = MetaKit.getDictData(platToken); + this.dicts = MetaKit.getDictData(plattoken); } // 初始化字典，不同模式下，数据来源不同 @@ -55,8 +55,8 @@ public final class DictKit { ArangoDB arangoDb = new ArangoDB.Builder().host(host, port).user(user).password(passwd).build(); ArangoDatabase dbDemo = arangoDb.db("db_demo"); - String platId = "28121369";//MetaKit.getPlatId(platToken); - String dictAQL = String.format("for d in Dict filter d.sysPlatId=='%s'return d", platId); + String platId = "28121369";//MetaKit.getPlatId(plattoken); + String dictAQL = String.format("for d in Dict filter d.platid=='%s'return d", platId); List list = (List) dbDemo.query(dictAQL, Map.class).asListRemaining(); String[] fields = {"label", "value", "pValue"}; diff --git a/src/main/java/net/tccn/dict/DictService.java b/src/main/java/net/tccn/dict/DictService.java index d8b5aa4..84b77e0 100644 --- a/src/main/java/net/tccn/dict/DictService.java +++ b/src/main/java/net/tccn/dict/DictService.java @@ -18,7 +18,7 @@ import java.util.Map; public class DictService extends BaseService { @RestMapping(name = "list", comment = "根据type 加载对应的字典列表") - public JBean list(@RestParam(name = "platToken") String token, String type) { + public JBean list(@RestParam(name = "plattoken") String token, String type) { JBean jBean = new JBean(); DictKit dictKit = DictKit.use(token); diff --git a/src/main/java/net/tccn/file/_FileService.java b/src/main/java/net/tccn/file/_FileService.java index ae28e80..f9a38cc 100644 --- a/src/main/java/net/tccn/file/_FileService.java +++ b/src/main/java/net/tccn/file/_FileService.java @@ -2,11 +2,11 @@ package net.tccn.file; import net.tccn.base.*; import net.tccn.base.dbq.table.Field; -import net.tccn.meta.MetaTable; -import net.tccn.plat.MetaPlat; +import net.tccn.meta.MTable; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestParam; import org.redkale.net.http.RestService; +import org.redkale.source.FilterNode; import java.io.File; import java.util.ArrayList; @@ -41,19 +41,19 @@ public class _FileService extends BaseService { }).collect(Collectors.toList()); } - public MetaPlat getSysPlat(String token) { + /*public MetaPlat getSysPlat(String token) { return getT(token, MetaPlat.class, () -> MetaPlat.dao.findFirst(new MetaPlat(token))); - } + }*/ @RestMapping(name = "data", comment = "得到文件数据") - public JBean data(String filePath, @RestParam(name = "platToken") String token) { + public JBean data(String filePath, @RestParam(name = "plattoken") String token) { JBean jBean = new JBean(); //SysPlat sysPlat = getSysPlat(token); File file = new File(webroot, filePath); if (file.exists()) { Map> map = ExcelKit.readExcelAll(file, FIELDS); - Kv data = Kv.of(); + Kv data = Kv.of(); map.forEach((k, v) -> { if (v.size() > 2) { data.put(k.replace(" ", ""), toMetaTable(v)); @@ -67,8 +67,8 @@ public class _FileService extends BaseService { data.forEach((k, v) -> { Kv kv = Kv.of(); res.put(k, - kv.set("name", v.getName()) - .set("hv", hv.contains(v.getName()) ? 1 : 0) + kv.set("name", v.getTablename()) + .set("hv", hv.contains(v.getTablename()) ? 1 : 0) .set("comment", v.getComment()) ); }); @@ -80,11 +80,11 @@ public class _FileService extends BaseService { } @RestMapping(name = "sheet_data", comment = "得到sheet数据") - public JBean sheetData(String filePath, String sheetName, @RestParam(name = "platToken") String token) { + public JBean sheetData(String filePath, String sheetName, @RestParam(name = "plattoken") String token) { JBean jBean = new JBean(); File file = new File(webroot, filePath); List list = ExcelKit.readExcel(file, FIELDS, sheetName); - MetaTable metaTable = toMetaTable(list); + MTable metaTable = toMetaTable(list); jBean.setBody(metaTable); @@ -94,7 +94,7 @@ public class _FileService extends BaseService { @RestMapping(ignore = true, comment = "导入excel数据到metatable") public JBean saveSheet(@RestParam(name = "sheetArr", comment = "sheet名") String[] sheetArr, @RestParam(name = "filePath", comment = "文件路径") String filePath, - @RestParam(name = "platToken") String token) { + @RestParam(name = "plattoken") String token) { JBean jBean = new JBean(); File file = new File(webroot, filePath); @@ -103,31 +103,31 @@ public class _FileService extends BaseService { Set ks = map.keySet(); // 找到需要导入的sheet名，并组装对应的数据 - MetaTable[] metaTables = Stream.of(sheetArr).filter(x -> { + MTable[] metaTables = Stream.of(sheetArr).filter(x -> { if (!ks.contains(x)) return false; - MetaTable bean = new MetaTable(); - bean.setSysPlatId(platId(token)); - bean.setName(x); - return MetaTable.dao.findFirst(bean) == null; + FilterNode node = FilterNode.create("platid", platId(token)).and("tablename", x); + return !metaSource.exists(MTable.class, node); }).map(x -> { - MetaTable metaTable = toMetaTable(map.get(x)); - metaTable.setSysPlatId(platId(token)); - metaTable.setAlias(MetaKit.nextAlias()); + MTable metaTable = toMetaTable(map.get(x)); + metaTable.setPlatid(platId(token)); + metaTable.setAlias(metaKit.nextAlias()); return metaTable; - }).toArray(MetaTable[]::new); + }).toArray(MTable[]::new); - MetaKit.save(metaTables); + for (MTable x : metaTables) { + metaKit.save(x); + } return jBean; } /** * 组装元数据 */ - private MetaTable toMetaTable(List list) { + private MTable toMetaTable(List list) { //Kv col = Kv.of(); - MetaTable metaTable = new MetaTable(); + MTable metaTable = new MTable(); list.remove(1);//list[0] head info Map rowHead = list.remove(0); @@ -135,7 +135,7 @@ public class _FileService extends BaseService { String comment = getComment(rowHead);//list[1] comment, String tableName = getTableName(rowHead); //col.set("name", tableName).set("comment", comment); - metaTable.setName(tableName); + metaTable.setTablename(tableName); metaTable.setComment(comment); //所有字段 diff --git a/src/main/java/net/tccn/meta/MLink.java b/src/main/java/net/tccn/meta/MLink.java new file mode 100644 index 0000000..3b286ff --- /dev/null +++ b/src/main/java/net/tccn/meta/MLink.java @@ -0,0 +1,31 @@ +package net.tccn.meta; + +import lombok.Getter; +import lombok.Setter; +import net.tccn.base.BaseEntity; +import org.redkale.persistence.Column; +import org.redkale.persistence.Entity; +import org.redkale.persistence.Id; +import org.redkale.persistence.Table; + +import java.util.HashMap; +import java.util.Map; + +/** + * Created by liangxianyou at 2018/12/25 16:22. + */ +@Getter +@Setter +@Entity +@Table(name = "mlink", comment = "MLink表") +public class MLink extends BaseEntity { + @Id + @Column(comment = "[主键ID]自增") + private int linkid; // 根据您的说明移除了nonnull，但通常主键不应该允许为空 + + @Column(comment = "[关联的表]存储表别名") + private String[] tables = new String[0]; + + @Column(comment = "[关联关系]") + private Map links = new HashMap<>(); +} diff --git a/src/main/java/net/tccn/meta/MService.java b/src/main/java/net/tccn/meta/MService.java new file mode 100644 index 0000000..d706863 --- /dev/null +++ b/src/main/java/net/tccn/meta/MService.java @@ -0,0 +1,53 @@ +package net.tccn.meta; + +import lombok.Getter; +import lombok.Setter; +import net.tccn.base.BaseEntity; +import org.redkale.persistence.Column; +import org.redkale.persistence.Entity; +import org.redkale.persistence.Id; +import org.redkale.persistence.Table; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * Created by liangxianyou at 2018/12/24 16:15. + */ +@Getter +@Setter +@Entity +@Table(name = "mservice", comment = "MService表") +public class MService extends BaseEntity { + @Id + @Column(comment = "[服务ID]") + private int servid; + + @Column(length = 64, comment = "[业务标识]") + private String name; + + @Column(length = 15, comment = "[主体表别名]") + private String tablealias; + + @Column(length = 64, comment = "[业务中文名]") + private String comment; + + @Column(comment = "[平台id]") + private Integer platid; + + @Column(comment = "[SHOWS]") + private List> shows = new ArrayList<>(); + + @Column(comment = "[EDITS]") + private List edits = new ArrayList<>(); + + @Column(comment = "[DETAILS]") + private List> details = new ArrayList<>(); + + @Column(comment = "[FILTERS]") + private List filters = new ArrayList<>(); + + @Column(comment = "[exports]") + private List> exports = new ArrayList<>(); +} \ No newline at end of file diff --git a/src/main/java/net/tccn/meta/MetaTable.java b/src/main/java/net/tccn/meta/MTable.java similarity index 51% rename from src/main/java/net/tccn/meta/MetaTable.java rename to src/main/java/net/tccn/meta/MTable.java index 6c98492..e95e0c6 100644 --- a/src/main/java/net/tccn/meta/MetaTable.java +++ b/src/main/java/net/tccn/meta/MTable.java @@ -2,11 +2,10 @@ package net.tccn.meta; import lombok.Getter; import lombok.Setter; -import net.tccn.base.arango.Doc; +import net.tccn.base.BaseEntity; import net.tccn.base.dbq.table.Field; +import org.redkale.persistence.*; -import javax.persistence.Table; -import java.io.Serializable; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -18,26 +17,47 @@ import java.util.stream.Collectors; */ @Getter @Setter -@Table(name = "MetaTable", catalog = "db_meta") -public class MetaTable extends Doc implements Serializable { - public static final MetaTable dao = MetaTable.dao(MetaTable.class); +@Entity +@Table(name = "mtable", comment = "TABLE记录表") +@Cacheable(value = true, interval = 60 * 60 * 1000, direct = true) +public class MTable extends BaseEntity { + @Id + @Column(comment = "[表ID]") + private Integer tableid; - private String name; - private String alias; //表别名：全库唯一，程序自动生成 - private String comment; + @Column(length = 64, comment = "[表名称]") + private String tablename; + + @Column(length = 15, unique = true, comment = "[表别名]全库唯一，程序自动生成") + private String alias; + + @Column(comment = "[表字段]") private List items; - private String sysPlatId; //所属系统平台 - private String dbPlatId; //所属数据平台 - private String catalog; //所在database - private Integer status; //状态 0 默认， 9删除 - private Integer hv;//临时 + @Column(length = 64, comment = "[表注释]") + private String comment; + + @Column(comment = "[临时]") + private int hv; + + @Column(comment = "[状态]0 默认， 9删除'") + private int status; + + @Column(comment = "[所属系统平台]") + private Integer platid; + + @Column(comment = "[所属数据平台]") + private Integer dbid; + + @Column(length = 32, comment = "[所在database]") + private String catalog; + // ------------------------------------------------ - public static MetaTable toAs(net.tccn.base.dbq.table.Table table) { + public static MTable toAs(net.tccn.base.dbq.table.Table table) { List fields = table.getColumns().stream().map(Field::toAs).collect(Collectors.toList()); - MetaTable _bean = new MetaTable(); - _bean.setName(table.getName()); + MTable _bean = new MTable(); + _bean.setTablename(table.getName()); _bean.setComment(table.getComment()); _bean.setCatalog(table.getCatalog()); _bean.setItems(fields); diff --git a/src/main/java/net/tccn/meta/MetaLink.java b/src/main/java/net/tccn/meta/MetaLink.java deleted file mode 100644 index c058fba..0000000 --- a/src/main/java/net/tccn/meta/MetaLink.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.tccn.meta; - -import lombok.Getter; -import lombok.Setter; -import net.tccn.base.arango.Doc; - -import javax.persistence.Table; -import java.util.Map; - -/** - * Created by liangxianyou at 2018/12/25 16:22. - */ -@Getter -@Setter -@Table(name = "MetaLink", catalog = "db_meta") -public class MetaLink extends Doc { - public static MetaLink dao = Doc.dao(MetaLink.class); - - private String[] tables; - private Map link; -} diff --git a/src/main/java/net/tccn/meta/MetaService.java b/src/main/java/net/tccn/meta/MetaService.java deleted file mode 100644 index eda8158..0000000 --- a/src/main/java/net/tccn/meta/MetaService.java +++ /dev/null @@ -1,36 +0,0 @@ -package net.tccn.meta; - -import lombok.Getter; -import lombok.Setter; -import net.tccn.base.arango.Doc; - -import javax.persistence.Table; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by liangxianyou at 2018/12/24 16:15. - */ -@Getter -@Setter -@Table(name = "MetaService", catalog = "db_meta") -public class MetaService extends Doc { - public static MetaService dao = Doc.dao(MetaService.class); - - private String name; //业务标识 - private String table; //主体表别名 - private String comment; //业务中文名 - private String sysPlatId; //平台id - - private List> shows = 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, } - private List> exports = new ArrayList<>(); - - //------ - -} diff --git a/src/main/java/net/tccn/meta/MetadataService.java b/src/main/java/net/tccn/meta/MetadataService.java index 7de1fa0..2db8851 100644 --- a/src/main/java/net/tccn/meta/MetadataService.java +++ b/src/main/java/net/tccn/meta/MetadataService.java @@ -2,7 +2,7 @@ package net.tccn.meta; import net.tccn.base.*; import net.tccn.base.dbq.table.Field; -import net.tccn.plat.MetaPlat; +import net.tccn.plat.MPlat; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestParam; import org.redkale.net.http.RestService; @@ -19,20 +19,20 @@ 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) { + public JBean tableList(@RestParam(name = "plattoken") String token, String catalog, Integer dbid, String name) { JBean jBean = new JBean(); - List list = MetaKit.getMetaTables().stream().filter(x + List list = MetaKit.getMTables().stream().filter(x -> (isEmpty(catalog) || catalog.equals(x.getCatalog())) && - (isEmpty(dbPlatId) || dbPlatId.equals(x.getDbPlatId())) && - (isEmpty(name) || x.getName().contains(name)) && - (isEmpty(token) || x.getSysPlatId().equals(platId(token))) && + (isEmpty(dbid) || dbid == (int) x.getDbid()) && + (isEmpty(name) || x.getTablename().contains(name)) && + (isEmpty(token) || x.getPlatid().equals(platId(token))) && (isEmpty(x.getStatus()) || x.getStatus() != 9) - ).map(x -> Kv.of("name", x.getName()) + ).map(x -> Kv.of("tablename", x.getTablename()) .set("comment", x.getComment()) .set("catalog", x.getCatalog()) .set("alias", x.getAlias()) - .set("dbPlatId", x.getDbPlatId()) + .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]); @@ -43,11 +43,11 @@ public class MetadataService extends BaseService { //arango @RestMapping(name = "service_list", comment = "业务列表") - public JBean serviceList(@RestParam(name = "platToken") String token) { + public JBean serviceList(@RestParam(name = "plattoken") String token) { JBean jBean = new JBean(); - List list = MetaKit.getMetaServices().stream() - .filter(x -> platId(token).equals(x.getSysPlatId())) + List list = MetaKit.getMetaServices().stream() + .filter(x -> platId(token).equals(x.getPlatid())) .collect(Collectors.toList()); jBean.setBody(list); @@ -55,10 +55,10 @@ public class MetadataService extends BaseService { //arango } @RestMapping(name = "tableinfo", comment = "table详情") - public JBean tableInfo(@RestParam(name = "platToken") String token, String name, String alias) { + public JBean tableInfo(@RestParam(name = "plattoken") String token, String name, String alias) { JBean jBean = new JBean(); - MetaTable metaTable = null; + MTable metaTable = null; if (!isEmpty(name)) { metaTable = MetaKit.getMetaTable(name, token); } @@ -70,11 +70,11 @@ public class MetadataService extends BaseService { //arango } @RestMapping(name = "service_save", comment = "service信息保存") - public JBean serviceSave(@RestParam(name = "platToken") String token, @RestParam(name = "service") MetaService service) { + public JBean serviceSave(@RestParam(name = "plattoken") String token, @RestParam(name = "service") MService service) { JBean jBean = new JBean(); do { // 标识码非空校验 - if (isEmpty(service.getTable())) { + if (isEmpty(service.getTablealias())) { jBean.set(-1, "请选择业务主表"); break; } @@ -86,29 +86,29 @@ public class MetadataService extends BaseService { //arango } // 标识码重复校验 - MetaService metaService = MetaKit.getMetaService(service.getName(), token); - if (metaService != null && !metaService.getKey().equals(service.getKey())) { + MService metaService = MetaKit.getMetaService(service.getName(), token); + if (metaService != null && metaService.getServid() != service.getServid()) { jBean.set(-1, "业务标识码被占用，修改业务标识码重试"); break; } - if (service.getKey() == null) { - service.setSysPlatId(platId(token)); + if (service.getServid() == 0) { + service.setPlatid(platId(token)); } - MetaKit.save(service); + metaKit.save(service); } while (false); return jBean; } @RestMapping(name = "service_info", comment = "service基本信息") - public JBean serviceInfo(@RestParam(name = "platToken") String token, String name) { - MetaService metaService = MetaKit.getMetaService(name, token); - return JBean.by(0, "", metaService); + public JBean serviceInfo(@RestParam(name = "plattoken") String token, String name) { + MService mService = MetaKit.getMetaService(name, token); + return JBean.by(0, "", mService); } @RestMapping(name = "service_detail", comment = "service详情") - public JBean serviceDetail(@RestParam(name = "platToken") String token, String name) { - MetaService metaService = MetaKit.getMetaService(name, token); + public JBean serviceDetail(@RestParam(name = "plattoken") String token, String name) { + MService metaService = MetaKit.getMetaService(name, token); Kv detail = MetaKit.buildeDetail(metaService); return JBean.by(0, "", detail); @@ -116,122 +116,122 @@ public class MetadataService extends BaseService { //arango //修改item的排序 @RestMapping(name = "itemsort", comment = "字段排序") - public JBean itemSortSave(String alias, String[] items, @RestParam(name = "platToken") String token) { + public JBean itemSortSave(String alias, String[] items, @RestParam(name = "plattoken") String token) { - MetaTable metaTable = MetaKit.getMetaTableByAlias(alias); + MTable metaTable = MetaKit.getMetaTableByAlias(alias); MetaKit.sortItem.apply(metaTable, items); - MetaKit.save(metaTable); + metaKit.save(metaTable); return JBean.OK; } @RestMapping(name = "itemupdate", comment = "字段修改") - public JBean itemUpdate(String alias, List items, @RestParam(name = "platToken") String token) { - MetaTable metaTable = MetaKit.getMetaTableByAlias(alias); + public JBean itemUpdate(String alias, List items, @RestParam(name = "plattoken") String token) { + MTable metaTable = MetaKit.getMetaTableByAlias(alias); MetaKit.itemUpdate.apply(metaTable, items); - MetaKit.save(metaTable); + metaKit.save(metaTable); return JBean.OK; } @RestMapping(name = "showsort", comment = "展示字段修改") - public JBean showSort(String name, List> shows, @RestParam(name = "platToken") String token) { + public JBean showSort(String name, List> shows, @RestParam(name = "plattoken") String token) { if (Utils.isEmpty(shows)) return null; - MetaService metaService = MetaKit.getMetaService(name, token); + MService metaService = MetaKit.getMetaService(name, token); metaService.setShows(shows); - MetaKit.save(metaService); + metaKit.save(metaService); return JBean.OK; } @RestMapping(name = "exportsave", comment = "导出配置保存") - public JBean exportSave(String name, List> exports, @RestParam(name = "platToken") String token) { + public JBean exportSave(String name, List> exports, @RestParam(name = "plattoken") String token) { if (Utils.isEmpty(exports)) return null; - MetaService metaService = MetaKit.getMetaService(name, token); + MService metaService = MetaKit.getMetaService(name, token); metaService.setExports(exports); - MetaKit.save(metaService); + metaKit.save(metaService); return JBean.OK; } @RestMapping(name = "detailsave", comment = "详情配置保存") - public JBean detailSave(String name, List> details, @RestParam(name = "platToken") String token) { + public JBean detailSave(String name, List> details, @RestParam(name = "plattoken") String token) { if (Utils.isEmpty(details)) return null; - MetaService metaService = MetaKit.getMetaService(name, token); + MService metaService = MetaKit.getMetaService(name, token); metaService.setDetails(details); - MetaKit.save(metaService); + metaKit.save(metaService); return JBean.OK; } @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 (Utils.isEmpty(edits)) return null; - MetaService metaService = MetaKit.getMetaService(name, token); + MService metaService = MetaKit.getMetaService(name, token); metaService.setEdits(edits); - MetaKit.save(metaService); + metaKit.save(metaService); return JBean.OK; } - @RestMapping(name = "delsave", comment = "删除配置保存") - public JBean delSave(String name, Map dels, @RestParam(name = "platToken") String token) { + /*@RestMapping(name = "delsave", comment = "删除配置保存") + public JBean delSave(String name, Map dels, @RestParam(name = "plattoken") String token) { if (Utils.isEmpty(dels)) return null; - MetaService metaService = MetaKit.getMetaService(name, token); + MService metaService = MetaKit.getMetaService(name, token); metaService.setDels(dels); MetaKit.save(metaService); return JBean.OK; - } + }*/ @RestMapping(name = "importsort", comment = "导入字段保存") - public JBean importSort(String serviceKey, List items, @RestParam(name = "platToken") String token) { + public JBean importSort(String serviceKey, List items, @RestParam(name = "plattoken") String token) { if (Utils.isEmpty(items)) return null; - MetaTable metaTable = MetaKit.getMetaTable(serviceKey, token); + MTable metaTable = MetaKit.getMetaTable(serviceKey, token); //fixme: metaTable.setImports(items); - MetaKit.save(metaTable); + metaKit.save(metaTable); return JBean.OK; } @RestMapping(name = "dbplatupdate", comment = "数据平台修改") - public JBean dbPlatUpdate(MetaTable metaTable, @RestParam(name = "platToken") String token) { + public JBean dbPlatUpdate(MTable metaTable, @RestParam(name = "plattoken") String token) { - MetaTable _metaTable = MetaKit.getMetaTableByKey(metaTable.getKey()); - _metaTable.setName(metaTable.getName()); + MTable _metaTable = MetaKit.getMetaTableByKey(metaTable.getTableid()); + _metaTable.setTablename(metaTable.getTablename()); _metaTable.setComment(metaTable.getComment()); _metaTable.setCatalog(metaTable.getCatalog()); - _metaTable.setDbPlatId(metaTable.getDbPlatId()); + _metaTable.setDbid(metaTable.getDbid()); _metaTable.setCatalog(metaTable.getCatalog()); - MetaKit.save(_metaTable); + metaKit.save(_metaTable); return JBean.OK; } @RestMapping(name = "filter_update", comment = "查询配置修改") - public JBean filterUpdate(String name, List filters, @RestParam(name = "platToken") String token) { - MetaService metaService = MetaKit.getMetaService(name, token); + public JBean filterUpdate(String name, List filters, @RestParam(name = "plattoken") String token) { + MService metaService = MetaKit.getMetaService(name, token); metaService.setFilters(filters); - MetaKit.save(metaService); + metaKit.save(metaService); return JBean.OK; } @RestMapping(name = "table_link_list", comment = "实体表，包含link信息的列表,(metalink 管理页面使用)") - public JBean tableLinkList(@RestParam(name = "platToken") String token) { + public JBean tableLinkList(@RestParam(name = "plattoken") String token) { JBean jBean = new JBean(); - List list = MetaKit.getMetaTables().stream() - .filter(x -> (isEmpty(token) || x.getSysPlatId().equals(platId(token))) - && (x.getStatus() == null || x.getStatus() != 9) + List list = MetaKit.getMTables().stream() + .filter(x -> (isEmpty(token) || x.getPlatid().equals(platId(token))) + && (x.getStatus() != 9) ).map(x -> { - Kv kv = Kv.of("name", x.getName()) + Kv kv = Kv.of("tablename", x.getTablename()) .set("comment", x.getComment()) .set("alias", x.getAlias()) .set("linkCount", 0); @@ -257,12 +257,12 @@ public class MetadataService extends BaseService { //arango List list = MetaKit.getMetaLinks().stream().filter(x -> x.getTables()[0].equals(alias) || x.getTables()[1].equals(alias) ).map(x -> { - MetaTable linkTable = MetaKit.getMetaTableByAlias(x.getTables()[0].equals(alias) ? x.getTables()[1] : x.getTables()[0]); - Kv kv = Kv.of("name", linkTable.getName()) + MTable linkTable = MetaKit.getMetaTableByAlias(x.getTables()[0].equals(alias) ? x.getTables()[1] : x.getTables()[0]); + Kv kv = Kv.of("tablename", linkTable.getTablename()) .set("alias", linkTable.getAlias()) .set("comment", linkTable.getComment()) - .set("linkSize", x.getLink().size()) - .set("link", x.getLink()); + .set("linkSize", x.getLinks().size()) + .set("links", x.getLinks()); return kv; }).collect(Collectors.toList()); @@ -273,7 +273,7 @@ public class MetadataService extends BaseService { //arango public JBean linkList(String alias) { JBean jBean = new JBean(); - List links = MetaKit.getMetaLinks(); + List links = MetaKit.getMetaLinks(); if (!isEmpty(alias)) { links = Utils.filter(links, x -> x.getTables()[0].equals(alias) || x.getTables()[1].equals(alias)); @@ -283,8 +283,8 @@ public class MetadataService extends BaseService { //arango } @RestMapping(name = "link_save", comment = "实体关系列表") - public JBean linkSave(MetaLink link, @RestParam(name = "platToken") String token) { - MetaKit.save(link); + public JBean linkSave(MLink link, @RestParam(name = "plattoken") String token) { + metaKit.save(link); return JBean.OK; } @@ -292,7 +292,7 @@ public class MetadataService extends BaseService { //arango @RestMapping(name = "plat_list", comment = "平台列表") public JBean platList() { JBean jBean = new JBean(); - List plats = MetaKit.getSysPlats(); + List plats = MetaKit.getMPlats(); return jBean.setBody(plats); } @@ -306,7 +306,7 @@ public class MetadataService extends BaseService { //arango // ------------------------------------ 对外服务 -------------------------------------- @RestMapping(name = "cfg", auth = false, comment = " 功能配置") - public JBean cfg(String name, @RestParam(name = "platToken") String token) { + public JBean cfg(String name, @RestParam(name = "plattoken") String token) { JBean jBean = new JBean(); Map cfg = MetaKit.cfg(name, token); diff --git a/src/main/java/net/tccn/open/DataService.java b/src/main/java/net/tccn/open/DataService.java index 9d0d0f3..8dd38ca 100644 --- a/src/main/java/net/tccn/open/DataService.java +++ b/src/main/java/net/tccn/open/DataService.java @@ -1,10 +1,10 @@ package net.tccn.open; import net.tccn.base.*; +import net.tccn.base.dbq.DbExecutors; import net.tccn.base.dbq.fbean.FBean; -import net.tccn.base.dbq.*; import net.tccn.dict.DictKit; -import net.tccn.meta.MetaService; +import net.tccn.meta.MService; import org.redkale.net.http.HttpScope; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestParam; @@ -23,10 +23,10 @@ import java.util.concurrent.ExecutionException; public class DataService extends BaseService { @RestMapping(name = "list", auth = false, comment = "数据分页列表") - public JBean findList(FBean fBean, @RestParam(name = "platToken") String token) { + public JBean findList(FBean fBean, @RestParam(name = "plattoken") String token) { JBean jBean = new JBean(); try { - fBean.setPlatToken(token); + fBean.setPlattoken(token); fBean.setType("list"); PageBean page = DbExecutors.findPage(fBean); jBean.setBody(page); @@ -38,7 +38,7 @@ public class DataService extends BaseService { } @RestMapping(name = "save", comment = "数据保存") - public JBean save(String name, Map data, @RestParam(name = "platToken") String token) { + public JBean save(String name, Map data, @RestParam(name = "plattoken") String token) { JBean jBean = new JBean(); try { DbExecutors.save(name, data, token); @@ -50,9 +50,9 @@ public class DataService extends BaseService { } @RestMapping(name = "export", auth = false, comment = "数据导出excel") - public HttpScope export(FBean fBean, String fileName, @RestParam(name = "platToken") String token) { + public HttpScope export(FBean fBean, String fileName, @RestParam(name = "plattoken") String token) { try { - fBean.setPlatToken(token); + fBean.setPlattoken(token); fBean.setType("export"); PageBean page = DbExecutors.findPage(fBean); Kv heads = MetaKit.cfgExport(fBean.getName(), token); @@ -64,7 +64,7 @@ public class DataService extends BaseService { List data = page.getRows(); //dataDeal - MetaService metaService = MetaKit.getMetaService(fBean.getName(), token); + MService metaService = MetaKit.getMetaService(fBean.getName(), token); List> exports = metaService.getExports(); DictKit dictKit = DictKit.use(token); //字典映射 、日期转换 、时间转换 @@ -107,8 +107,8 @@ public class DataService extends BaseService { return HttpScope.refer("excel"); } - @RestMapping(name = "del", auth = false, comment = "数据删除") - public JBean del(String name, Map data, @RestParam(name = "platToken") String token) { + /*@RestMapping(name = "del", auth = false, comment = "数据删除") + public JBean del(String name, Map data, @RestParam(name = "plattoken") String token) { JBean jBean = new JBean(); try { DbExecutors.del(name, data, token); @@ -116,5 +116,5 @@ public class DataService extends BaseService { jBean.set(-1, "删除数据失败!"); } return jBean; - } + }*/ } diff --git a/src/main/java/net/tccn/plat/MPlat.java b/src/main/java/net/tccn/plat/MPlat.java new file mode 100644 index 0000000..6b37491 --- /dev/null +++ b/src/main/java/net/tccn/plat/MPlat.java @@ -0,0 +1,31 @@ +package net.tccn.plat; + +import lombok.Getter; +import lombok.Setter; +import net.tccn.base.BaseEntity; +import org.redkale.annotation.Comment; +import org.redkale.persistence.Column; +import org.redkale.persistence.Entity; +import org.redkale.persistence.Id; + +@Getter +@Setter +@Entity +public class MPlat extends BaseEntity { + @Id + @Comment("[平台ID]") + private Integer platid; + + @Comment("[平台名称]") + private String platname; + + @Comment("[平台令牌]") + private String plattoken; + + @Comment("[备注信息]") + private String remark; + + @Comment("[创建时间]") + @Column(updatable = false) + private Long createtime; +} diff --git a/src/main/java/net/tccn/plat/MetaDb.java b/src/main/java/net/tccn/plat/MetaDb.java index 2859cef..717ad1b 100644 --- a/src/main/java/net/tccn/plat/MetaDb.java +++ b/src/main/java/net/tccn/plat/MetaDb.java @@ -1,3 +1,4 @@ +/* package net.tccn.plat; import lombok.Getter; @@ -7,10 +8,12 @@ import org.redkale.convert.ConvertColumn; import javax.persistence.Table; +*/ /** * 数据库平台 * @author: liangxianyou at 2018/11/14 12:58. - */ + *//* + @Getter @Setter @Table(name = "MetaDb", catalog = "db_meta") @@ -37,8 +40,9 @@ public class MetaDb extends Doc { return user + ":" + pwd + "@" + host; } - @ConvertColumn(ignore = true) + //@ConvertColumn(ignore = true) public String getPwd() { return pwd; } } +*/ diff --git a/src/main/java/net/tccn/plat/MetaPlat.java b/src/main/java/net/tccn/plat/MetaPlat.java index 42c1a9a..afe7ec7 100644 --- a/src/main/java/net/tccn/plat/MetaPlat.java +++ b/src/main/java/net/tccn/plat/MetaPlat.java @@ -1,3 +1,4 @@ +/* package net.tccn.plat; import lombok.Getter; @@ -5,9 +6,11 @@ import lombok.Setter; import net.tccn.base.arango.Doc; import javax.persistence.Table; +*/ /** * @author: liangxianyou at 2018/11/26 17:46. - */ + *//* + @Getter @Setter @Table(name = "MetaPlat", catalog = "db_meta") @@ -25,3 +28,4 @@ public class MetaPlat extends Doc { } } +*/ diff --git a/src/main/java/net/tccn/plat/PlatService.java b/src/main/java/net/tccn/plat/PlatService.java index 24741aa..f30db59 100644 --- a/src/main/java/net/tccn/plat/PlatService.java +++ b/src/main/java/net/tccn/plat/PlatService.java @@ -3,32 +3,37 @@ package net.tccn.plat; import net.tccn.base.BaseService; import net.tccn.base.JBean; import net.tccn.base.MetaKit; -import net.tccn.base.PageBean; +import net.tccn.base.Utils; import net.tccn.base.dbq.jdbc.api.DbAccount; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestService; +import org.redkale.source.FilterBean; import org.redkale.source.Flipper; import org.redkale.util.Comment; - -import java.util.List; +import org.redkale.util.Sheet; @RestService(name = "plat", automapping = true, comment = "业务/数据平台") public class PlatService extends BaseService { @RestMapping(name = "list", comment = "平台列表") - public JBean list(MetaPlat plat, Flipper flipper) { + public JBean list(MPlat plat, Flipper flipper) { JBean jBean = new JBean(); //PageBean page = SysPlat.dao.findPage(plat, flipper); - List list = MetaKit.getSysPlats(); - PageBean page = PageBean.by(list, list.size()); + /*List list = MetaKit.getSysPlats(); + PageBean page = PageBean.by(list, list.size());*/ - return jBean.setBody(page); + Sheet sheet = metaSource.querySheet(MPlat.class, flipper, (FilterBean) null); + return jBean.setBody(sheet); } @Comment("平台信息保存") - public JBean save(MetaPlat plat) { - MetaKit.save(plat); + public JBean save(MPlat plat) { + if (!Utils.isEmpty(plat.getPlatid())) { + metaSource.update(plat); + } else { + metaSource.insert(plat); + } return JBean.OK; } @@ -40,18 +45,29 @@ public class PlatService extends BaseService { //------------------------ @RestMapping(name = "db_list", comment = "数据源列表") - public JBean dbList(MetaDb plat, Flipper flipper) { + public JBean dbList(DbAccount plat, Flipper flipper) { JBean jBean = new JBean(); - List list = MetaKit.getDbPlats(); - PageBean page = PageBean.by(list, list.size()); + /*List list = MetaKit.getDbPlats(); + PageBean page = PageBean.by(list, list.size());*/ - return jBean.setBody(page); + Sheet sheet = metaSource.querySheet(DbAccount.class, flipper, (FilterBean) null); + return jBean.setBody(sheet); } @RestMapping(name = "db_save", comment = "数据源信息保存") - public JBean dbSave(MetaDb plat) { - MetaKit.save(plat); + public JBean dbSave(DbAccount plat) { + // MetaKit.save(plat); + if (!Utils.isEmpty(plat.getDbid()) || plat.getDbid() != 0) { + if (Utils.isEmpty(plat.getPwd())) { + DbAccount account = MetaKit.getDbPlat(plat.getDbid()); + plat.setPwd(account.getPwd()); + } + + metaSource.update(plat); + } else { + metaSource.insert(plat); + } return JBean.OK; } diff --git a/src/main/java/net/tccn/plat/_DbService.java b/src/main/java/net/tccn/plat/_DbService.java index 77faeaf..7a75755 100644 --- a/src/main/java/net/tccn/plat/_DbService.java +++ b/src/main/java/net/tccn/plat/_DbService.java @@ -8,7 +8,7 @@ import net.tccn.base.dbq.jdbc.api.DbAccount; import net.tccn.base.dbq.jdbc.api.DbKit; import net.tccn.base.dbq.table.Column; import net.tccn.base.dbq.table.Table; -import net.tccn.meta.MetaTable; +import net.tccn.meta.MTable; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestService; @@ -23,13 +23,13 @@ import java.util.stream.Stream; public class _DbService extends BaseService { @RestMapping(name = "catalog_list", comment = "获取数据源的database") - public JBean catalogList(DbAccount dbAccount, String dbPlatId) { + public JBean catalogList(DbAccount dbAccount, int dbid) { JBean jBean = new JBean(); DbKit dbKit = null; if (dbAccount != null) { dbKit = new DbKit(dbAccount, ""); } else { - dbKit = MetaKit.getDbKit(dbPlatId, ""); + dbKit = MetaKit.getDbKit(dbid, ""); } List list = dbKit.queryList("SHOW DATABASES;", Map.class); @@ -40,29 +40,29 @@ public class _DbService extends BaseService { } @RestMapping(name = "table_list", comment = "数据库表列表") - public List tableList(String dbPlatId, String catalog, String[] tables) { - DbKit dbKit = MetaKit.getDbKit(dbPlatId, ""); + public List
tableList(int dbid, String catalog, String[] tables) { + DbKit dbKit = MetaKit.getDbKit(dbid, ""); String sql = tplKit.getTpl("db.table_list", Kv.of("catalog", catalog).set("tables", tables)); return dbKit.queryList(sql, Table.class); } @RestMapping(ignore = true) - public List
tableInfoList(String dbPlatId, String catalog, String[] tables) { + public List
tableInfoList(int dbid, String catalog, String[] tables) { List
list = new ArrayList<>(tables.length); for (String table : tables) { - list.add(tableInfo(dbPlatId, catalog, table)); + list.add(tableInfo(dbid, catalog, table)); } return list; } @RestMapping(name = "table_info", comment = "数据库表详情") - public JBean MetatableInfo(String dbPlatId, String catalog, String tableName) { + public JBean MetatableInfo(int dbid, String catalog, String tableName) { JBean jBean = new JBean(); try { - Table table = tableInfo(dbPlatId, catalog, tableName); + Table table = tableInfo(dbid, catalog, tableName); - jBean.setBody(MetaTable.toAs(table)); + jBean.setBody(MTable.toAs(table)); } catch (Exception e) { jBean.set(-1, "查询表信息失败"); new IllegalArgumentException("查询表信息失败", e); @@ -71,8 +71,8 @@ public class _DbService extends BaseService { } @RestMapping(ignore = true, comment = "查询表信息") - public Table tableInfo(String dbPlatId, String catalog, String tableName) { - DbKit dbKit = MetaKit.getDbKit(dbPlatId, catalog); + public Table tableInfo(int dbid, String catalog, String tableName) { + DbKit dbKit = MetaKit.getDbKit(dbid, catalog); String sql = tplKit.getTpl("db.table_list", Kv.of("table", tableName)); String columnSql = String.format("SHOW FULL COLUMNS FROM %s.`%s`", catalog, tableName); @@ -92,10 +92,10 @@ public class _DbService extends BaseService { } @RestMapping(name = "table_create", comment = "新建表[mysql]") - public JBean tableCreate(String dbPlatId, String catalog, String sql) { + public JBean tableCreate(int dbid, String catalog, String sql) { JBean jBean = new JBean(); - DbKit dbKit = MetaKit.getDbKit(dbPlatId, catalog); + DbKit dbKit = MetaKit.getDbKit(dbid, catalog); dbKit.createTable(sql); return jBean; diff --git a/src/main/java/net/tccn/plat/_TableService.java b/src/main/java/net/tccn/plat/_TableService.java index b960f16..6eff1fb 100644 --- a/src/main/java/net/tccn/plat/_TableService.java +++ b/src/main/java/net/tccn/plat/_TableService.java @@ -6,7 +6,7 @@ import net.tccn.base.Kv; import net.tccn.base.MetaKit; import net.tccn.base.dbq.table.Table; import net.tccn.file._FileService; -import net.tccn.meta.MetaTable; +import net.tccn.meta.MTable; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestParam; import org.redkale.net.http.RestService; @@ -35,8 +35,8 @@ public class _TableService extends BaseService { // excel String filePath, //mysql {数据库连接账号、数据源id、数据库database数组} - String dbPlatId, String catalog, - @RestParam(name = "platToken") String token) { + int dbid, String catalog, + @RestParam(name = "plattoken") String token) { JBean jBean = new JBean(); @@ -44,21 +44,21 @@ public class _TableService extends BaseService { jBean = fileService.data(filePath, token); } else if ("mysql".equals(cate)) { - List
list = dbService.tableList(dbPlatId, catalog, null); + List
list = dbService.tableList(dbid, catalog, null); String[] tableArr = list.stream().map(Table::getName).toArray(String[]::new); List hv = MetaKit.tableExist(tableArr, token); - List sheets = new ArrayList<>(); + List sheets = new ArrayList<>(); list.forEach(x -> { - MetaTable bean = MetaTable.toAs(x); + MTable bean = MTable.toAs(x); bean.setHv(hv.contains(x.getName()) ? 1 : 0); sheets.add(bean); }); //对数据分组后返回 - Kv data = Kv.of(); - sheets.forEach(x -> data.set(x.getName(), x)); + Kv data = Kv.of(); + sheets.forEach(x -> data.set(x.getTablename(), x)); jBean.setBody(data); } @@ -67,63 +67,65 @@ public class _TableService extends BaseService { } @RestMapping(name = "sheet_info", comment = "sheet详情") - public JBean sheetInfo(String cate, @RestParam(name = "platToken") String token, + public JBean sheetInfo(String cate, @RestParam(name = "plattoken") String token, // excel String filePath, String sheetName, // mysql - String dbPlatId, String catalog, String tableName) { + int dbid, String catalog, String tableName) { if ("excel".equals(cate)) { return fileService.sheetData(filePath, sheetName, token); } else if ("mysql".equals(cate)) { - return new JBean().setBody(dbService.tableInfo(dbPlatId, catalog, tableName)); + return new JBean().setBody(dbService.tableInfo(dbid, catalog, tableName)); } return null; } @RestMapping(name = "table_save", comment = "保存数据源实体到元数据实体表") - public JBean tableSave(String cate, @RestParam(name = "platToken") String token, + public JBean tableSave(String cate, @RestParam(name = "plattoken") String token, String filePath, String[] sheetNames, - String dbPlatId, String catalog, String[] tableArr) { + int dbid, String catalog, String[] tableArr) { if ("excel".equals(cate)) { return fileService.saveSheet(sheetNames, filePath, token); } else if ("mysql".equals(cate)) { List hv = MetaKit.tableExist(tableArr, token); - List
tables = dbService.tableInfoList(dbPlatId, catalog, tableArr); + List
tables = dbService.tableInfoList(dbid, catalog, tableArr); - MetaTable[] metaTables = tables.stream() + MTable[] metaTables = tables.stream() .filter(t -> !hv.contains(t.getName())) // 去除同名 .map(t -> { - MetaTable metaTable = MetaTable.toAs(t); + MTable metaTable = MTable.toAs(t); metaTable.setCatalog(catalog); - metaTable.setDbPlatId(dbPlatId); - metaTable.setAlias(MetaKit.nextAlias());// 表别名 - metaTable.setSysPlatId(platId(token)); + metaTable.setDbid(dbid); + metaTable.setAlias(metaKit.nextAlias());// 表别名 + metaTable.setPlatid(platId(token)); return metaTable; - }).toArray(MetaTable[]::new); - - MetaKit.save(metaTables); + }).toArray(MTable[]::new); + for (MTable table : metaTables) { + metaKit.save(table); + } // 已经有的表 更新 - MetaTable[] metaTables2 = tables.stream() + MTable[] metaTables2 = tables.stream() .filter(t -> hv.contains(t.getName())) // 去除同名 .map(t -> { - MetaTable table = MetaKit.getMetaTable(t.getName(), token); + MTable table = MetaKit.getMetaTable(t.getName(), token); - MetaTable metaTable = MetaTable.toAs(t); + MTable metaTable = MTable.toAs(t); table.setCatalog(catalog); - table.setDbPlatId(dbPlatId); + table.setDbid(dbid); table.setAlias(table.getAlias());// 表别名 - table.setSysPlatId(platId(token)); + table.setPlatid(platId(token)); table.setItems(metaTable.getItems()); table.setComment(metaTable.getComment()); return table; - }).toArray(MetaTable[]::new); - - MetaKit.save(metaTables2); + }).toArray(MTable[]::new); + for (MTable table : metaTables2) { + metaKit.save(table); + } } return JBean.OK; } diff --git a/src/main/java/net/tccn/qtask/DbTask.java b/src/main/java/net/tccn/qtask/DbTask.java index f6c961d..274c48e 100644 --- a/src/main/java/net/tccn/qtask/DbTask.java +++ b/src/main/java/net/tccn/qtask/DbTask.java @@ -21,13 +21,13 @@ public class DbTask extends Doc { private String name; // 任务标识码 private String title; // 任务名称 //private String cate; // 任务类型 - private String dbPlatId; // 数据平台id + private int dbid; // 数据平台id private String catalog; // private String content; // 任务内容 private String remark; // 任务备注 private String para; // 任务参数 - private String sysPlatId; // 平台id + private String platid; // 平台id // --------------------- } diff --git a/src/main/java/net/tccn/qtask/QtaskService.java b/src/main/java/net/tccn/qtask/QtaskService.java index 9c32134..1a34d3d 100644 --- a/src/main/java/net/tccn/qtask/QtaskService.java +++ b/src/main/java/net/tccn/qtask/QtaskService.java @@ -13,13 +13,13 @@ import org.redkale.service.RetResult; @RestService(name = "qtask", automapping = true, comment = "qtask查询服务") public class QtaskService extends BaseService { - // 调用示例: http://qtask_service_addr_xxxxxx/qtask/call?name=abxx&platToken=3421432¶={h:1} + // 调用示例: http://qtask_service_addr_xxxxxx/qtask/call?name=abxx&plattoken=3421432¶={h:1} @RestMapping(name = "call", auth = false) - public RetResult call(String name, Kv para, @RestParam(name = "platToken") String platToken) { + public RetResult call(String name, Kv para, @RestParam(name = "plattoken") String plattoken) { if (para == null) { para = Kv.of(); } - return RetResult.success(TaskKit.taskRun(name, platToken, para)); + return RetResult.success(TaskKit.taskRun(name, plattoken, para)); } } diff --git a/src/main/java/net/tccn/qtask/Task.java b/src/main/java/net/tccn/qtask/Task.java index 0822658..acb887b 100644 --- a/src/main/java/net/tccn/qtask/Task.java +++ b/src/main/java/net/tccn/qtask/Task.java @@ -5,9 +5,10 @@ import lombok.Setter; import net.tccn.base.Kv; import net.tccn.base.dbq.jdbc.api.DbAccount; + /** * |- dbp: 调用谁， 参数， - * |- 谁：谁（干什么） => dbPlatId + content （在程序的世界每个个体，往往都有其明确的职责） + * |- 谁：谁（干什么） => dbid + content （在程序的世界每个个体，往往都有其明确的职责） * |- * 任务对象 */ @@ -16,7 +17,7 @@ import net.tccn.base.dbq.jdbc.api.DbAccount; public class Task { private String name; // 任务标识，同一系统唯一 - private String dbPlatId; // 数据源id + private int dbid; // 数据源id private String catalog; // 数据库 database private String content; // 任务内容 diff --git a/src/main/java/net/tccn/qtask/TaskKit.java b/src/main/java/net/tccn/qtask/TaskKit.java index 14e0808..99a5057 100644 --- a/src/main/java/net/tccn/qtask/TaskKit.java +++ b/src/main/java/net/tccn/qtask/TaskKit.java @@ -25,7 +25,7 @@ public class TaskKit { public static Task buildTask(dev.zhub.mk.qtask.QTask qTask, Kv para) { Task task = qTask.createTask(para); - task.setDbAccount(MetaKit.getDbPlat(qTask.getDbplatid())); + task.setDbAccount(MetaKit.getDbPlat(qTask.getDbid())); return task; } diff --git a/src/main/java/net/tccn/qtask/_QtaskService.java b/src/main/java/net/tccn/qtask/_QtaskService.java index 9f8c2de..ba5d355 100644 --- a/src/main/java/net/tccn/qtask/_QtaskService.java +++ b/src/main/java/net/tccn/qtask/_QtaskService.java @@ -23,7 +23,7 @@ public class _QtaskService extends BaseService { /*if (task == null) { task = new DbTask(); } - task.setSysPlatId(platId(token)); + task.setplatid(platId(token)); PageBean page = DbTask.dao.findPage(task, flipper);*/ @@ -72,7 +72,7 @@ public class _QtaskService extends BaseService { /*@Comment("qtask保存") - public JBean save(DbTask task, @RestParam(name = "platToken") String token) { + public JBean save(DbTask task, @RestParam(name = "plattoken") String token) { JBean jBean = new JBean(); do { @@ -83,7 +83,7 @@ public class _QtaskService extends BaseService { // 同平台name 唯一校验 DbTask bean = new DbTask(); - bean.setSysPlatId(platId(token)); + bean.setplatid(platId(token)); bean.setName(task.getName()); DbTask entity = DbTask.dao.findFirst(bean); @@ -95,7 +95,7 @@ public class _QtaskService extends BaseService { if (task.getKey() != null) { task.update(); } else { - task.setSysPlatId(platId(token)); + task.setplatid(platId(token)); task.save(); } MetaKit.reload(task); @@ -107,7 +107,7 @@ public class _QtaskService extends BaseService { }*/ @Comment("debug调试接口") - public JBean debug(QTask task, @RestParam(name = "platToken") String token) { + public JBean debug(QTask task, @RestParam(name = "plattoken") String token) { JBean jBean = new JBean(); Object res = TaskKit.taskRun(task); diff --git a/src/main/java/net/tccn/qtask/impl/QTaskMysql.java b/src/main/java/net/tccn/qtask/impl/QTaskMysql.java index 6b14d70..41cbd6c 100644 --- a/src/main/java/net/tccn/qtask/impl/QTaskMysql.java +++ b/src/main/java/net/tccn/qtask/impl/QTaskMysql.java @@ -27,7 +27,7 @@ public class QTaskMysql extends QTaskAbs implements QTask { public QTaskMysql(Task task) { super(task); - this.dbKit = MetaKit.getDbKit(task.getDbPlatId(), task.getCatalog()); + this.dbKit = MetaKit.getDbKit(task.getDbid(), task.getCatalog()); } @Override diff --git a/src/main/java/net/tccn/user/MetaUser.java b/src/main/java/net/tccn/user/MUser.java similarity index 51% rename from src/main/java/net/tccn/user/MetaUser.java rename to src/main/java/net/tccn/user/MUser.java index 4d83215..1d27997 100644 --- a/src/main/java/net/tccn/user/MetaUser.java +++ b/src/main/java/net/tccn/user/MUser.java @@ -3,37 +3,40 @@ package net.tccn.user; import lombok.Getter; import lombok.Setter; import net.tccn.base.JBean; -import net.tccn.base.arango.Doc; +import org.redkale.persistence.Cacheable; +import org.redkale.persistence.Column; +import org.redkale.persistence.Entity; +import org.redkale.persistence.Id; import org.redkale.util.Utility; -import javax.persistence.Table; - -/** - * @author: liangxianyou at 2018/11/22 17:37. - */ @Getter @Setter -@Table(name = "MetaUser", catalog = "db_meta") -public class MetaUser extends Doc { - public static MetaUser dao = dao(MetaUser.class); +@Entity +@Cacheable(value = true, interval = 60 * 60 * 1000, direct = true) +public class MUser { + @Id + @Column(comment = "[用户ID]") + private Integer userid; + @Column(length = 64, comment = "[用户名]") private String username; - //@ConvertColumn(ignore = true,type = ConvertType.JSON) + + @Column(length = 64, comment = "[加密后的密码]") private String pwd; - private Long createTime; - private Long loginTime; - private Integer status; + + @Column(length = 64, comment = "[会话ID]") private String sessionid; - public MetaUser() { - } + @Column(comment = "[状态] 1启用，0未启用") + private short status; - public MetaUser(String sessionid) { - this.sessionid = sessionid; - } - //------------------------------- + @Column(updatable = false, comment = "[创建时间]") + private long createtime; - public static String md5IfNeed(String password){ + @Column(comment = "[最后登录时间]") + private long logintime; + + public static String md5IfNeed(String password) { if (password == null || password.length() == 0) { return ""; } @@ -54,5 +57,4 @@ public class MetaUser extends Doc { jBean.setBody(this); return jBean; } - } diff --git a/src/main/java/net/tccn/user/UserService.java b/src/main/java/net/tccn/user/UserService.java index a730bdb..7df23d4 100644 --- a/src/main/java/net/tccn/user/UserService.java +++ b/src/main/java/net/tccn/user/UserService.java @@ -2,11 +2,10 @@ package net.tccn.user; import net.tccn.base.BaseService; import net.tccn.base.JBean; -import net.tccn.base.MetaKit; -import org.redkale.net.http.RestBody; import org.redkale.net.http.RestMapping; import org.redkale.net.http.RestService; import org.redkale.net.http.RestSessionid; +import org.redkale.source.FilterNode; /** * @author: liangxianyou at 2018/11/22 17:16. @@ -18,39 +17,44 @@ public class UserService extends BaseService { public JBean login(@RestSessionid String sessionid, String username, String pwd) { - MetaUser bean = new MetaUser(); + MUser bean = new MUser(); bean.setUsername(username); - MetaUser user = MetaKit.findFirst(bean); + //MUser user = MetaKit.findFirst(bean); + MUser user = metaSource.find(MUser.class, FilterNode.create("username", username)); if (user == null) { return JBean.by(-1, "登陆失败:账号无效"); } JBean jBean = user.checkLogin(pwd); if (jBean.getCode() == 0) { - cacheSource.set(30 * 60 * 2,sessionid, MetaUser.class, user); + cacheSource.set(30 * 60 * 2, sessionid, MUser.class, user); user.setSessionid(sessionid); - user.setLoginTime(System.currentTimeMillis()); - MetaKit.save(user); + user.setLogintime(System.currentTimeMillis()); + // MetaKit.save(user); + metaSource.updateColumn(user, "sessionid", "logintime"); } return jBean; } @RestMapping(name = "current") - public MetaUser current(@RestSessionid String sessionid) { - return getT("user_" + sessionid, MetaUser.class, () -> MetaKit.findFirst(new MetaUser(sessionid))); + public MUser current(@RestSessionid String sessionid) { + // T + //return getT("user_" + sessionid, MUser.class, () -> MetaKit.findFirst(new MetaUser(sessionid))); + MUser user = metaSource.find(MUser.class, FilterNode.create("sessionid", sessionid)); + return user; } @RestMapping(name = "logout", comment = "退出登陆") public JBean logout(@RestSessionid String sessionid) { - MetaUser user = MetaKit.findFirst(new MetaUser(sessionid)); + MUser user = metaSource.find(MUser.class, FilterNode.create("sessionid", sessionid)); if (user != null) { user.setSessionid(""); - MetaKit.save(user); + metaSource.updateColumn(user, "sessionid"); } - cacheSource.removeAsync("user_" + sessionid); + // cacheSource.removeAsync("user_" + sessionid); return JBean.OK; } diff --git a/src/main/resources/tpl/aql/table.aql b/src/main/resources/tpl/aql/table.aql index 992d359..6a28bb2 100644 --- a/src/main/resources/tpl/aql/table.aql +++ b/src/main/resources/tpl/aql/table.aql @@ -5,6 +5,13 @@ UPDATE "#(key)" WITH { link:null } IN Characters #end +#sql("mable.lastAlias") + SELECT alias + FROM mtable + ORDER BY LENGTH(alias) DESC, alias DESC + LIMIT 1; +#end + #sql("metaTable.lastAlias") for d in MetaTable sort length(d.alias) desc, d.alias desc diff --git a/src/test/java/RunTest.java b/src/test/java/RunTest.java index dcffc0e..240b100 100644 --- a/src/test/java/RunTest.java +++ b/src/test/java/RunTest.java @@ -1,26 +1,15 @@ import net.tccn.base.*; import net.tccn.base.dbq.fbean.FBean; -import net.tccn.base.dbq.jdbc.api.DbAccount; -import net.tccn.base.dbq.jdbc.api.DbKit; import net.tccn.base.dbq.parser.ParseMysql; import net.tccn.dict.Dict; import net.tccn.dict.DictKit; -import net.tccn.meta.MetaService; -import net.tccn.meta.MetaTable; -import net.tccn.user.MetaUser; -import org.apache.poi.ss.usermodel.Workbook; import org.junit.Test; import org.redkale.convert.json.JsonConvert; -import org.redkale.source.CacheMemorySource; -import org.redkale.util.TypeToken; -import org.redkale.util.Utility; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.lang.reflect.Type; -import java.util.*; +import java.util.Date; +import java.util.Timer; +import java.util.TimerTask; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.BiPredicate; import java.util.function.Predicate; @@ -39,7 +28,7 @@ public class RunTest { /*public static Task A = new Task("mysql", "select * from user where userid=#(userid)", "查询用户列表", Kv.of("userid", 1)); public static Task B = new Task("method", "User.say", "user调用", Kv.of("name", "张三").set("age", 13)); - public static Task C = new Task("http", "http://127.0.0.1/meta/db_plat_list?platToken=3421432", "查询数据平台列表", Kv.of("abx", "abx111")); + public static Task C = new Task("http", "http://127.0.0.1/meta/db_plat_list?plattoken=3421432", "查询数据平台列表", Kv.of("abx", "abx111")); public static Task d = new Task("es", "http://192.168.91.5:9200/_sql?", "查询数据平台列表", Kv.of("sql", "select * from basic_iotdevice_all limit 10")); public static Task e = new Task("http", "http://192.168.91.5:9200/_sql?sql=select%20*%20from%20basic_iotdevice_all%20limit%2010", "查询数据平台列表", Kv.of()); */ @@ -60,7 +49,7 @@ public class RunTest { //@Test public void parseFBeanTest() { - String str = "{'platToken':'ipsm_v4','name':'historyTrack'," + + String str = "{'plattoken':'ipsm_v4','name':'historyTrack'," + "'filters':[{'col':'ap.comName','value':'贵阳市第十九中学','type':'LIKE'},{'col':'','value':'name=213113','type':'SQL'}," + "{'col':'age','values':[1,2],'type':'RANGE'}]," + @@ -74,7 +63,7 @@ public class RunTest { System.out.println("list:" + parse[1]); } - @Test + /*@Test public void jdbcTest() { //DbAccount jdbcAccount = new DbAccount("jdbc:mysql://192.168.202.11:3306/gxbii_dev", "root", "eversec123098"); DbAccount dbAccount = new DbAccount(); @@ -103,10 +92,10 @@ public class RunTest { //find count - /*long total = dbKit.queryColumn("select count(1) from basic_device", long.class); + *//*long total = dbKit.queryColumn("select count(1) from basic_device", long.class); System.out.println(total); - System.out.println(int.class);*/ - } + System.out.println(int.class);*//* + }*/ //@Test public void toAsTest() { @@ -173,7 +162,7 @@ public class RunTest { } //@Test - public void userCreate() { + /*public void userCreate() { MetaUser user = new MetaUser(); user.setUsername("admin"); user.setCreateTime(System.currentTimeMillis()); @@ -181,12 +170,12 @@ public class RunTest { user.setStatus(1); user.save(); - } + }*/ //@Test - public void t() { + /*public void t() { System.out.println(MetaKit.nextAlias()); - } + }*/ //@Test public void kvTest() { @@ -216,27 +205,38 @@ public class RunTest { Object o = Kv.toAs(k, v); switch (v.getSimpleName()) { case "int": - System.out.println((int)o);break; + System.out.println((int) o); + break; case "Integer": - System.out.println((Integer)o);break; + System.out.println(o); + break; case "long": - System.out.println((long)o);break; + System.out.println((long) o); + break; case "Long": - System.out.println((Long)o);break; + System.out.println(o); + break; case "short": - System.out.println((short)o);break; + System.out.println((short) o); + break; case "Short": - System.out.println((Short)o);break; + System.out.println(o); + break; case "byte": - System.out.println((byte)o);break; + System.out.println((byte) o); + break; case "float": - System.out.println((float)o);break; + System.out.println((float) o); + break; case "Float": - System.out.println((Float)o);break; + System.out.println(o); + break; case "Byte": - System.out.println((Byte)o);break; + System.out.println(o); + break; case "String": - System.out.println((String)o);break; + System.out.println((String) o); + break; } } } @@ -252,12 +252,12 @@ public class RunTest { } - @Test + /*@Test public void T() { List metaTables = MetaKit.getMetaTables(); System.out.println(metaTables.size()); - } + }*/ TplKit tplKit = TplKit.use(); @@ -301,7 +301,7 @@ public class RunTest { }*/ //@Test - public void dataToFileTest() { + /*public void dataToFileTest() { List metaServices = MetaService.dao.find(); @@ -311,17 +311,17 @@ public class RunTest { file.getParentFile().mkdirs(); FileKit.strToFile(convert.convertTo(metaKit), file); - } + }*/ //@Test - public void readJson() { + /*public void readJson() { File file = new File("tmp/MetaService.json"); try { - Type type = new TypeToken>() { + Type type = new TypeToken>() { }.getType(); - List list = convert.convertFrom(type, new FileInputStream(file)); + List list = convert.convertFrom(type, new FileInputStream(file)); System.out.println(list); @@ -329,22 +329,22 @@ public class RunTest { e.printStackTrace(); } - Class clazz = MetaService.class; + Class clazz = MService.class; //File file = new File(String.format("tmp/%s.json", clazz.getSimpleName())); - /* + *//* 写入数据到 文件 MetaKit.cacheSave(MetaTable.class); MetaKit.cacheSave(MetaLink.class); MetaKit.cacheSave(MetaService.class); MetaKit.cacheSave(DbAccount.class); - MetaKit.cacheSave(SysPlat.class);*/ + MetaKit.cacheSave(SysPlat.class);*//* - } + }*/ //@Test - public void cacheMemorySourceTest() { + /*public void cacheMemorySourceTest() { CacheMemorySource source = new CacheMemorySource(""); //MetaKit.dcate = "db"; //MetaKit.init(); @@ -365,9 +365,9 @@ public class RunTest { System.out.println(metaTable); - } + }*/ - public List dbKitTest() { + /*public List dbKitTest() { DbAccount dbAccount = new DbAccount(); dbAccount.setCate("mysql"); dbAccount.setUrl("jdbc:mysql://192.168.202.11:3306/gxbii_dev"); @@ -387,11 +387,11 @@ public class RunTest { System.out.println(list); return list; - } + }*/ // 通用导出组件测试 //@Test - public void exportTest() { + /*public void exportTest() { List list = dbKitTest(); Kv kv = Kv.of("platID", "平台id") @@ -406,7 +406,7 @@ public class RunTest { e.printStackTrace(); } - } + }*/ //@Test public void switchTest() {