From d25d064d942f760806e6a79d246877f5ee57ee92 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 12 一月 2023 20:57:09 +0800
Subject: [PATCH] 1

---
 DataLoader/MainWindow.xaml.cs   |    3 
 ExportMap/up.html               |   38 +++++++
 DataLoader/Model/SysMetaFile.cs |    1 
 DataLoader/Model/SysMeta.cs     |    1 
 ExportMap/js/insertFiles.js     |  249 +++++++++++++++++++++++++++++++------------------
 JavaCode/FrmMyBatisPlus.cs      |    4 
 6 files changed, 198 insertions(+), 98 deletions(-)

diff --git a/DataLoader/MainWindow.xaml.cs b/DataLoader/MainWindow.xaml.cs
index 20a6f18..24228ef 100644
--- a/DataLoader/MainWindow.xaml.cs
+++ b/DataLoader/MainWindow.xaml.cs
@@ -62,7 +62,8 @@
 
         protected virtual void OnPropertyChanged(string propertyName = null)
         {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            //PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            if (PropertyChanged != null) PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
diff --git a/DataLoader/Model/SysMeta.cs b/DataLoader/Model/SysMeta.cs
index 20ab1e8..a14a2b9 100644
--- a/DataLoader/Model/SysMeta.cs
+++ b/DataLoader/Model/SysMeta.cs
@@ -6,7 +6,6 @@
 using System.Security.Policy;
 using System.Text;
 using System.Threading.Tasks;
-using static Mono.Security.X509.X520;
 using System.Windows.Controls;
 
 namespace DataLoader.Model
diff --git a/DataLoader/Model/SysMetaFile.cs b/DataLoader/Model/SysMetaFile.cs
index 27bdfb5..9886372 100644
--- a/DataLoader/Model/SysMetaFile.cs
+++ b/DataLoader/Model/SysMetaFile.cs
@@ -5,7 +5,6 @@
 using System.Security.Policy;
 using System.Text;
 using System.Threading.Tasks;
-using static Mono.Security.X509.X520;
 using System.Windows.Controls;
 
 namespace DataLoader.Model
diff --git a/ExportMap/js/insertFiles.js b/ExportMap/js/insertFiles.js
index 79bbb28..96bbd84 100644
--- a/ExportMap/js/insertFiles.js
+++ b/ExportMap/js/insertFiles.js
@@ -1,530 +1,591 @@
 锘縱ar metaFiles = [
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 163,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "85025390-1276-450e-9a9a-ff2bd99b5c1e",
+        "eventid": "ebd01a96-6103-4071-930c-a4f0ce91e339",
         "extName": ".dwg",
         "guid": "810df4ee366d1b32975b6d087fcb8616",
+        "msg": null,
         "name": "濮滄矡闅ч亾宸ョ▼鍦拌川鍓栭潰鍥�.dwg",
         "path": "20230110010101_zip\\鍘熺偣妫�鏌\濮滄矡闅ч亾宸ョ▼鍦拌川鍓栭潰鍥�.dwg",
+        "rows": 0,
         "sizes": 0.15,
         "tab": null,
         "type": "dwg",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 168,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "72610cbe-3b67-4fa3-b99d-84c455a7df14",
+        "eventid": "410935a8-5113-4152-930e-5c562fb8f143",
         "extName": ".pdf",
         "guid": "2c4d2331e6ccda59d6b2d782d2579744",
+        "msg": null,
         "name": "00116BT02-CR001#ESV-DW-0001 灏侀潰.pdf",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\PDF\\00116BT02-CR001#ESV-DW-0001 灏侀潰.pdf",
+        "rows": 0,
         "sizes": 0.148,
         "tab": null,
         "type": "pdf",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 168,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "ed673107-f854-4c07-a2c3-671f6a70fd59",
+        "eventid": "abd2691d-6ec7-4e49-9606-36092f83ce22",
         "extName": ".pdf",
         "guid": "8750e266b37e9c3572a4c06669eb8bd2",
+        "msg": null,
         "name": "00116BT02-CR001#ESV-DW-0001锛堝ぇ娌虫部娌崇┛瓒婂湴褰㈠浘锛�.pdf",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\PDF\\00116BT02-CR001#ESV-DW-0001锛堝ぇ娌虫部娌崇┛瓒婂湴褰㈠浘锛�.pdf",
+        "rows": 0,
         "sizes": 2.511,
         "tab": null,
         "type": "pdf",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 168,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "e3ac1b4c-673e-47dd-98ac-eac5bd52c8e0",
+        "eventid": "2e987219-5366-4aab-9a4f-0625279fa474",
         "extName": ".pdf",
         "guid": "02b83c10b866e8ca5098ad3b56f84bf4",
+        "msg": null,
         "name": "00116BT02-CR001#ESV-IN-0001锛堣祫鏂欏浘绾哥洰褰曪級.pdf",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\PDF\\00116BT02-CR001#ESV-IN-0001锛堣祫鏂欏浘绾哥洰褰曪級.pdf",
+        "rows": 0,
         "sizes": 0.233,
         "tab": null,
         "type": "pdf",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 179,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "acae8d44-f75b-411c-b30d-14943fb0a5ca",
+        "eventid": "d851f40d-7a7d-41c0-a944-6227e514450f",
         "extName": ".gdb",
         "guid": "0e32afa851f01c414a2e550f46950e3f",
+        "msg": null,
         "name": "1绫�.gdb",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\POI鏁版嵁\\1绫�.gdb",
+        "rows": 0,
         "sizes": 0.253,
         "tab": "瓒呯骇甯傚満",
         "type": "gdb",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 179,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "78fa92d8-79d5-477b-8f4a-e5fcbb64b8d7",
+        "eventid": "851df87c-4aef-4afc-a36d-b5c379202e38",
         "extName": ".gdb",
         "guid": "0e32afa851f01c414a2e550f46950e3f",
+        "msg": null,
         "name": "1绫�.gdb",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\POI鏁版嵁\\1绫�.gdb",
+        "rows": 0,
         "sizes": 0.253,
         "tab": "鍏洯骞垮満",
         "type": "gdb",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 179,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "ffa61065-6e2e-43ff-914a-c054b3b0ef6a",
+        "eventid": "3c0482a0-efe6-4d40-bc23-11db9d5b950a",
         "extName": ".gdb",
         "guid": "0e32afa851f01c414a2e550f46950e3f",
+        "msg": null,
         "name": "1绫�.gdb",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\POI鏁版嵁\\1绫�.gdb",
+        "rows": 0,
         "sizes": 0.253,
         "tab": "鍟嗗満",
         "type": "gdb",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 179,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "30010df9-ba2e-4ee4-98dc-3a835ca59d7b",
+        "eventid": "ca57afbf-6fcd-412d-b91c-44224ac9f764",
         "extName": ".gdb",
         "guid": "0e32afa851f01c414a2e550f46950e3f",
+        "msg": null,
         "name": "1绫�.gdb",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\POI鏁版嵁\\1绫�.gdb",
+        "rows": 0,
         "sizes": 0.253,
         "tab": "瀛︽牎",
         "type": "gdb",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 179,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "f8d970d2-09e9-4494-997f-ef36a932c8c7",
+        "eventid": "a37e480e-c03a-4c53-beef-636e0883d6f8",
         "extName": ".gdb",
         "guid": "0e32afa851f01c414a2e550f46950e3f",
+        "msg": null,
         "name": "1绫�.gdb",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\POI鏁版嵁\\1绫�.gdb",
+        "rows": 0,
         "sizes": 0.253,
         "tab": "鍖婚櫌",
         "type": "gdb",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 179,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "a325910e-9f3f-449d-ba3b-09537645fca9",
+        "eventid": "df6674b1-3692-4e20-a6c4-3ae888a3ba9c",
         "extName": ".gdb",
         "guid": "6b59075f0ff6611b815616bedc8b6af3",
+        "msg": null,
         "name": "pg.gdb",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\POI鏁版嵁\\pg.gdb",
+        "rows": 0,
         "sizes": 0.194,
         "tab": "dlg_25w_boul",
         "type": "gdb",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 179,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "02b1b469-fc16-4928-9d89-51fbe1a1ff64",
+        "eventid": "f2d649e7-4625-493d-8592-4a639987787f",
         "extName": ".gdb",
         "guid": "6b59075f0ff6611b815616bedc8b6af3",
+        "msg": null,
         "name": "pg.gdb",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\POI鏁版嵁\\pg.gdb",
+        "rows": 0,
         "sizes": 0.194,
         "tab": "dlg_25w_resa",
         "type": "gdb",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 179,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "ee0390dd-3ccf-4fd4-a688-882a9bb90e48",
+        "eventid": "980ab256-a33b-4c12-87dc-fcf042b3fd50",
         "extName": ".gdb",
         "guid": "6b59075f0ff6611b815616bedc8b6af3",
+        "msg": null,
         "name": "pg.gdb",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\POI鏁版嵁\\pg.gdb",
+        "rows": 0,
         "sizes": 0.194,
         "tab": "dlg_agnp",
         "type": "gdb",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 163,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "a8a98b1c-9b9a-4d1e-8d19-f69c2d2bb6e8",
+        "eventid": "d3a2b73b-dcf0-47b6-ae70-5549d676fe89",
         "extName": ".shp",
         "guid": "22181537f49f838b7b7f72730ae91873",
+        "msg": null,
         "name": "dlg_agnp.shp",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\POI鏁版嵁\\pgShp\\dlg_agnp.shp",
+        "rows": 0,
         "sizes": 0.007,
         "tab": "dlg_agnp.shp",
         "type": "shp",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 173,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "97f15976-e402-4f47-942c-58f80d6bcab4",
+        "eventid": "49cdf146-5f8d-4901-93d8-3fe1bd946e4f",
         "extName": ".osgb",
         "guid": "51bfe7e220ec7f612b61adfcb4358319",
+        "msg": null,
         "name": "10031030001B00120000.osgb",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\鍊炬枩鎽勫奖鏁版嵁\\10031030001B00120000.osgb",
+        "rows": 0,
         "sizes": 0.028,
         "tab": null,
         "type": "osgb",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 181,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "3b3e66ea-c09b-4dd5-84d3-05f714f515dd",
+        "eventid": "21940fca-143a-48d5-9345-967bd2988da2",
         "extName": ".xlsx",
         "guid": "5c62d97f98cb914260597f3ebf802d2d",
+        "msg": null,
         "name": "鍊炬枩鎽勫奖妯″瀷.xlsx",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\鍏冩暟鎹甛\鍊炬枩鎽勫奖妯″瀷.xlsx",
+        "rows": 0,
         "sizes": 0.009,
         "tab": null,
         "type": "xlsx",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 181,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "7cc191fb-f0a1-4b2b-af1a-50916caed745",
+        "eventid": "429dc05a-ed8a-4bea-b2c9-6f756abafec4",
         "extName": ".xlsx",
         "guid": "237e4e0b0f6de49ce3ed9333b9ad4b39",
+        "msg": null,
         "name": "鏁板瓧姝e皠褰卞儚鍥�.xlsx",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\鍏冩暟鎹甛\鏁板瓧姝e皠褰卞儚鍥�.xlsx",
+        "rows": 0,
         "sizes": 0.009,
         "tab": null,
         "type": "xlsx",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 181,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "a3f7e5c2-e88f-40b4-8e89-be9565449e50",
+        "eventid": "7ac4819c-7f34-47b6-b7b6-3217edefa4fc",
         "extName": ".xlsx",
         "guid": "00384620060869ab9dff9ea61cee0f91",
+        "msg": null,
         "name": "婵�鍏夌偣浜戞ā鍨�.xlsx",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\鍏冩暟鎹甛\婵�鍏夌偣浜戞ā鍨�.xlsx",
+        "rows": 0,
         "sizes": 0.009,
         "tab": null,
         "type": "xlsx",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 167,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "e8d43505-1fe5-4435-86d7-a9f61ab0d08c",
+        "eventid": "1c45b89e-be4d-4fa3-b395-d545cdcd8bae",
         "extName": ".docx",
         "guid": "af335ca6af935885ebed58a43fb26382",
+        "msg": null,
         "name": "00116BT02-CR001#ESV-DW-0101 灏侀潰.docx",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\鍙紪杈慭\00116BT02-CR001#ESV-DW-0101 灏侀潰.docx",
+        "rows": 0,
         "sizes": 0.059,
         "tab": null,
         "type": "docx",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 167,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "8e871be4-85e3-43ca-b308-cf887b2ec7da",
+        "eventid": "50cd5f88-5384-4333-81fe-178d998e84a5",
         "extName": ".dwg",
         "guid": "8c8de9189d5dd07590779ad7e2773f38",
+        "msg": null,
         "name": "00116BT02-CR001#ESV-DW-0101锛堝ぇ娌虫部娌崇┛瓒婂湴褰㈠浘锛�0.dwg",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\鍙紪杈慭\00116BT02-CR001#ESV-DW-0101锛堝ぇ娌虫部娌崇┛瓒婂湴褰㈠浘锛�0.dwg",
+        "rows": 0,
         "sizes": 1.195,
         "tab": null,
         "type": "dwg",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 167,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "2a20436d-8e7c-4782-b705-093d8cd88236",
+        "eventid": "4b9b0d61-802e-434b-9a23-b56e261ef939",
         "extName": ".dwg",
         "guid": "5a9750f34cc13cbfd2c04f24fb30b741",
+        "msg": null,
         "name": "00116BT02-CR001#ESV-DW-0101锛堝ぇ娌虫部娌崇┛瓒婄旱鏂潰鍥撅級0.dwg",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\鍙紪杈慭\00116BT02-CR001#ESV-DW-0101锛堝ぇ娌虫部娌崇┛瓒婄旱鏂潰鍥撅級0.dwg",
+        "rows": 0,
         "sizes": 0.49,
         "tab": null,
         "type": "dwg",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 167,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "19a26ebe-a5f6-40d8-b436-b4029e229701",
+        "eventid": "5007e6be-1e01-4c11-9287-7db9a20cd9a9",
         "extName": ".doc",
         "guid": "12d29544420995d1a8a52db3223ca6d5",
+        "msg": null,
         "name": "00116BT02-CR001#ESV-IN-0101锛堣祫鏂欏浘绾哥洰褰曪級.doc",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\鍙紪杈慭\00116BT02-CR001#ESV-IN-0101锛堣祫鏂欏浘绾哥洰褰曪級.doc",
+        "rows": 0,
         "sizes": 0.218,
         "tab": null,
         "type": "doc",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 163,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "bfa956e0-f4b4-47c4-ad82-b70fa1a16f35",
+        "eventid": "ac4eaa54-eb23-401e-a0c0-f2a2fff3ce9c",
         "extName": ".tif",
         "guid": "bb937bdee83df4517dc601d5b972d207",
+        "msg": null,
         "name": "43-transparent.tif",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\鏁板瓧姝e皠褰卞儚鍥綷\DOM_0.5m_tif\\43-transparent.tif",
+        "rows": 0,
         "sizes": 8.013,
         "tab": null,
         "type": "tif",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 163,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "4e39d9bf-85a3-479e-a579-cdf079f8a2c4",
+        "eventid": "9393a0a6-1430-447d-a769-c9d80515ddf2",
         "extName": ".tif",
         "guid": "4815287aeed899892e86222537a41f7d",
+        "msg": null,
         "name": "PNGRASTER.tif",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\鏁板瓧姝e皠褰卞儚鍥綷\DOM_0.5m_tif\\PNGRASTER.tif",
+        "rows": 0,
         "sizes": 2.268,
         "tab": null,
         "type": "tif",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 163,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "04a57649-1165-4c8c-95c9-f4c560abc843",
+        "eventid": "89000447-feb3-4e39-bdd8-e0b9a1a75b90",
         "extName": ".tif",
         "guid": "64c82ad1c5ae76a5a5a0ff50614eff76",
+        "msg": null,
         "name": "43_transparent_mosaic.tif",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\鏁板瓧姝e皠褰卞儚鍥綷\DOM_1m_tif\\43_transparent_mosaic.tif",
+        "rows": 0,
         "sizes": 2.259,
         "tab": null,
         "type": "tif",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 163,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "a67c4d82-d605-4d81-bc99-b2a2fd32c678",
+        "eventid": "a688f01a-6f2a-4993-8d7d-f37a8ff0e288",
         "extName": ".tif",
         "guid": "c001f124cb8431387ddcdfac9c596905",
+        "msg": null,
         "name": "DEM.tif",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\鏁板瓧楂樼▼妯″瀷\\DEM_2m\\DEM.tif",
+        "rows": 0,
         "sizes": 6.386,
         "tab": null,
         "type": "tif",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 169,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "e5064e8d-a654-4faf-b44b-d2816ebc09ce",
-        "extName": ".xlsx",
-        "guid": "3ec36e314f13f1112c0a56e35867e288",
-        "name": "~$骞抽潰鍥剧储寮曟枃浠�.xlsx",
-        "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\娴嬮噺琛ㄦ牸鏁版嵁\\~$骞抽潰鍥剧储寮曟枃浠�.xlsx",
-        "sizes": 0.001,
-        "tab": null,
-        "type": "xlsx",
-        "verid": 0
-    },
-    {
-        "createUser": 1,
-        "depid": 38,
-        "dirid": 169,
-        "entity": null,
-        "epsgCode": "EPSG:4490",
-        "eventid": "7b9eb09d-6f39-4eea-b7df-967813ea852c",
+        "eventid": "12e25ab8-3f33-41e4-9a01-bc17a0fe27a8",
         "extName": ".xlsx",
         "guid": "e9d9da535e7457d109e54850b7677f8d",
+        "msg": null,
         "name": "涓嚎鎴愭灉琛�.xlsx",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\娴嬮噺琛ㄦ牸鏁版嵁\\涓嚎鎴愭灉琛�.xlsx",
+        "rows": 0,
         "sizes": 0.013,
         "tab": null,
         "type": "xlsx",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 169,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "5029c3f3-c7d9-4c68-84b8-657a9795ee43",
+        "eventid": "d4b4dafd-f266-4214-aca0-4a10cb32a7bb",
         "extName": ".xlsx",
         "guid": "c2a52e1cb4700430c258e4dff4875368",
+        "msg": null,
         "name": "鍦伴潰绾�.xlsx",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\娴嬮噺琛ㄦ牸鏁版嵁\\鍦伴潰绾�.xlsx",
+        "rows": 0,
         "sizes": 0.052,
         "tab": null,
         "type": "xlsx",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 169,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "ddfce0c1-32c5-47a6-ba89-32758dcfe761",
+        "eventid": "6ba7c635-692b-4d87-8ce6-e6471efd2173",
         "extName": ".xlsx",
         "guid": "b64003be883d55d34df8033c1b408252",
+        "msg": null,
         "name": "骞抽潰鍥剧储寮曟枃浠�.xlsx",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\娴嬮噺琛ㄦ牸鏁版嵁\\骞抽潰鍥剧储寮曟枃浠�.xlsx",
+        "rows": 0,
         "sizes": 0.01,
         "tab": null,
         "type": "xlsx",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 169,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "bcb45fbc-192a-4ab5-95b5-5afe32e0efbd",
+        "eventid": "a123ea1f-6e2d-40a3-a80e-2517ceda8d82",
         "extName": ".xlsx",
         "guid": "44fa5a63f7b96dacd5267ad6373fdd28",
+        "msg": null,
         "name": "鎺у埗鐐�.xlsx",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\娴嬮噺琛ㄦ牸鏁版嵁\\鎺у埗鐐�.xlsx",
+        "rows": 0,
         "sizes": 0.009,
         "tab": null,
         "type": "xlsx",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 169,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "c00ae9fc-730f-41a5-9f48-cd91f63b4dc2",
+        "eventid": "83f800e4-4c21-4c0e-988a-6cc60eefc8f0",
         "extName": ".xlsx",
         "guid": "1972617f34e39fd1328a2d63801a632a",
+        "msg": null,
         "name": "绂绘暎鐐�.xlsx",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\娴嬮噺琛ㄦ牸鏁版嵁\\绂绘暎鐐�.xlsx",
+        "rows": 0,
         "sizes": 0.066,
         "tab": null,
         "type": "xlsx",
         "verid": 0
     },
     {
+        "createTime": null,
         "createUser": 1,
-        "depid": 38,
+        "depid": 1,
         "dirid": 174,
         "entity": null,
         "epsgCode": "EPSG:4490",
-        "eventid": "a7c29274-a1b1-444f-8e5f-c432f1f7d1b6",
+        "eventid": "df72816c-0590-4783-8594-3d395c28e407",
         "extName": ".laz",
         "guid": "2029c322846ea5327c33ac2050b53577",
+        "msg": null,
         "name": "CoV_4900E_54570N.laz",
         "path": "20230110010101_zip\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116bt02锛塡\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛塡\澶т腑鍨嬬┛璺ㄨ秺宸ョ▼锛圕R锛塡\CR001\\娴嬮噺锛圗SV锛塡\婵�鍏夌偣浜戞暟鎹甛\CoV_4900E_54570N.laz",
+        "rows": 0,
         "sizes": 19.834,
         "tab": null,
         "type": "laz",
-        "verid": 0
-    },
-    {
-        "createUser": 1,
-        "depid": 38,
-        "dirid": 163,
-        "entity": null,
-        "epsgCode": "EPSG:4490",
-        "eventid": "4a999c91-6e04-4cda-8886-0ce8669aa348",
-        "extName": ".xlsx",
-        "guid": "bed9ba49669d78d875def58040b6736e",
-        "name": "椤圭洰WBS瀵煎嚭.xlsx",
-        "path": "20230110010101\\椤圭洰WBS瀵煎嚭.xlsx",
-        "sizes": 0.01,
-        "tab": null,
-        "type": "xlsx",
         "verid": 0
     }
 ];
\ No newline at end of file
diff --git a/ExportMap/up.html b/ExportMap/up.html
index de3f3c2..0d33c29 100644
--- a/ExportMap/up.html
+++ b/ExportMap/up.html
@@ -11,7 +11,7 @@
     var app = {};
     var path = "20230110010101";
     var url = "http://127.0.0.1:12316/server/";
-    var token = "da6ec384-6eab-4cb5-850e-4cc134bf5935";
+    var token = "bb079561-da66-4a68-9fbc-889f50707b82";
 
     $(function () {
       $("#pathSpan").html(path);
@@ -486,6 +486,39 @@
         alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result);
       });
     }
+
+    // 缁煎悎鏁版嵁鍏ュ簱
+    function insertAllFiles() {
+      ajax(getUrl("dataUpload/insertFiles"), "POST", JSON.stringify(metaFiles), null, null, function (rs) {
+        console.log(rs);
+        alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result);
+      });
+    }
+
+    // 璇锋眰绠$嚎鍒嗘瀽
+    function selectPipeAnalysis() {
+      var data = {
+        gid: 24,
+        tabs: ["bd.dlg_25w_hydl", "bd.dlg_25w_lrdl", "bd.dlg_25w_lrrl", "bd.dlg_25w_hyda"]
+      };
+      ajax(getUrl("pipeline/selectPipeAnalysis"), "POST", JSON.stringify(data), null, null, function (rs) {
+        console.log(rs);
+        alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result);
+      });
+    }
+
+    // 绠$嚎鍒嗘瀽缁撴灉涓嬭浇
+    function downloadPipeAnalysis() {
+      var data = {
+        pwd: encrypt.encrypt("Test!321&456"),
+        gid: 24,
+        tabs: ["bd.dlg_25w_hydl", "bd.dlg_25w_lrdl", "bd.dlg_25w_lrrl", "bd.dlg_25w_hyda"]
+      };
+      ajax(getUrl("pipeline/downloadReq"), "POST", JSON.stringify(data), null, null, function (rs) {
+        console.log(rs);
+        alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result);
+      });
+    }
   </script>
 </head>
 <body>
@@ -513,6 +546,7 @@
     <input value="Shp鍏ュ簱" type="button" onclick="insertShps();" />
     <input value="Gdb鍏ュ簱" type="button" onclick="insertGdb();" />
     <input value="Mdb鍏ュ簱" type="button" onclick="insertMdb();" />
+    <input value="* 缁煎悎鏁版嵁鍏ュ簱 *" type="button" onclick="insertAllFiles();" />
     <hr />
     <br />
 
@@ -538,6 +572,8 @@
     鏁版嵁鐢宠锛�
     <input value="鏌ヨDB涓孩鍑虹殑鍗曚綅ID" type="button" onclick="selectDbOverflowDep();" />
     <input value="鎻掑叆鏁版嵁鐢宠" type="button" onclick="insertApply();" />
+    <input value="璇锋眰绠$嚎鍒嗘瀽" type="button" onclick="selectPipeAnalysis();" />
+    <input value="绠$嚎鍒嗘瀽缁撴灉涓嬭浇" type="button" onclick="downloadPipeAnalysis();" />
     <hr />
     <br />
   </form>
diff --git a/JavaCode/FrmMyBatisPlus.cs b/JavaCode/FrmMyBatisPlus.cs
index c945dca..bcf3c5a 100644
--- a/JavaCode/FrmMyBatisPlus.cs
+++ b/JavaCode/FrmMyBatisPlus.cs
@@ -320,6 +320,10 @@
 
                 str += strs[i].Length == 1 ? strs[i] : ToUpperFirst(strs[i]);
             }
+            if (str.Length == 1 && firstUpper)
+            {
+                return str.ToUpper();
+            }
 
             return str;
         }

--
Gitblit v1.9.3