From 4c73ef378dab15cd93264118f7d45c4043f6c13e Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 16 三月 2023 17:33:35 +0800
Subject: [PATCH] 1

---
 ExportMap/cs/XYZUtils.cs                   |   12 ++++++------
 ExportMap/Controllers/ConvertController.cs |   20 ++++++++++++++++++++
 ExportMap/cs/ConvertUtils.cs               |    4 +++-
 ExportMap/Models/XYZArgs.cs                |    5 -----
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/ExportMap/Controllers/ConvertController.cs b/ExportMap/Controllers/ConvertController.cs
index bf239e8..38299cb 100644
--- a/ExportMap/Controllers/ConvertController.cs
+++ b/ExportMap/Controllers/ConvertController.cs
@@ -67,5 +67,25 @@
                 return ResponseMsg<int>.fail(ex.Message);
             }
         }
+
+        /// <summary>
+        /// 杞崲涓虹摝鐗�
+        /// </summary>
+        [HttpPost]
+        public ResponseMsg<int> ToSG([FromBody]XYZArgs args)
+        {
+            try
+            {
+
+                int count = 0;
+
+                return ResponseMsg<int>.success("鎴愬姛", count);
+            }
+            catch (Exception ex)
+            {
+                LogOut.Error(ex.StackTrace);
+                return ResponseMsg<int>.fail(ex.Message);
+            }
+        }
     }
 }
diff --git a/ExportMap/Models/XYZArgs.cs b/ExportMap/Models/XYZArgs.cs
index 3ebe9ee..d691106 100644
--- a/ExportMap/Models/XYZArgs.cs
+++ b/ExportMap/Models/XYZArgs.cs
@@ -16,11 +16,6 @@
         }
 
         /// <summary>
-        /// ID
-        /// </summary>
-        public int id { set; get; }
-
-        /// <summary>
         /// 鍦板浘鏈�灏忕骇鍒�
         /// </summary>
         public int min { set; get; }
diff --git a/ExportMap/cs/ConvertUtils.cs b/ExportMap/cs/ConvertUtils.cs
index 63cece0..89a5d10 100644
--- a/ExportMap/cs/ConvertUtils.cs
+++ b/ExportMap/cs/ConvertUtils.cs
@@ -65,7 +65,9 @@
             Process p = null;
             try
             {
-                string args = string.Format("-licensing AdLM -OpenFile \"{0}\" -ExecuteAddInPlugin \"EngineBatch_Sample.SmartEarth\" \"{1}\" -NoGui -Exit", modelFile, configFile); // -log D:\\xyz\\auto\\log.txt
+                //string log = Path.Combine(ExportUtil.SourcesPath, "ns_log.txt");
+                //string args = string.Format("-licensing AdLM -OpenFile \"{0}\" -ExecuteAddInPlugin \"EngineBatch_Sample.SmartEarth\" \"{1}\" -log \"{2}\" -NoGui -Exit", modelFile, configFile, log);
+                string args = string.Format("-licensing AdLM -OpenFile \"{0}\" -ExecuteAddInPlugin \"EngineBatch_Sample.SmartEarth\" \"{1}\" -NoGui -Exit", modelFile, configFile);
                 LogOut.Info("Args:" + args);
 
                 // 鍚姩杩涚▼
diff --git a/ExportMap/cs/XYZUtils.cs b/ExportMap/cs/XYZUtils.cs
index f2de7c3..02686f6 100644
--- a/ExportMap/cs/XYZUtils.cs
+++ b/ExportMap/cs/XYZUtils.cs
@@ -50,12 +50,13 @@
         /// <returns>鏁版嵁鍙戝竷ID</returns>
         public static int Generate(XYZArgs args, ref string err)
         {
-            string tifFile = Path.Combine(Tool.TempDir, ExportUtil.DateStr + ".txt");
-            string xyzPath = Path.Combine(SGUtils.LFData, "2d\\tiles", args.id.ToString());
-            if (!Directory.Exists(xyzPath)) Directory.CreateDirectory(xyzPath);
-
             List<SysMeta> list = selectMetas(args.ids, "and type in ('tif', 'tiff', 'img')");
             if (null == list || list.Count == 0) return 0;
+
+            int id = list[0].id;
+            string tifFile = Path.Combine(Tool.TempDir, ExportUtil.DateStr + ".txt");
+            string xyzPath = Path.Combine(SGUtils.LFData, "2d\\tiles", id.ToString());
+            if (!Directory.Exists(xyzPath)) Directory.CreateDirectory(xyzPath);
 
             WriteText(tifFile, list);
 
@@ -71,7 +72,6 @@
 
             //string newPy = tifFile.Replace(".txt", ".py").Replace("\\", "\\\\");
             //File.WriteAllText(newPy, pyText);
-           
             //string cmd = string.Format("exec(open('{0}', 'r', encoding='utf-8').read()) & exit()", newPy);
 
             err = ExecCmd(cmd);
@@ -80,7 +80,7 @@
 
             string viewFile = Path.Combine(xyzPath, "view.html");
 
-            return File.Exists(viewFile) ? args.id : 0;
+            return File.Exists(viewFile) ? id : 0;
         }
 
         /// <summary>

--
Gitblit v1.9.3