数据库操作修改

parkMonitor/App.config

@@ -16,7 +16,7 @@
   </Equipments>
   <appSettings>
     <!--数据库连接配置文件-->
-    <add key="SqlConnectionLocation" value="Data Source=127.0.0.1;port=3306;uid=root;pooling=true;pwd=jingwang1995;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;" />
+    <add key="SqlConnectionLocation" value="Data Source=127.0.0.1;port=20000;uid=root;pooling=true;pwd=;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;" /> 
 <!--日志写入地址配置文件-->
@@ -63,7 +63,7 @@
     <add key="licenseTime" value="30" />
     <add key="userTime" value="30" />
     <!--上位机（Web线程）IP地址及配置serverScoket的端口-->
-    <add key="WebConfig" value="192.168.111.254:9000" />
+    <add key="WebConfig" value="192.168.111.17:9000" />
     <!--<add key ="WebConfig" value="127.0.0.1:9000"/>-->
 
     <!--车库入口-->

parkMonitor/DB/DBOperation.cs

@@ -36,6 +36,7 @@ namespace parkMonitor.DB
                 }
                 if (reader != null)
                 {
+                    reader.Close();
                     reader.Dispose();
                 }
                 if (cmd != null)
@@ -44,7 +45,7 @@ namespace parkMonitor.DB
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -84,6 +85,7 @@ namespace parkMonitor.DB
                 }
                 if (reader != null)
                 {
+                    reader.Close();
                     reader.Dispose();
                 }
                 if (cmd != null)
@@ -92,7 +94,7 @@ namespace parkMonitor.DB
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -139,6 +141,7 @@ namespace parkMonitor.DB
                 }
                 if (reader != null)
                 {
+                    reader.Close();
                     reader.Dispose();
                 }
                 if (cmd != null)
@@ -147,7 +150,7 @@ namespace parkMonitor.DB
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -194,6 +197,7 @@ namespace parkMonitor.DB
                 }
                 if (reader != null)
                 {
+                    reader.Close();
                     reader.Dispose();
                 }
                 if (cmd != null)
@@ -202,7 +206,7 @@ namespace parkMonitor.DB
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -242,6 +246,7 @@ namespace parkMonitor.DB
                 }
                 if (reader != null)
                 {
+                    reader.Close();
                     reader.Dispose();
                 }
                 if (cmd != null)
@@ -250,7 +255,7 @@ namespace parkMonitor.DB
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -274,12 +279,12 @@ namespace parkMonitor.DB
                 oper.getInsert(cmd);
                 parkingRecordsID = Convert.ToInt32(cmd.LastInsertedId);
                 if (cmd != null)
-                {
+                {                   
                     cmd.Dispose();
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -306,7 +311,7 @@ namespace parkMonitor.DB
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -337,6 +342,7 @@ namespace parkMonitor.DB
                 }
                 if (reader != null)
                 {
+                    reader.Close();
                     reader.Dispose();
                 }
                 if (cmd != null)
@@ -345,7 +351,7 @@ namespace parkMonitor.DB
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -372,7 +378,7 @@ namespace parkMonitor.DB
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -398,7 +404,7 @@ namespace parkMonitor.DB
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -424,7 +430,7 @@ namespace parkMonitor.DB
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -450,7 +456,7 @@ namespace parkMonitor.DB
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -476,7 +482,7 @@ namespace parkMonitor.DB
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -507,6 +513,7 @@ namespace parkMonitor.DB
                 }
                 if (reader != null)
                 {
+                    reader.Close();
                     reader.Dispose();
                 }
                 if (cmd != null)
@@ -515,7 +522,7 @@ namespace parkMonitor.DB
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -555,6 +562,7 @@ namespace parkMonitor.DB
                 }
                 if (reader != null)
                 {
+                    reader.Close();
                     reader.Dispose();
                 }
                 if (cmd != null)
@@ -563,7 +571,7 @@ namespace parkMonitor.DB
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -600,6 +608,7 @@ namespace parkMonitor.DB
                 }
                 if (reader != null)
                 {
+                    reader.Close();
                     reader.Dispose();
                 }
                 if (cmd != null)
@@ -608,7 +617,7 @@ namespace parkMonitor.DB
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }

parkMonitor/DBLocation/DBLocation.cs

@@ -34,7 +34,7 @@ namespace parkMonitor.DBLocation
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -63,7 +63,7 @@ namespace parkMonitor.DBLocation
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -95,6 +95,7 @@ namespace parkMonitor.DBLocation
                 }
                 if (reader != null)
                 {
+                    reader.Close();
                     reader.Dispose();
                 }
                 if (cmd != null)
@@ -103,7 +104,7 @@ namespace parkMonitor.DBLocation
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -135,6 +136,7 @@ namespace parkMonitor.DBLocation
                 }
                 if (reader != null)
                 {
+                    reader.Close();
                     reader.Dispose();
                 }
                 if (cmd != null)
@@ -143,7 +145,7 @@ namespace parkMonitor.DBLocation
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -175,15 +177,16 @@ namespace parkMonitor.DBLocation
                 }
                 if (reader != null)
                 {
+                    reader.Close();
                     reader.Dispose();
                 }
                 if (cmd != null)
-                {
+                {                    
                     cmd.Dispose();
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -215,7 +218,7 @@ namespace parkMonitor.DBLocation
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -244,7 +247,7 @@ namespace parkMonitor.DBLocation
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -271,7 +274,7 @@ namespace parkMonitor.DBLocation
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -297,7 +300,7 @@ namespace parkMonitor.DBLocation
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -323,7 +326,7 @@ namespace parkMonitor.DBLocation
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -349,7 +352,7 @@ namespace parkMonitor.DBLocation
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -375,7 +378,7 @@ namespace parkMonitor.DBLocation
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -406,7 +409,7 @@ namespace parkMonitor.DBLocation
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -433,7 +436,7 @@ namespace parkMonitor.DBLocation
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }
@@ -473,7 +476,7 @@ namespace parkMonitor.DBLocation
                 }
                 if (con != null)
                 {
-                    //con.Close();
+                    con.Close();
                     con.Dispose();
                 }
             }

parkMonitor/server/CoreThread/AbstractCmd.cs

@@ -189,7 +189,14 @@ namespace parkMonitor.server.CoreThread
             {
                 while (true)
                 {
-                    ppp = aps.MallocParkingSpace(c);//得到车位
+                    if (!queueCmd.manual)
+                    {
+                        ppp = aps.MallocParkingSpace(c, oper);//自动
+                    }
+                    else
+                    {
+                        ppp = aps.MallocParkingSpace(c, locationOper);//手动
+                    }
                     if (ppp != null)
                     {
                         break;
@@ -198,11 +205,8 @@ namespace parkMonitor.server.CoreThread
                     Thread.Sleep(200);
                 }
             });
-            parkingSpace.Wait();
-            int parkingSpaceID = ppp.parkingSpaceID;
-            int parkingSpaceX = ppp.parkingSpaceX;
-            int parkingSpaceY = ppp.parkingSpaceY;
-            int parkingSpaceZ = ppp.parkingSpaceZ;
+            //parkingSpace.Wait();
+            
             //int garageID = ppp.garageID;
             string numberPlate = queueCmd.LicenseNum;
             int userID = 0;
@@ -299,7 +303,12 @@ namespace parkMonitor.server.CoreThread
                 }
             });
 
-            dataFromLaser.Wait();
+            //dataFromLaser.Wait();
+            Task.WaitAll(parkingSpace,dataFromLaser);
+            int parkingSpaceID = ppp.parkingSpaceID;
+            int parkingSpaceX = ppp.parkingSpaceX;
+            int parkingSpaceY = ppp.parkingSpaceY;
+            int parkingSpaceZ = ppp.parkingSpaceZ;
             if (disappeared)
             {
                 NumReset(queueCmd);

parkMonitor/server/CoreThread/AllotParkingSpace.cs

@@ -11,7 +11,7 @@ namespace parkMonitor.server.CoreThread
     public class AllotParkingSpace
     {
         //根据车位位置及状态分配目标车位，返回Parking Space的ID
-        public Parking_Space MallocParkingSpace(CEntrance pt_Ent)
+        public Parking_Space MallocParkingSpace(CEntrance pt_Ent,object c)
         {
             DBOperation o = new DBOperation();
             List<Parking_Space> lps = o.GetParkingSpace();

parkMonitor/server/CoreThread/AllotTest.cs

@@ -1,24 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using parkMonitor.DB;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading.Tasks;
+//using parkMonitor.DB;
 
-namespace parkMonitor.server.CoreThread
-{
-    class AllotTest
-    {
-        public void AllotMethod()
-        {
-            AllotParkingSpace aps = new AllotParkingSpace();
-            CEntrance c = new CEntrance();
-            c.parkingEntX = 0;
-            c.parkingEntY = 0;
-            c.parkingEntZ = 0;
-            Parking_Space ppp = new Parking_Space();
-            ppp = aps.MallocParkingSpace(c);
-            Console.WriteLine(ppp);
-        }
-    }
-}
+//namespace parkMonitor.server.CoreThread
+//{
+//    class AllotTest
+//    {
+//        public void AllotMethod()
+//        {
+//            AllotParkingSpace aps = new AllotParkingSpace();
+//            CEntrance c = new CEntrance();
+//            c.parkingEntX = 0;
+//            c.parkingEntY = 0;
+//            c.parkingEntZ = 0;
+//            Parking_Space ppp = new Parking_Space();
+//            ppp = aps.MallocParkingSpace(c);
+//            Console.WriteLine(ppp);
+//        }
+//    }
+//}

parkMonitor/server/NumMachine/NumMachine.cs

@@ -752,7 +752,9 @@ namespace parkMonitor.server
                 Dictionary<string, int>.Enumerator enumerator = ipIdMap.GetEnumerator();
                 do
                 {
-                    if (enumerator.Current.Value == cmd.id && ipHandleMap.TryGetValue(enumerator.Current.Key, out int handle))
+                   // if (enumerator.Current.Value == cmd.id && ipHandleMap.TryGetValue(enumerator.Current.Key, out int handle))
+                    int handle = 0;
+                     if(enumerator.Current.Value == cmd.id && ipHandleMap.TryGetValue(enumerator.Current.Key, out handle))
                     {
                         snapshotDevHandle = handle;
                         break;