微改

parkMonitor/App.config

@@ -16,7 +16,7 @@
   </Equipments>
   <appSettings>
     <!--数据库连接配置文件-->
-    <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="SqlConnectionLocation" value="Data Source=127.0.0.1;port=20000;uid=root;pooling=true;pwd=jingwang1995;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;" /> 
 <!--日志写入地址配置文件-->

parkMonitor/server/CoreThread/AbstractCmd.cs

@@ -297,10 +297,10 @@ namespace parkMonitor.server.CoreThread
         {        
             //第一步：
             int status = 1;//停车
-            ControlMessage pm = new ControlMessage();
-            pm.status = status;
-            pm.laserID = queueCmd.id;//启动对应激光
-            PLC.SetMessage(pm);
+            ControlMessage cm = new ControlMessage();
+            cm.status = status;
+            cm.laserID = queueCmd.id;//启动对应激光
+            PLC.SetMessage(cm);
             Console.WriteLine("停车，开激光:" + queueCmd.LicenseNum);
             Log.WriteLog("停车，开激光:" + queueCmd.LicenseNum);
             UILogServer.ins.info("停车，开激光:" + queueCmd.LicenseNum);   
@@ -394,19 +394,19 @@ namespace parkMonitor.server.CoreThread
             robotFree.Wait();
             //第二步：
             status = 2;
-            pm.status = status;
-            pm.RobotID = robotID;//启动对应机械手
-            pm.centerX = Convert.ToString(centerX);
-            pm.centerY = Convert.ToString(centerY);
-            pm.angleA = Convert.ToString(angleA);
-            pm.length = Convert.ToString(length);
-            pm.width = Convert.ToString(width);
-            pm.height = Convert.ToString(height);
-            pm.parkingSpaceID = Convert.ToString(parkingSpaceID);
-            pm.parkingSpaceX = Convert.ToString(parkingSpaceX);
-            pm.parkingSpaceY = Convert.ToString(parkingSpaceY);
-            pm.parkingSpaceZ = Convert.ToString(parkingSpaceZ);
-            PLC.SetMessage(pm);
+            cm.status = status;
+            cm.RobotID = robotID;//启动对应机械手
+            cm.centerX = Convert.ToString(centerX);
+            cm.centerY = Convert.ToString(centerY);
+            cm.angleA = Convert.ToString(angleA);
+            cm.length = Convert.ToString(length);
+            cm.width = Convert.ToString(width);
+            cm.height = Convert.ToString(height);
+            cm.parkingSpaceID = Convert.ToString(parkingSpaceID);
+            cm.parkingSpaceX = Convert.ToString(parkingSpaceX);
+            cm.parkingSpaceY = Convert.ToString(parkingSpaceY);
+            cm.parkingSpaceZ = Convert.ToString(parkingSpaceZ);
+            PLC.SetMessage(cm);
 
             Console.WriteLine("停车，抓车:" + queueCmd.LicenseNum);
             Log.WriteLog("停车，抓车:" + queueCmd.LicenseNum);
@@ -421,8 +421,8 @@ namespace parkMonitor.server.CoreThread
             storeSignal.Wait();
             //第三步：
             status = 3;
-            pm.status = status;
-            PLC.SetMessage(pm);
+            cm.status = status;
+            PLC.SetMessage(cm);
             //机械手异常则跳出
             if (robotError)
             {
@@ -537,7 +537,7 @@ namespace parkMonitor.server.CoreThread
             int parkingSpaceX = fslist.parkingSpaceX;
             int parkingSpaceY = fslist.parkingSpaceY;
             int parkingSpaceZ = fslist.parkingSpaceZ;
-            ControlMessage pm = new ControlMessage();
+            ControlMessage cm = new ControlMessage();
             
             int robotID = 0;
             robotID = parkingSpaceID / 15 + 1;
@@ -548,17 +548,17 @@ namespace parkMonitor.server.CoreThread
             robotFree.Wait();
             //取车
             int status = 4;
-            pm.status = status;
+            cm.status = status;
             //先手动赋值
-            pm.RobotID = 1;
-            pm.fetchPosition = 1;//放置地址
-            pm.parkingSpaceID = Convert.ToString(parkingSpaceID);
-            pm.parkingSpaceX = Convert.ToString(parkingSpaceX);
-            pm.parkingSpaceY = Convert.ToString(parkingSpaceY);
-            pm.parkingSpaceZ = Convert.ToString(parkingSpaceZ);
-            pm.frontWheelbase = frontwheelbase;
-            pm.rearWheelbase = rearwheelbase;
-            PLC.SetMessage(pm);
+            cm.RobotID = 1;
+            cm.fetchPosition = 1;//放置地址
+            cm.parkingSpaceID = Convert.ToString(parkingSpaceID);
+            cm.parkingSpaceX = Convert.ToString(parkingSpaceX);
+            cm.parkingSpaceY = Convert.ToString(parkingSpaceY);
+            cm.parkingSpaceZ = Convert.ToString(parkingSpaceZ);
+            cm.frontWheelbase = frontwheelbase;
+            cm.rearWheelbase = rearwheelbase;
+            PLC.SetMessage(cm);
 
             Console.WriteLine("取车:" + queueCmd.LicenseNum);
             Log.WriteLog("取车:" + queueCmd.LicenseNum);
@@ -583,11 +583,11 @@ namespace parkMonitor.server.CoreThread
             signalFromPLC.Wait();
             //取车完成
             status = 5;
-            ControlMessage pm2 = new ControlMessage();
-            pm2.status = status;
+            ControlMessage cm2 = new ControlMessage();
+            cm2.status = status;
             //先手动赋值
-            pm2.RobotID = 1;
-            PLC.SetMessage(pm2);
+            cm2.RobotID = 1;
+            PLC.SetMessage(cm2);
             Console.WriteLine("号牌：" + queueCmd.LicenseNum + "取车完成");
             Log.WriteLog("号牌：" + queueCmd.LicenseNum + "取车完成");
             UILogServer.ins.info("号牌：" + queueCmd.LicenseNum + "取车完成");

parkMonitor/server/CoreThread/CoreThreadTest2.cs

@@ -86,7 +86,7 @@ namespace parkMonitor.server.CoreThread
             AbstractCmd.isClosing = true;//停止运行中指令
         }
 
-        public void BeginWorking()
+        public void BeginWorking() 
         {
             while (true)
             {
@@ -116,11 +116,14 @@ namespace parkMonitor.server.CoreThread
                         //更新车库表车位数
                         int freeSpaceCount = locationOper.getGarageFreeSpace(queueCmd.garageID);
                         oper.UpdateGarageFreeSpace(freeSpaceCount, queueCmd.garageID);
-                        //更新车位状态
+                        //更新车位状态                       
                         int[] spaceID = locationOper.GetAllParkingSpaceID();
-                        for (int i = 0; i < spaceID.Length; i++)
+                        if (spaceID != null)
                         {
-                            oper.UpdateParkingSpaceState(spaceID[i],1);
+                            for (int i = 0; i < spaceID.Length; i++)
+                            {
+                                oper.UpdateParkingSpaceState(spaceID[i], 1);
+                            }
                         }
                     }
                     catch (Exception)