修改Postgres数据库帮助类

13693261870

2023-08-21 8482a6fef58c0d699795435ef525a8f188e502a1

 ExportMap/cs/Tools.cs

@@ -8,7 +8,10 @@
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;
using System.Runtime.Serialization.Formatters.Binary;
using System.Security.AccessControl;
@@ -26,6 +29,9 @@

        private static string tempDir;

        /// <summary>
        /// 临时目录
        /// </summary>
        public static string TempDir
        {
            get
@@ -33,7 +39,10 @@
                if (string.IsNullOrWhiteSpace(tempDir))
                {
                    tempDir = Path.Combine(BaseDir, "temp");
                    if (!Directory.Exists(tempDir)) Directory.CreateDirectory(tempDir);
                    if (!Directory.Exists(tempDir))
                    {
                        Directory.CreateDirectory(tempDir);
                    }
                }

                return tempDir;
@@ -51,7 +60,7 @@
            {
                if (null == _dbHelper)
                {
                    _dbHelper = new PostgreHelper(DbEnum.langfang);
                    _dbHelper = new PostgreHelper();
                }

                return _dbHelper;
@@ -157,9 +166,12 @@
        /// <summary>
        /// 执行CMD
        /// </summary>
        /// <param name="task">任务</param>
        /// <param name="cmd">命令行</param>
        /// <param name="isPy">是否为QGIS Py脚本</param>
        /// <param name="isOut">是否输出错误</param>
        /// <returns>执行结果或出错信息</returns>
        public static String ExecCmd(string cmd, bool isPy = false)
        public static string ExecCmd(SysTask task, string cmd, bool isPy = false, bool isOut = false)
        {
            List<string> list = new List<string>();
            if (isPy)
@@ -171,7 +183,7 @@
            }
            list.Add(cmd);

            string str = ExecCmd(list);
            string str = ExecCmd(task, list, isOut);

            return str;
        }
@@ -179,9 +191,11 @@
        /// <summary>
        /// 执行CMD
        /// </summary>
        /// <param name="task">任务</param>
        /// <param name="list">命令集合</param>
        /// <param name="isOut">是否输出错误</param>
        /// <returns>执行结果或出错信息</returns>
        public static string ExecCmd(List<string> list)
        public static string ExecCmd(SysTask task, List<string> list, bool isOut = false)
        {
            string str = null;
            try
@@ -192,12 +206,15 @@
                p.StartInfo.CreateNoWindow = true;
                //p.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
                p.StartInfo.RedirectStandardInput = true;
                p.StartInfo.RedirectStandardOutput = true;
                p.StartInfo.RedirectStandardOutput = isOut;
                p.StartInfo.RedirectStandardError = true;
                p.Start();

                task.pid = p.Id;
                task.id = TaskDBHelper.Insert(task);

                StreamWriter si = p.StandardInput; // 标准输入流 
                //StreamReader so = p.StandardOutput; // 标准输出流 
                StreamReader so = isOut ? p.StandardOutput : null; // 标准输出流 
                StreamReader se = p.StandardError; // 标准错误流

                LogOut.Info("cmd = " + string.Join("，", list));
@@ -208,15 +225,22 @@
                }
                si.WriteLine("exit");

                //string info = so.ReadToEnd();
                string info = null == so ? null : so.ReadToEnd();
                str = se.ReadToEnd();

                //if (!string.IsNullOrEmpty(info)) LogOut.Debug(info);
                if (!string.IsNullOrEmpty(str)) LogOut.Error(str);
                if (!string.IsNullOrEmpty(str) && !str.Contains("@jit(cache=True, nogil=True)")) LogOut.Error(str);
                if (p.HasExited == false) p.Kill();

                task = TaskDBHelper.SelectById(task.id);
                if (null != task && task.status < 2)
                {
                    task.status = 2;
                    TaskDBHelper.Update(task);
                }

                if (null != so) so.Close();
                se.Close();
                //so.Close();
                si.Close();
                p.Close();
            }
@@ -224,8 +248,65 @@
            {
                LogOut.Error(ex.Message + "\r\n" + ex.StackTrace);
                str = ex.Message;
                task = TaskDBHelper.SelectById(task.id);
                if (null != task && task.status < 2)
                {
                    task.err = ex.Message;
                    task.status = 4;
                    TaskDBHelper.Update(task);
                }
            }

            return str;
        }

        /// <summary>
        /// 执行命令
        /// </summary>
        /// <param name="list">命令集合</param>
        public static string ExecCmd(List<string> list)
        {
            string str = null;
            Process p = null;
            try
            {
                p = new Process();
                p.StartInfo.FileName = "cmd.exe";
                p.StartInfo.UseShellExecute = false;
                p.StartInfo.CreateNoWindow = true;
                p.StartInfo.RedirectStandardInput = true;
                p.StartInfo.RedirectStandardOutput = true;
                p.StartInfo.RedirectStandardError = true;
                p.Start();

                StreamWriter si = p.StandardInput;
                StreamReader se = p.StandardError;

                LogOut.Info("cmd = " + string.Join("，", list));
                si.AutoFlush = true;
                foreach (string cmd in list)
                {
                    si.WriteLine(cmd);
                }
                si.WriteLine("exit");

                str = se.ReadToEnd();
                se.Close();
                si.Close();
            }
            catch (Exception ex)
            {
                LogOut.Error(ex.Message + "\r\n" + ex.StackTrace);
                str = ex.Message;
            }
            finally
            {
                if (p != null)
                {
                    p.Close();
                    p = null;
                }
            }
            return str;
        }

@@ -268,7 +349,11 @@
        /// </summary>
        public static void SetIsModel(XYZArgs args, List<SysMeta> list)
        {
            if (null == args.models || args.models.Count != args.ids.Count) return;
            if (null == args.models || args.models.Count != args.ids.Count)
            {
                foreach (SysMeta meta in list) meta.ismeta = 1;
                return;
            }

            foreach (SysMeta meta in list)
            {
@@ -276,5 +361,26 @@
                meta.ismeta = idx == -1 ? 1 : args.models[idx];
            }
        }

        /// <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);
    }
}