优化结构

src/pPowerManger/PowerManger.h

@@ -36,6 +36,7 @@ class PowerManagerFsm;
 #include "PowerManagerFsm.hpp"
 #include "SQLiteDB.h"
 #include "driver.h"
+#include "LowerCommManager.h"
 
 #define VAR_TO_STR(var) #var
 
@@ -99,34 +100,44 @@ class PowerManger : public AppCastingMOOSApp
   double msg_disHighAVolBusFbMsg_Update_time;
   double msg_disHighBVolBusFbMsg_Update_time;
   double msg_disLowBusFbMsg_Update_time;
+  /************************************************************/
+  /*       |<------------FEEDBACK--------<--                  */
+  /*       |                               |                  */
+  /*  IN-->+-------[STATE CONTROL]---------+--->OUT           */
+  /*                                                          */
+  /************************************************************/  
   public:
-  //===========================交互状态变量==================================
-  Driver m_driver; //设备驱动
+  //===========================IN============================================
+  DriverTable m_MSDriverCmd;
+  MSControlCmd m_msCmd;
+  //===========================OUT===========================================
+  DriverTable m_subDisSysCmd;
+  ccuColCmd m_CcuColCmd;
+  disSysBreakerList m_targetDisBreakerState;
+  //===========================FEEDBACK======================================
   pmState m_pmCurrentState; //能源系统的当前状态
   disSysBreakerList m_currentDisBreakerState; //配电断路器状态
-  disSysBreakerList m_targetDisBreakerState;
   DriverTable m_currentDriverState;
-  DriverTable m_MSDriverCmd;
-  DriverTable m_subDisSysCmd;
   DriverTable m_subDisSysState;
-  std::string m_pmEvent;  // 状态机事件描述
-  //=============================运行变量======================================
+  //===========================STATE=========================================
+  unsigned char workCondition;
+  unsigned char currentMod;
+  unsigned char powerState;
+  unsigned char falutLevel;
+  vector<unsigned int> faultCode;
+  unsigned int soc;
+  unsigned int sustainableTime;
+  //===========================CONFIG========================================
   long          m_lPort;
   unsigned int  m_nReceiveBufferSizeKB;
   unsigned int  m_nSendBufferSizeKB;
   double        m_current_time;
   unsigned int  m_faultNum;
   unsigned int  m_ticker;
-//===========================================================================
-   //系统运行状态
-   unsigned char workCondition;
-   unsigned char currentMod;
-   unsigned char powerState;
-   unsigned char falutLevel;
-   vector<unsigned int> faultCode;
-   unsigned int soc;
-   unsigned int sustainableTime;
- 
+  //===========================交互状态变量==================================
+  Driver m_driver; //设备驱动
+  std::string m_pmEvent;  // 状态机事件描述
+  //=============================运行变量======================================
    // 配电和CCU的反馈状态
    msg_CcuStateFbMsg       m_CcuCurrentState;
    msg_disHighVolBusFbMsg  m_disHighVolBusCurrentState;
@@ -135,7 +146,6 @@ class PowerManger : public AppCastingMOOSApp
    msg_disLowBusFbMsg      m_disLowBusState;
  
    //下位机操作函数
-   ccuColCmd m_CcuColCmd;
    void disSysOption();
    void ccuOption();
  
@@ -143,16 +153,15 @@ class PowerManger : public AppCastingMOOSApp
    void initControlCmd();
  
    //上位机操作函数
-   MSControlCmd m_msCmd;
+   
    bool buildPowerSysReport();
    bool getMsCmdFromJson(MSControlCmd &cmd,const string &strJson);
  
   private:
-   udpComm       m_udpComm;
-   XPCUdpSocket *m_pCcuUdpComm;
    CMOOSThread   m_ListenThread;
    CMOOSThread   m_FsmThread;
- 
+   LowerCommManager* m_lowerCommManager;
+    
    // 状态机实例
    PowerManagerFsm m_fsm;