From fe598c1ac81772e661647444056b448c085e8f70 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 14 三月 2023 17:39:33 +0800
Subject: [PATCH] 1
---
ExportMap/cs/ConvertUtils.cs | 14 ++++++++++----
ExportMap/export.html | 34 +++++++++++++++++++++++++++++++++-
ExportMap/Web.config | 2 +-
3 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/ExportMap/Web.config b/ExportMap/Web.config
index bb4807a..a41ac58 100644
--- a/ExportMap/Web.config
+++ b/ExportMap/Web.config
@@ -16,7 +16,7 @@
<!-- SG鐨凞B搴� -->
<add key="sgDB" value="E:\soft\SGConfig\catalog.db"/>
<!-- PG杩炴帴 -->
- <add key="pgConn" value="Server=127.0.0.1;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>
+ <add key="pgConn" value="Server=192.168.20.205;Port=5433;Database=langfang;User Id=postgres;Password=Postgres!_14_Lf;"/>
<add key="webpages:Version" value="3.0.0.0"/>
<add key="webpages:Enabled" value="false"/>
<add key="ClientValidationEnabled" value="true"/>
diff --git a/ExportMap/cs/ConvertUtils.cs b/ExportMap/cs/ConvertUtils.cs
index ac8787b..929c2db 100644
--- a/ExportMap/cs/ConvertUtils.cs
+++ b/ExportMap/cs/ConvertUtils.cs
@@ -8,12 +8,15 @@
namespace ExportMap.cs
{
+ /// <summary>
+ /// 妯″瀷杞崲宸ュ叿
+ /// </summary>
public class ConvertUtils
{
/// <summary>
/// 宸ヤ綔閰嶇疆
/// </summary>
- public static string JobConfig = "{ \"format\": \"3dtiles\", \"mode\": 0, \"outputPath\": \"{0}\", \"outputOptions\": null, \"levelOfDetail\": -1, \"levelOfDetailText\": \"Auto\", \"georeferenced\": null }";
+ public static string JobConfig = "{{ \"format\": \"3dtiles\", \"mode\": 0, \"outputPath\": \"{0}\", \"outputOptions\": null, \"levelOfDetail\": -1, \"levelOfDetailText\": \"Auto\", \"georeferenced\": null }}";
/// <summary>
/// Roamer.exe
@@ -29,7 +32,9 @@
string uploadFolder = Tool.GetSetting("uploadFolder");
string tilesFolder = Path.Combine(Tool.GetSetting("lfData"), "3d\\3dtiles");
- List<SysMeta> list = XYZUtils.selectMetas(ids, "type in ('ifc', 'fbx', 'rvt')");
+ List<SysMeta> list = XYZUtils.selectMetas(ids, "and type in ('ifc', 'fbx', 'rvt')");
+ if (null == list || list.Count == 0) return 0;
+
foreach (SysMeta meta in list)
{
try
@@ -47,6 +52,7 @@
WriteText(configFile, string.Format(JobConfig, outPath));
ExecNavisworks(modelFile, configFile);
+ File.Delete(configFile);
count++;
}
@@ -62,9 +68,9 @@
/// <summary>
/// 杩愯Navisworks
/// </summary>
- public static string ExecNavisworks(string modelFile, string outPath)
+ public static string ExecNavisworks(string modelFile, string configFile)
{
- string args = string.Format("-licensing AdLM -OpenFile \"{0}\" -ExecuteAddInPlugin SmartEarth \"{1}\" -NoGui -NoCache -Exit", modelFile, outPath);
+ string args = string.Format("-licensing AdLM -OpenFile \"{0}\" -ExecuteAddInPlugin \"EngineBatch_Sample.SmartEarth\" \"{1}\" -NoGui -Exit", modelFile, configFile);
Process p = new Process();
p.StartInfo.UseShellExecute = false;
diff --git a/ExportMap/export.html b/ExportMap/export.html
index c6ca19c..c6cd708 100644
--- a/ExportMap/export.html
+++ b/ExportMap/export.html
@@ -7,6 +7,7 @@
<script>
var token = "8e3f2499-b4e3-40b7-92bd-5ed1ce1c8b03";
+ // Ajax
function ajax(url, type, data, dataType, contentType, fn) {
$.ajax({
url: url,
@@ -24,6 +25,7 @@
});
}
+ // 鍑哄浘-1
function exportMap1() {
var page = $("#selectPage").find("option:selected").text();
var data = {
@@ -48,6 +50,7 @@
});
}
+ // 鍑哄浘-2
function exportMap2() {
var page = $("#selectPage").find("option:selected").text();
var data = {
@@ -71,6 +74,33 @@
console.log(rs);
});
}
+
+ // 娴嬭瘯Rvt
+ function convert1() {
+ var data = { ids: [1521] };
+ ajax("Convert/ToTileset", "POST", JSON.stringify(data), null, null, function (rs) {
+ alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result);
+ console.log(rs);
+ });
+ }
+
+ // 娴嬭瘯Fbx
+ function convert2() {
+ var data = { ids: [1522] };
+ ajax("Convert/ToTileset", "POST", JSON.stringify(data), null, null, function (rs) {
+ alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result);
+ console.log(rs);
+ });
+ }
+
+ // 娴嬭瘯Ifc
+ function convert3() {
+ var data = { ids: [1524] };
+ ajax("Convert/ToTileset", "POST", JSON.stringify(data), null, null, function (rs) {
+ alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result);
+ console.log(rs);
+ });
+ }
</script>
</head>
<body>
@@ -86,6 +116,8 @@
<input type="button" value="鍑哄浘-2" onclick="exportMap2()" />
<br /><br />
- <a href="Convert/Test" >娴嬭瘯rvt</a>
+ <input type="button" value="娴嬭瘯Rvt" onclick="convert1();" />
+ <input type="button" value="娴嬭瘯Fbx" onclick="convert2();" />
+ <input type="button" value="娴嬭瘯Ifc" onclick="convert3();" />
</body>
</html>
--
Gitblit v1.9.3