输出梳理，激光流程需debug

parkMonitor/manualParking/ManualParkingSimul.cs

@@ -17,7 +17,7 @@ namespace parkMonitor
         private const string userId = "18202736439";
         private const string garageId = "1";
         private const string header = "鄂A";
-        private const int licInterval = 30000;//90秒
+        private const int licInterval = 10000;//90秒
         private Random rnd;
         private Dictionary<int, CarStatusStru> numStatusMap = new Dictionary<int, CarStatusStru>();
         Command executableCmd = new Command();

parkMonitor/server/CoreThread/AbstractCmd.cs

@@ -128,7 +128,7 @@ namespace parkMonitor.server.CoreThread
                         if (MyTimer.restart && !mt.rolledBack)
                         {
                             mt.rolledBack = true;
-                            UILogServer.ins.info("启动机械手资源超时，启动回滚");
+                            UILogServer.ins.error("启动机械手资源超时，启动回滚");
                             return false;
                         }
                     }
@@ -278,7 +278,7 @@ namespace parkMonitor.server.CoreThread
                 }
                 if (ppp != null)
                 {
-                    UILogServer.ins.log(queueCmd.LicenseNum + "已分配车位");
+                    UILogServer.ins.log("停车流程："+queueCmd.LicenseNum + "已分配车位");
                     break;
                 }
                 Thread.Sleep(200);
@@ -288,7 +288,7 @@ namespace parkMonitor.server.CoreThread
                 {
                     if (activationCount == 1)
                     {
-                        UILogServer.ins.info(queueCmd.LicenseNum + "未获得车位");
+                        UILogServer.ins.info("停车流程：" + queueCmd.LicenseNum + "未获得车位");
                     }
                     if (MyTimer.restart && !mt.rolledBack)
                     {
@@ -366,7 +366,7 @@ namespace parkMonitor.server.CoreThread
                     }
                     if (jumpOut)
                     {
-                        UILogServer.ins.log(queueCmd.LicenseNum + "激光数据已获得");
+                        UILogServer.ins.log("停车流程：" + queueCmd.LicenseNum + "激光数据已获得");
                         break;
                     }
                 }
@@ -377,7 +377,7 @@ namespace parkMonitor.server.CoreThread
                 {
                     if (activationCount == 1)
                     {
-                        UILogServer.ins.info(queueCmd.LicenseNum + "未获取激光数据，继续等待");
+                        UILogServer.ins.info("停车流程：" + queueCmd.LicenseNum + "未获取激光数据，继续等待");
                     }
                     if (MyTimer.restart && !mt.rolledBack)
                     {
@@ -407,7 +407,7 @@ namespace parkMonitor.server.CoreThread
                 //停车完成信号
                 if (storeStatus == status)
                 {
-                    UILogServer.ins.log(queueCmd.LicenseNum + "已获得停车完成信号" + status);
+                    UILogServer.ins.log("停车流程：" + queueCmd.LicenseNum + "已获得停车完成信号" + status);
                     break;
                 }
                 else if (1 == 2)//机械手异常，则退指令，写数据库归位，判断条件需之后补充
@@ -433,7 +433,7 @@ namespace parkMonitor.server.CoreThread
                 {
                     if (activationCount == 1)
                     {
-                        UILogServer.ins.info(queueCmd.LicenseNum + "未获得停车完成信号" + status + "，继续等待");
+                        UILogServer.ins.info("停车流程：" + queueCmd.LicenseNum + "未获得停车完成信号" + status + "，继续等待");
                     }
                     if (MyTimer.restart && !mt.rolledBack)
                     {
@@ -507,8 +507,8 @@ namespace parkMonitor.server.CoreThread
             cm.laserID = queueCmd.id / 6 + 1;
             cm.LicenseNum = queueCmd.LicenseNum;
             PLC.SetMessage(cm);
-            Log.WriteLog("停车流程，车牌号为" + queueCmd.LicenseNum + "的车辆准备开启激光");
-            UILogServer.ins.info("停车流程，车牌号为" + queueCmd.LicenseNum + "的车辆准备开启激光");
+            Log.WriteLog("停车流程：车牌号为" + queueCmd.LicenseNum + "的车辆准备开启激光");
+            UILogServer.ins.info("停车流程：车牌号为" + queueCmd.LicenseNum + "的车辆准备开启激光");
 
             //车位分配数据库操作加锁，直到启动机械手
             Parking_Space ppp = new Parking_Space();
@@ -609,7 +609,7 @@ namespace parkMonitor.server.CoreThread
             }
             //开始启动机械手，停止检测号牌
             stopChecking = true;
-            UILogServer.ins.log(queueCmd.LicenseNum + "停止号牌核对，准备启动机械手");
+            UILogServer.ins.log("停车流程：" + queueCmd.LicenseNum + "停止号牌核对，准备启动机械手");
             int robotID = 0;
             robotID = queueCmd.id / 6 + 1;
             int frontWheelbase = 0;
@@ -639,8 +639,8 @@ namespace parkMonitor.server.CoreThread
             cm.parkingSpaceY = Convert.ToString(ppp.parkingSpaceY);
             cm.parkingSpaceZ = Convert.ToString(ppp.parkingSpaceZ);
             PLC.SetMessage(cm);
-            Log.WriteLog("停车流程，抓车:" + queueCmd.LicenseNum);
-            UILogServer.ins.info("停车流程，抓车:" + queueCmd.LicenseNum);
+            Log.WriteLog("停车流程：抓车:" + queueCmd.LicenseNum);
+            UILogServer.ins.info("停车流程：抓车:" + queueCmd.LicenseNum);
 
             if (!WaitWheelbase(ref frontWheelbase, ref rearWheelbase))
             {
@@ -666,8 +666,8 @@ namespace parkMonitor.server.CoreThread
 
             //停车流程结束，将相应车牌复位
             NumReset(queueCmd);
-            Log.WriteLog("停车完成，状态复位");
-            UILogServer.ins.info(queueCmd.LicenseNum + "停车完成，状态复位");
+            Log.WriteLog("停车流程：" + queueCmd.LicenseNum + "停车完成，状态复位");
+            UILogServer.ins.info("停车流程：" + queueCmd.LicenseNum + "停车完成，状态复位");
             Robot.robot1.occupied = false;
             //自动化测试用
             ManualParkingSimul.ins.Update(Int32.Parse(queueCmd.LicenseNum.Substring(2, 1)));
@@ -732,7 +732,7 @@ namespace parkMonitor.server.CoreThread
                 if (fetchingStatus == status)
                 {
                     //取车完成后或可归零
-                    UILogServer.ins.log(queueCmd.LicenseNum + "获得取车完成信号" + status);
+                    UILogServer.ins.log("取车流程：" + queueCmd.LicenseNum + "获得取车完成信号" + status);
                     break;
                 }
                 else if (1 == 2)//机械手异常，则退指令，写数据库归位，判断条件需之后补充
@@ -758,7 +758,7 @@ namespace parkMonitor.server.CoreThread
                 {
                     if (activationCount == 1)
                     {
-                        UILogServer.ins.info(queueCmd.LicenseNum + "未获得取车完成信号" + status + "，继续等待");
+                        UILogServer.ins.info("取车流程：" + queueCmd.LicenseNum + "未获得取车完成信号" + status + "，继续等待");
                     }
                     if (MyTimer.restart && !mt.rolledBack)
                     {
@@ -830,9 +830,8 @@ namespace parkMonitor.server.CoreThread
             cm.rearWheelbase = rearwheelbase;
             PLC.SetMessage(cm);
 
-            Console.WriteLine("取车:" + queueCmd.LicenseNum);
-            Log.WriteLog("取车:" + queueCmd.LicenseNum);
-            UILogServer.ins.info("取车:" + queueCmd.LicenseNum);
+            Log.WriteLog("取车流程:" + queueCmd.LicenseNum + "取车");
+            UILogServer.ins.info("取车流程:" + queueCmd.LicenseNum+"取车");
             //等待PLC取车完成信号
             if (!waitForFetchCompletionSignal(queueCmd, ps.parkingSpaceID, ref robotError, 1))
             {
@@ -852,8 +851,8 @@ namespace parkMonitor.server.CoreThread
                 return;
             }
             Robot.robot1.occupied = false;
-            Log.WriteLog("号牌：" + queueCmd.LicenseNum + "取车完成");
-            UILogServer.ins.info("号牌：" + queueCmd.LicenseNum + "取车完成");
+            Log.WriteLog("取车流程：号牌：" + queueCmd.LicenseNum + "取车完成");
+            UILogServer.ins.info("取车流程：号牌：" + queueCmd.LicenseNum + "取车完成");
             //自动化测试用
             ManualParkingSimul.ins.Update(Int32.Parse(queueCmd.LicenseNum.Substring(2, 1)));
 

parkMonitor/server/NumMachine/NumMachineSimul.cs

@@ -10,7 +10,7 @@ namespace parkMonitor.server
 {
     class NumMachineSimul : IEquipments
     {
-        private const int licInterval = 30000;//90秒
+        private const int licInterval = 10000;//90秒
         ///<summary>号牌队列</summary>
         private Queue<NumberMachineNode> LicBuffer = new Queue<NumberMachineNode>();
         /// <summary>