From 2885ecdc25cd1e64158e4a94b179a6f2362237c1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 12 六月 2023 11:26:38 +0800
Subject: [PATCH] 添加单体模型参数
---
ExportMap/cs/SGUtils.cs | 1 +
ExportMap/cs/Tools.cs | 10 ++++++++++
ExportMap/cs/ConvertUtils.cs | 2 ++
ExportMap/Models/XYZArgs.cs | 5 +++++
ExportMap/db/PubDBHelper.cs | 9 ++++++---
5 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/ExportMap/Models/XYZArgs.cs b/ExportMap/Models/XYZArgs.cs
index 948f2a7..13f4201 100644
--- a/ExportMap/Models/XYZArgs.cs
+++ b/ExportMap/Models/XYZArgs.cs
@@ -62,6 +62,11 @@
public List<int> ids { set; get; }
/// <summary>
+ /// 鍗曚綋妯″瀷闆嗗悎
+ /// </summary>
+ public List<int> models { set; get; }
+
+ /// <summary>
/// 鏄�/鍚﹀叏鏂板彂甯�
/// </summary>
public bool isNew { set; get; }
diff --git a/ExportMap/cs/ConvertUtils.cs b/ExportMap/cs/ConvertUtils.cs
index cfc0eae..3c99e0e 100644
--- a/ExportMap/cs/ConvertUtils.cs
+++ b/ExportMap/cs/ConvertUtils.cs
@@ -43,6 +43,8 @@
List<SysMeta> list = XYZUtils.SelectMetas(args.ids, "and type in ('ifc', 'fbx', 'rvt')");
if (null == list || list.Count == 0) return null;
+ Tools.SetIsModel(args, list);
+
List<int> ids = new List<int>();
foreach (SysMeta meta in list)
{
diff --git a/ExportMap/cs/SGUtils.cs b/ExportMap/cs/SGUtils.cs
index 365653f..ee7138a 100644
--- a/ExportMap/cs/SGUtils.cs
+++ b/ExportMap/cs/SGUtils.cs
@@ -71,6 +71,7 @@
//err = LinkFiles(list);
//if (!string.IsNullOrEmpty(err)) return 0;
+ Tools.SetIsModel(args, list);
MoveFiles(list);
string names = GetNames(list);
diff --git a/ExportMap/cs/Tools.cs b/ExportMap/cs/Tools.cs
index dc9fe60..58d401b 100644
--- a/ExportMap/cs/Tools.cs
+++ b/ExportMap/cs/Tools.cs
@@ -262,5 +262,15 @@
return ExecCmd(list);
}
+
+ /// <summary>
+ /// 璁剧疆鍗曚綋妯″瀷鍙傛暟
+ /// </summary>
+ public static void SetIsModel(XYZArgs args, List<SysMeta> list)
+ {
+ if (null == args.models || args.models.Count != args.ids.Count) return;
+
+ //
+ }
}
}
diff --git a/ExportMap/db/PubDBHelper.cs b/ExportMap/db/PubDBHelper.cs
index e775682..e26f1d2 100644
--- a/ExportMap/db/PubDBHelper.cs
+++ b/ExportMap/db/PubDBHelper.cs
@@ -157,7 +157,7 @@
/// </summary>
public static int SelectLayerPid(SysPublish sys, SysMeta meta)
{
- string sql = GetSelectLayerPidSql(meta);
+ string sql = GetSelectLayerPidSql(meta, meta.ismeta);
int pid = Tools.DBHelper.GetIntScalar(sql);
string dirid = sys.dirid.Substring(0, 2);
@@ -183,7 +183,7 @@
/// <summary>
/// 鑾峰彇鏌ヨ鍥惧眰鐖惰妭鐐笽D鐨凷QL
/// </summary>
- public static string GetSelectLayerPidSql(SysMeta meta)
+ public static string GetSelectLayerPidSql(SysMeta meta, int isModel)
{
string noneSql = "select id from lf.sys_layer where cn_name = '鍏朵粬' and pid = (select id from lf.sys_layer where cn_name = '宸ョ▼鏁版嵁' order by pid limit 1)";
@@ -201,7 +201,10 @@
if ("DOM".Equals(meta.type))
return "select id from lf.sys_layer where cn_name = '鏁板瓧姝ｅ皠褰卞儚鍥�' and pid = (select id from lf.sys_layer where cn_name = '娴嬬粯' order by pid limit 1)";
else
- return "select id from lf.sys_layer where cn_name = '鍗曚綋妯″瀷' and pid = (select id from lf.sys_layer where cn_name = '娴嬬粯' order by pid limit 1)";
+ {
+ //return "select id from lf.sys_layer where cn_name = '鍗曚綋妯″瀷' and pid = (select id from lf.sys_layer where cn_name = '娴嬬粯' order by pid limit 1)";
+ return string.Format("select id from lf.sys_layer where cn_name = '{0}' and pid = (select id from lf.sys_layer where cn_name = '娴嬬粯' order by pid limit 1)", isModel > 0 ? "鍗曚綋妯″瀷" : "鍊炬枩鎽勫奖鏁版嵁");
+ }
}
if (meta.dirname.IndexOf("\\鍦扮伨") > -1)
--
Gitblit v1.9.3