kingwang1995 7 rokov pred
rodič
commit
7692a52a7c

+ 1 - 1
parkMonitor/DB/DBOperation.cs

@@ -8,7 +8,7 @@ using System.Configuration;
 
 namespace parkMonitor.DB
 {
-    class DBOperation
+    public class DBOperation
     {
         private static MySqlConnection con;
         private static MySqlCommand cmd;

+ 1 - 1
parkMonitor/DB/Garage.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace parkMonitor.DB
 {
-    class Garage
+    public class Garage
     {
         public int xweight { get; set; }
         public int yweight { get; set; }

+ 2 - 2
parkMonitor/DB/Parking_Space.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace parkMonitor.DB
 {
-    class Parking_Space
+    public class Parking_Space
     {
         public int parkingSpaceID { get; set; }
         //public float parkingSpaceWeight { get; set; }
@@ -17,7 +17,7 @@ namespace parkMonitor.DB
         public int parkingSpaceZ { get; set; }
     }
 
-    class Fetching_Space
+    public class Fetching_Space
     {
         public int parkingSpaceX { get; set; }
         public int parkingSpaceY { get; set; }

+ 1 - 1
parkMonitor/DB/Vehicle.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace parkMonitor.DB
 {
-    class Vehicle
+    public class Vehicle
     {
         public int parkingSpaceID { get; set; }
         public int garageID { get; set; }

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 615 - 500
parkMonitor/sdk/superscene/XmlCtl.cs


+ 26 - 53
parkMonitor/server/CoreThread/AbstractCmd.cs

@@ -16,52 +16,44 @@ namespace parkMonitor.server.CoreThread
     public abstract class AbstractCmd
     {
         public int equipmentStatus_address { set; get; }
+        public int park_completed_address { set; get; }
         public int parkingEntX { set; get; }
+        public int parkingEntY { set; get; }
+        public int parkingEntZ { set; get; }
+        public int fetch_completed_address { set; get; }
+        public IEquipments PLC { set; get; }
+        public IEquipments queuingThread { set; get; }
+        public DBOperation oper { set; get; }
+        public IEquipments NumMachine { set; get; }
+        public CEntrance c { set; get; }
+        public AllotParkingSpace aps { set; get; }
         public abstract void executeCmd(Command queueCmd);
 
         public AbstractCmd()
         {
             equipmentStatus_address = Convert.ToInt32(ConfigurationManager.AppSettings["equipmentStatus_address"]);
-            //int park_completed_address = Convert.ToInt32(ConfigurationManager.AppSettings["park_completed_address"]);
+            park_completed_address = Convert.ToInt32(ConfigurationManager.AppSettings["park_completed_address"]);
             parkingEntX = Convert.ToInt32(ConfigurationManager.AppSettings["parkingEntX"]);
-            //int parkingEntY = Convert.ToInt32(ConfigurationManager.AppSettings["parkingEntY"]);
-            //int parkingEntZ = Convert.ToInt32(ConfigurationManager.AppSettings["parkingEntZ"]);
-            ////取车完成
-            //int fetch_completed_address = Convert.ToInt32(ConfigurationManager.AppSettings["fetch_completed_address"]);
-            ////获取PLC句柄
-            //IEquipments PLC = EquipmentSimpleFactory.ins.FindEquipment(EquipmentName.PLC);
-            ////获取队列句柄
-            //IEquipments queuingThread = EquipmentSimpleFactory.ins.FindEquipment(EquipmentName.Queue);
-            ////数据库
-            //DBOperation oper = new DBOperation();
-            ////获取号牌句柄
-            //IEquipments NumMachine = EquipmentSimpleFactory.ins.FindEquipment(EquipmentName.NumMachine);
-            ////车位分配
-            //CEntrance c = new CEntrance();
-            //AllotParkingSpace aps = new AllotParkingSpace();
+            parkingEntY = Convert.ToInt32(ConfigurationManager.AppSettings["parkingEntY"]);
+            parkingEntZ = Convert.ToInt32(ConfigurationManager.AppSettings["parkingEntZ"]);
+            //取车完成
+            fetch_completed_address = Convert.ToInt32(ConfigurationManager.AppSettings["fetch_completed_address"]);
+            //获取PLC句柄
+            PLC = EquipmentSimpleFactory.ins.FindEquipment(EquipmentName.PLC);
+            //获取队列句柄
+            queuingThread = EquipmentSimpleFactory.ins.FindEquipment(EquipmentName.Queue);
+            //数据库
+            oper = new DBOperation();
+            //获取号牌句柄
+            NumMachine = EquipmentSimpleFactory.ins.FindEquipment(EquipmentName.NumMachine);
+            //车位分配
+            c = new CEntrance();
+            aps = new AllotParkingSpace();
         }
     }
 
     public class StopCmd : AbstractCmd
     {
-       // int equipmentStatus_address = Convert.ToInt32(ConfigurationManager.AppSettings["equipmentStatus_address"]);
-        int park_completed_address = Convert.ToInt32(ConfigurationManager.AppSettings["park_completed_address"]);
-       // int parkingEntX = Convert.ToInt32(ConfigurationManager.AppSettings["parkingEntX"]);
-        int parkingEntY = Convert.ToInt32(ConfigurationManager.AppSettings["parkingEntY"]);
-        int parkingEntZ = Convert.ToInt32(ConfigurationManager.AppSettings["parkingEntZ"]);
-        //取车完成
-        int fetch_completed_address = Convert.ToInt32(ConfigurationManager.AppSettings["fetch_completed_address"]);
-        //获取PLC句柄
-        IEquipments PLC = EquipmentSimpleFactory.ins.FindEquipment(EquipmentName.PLC);
-        //获取队列句柄
-        IEquipments queuingThread = EquipmentSimpleFactory.ins.FindEquipment(EquipmentName.Queue);
-        //数据库
-        DBOperation oper = new DBOperation();
-        //获取号牌句柄
-        IEquipments NumMachine = EquipmentSimpleFactory.ins.FindEquipment(EquipmentName.NumMachine);
-        //车位分配
-        CEntrance c = new CEntrance();
-        AllotParkingSpace aps = new AllotParkingSpace();
         public override void executeCmd(Command queueCmd)
         {
             PLCMessage PLCMsg = null;
@@ -206,24 +198,6 @@ namespace parkMonitor.server.CoreThread
 
     public class FetchCmd : AbstractCmd
     {
-        int equipmentStatus_address = Convert.ToInt32(ConfigurationManager.AppSettings["equipmentStatus_address"]);
-        int park_completed_address = Convert.ToInt32(ConfigurationManager.AppSettings["park_completed_address"]);
-        int parkingEntX = Convert.ToInt32(ConfigurationManager.AppSettings["parkingEntX"]);
-        int parkingEntY = Convert.ToInt32(ConfigurationManager.AppSettings["parkingEntY"]);
-        int parkingEntZ = Convert.ToInt32(ConfigurationManager.AppSettings["parkingEntZ"]);
-        //取车完成
-        int fetch_completed_address = Convert.ToInt32(ConfigurationManager.AppSettings["fetch_completed_address"]);
-        //获取PLC句柄
-        IEquipments PLC = EquipmentSimpleFactory.ins.FindEquipment(EquipmentName.PLC);
-        //获取队列句柄
-        IEquipments queuingThread = EquipmentSimpleFactory.ins.FindEquipment(EquipmentName.Queue);
-        //数据库
-        DBOperation oper = new DBOperation();
-        //获取号牌句柄
-        IEquipments NumMachine = EquipmentSimpleFactory.ins.FindEquipment(EquipmentName.NumMachine);
-        //车位分配
-        CEntrance c = new CEntrance();
-        AllotParkingSpace aps = new AllotParkingSpace();
         public override void executeCmd(Command queueCmd)
         {
             PLCMessage PLCMsg = null;
@@ -279,7 +253,6 @@ namespace parkMonitor.server.CoreThread
 
     public class ExceptionCmd : AbstractCmd
     {
-        DBOperation oper = new DBOperation();
         public override void executeCmd(Command queueCmd)
         {
             if (queueCmd.commandType == 'e')

+ 1 - 1
parkMonitor/server/CoreThread/AllotParkingSpace.cs

@@ -8,7 +8,7 @@ using System.Configuration;
 
 namespace parkMonitor.server.CoreThread
 {
-    class AllotParkingSpace
+    public class AllotParkingSpace
     {
         //根据车位位置及状态分配目标车位,返回Parking Space的ID
         public Parking_Space MallocParkingSpace(CEntrance pt_Ent)

+ 2 - 2
parkMonitor/view/mainWin/MainWindow.xaml.cs

@@ -45,7 +45,7 @@ namespace parkMonitor
 		
         ObjectItemVM selectedTreeVM = null;
         ObservableCollection<DevDetailItemVM> selectedDetailItemVM = null;
-        XmlCtl xmlConfig = new XmlCtl();
+        //XmlCtl xmlConfig = new XmlCtl();
         //private bool isScrollLogBox = true;
 
         public MainWindow()
@@ -203,7 +203,7 @@ namespace parkMonitor
         {
             CmdServer.ins.send(CmdType.MainWinClosed);
 
-            xmlConfig.save();
+           // xmlConfig.save();
         }
 
         /// <summary>点击复位按钮</summary>