From e3fbc1c4e3dd2d5188ef267f136e3bbd8397c8fa Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 04 五月 2023 17:05:50 +0800
Subject: [PATCH] 1
---
ExportMap/export.html | 4 ++--
ExportMap/Web.config | 4 ++--
ExportMap/db/PubDBHelper.cs | 18 ++++++++++--------
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/ExportMap/Web.config b/ExportMap/Web.config
index 9151ed8..b2afe2f 100644
--- a/ExportMap/Web.config
+++ b/ExportMap/Web.config
@@ -13,8 +13,8 @@
<add key="sgDB" value="E:\soft\SGConfig\catalog.db"/>
<!-- PG杩炴帴 -->
<!--<add key="pgConn" value="Server=127.0.0.1;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>-->
- <!--<add key="pgConn" value="Server=192.168.20.205;Port=5433;Database=langfang;User Id=postgres;Password=Postgres!_14_Lf;"/>-->
- <add key="pgConn" value="Server=103.85.165.99;Port=5433;Database=langfang;User Id=postgres;Password=Postgres!_14_Lf;"/>
+ <add key="pgConn" value="Server=192.168.20.205;Port=5433;Database=langfang;User Id=postgres;Password=Postgres!_14_Lf;"/>
+ <!--<add key="pgConn" value="Server=103.85.165.99;Port=5433;Database=langfang;User Id=postgres;Password=Postgres!_14_Lf;"/>-->
<add key="webpages:Version" value="3.0.0.0"/>
<add key="webpages:Enabled" value="false"/>
<add key="ClientValidationEnabled" value="true"/>
diff --git a/ExportMap/db/PubDBHelper.cs b/ExportMap/db/PubDBHelper.cs
index 9d24141..3baa47c 100644
--- a/ExportMap/db/PubDBHelper.cs
+++ b/ExportMap/db/PubDBHelper.cs
@@ -19,13 +19,13 @@
private static string insertMetaPubSql = "insert into lf.sys_meta_pub (metaid, pubid, create_user) select {0}, {1}, {2} from (select 1) temp where not exists (select 1 from lf.sys_meta_pub where metaid = {0} and pubid = {1})";
// 妯″瀷-@cnName锛宮odel-@enName锛岃嚜鍔ㄥ彂甯冩ā鍨�-@name锛宧ttp:// - @url锛孴ileset-@serve锛�1-@user锛�7-@pubid
- private static string insertLayerSql = "insert into lf.sys_layer (pid, cn_name, en_name, url, type, level, order_num, is_show, create_user, data_type, serve_type, pubid, elev) values (@pid, @cnName, @enName, @url, 2, (select coalesce(level, 0) + 1 from lf.sys_layer where id = @pid), (select coalesce(max(order_num), 0) + 1 from lf.sys_layer where pid = @pid), 0, @user, @data, @serve, @pubid, @elev) returning id";
+ private static string insertLayerSql = "insert into lf.sys_layer (pid, cn_name, en_name, url, type, level, order_num, is_show, create_user, data_type, serve_type, pubid, elev) values (@pid, @cnName, @enName, @url, 2, (select coalesce(level, 0) + 1 from lf.sys_layer where id = @pid), (select coalesce(max(order_num), 0) + 1 from lf.sys_layer where pid = @pid), 0, @user, @data, @serve, @pubid, @elev)";
- private static string insertParentLayer = "insert into lf.sys_layer (pid, cn_name, type, level, order_num, is_show, create_user, data_type) values (@pid, @cn_name, 1, (select coalesce(level, 0) + 1 from lf.sys_layer where id = @pid), (select coalesce(max(order_num), 0) + 1 from lf.sys_layer where pid = @pid), 0, @create_user, (select data_type from lf.sys_layer where id = @pid))";
+ private static string insertParentLayer = "insert into lf.sys_layer (pid, cn_name, en_name, type, level, order_num, is_show, create_user, data_type, is_project) values (@pid, (select name from lf.sys_dir where code = @code), @en_name, 1, (select coalesce(level, 0) + 1 from lf.sys_layer where id = @pid), (select coalesce(max(order_num), 0) + 1 from lf.sys_layer where pid = @pid), 0, @create_user, (select data_type from lf.sys_layer where id = @pid), 1) returning id";
private static string updateMetaSql = "update lf.sys_meta set path = @path where id = @id";
- private static string selectLayerSql = "select id from lf.sys_layer where pid = @pid and cn_name = @name";
+ private static string selectLayerSql = "select id from lf.sys_layer where pid = @pid and en_name = @en_name";
/// <summary>
/// 鏄�/鍚﹀彂甯冭繃
@@ -126,19 +126,21 @@
string sql = GetSelectLayerPidSql(meta);
int pid = Tools.DBHelper.GetIntScalar(sql);
+ string dirid = string.IsNullOrWhiteSpace(sys.dirid) || sys.dirid.Length < 2 ? "00" : sys.dirid.Substring(0, 2);
List<DbParameter> list = new List<DbParameter>();
list.Add(new NpgsqlParameter("@pid", pid));
- list.Add(new NpgsqlParameter("@name", meta.dirname));
+ list.Add(new NpgsqlParameter("@en_name", dirid));
int layerId = Tools.DBHelper.GetIntScalar(selectLayerSql, list.ToArray());
if (0 == layerId)
{
List<DbParameter> args = new List<DbParameter>();
- list.Add(new NpgsqlParameter("@pid", pid));
- list.Add(new NpgsqlParameter("@cn_name", meta.dirname));
- list.Add(new NpgsqlParameter("@create_user", sys.create_user));
+ args.Add(new NpgsqlParameter("@pid", pid));
+ args.Add(new NpgsqlParameter("@code", dirid));
+ args.Add(new NpgsqlParameter("@en_name", dirid));
+ args.Add(new NpgsqlParameter("@create_user", sys.create_user));
- layerId = Tools.DBHelper.ExecuteNonQuery(insertParentLayer, args.ToArray());
+ layerId = Tools.DBHelper.GetIntScalar(insertParentLayer, args.ToArray());
}
return layerId;
diff --git a/ExportMap/export.html b/ExportMap/export.html
index 80015b8..b0b7350 100644
--- a/ExportMap/export.html
+++ b/ExportMap/export.html
@@ -5,7 +5,7 @@
<title></title>
<script src="js/jquery.1.12.4.js"></script>
<script>
- var token = "c36e4f94-dfde-401e-9967-2c4a449f1300";
+ var token = "af7f814c-9f3d-4123-af04-70abb7d5a21c";
// Ajax
function ajax(url, type, data, dataType, contentType, fn) {
@@ -104,7 +104,7 @@
// 娴嬭瘯Ifc
function convert3() {
- var data = { token: token, ids: [2324], depcode: "000305", dircode: "0102", userId: 1 };
+ var data = { token: token, ids: [6894], depcode: "000305", dircode: "0A040001010004", userId: 1 };
ajax("Convert/ToTileset", "POST", JSON.stringify(data), null, null, function (rs) {
alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result);
console.log(rs);
--
Gitblit v1.9.3