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

parkMonitor/DB/DBOperation.cs

@@ -139,7 +139,7 @@ namespace parkMonitor.DB
         {
             List<Parking_Space> lps = new List<Parking_Space>();
             MySqlDataReader reader;
-            string sql = "select * from parkingspace where parkingSpaceState=0";
+            string sql = "select * from parkingspace where parkingSpaceState = 0 ";
             con = oper.getConn();
             try
             {

parkMonitor/bll/MainBll.cs

@@ -27,15 +27,15 @@ namespace parkMonitor.bll {
             if (coreThread != null)
             {
                 coreThread.Start();
-                //Task.Factory.StartNew(() =>
-                //{
-                //    (coreThread as ICoreThreadDoWorking).BeginWorking();
-                //});
+                Task.Factory.StartNew(() =>
+                {
+                    (coreThread as ICoreThreadDoWorking).BeginWorking();
+                });
             }
 
             //数据库测试
-            var dbt = new DBTest();
-            dbt.TestMethod();
+            //var dbt = new DBTest();
+            //dbt.TestMethod();
             //DBOperation o = new DBOperation();
             //IEquipments nml = EquipmentSimpleFactory.ins.FindEquipment(EquipmentName.NumMachine);
             //int count = 10;

parkMonitor/parkMonitor.csproj

@@ -49,10 +49,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>sdk\log4net\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data, Version=6.0.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>sdk\mysql\MySql.Data.dll</HintPath>
-    </Reference>
+    <Reference Include="MySql.Data, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" />
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>sdk\HslCommunication\Newtonsoft.Json.dll</HintPath>

parkMonitor/server/CoreThread/CoreThreadTest.cs

@@ -236,7 +236,7 @@ namespace parkMonitor.server.CoreThread
                              {
                                  if (PLCMsg.laser1.data != null)
                                  {
-                                     if (PLCMsg.laser1.status == 0 || PLCMsg.laser1.status == 3)
+                                     if (PLCMsg.laser1.status == 3)
                                      {
                                          int centerX = 0;
                                          int centerY = 0;
@@ -267,6 +267,7 @@ namespace parkMonitor.server.CoreThread
                                      }   
                                  }
                              }
+                             Thread.Sleep(500);
                          }
                      });
                     //Task.WaitAll(dataFromLaser);
@@ -302,9 +303,8 @@ namespace parkMonitor.server.CoreThread
                     //判断测量数据是否准确
                     //bool isDataRight = oper.IsDataRight(vehicleTypeLength, vehicleTypeWidth, vehicleTypeHeight, vehicleTypeWheelbase, vehicleTypeID);
                     //更新数据库
-
-
                 }
+                PLCMsg.laser1.status = 0;
                 Thread.Sleep(100);
             }
         }

parkMonitor/server/PLCLinker/PLCLinker.cs

@@ -589,6 +589,15 @@ namespace parkMonitor.server
                         case 1:
                             //start laser scanning for parking
                             SendtoPLC(park_command_addr.ToString(), "1");
+                            Thread.Sleep(100);
+                            if (plcMsg.laser1 != null)
+                            {
+                                plcMsg.laser1.status = 0;
+                            }
+                            if (plcMsg.laser2 != null)
+                            {
+                                plcMsg.laser2.status = 0;
+                            }
                             //Console.WriteLine("扫摆激光启动");
                             break;
                         //停车激光的6个数据,停车机械手,车位信息4个