From 7cbbe62fea4efded9cf73939a860f7bbb2169458 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 23 三月 2023 18:07:57 +0800
Subject: [PATCH] 1
---
ExportMap/cs/ConvertUtils.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ExportMap/cs/ConvertUtils.cs b/ExportMap/cs/ConvertUtils.cs
index 0a092d0..cca8fb3 100644
--- a/ExportMap/cs/ConvertUtils.cs
+++ b/ExportMap/cs/ConvertUtils.cs
@@ -35,15 +35,15 @@
/// <summary>
/// 妯″瀷杞崲
/// </summary>
- public static int Convert(XYZArgs args)
+ public static List<int> Convert(XYZArgs args)
{
- int count = 0;
string uploadFolder = Tools.GetSetting("uploadFolder");
string tilesFolder = Path.Combine(Tools.GetSetting("lfData"), "3d\\3dtiles");
List<SysMeta> list = XYZUtils.SelectMetas(args.ids, "and type in ('ifc', 'fbx', 'rvt')");
- if (null == list || list.Count == 0) return 0;
+ if (null == list || list.Count == 0) return null;
+ List<int> ids = new List<int>();
foreach (SysMeta meta in list)
{
string modelFile = Path.Combine(uploadFolder, meta.path);
@@ -63,13 +63,13 @@
if (File.Exists(jsonFile))
{
string path = jsonFile.Replace(Tools.GetSetting("lfData") + "\\", "");
- InsertToDB(meta, args, path);
+ int pubid = InsertToDB(meta, args, path);
- count++;
+ if (pubid > 0) ids.Add(pubid);
}
}
- return count;
+ return ids;
}
/// <summary>
@@ -121,9 +121,9 @@
/// <summary>
/// 鎻掑叆鏁版嵁搴�
/// </summary>
- private static void InsertToDB(SysMeta meta, XYZArgs args, string path)
+ private static int InsertToDB(SysMeta meta, XYZArgs args, string path)
{
- if (PubDBHelper.IsPublish(meta.id)) return;
+ if (PubDBHelper.IsPublish(meta.id)) return 0;
SysPublish sys = NewPublish(meta, args);
sys.path = path;
@@ -135,6 +135,8 @@
PubDBHelper.InsertLayer(sys, meta, 100);
PubDBHelper.InsertMetaPub(meta.id, pubid, args.userId);
}
+
+ return pubid;
}
/// <summary>
--
Gitblit v1.9.3