yc_t 7 anni fa
parent
commit
d8c912f544

+ 3 - 1
parkMonitor/App.config

@@ -16,7 +16,9 @@
   </Equipments>
   <appSettings>
     <!--数据库连接配置文件-->
-    <add key="SqlConnectionStr" value="Data Source=127.0.0.1;port=3306;uid=root;pooling=true;pwd=yct;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;" />
+    <!--<add key="SqlConnectionStr" value="Data Source=127.0.0.1;port=3306;uid=root;pooling=true;pwd=yct;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;" />-->
+    <add key="SqlConnectionStr" value="Data Source=13.229.217.199;port=3306;uid=Ubuntu;pooling=true;pwd=12345678;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;" />
+    <!--<add key="SqlConnectionStr" value="Data Source=192.168.0.55;port=3306;uid=root;pooling=true;pwd=x5;database=zxpark;CharSet=utf8;Allow Zero Datetime=true;" />-->
     <!--日志写入地址配置文件-->
     <add key="LogPath" value="E:\\c#workspace\\LogDemo\\LoggerTest" />
     <!--测量数据的误差-->

+ 6 - 6
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;

+ 12 - 12
parkMonitor/server/CoreThread/CoreThreadTest.cs

@@ -14,22 +14,22 @@ namespace parkMonitor.server.CoreThread
 {
     class CoreThreadTest : IEquipments, ICoreThreadDoWorking
     {
-        string startRobot_address;//启动机械手地址
-        string parkingSpaceID_address;
-        string parkingSpaceX_address;
-        string parkingSpaceY_address;
-        string parkingSpaceZ_address;
+        //string startRobot_address;//启动机械手地址
+        //string parkingSpaceID_address;
+        //string parkingSpaceX_address;
+        //string parkingSpaceY_address;
+        //string parkingSpaceZ_address;
         int equipmentStatus_address;//设备总控状态地址
         int park_completed_address;//停车完成地址
         int parkingEntX;//入口
         int parkingEntY;
         int parkingEntZ;
-        string park_command_address;//启动激光
+        //string park_command_address;//启动激光
         //int vehicleTypeLength_address;
         //int vehicleTypeWidth_address;
         //int vehicleTypeHeight_address;
         //int vehicleTypeWheelbase_address;
-        string parking_startRobot_address;//停车启动
+        //string parking_startRobot_address;//停车启动
         int fetch_completed_address;
         //获取PLC句柄
         IEquipments PLC;
@@ -211,11 +211,11 @@ namespace parkMonitor.server.CoreThread
                     c.parkingEntY = parkingEntY;
                     c.parkingEntZ = parkingEntZ;
                     Parking_Space ppp = new Parking_Space();
-                    //ppp = aps.MallocParkingSpace(c);//得到车位
-                    ppp.parkingSpaceID = 4;
-                    ppp.parkingSpaceX = 3;
-                    ppp.parkingSpaceY = 1;
-                    ppp.parkingSpaceZ = 2;
+                    ppp = aps.MallocParkingSpace(c);//得到车位
+                    //ppp.parkingSpaceID = 4;
+                    //ppp.parkingSpaceX = 3;
+                    //ppp.parkingSpaceY = 1;
+                    //ppp.parkingSpaceZ = 2;
                     int parkingSpaceID = ppp.parkingSpaceID;
                     int parkingSpaceX = ppp.parkingSpaceX;
                     int parkingSpaceY = ppp.parkingSpaceY;