yct 6 jaren geleden
bovenliggende
commit
42a3fb1079

+ 7 - 7
PLCLinker/centralController/App.config

@@ -9,13 +9,13 @@
     <!--数据库信息-->
     <!--<add key="remoteDBConnStr" value="Data Source=59.175.148.85;port=3306;uid=root;pooling=true;max pool size=1024;pwd=x5;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;"/>-->
     <!--<add key="remoteDBConnStr" value="Data Source=192.168.111.61;port=3306;uid=remote;pooling=true;max pool size=1024;pwd=x5;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>-->
-    <add key="remoteDBConnStr" value="Data Source=127.0.0.1;port=20000;uid=root;pooling=true;max pool size=1024;pwd=yct;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>
+    <add key="remoteDBConnStr" value="Data Source=127.0.0.1;port=3306;uid=root;pooling=true;max pool size=1024;pwd=;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>
     <!--<add key="remoteDBConnStr" value="Data Source=192.168.0.106;port=3306;uid=remote;pooling=true;max pool size=1024;pwd=x5;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>-->
-    <add key="localDBConnStr" value="Data Source=127.0.0.1;port=20000;uid=root;pooling=true;max pool size=1024;pwd=yct;database=zxpark_local;CharSet=utf8;Allow Zero Datetime=true;"/>
+    <add key="localDBConnStr" value="Data Source=127.0.0.1;port=3306;uid=root;pooling=true;max pool size=1024;pwd=;database=zxpark_local;CharSet=utf8;Allow Zero Datetime=true;"/>
     <add key="DBtimeout" value="3"/>
     <!--号牌机信息-->
-    <add key="192.168.10.42" value="1"/>
-    <add key="192.168.10.41" value="2"/>
+    <add key="192.168.0.51" value="2"/>
+    <add key="192.168.0.50" value="1"/>
     <add key="filterRatio" value="0.7"/>
     <!--PLC基本配置-->
     <!--<add key="PLC_ip_address" value="192.168.0.10" />-->
@@ -28,12 +28,12 @@
     <add key="plcParkingSpaceCount" value="200" />
     <add key="plcRefreshInterval" value="200"/>
     <!--显示屏信息-->
-    <add key="allInOneMachineIP" value="192.168.10.90"/>
-    <add key="allInOneMachinePort" value="8888"/>
+    <add key="allInOneMachineIP" value="192.168.0.189"/>
+    <add key="allInOneMachinePort" value="10001"/>
     <!--中控webServer端口,deprecated-->
     <add key="webPort" value="9000"/>
     <!--车库信息-->
-    <add key="garageID" value="2"/>
+    <add key="garageID" value="6"/>
     <!--日志写入地址配置文件-->
     <add key="LogAddress" value="c:\\c#workspace\\LogDemo\\LoggerTest" />
     <!--广告存放路径-->

+ 54 - 47
PLCLinker/centralController/Terminal/Terminal.cs

@@ -309,11 +309,13 @@ namespace Terminal
             {
                 terminalID = (short)id,
                 parkingFee = (short)32767,
+                receiptNum = (short)-1
             };
             TerminalStru tsFromTerminal = new TerminalStru
             {
                 terminalID = (short)id,
                 btnStatus = (short)0,
+                receiptNum = (short)-1
             };
             Monitor.Monitor.PLC.WriteToPLC(tsFromCentral, PLCDataType.central);
             Thread.Sleep(300);
@@ -505,11 +507,19 @@ namespace Terminal
                             catch (Exception e) { Log.WriteLog(LogType.process, LogFile.ERROR, "号牌" + license + "记录号牌异常\n" + e.StackTrace); }
                         }
                         Log.WriteLog(LogType.process, LogFile.INFO, "号牌" + license + "已记录");
-
+                        MainBlockStru mb = new MainBlockStru
+                        {
+                            centralHearbeat = (short)-1,
+                            bookParkCmd = -1,
+                            bookFetchCmd = -1,
+                            processCompleted = (short)0,
+                            licenseReceived = (short)-1
+                        };
+                        Monitor.Monitor.PLC.WriteToPLC(mb, PLCDataType.central);
                         //未获得号牌,告知PLC终止,告诉终端提示用户重新操作
                         if (license == "")
                         {
-                            MainBlockStru mb = new MainBlockStru
+                            MainBlockStru mbs = new MainBlockStru
                             {
                                 centralHearbeat = (short)-1,
                                 bookParkCmd = -1,
@@ -517,7 +527,7 @@ namespace Terminal
                                 processCompleted = (short)-1,
                                 licenseReceived = (short)2
                             };
-                            Monitor.Monitor.PLC.WriteToPLC(mb, PLCDataType.central);
+                            Monitor.Monitor.PLC.WriteToPLC(mbs, PLCDataType.central);
                             TerminalStru ts = new TerminalStru
                             {
                                 terminalID = (short)term.terminalID,
@@ -566,7 +576,7 @@ namespace Terminal
                                 Monitor.Monitor.PLC.WriteToPLC(ts, PLCDataType.central);
                             }
                             //无论是否注册,皆告知PLC,已获取号牌或比对异常、终止流程
-                            MainBlockStru mb = new MainBlockStru
+                            MainBlockStru mbst = new MainBlockStru
                             {
                                 centralHearbeat = -1,
                                 bookFetchCmd = -1,
@@ -574,7 +584,7 @@ namespace Terminal
                                 processCompleted = (short)-1,
                                 licenseReceived = (short)numReceivedStatus
                             };
-                            Monitor.Monitor.PLC.WriteToPLC(mb, PLCDataType.central);
+                            Monitor.Monitor.PLC.WriteToPLC(mbst, PLCDataType.central);
                             //号牌获取结果被清零才跳出
                             Monitor.Monitor.SetNotification("已写入号牌获取结果,等待号牌机启动指令清零", parkMonitor.model.TextColor.Info);
                         }
@@ -598,6 +608,8 @@ namespace Terminal
         /// </summary>
         private static void ParkCompleteSubProcess()
         {
+            Thread.Sleep(300);
+            Console.WriteLine(Monitor.Monitor.mainBlockInfo.parkingRunning+","+ Monitor.Monitor.mainBlockInfo.processCompleted);
             int processAttrib = Monitor.Monitor.mainBlockInfo.parkingRunning;
             //int processCompleted = Monitor.Monitor.mainBlockInfo.processCompleted;
             int currentTerm = Monitor.Monitor.mainBlockInfo.terminalID;
@@ -607,11 +619,13 @@ namespace Terminal
                 TerminalStru term = new TerminalStru();
                 string license;
                 //等待完成信号
-                while (Monitor.Monitor.mainBlockInfo.processCompleted != 1)
+                if (Monitor.Monitor.mainBlockInfo.parkingRunning != 1 || Monitor.Monitor.mainBlockInfo.processCompleted != 1)
                 {
                     if (Monitor.Monitor.mainBlockInfo.processStopped == 1)
-                        return;
-                    Thread.Sleep(200);
+                    {
+                        Console.WriteLine("中断");
+                    }
+                    return;
                 }
                 //找到终端号,判断是否注册用户
                 //拿到号牌
@@ -624,21 +638,23 @@ namespace Terminal
                             term = terminalInfo[i];
                     }
                     //term = terminalInfo[currentTerm - 1];
-                    Thread.Sleep(1500);
+                    Thread.Sleep(1000);
+                    parkingSpaceID = Monitor.Monitor.mainBlockInfo.currentParkingSpaceID;
                     //找到停车位置
-                    for (int s = 0; s < Monitor.Monitor.parkingSpaceInfo.Count; s++)
-                    {
-                        //Console.WriteLine(Monitor.Monitor.parkingSpaceInfo[s].receiptNum + "," + term.receiptNum);
-                        if (Monitor.Monitor.parkingSpaceInfo[s].receiptNum == term.receiptNum)
-                        {
-                            parkingSpaceID = Monitor.Monitor.parkingSpaceInfo[s].parkingSpace;
-                            break;
-                        }
-                    }
+                    //for (int s = 0; s < Monitor.Monitor.parkingSpaceInfo.Count; s++)
+                    //{
+                    //    //Console.WriteLine(Monitor.Monitor.parkingSpaceInfo[s].receiptNum + "," + term.receiptNum);
+                    //    if (Monitor.Monitor.parkingSpaceInfo[s].receiptNum == term.receiptNum)
+                    //    {
+                    //        parkingSpaceID = Monitor.Monitor.parkingSpaceInfo[s].parkingSpace;
+                    //        break;
+                    //    }
+                    //}
                     //无车位信息则跳出当前循环
                     if (parkingSpaceID == 0 || term.receiptNum == 0)
                     {
-                        try {
+                        try
+                        {
                             idLicMap.Remove(currentTerm);
                             ClearTerminal(term.terminalID);
                             MainBlockStru mbs = new MainBlockStru
@@ -701,15 +717,6 @@ namespace Terminal
                     //}
                     //中控清除车牌、凭证号、号牌验证等信息
                     ClearTerminal(term.terminalID);
-                    MainBlockStru mb = new MainBlockStru
-                    {
-                        centralHearbeat = (short)-1,
-                        bookParkCmd = -1,
-                        bookFetchCmd = -1,
-                        processCompleted = (short)0,
-                        licenseReceived = (short)-1
-                    };
-                    Monitor.Monitor.PLC.WriteToPLC(mb, PLCDataType.central);
                     try { idLicMap.Remove(currentTerm); }
                     catch { }
                     Monitor.Monitor.SetNotification(license + " 数据库已更新,停车流程结束", parkMonitor.model.TextColor.Info);
@@ -1139,6 +1146,15 @@ namespace Terminal
                 bool value = false;
                 if (termIndex != -1 && termCalcMap.Count >= termIndex && termCalcMap.TryGetValue(termIndex, out value) && !value && ts.cmd == 2 && receiptNum != 0)
                 {
+                    MainBlockStru mb = new MainBlockStru
+                    {
+                        centralHearbeat = (short)-1,
+                        bookParkCmd = -1,
+                        bookFetchCmd = -1,
+                        processCompleted = (short)0,
+                        licenseReceived = (short)-1
+                    };
+                    Monitor.Monitor.PLC.WriteToPLC(mb, PLCDataType.central);
                     //fetchState = Monitor.Monitor.mainBlockInfo.fetchingRunning;
                     Monitor.Monitor.SetNotification(termIndex + "号终端准备计算费用", parkMonitor.model.TextColor.Log);
                     termCalcMap[termIndex] = true;
@@ -1261,15 +1277,15 @@ namespace Terminal
                                 if (Monitor.Monitor.mainBlockInfo.processCompleted == 1)
                                 {
                                     UpdateSpecificParkingSpace();
-                                    while (terminalInfo[termIndex].receiptNum != 0)
-                                    {
-                                        count++;
-                                        if (count == 1)
-                                            Monitor.Monitor.SetNotification("等待凭证号清除", parkMonitor.model.TextColor.Log);
-                                        if (count > 10000)//避免int型数据溢出
-                                            count = 2;
-                                        Thread.Sleep(200);
-                                    }
+                                    //while (terminalInfo[termIndex].receiptNum != 0)
+                                    //{
+                                    //    count++;
+                                    //    if (count == 1)
+                                    //        Monitor.Monitor.SetNotification("等待凭证号清除", parkMonitor.model.TextColor.Log);
+                                    //    if (count > 10000)//避免int型数据溢出
+                                    //        count = 2;
+                                    //    Thread.Sleep(200);
+                                    //}
                                     int paymentStatus = 0;
                                     for (int i = 0; i < terminalInfo.Count; i++)
                                     {
@@ -1279,19 +1295,10 @@ namespace Terminal
                                             break;
                                         }
                                     }
-                                    Log.WriteLog(LogType.process, LogFile.INFO, "检测到凭证号已被清除");
+                                    //Log.WriteLog(LogType.process, LogFile.INFO, "检测到凭证号已被清除");
                                     FetchInfo fi = null;
                                     UpdateAllParkingSpace(false);
                                     ClearTerminal(terminalInfo[termIndex].terminalID);
-                                    MainBlockStru mb = new MainBlockStru
-                                    {
-                                        centralHearbeat = (short)-1,
-                                        bookParkCmd = -1,
-                                        bookFetchCmd = -1,
-                                        processCompleted = (short)0,
-                                        licenseReceived = (short)-1
-                                    };
-                                    Monitor.Monitor.PLC.WriteToPLC(mb, PLCDataType.central);
 
                                     if (fetchInfoMap.ContainsKey(terminalInfo[termIndex].terminalID))
                                     {

BIN
PLCLinker/centralController/obj/Release/centralController.Properties.Resources.resources


+ 1 - 1
PLCLinker/centralController/obj/Release/centralController.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-e2e18498797396c0c4d793777c2850f188bce73b
+06a8c02145b158084c7aeb48ba8e70c35f6aaaff

+ 14 - 3
PLCLinker/centralController/obj/Release/centralController.csproj.FileListAbsolute.txt

@@ -1,5 +1,4 @@
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\centralController.exe.config
-C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csproj.centralController.exe.config
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.g.resources
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\VzClientSDKDemo.BaseConfig_From.resources
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\PLC_Communication.FormModbus.resources
@@ -42,7 +41,6 @@ C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\MySql.
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\nettyCommunication.dll
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Newtonsoft.Json.dll
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\PLCS7.dll
-C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\S7.Net.dll
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Collections.Immutable.dll
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Runtime.CompilerServices.Unsafe.dll
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Runtime.InteropServices.RuntimeInformation.dll
@@ -74,7 +72,6 @@ C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\sdk\VZ
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\sdk\VZ_Sdk\iDecoders.dll
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\sdk\VZ_Sdk\VzDrawsLib.dll
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\sdk\VZ_Sdk\VZ_Sdk.dll
-C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csprojResolveAssemblyReference.cache
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\sdk\VZ_Sdk\iDecoders.dll
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\sdk\VZ_Sdk\VzDrawsLib.dll
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\bin\Release\sdk\VZ_Sdk\VzLPRSDK.dll
@@ -164,3 +161,17 @@ E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralControl
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\obj\Release\centralController.exe
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\obj\Release\centralController.pdb
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\centralController\obj\Release\centralController.csprojResolveAssemblyReference.cache
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar.Schedule.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar.SuperGrid.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar2.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.Instrumentation.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\netstandard.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\snap7Enc.dll
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar.Schedule.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar.SuperGrid.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar2.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.Instrumentation.xml
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csprojAssemblyReference.cache
+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

BIN
PLCLinker/centralController/obj/Release/centralController.csproj.GenerateResource.Cache