Merge remote-tracking branch 'jin's_repo_in_jin's_remote/dev' into dev

parkMonitor/DataBase/IDBOperation.cs

@@ -42,9 +42,13 @@ namespace parkMonitor.DataBase
                     if (reader.HasRows)
                     {
                         count++;
-                        //return reader;
                     }                 
-                }               
+                }
+                reader.Close();
+                if (count > 0)
+                {
+                    reader = cmd.ExecuteReader();
+                }
             }
             catch
             {

parkMonitor/server/CoreThread/AllotParkingSpace.cs

@@ -12,12 +12,19 @@ namespace parkMonitor.server.CoreThread
 {
     public class AllotParkingSpace
     {
+        //Dictionary<int, Parking_Space> lps = null;
+        //public AllotParkingSpace()
+        //{
+        //    DBOperation oper = new DBOperation();
+        //    lps = oper.GetParkingSpace(connectionStr, queueCmd.garageID);
+        //}
         //根据车位位置及状态分配目标车位，返回Parking Space的ID
         public Parking_Space MallocParkingSpace(CEntrance pt_Ent, string connectionStr, Command queueCmd)
         {
             DBOperation oper = new DBOperation();
             Dictionary<int, Parking_Space> lps = null;
-            lps = oper.GetParkingSpace(connectionStr,queueCmd.garageID);
+            lps = oper.GetParkingSpace(connectionStr, queueCmd.garageID);
+
             double xWeight = Convert.ToDouble(ConfigurationManager.AppSettings["xWeight"]);
             double yWeight = Convert.ToDouble(ConfigurationManager.AppSettings["yWeight"]);
             double zWeight = Convert.ToDouble(ConfigurationManager.AppSettings["zWeight"]);