From 2cf980484c713dfcecce72302b8a757a0c5aedb2 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 26 十二月 2023 17:19:52 +0800
Subject: [PATCH] 修改py初始化参数
---
ExportMap/cs/ExportUtil.cs | 2 +-
ExportMap/cs/Tools.cs | 18 ++++++++++++++++--
ExportMap/Controllers/ConvertController.cs | 7 ++++++-
ExportMap/Web.config | 6 ++++--
4 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/ExportMap/Controllers/ConvertController.cs b/ExportMap/Controllers/ConvertController.cs
index ae2c210..27320d8 100644
--- a/ExportMap/Controllers/ConvertController.cs
+++ b/ExportMap/Controllers/ConvertController.cs
@@ -1,4 +1,5 @@
锘縰sing ExportMap.cs;
+using ExportMap.db;
using ExportMap.Models;
using System;
using System.Collections.Generic;
@@ -23,7 +24,11 @@
//string wkt = TerrainUtils.GetPointZ(new XYZArgs() { dircode = "0B" });
//PyLasUtils.CsTransform("EPSG:4528", 400925.079, 2541768.173);
//string json = PyLasUtils.GetLasGeomJSON(@"D:\LF\data\las\1_lfz_0.05m.las", 1314);
- TerrainUtils.Complement(new XYZArgs() { dircode = "00" });
+ //TerrainUtils.Complement(new XYZArgs() { dircode = "00" });
+
+ ExportArgs args = new ExportArgs() { title = "Test" };
+ SysTask task = TaskDBHelper.CreateTask(ExportUtil.ToXYZArgs(args), "PNG", "鍦ㄧ嚎鍒跺浘(PNG)");
+ Tools.ExecCmd(task, "dir", true, true);
return DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
}
diff --git a/ExportMap/Web.config b/ExportMap/Web.config
index b005b95..b9f1c1b 100644
--- a/ExportMap/Web.config
+++ b/ExportMap/Web.config
@@ -33,13 +33,15 @@
<!-- Mpt璺緞 -->
<add key="mpt" value="D:\LF\data\mpt\tb.mpt" />
<!-- 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="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="pgConn" value="Server=103.85.165.99;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"/>
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
+ <!--Py鍒濆鍖栧弬鏁�-->
+ <add key="pyInitArgs" value="cd "C:/Program Files/QGIS 3.16/apps/Python37";"C:/Program Files/QGIS 3.16/bin/qgis_process-qgis-ltr.bat""/>
</appSettings>
<connectionStrings/>
<system.web>
diff --git a/ExportMap/cs/ExportUtil.cs b/ExportMap/cs/ExportUtil.cs
index 4fab51c..c7ad5d4 100644
--- a/ExportMap/cs/ExportUtil.cs
+++ b/ExportMap/cs/ExportUtil.cs
@@ -158,7 +158,7 @@
/// <summary>
/// 杞崲涓篨YZ鍙傛暟
/// </summary>
- private static XYZArgs ToXYZArgs(ExportArgs ea)
+ public static XYZArgs ToXYZArgs(ExportArgs ea)
{
XYZArgs args = new XYZArgs();
args.name = ea.title;
diff --git a/ExportMap/cs/Tools.cs b/ExportMap/cs/Tools.cs
index fc981b3..f3c48bf 100644
--- a/ExportMap/cs/Tools.cs
+++ b/ExportMap/cs/Tools.cs
@@ -80,6 +80,19 @@
}
/// <summary>
+ /// 鑾峰彇Py鍒濆鍖栧弬鏁�
+ /// </summary>
+ public static string[] PyInitArgs
+ {
+ get
+ {
+ string args = GetSetting("pyInitArgs");
+
+ return args.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ }
+ }
+
+ /// <summary>
/// 瀛楄妭鏍煎紡鍖�
/// </summary>
public static string FormatBytes(long bytes)
@@ -188,8 +201,9 @@
List<string> list = new List<string>();
if (isPy)
{
- list.Add("cd \"C:\\Program Files\\QGIS 3.16\\apps\\Python37\"");
- list.Add("\"C:\\Program Files\\QGIS 3.16\\bin\\qgis_process-qgis-ltr.bat\"");
+ //list.Add("cd \"C:\\Program Files\\QGIS 3.16\\apps\\Python37\"");
+ //list.Add("\"C:\\Program Files\\QGIS 3.16\\bin\\qgis_process-qgis-ltr.bat\"");
+ list.AddRange(PyInitArgs);
//list.Add("\"C:\\Program Files\\QGIS 3.16\\bin\\python-qgis-ltr.bat\"");
//list.Add("exit()");
}
--
Gitblit v1.9.3