From c2a36e2752e70bd4c4a2c040a70fea897fd47a13 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 21 六月 2023 11:27:13 +0800
Subject: [PATCH] 1

---
 ExportMap/Controllers/ConvertController.cs |  192 ++++++++++++++++++++++++++---------------------
 1 files changed, 107 insertions(+), 85 deletions(-)

diff --git a/ExportMap/Controllers/ConvertController.cs b/ExportMap/Controllers/ConvertController.cs
index 80b2037..ce196c1 100644
--- a/ExportMap/Controllers/ConvertController.cs
+++ b/ExportMap/Controllers/ConvertController.cs
@@ -21,25 +21,15 @@
         }
 
         /// <summary>
-        /// 杞崲涓篢ileset
+        /// 杞崲Tileset
         /// </summary>
         [HttpPost]
         public ResponseMsg<string> ToTileset([FromBody]XYZArgs args)
         {
             try
             {
-                if (null == args || null == args.ids || args.ids.Count == 0)
-                {
-                    return ResponseMsg<string>.fail("璇疯緭鍏ュ厓鏁版嵁ID");
-                }
-                if (string.IsNullOrWhiteSpace(args.token))
-                {
-                    return ResponseMsg<string>.fail("娌℃湁浠ょ墝");
-                }
-                if (!ExportUtil.VerifyToken(args.token))
-                {
-                    return ResponseMsg<string>.fail("浠ょ墝鏃犳晥");
-                }
+                ResponseMsg<string> msg = checkArgs(args);
+                if (null != args) return msg;
 
                 List<int> rs = ConvertUtils.Convert(args);
                 if (null == rs || rs.Count == 0)
@@ -57,43 +47,17 @@
         }
 
         /// <summary>
-        /// 杞崲涓虹摝鐗�
+        /// 杞崲鐡︾墖
         /// </summary>
         [HttpPost]
         public ResponseMsg<string> ToTiles([FromBody]XYZArgs args)
         {
             try
             {
-                if (null == args || null == args.ids || args.ids.Count == 0)
-                {
-                    return ResponseMsg<string>.fail("璇疯緭鍏ュ厓鏁版嵁ID");
-                }
-                if (string.IsNullOrWhiteSpace(args.token))
-                {
-                    return ResponseMsg<string>.fail("娌℃湁浠ょ墝");
-                }
-                if (!ExportUtil.VerifyToken(args.token))
-                {
-                    return ResponseMsg<string>.fail("浠ょ墝鏃犳晥");
-                }
-                if (string.IsNullOrWhiteSpace(args.dircode))
-                {
-                    return ResponseMsg<string>.fail("鍗曚綅浠g爜涓嶈兘涓虹┖");
-                }
+                ResponseMsg<string> msg = checkArgs(args, true);
+                if (null != args) return msg;
 
-                if (args.min < 0) args.min = 0;
-                if (args.min > 22) args.min = 22;
-                if (args.max < 0) args.max = 0;
-                if (args.max > 22) args.max = 22;
-                if (args.min > args.max)
-                {
-                    int tmp = args.min;
-                    args.min = args.max;
-                    args.max = tmp;
-                }
-
-                if (args.noData < 0) args.noData = 0;
-                if (args.noData > 255) args.noData = 255;
+                checkMinMax(args, true);
 
                 string err = null;
                 List<int> rs = XYZUtils.Generate(args, ref err);
@@ -112,29 +76,18 @@
         }
 
         /// <summary>
-        /// 杞崲涓虹摝鐗�
+        /// 杞崲鐡︾墖
         /// </summary>
         [HttpPost]
         public ResponseMsg<string> ToSG([FromBody]XYZArgs args)
         {
             try
             {
-                if (null == args || null == args.ids || args.ids.Count == 0)
-                {
-                    return ResponseMsg<string>.fail("璇疯緭鍏ュ厓鏁版嵁ID");
-                }
-                if (string.IsNullOrWhiteSpace(args.token))
-                {
-                    return ResponseMsg<string>.fail("娌℃湁浠ょ墝");
-                }
-                if (!ExportUtil.VerifyToken(args.token))
-                {
-                    return ResponseMsg<string>.fail("浠ょ墝鏃犳晥");
-                }
-
-                SGUtils utils = new SGUtils();
+                ResponseMsg<string> msg = checkArgs(args);
+                if (null != args) return msg;
 
                 string err = null;
+                SGUtils utils = new SGUtils();
                 List<int> rs = utils.Release(args, ref err);
                 if (null == rs || rs.Count == 0)
                 {
@@ -151,40 +104,17 @@
         }
 
         /// <summary>
-        /// 杞崲涓哄湴褰�
+        /// 杞崲鍦板舰
         /// </summary>
         [HttpPost]
         public ResponseMsg<string> ToTerra([FromBody]XYZArgs args)
         {
             try
             {
-                if (null == args || null == args.ids || args.ids.Count == 0)
-                {
-                    return ResponseMsg<string>.fail("璇疯緭鍏ュ厓鏁版嵁ID");
-                }
-                if (string.IsNullOrWhiteSpace(args.token))
-                {
-                    return ResponseMsg<string>.fail("娌℃湁浠ょ墝");
-                }
-                if (!ExportUtil.VerifyToken(args.token))
-                {
-                    return ResponseMsg<string>.fail("浠ょ墝鏃犳晥");
-                }
-                if (string.IsNullOrWhiteSpace(args.dircode))
-                {
-                    return ResponseMsg<string>.fail("鍗曚綅浠g爜涓嶈兘涓虹┖");
-                }
+                ResponseMsg<string> msg = checkArgs(args, true);
+                if (null != args) return msg;
 
-                if (args.min < 0) args.min = 0;
-                if (args.min > 22) args.min = 22;
-                if (args.max < 0) args.max = 0;
-                if (args.max > 22) args.max = 22;
-                if (args.min > args.max)
-                {
-                    int tmp = args.min;
-                    args.min = args.max;
-                    args.max = tmp;
-                }
+                checkMinMax(args);
 
                 string err = null;
                 List<int> rs = TerraUtils.Generate(args, ref err);
@@ -201,5 +131,97 @@
                 return ResponseMsg<string>.fail(ex.Message);
             }
         }
+
+        /// <summary>
+        /// 杞崲LAS
+        /// </summary>
+        [HttpPost]
+        public ResponseMsg<string> ToLas([FromBody]XYZArgs args)
+        {
+            try
+            {
+                ResponseMsg<string> msg = checkArgs(args);
+                if (null != args) return msg;
+
+                //
+
+                return null;
+            }
+            catch (Exception ex)
+            {
+                LogOut.Error(ex.Message + "\r\n" + ex.StackTrace);
+                return ResponseMsg<string>.fail(ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 杞崲OSGB
+        /// </summary>
+        [HttpPost]
+        public ResponseMsg<string> ToOsgb([FromBody]XYZArgs args)
+        {
+            try
+            {
+                ResponseMsg<string> msg = checkArgs(args);
+                if (null != args) return msg;
+
+                //
+
+                return null;
+            }
+            catch (Exception ex)
+            {
+                LogOut.Error(ex.Message + "\r\n" + ex.StackTrace);
+                return ResponseMsg<string>.fail(ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 妫�鏌ュ弬鏁�
+        /// </summary>
+        private ResponseMsg<string> checkArgs(XYZArgs args, bool checkDir = false)
+        {
+            if (null == args || null == args.ids || args.ids.Count == 0)
+            {
+                return ResponseMsg<string>.fail("璇疯緭鍏ュ厓鏁版嵁ID");
+            }
+            if (string.IsNullOrWhiteSpace(args.token))
+            {
+                return ResponseMsg<string>.fail("娌℃湁浠ょ墝");
+            }
+            if (!ExportUtil.VerifyToken(args.token))
+            {
+                return ResponseMsg<string>.fail("浠ょ墝鏃犳晥");
+            }
+            if (checkDir && string.IsNullOrWhiteSpace(args.dircode))
+            {
+                return ResponseMsg<string>.fail("鍗曚綅浠g爜涓嶈兘涓虹┖");
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// 妫�鏌ユ渶澶ф渶灏忓��
+        /// </summary>
+        private void checkMinMax(XYZArgs args, bool checkNoData = false)
+        {
+            if (args.min < 0) args.min = 0;
+            if (args.min > 22) args.min = 22;
+            if (args.max < 0) args.max = 0;
+            if (args.max > 22) args.max = 22;
+            if (args.min > args.max)
+            {
+                int tmp = args.min;
+                args.min = args.max;
+                args.max = tmp;
+            }
+
+            if (checkNoData)
+            {
+                if (args.noData < 0) args.noData = 0;
+                if (args.noData > 255) args.noData = 255;
+            }
+        }
     }
 }

--
Gitblit v1.9.3