From a1298c2750431e78dd4c8c57a80388b2bad615e3 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 08 八月 2023 10:15:53 +0800
Subject: [PATCH] 1

---
 ExportMap/cs/XYZUtils.cs |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ExportMap/cs/XYZUtils.cs b/ExportMap/cs/XYZUtils.cs
index 73cc786..0dc8cda 100644
--- a/ExportMap/cs/XYZUtils.cs
+++ b/ExportMap/cs/XYZUtils.cs
@@ -91,7 +91,9 @@
             //if (args.isNew && Directory.Exists(xyzPath)) Tools.DelPath(xyzPath); // 宸插瓨鍦ㄧ殑锛屽垹闄�
             if (!Directory.Exists(xyzPath)) Directory.CreateDirectory(xyzPath);
 
-            WriteText(txtFile, list);
+            int pubid = PubDBHelper.GetPushlishId(args.dircode, "DOM");
+            List<int> mids = PubDBHelper.GetPublishMetaId(pubid);
+            WriteText(txtFile, list, mids);
 
             string cmd = string.Format("python \"{0}\" -qgz {1} -file \"{2}\" -out \"{3}\" -min {4} -max {5} -noData {6}", PyFile, Qgz, txtFile, xyzPath, args.min, args.max, args.noData);
             SysTask task = TaskDBHelper.CreateTask(args, "DOM", "褰卞儚鏁版嵁(DOM)");
@@ -105,7 +107,7 @@
             if (File.Exists(viewFile))
             {
                 string path = "2d\\tiles" + "\\" + args.dircode;
-                int pubid = InsertToDB(list, args, path);
+                pubid = InsertToDB(list, args, path);
 
                 if (pubid > 0) ids.Add(pubid);
             }
@@ -128,7 +130,7 @@
         /// <summary>
         /// 鍐欐枃鏈枃浠�
         /// </summary>
-        private static void WriteText(string file, List<SysMeta> list)
+        private static void WriteText(string file, List<SysMeta> list, List<int> mids)
         {
             string uploadFolder = Tools.GetSetting("uploadFolder");
 
@@ -136,7 +138,10 @@
             foreach (SysMeta meta in list)
             {
                 string filePath = Path.Combine(uploadFolder, meta.path);
-                if (File.Exists(filePath)) files.Add(filePath);
+                if (!File.Exists(filePath)) continue;
+
+                bool exists = mids.Contains(meta.id);
+                files.Add(string.Format("{0},{1}", filePath, exists ? 1 : 0));
             }
             //files.Add(@"E:\01.Data\33.DOM\2.澶у簡DOM\5154.50-415.50.tif");
             //files.Add(@"E:\01.Data\33.DOM\2.澶у簡DOM\5154.50-416.00.tif");

--
Gitblit v1.9.3