日志文件结构调整

parkMonitor/DataBase/IDBOperation.cs

@@ -108,7 +108,7 @@ namespace parkMonitor.DataBase
                 if (conn.ConnectionString == DBConnection.remoteConf)
                 {
                     UILogServer.ins.error("传入非法数据库连接对象,请检查后手动重置数据库状态");
-                    Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "传入非法数据库连接对象");
+                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "传入非法数据库连接对象");
                     Operation.malfunctionRemote = true;
                     Operation.malfunctionLocal = true;
                 }
@@ -121,12 +121,12 @@ namespace parkMonitor.DataBase
                     if (conn.ConnectionString == DBConnection.remoteConf)
                     {
                         UILogServer.ins.error("暂时无法连接远端数据库, 请检查网络连接后点击“启动远端DB”恢复。");
-                        Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "与远端DB失去连接");
+                        Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "与远端DB失去连接");
                         Operation.malfunctionRemote = true;
                     }else if (conn.ConnectionString == DBConnection.localConf)
                     {
                         UILogServer.ins.error("暂时无法连接本地数据库,请检查网络连接后点击“启动本地DB”恢复。");
-                        Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "与本地DB失去连接");
+                        Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "与本地DB失去连接");
                         Operation.malfunctionLocal = true;
                     }
                 };
@@ -189,7 +189,7 @@ namespace parkMonitor.DataBase
                 if (mt.IsLonger(45, 1, false, out counter) && counter >= 5)
                 {
                     UILogServer.ins.error("数据库操作异常，暂停处理自动命令。回滚后点击“启动远端DB”恢复");
-                    Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "操作远端DB异常");
+                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "操作远端DB异常");
                     Operation.malfunctionRemote = true;
                     break;
                 }

parkMonitor/LOG/LogManager.cs

@@ -8,123 +8,92 @@ using System.Configuration;
 
 namespace parkMonitor.LOG
 {
-    class LogManager
+    /// <summary>
+    /// 日志管理
+    /// </summary>
+    public class LogManager
     {
-        private string logFileName = string.Empty;
-        private string logPath = "Log";
-        private string logFileExtName = "log";
-        private bool writeLogTime = true;
-        private bool logFileNameEndWithDate = true;
-        private Encoding logFileEncoding = Encoding.UTF8;
-        private object obj = new object();
-
-        public LogManager()
-        {
-            this.LogPath = "Log";
-            this.LogFileExtName = "log";
-            this.WriteLogTime = true;
-            this.logFileNameEndWithDate = true;
-            this.LogFileEncoding = Encoding.UTF8;
-        }
-        public LogManager(string logPath,string logFileExtName,bool writeLogTime)
+        public static string logAddressStr = "LogAddress";
+        public static string logAddress;
+        private string logFileExtName = "log";     //日志文件扩展名
+        private Encoding logFileEncoding = Encoding.UTF8;   //日志文件编码格式
+        private string logFileName = string.Empty;  //日志文件名
+        private string logPath = null;            //日志文件路径
+        private bool writeLogTime = true;     //log文件是否写时间
+        private static object obj = new object();
+        /// <summary>
+        /// 配置文件初始化
+        /// </summary>
+        public static void Init()
         {
-            this.LogPath =logPath;
-            this.LogFileExtName = logFileExtName;
-            this.WriteLogTime = writeLogTime;
-            this.LogFileNameEndWithDate = true;
+            try
+            {
+                logAddress = ConfigurationManager.AppSettings[logAddressStr];
+            }
+            catch
+            {
+                Console.WriteLine("配置文件有误");
+            }
         }
-        
-        //Log文件路径
-        private string LogPath
+        /// <summary>
+        /// 日志文件路径
+        /// </summary>
+        public string CreateLogPath()
         {
-            get
+            string time = System.DateTime.Now.ToString("yyyy-MM-dd");
+            if (logPath == null || logPath == string.Empty)
             {
-                if (this.logPath == null || this.logPath == string.Empty)
+                try
+                {
+                    logPath = System.IO.Path.Combine(logAddress, time);
+                }
+                catch
                 {
-                    this.logPath = System.IO.Path.Combine(ConfigurationManager.AppSettings["LogPath"], DateTime.Now.ToString("yyyy-MM-dd"));
+                    Console.WriteLine("路径合成失败");
                 }
-                return this.logPath;
             }
-            set
+            if (!logPath.EndsWith(@"\"))
+            {
+                logPath += @"\";
+            }
+            if (!Directory.Exists(logPath))
             {
-                this.logPath = value;
-                if (this.logPath == null || this.logPath == string.Empty)
+                try
                 {
-                    this.logPath = System.IO.Path.Combine(ConfigurationManager.AppSettings["LogPath"], DateTime.Now.ToString("yyyy-MM-dd"));
+                    Directory.CreateDirectory(logPath);
                 }
-                else
+                catch
                 {
-                    try
-                    {
-                        //是否绝对路径
-                        if (this.logPath.IndexOf(Path.VolumeSeparatorChar) >= 0)
-                        {
-                            //绝对路径
-                        }
-                        else
-                        {
-                            //相对路径
-                            this.logPath = System.IO.Path.Combine(ConfigurationManager.AppSettings["LogPath"], DateTime.Now.ToString("yyyy-MM-dd"));
-                        }
-                        if (!Directory.Exists(this.logPath))
-                        {
-                            Directory.CreateDirectory(this.logPath);
-                        }
-                    }
-                    catch
-                    {
-                        this.logPath = System.IO.Path.Combine(ConfigurationManager.AppSettings["LogPath"], DateTime.Now.ToString("yyyy-MM-dd"));
-                        //this.logPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, DateTime.Now.ToString("yyyy-MM-dd"));
-                    }
-                    if (!this.logPath.EndsWith(@"\"))
-                    {
-                        this.logPath += @"\";
-                    }
+                    Console.WriteLine("创建文件路径失败");
                 }
             }
-        } 
-        //Log文件扩展名
-        private string LogFileExtName
-        {
-            get { return this.logFileExtName; }
-            set { this.logFileExtName = value; }
-        }
-        //日志文件名是否带日期
-        private bool LogFileNameEndWithDate
-        {
-            get { return this.logFileNameEndWithDate; }
-            set { this.logFileNameEndWithDate = value; }
-        }
-        //是否在每个Log行前面添加时间
-        private bool WriteLogTime
-        {
-            get { return this.writeLogTime; }
-            set { this.writeLogTime = value; }
+            return logPath;
         }
-        //日志文件的字符编码
-        private Encoding LogFileEncoding
-        {
-            get { return this.logFileEncoding; }
-            set { this.logFileEncoding = value; }
-        }
-
-        public void WriteLog(LogType logType,string logFile, string msg)
+        /// <summary>
+        /// 写日志
+        /// </summary>
+        public void WriteLog(LogType logType, string logFile, string msg)
         {
+            CreateLogPath();
             lock (obj)
             {
                 try
                 {
-                    string dateString = string.Empty;
-                    if (this.LogFileNameEndWithDate || logFile.Length == 0)
-                    {
-                        dateString = DateTime.Now.ToString("yyyy-MM-dd");
-                    }
-                    logFileName = string.Format("{0}{1}.{2}", this.LogPath,logType, this.logFileExtName);
+                    //创建log文件
+                    logFileName = string.Format("{0}{1}.{2}", logPath, logType, this.logFileExtName);
                     using (StreamWriter sw = new StreamWriter(logFileName, true, logFileEncoding))
                     {
+                        //if (logType == LogType.DATABASE)
+                        //{
+                        //    writeLogTime = false;
+                        //}
+                        //else
+                        //{
+                        //    writeLogTime = true;
+                        //}
                         if (writeLogTime)
                         {
-                            sw.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:") +logFile+":"+ msg);
+                            sw.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:") + logFile + ":" + msg);
                         }
                         else
                         {
@@ -132,23 +101,35 @@ namespace parkMonitor.LOG
                         }
                     }
                 }
-                catch
-                {
-
-                }
+                catch { }
             }
         }
-        //
+        /// <summary>
+        /// log类型不定
+        /// </summary>
+        /// <param name="logType"></param>
+        /// <param name="logFile"></param>
+        /// <param name="msg"></param>
         public void WriteLog(LogType logType, LogFile logFile, string msg)
         {
-            this.WriteLog(logType,logFile.ToString(), msg);
+            this.WriteLog(logType, logFile.ToString(), msg);
         }
+        /// <summary>
+        /// log类型为null
+        /// </summary>
+        /// <param name="logType"></param>
+        /// <param name="msg"></param>
         public void WriteLog(LogType logType, string msg)
         {
-            this.WriteLog(logType,string.Empty, msg);
+            this.WriteLog(logType, string.Empty, msg);
         }
-    }
 
+
+
+    }
+    /// <summary>
+    /// log类型
+    /// </summary>
     public enum LogFile
     {
         LOG,
@@ -158,10 +139,12 @@ namespace parkMonitor.LOG
         INFO,
         ERROR_NUMBERPLATE
     }
-
+    /// <summary>
+    /// log文件类型
+    /// </summary>
     public enum LogType
     {
         DATABASE,
-        NOTDATABASE
+        NOT_DATABASE
     }
 }

parkMonitor/LOG/log.cs

@@ -11,26 +11,36 @@ namespace parkMonitor.LOG
         private static LogManager logManager;
         static Log()
         {
+            LogManager.Init();
             logManager = new LogManager();
         }
-
+        /// <summary>
+        /// 写文件类型
+        /// </summary>
+        /// <param name="logType"></param>
+        /// <param name="logFile"></param>
+        /// <param name="msg"></param>
         public static void WriteLog(LogType logType, LogFile logFile, string msg)
         {
             try
             {
-                logManager.WriteLog(logType,logFile, msg);
+                logManager.WriteLog(logType, logFile, msg);
             }
             catch
             {
 
             }
         }
-
+        /// <summary>
+        /// 文件类型为null
+        /// </summary>
+        /// <param name="logType"></param>
+        /// <param name="msg"></param>
         public static void WriteLog(LogType logType, string msg)
         {
             try
             {
-                logManager.WriteLog(logType,string.Empty, msg);
+                logManager.WriteLog(logType, string.Empty, msg);
             }
             catch
             {
@@ -38,16 +48,5 @@ namespace parkMonitor.LOG
             }
         }
 
-        //public static void WriteLog(string logFile, string msg)
-        //{
-        //    try
-        //    {
-        //        logManager.WriteLog(logFile, msg);
-        //    }
-        //    catch
-        //    {
-
-        //    }
-        //}
     }
 }

parkMonitor/manualParking/ManualParkingSimul.cs

@@ -56,13 +56,13 @@ namespace parkMonitor
             {
                 executableCmd.garageID = Convert.ToInt32(garageId);
             }
-            catch { UILogServer.ins.error("非法车库号，请重新输入"); Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "非法车库号，请重新输入"); return; }
+            catch { UILogServer.ins.error("非法车库号，请重新输入"); Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "非法车库号，请重新输入"); return; }
             int garageFreeSpace = 0;
             bool isTelRegister = oper.IsTelRegister(connectionStr, userId);
             if (isTelRegister == false)
             {
                 UILogServer.ins.error(lic+"停车，该号码未被注册，请先注册");
-                Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, lic + "停车，号码未被注册");
+                Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, lic + "停车，号码未被注册");
             }
             else if (executableCmd.garageID != 0)
             {
@@ -78,7 +78,7 @@ namespace parkMonitor
                 else
                 {
                     UILogServer.ins.error(lic+"该车库没有剩余车位");
-                    Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, lic + "该车库没有剩余车位");
+                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, lic + "该车库没有剩余车位");
                 }
             }
         }
@@ -95,18 +95,18 @@ namespace parkMonitor
             {
                 executableCmd.garageID = Convert.ToInt32(garageId);
             }
-            catch { UILogServer.ins.error("非法车库号，请重新输入"); Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "非法车库号"); return; }
+            catch { UILogServer.ins.error("非法车库号，请重新输入"); Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "非法车库号"); return; }
             bool isTelRegister = oper.IsTelRegister(connectionStr, userId);
             bool isNumberPlate = oper.IsNumberPlate(connectionStr, executableCmd.LicenseNum, executableCmd.garageID);
             if (isTelRegister == false)
             {
                 UILogServer.ins.error(lic+"取车该号码未被注册，请先注册");
-                Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, lic + "取车该号码未被注册");
+                Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, lic + "取车该号码未被注册");
             }
             else if (isNumberPlate == false)
             {
                 UILogServer.ins.error(lic+"车库中查无此车");
-                Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, lic + "车库中查无此车");
+                Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, lic + "车库中查无此车");
             }
             else
             {
@@ -119,7 +119,7 @@ namespace parkMonitor
                 else
                 {
                     UILogServer.ins.error("电话号码或号牌错误");
-                    Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "电话号码或号牌错误");
+                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "电话号码或号牌错误");
                 }
             }
 

parkMonitor/server/CoreThread/AbstractCmd.cs

@@ -162,7 +162,7 @@ namespace parkMonitor.server.CoreThread
                     {
                         Robot.robot1.occupied = true;
                         //UILogServer.ins.log("获得机械手资源");
-                        Log.WriteLog(LogType.NOTDATABASE,LogFile.LOG, "获得机械手资源");
+                        Log.WriteLog(LogType.NOT_DATABASE,LogFile.LOG, "获得机械手资源");
                         break;
                     }
                     mt.EndTiming();
@@ -177,7 +177,7 @@ namespace parkMonitor.server.CoreThread
                         {
                             mt.rolledBack = true;
                             UILogServer.ins.error("启动机械手资源超时，已启动回滚");
-                            Log.WriteLog(LogType.NOTDATABASE,LogFile.ERROR, "启动机械手资源超时，已启动回滚");
+                            Log.WriteLog(LogType.NOT_DATABASE,LogFile.ERROR, "启动机械手资源超时，已启动回滚");
                             return false;
                         }
                         Thread.Sleep(100);
@@ -354,7 +354,7 @@ namespace parkMonitor.server.CoreThread
                 }
                 if (ppp != null)
                 {
-                    Log.WriteLog(LogType.NOTDATABASE,LogFile.LOG, "停车流程：" + queueCmd.LicenseNum + "已分配车位");
+                    Log.WriteLog(LogType.NOT_DATABASE,LogFile.LOG, "停车流程：" + queueCmd.LicenseNum + "已分配车位");
                     break;
                 }
                 Thread.Sleep(200);
@@ -370,7 +370,7 @@ namespace parkMonitor.server.CoreThread
                     {
                         mt.rolledBack = true;
                         UILogServer.ins.error(queueCmd.LicenseNum + "超时未获得车位，指令退回");
-                        Log.WriteLog(LogType.NOTDATABASE,LogFile.ERROR, queueCmd.LicenseNum + "超时未获得车位，指令退回");
+                        Log.WriteLog(LogType.NOT_DATABASE,LogFile.ERROR, queueCmd.LicenseNum + "超时未获得车位，指令退回");
                         return null;
                     }
                     Thread.Sleep(100);
@@ -436,7 +436,7 @@ namespace parkMonitor.server.CoreThread
                                     if (disconnectionCount == 1)
                                     {
                                         UILogServer.ins.error("激光" + lm.id + "连接异常");
-                                        Log.WriteLog(LogType.NOTDATABASE,LogFile.ERROR, "激光" + lm.id + "连接异常");
+                                        Log.WriteLog(LogType.NOT_DATABASE,LogFile.ERROR, "激光" + lm.id + "连接异常");
                                     }
                                     Thread.Sleep(10000);
                                 }
@@ -447,7 +447,7 @@ namespace parkMonitor.server.CoreThread
                     if (jumpOut)
                     {
                         //UILogServer.ins.log("停车流程：" + queueCmd.LicenseNum + "激光数据已获得");
-                        Log.WriteLog(LogType.NOTDATABASE, LogFile.LOG, "停车流程：" + queueCmd.LicenseNum + "激光数据已获得");
+                        Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "停车流程：" + queueCmd.LicenseNum + "激光数据已获得");
                         break;
                     }
                 }
@@ -464,7 +464,7 @@ namespace parkMonitor.server.CoreThread
                     {
                         mt.rolledBack = true;
                         UILogServer.ins.error(queueCmd.LicenseNum + "超时未获取激光数据，指令退回");
-                        Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, queueCmd.LicenseNum + "超时未获取激光数据，指令退回");
+                        Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, queueCmd.LicenseNum + "超时未获取激光数据，指令退回");
                         return null;
                     }
                     Thread.Sleep(100);
@@ -491,7 +491,7 @@ namespace parkMonitor.server.CoreThread
                 if (storeStatus == status)
                 {
                     //UILogServer.ins.log("停车流程：" + queueCmd.LicenseNum + "已获得停车完成信号" + status);
-                    Log.WriteLog(LogType.NOTDATABASE, LogFile.LOG, "停车流程：" + queueCmd.LicenseNum + "已获得停车完成信号" + status);
+                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "停车流程：" + queueCmd.LicenseNum + "已获得停车完成信号" + status);
                     break;
                 }
                 else if (1 == 2)//机械手异常，则退指令，写数据库归位，判断条件需之后补充
@@ -523,7 +523,7 @@ namespace parkMonitor.server.CoreThread
                     {
                         mt.rolledBack = true;
                         UILogServer.ins.error(queueCmd.LicenseNum + "等待停车完成信号" + status + "超时，流程回滚");
-                        Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, queueCmd.LicenseNum + "等待停车完成信号" + status + "超时，流程回滚");
+                        Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, queueCmd.LicenseNum + "等待停车完成信号" + status + "超时，流程回滚");
                         return false;
                     }
                     Thread.Sleep(100);
@@ -551,7 +551,7 @@ namespace parkMonitor.server.CoreThread
                     frontWheelbase = Convert.ToInt32(PLCMsg.originalPlcList[frontWheelbase_address].Value);
                     rearWheelbase = Convert.ToInt32(PLCMsg.originalPlcList[rearWheelbase_address].Value);
                     //UILogServer.ins.log("轮距雷达完成状态已获取");
-                    Log.WriteLog(LogType.NOTDATABASE, LogFile.LOG, "轮距雷达完成状态已获取");
+                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "轮距雷达完成状态已获取");
                     break;
                 }
                 Thread.Sleep(1000);
@@ -567,7 +567,7 @@ namespace parkMonitor.server.CoreThread
                     {
                         mt.rolledBack = true;
                         UILogServer.ins.error("超时未获取轮距雷达数据，流程回滚");
-                        Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "超时未获取轮距雷达数据，流程回滚");
+                        Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "超时未获取轮距雷达数据，流程回滚");
                         return false;
                     }
                     Thread.Sleep(100);
@@ -582,7 +582,7 @@ namespace parkMonitor.server.CoreThread
         public override void executeCmd(Command queueCmd)
         {
             //UILogServer.ins.info("停车流程:" + queueCmd.LicenseNum + "开始");
-            Log.WriteLog(LogType.NOTDATABASE, LogFile.LOG, "停车流程:" + queueCmd.LicenseNum + "开始");
+            Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "停车流程:" + queueCmd.LicenseNum + "开始");
             string connectionStr = null;                                          //数据库连接字符串
             bool disappeared = false;                                             //车辆检测结果
             bool stopChecking = false;                                          //是否停止检测
@@ -597,7 +597,7 @@ namespace parkMonitor.server.CoreThread
             cm.laserID = queueCmd.id / 6 + 1;
             cm.LicenseNum = queueCmd.LicenseNum;
             PLC.SetMessage(cm);
-            Log.WriteLog(LogType.NOTDATABASE, "停车流程：车牌号为" + queueCmd.LicenseNum + "的车辆准备开启激光");
+            Log.WriteLog(LogType.NOT_DATABASE, "停车流程：车牌号为" + queueCmd.LicenseNum + "的车辆准备开启激光");
             //UILogServer.ins.info("停车流程：车牌号为" + queueCmd.LicenseNum + "的车辆准备开启激光");
 
             //车位分配数据库操作加锁，直到启动机械手
@@ -731,7 +731,7 @@ namespace parkMonitor.server.CoreThread
             //开始启动机械手，停止检测号牌
             stopChecking = true;
             //UILogServer.ins.log("停车流程：" + queueCmd.LicenseNum + "停止号牌核对，准备启动机械手");
-            Log.WriteLog(LogType.NOTDATABASE, LogFile.LOG, "停车流程：" + queueCmd.LicenseNum + "停止号牌核对，准备启动机械手");
+            Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "停车流程：" + queueCmd.LicenseNum + "停止号牌核对，准备启动机械手");
             int robotID = 0;
             robotID = queueCmd.id / 6 + 1;
             int frontWheelbase = 0;
@@ -761,7 +761,7 @@ namespace parkMonitor.server.CoreThread
             cm.parkingSpaceY = Convert.ToString(ppp.parkingSpaceY);
             cm.parkingSpaceZ = Convert.ToString(ppp.parkingSpaceZ);
             PLC.SetMessage(cm);
-            Log.WriteLog(LogType.NOTDATABASE, LogFile.LOG, "停车流程：抓车:" + queueCmd.LicenseNum + "\n车辆数据：" + cm.angleA + " ," + cm.centerX + " ," + cm.centerY + " ," + cm.length + " ," + cm.width + " ," + cm.height + " ," + cm.parkingSpaceID + " ," + cm.parkingSpaceX + " ," + cm.parkingSpaceY + " ," + cm.parkingSpaceZ);
+            Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "停车流程：抓车:" + queueCmd.LicenseNum + "\n车辆数据：" + cm.angleA + " ," + cm.centerX + " ," + cm.centerY + " ," + cm.length + " ," + cm.width + " ," + cm.height + " ," + cm.parkingSpaceID + " ," + cm.parkingSpaceX + " ," + cm.parkingSpaceY + " ," + cm.parkingSpaceZ);
             UILogServer.ins.info("停车流程：抓车:" + queueCmd.LicenseNum);
 
             if (!WaitWheelbase(ref frontWheelbase, ref rearWheelbase))
@@ -788,7 +788,7 @@ namespace parkMonitor.server.CoreThread
 
             //停车流程结束，将相应车牌复位,从号牌队列中出队
             NumReset(queueCmd);
-            Log.WriteLog(LogType.NOTDATABASE,LogFile.LOG, "停车流程：" + queueCmd.LicenseNum + "停车完成，状态复位");
+            Log.WriteLog(LogType.NOT_DATABASE,LogFile.LOG, "停车流程：" + queueCmd.LicenseNum + "停车完成，状态复位");
             UILogServer.ins.info("停车流程：" + queueCmd.LicenseNum + "停车完成，状态复位");
             //释放机械手与激光
             if (lmToBeReleased != null)
@@ -871,12 +871,12 @@ namespace parkMonitor.server.CoreThread
             else
             {
                 LogFile logFile = LogFile.ERROR_NUMBERPLATE;
-                Log.WriteLog(LogType.NOTDATABASE, logFile, "号牌：" + queueCmd.LicenseNum);
-                Log.WriteLog(LogType.NOTDATABASE, logFile, "入库时间：" + realParkTime);
-                Log.WriteLog(LogType.NOTDATABASE, logFile, "车位id：" + ppp.parkingSpaceID);
-                Log.WriteLog(LogType.NOTDATABASE, logFile, "车位x：" + ppp.parkingSpaceX);
-                Log.WriteLog(LogType.NOTDATABASE, logFile, "车位y：" + ppp.parkingSpaceY);
-                Log.WriteLog(LogType.NOTDATABASE, logFile, "车位z：" + ppp.parkingSpaceZ);
+                Log.WriteLog(LogType.NOT_DATABASE, logFile, "号牌：" + queueCmd.LicenseNum);
+                Log.WriteLog(LogType.NOT_DATABASE, logFile, "入库时间：" + realParkTime);
+                Log.WriteLog(LogType.NOT_DATABASE, logFile, "车位id：" + ppp.parkingSpaceID);
+                Log.WriteLog(LogType.NOT_DATABASE, logFile, "车位x：" + ppp.parkingSpaceX);
+                Log.WriteLog(LogType.NOT_DATABASE, logFile, "车位y：" + ppp.parkingSpaceY);
+                Log.WriteLog(LogType.NOT_DATABASE, logFile, "车位z：" + ppp.parkingSpaceZ);
                 //异常情况处理有待讨论
             }
         }
@@ -911,7 +911,7 @@ namespace parkMonitor.server.CoreThread
                 {
                     //取车完成后或可归零
                     //UILogServer.ins.log("取车流程：" + queueCmd.LicenseNum + "获得取车完成信号" + status);
-                    Log.WriteLog(LogType.NOTDATABASE, LogFile.LOG, "取车流程：" + queueCmd.LicenseNum + "获得取车完成信号" + status);
+                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "取车流程：" + queueCmd.LicenseNum + "获得取车完成信号" + status);
                     break;
                 }
                 else if (1 == 2)//机械手异常，则退指令，写数据库归位，判断条件需之后补充
@@ -943,7 +943,7 @@ namespace parkMonitor.server.CoreThread
                     {
                         mt.rolledBack = true;
                         UILogServer.ins.error(queueCmd.LicenseNum + "等待取车完成信号" + status + "超时，流程回滚");
-                        Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, queueCmd.LicenseNum + "等待取车完成信号" + status + "超时，流程回滚");
+                        Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, queueCmd.LicenseNum + "等待取车完成信号" + status + "超时，流程回滚");
                         return false;
                     }
                     Thread.Sleep(100);
@@ -955,7 +955,7 @@ namespace parkMonitor.server.CoreThread
         public override void executeCmd(Command queueCmd)
         {
             //UILogServer.ins.info("取车流程:" + queueCmd.LicenseNum + "开始");
-            Log.WriteLog(LogType.NOTDATABASE, LogFile.LOG, "取车流程:" + queueCmd.LicenseNum + "开始");
+            Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "取车流程:" + queueCmd.LicenseNum + "开始");
             string connectionStr = null;            //数据库连接字符串
             PLCMessage PLCMsg = null;          //PLC信息
             Vehicle vehiclelist = null;                 //待取车辆信息
@@ -1024,7 +1024,7 @@ namespace parkMonitor.server.CoreThread
             cm.rearWheelbase = rearwheelbase;
             PLC.SetMessage(cm);
 
-            Log.WriteLog(LogType.NOTDATABASE, LogFile.LOG, "取车流程:" + queueCmd.LicenseNum + "取车");
+            Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "取车流程:" + queueCmd.LicenseNum + "取车");
             UILogServer.ins.info("取车流程:" + queueCmd.LicenseNum + "取车");
             //等待PLC取车完成信号
             if (!waitForFetchCompletionSignal(queueCmd, ps.parkingSpaceID, ref robotError, 1))
@@ -1050,10 +1050,10 @@ namespace parkMonitor.server.CoreThread
             //释放车位
             if (ParkingSpaceManager.ins == null || !ParkingSpaceManager.ins.releaseParkingSpace(ps.parkingSpaceID))
             {
-                Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "车位异常，请检查"); UILogServer.ins.error("车位异常，请检查");
+                Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "车位异常，请检查"); UILogServer.ins.error("车位异常，请检查");
             }
 
-            Log.WriteLog(LogType.NOTDATABASE,"取车流程：号牌：" + queueCmd.LicenseNum + "取车完成");
+            Log.WriteLog(LogType.NOT_DATABASE,"取车流程：号牌：" + queueCmd.LicenseNum + "取车完成");
             UILogServer.ins.info("取车流程：号牌：" + queueCmd.LicenseNum + "取车完成");
 
             //自动化测试用
@@ -1100,7 +1100,7 @@ namespace parkMonitor.server.CoreThread
                                 strs.Add(updateParkingRecordsSql);
                                 if (!Operation.MyTransaction(conn, strs, out temp))
                                 {
-                                    Log.WriteLog(LogType.NOTDATABASE, "数据库操作出错，记录sql语句等待流程回滚");
+                                    Log.WriteLog(LogType.NOT_DATABASE, "数据库操作出错，记录sql语句等待流程回滚");
                                     //写日志记录sql，以待之后处理
                                     Log.WriteLog(LogType.DATABASE, updateParkingSpaceStateSql);
                                     Log.WriteLog(LogType.DATABASE,updateFreeSpaceSql);
@@ -1148,7 +1148,7 @@ namespace parkMonitor.server.CoreThread
                 oper.InsertToMessageQueue(connectionStr, userId, "停车异常，请联系管理员！", 2);
                 //未能停车，将车辆状态复位
                 oper.UpdateVehicleParkState(connectionStr, queueCmd.LicenseNum, 0);
-                Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "过期用户指令,车牌号：" + queueCmd.LicenseNum);
+                Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "过期用户指令,车牌号：" + queueCmd.LicenseNum);
                 UILogServer.ins.error("过期用户指令,车牌号：" + queueCmd.LicenseNum);
                 //continue;
             }

parkMonitor/server/CoreThread/AllotParkingSpace.cs

@@ -40,14 +40,14 @@ namespace parkMonitor.server.CoreThread
                     {
                         garageID = Int32.Parse(ConfigurationManager.AppSettings["garageID"]);
                     }
-                    catch { UILogServer.ins.error("无法获取车库ID，请检查配置"); Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "无车库ID相关配置"); return false; }
+                    catch { UILogServer.ins.error("无法获取车库ID，请检查配置"); Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "无车库ID相关配置"); return false; }
                     try
                     {
                         xWeight = Convert.ToDouble(ConfigurationManager.AppSettings["xWeight"]);
                         yWeight = Convert.ToDouble(ConfigurationManager.AppSettings["yWeight"]);
                         zWeight = Convert.ToDouble(ConfigurationManager.AppSettings["zWeight"]);
                     }
-                    catch { UILogServer.ins.error("无法获得车位权重，请检查配置"); Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "无法获得车位权重"); return false; }
+                    catch { UILogServer.ins.error("无法获得车位权重，请检查配置"); Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "无法获得车位权重"); return false; }
                     if (garageID != 0)
                     {
                         parkingSpaceStatusMap = oper.GetAllParkingSpace(DBConnection.remoteStr, garageID);
@@ -58,7 +58,7 @@ namespace parkMonitor.server.CoreThread
                         return false;
                     }
                     //车位校验，与PLC车位数据核对
-                    Log.WriteLog(LogType.NOTDATABASE, LogFile.INFO, "车位表缓存成功");
+                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "车位表缓存成功");
                     return true;
                 }
             }
@@ -82,7 +82,7 @@ namespace parkMonitor.server.CoreThread
                     //获取车位前准备
                     if (parkingSpaceStatusMap == null || zWeight == 0)
                     {
-                        Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "车辆表缓存或车位权重初始化异常");
+                        Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "车辆表缓存或车位权重初始化异常");
                         return null;
                     }
 

parkMonitor/server/CoreThread/CoreThreadTest2.cs

@@ -214,7 +214,7 @@ namespace parkMonitor.server.CoreThread
                 if (normalStatus == 1)
                 {
                     UILogServer.ins.log("设备总状态正常");
-                    Log.WriteLog(LogType.NOTDATABASE, LogFile.LOG, "设备总状态正常");
+                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "设备总状态正常");
                     break;
                 }
                 Thread.Sleep(200);

parkMonitor/server/CoreThread/QueuingThread.cs

@@ -66,7 +66,7 @@ namespace parkMonitor.server.CoreThread
                 licenseTime = Int32.Parse(ConfigurationManager.AppSettings.Get("licenseTime"));
                 userTime = Int32.Parse(ConfigurationManager.AppSettings.Get("userTime"));
             }
-            catch (Exception) { fetchStoreRatio = 3; UILogServer.ins.error("未找到停取车比例与计时参数"); Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "未找到停取车比例与计时参数"); }
+            catch (Exception) { fetchStoreRatio = 3; UILogServer.ins.error("未找到停取车比例与计时参数"); Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "未找到停取车比例与计时参数"); }
         }
 
         /// <summary>
@@ -84,7 +84,7 @@ namespace parkMonitor.server.CoreThread
                     {
                         webMsg = (MessageUTF8)(((MessageUTF8)webHandle.GetMessage()).Clone());
                     }
-                    catch (Exception) { UILogServer.ins.error("用户指令异常"); Log.WriteLog(LogType.NOTDATABASE, "用户指令异常"); }
+                    catch (Exception) { UILogServer.ins.error("用户指令异常"); Log.WriteLog(LogType.NOT_DATABASE, "用户指令异常"); }
                 }
                 //get useful data from webMsg and assign it to output data structure
                 if (webMsg != null)
@@ -108,18 +108,18 @@ namespace parkMonitor.server.CoreThread
                             FetchCmdQueue.Enqueue((Command)cmd.Clone());
                         }
                         UILogServer.ins.info("收到web取车指令：" + cmd.LicenseNum);
-                        Log.WriteLog(LogType.NOTDATABASE, LogFile.INFO, "收到web取车指令：" + cmd.LicenseNum);
+                        Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "收到web取车指令：" + cmd.LicenseNum);
                     }
                     //停车先遍历
                     else if (cmd.commandType.Equals('s'))
                     {
                         UserCmdMatch(cmd);
                         UILogServer.ins.info("收到web停车指令：" + cmd.LicenseNum);
-                        Log.WriteLog(LogType.NOTDATABASE, LogFile.INFO, "收到web停车指令：" + cmd.LicenseNum);
+                        Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "收到web停车指令：" + cmd.LicenseNum);
                     }
                     else
                     {
-                        Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "从web收到无法识别的用户指令");
+                        Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "从web收到无法识别的用户指令");
                         UILogServer.ins.error("从web收到无法识别的用户指令,并非停取车");
                     }
                 }
@@ -147,7 +147,7 @@ namespace parkMonitor.server.CoreThread
                             if (!LicenseQueue.Contains(license))
                             {
                                 UILogServer.ins.info("已扫描到号牌：" + license.LicenseNum + "，匹配中");
-                                Log.WriteLog(LogType.NOTDATABASE, LogFile.INFO, "已扫描到号牌：" + license.LicenseNum + "，匹配中");
+                                Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "已扫描到号牌：" + license.LicenseNum + "，匹配中");
                                 //先匹配指令
                                 NumMatch(ref license);
                             }
@@ -210,7 +210,7 @@ namespace parkMonitor.server.CoreThread
                 if (userTimeSpan.TotalMinutes >= userTime)
                 {
                     UILogServer.ins.error("异常：用户指令 " + cmd.LicenseNum + " 已存在超过" + String.Format("{0:F1}", userTimeSpan.TotalMinutes) + "分钟 ,强制出队");
-                    Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "异常：用户指令 " + cmd.LicenseNum + " 已存在超过" + String.Format("{0:F1}", userTimeSpan.TotalMinutes) + "分钟 ,强制出队");
+                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "异常：用户指令 " + cmd.LicenseNum + " 已存在超过" + String.Format("{0:F1}", userTimeSpan.TotalMinutes) + "分钟 ,强制出队");
                     //cmd.LicenseNum = "";
                     cmd.commandType = 'e';
                     lock (ValidStoreCmdQueue)
@@ -246,7 +246,7 @@ namespace parkMonitor.server.CoreThread
                     {
                         //异常号牌不再入队，而是界面提示管理员,并让号牌机线程
                         UILogServer.ins.error("异常：号牌 " + node.LicenseNum + " 已扫描超过" + String.Format("{0:F1}", licTimeSpan.TotalMinutes) + "分钟 ,强制出队");
-                        Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "异常：号牌 " + node.LicenseNum + " 已扫描超过" + String.Format("{0:F1}", licTimeSpan.TotalMinutes) + "分钟 ,强制出队");
+                        Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "异常：号牌 " + node.LicenseNum + " 已扫描超过" + String.Format("{0:F1}", licTimeSpan.TotalMinutes) + "分钟 ,强制出队");
                         //停车完成，将相应车牌复位
                         NumberMachineMessage numberMachineMessage = new NumberMachineMessage();
                         numberMachineMessage.aNode = new NumberMachineNode();
@@ -356,7 +356,7 @@ namespace parkMonitor.server.CoreThread
                     {
                         ExecutableCmdQueue.Enqueue((Command)cmd.Clone());
                         UILogServer.ins.info("任务：取出号牌为 " + cmd.LicenseNum + " 的车辆，开始排队");
-                        Log.WriteLog(LogType.NOTDATABASE, "取车命令：" + cmd.LicenseNum + "已进入可执行队列");
+                        Log.WriteLog(LogType.NOT_DATABASE, "取车命令：" + cmd.LicenseNum + "已进入可执行队列");
                     }
                 }
             }
@@ -373,7 +373,7 @@ namespace parkMonitor.server.CoreThread
                     {
                         ExecutableCmdQueue.Enqueue((Command)cmd.Clone());
                         UILogServer.ins.info("任务：存入号牌为 " + cmd.LicenseNum + " 的车辆，开始排队");
-                        Log.WriteLog(LogType.NOTDATABASE, "停车命令：" + cmd.LicenseNum + "已进入可执行队列");
+                        Log.WriteLog(LogType.NOT_DATABASE, "停车命令：" + cmd.LicenseNum + "已进入可执行队列");
                     }
                 }
             }
@@ -423,7 +423,7 @@ namespace parkMonitor.server.CoreThread
                                 ValidStoreCmdQueue.Enqueue((Command)command.Clone());
                             }
                             UILogServer.ins.info("收到退回的停车指令：" + command.LicenseNum);
-                            Log.WriteLog(LogType.NOTDATABASE, LogFile.INFO, "收到退回的停车指令：" + command.LicenseNum);
+                            Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "收到退回的停车指令：" + command.LicenseNum);
                         }
                         else if (command.commandType.Equals('f'))
                         {
@@ -432,7 +432,7 @@ namespace parkMonitor.server.CoreThread
                                 FetchCmdQueue.Enqueue((Command)command.Clone());
                             }
                             UILogServer.ins.info("收到退回的取车指令：" + command.LicenseNum);
-                            Log.WriteLog(LogType.NOTDATABASE, LogFile.INFO, "收到退回的取车指令：" + command.LicenseNum);
+                            Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "收到退回的取车指令：" + command.LicenseNum);
                         }
                     }
                     else
@@ -446,23 +446,23 @@ namespace parkMonitor.server.CoreThread
                                     FetchCmdQueue.Enqueue((Command)command.Clone());
                                 }
                                 UILogServer.ins.info("收到手动的取车指令：" + command.LicenseNum);
-                                Log.WriteLog(LogType.NOTDATABASE, LogFile.INFO, "收到手动的取车指令：" + command.LicenseNum);
+                                Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "收到手动的取车指令：" + command.LicenseNum);
                             }
                             else if (command.commandType.Equals('s'))
                             {
                                 UserCmdMatch(command);
                                 UILogServer.ins.info("收到手动的停车指令：" + command.LicenseNum);
-                                Log.WriteLog(LogType.NOTDATABASE, LogFile.INFO, "收到手动的停车指令：" + command.LicenseNum);
+                                Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "收到手动的停车指令：" + command.LicenseNum);
                             }
                             else
                             {
-                                Log.WriteLog(LogType.NOTDATABASE, LogFile.INFO, "收到无法识别的手动用户指令：" + command.LicenseNum);
+                                Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "收到无法识别的手动用户指令：" + command.LicenseNum);
                                 UILogServer.ins.error("收到无法识别的手动用户指令");
                             }
                         }
                         else
                         {
-                            Log.WriteLog(LogType.NOTDATABASE, LogFile.INFO, "本地数据库异常，暂停接收手动指令" + command.LicenseNum);
+                            Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "本地数据库异常，暂停接收手动指令" + command.LicenseNum);
                             UILogServer.ins.error("本地数据库异常，暂停接收关于" + command.LicenseNum+"的手动指令");
                         }
                     }

parkMonitor/server/NumMachine/NumMachine.cs

@@ -145,7 +145,7 @@ namespace parkMonitor.server
                 {
                     //号牌机断线写日志
                     nmn.status = EnumNumberMachineStatus.Offline;
-                    Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "正在与ip为 " + nmn.ip + " 的号牌机 进行连接。");
+                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "正在与ip为 " + nmn.ip + " 的号牌机 进行连接。");
                     UILogServer.ins.info("正在与ip为 " + nmn.ip + " 的号牌机 进行连接。");
                     Thread.Sleep(10000);
                 }
@@ -186,7 +186,7 @@ namespace parkMonitor.server
                                         int id = Int32.Parse(ConfigurationManager.AppSettings.Get(ipEnumer.Current.Key));
                                         ipIdMap.Add(ipEnumer.Current.Key, id);
                                     }
-                                    catch (Exception) { UILogServer.ins.log("读取号牌机编号映射失败，配置文件填写有误"); Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "读取号牌机编号映射失败"); }
+                                    catch (Exception) { UILogServer.ins.log("读取号牌机编号映射失败，配置文件填写有误"); Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "读取号牌机编号映射失败"); }
                                 }
                             }
                         } while (ipEnumer.MoveNext());
@@ -433,13 +433,13 @@ namespace parkMonitor.server
                         int temp = VzClientSDK.VzLPRClient_ImageSaveToJpeg(pImgFull, path, 50);
                         if (temp != -1)
                         {
-                            Log.WriteLog(LogType.NOTDATABASE, LogFile.LOG, "号牌机" + ip + "已拍照，图片保存于 " + strFilePath);
+                            Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "号牌机" + ip + "已拍照，图片保存于 " + strFilePath);
                             UILogServer.ins.info("号牌机" + ip + "已拍照，图片保存于 " + strFilePath);
                         }
                         else
                         {
                             UILogServer.ins.info("图片保存失败");
-                            Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "图片保存失败");
+                            Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "图片保存失败");
                         }
                     }
                     snapshotDevHandle = -1;
@@ -471,7 +471,7 @@ namespace parkMonitor.server
                         id = Int32.Parse(ConfigurationManager.AppSettings.Get(strIP));
                         ipIdMap.Add(strIP, id);
                     }
-                    catch (Exception) { UILogServer.ins.error("读取号牌机编号映射失败，配置文件填写有误"); Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "读取号牌机编号映射失败"); }
+                    catch (Exception) { UILogServer.ins.error("读取号牌机编号映射失败，配置文件填写有误"); Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "读取号牌机编号映射失败"); }
                 }
             }
             //检查设备是否存在
@@ -813,7 +813,7 @@ namespace parkMonitor.server
                 else
                 {
                     UILogServer.ins.error("参数错误，图片未保存");
-                    Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "参数错误，图片未保存");
+                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "参数错误，图片未保存");
                 }
             }
 

parkMonitor/server/PLCLinker/PLCLinker.cs

@@ -273,7 +273,7 @@ namespace parkMonitor.server
                                 {
                                     //断线后只显示一次
                                     UILogServer.ins.warn("尝试重连PLC");
-                                    Log.WriteLog(LogType.NOTDATABASE, LogFile.LOG, "PLC重连中，请稍候。。。。。。");
+                                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "PLC重连中，请稍候。。。。。。");
                                 }
                                 LinkStart();
                                 Thread.Sleep(10000);
@@ -534,7 +534,7 @@ namespace parkMonitor.server
                                     lpuTemp.laserMsg.occupied = true;
                                     jumpOut = true;
                                     //UILogServer.ins.log("获取摆扫激光空闲状态，准备启动激光");
-                                    Log.WriteLog(LogType.NOTDATABASE, LogFile.LOG, "获取摆扫激光空闲状态，准备启动激光");
+                                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "获取摆扫激光空闲状态，准备启动激光");
                                     break;
                                 }
                             }
@@ -552,7 +552,7 @@ namespace parkMonitor.server
                         {
                             mt.rolledBack = true;
                             UILogServer.ins.error("启动前超时未能获取摆扫空闲状态，请检查设备");
-                            Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "启动前超时未能获取摆扫空闲状态，请检查设备");
+                            Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "启动前超时未能获取摆扫空闲状态，请检查设备");
                         }
                         Thread.Sleep(100);
                     }
@@ -636,7 +636,7 @@ namespace parkMonitor.server
                                     SendtoPLC(laser_start_addr, "1");
                                     Thread.Sleep(100);
                                     //SendtoPLC("1", "1");//停车指令置1
-                                    Log.WriteLog(LogType.NOTDATABASE, "已发送激光" + lpuTemp.id + "启动指令");
+                                    Log.WriteLog(LogType.NOT_DATABASE, "已发送激光" + lpuTemp.id + "启动指令");
                                     //UILogServer.ins.info("已发送激光" + lpuTemp.id + "启动指令");
                                 }
                             });
@@ -697,7 +697,7 @@ namespace parkMonitor.server
                                 SendtoPLC(rpu1.fetch_to_address.ToString(), "0");
                             }
                             break;
-                        default: Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "输入PLC数据异常"); break;
+                        default: Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "输入PLC数据异常"); break;
                     }
                 }
             }
@@ -721,7 +721,7 @@ namespace parkMonitor.server
                 startAddr = Int32.Parse(ConfigurationManager.AppSettings.Get("PLC_start_address"));
                 addrLength = Int32.Parse(ConfigurationManager.AppSettings.Get("PLC_address_length"));
             }
-            catch (Exception) { UILogServer.ins.error("PLC配置文件异常"); Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "PLC配置文件异常"); }
+            catch (Exception) { UILogServer.ins.error("PLC配置文件异常"); Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "PLC配置文件异常"); }
             LinkStart();
 
             Task.Factory.StartNew(() =>
@@ -964,7 +964,7 @@ namespace parkMonitor.server
             catch (Exception)
             {
                 UILogServer.ins.error("激光设备配置文件错误");
-                Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "激光设备配置文件错误");
+                Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "激光设备配置文件错误");
             }
         }
 
@@ -1031,7 +1031,7 @@ namespace parkMonitor.server
                                     {
                                         mt.rolledBack = true;
                                         UILogServer.ins.error("记录数据前超时未获得心跳，请检查设备");
-                                        Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "记录数据前超时未获得心跳");
+                                        Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "记录数据前超时未获得心跳");
                                     }
                                     Thread.Sleep(100);
                                 }
@@ -1066,7 +1066,7 @@ namespace parkMonitor.server
                                     if (!laserMsg.abort_rescan)
                                     {
                                         UILogServer.ins.error("激光" + laserMsg.id + "计算异常，重新测量");
-                                        Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "激光" + laserMsg.id + "计算异常，重新测量");
+                                        Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "激光" + laserMsg.id + "计算异常，重新测量");
                                         //重测检测心跳
                                         Task rescan_wait_heartbeat = Task.Factory.StartNew(() =>
                                         {
@@ -1087,13 +1087,13 @@ namespace parkMonitor.server
                                                     {
                                                         mt.rolledBack = true;
                                                         UILogServer.ins.error("发起重测前超时未能获取摆扫激光心跳，请检查设备");
-                                                        Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "发起重测前超时未能获取摆扫激光心跳");
+                                                        Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "发起重测前超时未能获取摆扫激光心跳");
                                                     }
                                                     Thread.Sleep(100);
                                                 }
                                             }
                                         });
-                                        Log.WriteLog(LogType.NOTDATABASE, LogFile.LOG, "获得心跳，准备发起重测");
+                                        Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "获得心跳，准备发起重测");
                                         rescan_wait_heartbeat.Wait();
                                         pn = new PLCNode(laser_start_address.ToString(), "1");
                                         plc.SetMessage(pn);
@@ -1109,7 +1109,7 @@ namespace parkMonitor.server
                             laser_rescan_countdown = -1;
                             laser_heartbeat_test = false;
                             UILogServer.ins.error("激光" + laserMsg.id + "计算异常超过重测次数，请检查");
-                            Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "激光" + laserMsg.id + "计算异常超过重测次数");
+                            Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "激光" + laserMsg.id + "计算异常超过重测次数");
                         }
                     }
 
@@ -1122,7 +1122,7 @@ namespace parkMonitor.server
                             if (!disordered)
                             {
                                 UILogServer.ins.error("激光" + laserMsg.id + "系统异常,请检查");
-                                Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "激光" + laserMsg.id + "系统异常");
+                                Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "激光" + laserMsg.id + "系统异常");
                             }
                             disordered = true;
                         }
@@ -1152,7 +1152,7 @@ namespace parkMonitor.server
                                 if (laserMsg.status >= 0 && !laserMsg.disconnected)
                                 {
                                     UILogServer.ins.error("激光" + laserMsg.id + "心跳检测失败");
-                                    Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "激光" + laserMsg.id + "心跳检测失败");
+                                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "激光" + laserMsg.id + "心跳检测失败");
                                 }
                                 laserMsg.disconnected = true;
                             }

parkMonitor/server/WebThread/CentralForWebSocketServer.cs

@@ -72,7 +72,7 @@ namespace parkMonitor.server.WebThread
                     listener.Start();
                     linked = true;
                 }
-                catch (Exception) { UILogServer.ins.error("未能与Web服务器连接,本地ip错误或网络异常"); Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "与Web服务器连接失败"); linked = false; }
+                catch (Exception) { UILogServer.ins.error("未能与Web服务器连接,本地ip错误或网络异常"); Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "与Web服务器连接失败"); linked = false; }
                 while (!isClosing)
                 {
                     try
@@ -101,7 +101,7 @@ namespace parkMonitor.server.WebThread
                                 listener.Start();
                                 linked = true;
                                 UILogServer.ins.log("web已成功重连");
-                                Log.WriteLog(LogType.NOTDATABASE, LogFile.INFO, "web已成功重连");
+                                Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "web已成功重连");
                                 break;
                             }
                             catch (Exception)
@@ -111,7 +111,7 @@ namespace parkMonitor.server.WebThread
                                 if (mt.IsLonger(30, 1, true, out count))
                                 {
                                     UILogServer.ins.error("未能与Web服务器连接,本地ip错误或网络异常");
-                                    Log.WriteLog(LogType.NOTDATABASE, LogFile.ERROR, "与Web服务器连接失败");
+                                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "与Web服务器连接失败");
                                 }
                             }
                         }

parkMonitor/view/menuBox/MenuBox.xaml.cs

@@ -140,7 +140,7 @@ namespace parkMonitor.view.util
             {
                 Operation.malfunctionRemote = false;
                 UILogServer.ins.info("已重新启用远端DB");
-                Log.WriteLog(LogType.NOTDATABASE, LogFile.INFO, "已重新启用远端DB");
+                Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "已重新启用远端DB");
             }
         }