From d3602925206857045b993e67bf82697168bde3c7 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 17 三月 2023 18:01:18 +0800
Subject: [PATCH] 1
---
ExportMap/cs/ConvertUtils.cs | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ExportMap/cs/ConvertUtils.cs b/ExportMap/cs/ConvertUtils.cs
index f5b76a9..bb2d424 100644
--- a/ExportMap/cs/ConvertUtils.cs
+++ b/ExportMap/cs/ConvertUtils.cs
@@ -35,13 +35,13 @@
/// <summary>
/// 妯″瀷杞崲
/// </summary>
- public static int Convert(List<int> ids)
+ public static int Convert(XYZArgs args)
{
int count = 0;
string uploadFolder = Tool.GetSetting("uploadFolder");
string tilesFolder = Path.Combine(Tool.GetSetting("lfData"), "3d\\3dtiles");
- List<SysMeta> list = XYZUtils.selectMetas(ids, "and type in ('ifc', 'fbx', 'rvt')");
+ List<SysMeta> list = XYZUtils.selectMetas(args.ids, "and type in ('ifc', 'fbx', 'rvt')");
if (null == list || list.Count == 0) return 0;
foreach (SysMeta meta in list)
@@ -60,10 +60,13 @@
ExecNavisworks(modelFile, configFile);
File.Delete(configFile);
- count += File.Exists(jsonFile) ? 1 : 0;
+ if (File.Exists(jsonFile))
+ {
+ string path = jsonFile.Replace(Tool.GetSetting("lfData") + "\\", "");
+ InsertToDB(meta, args, path);
- string path = jsonFile.Replace(Tool.GetSetting("lfData") + "\\", "");
- InsertToDB(meta, path);
+ count++;
+ }
}
return count;
@@ -118,11 +121,11 @@
/// <summary>
/// 鎻掑叆鏁版嵁搴�
/// </summary>
- private static void InsertToDB(SysMeta meta, string path)
+ private static void InsertToDB(SysMeta meta, XYZArgs args, string path)
{
if (PubDBHelper.IsPublish(meta.id)) return;
- SysPublish sys = NewPublish(meta);
+ SysPublish sys = NewPublish(meta, args);
sys.path = path;
int pubid = PubDBHelper.InsertPublish(sys);
@@ -135,7 +138,7 @@
/// <summary>
/// 鍒涘缓鏁版嵁鍙戝竷绫�
/// </summary>
- private static SysPublish NewPublish(SysMeta meta)
+ private static SysPublish NewPublish(SysMeta meta, XYZArgs args)
{
SysPublish sp = new SysPublish();
sp.name = meta.name;
@@ -143,11 +146,11 @@
sp.type = meta.type;
sp.status = 3;
sp.dirid = meta.dircode;
- sp.depid = meta.depcode;
+ sp.depid = args.depcode;
sp.min = 0;
sp.max = 0;
sp.json = null;
- sp.create_user = meta.create_user;
+ sp.create_user = args.userId;
sp.geom = null;
sp.bak = null;
--
Gitblit v1.9.3