增加了网页服务

src/pPowerManger/PowerManger.cpp

@@ -47,18 +47,24 @@ PowerManger::PowerManger()
   //初始化控制指令
   initControlCmd();
 
-  //初始化UDP通信
+  //初始化下位机通信
   m_lowerCommManager = new LowerCommManager(this,IPORT,CCUPORT,CCUHOST);
   m_lowerCommManager->initUdpComm();
   m_lowerCommManager->startListenThread();
 
   //初始化上位机通信
   m_upperCommManager = new UpperCommManager(this);
-  //
 
   //初始化数据库
   m_db = new SQLite("power_data.db");
   m_db->createTable();
+
+  //初始化http服务器
+  m_httpServer = new HttpServer(8090);
+  //初始化系统数据
+  m_systemData = new SystemData();
+  m_httpServer->setSystemData(m_systemData);
+  m_httpServer->start();
 }
 
 //---------------------------------------------------------
@@ -129,18 +135,16 @@ bool PowerManger::Iterate()
   CycleTriggeredEvent cycleEvent;
   PowerManagerFsm::dispatch(cycleEvent);
   faultLevel = getFaultLevel();
-  //更新数据库
-  m_db->insertData(m_pmCurrentState.ccustate);
-  m_db->insertData(m_pmCurrentState.bus1State);
-  m_db->insertData(m_pmCurrentState.bus2State);
-  m_db->insertData(m_pmCurrentState.bus3State);
-  m_db->insertData(m_pmCurrentState.bus4State);
+  m_systemData->updateSystemData(m_pmCurrentState.ccustate);
+  m_systemData->updateSystemData(m_pmCurrentState.bus1State);
+  m_systemData->updateSystemData(m_pmCurrentState.bus2State);
+  m_systemData->updateSystemData(m_pmCurrentState.bus3State);
+  m_systemData->updateSystemData(m_pmCurrentState.bus4State);
   if (m_ticker++ % 5 == 0)
   {
     m_CcuColCmd.heartbeat++;
     m_lowerCommManager->processPeriodicTasks();
     m_upperCommManager->processPeriodicTasks();
-    writeDataToDB();
   }
   return(true);
 }
@@ -249,22 +253,6 @@ bool PowerManger::FsmLoop()
   return true;
 }
 
-bool PowerManger::writeDataToDB()
-{
-  //写入设备状态
-  // if(!m_db->insertDriverTables(m_currentDriverState,VAR_TO_STR(m_currentDriverState)))
-  //   return false;
-  // if(!m_db->insertDriverTables(m_subDisSysState,VAR_TO_STR(m_subDisSysState)))
-  //   return false;
-  // if(!m_db->insertDriverTables(m_subDisSysCmd,VAR_TO_STR(m_subDisSysCmd)))
-  //   return false;
-  // if(!m_db->insertDriverTables(m_MSDriverCmd,VAR_TO_STR(m_MSDriverCmd)))
-  //   return false;
-
-  return true;
-
-}
-
 int PowerManger::checkError()
 {
   //TODO：更新协议