From a076f06d57a304b2903760409c0cf0b6302640b2 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期三, 12 四月 2023 10:06:16 +0800 Subject: [PATCH] 1 --- ExportMap/up.html | 30 ++++++++++++++++++++++++++++-- JavaCode/FrmMyBatisPlus.cs | 2 +- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/ExportMap/up.html b/ExportMap/up.html index 5070803..ad5b7cb 100644 --- a/ExportMap/up.html +++ b/ExportMap/up.html @@ -13,7 +13,7 @@ var path = "20230228"; var url = "http://127.0.0.1:12316/server/"; //var token = "c36e4f94-dfde-401e-9967-2c4a449f1300"; - var token = "deca57d4-7e09-431f-8dd2-97b6e9d840b2"; + var token = "e507a96b-ca70-4531-b7ef-b3ecb3fb6094"; $(function () { $("#pathSpan").html(path); @@ -272,6 +272,31 @@ } </script> <script> + // 鏌ヨ鍏冩暟鎹腑婧㈠嚭鐨勫崟浣岻D + function selectMetaOverflowDep() { + ajax(getUrl("meta/selectMetaOverflowDep"), "POST", JSON.stringify({ ids: [1393, 1392, 1383, 1382] }), null, null, function (rs) { + console.log(rs); + alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result); + }); + } + + // 鎻掑叆鍏冩暟鎹敵璇� + function insertMetaApply() { + var obj = { + ids: [1393, 1392, 1383, 1382], + pwd: aesEncrypt("Test!321&456"), + tabs: ["鍏冩暟鎹〃"], + entities: ["sysmeta"], + descr: "娴嬭瘯鍏冩暟鎹敵璇穨", + depcodes: ["00"] + }; + + ajax(getUrl("apply/insertApply"), "POST", JSON.stringify(obj), null, null, function (rs) { + console.log(rs); + alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result); + }); + } + function selectDbOverflowDep() { //selectDbOverflowDep4Wkt(); //selectDbOverflowDep4Prop1(); @@ -554,6 +579,8 @@ <br /> 鍏冩暟鎹細 + <input value="鏌ヨ鍏冩暟鎹腑婧㈠嚭鐨勫崟浣岻D" type="button" onclick="selectMetaOverflowDep();" /> + <input value="鎻掑叆鍏冩暟鎹敵璇�" type="button" onclick="insertMetaApply();" /> <input value="璇锋眰涓嬭浇" type="button" onclick="metaDownloadReq();" /> <input value="涓嬭浇鏂囦欢" type="button" onclick="selectDownloadFile();" /> <iframe id="downFrame" src="" style="display: none; border: 0; padding: 0; height: 0; width: 0"></iframe> @@ -580,7 +607,6 @@ <input value="闄勪欢涓嬭浇1" type="button" onclick="downloadReqForGuids();" /> <input value="闄勪欢涓嬭浇2" type="button" onclick="downloadReqForTabGuids();" /> <hr /> - <br /> Turf锛� <input id="inpPoint" type="text" value="POINT (100.746244878 35.588071316)" style="width: 256px;" /> diff --git a/JavaCode/FrmMyBatisPlus.cs b/JavaCode/FrmMyBatisPlus.cs index 13abb6c..1f5e721 100644 --- a/JavaCode/FrmMyBatisPlus.cs +++ b/JavaCode/FrmMyBatisPlus.cs @@ -44,7 +44,7 @@ string tabName = this.txtTabPre.Text.Trim(); string tabFilter = string.IsNullOrEmpty(tabName) ? "" : string.Format("and c.relname like '{0}%'", tabName); - string sql = string.Format("select c.relname \"tab\", cast(obj_description(c.oid) as varchar) \"desc\", a.attnum \"num\", a.attname \"col\", t.typname \"type\", d.description \"bak\" from pg_attribute a left join pg_description d on d.objoid = a.attrelid and d.objsubid = a.attnum left join pg_class c on a.attrelid = c.oid left join pg_type t on a.atttypid = t.oid where a.attnum >= 0 and reltype>0 and relnamespace in ({0}) {1} order by c.relname desc, a.attnum asc", this.txtNS.Text.Trim(), tabFilter); + string sql = string.Format("select c.relname \"tab\", cast(obj_description(c.oid) as varchar) \"desc\", a.attnum \"num\", a.attname \"col\", t.typname \"type\", d.description \"bak\" from pg_attribute a left join pg_description d on d.objoid = a.attrelid and d.objsubid = a.attnum left join pg_class c on a.attrelid = c.oid left join pg_type t on a.atttypid = t.oid where a.attnum >= 0 and reltype>0 and relnamespace in ({0}) {1} and position('pg.dropped' in a.attname) = 0 order by c.relname desc, a.attnum asc", this.txtNS.Text.Trim(), tabFilter); DataTable dt = _dbHelper.GetDataTable(sql, null); _list = ModelHandler.FillModel<TabInfo>(dt); -- Gitblit v1.9.3