From 2b6ef5a1688f30b25c22f79f39a243df3b9a5b96 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 04 九月 2023 14:09:07 +0800
Subject: [PATCH] 修改地形生成接口

---
 ExportMap/cs/TerraUtils.cs |   20 ++++++++++++++++----
 ExportMap/Web.config       |    4 ++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/ExportMap/Web.config b/ExportMap/Web.config
index 4f84f6e..315f96e 100644
--- a/ExportMap/Web.config
+++ b/ExportMap/Web.config
@@ -26,8 +26,8 @@
     <add key="d3tilesPath" value="E:\WebSite\Cesium\Tool\3dtiles" />
     <!-- gocesiumtiler璺緞 -->
     <add key="tilerPath" value="E:\WebSite\Cesium\Tool\gocesiumtiler-1.2.3" />
-	<!-- GDAL璺緞 -->
-	<add key="gdalPath" value="E:\terrait\TianJin\Zip\release-1928-x64-dev\release-1928-x64\bin" />
+    <!-- GDAL璺緞 -->
+    <add key="gdalPath" value="E:\terrait\TianJin\Zip\release-1928-x64-dev\release-1928-x64\bin" />
     <!-- Mpt璺緞 -->
     <add key="mpt" value="D:\LF\data\mpt\tb.mpt" />
     <!-- PG杩炴帴 -->
diff --git a/ExportMap/cs/TerraUtils.cs b/ExportMap/cs/TerraUtils.cs
index 0340cef..42e626c 100644
--- a/ExportMap/cs/TerraUtils.cs
+++ b/ExportMap/cs/TerraUtils.cs
@@ -119,20 +119,32 @@
             try
             {
                 List<SysMeta> metas = XYZUtils.SelectMetas(args.ids, "and type in ('tif', 'tiff')");
-                if (null == metas || metas.Count == 0) return null;
+                if (null == metas || metas.Count == 0)
+                {
+                    LogOut.Info("TerraUtils锛氭壘涓嶅埌鍏冩暟鎹��");
+                    return null;
+                }
 
                 string dirPath = GetTerrainPath(args.dircode);
                 //if (Directory.Exists(dirPath)) Tools.DelPath(dirPath); // 宸插瓨鍦ㄧ殑锛屽垹闄�
 
                 tifFile = Merge(metas, args, ref err);
-                if (!File.Exists(tifFile)) return null;
+                if (!File.Exists(tifFile))
+                {
+                    LogOut.Info("TerraUtils锛氭壘涓嶅埌tifFile鏁版嵁銆�");
+                    return null;
+                }
 
                 string json = Path.Combine(dirPath, "layer.json");
                 if (File.Exists(json)) File.Delete(json);
                 //Generate(args, tifFile, ref err);
                 CreateTerrain(args, tifFile, ref err);
 
-                if (!File.Exists(json)) return null;
+                if (!File.Exists(json))
+                {
+                    LogOut.Info("TerraUtils锛氭壘涓嶅埌layer.json鏂囦欢銆�");
+                    return null;
+                }
                 Complement(args);
 
                 List<int> ids = new List<int>();
@@ -196,7 +208,7 @@
                 err = Tools.ExecCmd(task, cmd, true);
 
                 task = TaskDBHelper.SelectById(task.id);
-                if (null == task || task.status != 2) return string.Empty;
+                if (null == task || task.status != 2) LogOut.Info("TerraUtils锛氫换鍔′负绌烘垨鐘舵�佷笉涓�2銆�");
 
                 return tifFile;
             }

--
Gitblit v1.9.3