核心加入号牌机复位

parkMonitor/App.config

@@ -10,8 +10,7 @@
     <Equipment key="Core" value="parkMonitor.server.CoreThread.CoreThreadTest2" />
     <Equipment key="Monitor" value="parkMonitor.server.MonitorServer" />
     <Equipment key="PLC" value="parkMonitor.server.PLCLinker" />
-    <!--<Equipment key="Num" value="parkMonitor.server.NumMachineLinker" />-->
-    <Equipment key="Num" value="parkMonitor.server.NumMachineSimul" />
+    <Equipment key="Num" value="parkMonitor.server.NumMachineLinker" />
     <Equipment key="Web" value="parkMonitor.server.WebThread.CentralForWeb" />
     <Equipment key="Queue" value="parkMonitor.server.CoreThread.QueuingThread" />
   </Equipments>
@@ -54,7 +53,7 @@
     <add key="fetch_store_ratio" value="3" />
     
     <!--上位机（Web线程）IP地址及配置serverScoket的端口-->
-    <add key="WebConfig" value="192.168.111.84:9000" />
+    <add key="WebConfig" value="192.168.111.8:9000" />
     <!--<add key ="WebConfig" value="127.0.0.1:9000"/>-->
     <!--PLC总控状态-->
     <add key="equipmentStatus_address" value="28" />

parkMonitor/server/CoreThread/AbstractCmd.cs

@@ -44,8 +44,6 @@ namespace parkMonitor.server.CoreThread
             queuingThread = EquipmentSimpleFactory.ins.FindEquipment(EquipmentName.Queue);
             //数据库
             oper = new DBOperation();
-            //获取号牌句柄
-            NumMachine = EquipmentSimpleFactory.ins.FindEquipment(EquipmentName.NumMachine);
             //车位分配
             c = new CEntrance();
             aps = new AllotParkingSpace();
@@ -157,6 +155,12 @@ namespace parkMonitor.server.CoreThread
             status = 3;
             pm.status = status;
             PLC.SetMessage(pm);
+            //停车完成，将相应车牌复位
+            NumberMachineMessage numberMachineMessage = new NumberMachineMessage();
+            numberMachineMessage.aNode = new NumberMachineNode();
+            numberMachineMessage.aNode.ip = "";
+            numberMachineMessage.aNode.LicenseNum = queueCmd.LicenseNum;
+            queuingThread.SetMessage(numberMachineMessage);
             Console.WriteLine("停车完成，状态复位");
             Log.WriteLog("停车完成，状态复位");
             UILogServer.ins.info("停车完成，状态复位");
@@ -192,6 +196,7 @@ namespace parkMonitor.server.CoreThread
                 Log.WriteLog(logFile, "车位x：" + parkingSpaceX);
                 Log.WriteLog(logFile, "车位y：" + parkingSpaceY);
                 Log.WriteLog(logFile, "车位z：" + parkingSpaceZ);
+                //异常情况处理有待讨论
             }
         }
     }

parkMonitor/server/CoreThread/QueuingThread.cs

@@ -184,9 +184,9 @@ namespace parkMonitor.server.CoreThread
             {
                 if (NumMachineNodeValidation(n))
                 {
-                    //计算时间差，超过5分钟自动出队，并将该Node标记为已使用，等待统一处理
+                    //计算时间差，超过5分钟自动出队（？处理方式待讨论），并将该Node标记为已使用，等待统一处理
                     TimeSpan licTimeSpan = DateTime.Now - DateTime.Parse(n.TimeRecord);
-                    if (licTimeSpan.TotalMinutes >= 0.05)//licenseTime)
+                    if (licTimeSpan.TotalMinutes >= licenseTime)
                     {
                         UILogServer.ins.error("异常：号牌已扫描时间：" + licTimeSpan.TotalSeconds + "秒 ,强制出队");
                         //Console.WriteLine("异常：号牌已扫描时间：" + licTimeSpan.TotalSeconds + "秒 ,强制出队");