Selaa lähdekoodia

终端需要在获得号牌后,对注册用户的操作生成对应凭证号,因此将记录凭证号操作后移。修改数据库配置到阿里云

yct 5 vuotta sitten
vanhempi
commit
0e8fe8c82d

+ 2 - 1
PLCLinker/centralController/App.config

@@ -12,7 +12,8 @@
     <add key="spacesInRow" value="6"/>
     <add key="spacesInRow" value="6"/>
     <!--数据库信息-->
     <!--数据库信息-->
     <!--<add key="remoteDBConnStr" value="Data Source=59.175.148.85;port=3306;uid=root;pooling=true;max pool size=1024;pwd=x5;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>-->
     <!--<add key="remoteDBConnStr" value="Data Source=59.175.148.85;port=3306;uid=root;pooling=true;max pool size=1024;pwd=x5;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>-->
-    <add key="remoteDBConnStr" value="Data Source=192.168.0.152;port=3306;uid=root;pooling=true;max pool size=1024;pwd=x5;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>
+    <add key="remoteDBConnStr" value="Data Source=118.31.225.50;port=3306;uid=zx;pooling=true;max pool size=1024;pwd=ZhiXiang436070;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>
+    <!--<add key="remoteDBConnStr" value="Data Source=192.168.0.152;port=3306;uid=root;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=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=192.168.10.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="remoteDBConnStr" value="Data Source=192.168.10.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=3306;uid=root;pooling=true;max pool size=1024;pwd=;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;"/>

+ 24 - 13
PLCLinker/centralController/Terminal/Terminal.cs

@@ -545,19 +545,7 @@ namespace Terminal
                                 }
                                 }
                             }
                             }
                             catch (Exception e) { Log.WriteLog(LogType.process, LogFile.ERROR, "号牌" + license + "记录号牌异常\n" + e.StackTrace); }
                             catch (Exception e) { Log.WriteLog(LogType.process, LogFile.ERROR, "号牌" + license + "记录号牌异常\n" + e.StackTrace); }
-                            try
-                            {
-                                if (idReceiptMap.ContainsKey(term.terminalID))
-                                {
-                                    if (!idReceiptMap[term.terminalID].Equals(term.receiptNum))
-                                        idReceiptMap[term.terminalID] = term.receiptNum;
-                                }
-                                else
-                                {
-                                    idReceiptMap.Add(term.terminalID, term.receiptNum);
-                                }
-                            }
-                            catch (Exception e) { Log.WriteLog(LogType.process, LogFile.ERROR, "凭证号" + term.receiptNum + "记录凭证号异常\n" + e.StackTrace); }
+                            
                         }
                         }
                         Log.WriteLog(LogType.process, LogFile.INFO, "号牌" + license + "已记录");
                         Log.WriteLog(LogType.process, LogFile.INFO, "号牌" + license + "已记录");
                         ////未获得号牌,告知PLC终止,告诉终端提示用户重新操作
                         ////未获得号牌,告知PLC终止,告诉终端提示用户重新操作
@@ -639,6 +627,29 @@ namespace Terminal
                             licenseReceived = (short)numReceivedStatus
                             licenseReceived = (short)numReceivedStatus
                         };
                         };
                         Monitor.Monitor.PLC.WriteToPLC(mbst, PLCDataType.central);
                         Monitor.Monitor.PLC.WriteToPLC(mbst, PLCDataType.central);
+
+                        int receiptCount = 6;
+                        while (receiptCount-- > 0)
+                        {
+                            term = terminalInfo[i];
+                            try
+                            {
+                                if (idReceiptMap.ContainsKey(term.terminalID))
+                                {
+                                    if (!idReceiptMap[term.terminalID].Equals(term.receiptNum))
+                                        idReceiptMap[term.terminalID] = term.receiptNum;
+                                }
+                                else
+                                {
+                                    idReceiptMap.Add(term.terminalID, term.receiptNum);
+                                }
+                                Log.WriteLog(LogType.process, LogFile.INFO, "记录凭证号:" + term.receiptNum + "\n");
+                                if (term.receiptNum != 0)
+                                    break;
+                            }
+                            catch (Exception e) { Log.WriteLog(LogType.process, LogFile.ERROR, "凭证号" + term.receiptNum + "记录凭证号异常\n" + e.StackTrace); }
+                            Thread.Sleep(1000);
+                        }
                         //号牌获取结果被清零才跳出
                         //号牌获取结果被清零才跳出
                         Monitor.Monitor.SetNotification("已写入号牌获取结果" + numReceivedStatus + ",等待号牌机启动指令清零", parkMonitor.model.TextColor.Info);
                         Monitor.Monitor.SetNotification("已写入号牌获取结果" + numReceivedStatus + ",等待号牌机启动指令清零", parkMonitor.model.TextColor.Info);
                         //}
                         //}

+ 1 - 1
PLCLinker/centralController/serversettings.json

@@ -1,6 +1,6 @@
 {
 {
   "ssl": "false",
   "ssl": "false",
-  "host": "192.168.0.152",
+  "host": "118.31.225.50",
   "garageID": "7",
   "garageID": "7",
   "port": "9000",
   "port": "9000",
   "size": "1024",
   "size": "1024",