diff --git a/product/src/example/dbms_test/AccessTest/testCQDbInterface.cpp b/product/src/example/dbms_test/AccessTest/testCQDbInterface.cpp index 555e40c7..caf231c8 100644 --- a/product/src/example/dbms_test/AccessTest/testCQDbInterface.cpp +++ b/product/src/example/dbms_test/AccessTest/testCQDbInterface.cpp @@ -13,9 +13,9 @@ int main() objPara.setHostName("192.168.77.212"); objPara.setDbType(DB_TYPE_MYSQL); objPara.setPort(3306); - objPara.setDatabaseName("iscs6000"); + objPara.setDatabaseName(EMS_DEFAULT_DATABASE); objPara.setUserName("root"); - objPara.setPassword("kbdct@0755"); + objPara.setPassword(EMS_DEFAULT_PASSWD); objDb.setDbPara(objPara); objDb.init(); objDb.open(); diff --git a/product/src/example/link_seq_test/linkage_server_test/CLinkageForHmiApiInterface.h b/product/src/example/link_seq_test/linkage_server_test/CLinkageForHmiApiInterface.h index cd0595da..9c1ac272 100644 --- a/product/src/example/link_seq_test/linkage_server_test/CLinkageForHmiApiInterface.h +++ b/product/src/example/link_seq_test/linkage_server_test/CLinkageForHmiApiInterface.h @@ -6,7 +6,7 @@ class MainWindow; using namespace iot_idl::linkage; class CLinkageForHmiApiInterface - : public iot_application::CLinkageForHmiApi + : public iot_app::CLinkageForHmiApi { public: CLinkageForHmiApiInterface(MainWindow* mainWindow); diff --git a/product/src/example/link_seq_test/linkage_server_test/ConfigureDialog.cpp b/product/src/example/link_seq_test/linkage_server_test/ConfigureDialog.cpp index 7a148e30..1206627a 100644 --- a/product/src/example/link_seq_test/linkage_server_test/ConfigureDialog.cpp +++ b/product/src/example/link_seq_test/linkage_server_test/ConfigureDialog.cpp @@ -123,7 +123,7 @@ void ConfigureDialog::slot_initUserInfo() { userItem->setText(1,"1"); userGroupItem->setText(1,"系统管理员"); - hostItem->setText(1,"kbd-rd-shj"); + hostItem->setText(1,"host1"); locationItem->setText(1,"东孚站"); domainItem->setText(1,"东孚站域"); diff --git a/product/src/example/link_seq_test/sequence_server_test/CConfigureDialog.cpp b/product/src/example/link_seq_test/sequence_server_test/CConfigureDialog.cpp index 1684cb46..fce7170b 100644 --- a/product/src/example/link_seq_test/sequence_server_test/CConfigureDialog.cpp +++ b/product/src/example/link_seq_test/sequence_server_test/CConfigureDialog.cpp @@ -173,7 +173,7 @@ void CConfigureDialog::slot_initUserInfo() { m_objUserName->setText(1,"1"); m_objUsergName->setText(1,"系统管理员"); - m_objHostName->setText(1,"kbd-rd-shj"); + m_objHostName->setText(1,"host1"); m_objLocationName->setText(1,"东孚站"); m_objDomainName->setText(1,"东孚站域"); diff --git a/product/src/example/link_seq_test/sequence_server_test/CSequenceForHmiApiInterface.h b/product/src/example/link_seq_test/sequence_server_test/CSequenceForHmiApiInterface.h index 9e592b47..e992fb73 100644 --- a/product/src/example/link_seq_test/sequence_server_test/CSequenceForHmiApiInterface.h +++ b/product/src/example/link_seq_test/sequence_server_test/CSequenceForHmiApiInterface.h @@ -5,7 +5,7 @@ class MainWindow; using namespace iot_idl::sequence; class CSequenceForHmiApiInterface - : public iot_application::CSeqForHmiApi + : public iot_app::CSeqForHmiApi { public: CSequenceForHmiApiInterface(MainWindow* mainWindow); diff --git a/product/src/example/link_seq_test/sequence_server_test/CSqlDbCtrl.cpp b/product/src/example/link_seq_test/sequence_server_test/CSqlDbCtrl.cpp index ca1c9894..5c4e2317 100644 --- a/product/src/example/link_seq_test/sequence_server_test/CSqlDbCtrl.cpp +++ b/product/src/example/link_seq_test/sequence_server_test/CSqlDbCtrl.cpp @@ -26,7 +26,7 @@ bool CSqlDbCtrl::getDbParam(iot_dbms::CDbPara& param) std::string strNodeName; if (!CDbSysInfo::getInitDbNode(strNodeName)) { - strNodeName = "kbd-rd-xxw"; + strNodeName = "host1"; } if (CDbSysInfo::getDbParamByNodeName(strNodeName, param) @@ -34,9 +34,9 @@ bool CSqlDbCtrl::getDbParam(iot_dbms::CDbPara& param) { param.setDbType(DB_TYPE_MYSQL); param.setHostName("192.168.77.200"); - param.setDatabaseName("iscs6000"); + param.setDatabaseName(EMS_DEFAULT_DATABASE); param.setUserName("root"); - param.setPassword("kbdct@0755"); + param.setPassword(EMS_DEFAULT_PASSWD); param.setPort(3306); } diff --git a/product/src/example/link_seq_test/trigger_test/CDbContainer.cpp b/product/src/example/link_seq_test/trigger_test/CDbContainer.cpp index cb1df000..8cc62466 100644 --- a/product/src/example/link_seq_test/trigger_test/CDbContainer.cpp +++ b/product/src/example/link_seq_test/trigger_test/CDbContainer.cpp @@ -106,10 +106,10 @@ QString CDbContainer::getTriggerTypeStr(TriggerType type) return retStr; }; -QString CDbContainer::getTriggerTypeStr(iot_application::CTriggerPara::TRIGGER_TYPE type) +QString CDbContainer::getTriggerTypeStr(iot_app::CTriggerPara::TRIGGER_TYPE type) { QString retStr; - using namespace iot_application; + using namespace iot_app; switch (type) { case CTriggerPara::TRIGGER_TYPE_CONDITION: diff --git a/product/src/example/link_seq_test/trigger_test/CDbContainer.h b/product/src/example/link_seq_test/trigger_test/CDbContainer.h index 7edb117c..40709319 100644 --- a/product/src/example/link_seq_test/trigger_test/CDbContainer.h +++ b/product/src/example/link_seq_test/trigger_test/CDbContainer.h @@ -23,7 +23,7 @@ public: void pushCondition(SConditionDefine* info); static QString getTriggerTypeStr(TriggerType type); - static QString getTriggerTypeStr(iot_application::CTriggerPara::TRIGGER_TYPE type); + static QString getTriggerTypeStr(iot_app::CTriggerPara::TRIGGER_TYPE type); protected: friend class CIterator; friend class STimerIterator; diff --git a/product/src/example/link_seq_test/trigger_test/CSqlDbCtrl.cpp b/product/src/example/link_seq_test/trigger_test/CSqlDbCtrl.cpp index 553fea8a..9ccbb897 100644 --- a/product/src/example/link_seq_test/trigger_test/CSqlDbCtrl.cpp +++ b/product/src/example/link_seq_test/trigger_test/CSqlDbCtrl.cpp @@ -41,9 +41,9 @@ bool CSqlDbCtrl::getdefaultDbParam(iot_dbms::CDbPara& param) param.setHostName("192.168.77.236"); param.setDbType(iot_dbms::DB_TYPE_MYSQL); param.setPort(3306); - param.setDatabaseName("sjq_iscs"); + param.setDatabaseName("iscs_test"); param.setUserName("root"); - param.setPassword("kbdct"); + param.setPassword("root"); return true; } diff --git a/product/src/example/link_seq_test/trigger_test/CTriggerInterface.cpp b/product/src/example/link_seq_test/trigger_test/CTriggerInterface.cpp index 13448581..d0950d04 100644 --- a/product/src/example/link_seq_test/trigger_test/CTriggerInterface.cpp +++ b/product/src/example/link_seq_test/trigger_test/CTriggerInterface.cpp @@ -14,7 +14,7 @@ CTriggerInterface::~CTriggerInterface() } bool CTriggerInterface::triggered( - const iot_application::CTriggerPara* param, uint64 triggerTime) + const iot_app::CTriggerPara* param, uint64 triggerTime) { return m_ptrMngr->triggered(param, triggerTime); } diff --git a/product/src/example/link_seq_test/trigger_test/CTriggerInterface.h b/product/src/example/link_seq_test/trigger_test/CTriggerInterface.h index 0549b4f5..a100ac78 100644 --- a/product/src/example/link_seq_test/trigger_test/CTriggerInterface.h +++ b/product/src/example/link_seq_test/trigger_test/CTriggerInterface.h @@ -2,7 +2,7 @@ #include "application/trigger_api/CTriggerApi.h" class CTriggerMngr; -class CTriggerInterface : public iot_application::CTriggerApi +class CTriggerInterface : public iot_app::CTriggerApi { public: CTriggerInterface(CTriggerMngr* ptr); @@ -10,7 +10,7 @@ public: protected: bool triggered( - const iot_application::CTriggerPara* param, + const iot_app::CTriggerPara* param, uint64 triggerTime); private: diff --git a/product/src/example/link_seq_test/trigger_test/CTriggerMngr.cpp b/product/src/example/link_seq_test/trigger_test/CTriggerMngr.cpp index a3b23695..580b83ed 100644 --- a/product/src/example/link_seq_test/trigger_test/CTriggerMngr.cpp +++ b/product/src/example/link_seq_test/trigger_test/CTriggerMngr.cpp @@ -30,7 +30,7 @@ void CTriggerMngr::stop() void CTriggerMngr::queryTrigged() { - using namespace iot_application; + using namespace iot_app; uint64 nTriggerTime; std::vector::iterator iter @@ -52,7 +52,7 @@ void CTriggerMngr::queryTrigged() } bool CTriggerMngr::triggered( - const iot_application::CTriggerPara* param, + const iot_app::CTriggerPara* param, uint64 triggerTime) { emit signal_triggered(param, triggerTime); @@ -61,7 +61,7 @@ bool CTriggerMngr::triggered( void CTriggerMngr::clear() { - using namespace iot_application; + using namespace iot_app; std::vector::iterator iter = m_vecTriggerParam.begin(); @@ -75,11 +75,11 @@ void CTriggerMngr::clear() m_vecTriggerParam.clear(); } -iot_application::CTriggerPara* CTriggerMngr::addParam( - iot_application::CTriggerPara::TRIGGER_TYPE type, +iot_app::CTriggerPara* CTriggerMngr::addParam( + iot_app::CTriggerPara::TRIGGER_TYPE type, const std::string& triggerName) { - using namespace iot_application; + using namespace iot_app; CTriggerPara* pParam = new CTriggerPara(type, triggerName); @@ -97,9 +97,9 @@ iot_application::CTriggerPara* CTriggerMngr::addParam( } bool CTriggerMngr::delParam( - iot_application::CTriggerPara* _pPara) + iot_app::CTriggerPara* _pPara) { - using namespace iot_application; + using namespace iot_app; CTriggerPara* pPara = _pPara; std::vector::iterator iter = m_vecTriggerParam.begin(); @@ -124,7 +124,7 @@ bool CTriggerMngr::delParam( } -void CTriggerMngr::ignoreCurTime(iot_application::CTriggerPara *pPram, uint64 time) +void CTriggerMngr::ignoreCurTime(iot_app::CTriggerPara *pPram, uint64 time) { if (pPram) { @@ -132,11 +132,11 @@ void CTriggerMngr::ignoreCurTime(iot_application::CTriggerPara *pPram, uint64 ti } } -iot_application::CTriggerPara *CTriggerMngr::findPara( - iot_application::CTriggerPara::TRIGGER_TYPE type, +iot_app::CTriggerPara *CTriggerMngr::findPara( + iot_app::CTriggerPara::TRIGGER_TYPE type, const std::string &triggerName) { - using namespace iot_application; + using namespace iot_app; CTriggerPara* pPara = NULL; std::vector::iterator iter = m_vecTriggerParam.begin(); diff --git a/product/src/example/link_seq_test/trigger_test/CTriggerMngr.h b/product/src/example/link_seq_test/trigger_test/CTriggerMngr.h index d8874cf2..e90513b0 100644 --- a/product/src/example/link_seq_test/trigger_test/CTriggerMngr.h +++ b/product/src/example/link_seq_test/trigger_test/CTriggerMngr.h @@ -18,37 +18,37 @@ public: virtual void queryTrigged(); void clear(); - iot_application::CTriggerPara * addParam( - iot_application::CTriggerPara::TRIGGER_TYPE type, + iot_app::CTriggerPara * addParam( + iot_app::CTriggerPara::TRIGGER_TYPE type, const std::string& triggerName); - bool delParam(iot_application::CTriggerPara*); + bool delParam(iot_app::CTriggerPara*); void ignoreCurTime( - iot_application::CTriggerPara *pPram, + iot_app::CTriggerPara *pPram, uint64 time); - iot_application::CTriggerPara* findPara( - iot_application::CTriggerPara::TRIGGER_TYPE type, + iot_app::CTriggerPara* findPara( + iot_app::CTriggerPara::TRIGGER_TYPE type, const std::string& triggerName); bool triggered( - const iot_application::CTriggerPara* param, + const iot_app::CTriggerPara* param, uint64 triggerTime); signals: void showMsg(const QString& msgStr); void signal_triggered( - const iot_application::CTriggerPara*, + const iot_app::CTriggerPara*, uint64); void signal_isTriggered( - const iot_application::CTriggerPara*, + const iot_app::CTriggerPara*, bool, uint64); private: CTriggerInterface m_objInterface; - std::vector m_vecTriggerParam; + std::vector m_vecTriggerParam; }; typedef boost::shared_ptr CAppThreadPtr; diff --git a/product/src/example/link_seq_test/trigger_test/mainwindow.cpp b/product/src/example/link_seq_test/trigger_test/mainwindow.cpp index bc7b8c64..f3a6b79a 100644 --- a/product/src/example/link_seq_test/trigger_test/mainwindow.cpp +++ b/product/src/example/link_seq_test/trigger_test/mainwindow.cpp @@ -54,11 +54,11 @@ MainWindow::MainWindow(QWidget *parent) : m_timer = new QTimer(this); connect(m_ptrTriggerMngr, SIGNAL(showMsg(const QString&)), this, SLOT(slot_showMsg(const QString&))); - //connect(m_ptrTriggerMngr, SIGNAL(signal_triggered(const iot_application::CTriggerPara*, uint64)), - // this, SLOT(slot_triggered(const iot_application::CTriggerPara*, uint64)),Qt::QueuedConnection); + //connect(m_ptrTriggerMngr, SIGNAL(signal_triggered(const iot_app::CTriggerPara*, uint64)), + // this, SLOT(slot_triggered(const iot_app::CTriggerPara*, uint64)),Qt::QueuedConnection); connect(m_ptrTriggerMngr, &CTriggerMngr::signal_triggered, this, &MainWindow::slot_triggered, Qt::BlockingQueuedConnection); - connect(m_ptrTriggerMngr, SIGNAL(signal_isTriggered(const iot_application::CTriggerPara*,bool, uint64)), - this, SLOT(slot_isTriggered(const iot_application::CTriggerPara*,bool, uint64))); + connect(m_ptrTriggerMngr, SIGNAL(signal_isTriggered(const iot_app::CTriggerPara*,bool, uint64)), + this, SLOT(slot_isTriggered(const iot_app::CTriggerPara*,bool, uint64))); connect(m_receateBtn, SIGNAL(clicked()), this, SLOT(slot_recreateBtn())); connect(m_regeditBtn, SIGNAL(clicked()), this, SLOT(slot_regedit())); @@ -224,10 +224,10 @@ bool MainWindow::recreateModel() return bRet; } -iot_application::CTriggerPara::TRIGGER_TYPE +iot_app::CTriggerPara::TRIGGER_TYPE MainWindow::trTriggerType(TriggerType type) { - using namespace iot_application; + using namespace iot_app; switch (type) { case TRIGGERTYPE_ALL: @@ -251,9 +251,9 @@ MainWindow::trTriggerType(TriggerType type) TriggerType MainWindow::trTriggerType( - iot_application::CTriggerPara::TRIGGER_TYPE type) + iot_app::CTriggerPara::TRIGGER_TYPE type) { - using namespace iot_application; + using namespace iot_app; switch (type) { case CTriggerPara::TRIGGER_TYPE_CONDITION: @@ -293,9 +293,9 @@ void MainWindow::inserCacheMsg(const QString& msg) void MainWindow::showRegistered( SBaseDefine* info, - iot_application::CTriggerPara * para) + iot_app::CTriggerPara * para) { - using namespace iot_application; + using namespace iot_app; QTreeWidgetItem* item = new QTreeWidgetItem(); @@ -322,7 +322,7 @@ bool MainWindow::regeditItem(QTreeWidgetItem* item) return false; } - iot_application::CTriggerPara *pParam = NULL; + iot_app::CTriggerPara *pParam = NULL; pParam = m_ptrTriggerMngr->addParam( trTriggerType(info->type), info->tag_name.toStdString()); @@ -350,8 +350,8 @@ bool MainWindow::regeditItem(QTreeWidgetItem* item) bool MainWindow::unRegeditItem(QTreeWidgetItem* item) { - iot_application::CTriggerPara * para = - (iot_application::CTriggerPara *)item->data(0, Qt::UserRole + 1).value(); + iot_app::CTriggerPara * para = + (iot_app::CTriggerPara *)item->data(0, Qt::UserRole + 1).value(); if (!para) { @@ -387,8 +387,8 @@ bool MainWindow::unRegeditItem(QTreeWidgetItem* item) bool MainWindow::ignoreItem(QTreeWidgetItem* item) { - iot_application::CTriggerPara * para = - (iot_application::CTriggerPara *)item->data(0, Qt::UserRole + 1).value(); + iot_app::CTriggerPara * para = + (iot_app::CTriggerPara *)item->data(0, Qt::UserRole + 1).value(); QDateTime dateTime = QDateTime::currentDateTime(); uint64 curTime = dateTime.toSecsSinceEpoch(); @@ -405,14 +405,14 @@ bool MainWindow::ignoreItem(QTreeWidgetItem* item) } QTreeWidgetItem* -MainWindow::findRegeditItem(const iot_application::CTriggerPara * para) +MainWindow::findRegeditItem(const iot_app::CTriggerPara * para) { QTreeWidgetItemIterator it(m_ptrRegeditList); QVariant data; while (*it) { data = (*it)->data(0, Qt::UserRole + 1); - if (para == (iot_application::CTriggerPara*)data.value()) + if (para == (iot_app::CTriggerPara*)data.value()) { return *it; } @@ -433,7 +433,7 @@ QString MainWindow::getTriggeredDesc(bool isTrigged) } void MainWindow::slot_triggered( - const iot_application::CTriggerPara *pParam, + const iot_app::CTriggerPara *pParam, uint64 time) { QString strTime = @@ -466,7 +466,7 @@ void MainWindow::slot_triggered( } void MainWindow::slot_isTriggered( - const iot_application::CTriggerPara* pParam, + const iot_app::CTriggerPara* pParam, bool isTrigger, uint64 time) { diff --git a/product/src/example/link_seq_test/trigger_test/mainwindow.h b/product/src/example/link_seq_test/trigger_test/mainwindow.h index e16b7c7b..b22ad5b3 100644 --- a/product/src/example/link_seq_test/trigger_test/mainwindow.h +++ b/product/src/example/link_seq_test/trigger_test/mainwindow.h @@ -32,11 +32,11 @@ private slots: void slot_showMsg(const QString&); void slot_triggered( - const iot_application::CTriggerPara*, + const iot_app::CTriggerPara*, uint64 time); void slot_isTriggered( - const iot_application::CTriggerPara*, + const iot_app::CTriggerPara*, bool isTrigger, uint64 time); @@ -50,22 +50,22 @@ private slots: void slot_recreateBtn(); private: bool recreateModel(); - iot_application::CTriggerPara::TRIGGER_TYPE + iot_app::CTriggerPara::TRIGGER_TYPE trTriggerType(TriggerType type); TriggerType - trTriggerType(iot_application::CTriggerPara::TRIGGER_TYPE type); + trTriggerType(iot_app::CTriggerPara::TRIGGER_TYPE type); void showCacheMsg(); void inserCacheMsg(const QString& msg); void showRegistered(SBaseDefine* info, - iot_application::CTriggerPara * para); + iot_app::CTriggerPara * para); bool regeditItem(QTreeWidgetItem* item); bool unRegeditItem(QTreeWidgetItem* item); bool ignoreItem(QTreeWidgetItem* item); - QTreeWidgetItem* findRegeditItem(const iot_application::CTriggerPara * para); + QTreeWidgetItem* findRegeditItem(const iot_app::CTriggerPara * para); static QString getTriggeredDesc(bool isTrigged); private: diff --git a/product/src/example/luabridge_test/incomeTest.hpp b/product/src/example/luabridge_test/incomeTest.hpp index 9793cddc..31b0f41b 100644 --- a/product/src/example/luabridge_test/incomeTest.hpp +++ b/product/src/example/luabridge_test/incomeTest.hpp @@ -1,4 +1,4 @@ -#ifndef INCOME_HPP +#ifndef INCOME_HPP #define INCOME_HPP #include