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 +++++++++++++++++++++-----------------
ExportMap/up.html | 4
ExportMap/js/insertFiles.js | 69 +++++++++++++
3 files changed, 178 insertions(+), 87 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("鍗曚綅浠ｇ爜涓嶈兘涓虹┖");
- }
+ 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("鍗曚綅浠ｇ爜涓嶈兘涓虹┖");
- }
+ 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("鍗曚綅浠ｇ爜涓嶈兘涓虹┖");
+ }
+
+ 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;
+ }
+ }
}
}
diff --git a/ExportMap/js/insertFiles.js b/ExportMap/js/insertFiles.js
index 4bb766c..67de3ff 100644
--- a/ExportMap/js/insertFiles.js
+++ b/ExportMap/js/insertFiles.js
@@ -1717,3 +1717,72 @@
"xlsPath": null
}
];
+
+var metaFiles = [
+ {
+ "createTime": null,
+ "createUser": 1,
+ "depcode": "00",
+ "dircode": "0102",
+ "entity": null,
+ "epsgCode": "EPSG:4490",
+ "eventid": "9859170c-5464-475f-b174-fd9d8ef2973b",
+ "extName": ".osgb",
+ "guid": "ca3a73591c0638839a472176d2bb1a96",
+ "isMeta": false,
+ "msg": null,
+ "name": "3-1鍊炬枩妯″瀷-涓崼绔�",
+ "path": "20230621_zip\\3-1鍊炬枩妯″瀷-涓崼绔�",
+ "records": 0,
+ "rows": 0,
+ "sizes": 0.187,
+ "tab": null,
+ "type": "osgb",
+ "verid": 0,
+ "xlsPath": null
+ },
+ {
+ "createTime": null,
+ "createUser": 1,
+ "depcode": "00",
+ "dircode": "0102",
+ "entity": null,
+ "epsgCode": "EPSG:4490",
+ "eventid": "9ed8ead8-c357-4c5c-8a46-956039dc34b1",
+ "extName": ".las",
+ "guid": "ca9d97f192d2c3742f22d48e8b4fa1a9",
+ "isMeta": false,
+ "msg": null,
+ "name": "HL_group1_densified_point_cloud_part_1.las",
+ "path": "20230621_zip\\HL_group1_densified_point_cloud_part_1.las",
+ "records": 0,
+ "rows": 0,
+ "sizes": 185.719,
+ "tab": null,
+ "type": "las",
+ "verid": 0,
+ "xlsPath": null
+ },
+ {
+ "createTime": null,
+ "createUser": 1,
+ "depcode": "00",
+ "dircode": "0102",
+ "entity": null,
+ "epsgCode": "EPSG:4490",
+ "eventid": "81fee9da-8b6e-43e8-a277-da61e6d1dc24",
+ "extName": ".docx",
+ "guid": "2e3789b2aa7dd7e55d07ac4383eb9013",
+ "isMeta": false,
+ "msg": null,
+ "name": "绠�鎶�.docx",
+ "path": "20230621_zip\\绠�鎶�.docx",
+ "records": 0,
+ "rows": 0,
+ "sizes": 0.011,
+ "tab": null,
+ "type": "docx",
+ "verid": 0,
+ "xlsPath": null
+ }
+];
diff --git a/ExportMap/up.html b/ExportMap/up.html
index 4b6904e..a8ce186 100644
--- a/ExportMap/up.html
+++ b/ExportMap/up.html
@@ -10,10 +10,10 @@
<script src="js/insertFiles.js"></script>
<script>
var app = {};
- var path = "20230425";
+ var path = "20230621";
var url = "http://127.0.0.1:12316/server/";
//var token = "c36e4f94-dfde-401e-9967-2c4a449f1300";
- var token = "1305cff2-516c-4d1f-af9a-9e53206f129c";
+ var token = "372253ed-0d4a-4f50-908f-d1892e4fe8e1";
$(function () {
$("#pathSpan").html(path);
--
Gitblit v1.9.3