Quellcode durchsuchen

号牌机根据指令再拍号牌,未获得号牌清除终端块,

yct vor 6 Jahren
Ursprung
Commit
d77df261b4

BIN
PLCLinker/PLCLinker/bin/Release/PLCLinker.exe


BIN
PLCLinker/PLCLinker/bin/Release/PLCLinker.pdb


BIN
PLCLinker/PLCLinker/obj/Release/PLCLinker.exe


BIN
PLCLinker/PLCLinker/obj/Release/PLCLinker.pdb


BIN
PLCLinker/PLCS7/bin/Release/PLCS7.dll


BIN
PLCLinker/PLCS7/bin/Release/PLCS7.pdb


+ 1 - 0
PLCLinker/PLCS7/obj/Release/PLCS7.csproj.FileListAbsolute.txt

@@ -14,3 +14,4 @@ C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\obj\Release\PLCS7.dll
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\obj\Release\PLCS7.pdb
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\obj\Release\PLCS7.csproj.CoreCompileInputs.cache
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\obj\Release\PLCS7.csproj.CopyComplete
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\obj\Release\PLCS7.csprojAssemblyReference.cache

BIN
PLCLinker/PLCS7/obj/Release/PLCS7.dll


BIN
PLCLinker/PLCS7/obj/Release/PLCS7.pdb


+ 1 - 1
PLCLinker/centralController/App.config

@@ -16,7 +16,7 @@
     <!--号牌机信息-->
     <add key="192.168.0.51" value="2"/>
     <add key="192.168.0.50" value="1"/>
-    <add key="filterRatio" value="0.7"/>
+    <add key="filterRatio" value="0.5"/>
     <!--PLC基本配置-->
     <!--<add key="PLC_ip_address" value="192.168.0.10" />-->
     <add key="plcIpAddress" value="192.168.0.1" />

+ 23 - 11
PLCLinker/centralController/NumMachine/NumMachine.cs

@@ -148,15 +148,15 @@ namespace NumMachine
                 while (!isClosing)
                 {
                     Thread.Sleep(REFRESHINGTIME);
-                    //定时更新号牌
-                    lock (ipHandleMap)
-                    {
-                        Dictionary<string, int>.Enumerator HandleEnumer = ipHandleMap.GetEnumerator();
-                        while (HandleEnumer.MoveNext())
-                        {
-                            ActivateSnap(HandleEnumer.Current.Value);
-                        }
-                    }
+                    ////定时更新号牌
+                    //lock (ipHandleMap)
+                    //{
+                    //    Dictionary<string, int>.Enumerator HandleEnumer = ipHandleMap.GetEnumerator();
+                    //    while (HandleEnumer.MoveNext())
+                    //    {
+                    //        ActivateSnap(HandleEnumer.Current.Value);
+                    //    }
+                    //}
                     ////读取设备ip与id映射关系
                     //lock (ipHandleMap)
                     //{
@@ -253,6 +253,7 @@ namespace NumMachine
                         id = Int32.Parse(ConfigurationManager.AppSettings.Get(ip));
                         ipIdMap.Add(ip, id);
                         idCountMap.Add(id, FILTERINGNUMBER);
+                        GetLicensePlate(id);
                     }
                     catch (Exception) { Console.WriteLine("读取号牌机编号映射失败,配置文件填写有误"); }
                 }
@@ -537,7 +538,6 @@ namespace NumMachine
             {
                 VzClientSDK.VzLPRClient_ForceTrigger(handle);
             }
-
         }
 
         ///<summary>ip+port字符串转ipe</summary>
@@ -888,9 +888,21 @@ namespace NumMachine
                 {
                     if (idCountMap.ContainsKey(id))
                     {
+                        Dictionary<string, int>.Enumerator ipidEnumer = ipIdMap.GetEnumerator();
+                        int handle = 0;
+                        while (ipidEnumer.MoveNext())
+                        {
+                            if(ipidEnumer.Current.Value == id)
+                            {
+                                ipHandleMap.TryGetValue(ipidEnumer.Current.Key, out handle);
+                                break;
+                            }
+                        }
                         while (idCountMap[id] < FILTERINGNUMBER)
                         {
-                            Thread.Sleep(500);
+                            Console.WriteLine(handle);
+                            ActivateSnap(handle);
+                            Thread.Sleep((int)(REFRESHINGTIME*0.6));
                         }
                         idCountMap[id] = 0;
                     }

+ 7 - 4
PLCLinker/centralController/Terminal/Terminal.cs

@@ -550,6 +550,9 @@ namespace Terminal
                                 licVerification = (short)2
                             };
                             Monitor.Monitor.PLC.WriteToPLC(ts, PLCDataType.central);
+                            Thread.Sleep(500);
+                            ClearTerminal(term.terminalID, false);
+                            ResetCompleteSignal();
                             Log.WriteLog(LogType.process, LogFile.ERROR, "未获得号牌");
                         }
                         else
@@ -639,7 +642,7 @@ namespace Terminal
                     {
                         Log.WriteLog(LogType.process, LogFile.ERROR, "停车流程中断");
                         Monitor.Monitor.SetNotification("停车流程中断", parkMonitor.model.TextColor.Warning);
-                        Thread.Sleep(2000);
+                        Thread.Sleep(500);
                         ClearTerminal(term.terminalID, false);
                         ResetCompleteSignal();
                         //流程终端清除记录的号牌
@@ -731,7 +734,7 @@ namespace Terminal
                     //中控清除车牌、凭证号、号牌验证等信息
                     ClearTerminal(term.terminalID, false);
                     //停车流程确保已清除中控块完成信号
-                    Thread.Sleep(2000);
+                    Thread.Sleep(500);
                     ResetCompleteSignal();
                     try { idLicMap.Remove(currentTerm); }
                     catch { }
@@ -1288,7 +1291,7 @@ namespace Terminal
                                     Monitor.Monitor.SetNotification("取车流程中断", parkMonitor.model.TextColor.Warning);
                                     ClearTerminal(terminalInfo[termIndex].terminalID, false);
                                     //停车流程确保已清除中控块完成信号
-                                    Thread.Sleep(2000);
+                                    Thread.Sleep(500);
                                     ResetCompleteSignal();
                                     break;
                                 }
@@ -1318,7 +1321,7 @@ namespace Terminal
                                     UpdateAllParkingSpace(false);
                                     ClearTerminal(terminalInfo[termIndex].terminalID, false);
                                     //停车流程确保已清除中控块完成信号
-                                    Thread.Sleep(2000);
+                                    Thread.Sleep(500);
                                     ResetCompleteSignal();
                                     if (fetchInfoMap.ContainsKey(terminalInfo[termIndex].terminalID))
                                     {

+ 1 - 0
PLCLinker/centralController/obj/Release/centralController.csproj.FileListAbsolute.txt

@@ -174,3 +174,4 @@ C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevCom
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.exe.config
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csproj.CoreCompileInputs.cache
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csproj.CopyComplete
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csprojAssemblyReference.cache

BIN
PLCLinker/socketTest/bin/Release/socketTest.exe


BIN
PLCLinker/socketTest/bin/Release/socketTest.pdb


+ 0 - 1
PLCLinker/socketTest/obj/Release/socketTest.csproj.FileListAbsolute.txt

@@ -16,5 +16,4 @@ C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.cs
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.exe
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.pdb
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\socketTest\obj\Release\socketTest.csprojResolveAssemblyReference.cache
-C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.csprojAssemblyReference.cache
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.csproj.CoreCompileInputs.cache

BIN
PLCLinker/socketTest/obj/Release/socketTest.exe


BIN
PLCLinker/socketTest/obj/Release/socketTest.pdb