Merge remote-tracking branch 'jinwang/dev' into dev

parkMonitor/App.config

@@ -18,7 +18,8 @@
     <!--数据库连接配置文件-->
     <add key="SqlConnectionLocation" value="Data Source=127.0.0.1;port=20000;uid=root;pooling=true;pwd=yct;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;" />
     <!--<add key="SqlConnectionStr" value="Data Source=52.77.33.102;port=3306;uid=Ubuntu1;pooling=true;pwd=12345678;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;" />-->
-    <add key="SqlConnectionStr" value="Data Source=59.175.148.85;port=3306;uid=root;pooling=true;pwd=x5;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;" />
+    <!---<add key="SqlConnectionStr" value="Data Source=59.175.148.85;port=3306;uid=root;pooling=true;pwd=x5;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;" />-->
+    <add key="SqlConnectionStr" value="Data Source=192.168.0.62;port=3306;uid=root;pooling=true;pwd=x5;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;" />
     <add key="localGarageId" value="1"/>
     <!--日志写入地址配置文件-->
     <add key="LogPath" value="c:\\c#workspace\\LogDemo\\LoggerTest" />
@@ -66,7 +67,7 @@
     <add key="licenseTime" value="10" />
     <add key="userTime" value="30" />
     <!--上位机（Web线程）IP地址及配置serverScoket的端口-->
-    <add key="WebConfig" value="192.168.111.254:9000" />
+    <add key="WebConfig" value="192.168.111.84:9000" />
     <!--<add key ="WebConfig" value="127.0.0.1:9000"/>-->
 
     <!--车库入口-->

parkMonitor/DataBase/DBOperation.cs

@@ -346,7 +346,7 @@ namespace parkMonitor.DataBase
         public bool IsNumberPlateFromVehicle(string connectionStr, string numberPlate)
         {
             bool isNumberPlateFromVehicle = true;
-            string sql = "select * from vehicle where numberPlate = '" + numberPlate + "'";
+            string sql = "select * from vehicle where numberPlate = '" + numberPlate + "' and vehiclepParkState = 1";
             MySqlDataReader reader = null;
             Operation oper = new Operation(connectionStr, sql);
             int count = 0;

parkMonitor/DataBase/IDBOperation.cs

@@ -50,9 +50,10 @@ namespace parkMonitor.DataBase
                     reader = cmd.ExecuteReader();
                 }
             }
-            catch
+            catch(Exception ex)
             {
-                Console.WriteLine("数据库异常");
+                Console.WriteLine("查询数据库异常");
+                Console.WriteLine(ex.Message);
             }
             return reader;
         }
@@ -64,9 +65,10 @@ namespace parkMonitor.DataBase
                 con.Open();
                 cmd.ExecuteNonQuery();
             }
-            catch (Exception)
+            catch (Exception ex)
             {
                 Console.WriteLine("插入异常");
+                Console.WriteLine(ex.Message);
             }
         }
 
@@ -77,9 +79,10 @@ namespace parkMonitor.DataBase
                 con.Open();
                 cmd.ExecuteNonQuery();
             }
-            catch (Exception)
+            catch (Exception ex)
             {
                 Console.WriteLine("更新异常");
+                Console.WriteLine(ex.Message);
             }
         }
 
@@ -102,9 +105,10 @@ namespace parkMonitor.DataBase
             {
                 insertID = Convert.ToInt32(cmd.LastInsertedId);
             }
-            catch
+            catch(Exception ex)
             {
                 Console.WriteLine("插入数据库失败");
+                Console.WriteLine(ex.Message);
             }
             return insertID;
         }

parkMonitor/server/CoreThread/AbstractCmd.cs

@@ -653,6 +653,7 @@ namespace parkMonitor.server.CoreThread
             cm.parkingSpaceZ = Convert.ToString(ppp.parkingSpaceZ);
             PLC.SetMessage(cm);
             Log.WriteLog("停车流程：抓车:" + queueCmd.LicenseNum);
+            Log.WriteLog("车辆数据：" + cm.angleA + " ," + cm.centerX + " ," + cm.centerY + " ," + cm.length + " ," + cm.width + " ," + cm.height + " ," + cm.parkingSpaceID + " ," + cm.parkingSpaceX + " ," + cm.parkingSpaceY + " ," + cm.parkingSpaceZ);
             UILogServer.ins.info("停车流程：抓车:" + queueCmd.LicenseNum);
 
             if (!WaitWheelbase(ref frontWheelbase, ref rearWheelbase))
@@ -953,6 +954,7 @@ namespace parkMonitor.server.CoreThread
     /// </summary>
     public class SimpleCMDFactory
     {
+        DBOperation oper = new DBOperation();
         public AbstractCmd createCmd(Command queueCmd)
         {
             AbstractCmd abstractCmd = null;
@@ -964,6 +966,15 @@ namespace parkMonitor.server.CoreThread
             if (queueCmd.commandType == 'f')
             {
                 abstractCmd = new FetchCmd();
+                //bool IsNumberPlateFromVehicle = oper.IsNumberPlateFromVehicle("SqlConnectionStr",queueCmd.LicenseNum);
+                //if (IsNumberPlateFromVehicle)
+                //{
+                //    abstractCmd = new FetchCmd();
+                //}
+                //else
+                //{
+                //    Console.WriteLine(queueCmd.LicenseNum+"不在车库中");
+                //}
             }
             if (queueCmd.commandType == 'e')
             {