From 9f72a0c361eaea367b09c722b35d06d59a0d29ba Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 八月 2023 18:07:49 +0800
Subject: [PATCH] 1
---
ExportMap/db/TaskDBHelper.cs | 21 ++++++++++++++++-----
ExportMap/cs/Tools.cs | 20 ++++++++++++++++++++
ExportMap/Controllers/ConvertController.cs | 6 +++---
ExportMap/Web.config | 2 ++
4 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/ExportMap/Controllers/ConvertController.cs b/ExportMap/Controllers/ConvertController.cs
index 4b71662..48c8390 100644
--- a/ExportMap/Controllers/ConvertController.cs
+++ b/ExportMap/Controllers/ConvertController.cs
@@ -14,10 +14,10 @@
[HttpGet]
public string Test()
{
- string name = "8-鐟炰附绔�0.05m.cpt";
- string cnName = name.Substring(0, name.LastIndexOf("."));
+ //string name = "8-鐟炰附绔�0.05m.cpt";
+ //string cnName = name.Substring(0, name.LastIndexOf("."));
- return cnName;
+ return Tools.GetLocalIP();
}
/// <summary>
diff --git a/ExportMap/Web.config b/ExportMap/Web.config
index 8f98cd6..cc5aba4 100644
--- a/ExportMap/Web.config
+++ b/ExportMap/Web.config
@@ -3,6 +3,8 @@
<appSettings>
<!-- 寤婂潑鏈嶅姟 -->
<add key="lfServer" value="http://127.0.0.1:12316/server"/>
+ <!-- 鏈満IP -->
+ <add key="localIP" value="192.168.20.106"/>
<!-- 涓存椂鐩綍 -->
<add key="tempFolder" value="D:\LF\temp"/>
<!-- 涓婁紶鐩綍 -->
diff --git a/ExportMap/cs/Tools.cs b/ExportMap/cs/Tools.cs
index 000724c..b9ccb8d 100644
--- a/ExportMap/cs/Tools.cs
+++ b/ExportMap/cs/Tools.cs
@@ -8,6 +8,8 @@
using System.Diagnostics;
using System.IO;
using System.Linq;
+using System.Net;
+using System.Net.Sockets;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
@@ -288,6 +290,24 @@
}
}
+ /// <summary>
+ /// 鑾峰彇鏈満IP
+ /// </summary>
+ /// <returns></returns>
+ public static string GetLocalIP()
+ {
+ var host = Dns.GetHostEntry(Dns.GetHostName());
+ foreach (var ip in host.AddressList)
+ {
+ if (ip.AddressFamily == AddressFamily.InterNetwork)
+ {
+ return ip.ToString();
+ }
+ }
+
+ return GetSetting("localIP");
+ }
+
[DllImport("ReadLas.dll")]
public extern static int get_las_cs(string file_name);
}
diff --git a/ExportMap/db/TaskDBHelper.cs b/ExportMap/db/TaskDBHelper.cs
index 62fc9ad..1a4fe2d 100644
--- a/ExportMap/db/TaskDBHelper.cs
+++ b/ExportMap/db/TaskDBHelper.cs
@@ -14,7 +14,7 @@
/// <summary>
/// 鏍规嵁ID闆嗗悎鏌ヨ
/// </summary>
- public static List<SysTask> selectByIds(List<int> ids)
+ public static List<SysTask> SelectByIds(List<int> ids)
{
string sql = string.Format("select * from lf.sys_task where id in ({0}) order by id desc", string.Join(",", ids.ToArray()));
@@ -27,12 +27,11 @@
/// <summary>
/// 鎻掑叆浠诲姟
/// </summary>
- public static int insert(SysTask task)
+ public static int Insert(SysTask task)
{
string sql = "insert into lf.sys_task (name, status, type, descr, err, ip, pid, gids, depcode, dircode, create_user) values (@name, @status, @type, @descr, @err, @ip, @pid, @gids, @depcode, @dircode, @create_user)";
List<DbParameter> list = Tools.GetParams<SysTask>(sql, task);
-
object obj = Tools.DBHelper.GetScalar(sql, list.ToArray());
return obj == null ? 0 : Convert.ToInt32(obj);
@@ -41,15 +40,27 @@
/// <summary>
/// 鏇存柊浠诲姟
/// </summary>
- public static int update(SysTask task)
+ public static int Update(SysTask task)
{
string sql = "update lf.sys_task set name=@name, status=@status, type=@type, descr=@descr, err=@err, ip=@ip, pid=@pid, gids=@gids, depcode=@depcode, dircode=@dircode, update_user=@update_user, update_time=now() where id=@id";
List<DbParameter> list = Tools.GetParams<SysTask>(sql, task);
-
object obj = Tools.DBHelper.GetScalar(sql, list.ToArray());
return obj == null ? 0 : Convert.ToInt32(obj);
}
+
+ /// <summary>
+ /// 鍒涘缓浠诲姟瀹炰綋绫�
+ /// </summary>
+ public static SysTask CreateTask(XYZArgs args, SysMeta meta)
+ {
+ SysTask task = new SysTask();
+ //
+
+
+
+ return task;
+ }
}
}
--
Gitblit v1.9.3