Sfoglia il codice sorgente

自动化测试调整

yc_t 7 anni fa
parent
commit
c743278cdb

+ 1 - 5
parkMonitor/App.config

@@ -75,16 +75,12 @@
     <add key="parkingEntZ" value="0" />
     <!--监控线程-->
     <!--数据更新间隔(毫秒数)-->
-    <add key="monitor_timGap" value="2000"/>
+    <add key="monitor_timGap" value="500"/>
 
     <!--ip位置映射表-->
     <!--位置编号;基点横坐标;车位宽度;宽度补偿-->
     <add key="192.168.0.20" value="1" />
     <add key="192.168.0.21" value="2" />
-    <add key="parkingEntZ" value="0" />
-    <add key="parkingEntZ" value="0" />
-    <add key="parkingEntZ" value="0" />
-    <add key="parkingEntZ" value="0" />
     
   </appSettings>
   

+ 17 - 2
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 = 90000;//90秒
+        private const int licInterval = 60000;//90秒
         private Random rnd;
         private Dictionary<int, CarStatusStru> numStatusMap = new Dictionary<int, CarStatusStru>();
         Command storeCmd = new Command();
@@ -128,15 +128,30 @@ namespace parkMonitor
                     if(status == 0)
                     {
                         Store(numStatusMap[index].licNum);
+                        numStatusMap[index].status = 2;
                     }
-                    else
+                    else if(status == 1)
                     {
                         Fetch(numStatusMap[index].licNum);
+                        numStatusMap[index].status = 3;
                     }
                 }
                 Thread.Sleep(licInterval);
             }
         }
+
+        public void Update(int index)
+        {
+            int status = numStatusMap[index].status;
+            if (status == 2)
+            {
+                numStatusMap[index].status = 1;
+            }
+            else if(status == 3)
+            {
+                numStatusMap[index].status = 0;
+            }
+        }
     }
     class CarStatusStru
     {

+ 5 - 1
parkMonitor/server/CoreThread/AbstractCmd.cs

@@ -649,6 +649,8 @@ namespace parkMonitor.server.CoreThread
             Log.WriteLog("停车完成,状态复位");
             UILogServer.ins.info(queueCmd.LicenseNum + "停车完成,状态复位");
             Robot.robot1.occupied = false;
+            //自动化测试用
+            ManualParkingSimul.ins.Update(Int32.Parse(queueCmd.LicenseNum.Substring(2, 1)));
             //根据号牌查找车型
             //int vehicleTypeID = oper.getVehicleTypeID(numberPlate);
             //判断测量数据是否准确
@@ -819,9 +821,11 @@ namespace parkMonitor.server.CoreThread
                 return;
             }
             Robot.robot1.occupied = false;
-
             Log.WriteLog("号牌:" + queueCmd.LicenseNum + "取车完成");
             UILogServer.ins.info("号牌:" + queueCmd.LicenseNum + "取车完成");
+            //自动化测试用
+            ManualParkingSimul.ins.Update(Int32.Parse(queueCmd.LicenseNum.Substring(2,1)));
+
             //数据库更新
             if (queueCmd.manual == false)
             {

+ 1 - 1
parkMonitor/server/NumMachine/NumMachineSimul.cs

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