diff --git a/platform/common/resource/en/fbd_editor/translate/fbd_editor_en.ts b/platform/common/resource/en/fbd_editor/translate/fbd_editor_en.ts index 4a7dba0c..5975ce20 100644 --- a/platform/common/resource/en/fbd_editor/translate/fbd_editor_en.ts +++ b/platform/common/resource/en/fbd_editor/translate/fbd_editor_en.ts @@ -10,7 +10,7 @@ - 深圳市康必达控制技术有限公司 逻辑编程工具 版本 V1.0 + 广州市宏茂技术有限公司 逻辑编程工具 版本 V1.0 Shenzhen Kangbida Control Technology Co., Ltd.Function Block Diagram Programming Tool Version V1.0 diff --git a/platform/common/resource/zh/fbd_editor/translate/fbd_editor_zh.ts b/platform/common/resource/zh/fbd_editor/translate/fbd_editor_zh.ts index 5e01ccf2..29aa43bb 100644 --- a/platform/common/resource/zh/fbd_editor/translate/fbd_editor_zh.ts +++ b/platform/common/resource/zh/fbd_editor/translate/fbd_editor_zh.ts @@ -10,7 +10,7 @@ - 深圳市康必达控制技术有限公司 逻辑编程工具 版本 V1.0 + 广州市宏茂技术有限公司 逻辑编程工具 版本 V1.0 diff --git a/platform/src/application/app_bio_identify/acs_device_api/CAcsCardMng.cpp b/platform/src/application/app_bio_identify/acs_device_api/CAcsCardMng.cpp index a878315f..50e95979 100644 --- a/platform/src/application/app_bio_identify/acs_device_api/CAcsCardMng.cpp +++ b/platform/src/application/app_bio_identify/acs_device_api/CAcsCardMng.cpp @@ -18,7 +18,7 @@ #include "CAcsCardMng.h" -namespace kbd_application +namespace iot_application { CAcsCardMng::CAcsCardMng(CAcsDeviceApiImpl *pParent) @@ -237,4 +237,4 @@ void CAcsCardMng::onSetCardCfgFinish(bool bSuccess) } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/acs_device_api/CAcsCardMng.h b/platform/src/application/app_bio_identify/acs_device_api/CAcsCardMng.h index 817a050a..6e134f0a 100644 --- a/platform/src/application/app_bio_identify/acs_device_api/CAcsCardMng.h +++ b/platform/src/application/app_bio_identify/acs_device_api/CAcsCardMng.h @@ -17,7 +17,7 @@ typedef unsigned long DWORD; typedef unsigned int DWORD; #endif -namespace kbd_application +namespace iot_application { class CAcsDeviceApiImpl; @@ -55,4 +55,4 @@ private: }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApi.cpp b/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApi.cpp index 3c5c2d5f..9bfd5d3d 100644 --- a/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApi.cpp +++ b/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApi.cpp @@ -14,7 +14,7 @@ #include "CAcsDeviceApiImplFactory.h" #include "app_bio_identify/acs_device_api/CAcsDeviceApi.h" -namespace kbd_application +namespace iot_application { CAcsDeviceApi::CAcsDeviceApi() : @@ -114,4 +114,4 @@ bool CAcsDeviceApi::enableListenEvents(bool bEnable) return m_pImpl->enableListenEvents(bEnable); } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiFake.cpp b/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiFake.cpp index ce3aaa98..b714d6f5 100644 --- a/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiFake.cpp +++ b/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiFake.cpp @@ -12,7 +12,7 @@ #include "app_bio_identify/acs_device_api/CAcsDeviceApi.h" -namespace kbd_application +namespace iot_application { CAcsDeviceApi::CAcsDeviceApi() : @@ -74,4 +74,4 @@ bool CAcsDeviceApi::enableListenEvents(bool /*bEnable*/) return false; } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiImpl.cpp b/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiImpl.cpp index 7eb6cecf..eea81776 100644 --- a/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiImpl.cpp +++ b/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiImpl.cpp @@ -18,7 +18,7 @@ #include "app_bio_identify/acs_device_api/CAcsDeviceApi.h" #include "CAcsDeviceApiImpl.h" -namespace kbd_application +namespace iot_application { CAcsDeviceApiImpl::CAcsDeviceApiImpl(CAcsDeviceApi *pParent) : @@ -199,14 +199,14 @@ bool CAcsDeviceApiImpl::setUserInfoToDevice(const std::list &listUser delete m_pListUserInfo; m_pListUserInfo = new std::list(listUserInfo); //< 先将结果全部设为false - for (std::list::iterator itUser = m_pListUserInfo->begin(); + for (std::list::iterator itUser = m_pListUserInfo->begin(); m_pListUserInfo->end() != itUser; ++itUser) { itUser->m_bSetCarSuccess = false; itUser->m_bSetFaceSuccess = false; - std::list &listFp = itUser->m_listFingerprint; - for (std::list::iterator itFp = listFp.begin(); + std::list &listFp = itUser->m_listFingerprint; + for (std::list::iterator itFp = listFp.begin(); listFp.end() != itFp; ++itFp) { itFp->m_bSetSuccess = false; @@ -463,4 +463,4 @@ bool CAcsDeviceApiImpl::enableListenEvents(bool bEnable) return true; } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiImpl.h b/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiImpl.h index 828a2057..4c3ed86b 100644 --- a/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiImpl.h +++ b/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiImpl.h @@ -20,7 +20,7 @@ typedef unsigned long DWORD; typedef unsigned int DWORD; #endif -namespace kbd_application +namespace iot_application { class CAcsDeviceApi; @@ -82,4 +82,4 @@ private: CAcsFingerprintMng m_objFpMng; }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiImplFactory.cpp b/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiImplFactory.cpp index 8d8644da..9d224003 100644 --- a/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiImplFactory.cpp +++ b/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiImplFactory.cpp @@ -16,7 +16,7 @@ #include "app_bio_identify/acs_device_api/CAcsDeviceApi.h" #include "CAcsDeviceApiImplFactory.h" -namespace kbd_application +namespace iot_application { #ifdef OS_WINDOWS @@ -294,4 +294,4 @@ void CAcsDeviceApiImplFactory::destoryAcsDeviceApiImpl(CAcsDeviceApiImpl **ppObj releaseGlobal(); } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiImplFactory.h b/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiImplFactory.h index 33471bad..1db6ac62 100644 --- a/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiImplFactory.h +++ b/platform/src/application/app_bio_identify/acs_device_api/CAcsDeviceApiImplFactory.h @@ -17,7 +17,7 @@ #include "CAcsDeviceApiImpl.h" -namespace kbd_application +namespace iot_application { class CAcsDeviceApi; @@ -49,4 +49,4 @@ private: static std::set m_setInstance; }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/acs_device_api/CAcsFaceMng.cpp b/platform/src/application/app_bio_identify/acs_device_api/CAcsFaceMng.cpp index 9deb1141..0c965008 100644 --- a/platform/src/application/app_bio_identify/acs_device_api/CAcsFaceMng.cpp +++ b/platform/src/application/app_bio_identify/acs_device_api/CAcsFaceMng.cpp @@ -19,7 +19,7 @@ #include "CAcsFaceMng.h" -namespace kbd_application +namespace iot_application { CAcsFaceMng::CAcsFaceMng(CAcsDeviceApiImpl *pParent) @@ -435,4 +435,4 @@ void CAcsFaceMng::onSetFaceCfgFinish(bool bSuccess) //< 无需再启动后续步骤 } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/acs_device_api/CAcsFaceMng.h b/platform/src/application/app_bio_identify/acs_device_api/CAcsFaceMng.h index fdbc5d22..08c96e3c 100644 --- a/platform/src/application/app_bio_identify/acs_device_api/CAcsFaceMng.h +++ b/platform/src/application/app_bio_identify/acs_device_api/CAcsFaceMng.h @@ -17,7 +17,7 @@ typedef unsigned long DWORD; typedef unsigned int DWORD; #endif -namespace kbd_application +namespace iot_application { class CAcsFaceMng @@ -59,4 +59,4 @@ private: }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/acs_device_api/CAcsFingerprintMng.cpp b/platform/src/application/app_bio_identify/acs_device_api/CAcsFingerprintMng.cpp index 67c5fe94..42f423c1 100644 --- a/platform/src/application/app_bio_identify/acs_device_api/CAcsFingerprintMng.cpp +++ b/platform/src/application/app_bio_identify/acs_device_api/CAcsFingerprintMng.cpp @@ -18,7 +18,7 @@ #include "CAcsDeviceApiImpl.h" #include "CAcsFingerprintMng.h" -namespace kbd_application +namespace iot_application { CAcsFingerprintMng::CAcsFingerprintMng(CAcsDeviceApiImpl *pParent) @@ -507,4 +507,4 @@ void CAcsFingerprintMng::onSetFpCfgFinish(bool bSuccess) } } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/acs_device_api/CAcsFingerprintMng.h b/platform/src/application/app_bio_identify/acs_device_api/CAcsFingerprintMng.h index 65f44428..841f11eb 100644 --- a/platform/src/application/app_bio_identify/acs_device_api/CAcsFingerprintMng.h +++ b/platform/src/application/app_bio_identify/acs_device_api/CAcsFingerprintMng.h @@ -17,7 +17,7 @@ typedef unsigned long DWORD; typedef unsigned int DWORD; #endif -namespace kbd_application +namespace iot_application { class CAcsDeviceApiImpl; @@ -63,4 +63,4 @@ private: }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/app_bio_identify_srv/BisCommon.cpp b/platform/src/application/app_bio_identify/app_bio_identify_srv/BisCommon.cpp index 9890539f..1d740cbc 100644 --- a/platform/src/application/app_bio_identify/app_bio_identify_srv/BisCommon.cpp +++ b/platform/src/application/app_bio_identify/app_bio_identify_srv/BisCommon.cpp @@ -9,7 +9,7 @@ #include "BisCommon.h" -namespace kbd_application +namespace iot_application { -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/app_bio_identify_srv/BisCommon.h b/platform/src/application/app_bio_identify/app_bio_identify_srv/BisCommon.h index e5a94e9f..4b8bf71b 100644 --- a/platform/src/application/app_bio_identify/app_bio_identify_srv/BisCommon.h +++ b/platform/src/application/app_bio_identify/app_bio_identify_srv/BisCommon.h @@ -9,9 +9,9 @@ #pragma once -namespace kbd_application +namespace iot_application { -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/app_bio_identify_srv/CAcsDevice.cpp b/platform/src/application/app_bio_identify/app_bio_identify_srv/CAcsDevice.cpp index 0de88e7d..f144ef46 100644 --- a/platform/src/application/app_bio_identify/app_bio_identify_srv/CAcsDevice.cpp +++ b/platform/src/application/app_bio_identify/app_bio_identify_srv/CAcsDevice.cpp @@ -37,7 +37,7 @@ #include "CAcsWorkThread.h" #include "CAcsDevice.h" -namespace kbd_application +namespace iot_application { CAcsDevice::CAcsDevice(CAcsWorkThread *pParent, const char *szTagName, @@ -73,7 +73,7 @@ void CAcsDevice::handleFingerprintInfo(bool bSuccess, size_t nDataLen, const cha LOGERROR("handleFingerprintInfo(): 服务程序不应运行至此处，检查程序！"); } -void CAcsDevice::handleSetUserInfoResult(const std::list &listUserInfo, void *pUserData) +void CAcsDevice::handleSetUserInfoResult(const std::list &listUserInfo, void *pUserData) { (void) listUserInfo; (void) pUserData; @@ -345,4 +345,4 @@ void CAcsDevice::processStateMachine() } } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/app_bio_identify_srv/CAcsDevice.h b/platform/src/application/app_bio_identify/app_bio_identify_srv/CAcsDevice.h index 49c847e6..8077309c 100644 --- a/platform/src/application/app_bio_identify/app_bio_identify_srv/CAcsDevice.h +++ b/platform/src/application/app_bio_identify/app_bio_identify_srv/CAcsDevice.h @@ -15,12 +15,12 @@ #include "net_msg_bus_api/MsgBusApi.h" #include "app_bio_identify/acs_device_api/CAcsDeviceApi.h" -namespace kbd_application +namespace iot_application { class CAcsWorkThread; -class CAcsDevice : private kbd_application::CAcsDeviceApi +class CAcsDevice : private iot_application::CAcsDeviceApi { public: CAcsDevice(CAcsWorkThread *pParent, const char *szTagName, @@ -70,7 +70,7 @@ private: void handleFingerprintInfo(bool bSuccess, size_t nDataLen, const char *pData, void *pUserData) override; - void handleSetUserInfoResult(const std::list &listUserInfo, void *pUserData) override; + void handleSetUserInfoResult(const std::list &listUserInfo, void *pUserData) override; void handleIdentificationEvent(bool bPass, int nUserID, size_t nPicDataLen, const char *pPicData) override; @@ -104,5 +104,5 @@ private: typedef boost::shared_ptr CAcsDevicePtr; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/app_bio_identify_srv/CAcsWorkThread.cpp b/platform/src/application/app_bio_identify/app_bio_identify_srv/CAcsWorkThread.cpp index 1e2d74fd..c3addae6 100644 --- a/platform/src/application/app_bio_identify/app_bio_identify_srv/CAcsWorkThread.cpp +++ b/platform/src/application/app_bio_identify/app_bio_identify_srv/CAcsWorkThread.cpp @@ -37,7 +37,7 @@ #include "CAcsWorkThread.h" -namespace kbd_application +namespace iot_application { CAcsWorkThread::CAcsWorkThread() : @@ -276,5 +276,5 @@ void CAcsWorkThread::handleOneMbMsg() } } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/app_bio_identify_srv/CAcsWorkThread.h b/platform/src/application/app_bio_identify/app_bio_identify_srv/CAcsWorkThread.h index 2e8d2d42..39f90fe3 100644 --- a/platform/src/application/app_bio_identify/app_bio_identify_srv/CAcsWorkThread.h +++ b/platform/src/application/app_bio_identify/app_bio_identify_srv/CAcsWorkThread.h @@ -17,7 +17,7 @@ #include "CAcsDevice.h" -namespace kbd_application +namespace iot_application { class CAcsWorkThread : private iot_public::CTimerThreadBase @@ -59,5 +59,5 @@ private: std::map m_mapAcsDevice; }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/app_bio_identify_srv/CBioIdentifySrv.cpp b/platform/src/application/app_bio_identify/app_bio_identify_srv/CBioIdentifySrv.cpp index 6580d81b..f304c282 100644 --- a/platform/src/application/app_bio_identify/app_bio_identify_srv/CBioIdentifySrv.cpp +++ b/platform/src/application/app_bio_identify/app_bio_identify_srv/CBioIdentifySrv.cpp @@ -22,7 +22,7 @@ #define BIS_PROC_NAME "app_bio_identify_srv" -namespace kbd_application +namespace iot_application { CBioIdentifySrv::CBioIdentifySrv() @@ -147,7 +147,7 @@ bool CBioIdentifySrv::start(int argc, char *argv[], int & /*nStatus*/) break; case RM_NO_PROC_MNG_MASTER: { - if (kbdSuccess != m_ptrRedunSw->redundantSwitch(true, false)) + if (iotSuccess != m_ptrRedunSw->redundantSwitch(true, false)) { LOGFATAL("以主机模式启动失败！"); return false; @@ -156,7 +156,7 @@ bool CBioIdentifySrv::start(int argc, char *argv[], int & /*nStatus*/) break; case RM_NO_PROC_MNG_SLAVE: { - if (kbdSuccess != m_ptrRedunSw->redundantSwitch(false, true)) + if (iotSuccess != m_ptrRedunSw->redundantSwitch(false, true)) { LOGFATAL("以备机模式启动失败！"); return false; @@ -234,7 +234,7 @@ bool CBioIdentifySrv::stop() int CBioIdentifySrv::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } @@ -245,7 +245,7 @@ int CBioIdentifySrv::updateProcInfo(bool bActive, bool bMaster, bool bSlave) return m_ptrProcMng->updateProcessInfo(bActive, bMaster, bSlave); } - return kbdFailed; + return iotFailed; } @@ -329,7 +329,7 @@ bool CBioIdentifySrv::loadSysInfo() iot_public::SRunAppInfo objRunAppInfo; int nRc = sysInfoPtr->getLocalRunAppInfoById(CN_AppId_COMAPP, objRunAppInfo); - if (kbdSuccess != nRc) + if (iotSuccess != nRc) { LOGERROR("loadSysInfo(): getLocalRunAppInfoByName failed !"); return false; @@ -346,5 +346,5 @@ int CBioIdentifySrv::getDomainID() const return m_nDomainID; } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/app_bio_identify_srv/CBioIdentifySrv.h b/platform/src/application/app_bio_identify/app_bio_identify_srv/CBioIdentifySrv.h index fd7b7f83..2c825a0d 100644 --- a/platform/src/application/app_bio_identify/app_bio_identify_srv/CBioIdentifySrv.h +++ b/platform/src/application/app_bio_identify/app_bio_identify_srv/CBioIdentifySrv.h @@ -14,7 +14,7 @@ #include "CBisRedunSw.h" -namespace kbd_application +namespace iot_application { class CBioIdentifySrv : public iot_public::CBaseService, iot_sys::CProcessQuitInterface @@ -63,5 +63,5 @@ private: iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/app_bio_identify_srv/CBisRedunSw.cpp b/platform/src/application/app_bio_identify/app_bio_identify_srv/CBisRedunSw.cpp index 175c1409..4aab54bc 100644 --- a/platform/src/application/app_bio_identify/app_bio_identify_srv/CBisRedunSw.cpp +++ b/platform/src/application/app_bio_identify/app_bio_identify_srv/CBisRedunSw.cpp @@ -11,9 +11,9 @@ #include "CBisRedunSw.h" -extern kbd_application::CBioIdentifySrv *g_pBioIdentifySrv; +extern iot_application::CBioIdentifySrv *g_pBioIdentifySrv; -namespace kbd_application +namespace iot_application { CBisRedunSw::CBisRedunSw() @@ -40,8 +40,8 @@ int CBisRedunSw::redundantSwitch(bool bMaster, bool bSlave) g_pBioIdentifySrv->updateProcInfo(true, m_objAcsWorkThread.isThreadRunning(), bSlave); - return kbdSuccess; + return iotSuccess; } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/app_bio_identify_srv/CBisRedunSw.h b/platform/src/application/app_bio_identify/app_bio_identify_srv/CBisRedunSw.h index 44e819d6..4989ea62 100644 --- a/platform/src/application/app_bio_identify/app_bio_identify_srv/CBisRedunSw.h +++ b/platform/src/application/app_bio_identify/app_bio_identify_srv/CBisRedunSw.h @@ -13,7 +13,7 @@ #include "CAcsWorkThread.h" -namespace kbd_application +namespace iot_application { class CBisRedunSw : public ::iot_sys::CRedundantSwitchInterface @@ -32,5 +32,5 @@ private: typedef boost::shared_ptr CCBisRedunSwPtr; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/application/app_bio_identify/app_bio_identify_srv/Main.cpp b/platform/src/application/app_bio_identify/app_bio_identify_srv/Main.cpp index 45e09fd2..a3671a74 100644 --- a/platform/src/application/app_bio_identify/app_bio_identify_srv/Main.cpp +++ b/platform/src/application/app_bio_identify/app_bio_identify_srv/Main.cpp @@ -9,11 +9,11 @@ #include "CBioIdentifySrv.h" -kbd_application::CBioIdentifySrv *g_pBioIdentifySrv = nullptr; +iot_application::CBioIdentifySrv *g_pBioIdentifySrv = nullptr; int main(int argc, char *argv[]) { - kbd_application::CBioIdentifySrv objApp; + iot_application::CBioIdentifySrv objApp; g_pBioIdentifySrv = &objApp; return objApp.main(argc, argv); } diff --git a/platform/src/application/app_bio_identify/test/test_hk_acs/mainwindow.cpp b/platform/src/application/app_bio_identify/test/test_hk_acs/mainwindow.cpp index 3f2148b2..39ec0848 100644 --- a/platform/src/application/app_bio_identify/test/test_hk_acs/mainwindow.cpp +++ b/platform/src/application/app_bio_identify/test/test_hk_acs/mainwindow.cpp @@ -4,7 +4,7 @@ #include "mainwindow.h" #include "ui_mainwindow.h" -using namespace kbd_application; +using namespace iot_application; MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) @@ -12,7 +12,7 @@ MainWindow::MainWindow(QWidget *parent) ui->setupUi(this); qRegisterMetaType("std::string"); - qRegisterMetaType>("std::list"); + qRegisterMetaType>("std::list"); qRegisterMetaType("size_t"); connect(this, SIGNAL(faceInfoFinish(bool, std::string, void * )), @@ -21,8 +21,8 @@ MainWindow::MainWindow(QWidget *parent) connect(this, SIGNAL(fingerprintInfoFinish(bool, std::string, void * )), this, SLOT(on_fingerprintInfoFinish(bool, std::string, void * ))); - connect(this, SIGNAL(setUserInfoFinish(std::list, void * )), - this, SLOT(on_setUserInfoFinish(std::list, void * ))); + connect(this, SIGNAL(setUserInfoFinish(std::list, void * )), + this, SLOT(on_setUserInfoFinish(std::list, void * ))); connect(this, SIGNAL(identificationEvent(bool, int, size_t, const char *)), this, SLOT(on_identificationEvent(bool, int, size_t, const char *))); @@ -49,7 +49,7 @@ void MainWindow::handleFingerprintInfo(bool bSuccess, size_t nDataLen, const cha emit fingerprintInfoFinish(bSuccess, strData, pUserData); } -void MainWindow::handleSetUserInfoResult(const std::list &listUserInfo, void *pUserData) +void MainWindow::handleSetUserInfoResult(const std::list &listUserInfo, void *pUserData) { emit setUserInfoFinish(listUserInfo, pUserData); } @@ -131,13 +131,13 @@ void MainWindow::on_fingerprintInfoFinish(bool bSuccess, std::string strData, vo } } -void MainWindow::on_setUserInfoFinish(std::list listUserInfo, void *pUserData) +void MainWindow::on_setUserInfoFinish(std::list listUserInfo, void *pUserData) { (void) pUserData; bool bSuccess = true; - for (std::list::const_iterator itUser = listUserInfo.cbegin(); + for (std::list::const_iterator itUser = listUserInfo.cbegin(); listUserInfo.cend() != itUser; ++itUser) { if (!itUser->m_bSetCarSuccess) @@ -157,8 +157,8 @@ void MainWindow::on_setUserInfoFinish(std::list list itUser->m_strName.c_str())); } - const std::list &listFp = itUser->m_listFingerprint; - for (std::list::const_iterator itFp = listFp.cbegin(); + const std::list &listFp = itUser->m_listFingerprint; + for (std::list::const_iterator itFp = listFp.cbegin(); listFp.cend() != itFp; ++itFp) { if (!itFp->m_bSetSuccess) diff --git a/platform/src/application/app_bio_identify/test/test_hk_acs/mainwindow.h b/platform/src/application/app_bio_identify/test/test_hk_acs/mainwindow.h index 27a80f92..201a1d94 100644 --- a/platform/src/application/app_bio_identify/test/test_hk_acs/mainwindow.h +++ b/platform/src/application/app_bio_identify/test/test_hk_acs/mainwindow.h @@ -12,7 +12,7 @@ class MainWindow; } QT_END_NAMESPACE -class MainWindow : public QMainWindow, private kbd_application::CAcsDeviceApi +class MainWindow : public QMainWindow, private iot_application::CAcsDeviceApi { Q_OBJECT @@ -25,7 +25,7 @@ private: void handleFingerprintInfo(bool bSuccess, size_t nDataLen, const char *pData, void *pUserData) override; - void handleSetUserInfoResult(const std::list &listUserInfo, void *pUserData) override; + void handleSetUserInfoResult(const std::list &listUserInfo, void *pUserData) override; void handleIdentificationEvent(bool bPass, int nUserID, size_t nPicDataLen, const char *pPicData) override; @@ -34,7 +34,7 @@ signals: void fingerprintInfoFinish(bool bSuccess, std::string strData, void *pUserData); - void setUserInfoFinish(std::list listUserInfo, void *pUserData); + void setUserInfoFinish(std::list listUserInfo, void *pUserData); void identificationEvent(bool bPass, int nUserID, size_t nPicDataLen, const char *pPicData); @@ -44,7 +44,7 @@ private slots: void on_fingerprintInfoFinish(bool bSuccess, std::string strData, void *pUserData); - void on_setUserInfoFinish(std::list listUserInfo, void *pUserData); + void on_setUserInfoFinish(std::list listUserInfo, void *pUserData); void on_identificationEvent(bool bPass, int nUserID, size_t nPicDataLen, const char *pPicData); diff --git a/platform/src/application/app_fbd/app_fbd_server/FbdConfigParse.cpp b/platform/src/application/app_fbd/app_fbd_server/FbdConfigParse.cpp index 3949e3e2..e91a674d 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdConfigParse.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/FbdConfigParse.cpp @@ -13,7 +13,7 @@ #include "FbdConfigParse.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -29,10 +29,10 @@ int CFbdConfigParse::initialize() if ( strCfgFilePath.empty()) { LOGERROR( "获取平台fbd_server.xml配置文件路径失败" ); - return kbdFailed; + return iotFailed; } nRc = parseCfgFile( strCfgFilePath ); - if ( kbdSuccess != nRc ) + if ( iotSuccess != nRc ) return nRc; } @@ -43,12 +43,12 @@ int CFbdConfigParse::initialize() if ( !strCfgFilePath.empty()) { nRc = parseCfgFile( strCfgFilePath ); - if ( kbdSuccess != nRc ) + if ( iotSuccess != nRc ) return nRc; } } - return kbdSuccess; + return iotSuccess; } @@ -87,10 +87,10 @@ int CFbdConfigParse::parseCfgFile( const std::string &strCfgFilePath ) catch ( std::exception &ex ) { LOGERROR( "解析配置文件[%s]失败.Msg=[%s]", strCfgFilePath.c_str(), ex.what()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -100,12 +100,12 @@ int CFbdConfigParse::getModuleCfgInfo( const std::string &strType, SFbdModuleCfg if ( itMap == m_mapModCfg.end()) { LOGERROR( "获取模块配置信息失败,module_type=[%s]", strType.c_str()); - return kbdFailed; + return iotFailed; } stModCfg = itMap->second; - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/FbdConfigParse.h b/platform/src/application/app_fbd/app_fbd_server/FbdConfigParse.h index f70604d1..9849b0fb 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdConfigParse.h +++ b/platform/src/application/app_fbd/app_fbd_server/FbdConfigParse.h @@ -7,7 +7,7 @@ #include -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -29,7 +29,7 @@ public: /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); @@ -37,7 +37,7 @@ public: @brief 根据模块类型ID获取模块配置信息 @param strType 模块类型 @param stModCfg 模块配置信息 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int getModuleCfgInfo( const std::string &strType, SFbdModuleCfg &stModCfg ); @@ -50,4 +50,4 @@ private: }; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/FbdGroupMng.cpp b/platform/src/application/app_fbd/app_fbd_server/FbdGroupMng.cpp index 3215fad6..33a8b7c6 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdGroupMng.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/FbdGroupMng.cpp @@ -16,7 +16,7 @@ #include "app_fbd/fbd_common/FbdAlarmSrcApi.h" #include "FbdGroupMng.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -43,13 +43,13 @@ int CFbdGroupMng::initialize() if ( m_ptrFbdUtil == nullptr ) { LOGERROR( "创建FBD公共操作类失败" ); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrFbdUtil->initialize()) + if ( iotSuccess != m_ptrFbdUtil->initialize()) { LOGERROR( "初始化FBD公共操作类失败" ); - return kbdFailed; + return iotFailed; } } @@ -60,16 +60,16 @@ int CFbdGroupMng::initialize() int CFbdGroupMng::redundantSwitch( bool bMaster, bool bSlave ) { - int nRet = kbdSuccess; + int nRet = iotSuccess; boost::mutex::scoped_lock lock( m_objRedundantLock ); for ( auto it = m_mapGrpId_Thread.begin(); it != m_mapGrpId_Thread.end(); ++it ) { const CFbdGrpWorkThreadPtr &ptrThread = it->second; - if ( kbdSuccess != ptrThread->redundantSwitch( bMaster, bSlave )) + if ( iotSuccess != ptrThread->redundantSwitch( bMaster, bSlave )) { LOGERROR( "调度FBD组[%d]冗余状态失败.Master[%d],Slave=[%d]", it->first, bMaster, bSlave ); - nRet = kbdFailed; + nRet = iotFailed; } } @@ -83,10 +83,10 @@ int CFbdGroupMng::checkAndApplyConfig() { //< 1.获取当前最新的FBD组列表 std::vector vecGrpInfo; - if ( kbdSuccess != m_ptrFbdUtil->getFbdGroupInfoList( vecGrpInfo )) + if ( iotSuccess != m_ptrFbdUtil->getFbdGroupInfoList( vecGrpInfo )) { LOGERROR( "获取FBD组信息失败" ); - return kbdFailed; + return iotFailed; } //< 2.对比哪些组发生了改变，vecModifyFbd 记录新增和修改的，mapDelFbdGrp 中记录删除的 @@ -143,13 +143,13 @@ int CFbdGroupMng::createGroupThread( const SFbdGroupInfo &stGrpInfo ) if ( ptrThread == nullptr ) { LOGERROR( "创建FBD组[%s]工作线程失败", stGrpInfo.m_szName ); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != ptrThread->initialize()) + if ( iotSuccess != ptrThread->initialize()) { LOGERROR( "初始化FBD组[%s]失败", stGrpInfo.m_szName ); - return kbdFailed; + return iotFailed; } //< 记录已经创建的FBD组线程，同时根据当前的主备状态决定是否激活当前线程 @@ -165,14 +165,14 @@ int CFbdGroupMng::createGroupThread( const SFbdGroupInfo &stGrpInfo ) LOGINFO( "当前服务非主,挂起FBD组[%s]处理线程", stGrpInfo.m_szName ); } - if ( kbdSuccess != ptrThread->redundantSwitch( m_bMaster, !m_bMaster )) + if ( iotSuccess != ptrThread->redundantSwitch( m_bMaster, !m_bMaster )) { bool bMaster = m_bMaster; LOGERROR( "调度FBD组[%s]主备状态失败,主=[%d]", stGrpInfo.m_szName, bMaster ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -180,12 +180,12 @@ int CFbdGroupMng::modifyFbdGroup( const std::vector &vecGrpInfo ) { if ( vecGrpInfo.empty()) { - return kbdSuccess; + return iotSuccess; } //< 获取增加的和更新的FBD组相关信息 GrpIdToDataInfoMAP mapGrpData; - if ( kbdSuccess != m_ptrFbdUtil->getGroupDataFromDB( vecGrpInfo, mapGrpData )) + if ( iotSuccess != m_ptrFbdUtil->getGroupDataFromDB( vecGrpInfo, mapGrpData )) { //< 发告警 auto ptrAlmSrcApi = getFbdAlarmSrcApi(); @@ -211,7 +211,7 @@ int CFbdGroupMng::modifyFbdGroup( const std::vector &vecGrpInfo ) ptrAlmSrcApi->addAlarm( objAddAlm ); - return kbdFailed; + return iotFailed; } //< 1.停止所有发生修改的组线程；2.更新内存记录；3.启动线程 @@ -241,10 +241,10 @@ int CFbdGroupMng::modifyFbdGroup( const std::vector &vecGrpInfo ) { const SFbdGroupData &stGrpData = itGrpData->second; //< 先重新加载数据 - if ( kbdSuccess == reloadGroupData( stGrpInfo, stGrpData )) + if ( iotSuccess == reloadGroupData( stGrpInfo, stGrpData )) { //< 创建处理线程，此时会加载插件动态库 - if ( kbdSuccess != createGroupThread( stGrpInfo )) + if ( iotSuccess != createGroupThread( stGrpInfo )) { //< 发告警 { @@ -312,7 +312,7 @@ int CFbdGroupMng::modifyFbdGroup( const std::vector &vecGrpInfo ) } } - return kbdSuccess; + return iotSuccess; } @@ -333,7 +333,7 @@ int CFbdGroupMng::deleteFbdGroup( const FbdGrpToInfoMAP &mapGrpInfo ) LOGINFO( "停止FBD组[%s]处理线程成功", stGrpInfo.m_szName ); } - if ( kbdSuccess != m_ptrFbdUtil->deleteAllDataByGroup( stGrpInfo.m_nId )) + if ( iotSuccess != m_ptrFbdUtil->deleteAllDataByGroup( stGrpInfo.m_nId )) { //< 发告警 { @@ -366,20 +366,20 @@ int CFbdGroupMng::deleteFbdGroup( const FbdGrpToInfoMAP &mapGrpInfo ) } } - return kbdSuccess; + return iotSuccess; } int CFbdGroupMng::reloadGroupData( const SFbdGroupInfo &stGrpInfo, const SFbdGroupData &stGrpData ) { - if ( kbdSuccess != m_ptrFbdUtil->deleteAllDataByGroup( stGrpInfo.m_nId )) + if ( iotSuccess != m_ptrFbdUtil->deleteAllDataByGroup( stGrpInfo.m_nId )) { LOGERROR( "删除FBD组[%s]数据失败", stGrpInfo.m_szName ); - return kbdFailed; + return iotFailed; } return m_ptrFbdUtil->insertAllDataByGroup( stGrpInfo, stGrpData ); } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/FbdGroupMng.h b/platform/src/application/app_fbd/app_fbd_server/FbdGroupMng.h index aec0a80a..14f166d1 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdGroupMng.h +++ b/platform/src/application/app_fbd/app_fbd_server/FbdGroupMng.h @@ -10,7 +10,7 @@ #include "FbdGrpWorkThread.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -26,7 +26,7 @@ public: /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); @@ -34,13 +34,13 @@ public: @brief 冗余切换 @param bool bMaster 是否为主 @param bool bSlave 是否为备 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int redundantSwitch( bool bMaster, bool bSlave ); /** @brief 检查并应用配置，用于初始化、在线组态 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int checkAndApplyConfig(); @@ -48,21 +48,21 @@ private: /** @brief 创建FBD组处理线程 @param const SFbdGroupInfo & m_stGrpInfo FBD组信息 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int createGroupThread( const SFbdGroupInfo &stGrpInfo ); /** @brief 在线组态时，修改FBD组(包括新增的和更新的) @param const std::vector & vecGrpInfo FBD组集合 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int modifyFbdGroup( const std::vector &vecGrpInfo ); /** @brief 在线组态时，删除FBD组处理线程 @param const FbdGrpToInfoMAP & mapGrpInfo 要删除的FBD组 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int deleteFbdGroup( const FbdGrpToInfoMAP &mapGrpInfo ); @@ -70,7 +70,7 @@ private: @brief 加载最新的FBD组的数据到内存(先删后加) @param const SFbdGroupInfo &stGrpInfo 要加载FBD组相关表信息 @param const SFbdGroupData & stGrpData 要加载FBD组相关表数据 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int reloadGroupData( const SFbdGroupInfo &stGrpInfo, const SFbdGroupData &stGrpData ); @@ -86,4 +86,4 @@ private: typedef boost::shared_ptr CFbdGroupMngPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/FbdGrpWorkThread.cpp b/platform/src/application/app_fbd/app_fbd_server/FbdGrpWorkThread.cpp index 563a2afc..5c9e5100 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdGrpWorkThread.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/FbdGrpWorkThread.cpp @@ -35,7 +35,7 @@ #include "app_fbd/fbd_common/FbdSysInfoApi.h" #include "FbdGrpWorkThread.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -122,7 +122,7 @@ void CFbdGrpWorkThread::execute() } iot_idl::SFBDDebugResponse objRep; - if ( kbdSuccess != m_ptrFbdUtil->getDebugResponse( objReq, objRep )) + if ( iotSuccess != m_ptrFbdUtil->getDebugResponse( objReq, objRep )) { LOGERROR( "调用 getDebugResponse 失败" ); continue; @@ -163,17 +163,17 @@ void CFbdGrpWorkThread::execute() int CFbdGrpWorkThread::initialize() { //< 创建所有的模块对象 - if ( kbdSuccess != createAllFbdModule()) - return kbdFailed; + if ( iotSuccess != createAllFbdModule()) + return iotFailed; - return kbdSuccess; + return iotSuccess; } int CFbdGrpWorkThread::redundantSwitch( bool bMaster, bool bSlave ) { LOGINFO( "当前FBD组[%s]接收到切换指令,bMaster=[%d],bSlave=[%d]", m_stGrpInfo.m_szName, bMaster, bSlave ); - int nRet = kbdFailed; + int nRet = iotFailed; if ( bMaster ) //< 为主 { CTimerThreadBase::suspend(); //< 先挂起线程，防止修改数据冲突 @@ -205,10 +205,10 @@ int CFbdGrpWorkThread::createAllFbdModule() { //< 获取本组所有的模块信息 std::vector vecModInfo; - if ( kbdSuccess != m_ptrFbdUtil->getFbdModuleInfoList( m_stGrpInfo.m_nId, vecModInfo )) + if ( iotSuccess != m_ptrFbdUtil->getFbdModuleInfoList( m_stGrpInfo.m_nId, vecModInfo )) { LOGERROR( "获取FBD组[%s]中的模块列表失败", m_stGrpInfo.m_szName ); - return kbdFailed; + return iotFailed; } if ( vecModInfo.empty()) @@ -220,11 +220,11 @@ int CFbdGrpWorkThread::createAllFbdModule() for ( const auto &stModInfo : vecModInfo ) { bool bNeedLoad = false; - if ( kbdSuccess != m_ptrFbdUtil->isModuleNeedLoad( stModInfo.m_strModType, bNeedLoad )) + if ( iotSuccess != m_ptrFbdUtil->isModuleNeedLoad( stModInfo.m_strModType, bNeedLoad )) { LOGERROR( "根据模块类型获取模块配置信息失败：module_key=[%s],module_type=[%s]", stModInfo.m_stModKey.toString().c_str(), stModInfo.m_strModType.c_str()); - return kbdFailed; + return iotFailed; } if ( bNeedLoad ) @@ -239,7 +239,7 @@ int CFbdGrpWorkThread::createAllFbdModule() { LOGERROR( "创建模块失败：module_key=[%s]", stModInfo.m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } LOGINFO( "添加到map：module_key=[%s],level=[%d]", @@ -252,7 +252,7 @@ int CFbdGrpWorkThread::createAllFbdModule() } LOGINFO( "加载FBD组[%s]成功", m_stGrpInfo.m_szName ); - return kbdSuccess; + return iotSuccess; } @@ -260,7 +260,7 @@ CBaseModulePtr CFbdGrpWorkThread::createFbdModule( const SFbdModInfo &stModInfo { //< 从fbd_server.xml中获取模块的dll相关信息 SFbdModuleCfg stModCfg; - if ( kbdSuccess != m_ptrFbdUtil->getModuleDllInfo( stModInfo.m_strModType, stModCfg )) + if ( iotSuccess != m_ptrFbdUtil->getModuleDllInfo( stModInfo.m_strModType, stModCfg )) { LOGERROR( "获取动态库文件名失败：module_key=[%s],module_type=[%s]", stModInfo.m_stModKey.toString().c_str(), @@ -305,7 +305,7 @@ CBaseModulePtr CFbdGrpWorkThread::createFbdModule( const SFbdModInfo &stModInfo } //< 调用fbd模块的初始化接口 - if ( kbdSuccess != ptrModule->init( stModInfo.m_stModKey, stModCfg.m_strExtraParam )) + if ( iotSuccess != ptrModule->init( stModInfo.m_stModKey, stModCfg.m_strExtraParam )) { LOGERROR( "初始化模块失败：module_key=[%s]", stModInfo.m_stModKey.toString().c_str()); @@ -323,16 +323,16 @@ int CFbdGrpWorkThread::resetModule( bool bMaster ) const SModInfoOrder &stModInfo = it.first; const CBaseModulePtr &ptrMod = it.second; - if ( kbdSuccess != ptrMod->reset( bMaster )) + if ( iotSuccess != ptrMod->reset( bMaster )) { LOGERROR( "调用模块的reset接口失败：module_key=[%s],Master=[%d]", stModInfo.m_stModKey.toString().c_str(), bMaster ); - return kbdFailed; + return iotFailed; } } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/FbdGrpWorkThread.h b/platform/src/application/app_fbd/app_fbd_server/FbdGrpWorkThread.h index 70bc4176..52f158ab 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdGrpWorkThread.h +++ b/platform/src/application/app_fbd/app_fbd_server/FbdGrpWorkThread.h @@ -12,7 +12,7 @@ #include "app_fbd/fbd_common/BaseModule.h" #include "FbdUtil.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -31,7 +31,7 @@ public: /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); @@ -39,7 +39,7 @@ public: @brief 冗余切换 @param bool bMaster 是否为主 @param bool bSlave 是否为备 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int redundantSwitch( bool bMaster, bool bSlave ); @@ -52,7 +52,7 @@ private: /** @brief 创建本组的所有FBD模块(加载dll，创建对象) - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int createAllFbdModule(); @@ -66,7 +66,7 @@ private: /** @brief 重置模块状态，主要用于冗余调度时清理模块的状态和资源 @param bool bMaster - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int resetModule( bool bMaster ); @@ -115,4 +115,4 @@ private: typedef boost::shared_ptr CFbdGrpWorkThreadPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/FbdServerApp.cpp b/platform/src/application/app_fbd/app_fbd_server/FbdServerApp.cpp index c57a571b..c7a56a2a 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdServerApp.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/FbdServerApp.cpp @@ -16,7 +16,7 @@ #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -86,14 +86,14 @@ bool CFbdServerApp::start( int argc, char *argv[], int &/*nStatus*/) } //8.设置冗余通知回调 - if ( kbdSuccess != m_ptrRedundancyMng->setCallback( m_ptrFbdSvrMng )) + if ( iotSuccess != m_ptrRedundancyMng->setCallback( m_ptrFbdSvrMng )) { LOGERROR( "设置冗余回调接口失败" ); return false; } //9.更新当前进程冗余状态 - if ( kbdSuccess != m_ptrProcMng->updateProcessInfo( true, false, false )) + if ( iotSuccess != m_ptrProcMng->updateProcessInfo( true, false, false )) { LOGERROR( "更新本进程的进程信息失败" ); return false; @@ -150,7 +150,7 @@ int CFbdServerApp::toQuit() } shutdown(); - return kbdSuccess; + return iotSuccess; } @@ -242,7 +242,7 @@ bool CFbdServerApp::getSystemInfo( const std::string &strAppName ) } iot_public::SRunAppInfo stRunAppInfo; - if ( kbdSuccess != m_ptrSysInfo->getSysInfo().getLocalRunAppInfoByName( strAppName, stRunAppInfo )) + if ( iotSuccess != m_ptrSysInfo->getSysInfo().getLocalRunAppInfoByName( strAppName, stRunAppInfo )) { LOGERROR( "获取系统信息失败" ); return false; @@ -272,7 +272,7 @@ bool CFbdServerApp::registToProcMng( const std::string &strStartArgs ) return false; } - if ( kbdSuccess != m_ptrProcMng->setCallback( this )) + if ( iotSuccess != m_ptrProcMng->setCallback( this )) { LOGERROR( "向进程管理设置回调函数失败" ); return false; @@ -298,7 +298,7 @@ bool CFbdServerApp::initialize() if ( !iot_net::initMsgBus( CN_ProcName_FbdServer, "" )) { LOGERROR( "初始化消息总线失败" ); - return kbdFailed; + return iotFailed; } //< 创建发送告警接口 @@ -317,7 +317,7 @@ bool CFbdServerApp::initialize() return false; } - if ( kbdSuccess != m_ptrFbdSvrMng->initialize()) + if ( iotSuccess != m_ptrFbdSvrMng->initialize()) { LOGERROR( "初始化FBD服务管理类失败" ); return false; @@ -337,4 +337,4 @@ bool CFbdServerApp::clean() } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/FbdServerApp.h b/platform/src/application/app_fbd/app_fbd_server/FbdServerApp.h index 33f7cb40..019ffe2c 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdServerApp.h +++ b/platform/src/application/app_fbd/app_fbd_server/FbdServerApp.h @@ -13,7 +13,7 @@ #include "FbdServerMng.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -88,4 +88,4 @@ private: }; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/FbdServerCommon.h b/platform/src/application/app_fbd/app_fbd_server/FbdServerCommon.h index 40899ac8..cb7579e4 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdServerCommon.h +++ b/platform/src/application/app_fbd/app_fbd_server/FbdServerCommon.h @@ -5,7 +5,7 @@ */ #pragma once -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -13,4 +13,4 @@ namespace app_fbd //< todo } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/FbdServerMng.cpp b/platform/src/application/app_fbd/app_fbd_server/FbdServerMng.cpp index 219740ef..3dcd7d54 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdServerMng.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/FbdServerMng.cpp @@ -8,7 +8,7 @@ #include "FbdServerMng.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -50,7 +50,7 @@ int CFbdServerMng::redundantSwitch( bool bMaster, bool bSlave ) } //< 切换失败，报告为非主非备 - if ( kbdSuccess == nAlmCltRet && kbdSuccess == nPntSubRet && kbdSuccess == nGrpMngRet ) + if ( iotSuccess == nAlmCltRet && iotSuccess == nPntSubRet && iotSuccess == nGrpMngRet ) { m_ptrProcMng->updateProcessInfo( true, bMaster, bSlave ); } @@ -59,7 +59,7 @@ int CFbdServerMng::redundantSwitch( bool bMaster, bool bSlave ) m_ptrProcMng->updateProcessInfo( true, false, false ); } - return kbdSuccess; + return iotSuccess; } @@ -68,20 +68,20 @@ int CFbdServerMng::initialize() //< FBD组扫描线程管理类，管理了所有的扫描线程 { m_ptrFbdGrpMng = boost::make_shared(); - if ( kbdSuccess != m_ptrFbdGrpMng->initialize()) + if ( iotSuccess != m_ptrFbdGrpMng->initialize()) { LOGERROR( "初始化FBD组管理类失败" ); - return kbdFailed; + return iotFailed; } } //< 在线组态更新线程，为了防止在线组态阻塞其他业务，所以单独出来一个线程 { m_ptrOnlieModifyThread = boost::make_shared( m_ptrFbdGrpMng ); - if ( kbdSuccess != m_ptrOnlieModifyThread->initialize()) + if ( iotSuccess != m_ptrOnlieModifyThread->initialize()) { LOGERROR( "初始化在线组态线程失败" ); - return kbdFailed; + return iotFailed; } } @@ -89,25 +89,25 @@ int CFbdServerMng::initialize() //< 测点数据订阅处理线程 { m_ptrPointSubThread = boost::make_shared(); - if ( kbdSuccess != m_ptrPointSubThread->initialize()) + if ( iotSuccess != m_ptrPointSubThread->initialize()) { LOGERROR( "初始化测点数据订阅处理线程失败" ); - return kbdFailed; + return iotFailed; } } //< 告警（包括事件）客户端处理线程 { m_ptrAlarmCltThread = boost::make_shared(); - if ( kbdSuccess != m_ptrAlarmCltThread->initialize()) + if ( iotSuccess != m_ptrAlarmCltThread->initialize()) { LOGERROR( "初始化告警客户端处理线程失败" ); - return kbdFailed; + return iotFailed; } } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/FbdServerMng.h b/platform/src/application/app_fbd/app_fbd_server/FbdServerMng.h index 1bb79934..967d54a9 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdServerMng.h +++ b/platform/src/application/app_fbd/app_fbd_server/FbdServerMng.h @@ -14,7 +14,7 @@ #include "alarm_client/AlarmCltThread.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -30,13 +30,13 @@ public: 在进程切换过程中，可能会被调用多次切换，业务进程需要保证幂等，无副作用 @param bool bMaster 是否为主 @param bool bSlave 是否为备 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int redundantSwitch( bool bMaster, bool bSlave ) override; /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); @@ -53,4 +53,4 @@ private: typedef boost::shared_ptr CFbdServerMngPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/FbdUtil.cpp b/platform/src/application/app_fbd/app_fbd_server/FbdUtil.cpp index 7a9dfa78..10376dca 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdUtil.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/FbdUtil.cpp @@ -19,7 +19,7 @@ #include "FbdUtil.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -39,10 +39,10 @@ CFbdUtil::~CFbdUtil() int CFbdUtil::initialize() { //1.解析配置文件 - if ( kbdSuccess != m_objCfgParse.initialize()) + if ( iotSuccess != m_objCfgParse.initialize()) { LOGERROR( "加载配置文件失败" ); - return kbdFailed; + return iotFailed; } //2.初始化Diagram数据接口 @@ -50,10 +50,10 @@ int CFbdUtil::initialize() if ( m_ptrDiagData == nullptr ) { LOGERROR( "创建Diagram数据接口失败" ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -72,14 +72,14 @@ std::string CFbdUtil::getFbdPluginsPath( const std::string &strDllName ) int CFbdUtil::isModuleNeedLoad( const std::string &strModType, bool &bNeedLoad ) { SFbdModuleCfg stModInfo; - if ( kbdSuccess != m_objCfgParse.getModuleCfgInfo( strModType, stModInfo )) + if ( iotSuccess != m_objCfgParse.getModuleCfgInfo( strModType, stModInfo )) { LOGERROR( "获取模块配置信息失败,module_type=[%s]", strModType.c_str()); - return kbdFailed; + return iotFailed; } bNeedLoad = !stModInfo.m_strDllName.empty(); - return kbdSuccess; + return iotSuccess; } @@ -371,7 +371,7 @@ int CFbdUtil::getGroupDataFromDB( const std::vector &vecGrpInfo, if ( !objDbConn.open()) { LOGERROR( "打开数据库失败" ); - return kbdFailed; + return iotFailed; } LOGINFO( "数据库地址=[%s],名称=[%s]", objDbConn.getCurrentDbPara().getHostName().toUtf8().data(), objDbConn.getCurrentDbPara().getDatabaseName().toUtf8().data()); @@ -402,7 +402,7 @@ int CFbdUtil::getGroupDataFromDB( const std::vector &vecGrpInfo, if ( !objDbConn.execute( strSql, objQuery )) { LOGERROR( "查询错误，SQL语句如下：\n%s", strSql.toUtf8().constData()); - return kbdFailed; + return iotFailed; } strLastDiagName.clear(); @@ -419,7 +419,7 @@ int CFbdUtil::getGroupDataFromDB( const std::vector &vecGrpInfo, LOGINFO( "开始解析XML，DiagName=[%s]", strLastDiagName.toUtf8().constData()); if ( !parseFbdXmlFile( stGrpInfo, strLastDiagName.toStdString(), baCompressedBase64, mapGrpData[stGrpInfo.m_nId] )) - return kbdFailed; + return iotFailed; baCompressedBase64.clear(); } @@ -436,7 +436,7 @@ int CFbdUtil::getGroupDataFromDB( const std::vector &vecGrpInfo, stGrpInfo.m_nId, objQuery.value( "GROUP_ID" ).toInt(), objQuery.value( "ENABLE" ).toInt()); - return kbdFailed; + return iotFailed; } baCompressedBase64 += objQuery.value( "CONTENT" ).toByteArray(); @@ -451,14 +451,14 @@ int CFbdUtil::getGroupDataFromDB( const std::vector &vecGrpInfo, LOGINFO( "开始解析XML，DiagName=[%s]", strLastDiagName.toUtf8().constData()); if ( !parseFbdXmlFile( stGrpInfo, strLastDiagName.toStdString(), baCompressedBase64, mapGrpData[stGrpInfo.m_nId] )) - return kbdFailed; + return iotFailed; baCompressedBase64.clear(); } } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/FbdUtil.h b/platform/src/application/app_fbd/app_fbd_server/FbdUtil.h index d4a40c40..57ce27e6 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdUtil.h +++ b/platform/src/application/app_fbd/app_fbd_server/FbdUtil.h @@ -11,7 +11,7 @@ #include "FbdConfigParse.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -27,7 +27,7 @@ public: /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); @@ -45,7 +45,7 @@ public: @brief 判断指定模块是否需要加载dll @param strModType 模块类型 @param bNeedLoad 返回是否需要加载 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int isModuleNeedLoad( const std::string &strModType, bool &bNeedLoad ); @@ -60,7 +60,7 @@ public: @brief 从关系库获取指定fbd组的相关配置信息 @param vecGrpInfo 要获取的FBD组列表 @param mapGrpData 返回的FBD组相关信息 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ static int getGroupDataFromDB( const std::vector &vecGrpInfo, GrpIdToDataInfoMAP &mapGrpData ); @@ -107,4 +107,4 @@ private: typedef boost::shared_ptr CFbdUtilPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/OnlineModifyThread.cpp b/platform/src/application/app_fbd/app_fbd_server/OnlineModifyThread.cpp index fedd6fff..b275a621 100644 --- a/platform/src/application/app_fbd/app_fbd_server/OnlineModifyThread.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/OnlineModifyThread.cpp @@ -8,7 +8,7 @@ #include "OnlineModifyThread.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -34,8 +34,8 @@ void COnlieModifyThread::execute() int COnlieModifyThread::initialize() { - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/OnlineModifyThread.h b/platform/src/application/app_fbd/app_fbd_server/OnlineModifyThread.h index 925e2dd3..d09be1f0 100644 --- a/platform/src/application/app_fbd/app_fbd_server/OnlineModifyThread.h +++ b/platform/src/application/app_fbd/app_fbd_server/OnlineModifyThread.h @@ -8,7 +8,7 @@ #include "pub_utility_api/TimerThreadBase.h" #include "FbdGroupMng.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -26,7 +26,7 @@ public: /** @brief 初始化 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int initialize(); @@ -43,4 +43,4 @@ private: typedef boost::shared_ptr COnlieModifyThreadPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/PointSubThread.cpp b/platform/src/application/app_fbd/app_fbd_server/PointSubThread.cpp index d3916feb..034f4d44 100644 --- a/platform/src/application/app_fbd/app_fbd_server/PointSubThread.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/PointSubThread.cpp @@ -17,7 +17,7 @@ #include "app_fbd/fbd_common/FbdSysInfoApi.h" #include "PointSubThread.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -42,7 +42,7 @@ CPointSubThread::~CPointSubThread() int CPointSubThread::initialize() { ( void ) this; - return kbdSuccess; + return iotSuccess; } @@ -70,7 +70,7 @@ int CPointSubThread::redundantSwitch( bool bMaster, bool /*bSlave*/ ) clear(); } - return kbdSuccess; + return iotSuccess; } @@ -219,4 +219,4 @@ void CPointSubThread::recvPntMsg( const int nTimeoutMsec ) } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/PointSubThread.h b/platform/src/application/app_fbd/app_fbd_server/PointSubThread.h index 21c146ff..8ad991db 100644 --- a/platform/src/application/app_fbd/app_fbd_server/PointSubThread.h +++ b/platform/src/application/app_fbd/app_fbd_server/PointSubThread.h @@ -14,7 +14,7 @@ #include "app_fbd/fbd_common/FbdPointSubApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -28,7 +28,7 @@ public: /******************************************************************************//** * @brief 初始化 * @param 无 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ int initialize(); @@ -36,7 +36,7 @@ public: * @brief 冗余切换 * @param bMaster 是否为主 * bSlave 是否为备 - * @return 成功返回kbdSuccess,失败返回错误码 + * @return 成功返回iotSuccess,失败返回错误码 **********************************************************************************/ int redundantSwitch( bool bMaster, bool bSlave ); @@ -48,7 +48,7 @@ private: /******************************************************************************//** * @brief 接收处理测点消息 * @param nTimeoutMsec： 接收超时时间 - * @return 成功返回kbdSuccess,失败返回错误码 + * @return 成功返回iotSuccess,失败返回错误码 **********************************************************************************/ void recvPntMsg( const int nTimeoutMsec ); @@ -65,4 +65,4 @@ private: typedef boost::shared_ptr CPointSubThreadPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/alarm_client/AlarmCltThread.cpp b/platform/src/application/app_fbd/app_fbd_server/alarm_client/AlarmCltThread.cpp index 3d0b11d7..71b0574f 100644 --- a/platform/src/application/app_fbd/app_fbd_server/alarm_client/AlarmCltThread.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/alarm_client/AlarmCltThread.cpp @@ -13,7 +13,7 @@ #include "AlarmCltThread.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -39,7 +39,7 @@ CAlarmCltThread::~CAlarmCltThread() int CAlarmCltThread::initialize() { ( void ) this; - return kbdSuccess; + return iotSuccess; } @@ -70,7 +70,7 @@ int CAlarmCltThread::redundantSwitch( bool bMaster, bool /*bSlave*/ ) clear(); } - return kbdSuccess; + return iotSuccess; } @@ -138,4 +138,4 @@ void CAlarmCltThread::execute() } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/alarm_client/AlarmCltThread.h b/platform/src/application/app_fbd/app_fbd_server/alarm_client/AlarmCltThread.h index d11ccc29..a0bd3181 100644 --- a/platform/src/application/app_fbd/app_fbd_server/alarm_client/AlarmCltThread.h +++ b/platform/src/application/app_fbd/app_fbd_server/alarm_client/AlarmCltThread.h @@ -17,7 +17,7 @@ #include "AlarmMsgHandler.h" #include "ItlAlmMsgHandler.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -33,7 +33,7 @@ public: /******************************************************************************//** * @brief 初始化 * @param 无 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ int initialize(); @@ -41,7 +41,7 @@ public: * @brief 冗余切换 * @param bMaster 是否为主 * bSlave 是否为备 - * @return 成功返回kbdSuccess,失败返回错误码 + * @return 成功返回iotSuccess,失败返回错误码 **********************************************************************************/ int redundantSwitch( bool bMaster, bool bSlave ); @@ -64,4 +64,4 @@ private: typedef boost::shared_ptr CAlarmCltThreadPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/alarm_client/AlarmMsgHandler.cpp b/platform/src/application/app_fbd/app_fbd_server/alarm_client/AlarmMsgHandler.cpp index 67b2fcc4..de1fe106 100644 --- a/platform/src/application/app_fbd/app_fbd_server/alarm_client/AlarmMsgHandler.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/alarm_client/AlarmMsgHandler.cpp @@ -16,7 +16,7 @@ #include "AlarmMsgHandler.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -487,4 +487,4 @@ void CAlarmMsgHandler::handle_MT_ALM_AS2AC_WAVE() } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/alarm_client/AlarmMsgHandler.h b/platform/src/application/app_fbd/app_fbd_server/alarm_client/AlarmMsgHandler.h index 696659e9..f7548960 100644 --- a/platform/src/application/app_fbd/app_fbd_server/alarm_client/AlarmMsgHandler.h +++ b/platform/src/application/app_fbd/app_fbd_server/alarm_client/AlarmMsgHandler.h @@ -34,7 +34,7 @@ #include "boost/integer.hpp" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -112,4 +112,4 @@ private: }; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/alarm_client/ItlAlmMsgHandler.cpp b/platform/src/application/app_fbd/app_fbd_server/alarm_client/ItlAlmMsgHandler.cpp index e6384b9b..d141ec8c 100644 --- a/platform/src/application/app_fbd/app_fbd_server/alarm_client/ItlAlmMsgHandler.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/alarm_client/ItlAlmMsgHandler.cpp @@ -16,7 +16,7 @@ #include "ItlAlmMsgHandler.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -437,4 +437,4 @@ void CItlAlmMsgHandler::handle_MT_IA_S2C_RELEASE() m_pParent->m_ptrFbdAlmCltAip->releaseItlAlm( objReleaseAlm ); } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/alarm_client/ItlAlmMsgHandler.h b/platform/src/application/app_fbd/app_fbd_server/alarm_client/ItlAlmMsgHandler.h index e4e843af..1ee14115 100644 --- a/platform/src/application/app_fbd/app_fbd_server/alarm_client/ItlAlmMsgHandler.h +++ b/platform/src/application/app_fbd/app_fbd_server/alarm_client/ItlAlmMsgHandler.h @@ -34,7 +34,7 @@ #include "boost/integer.hpp" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -110,4 +110,4 @@ private: }; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/app_fbd_server/main.cpp b/platform/src/application/app_fbd/app_fbd_server/main.cpp index bde13545..a6348888 100644 --- a/platform/src/application/app_fbd/app_fbd_server/main.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/main.cpp @@ -12,7 +12,7 @@ int main( int argc, char *argv[] ) //< 控制释放 { - kbd_app::app_fbd::CFbdServerApp objApp; + iot_app::app_fbd::CFbdServerApp objApp; nRc = objApp.main( argc, argv ); } diff --git a/platform/src/application/app_fbd/fbd_common/FbdAlarmSrcImpl.cpp b/platform/src/application/app_fbd/fbd_common/FbdAlarmSrcImpl.cpp index c406be7f..2aa2b279 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdAlarmSrcImpl.cpp +++ b/platform/src/application/app_fbd/fbd_common/FbdAlarmSrcImpl.cpp @@ -16,7 +16,7 @@ #include "app_fbd/fbd_common/FbdSysInfoApi.h" #include "FbdAlarmSrcImpl.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -94,4 +94,4 @@ bool CFbdAlarmSrcImpl::addAlarm( iot_idl::SAppAddAlm &objAlarm ) } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_common/FbdAlarmSrcImpl.h b/platform/src/application/app_fbd/fbd_common/FbdAlarmSrcImpl.h index 4dd123c0..6680f46e 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdAlarmSrcImpl.h +++ b/platform/src/application/app_fbd/fbd_common/FbdAlarmSrcImpl.h @@ -12,7 +12,7 @@ #include "app_fbd/fbd_common/FbdAlarmSrcApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -37,4 +37,4 @@ private: typedef boost::shared_ptr CFbdAlarmSrcImplPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_common/FbdDiagDataImpl.cpp b/platform/src/application/app_fbd/fbd_common/FbdDiagDataImpl.cpp index cd64a7b4..194fd7b3 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdDiagDataImpl.cpp +++ b/platform/src/application/app_fbd/fbd_common/FbdDiagDataImpl.cpp @@ -34,7 +34,7 @@ #include "FbdDiagDataImpl.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -59,7 +59,7 @@ FBD_COMMON_API CFbdDiagDataApiPtr getFbdDiagDataApi() spInst = boost::make_shared(); - if ( kbdSuccess == spInst->initialize()) + if ( iotSuccess == spInst->initialize()) { g_wpSingleton = spInst; return spInst; @@ -109,7 +109,7 @@ int CFbdDiagDataImpl::initialize() if ( nullptr == ptrSysInfo || ptrSysInfo->getCurrentRunAppInfo().strAppName.empty()) { LOGERROR( "initialize(): 系统信息非预期，检查程序！" ); - return kbdFailed; + return iotFailed; } m_pRdbTableMng = new iot_dbms::CRdbTableMng( getFbdSysInfoApi()->getCurrentRunAppInfo().strAppName ); } @@ -118,10 +118,10 @@ int CFbdDiagDataImpl::initialize() || nullptr == m_pMutexModOutputTable || nullptr == m_pMutexModPropTable ) { LOGERROR( "initialize(): 空指针，非预期，检查程序！" ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -132,7 +132,7 @@ int CFbdDiagDataImpl::getModProperty( const SFbdModPropKey &stPropertyKey, std:: if ( !stPropertyKey.isValid()) { LOGERROR( "getModProperty(): 无效的输入 stPropertyKey，返回失败！" ); - return kbdFailed; + return iotFailed; } //< 读锁 @@ -143,10 +143,10 @@ int CFbdDiagDataImpl::getModProperty( const SFbdModPropKey &stPropertyKey, std:: { LOGERROR( "getModProperty(): m_objModPropTable 中未找到记录 Key=[%s]", stPropertyKey.toString().c_str()); - return kbdFailed; + return iotFailed; } strValue = ( *it )->m_strValue; - return kbdSuccess; + return iotSuccess; } @@ -157,7 +157,7 @@ int CFbdDiagDataImpl::getValKeyByModInput( const SFbdModInputKey &stInputKey, SF if ( !stInputKey.isValid()) { LOGERROR( "getValKeyByModInput(): 无效的输入 stInputKey，返回失败！" ); - return kbdFailed; + return iotFailed; } SFbdModOutputKey stOutputKey; @@ -170,7 +170,7 @@ int CFbdDiagDataImpl::getValKeyByModInput( const SFbdModInputKey &stInputKey, SF { LOGERROR( "getValKeyByModInput(): m_objModInputTable 中未找到记录 Key=[%s]", stInputKey.toString().c_str()); - return kbdFailed; + return iotFailed; } stOutputKey = ( *it )->m_stOutputKey; } @@ -184,7 +184,7 @@ int CFbdDiagDataImpl::getValKeyByModInput( const SFbdModInputKey &stInputKey, SF { LOGERROR( "getValKeyByModInput(): m_objModOutputTable 中未找到记录 Key=[%s]", stOutputKey.toString().c_str()); - return kbdFailed; + return iotFailed; } stValueKey.m_bWriteable = false; @@ -192,10 +192,10 @@ int CFbdDiagDataImpl::getValKeyByModInput( const SFbdModInputKey &stInputKey, SF } if ( stValueKey.isValid()) - return kbdSuccess; + return iotSuccess; LOGERROR( "getValKeyByModInput(): 无效的输出，检查程序！" ); - return kbdFailed; + return iotFailed; } @@ -206,7 +206,7 @@ int CFbdDiagDataImpl::getValKeyByModOutput( const SFbdModOutputKey &stOutputKey, if ( !stOutputKey.isValid()) { LOGERROR( "getValKeyByModOutput(): 无效的输入 stOutputKey，返回失败！" ); - return kbdFailed; + return iotFailed; } //< 读锁 @@ -217,17 +217,17 @@ int CFbdDiagDataImpl::getValKeyByModOutput( const SFbdModOutputKey &stOutputKey, { LOGERROR( "getValKeyByModOutput(): m_objModOutputTable 中未找到记录 Key=[%s]", stOutputKey.toString().c_str()); - return kbdFailed; + return iotFailed; } stValueKey.m_bWriteable = true; stValueKey.m_ptrModOutput = *it; if ( stValueKey.isValid()) - return kbdSuccess; + return iotSuccess; LOGERROR( "getValKeyByModOutput(): 无效的输出，检查程序！" ); - return kbdFailed; + return iotFailed; } @@ -238,7 +238,7 @@ int CFbdDiagDataImpl::getNumericValByKey( const SFbdValueKey &stValueKey, SFbdNu if ( !stValueKey.isValid()) { LOGERROR( "getNumericValByKey(): 无效的输入 stValueKey，返回失败！" ); - return kbdFailed; + return iotFailed; } //< 读锁 @@ -251,12 +251,12 @@ int CFbdDiagDataImpl::getNumericValByKey( const SFbdValueKey &stValueKey, SFbdNu LOGERROR( "getNumericValByKey(): 类型不一致，key=[%s],type=[%s]", stValueKey.toString().c_str(), stValueKey.m_ptrModOutput->m_anyOutputValue.type().name()); - return kbdFailed; + return iotFailed; } stValAndSta = *pValue; - return kbdSuccess; + return iotSuccess; } @@ -265,13 +265,13 @@ int CFbdDiagDataImpl::setNumericValByKey( const SFbdValueKey &stValueKey, const if ( !stValueKey.isValid()) { LOGERROR( "setNumericValByKey(): 无效的输入 stValueKey，返回失败！" ); - return kbdFailed; + return iotFailed; } if ( !stValueKey.m_bWriteable ) { LOGERROR( "setNumericValByKey(): 非可写 Key" ); - return kbdFailed; + return iotFailed; } //< 写锁 @@ -279,7 +279,7 @@ int CFbdDiagDataImpl::setNumericValByKey( const SFbdValueKey &stValueKey, const stValueKey.m_ptrModOutput->m_anyOutputValue = stValAndSta; - return kbdSuccess; + return iotSuccess; } @@ -290,7 +290,7 @@ int CFbdDiagDataImpl::getStringValByKey( const SFbdValueKey &stValueKey, SFbdStr if ( !stValueKey.isValid()) { LOGERROR( "getStringValByKey(): 无效的输入 stValueKey，返回失败！" ); - return kbdFailed; + return iotFailed; } //< 读锁 @@ -303,12 +303,12 @@ int CFbdDiagDataImpl::getStringValByKey( const SFbdValueKey &stValueKey, SFbdStr LOGERROR( "getStringValByKey(): 类型不一致，key=[%s],type=[%s]", stValueKey.toString().c_str(), stValueKey.m_ptrModOutput->m_anyOutputValue.type().name()); - return kbdFailed; + return iotFailed; } stValAndSta = *pValue; - return kbdSuccess; + return iotSuccess; } @@ -317,13 +317,13 @@ int CFbdDiagDataImpl::setStringValByKey( const SFbdValueKey &stValueKey, const S if ( !stValueKey.isValid()) { LOGERROR( "setStringValByKey(): 无效的输入 stValueKey，返回失败！" ); - return kbdFailed; + return iotFailed; } if ( !stValueKey.m_bWriteable ) { LOGERROR( "setStringValByKey(): 非可写 Key" ); - return kbdFailed; + return iotFailed; } //< 写锁 @@ -331,7 +331,7 @@ int CFbdDiagDataImpl::setStringValByKey( const SFbdValueKey &stValueKey, const S stValueKey.m_ptrModOutput->m_anyOutputValue = stValAndSta; - return kbdSuccess; + return iotSuccess; } @@ -342,7 +342,7 @@ int CFbdDiagDataImpl::getAlarmValByKey( const SFbdValueKey &stValueKey, SFbdAlar if ( !stValueKey.isValid()) { LOGERROR( "getAlarmValByKey(): 无效的输入 stValueKey，返回失败！" ); - return kbdFailed; + return iotFailed; } //< 读锁 @@ -355,12 +355,12 @@ int CFbdDiagDataImpl::getAlarmValByKey( const SFbdValueKey &stValueKey, SFbdAlar LOGERROR( "getAlarmValByKey(): 类型不一致，key=[%s],type=[%s]", stValueKey.toString().c_str(), stValueKey.m_ptrModOutput->m_anyOutputValue.type().name()); - return kbdFailed; + return iotFailed; } stValAndSta = *pValue; - return kbdSuccess; + return iotSuccess; } @@ -369,13 +369,13 @@ int CFbdDiagDataImpl::setAlarmValByKey( const SFbdValueKey &stValueKey, const SF if ( !stValueKey.isValid()) { LOGERROR( "setAlarmValByKey(): 无效的输入 stValueKey，返回失败！" ); - return kbdFailed; + return iotFailed; } if ( !stValueKey.m_bWriteable ) { LOGERROR( "setAlarmValByKey(): 非可写 Key" ); - return kbdFailed; + return iotFailed; } //< 写锁 @@ -383,7 +383,7 @@ int CFbdDiagDataImpl::setAlarmValByKey( const SFbdValueKey &stValueKey, const SF stValueKey.m_ptrModOutput->m_anyOutputValue = stValAndSta; - return kbdSuccess; + return iotSuccess; } @@ -397,9 +397,9 @@ int CFbdDiagDataImpl::getAllGroupInfo( std::vector &vecGrpInfo ) if ( !m_pRdbTableMng->selectAllColumnNoCondition( strTableName, vecGrpInfo )) { LOGERROR( "getAllGroupInfo(): 从RDB获取FBD组信息失败" ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -415,7 +415,7 @@ int CFbdDiagDataImpl::getModuleInfoByGroup( const int nFbdGrpId, std::vectorset_nvalid( nStatus ); } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_common/FbdDiagDataImpl.h b/platform/src/application/app_fbd/fbd_common/FbdDiagDataImpl.h index d43a7001..a85bc310 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdDiagDataImpl.h +++ b/platform/src/application/app_fbd/fbd_common/FbdDiagDataImpl.h @@ -14,7 +14,7 @@ #include "FbdDiagDataStructPrivate.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -27,7 +27,7 @@ public: /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); @@ -100,4 +100,4 @@ typedef boost::shared_ptr CFbdDiagDataImplPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_common/FbdDiagDataStructPrivate.cpp b/platform/src/application/app_fbd/fbd_common/FbdDiagDataStructPrivate.cpp index d3ecd050..f0a44758 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdDiagDataStructPrivate.cpp +++ b/platform/src/application/app_fbd/fbd_common/FbdDiagDataStructPrivate.cpp @@ -36,7 +36,7 @@ #include "FbdDiagDataStructPrivate.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -385,4 +385,4 @@ bool SFbdModOutput::getValueString( int &nStatus, std::string &strValue ) const } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_common/FbdDiagDataStructPrivate.h b/platform/src/application/app_fbd/fbd_common/FbdDiagDataStructPrivate.h index 5ae01ec1..20a07ebe 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdDiagDataStructPrivate.h +++ b/platform/src/application/app_fbd/fbd_common/FbdDiagDataStructPrivate.h @@ -21,7 +21,7 @@ #include "app_fbd/fbd_common/FbdDiagDataStruct.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -275,4 +275,4 @@ struct SFbdGroupData }; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_common/FbdPointSubImpl.cpp b/platform/src/application/app_fbd/fbd_common/FbdPointSubImpl.cpp index 637b34db..a7a4d1a8 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdPointSubImpl.cpp +++ b/platform/src/application/app_fbd/fbd_common/FbdPointSubImpl.cpp @@ -12,7 +12,7 @@ #include "FbdPointSubImpl.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -37,7 +37,7 @@ FBD_COMMON_API CFbdPointSubApiPtr getFbdPointSubApi() spInst = boost::make_shared(); - if ( kbdSuccess == spInst->initialize()) + if ( iotSuccess == spInst->initialize()) { g_wpSingleton = spInst; return spInst; @@ -60,7 +60,7 @@ FBD_COMMON_API int splitLongKeyIdTag( const std::string &strLongKeyIdTag, SLongK if ( vecStr.size() < 5 ) { LOGERROR( "KEY=[%s]格式不正确", strLongKeyIdTag.c_str()); - return kbdFailed; + return iotFailed; } stKeyInfo.strOriginalKey = strLongKeyIdTag; //< 原始主键 @@ -78,7 +78,7 @@ FBD_COMMON_API int splitLongKeyIdTag( const std::string &strLongKeyIdTag, SLongK stKeyInfo.strKeyExcludeLocSub = stKeyInfo.strTableName + "." + stKeyInfo.strTagName + "." + stKeyInfo.strColName; - return kbdSuccess; + return iotSuccess; } @@ -109,14 +109,14 @@ int CFbdPointSubImpl::initialize() if ( !iot_service::CDpcdaForApp::initGlobalThread()) { LOGERROR( "初始化数据订阅服务接口失败" ); - return kbdFailed; + return iotFailed; } m_ptrDpSub = boost::make_shared(); if ( m_ptrDpSub == nullptr ) { LOGERROR( "创建数据订阅服务接口失败" ); - return kbdFailed; + return iotFailed; } //< 初始化数据处理接口，主要用来判断测点状态字是否有效 @@ -124,16 +124,16 @@ int CFbdPointSubImpl::initialize() if ( m_ptrDpApi == nullptr ) { LOGERROR( "创建数据处理接口失败" ); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDpApi->initialize()) + if ( iotSuccess != m_ptrDpApi->initialize()) { LOGERROR( "初始化数据处理接口失败" ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -178,10 +178,10 @@ int CFbdPointSubImpl::getPntValAndSta( const std::string &strPntKey, if ( pIter != m_mapPntKeyToValue.end()) { pIter->second.getValAndSta( dValue, nStatus ); - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } @@ -201,7 +201,7 @@ int CFbdPointSubImpl::setPntValAndSta( const std::string &strPntKey, double dVal pIter->second.updateRefreshTime( iot_public::getMonotonicMsec()); } - return kbdSuccess; + return iotSuccess; } @@ -213,7 +213,7 @@ int CFbdPointSubImpl::batchSetPntValAndSta( const std::vector &vecP { LOGERROR( "批量设置中Key=[%d],Value=[%d],Status=[%d]个数不匹配", ( int ) vecPntKey.size(), ( int ) vecValue.size(), ( int ) vecSta.size()); - return kbdFailed; + return iotFailed; } int64 lCurTime = iot_public::getMonotonicMsec(); @@ -229,7 +229,7 @@ int CFbdPointSubImpl::batchSetPntValAndSta( const std::vector &vecP } } - return kbdSuccess; + return iotSuccess; } @@ -246,4 +246,4 @@ void CFbdPointSubImpl::resetOverTimePntValAndSta() } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_common/FbdPointSubImpl.h b/platform/src/application/app_fbd/fbd_common/FbdPointSubImpl.h index 37f95f65..e2f239c2 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdPointSubImpl.h +++ b/platform/src/application/app_fbd/fbd_common/FbdPointSubImpl.h @@ -11,7 +11,7 @@ #include "data_process_api/DataProcessApi.h" #include "app_fbd/fbd_common/FbdPointSubApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -104,7 +104,7 @@ public: /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); @@ -113,7 +113,7 @@ public: @param const std::string & strTableName 表名 @param const std::string & strTagName 主键 @param const std::string & strColName 列名 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ void addPointSub( const std::string &strTableName, const std::string &strTagName, @@ -124,7 +124,7 @@ public: @param const std::string & strTableName 表名 @param const std::string & strTagName 主键 @param const std::string & strColName 列名 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ void delPointSub( const std::string &strTableName, const std::string &strTagName, @@ -135,7 +135,7 @@ public: @param const std::string & strPntKey 表名.位置.设备.测点.列名 @param double & dValue 返回的值 @param int & nStatus 返回的状态 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int getPntValAndSta( const std::string &strPntKey, double &dValue, int &nStatus ) override; @@ -155,7 +155,7 @@ public: @param const std::string & strPntKey 表名.位置.设备.测点.列名 @param double & dValue 返回的值 @param int & nStatus 返回的状态 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int setPntValAndSta( const std::string &strPntKey, double dValue, int nStatus ) override; @@ -164,7 +164,7 @@ public: @param const std::vector & vecPntKey 测点主键 @param const std::vector & vecValue 测点值 @param const std::vector & vecSta 测点状态 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int batchSetPntValAndSta( const std::vector &vecPntKey, const std::vector &vecValue, @@ -186,4 +186,4 @@ private: typedef boost::shared_ptr CFbdPointSubImplPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_common/FbdSysInfoImpl.cpp b/platform/src/application/app_fbd/fbd_common/FbdSysInfoImpl.cpp index bdf96083..548f4805 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdSysInfoImpl.cpp +++ b/platform/src/application/app_fbd/fbd_common/FbdSysInfoImpl.cpp @@ -15,7 +15,7 @@ #include "FbdSysInfoImpl.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -78,4 +78,4 @@ void CFbdSysInfoImpl::setCurrentRunAppInfo( const iot_public::SRunAppInfo &stSet } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_common/FbdSysInfoImpl.h b/platform/src/application/app_fbd/fbd_common/FbdSysInfoImpl.h index 3e7108d0..58883c3b 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdSysInfoImpl.h +++ b/platform/src/application/app_fbd/fbd_common/FbdSysInfoImpl.h @@ -10,7 +10,7 @@ #include "app_fbd/fbd_common/FbdSysInfoApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -47,4 +47,4 @@ private: typedef boost::shared_ptr CFbdSysInfoImplPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_common/alarm_client/AlarmDataMng.cpp b/platform/src/application/app_fbd/fbd_common/alarm_client/AlarmDataMng.cpp index 4bb53c1e..cf81be6f 100644 --- a/platform/src/application/app_fbd/fbd_common/alarm_client/AlarmDataMng.cpp +++ b/platform/src/application/app_fbd/fbd_common/alarm_client/AlarmDataMng.cpp @@ -15,7 +15,7 @@ #include "AlarmDataMng.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -41,10 +41,10 @@ int CAlarmDataMng::initialize() if ( nullptr == m_pMutexLiveAlmTable ) { LOGERROR( "initialize(): 空指针，非预期，检查程序！" ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -57,11 +57,11 @@ int CAlarmDataMng::getLastAlarm( SFbdAlarmInfo &stAlmOutput ) const { LOGINFO( "getLastAlarm(): 当前没有任何告警，返回失败" ); stAlmOutput.m_ptrAlmInfo = nullptr; - return kbdFailed; + return iotFailed; } stAlmOutput.m_ptrAlmInfo = m_objLiveAlmTable.rbegin()->m_ptrAlmInfo; - return kbdSuccess; + return iotSuccess; } @@ -77,7 +77,7 @@ int CAlarmDataMng::getAlarmAfter( const SFbdAlarmInfo &stPosition, std::vector(); @@ -112,7 +112,7 @@ int CAlarmDataMng::getAlarmAfter( const SFbdAlarmInfo &stPosition, std::vectorm_ptrAlmInfo; - return kbdSuccess; + return iotSuccess; } @@ -126,11 +126,11 @@ int CAlarmDataMng::getAlarmByUuid( const std::string &strUuidBase64, SFbdAlarmIn if ( indexUuid.end() == itUuid ) { stOutput.m_ptrAlmInfo = nullptr; - return kbdFailed; + return iotFailed; } stOutput.m_ptrAlmInfo = itUuid->m_ptrAlmInfo; - return kbdSuccess; + return iotSuccess; } @@ -640,4 +640,4 @@ void CAlarmDataMng::linkWave2Alarm( iot_idl::SAlmCltLinkWave2Alm &objWave2Alm ) } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_common/alarm_client/AlarmDataMng.h b/platform/src/application/app_fbd/fbd_common/alarm_client/AlarmDataMng.h index 72daa04f..177607f3 100644 --- a/platform/src/application/app_fbd/fbd_common/alarm_client/AlarmDataMng.h +++ b/platform/src/application/app_fbd/fbd_common/alarm_client/AlarmDataMng.h @@ -40,7 +40,7 @@ #include "app_fbd/fbd_common/FbdDiagDataStruct.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -57,7 +57,7 @@ public: /******************************************************************************//** * @brief 初始化 * @param 无 - * @return 成功返回kbdSuccess,失败返回错误码 + * @return 成功返回iotSuccess,失败返回错误码 **********************************************************************************/ int initialize(); @@ -260,4 +260,4 @@ private: }; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_common/alarm_client/FbdAlarmCltImpl.cpp b/platform/src/application/app_fbd/fbd_common/alarm_client/FbdAlarmCltImpl.cpp index ce37ab89..043a7185 100644 --- a/platform/src/application/app_fbd/fbd_common/alarm_client/FbdAlarmCltImpl.cpp +++ b/platform/src/application/app_fbd/fbd_common/alarm_client/FbdAlarmCltImpl.cpp @@ -17,7 +17,7 @@ #include "FbdAlarmCltImpl.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -42,7 +42,7 @@ FBD_COMMON_API CFbdAlarmCltApiPtr getFbdAlarmCltApi() spInst = boost::make_shared(); - if ( kbdSuccess == spInst->initialize()) + if ( iotSuccess == spInst->initialize()) { g_wpSingleton = spInst; return spInst; @@ -63,13 +63,13 @@ FBD_COMMON_API long getFbdAlarmCltApiUseCount() int CFbdAlarmCltImpl::initialize() { - if ( kbdSuccess != m_objAlarmDataMng.initialize()) - return kbdFailed; + if ( iotSuccess != m_objAlarmDataMng.initialize()) + return iotFailed; - if ( kbdSuccess != m_objItlAlmDataMng.initialize()) - return kbdFailed; + if ( iotSuccess != m_objItlAlmDataMng.initialize()) + return iotFailed; - return kbdSuccess; + return iotSuccess; } @@ -203,4 +203,4 @@ void CFbdAlarmCltImpl::releaseItlAlm( iot_idl::SIntelliAlmRelease &objReleaseItl } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_common/alarm_client/FbdAlarmCltImpl.h b/platform/src/application/app_fbd/fbd_common/alarm_client/FbdAlarmCltImpl.h index a98f8e8f..009dee4a 100644 --- a/platform/src/application/app_fbd/fbd_common/alarm_client/FbdAlarmCltImpl.h +++ b/platform/src/application/app_fbd/fbd_common/alarm_client/FbdAlarmCltImpl.h @@ -13,7 +13,7 @@ #include "app_fbd/fbd_common/FbdAlarmCltApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -28,7 +28,7 @@ public: /******************************************************************************//** * @brief 初始化 * @param 无 - * @return 成功返回kbdSuccess,失败返回错误码 + * @return 成功返回iotSuccess,失败返回错误码 **********************************************************************************/ int initialize(); @@ -112,4 +112,4 @@ private: typedef boost::shared_ptr CFbdAlarmCltImplPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_common/alarm_client/ItlAlmDataMng.cpp b/platform/src/application/app_fbd/fbd_common/alarm_client/ItlAlmDataMng.cpp index 929a90ec..8af6c18c 100644 --- a/platform/src/application/app_fbd/fbd_common/alarm_client/ItlAlmDataMng.cpp +++ b/platform/src/application/app_fbd/fbd_common/alarm_client/ItlAlmDataMng.cpp @@ -15,7 +15,7 @@ #include "ItlAlmDataMng.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -38,10 +38,10 @@ int CItlAlmDataMng::initialize() if ( nullptr == m_pMutexLiveRawAlmTable ) { LOGERROR( "initialize(): 空指针，非预期，检查程序！" ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -51,7 +51,7 @@ int CItlAlmDataMng::getItlAlmByRawAlm( const SFbdAlarmInfo &stRawAlm, SFbdItlAlm { LOGERROR( "getItlAlmByRawAlm(): 输入参数 stRawAlm 无效，返回失败" ); stItlAlm.m_ptrItlAlmInfo = nullptr; - return kbdFailed; + return iotFailed; } //< 读锁 @@ -64,11 +64,11 @@ int CItlAlmDataMng::getItlAlmByRawAlm( const SFbdAlarmInfo &stRawAlm, SFbdItlAlm //< 没找到，不属于任何智能告警 //< 和智能告警服务端代码不一样，没有服务端复杂 stItlAlm.m_ptrItlAlmInfo = nullptr; - return kbdFailed; + return iotFailed; } stItlAlm.m_ptrItlAlmInfo = itUuid->m_ptrItlAlmInfo; - return kbdSuccess; + return iotSuccess; } @@ -83,11 +83,11 @@ int CItlAlmDataMng::getItlAlmByUuid( const std::string &strUuidBase64, SFbdItlAl { //< 没找到 stOutput.m_ptrItlAlmInfo = nullptr; - return kbdFailed; + return iotFailed; } stOutput.m_ptrItlAlmInfo = pairRange.first->m_ptrItlAlmInfo; - return kbdSuccess; + return iotSuccess; } @@ -326,4 +326,4 @@ void CItlAlmDataMng::releaseItlAlm( iot_idl::SIntelliAlmRelease &objReleaseItlAl } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_common/alarm_client/ItlAlmDataMng.h b/platform/src/application/app_fbd/fbd_common/alarm_client/ItlAlmDataMng.h index b79a7f60..cb648397 100644 --- a/platform/src/application/app_fbd/fbd_common/alarm_client/ItlAlmDataMng.h +++ b/platform/src/application/app_fbd/fbd_common/alarm_client/ItlAlmDataMng.h @@ -41,7 +41,7 @@ #include "app_fbd/fbd_common/FbdDiagDataStruct.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -58,7 +58,7 @@ public: /******************************************************************************//** * @brief 初始化 * @param 无 - * @return 成功返回kbdSuccess,失败返回错误码 + * @return 成功返回iotSuccess,失败返回错误码 **********************************************************************************/ int initialize(); @@ -175,4 +175,4 @@ private: }; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/anti_shake/AntiShake.cpp b/platform/src/application/app_fbd/fbd_module/anti_shake/AntiShake.cpp index 200d3d3b..9e0bc086 100644 --- a/platform/src/application/app_fbd/fbd_module/anti_shake/AntiShake.cpp +++ b/platform/src/application/app_fbd/fbd_module/anti_shake/AntiShake.cpp @@ -10,7 +10,7 @@ #include "pub_logger_api/logger.h" #include "pub_utility_api/TimeUtil.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -38,20 +38,20 @@ int CAntiShake::init( const SFbdModKey &stModuleKey, const std::string & ) if ( m_ptrDiagData == nullptr ) { LOGERROR( "获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } //1.获取输入、输出参数 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKey2 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stOutputKey )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || + iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKey2 ) || + iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stOutputKey )) { LOGERROR( "获取模块[%s]的输入输出参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } LOGINFO( "[%s]加载成功", m_stModKey.toString().c_str()); - return kbdSuccess; + return iotSuccess; } @@ -61,11 +61,11 @@ int CAntiShake::calculate() SFbdNumericValue stInput2( 0, CN_FBD_STATUS_Invalid ); //< 获取输入参数值和状态 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey1, stInput1 ) || - kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey2, stInput2 )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey1, stInput1 ) || + iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey2, stInput2 )) { LOGERROR( "获取模块[%s]的输入参数失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //< 判断输入参数的状态是否有效，无效则直接写输出 @@ -79,10 +79,10 @@ int CAntiShake::calculate() if ( m_lChangeTimeMsec == 0 ) //< 启动后第一次，先将输出值设置为无效，同时开始计时 { SFbdNumericValue stOutputTemp( 0, CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputKey, stOutputTemp )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputKey, stOutputTemp )) { LOGERROR( "首次计算，写模块[%s]输出值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } m_lChangeTimeMsec = iot_public::getMonotonicMsec(); @@ -111,7 +111,7 @@ int CAntiShake::calculate() } } - return kbdSuccess; + return iotSuccess; } @@ -136,4 +136,4 @@ boost::shared_ptr CAntiShake::create() } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/anti_shake/AntiShake.h b/platform/src/application/app_fbd/fbd_module/anti_shake/AntiShake.h index 32975a64..787be856 100644 --- a/platform/src/application/app_fbd/fbd_module/anti_shake/AntiShake.h +++ b/platform/src/application/app_fbd/fbd_module/anti_shake/AntiShake.h @@ -9,7 +9,7 @@ #include "app_fbd/fbd_common/BaseModule.h" #include "app_fbd/fbd_common/FbdDiagDataApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -51,4 +51,4 @@ BOOST_DLL_ALIAS( ) } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/ao_ctrl/AoCtrl.cpp b/platform/src/application/app_fbd/fbd_module/ao_ctrl/AoCtrl.cpp index 8d84cc8b..7717d877 100644 --- a/platform/src/application/app_fbd/fbd_module/ao_ctrl/AoCtrl.cpp +++ b/platform/src/application/app_fbd/fbd_module/ao_ctrl/AoCtrl.cpp @@ -20,7 +20,7 @@ #include "AoCtrl.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -42,41 +42,41 @@ int CAoCtrl::init( const SFbdModKey &stModuleKey, const std::string & ) if ( m_ptrDiagData == nullptr ) { LOGERROR( "获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } //1.解析配置 - if ( kbdSuccess != initCtrlParam()) + if ( iotSuccess != initCtrlParam()) { LOGERROR( "初始化模块[%s]的控制参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //2.获取输入、输出参数 if ( m_stCmdCfgInfo.strKeyIdTag.empty()) { //< 3个输入，从输入动态获取测点串 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKeyCtrlStr ) || - kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKeyTargetVal ) || - kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 3, m_stInKeyEnable )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKeyCtrlStr ) || + iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKeyTargetVal ) || + iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 3, m_stInKeyEnable )) { LOGERROR( "获取模块[%s]的输入输出参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } } else { //< 2个输入，测点串在配置中 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKeyTargetVal ) || - kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKeyEnable )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKeyTargetVal ) || + iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKeyEnable )) { LOGERROR( "获取模块[%s]的输入输出参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } } LOGINFO( "[%s]加载成功", m_stModKey.toString().c_str()); - return kbdSuccess; + return iotSuccess; } @@ -87,7 +87,7 @@ int CAoCtrl::calculate() if ( nullptr == m_pMbComm ) { LOGERROR( "通讯器指针为空，非预期，检查程序！" ); - return kbdFailed; + return iotFailed; } iot_net::CMbMessage objMsg; @@ -121,20 +121,20 @@ int CAoCtrl::calculate() //< 获取输入 { SFbdNumericValue stInValEnable; - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyEnable, stInValEnable )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyEnable, stInValEnable )) { LOGERROR( "获取模块[%s]的输入 使能 的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //< 判断是否使能，检测到使能，放入命令队列 if ( 0 != static_cast(stInValEnable.m_dValue) && isValidOfStatus( stInValEnable.m_nStatus )) { SFbdNumericValue stInValTargetVal; - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyTargetVal, stInValTargetVal )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyTargetVal, stInValTargetVal )) { LOGERROR( "获取模块[%s]的输入 目标值 的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if ( isValidOfStatus( stInValTargetVal.m_nStatus )) @@ -149,18 +149,18 @@ int CAoCtrl::calculate() { //< 为空，说明从输入获取 SFbdStringValue stInValCtrlStr; - if ( kbdSuccess != m_ptrDiagData->getStringValByKey( m_stInKeyCtrlStr, stInValCtrlStr )) + if ( iotSuccess != m_ptrDiagData->getStringValByKey( m_stInKeyCtrlStr, stInValCtrlStr )) { LOGERROR( "获取模块[%s]的输入 测点 的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != parseKeyIdTag( stInValCtrlStr.m_strValue, *ptrCmd ) + if ( iotSuccess != parseKeyIdTag( stInValCtrlStr.m_strValue, *ptrCmd ) || ptrCmd->strKeyIdTag.empty()) { LOGERROR( "模块[%s]解析输入的控制测点串失败.strCtrlStr=[%s]", m_stModKey.toString().c_str(), stInValCtrlStr.m_strValue.c_str()); - return kbdFailed; + return iotFailed; } } @@ -216,13 +216,13 @@ int CAoCtrl::calculate() } } - return kbdSuccess; + return iotSuccess; } int CAoCtrl::reset( const bool bMaster ) { - int nRet = kbdSuccess; + int nRet = iotSuccess; if ( bMaster ) { if ( nullptr == m_pMbComm ) @@ -262,12 +262,12 @@ int CAoCtrl::initCtrlParam() std::string strRetryTimes; //< 失败重试次数 std::string strInPortCtrlStr; //< 输入控制测点串 - if ( kbdSuccess != m_ptrDiagData->getModProperty( m_stModKey, "ControlTimeout", strCtrlTimeout ) || - kbdSuccess != m_ptrDiagData->getModProperty( m_stModKey, "RedoTimes", strRetryTimes ) || - kbdSuccess != m_ptrDiagData->getModProperty( m_stModKey, "InPortCtrlStr", strInPortCtrlStr )) + if ( iotSuccess != m_ptrDiagData->getModProperty( m_stModKey, "ControlTimeout", strCtrlTimeout ) || + iotSuccess != m_ptrDiagData->getModProperty( m_stModKey, "RedoTimes", strRetryTimes ) || + iotSuccess != m_ptrDiagData->getModProperty( m_stModKey, "InPortCtrlStr", strInPortCtrlStr )) { LOGERROR( "获取模块[%s]属性失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //2.获取超时、失败后处理逻辑等参数 @@ -286,29 +286,29 @@ int CAoCtrl::initCtrlParam() catch ( const std::exception &e ) { LOGERROR( "模块[%s]参数格式非法，Err：\n%s", m_stModKey.toString().c_str(), e.what()); - return kbdFailed; + return iotFailed; } //3.解析控制动作串 if ( 0 == nInPortCtrlStr ) { std::string strCtrlStr; - if ( kbdSuccess != m_ptrDiagData->getModProperty( m_stModKey, "CtrlStr", strCtrlStr )) + if ( iotSuccess != m_ptrDiagData->getModProperty( m_stModKey, "CtrlStr", strCtrlStr )) { LOGERROR( "获取模块[%s]属性 CtrlStr 失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //< m_stCmdCfgInfo.strKeyIdTag 必须不能为空，后续以此判断是否从输入端口获取测点串 - if ( kbdSuccess != parseKeyIdTag( strCtrlStr, m_stCmdCfgInfo ) + if ( iotSuccess != parseKeyIdTag( strCtrlStr, m_stCmdCfgInfo ) || m_stCmdCfgInfo.strKeyIdTag.empty()) { LOGERROR( "模块[%s]解析控制测点串失败.strCtrlStr=[%s]", m_stModKey.toString().c_str(), strCtrlStr.c_str()); - return kbdFailed; + return iotFailed; } } - return kbdSuccess; + return iotSuccess; } @@ -338,7 +338,7 @@ int CAoCtrl::handleCmd( SCmdOfOnePnt &stCmdOfOnePnt ) } } - return kbdSuccess; + return iotSuccess; } @@ -467,38 +467,38 @@ int CAoCtrl::parseKeyIdTag( const std::string &strKeyIdTag, SCtrlCmd &stCtrlCmd if ( strKeyIdTag.empty()) { LOGERROR( "测点信息为空.module_name=[%s]", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } SLongKeyIdTagInfo stKeyInfo; - if ( kbdSuccess != splitLongKeyIdTag( strKeyIdTag, stKeyInfo )) + if ( iotSuccess != splitLongKeyIdTag( strKeyIdTag, stKeyInfo )) { LOGERROR( "解析测点信息失败.KeyIdTag=[%s]", strKeyIdTag.c_str()); - return kbdFailed; + return iotFailed; } CFbdSysInfoApiPtr ptrSysInfo = getFbdSysInfoApi(); if ( ptrSysInfo == nullptr ) { LOGERROR( "获取系统信息库失败" ); - return kbdFailed; + return iotFailed; } iot_public::SSubsystemInfo stSubsysInfo; iot_public::SLocationInfo stLocationInfo; - if ( kbdSuccess != ptrSysInfo->getSysInfo().getSubsystemInfoByName( stKeyInfo.strSubsystemName, stSubsysInfo ) || - kbdSuccess != ptrSysInfo->getSysInfo().getLocationInfoByName( stKeyInfo.strLocationName, stLocationInfo )) + if ( iotSuccess != ptrSysInfo->getSysInfo().getSubsystemInfoByName( stKeyInfo.strSubsystemName, stSubsysInfo ) || + iotSuccess != ptrSysInfo->getSysInfo().getLocationInfoByName( stKeyInfo.strLocationName, stLocationInfo )) { LOGERROR( "获取测点所属域和应用信息失败.位置ID=[%s],专业ID=[%s]", stKeyInfo.strSubsystemName.c_str(), stKeyInfo.strLocationName.c_str()); - return kbdFailed; + return iotFailed; } stCtrlCmd.strKeyIdTag = stKeyInfo.strKeyExcludeLocSub; stCtrlCmd.nDstDomainId = stLocationInfo.nDomainId; stCtrlCmd.nAppId = stSubsysInfo.nAppId; - return kbdSuccess; + return iotSuccess; } @@ -508,4 +508,4 @@ boost::shared_ptr CAoCtrl::create() } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/ao_ctrl/AoCtrl.h b/platform/src/application/app_fbd/fbd_module/ao_ctrl/AoCtrl.h index 096eeba4..d42457c3 100644 --- a/platform/src/application/app_fbd/fbd_module/ao_ctrl/AoCtrl.h +++ b/platform/src/application/app_fbd/fbd_module/ao_ctrl/AoCtrl.h @@ -17,7 +17,7 @@ #include "app_fbd/fbd_common/BaseModule.h" #include "app_fbd/fbd_common/FbdDiagDataApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -95,14 +95,14 @@ private: private: /** @brief 初始化控制相关参数 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initCtrlParam(); /** @brief 处理命令 @param stCmdOfOnePnt 要处理的命令对象 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int handleCmd( SCmdOfOnePnt &stCmdOfOnePnt ); @@ -135,7 +135,7 @@ private: @brief 解析控制字符串 @param const std::string & strKeyIdTag 测点信息 @param SCtrlCmd & stCtrlCmd 解析后的结果 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int parseKeyIdTag( const std::string &strKeyIdTag, SCtrlCmd &stCtrlCmd ); @@ -162,4 +162,4 @@ BOOST_DLL_ALIAS( ) } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/bit_split/BitSplit.cpp b/platform/src/application/app_fbd/fbd_module/bit_split/BitSplit.cpp index fa7420c1..e3c1200f 100644 --- a/platform/src/application/app_fbd/fbd_module/bit_split/BitSplit.cpp +++ b/platform/src/application/app_fbd/fbd_module/bit_split/BitSplit.cpp @@ -13,7 +13,7 @@ #include "BitSplit.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -41,22 +41,22 @@ int CBitSplit::init( const SFbdModKey &stModuleKey, const std::string & ) if ( m_ptrDiagData == nullptr ) { LOGERROR( "获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } //1.获取输入、输出参数 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 )) { LOGERROR( "获取模块[%s]的输入参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //< 获取输出参数 std::string strOutputNum = "0"; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_SwitchINum, strOutputNum )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_SwitchINum, strOutputNum )) { LOGERROR( "获取模块[%s]的输入参数数量失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } m_nOutputNum = iot_public::StringToInt( strOutputNum ); @@ -64,21 +64,21 @@ int CBitSplit::init( const SFbdModKey &stModuleKey, const std::string & ) { LOGERROR( "模块[%s]要求的输出参数个数最小=%d,最大=%d", stModuleKey.toString().c_str(), CN_MinOutputNum, CN_MaxOutputNum ); - return kbdFailed; + return iotFailed; } m_vecOutputKey.resize( static_cast(m_nOutputNum)); for ( int i = 0; i < m_nOutputNum; ++i ) //< 获取输出参数主键 { - if ( kbdSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, i + 1, m_vecOutputKey[i] )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, i + 1, m_vecOutputKey[i] )) { LOGERROR( "获取模块[%s]的输入参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } } LOGINFO( "[%s]加载成功", stModuleKey.toString().c_str()); - return kbdSuccess; + return iotSuccess; } @@ -88,7 +88,7 @@ int CBitSplit::calculate() SFbdNumericValue stOutput( 0, CN_FBD_STATUS_Invalid ); //< 获取输入参数的值和状态 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey1, stInput1 )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey1, stInput1 )) { LOGERROR( "获取模块[%s]的输入参数失败", m_stModKey.toString().c_str()); return setAllOutput( stOutput ); @@ -98,14 +98,14 @@ int CBitSplit::calculate() stOutput.m_nStatus = stInput1.m_nStatus; boost::dynamic_bitset<> setBit( m_nOutputNum, static_cast(stInput1.m_dValue)); - int nRet = kbdSuccess; + int nRet = iotSuccess; for ( size_t i = 0; i < m_vecOutputKey.size(); ++i ) { stOutput.m_dValue = setBit[i]; - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_vecOutputKey[i], stOutput )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_vecOutputKey[i], stOutput )) { LOGERROR( "设置[%s]输出值失败", m_vecOutputKey[i].toString().c_str()); - nRet = kbdFailed; + nRet = iotFailed; } } @@ -129,13 +129,13 @@ int CBitSplit::clean() int CBitSplit::setAllOutput( const SFbdNumericValue &stValue ) { - int nRet = kbdSuccess; + int nRet = iotSuccess; for ( size_t i = 0; i < m_vecOutputKey.size(); ++i ) { - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_vecOutputKey[i], stValue )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_vecOutputKey[i], stValue )) { LOGERROR( "设置[%s]输出值失败", m_vecOutputKey[i].toString().c_str()); - nRet = kbdFailed; + nRet = iotFailed; } } @@ -149,4 +149,4 @@ boost::shared_ptr CBitSplit::create() } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/bit_split/BitSplit.h b/platform/src/application/app_fbd/fbd_module/bit_split/BitSplit.h index 0acd2e36..173fa553 100644 --- a/platform/src/application/app_fbd/fbd_module/bit_split/BitSplit.h +++ b/platform/src/application/app_fbd/fbd_module/bit_split/BitSplit.h @@ -9,7 +9,7 @@ #include "app_fbd/fbd_common/BaseModule.h" #include "app_fbd/fbd_common/FbdDiagDataApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -36,7 +36,7 @@ private: /** @brief 设置所有输出值 @param const SFbdNumericValue & stValue 要设置的值和状态 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int setAllOutput( const SFbdNumericValue &stValue ); @@ -56,5 +56,5 @@ BOOST_DLL_ALIAS( ) } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/compare_opt/CompareInterface.h b/platform/src/application/app_fbd/fbd_module/compare_opt/CompareInterface.h index de63a192..68998c75 100644 --- a/platform/src/application/app_fbd/fbd_module/compare_opt/CompareInterface.h +++ b/platform/src/application/app_fbd/fbd_module/compare_opt/CompareInterface.h @@ -7,7 +7,7 @@ #include "app_fbd/fbd_common/FbdDiagDataStruct.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -23,7 +23,7 @@ public: @param const SFbdNumericValue & stInput1 左参 @param const SFbdNumericValue & stInput2 右参 @param SFbdNumericValue & stOutput 返回的比较结果 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int compare( const SFbdNumericValue &stInput1, const SFbdNumericValue &stInput2, @@ -33,4 +33,4 @@ public: typedef boost::shared_ptr CCompareInterfacePtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/compare_opt/CompareOpt.cpp b/platform/src/application/app_fbd/fbd_module/compare_opt/CompareOpt.cpp index 50554d57..d253f78b 100644 --- a/platform/src/application/app_fbd/fbd_module/compare_opt/CompareOpt.cpp +++ b/platform/src/application/app_fbd/fbd_module/compare_opt/CompareOpt.cpp @@ -16,7 +16,7 @@ #include "LT.h" #include "NE.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -45,16 +45,16 @@ int CCompareOpt::init( const SFbdModKey &stModuleKey, const std::string &strExtr if ( m_ptrDiagData == nullptr ) { LOGERROR( "获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } //1.获取输入、输出参数 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKey2 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stOutputKey )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || + iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKey2 ) || + iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stOutputKey )) { LOGERROR( "获取模块[%s]的输入输出参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //< 创建比较函数处理类 @@ -62,11 +62,11 @@ int CCompareOpt::init( const SFbdModKey &stModuleKey, const std::string &strExtr if ( m_ptrCompare == nullptr ) { LOGERROR( "创建比较模块失败.ModName=[%s],compare=[%s]", stModuleKey.toString().c_str(), strExtraParam.c_str()); - return kbdFailed; + return iotFailed; } LOGINFO( "[%s]加载成功", stModuleKey.toString().c_str()); - return kbdSuccess; + return iotSuccess; } @@ -76,13 +76,13 @@ int CCompareOpt::calculate() SFbdNumericValue stInput2( 0, CN_FBD_STATUS_Invalid ); SFbdNumericValue stOutput( 0, CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey1, stInput1 ) || - kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey2, stInput2 )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey1, stInput1 ) || + iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey2, stInput2 )) { LOGERROR( "获取输入参数[%s]值失败", m_stModKey.toString().c_str()); } - if ( kbdSuccess != m_ptrCompare->compare( stInput1, stInput2, stOutput )) + if ( iotSuccess != m_ptrCompare->compare( stInput1, stInput2, stOutput )) { LOGERROR( "模块[%s]执行比较操作失败", m_stModKey.toString().c_str()); } @@ -144,4 +144,4 @@ boost::shared_ptr CCompareOpt::create() } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/compare_opt/CompareOpt.h b/platform/src/application/app_fbd/fbd_module/compare_opt/CompareOpt.h index d08db679..22611da1 100644 --- a/platform/src/application/app_fbd/fbd_module/compare_opt/CompareOpt.h +++ b/platform/src/application/app_fbd/fbd_module/compare_opt/CompareOpt.h @@ -10,7 +10,7 @@ #include "app_fbd/fbd_common/FbdDiagDataApi.h" #include "CompareInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -54,4 +54,4 @@ BOOST_DLL_ALIAS( ) } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/compare_opt/EQ.cpp b/platform/src/application/app_fbd/fbd_module/compare_opt/EQ.cpp index 2c04f843..8e53824a 100644 --- a/platform/src/application/app_fbd/fbd_module/compare_opt/EQ.cpp +++ b/platform/src/application/app_fbd/fbd_module/compare_opt/EQ.cpp @@ -8,7 +8,7 @@ #include "EQ.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -36,8 +36,8 @@ int CEQ::compare( const SFbdNumericValue &stInput1, stOutput.m_nStatus = CN_FBD_STATUS_Invalid; } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/compare_opt/EQ.h b/platform/src/application/app_fbd/fbd_module/compare_opt/EQ.h index 8210d4d2..2dac5444 100644 --- a/platform/src/application/app_fbd/fbd_module/compare_opt/EQ.h +++ b/platform/src/application/app_fbd/fbd_module/compare_opt/EQ.h @@ -7,7 +7,7 @@ #include "CompareInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -28,4 +28,4 @@ public: typedef boost::shared_ptr CEQPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/compare_opt/GE.cpp b/platform/src/application/app_fbd/fbd_module/compare_opt/GE.cpp index babcb4d5..d28116d5 100644 --- a/platform/src/application/app_fbd/fbd_module/compare_opt/GE.cpp +++ b/platform/src/application/app_fbd/fbd_module/compare_opt/GE.cpp @@ -6,7 +6,7 @@ #include "GE.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -34,8 +34,8 @@ int CGE::compare( const SFbdNumericValue &stInput1, stOutput.m_nStatus = CN_FBD_STATUS_Invalid; } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/compare_opt/GE.h b/platform/src/application/app_fbd/fbd_module/compare_opt/GE.h index 7bdf9e4b..3a90f841 100644 --- a/platform/src/application/app_fbd/fbd_module/compare_opt/GE.h +++ b/platform/src/application/app_fbd/fbd_module/compare_opt/GE.h @@ -7,7 +7,7 @@ #include "CompareInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -27,4 +27,4 @@ public: typedef boost::shared_ptr CGEPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/compare_opt/GT.cpp b/platform/src/application/app_fbd/fbd_module/compare_opt/GT.cpp index e7509cf3..8f59984c 100644 --- a/platform/src/application/app_fbd/fbd_module/compare_opt/GT.cpp +++ b/platform/src/application/app_fbd/fbd_module/compare_opt/GT.cpp @@ -6,7 +6,7 @@ #include "GT.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -37,8 +37,8 @@ int CGT::compare( const SFbdNumericValue &stInput1, stOutput.m_nStatus = CN_FBD_STATUS_Invalid; } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/compare_opt/GT.h b/platform/src/application/app_fbd/fbd_module/compare_opt/GT.h index c9cd46ee..521dae07 100644 --- a/platform/src/application/app_fbd/fbd_module/compare_opt/GT.h +++ b/platform/src/application/app_fbd/fbd_module/compare_opt/GT.h @@ -7,7 +7,7 @@ #include "CompareInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -28,4 +28,4 @@ public: typedef boost::shared_ptr CGTPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/compare_opt/LE.cpp b/platform/src/application/app_fbd/fbd_module/compare_opt/LE.cpp index 4f852341..2c5a7f03 100644 --- a/platform/src/application/app_fbd/fbd_module/compare_opt/LE.cpp +++ b/platform/src/application/app_fbd/fbd_module/compare_opt/LE.cpp @@ -6,7 +6,7 @@ #include "LE.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -34,8 +34,8 @@ int CLE::compare( const SFbdNumericValue &stInput1, stOutput.m_nStatus = CN_FBD_STATUS_Invalid; } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/compare_opt/LE.h b/platform/src/application/app_fbd/fbd_module/compare_opt/LE.h index 405062f3..1623c6ee 100644 --- a/platform/src/application/app_fbd/fbd_module/compare_opt/LE.h +++ b/platform/src/application/app_fbd/fbd_module/compare_opt/LE.h @@ -7,7 +7,7 @@ #include "CompareInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -28,4 +28,4 @@ public: typedef boost::shared_ptr CLEPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/compare_opt/LT.cpp b/platform/src/application/app_fbd/fbd_module/compare_opt/LT.cpp index 0705ae57..6d322465 100644 --- a/platform/src/application/app_fbd/fbd_module/compare_opt/LT.cpp +++ b/platform/src/application/app_fbd/fbd_module/compare_opt/LT.cpp @@ -6,7 +6,7 @@ #include "LT.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -37,8 +37,8 @@ int CLT::compare( const SFbdNumericValue &stInput1, stOutput.m_nStatus = CN_FBD_STATUS_Invalid; } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/compare_opt/LT.h b/platform/src/application/app_fbd/fbd_module/compare_opt/LT.h index c775d663..ac3f2f66 100644 --- a/platform/src/application/app_fbd/fbd_module/compare_opt/LT.h +++ b/platform/src/application/app_fbd/fbd_module/compare_opt/LT.h @@ -7,7 +7,7 @@ #include "CompareInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -28,4 +28,4 @@ public: typedef boost::shared_ptr CLTPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/compare_opt/NE.cpp b/platform/src/application/app_fbd/fbd_module/compare_opt/NE.cpp index c37e8d07..98b1710b 100644 --- a/platform/src/application/app_fbd/fbd_module/compare_opt/NE.cpp +++ b/platform/src/application/app_fbd/fbd_module/compare_opt/NE.cpp @@ -6,7 +6,7 @@ #include "NE.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -34,8 +34,8 @@ int CNE::compare( const SFbdNumericValue &stInput1, stOutput.m_nStatus = CN_FBD_STATUS_Invalid; } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/compare_opt/NE.h b/platform/src/application/app_fbd/fbd_module/compare_opt/NE.h index 0c037967..60156e19 100644 --- a/platform/src/application/app_fbd/fbd_module/compare_opt/NE.h +++ b/platform/src/application/app_fbd/fbd_module/compare_opt/NE.h @@ -7,7 +7,7 @@ #include "CompareInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -27,4 +27,4 @@ public: typedef boost::shared_ptr CNEPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/data_type_conv/BToI.cpp b/platform/src/application/app_fbd/fbd_module/data_type_conv/BToI.cpp index d96855dc..0a934914 100644 --- a/platform/src/application/app_fbd/fbd_module/data_type_conv/BToI.cpp +++ b/platform/src/application/app_fbd/fbd_module/data_type_conv/BToI.cpp @@ -5,7 +5,7 @@ */ #include "BToI.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -20,8 +20,8 @@ int CBToI::conv( const SFbdNumericValue &stInput, SFbdNumericValue &stOutput ) stOutput.m_dValue = static_cast(stInput.m_dValue); stOutput.m_nStatus = stInput.m_nStatus; - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/data_type_conv/BToI.h b/platform/src/application/app_fbd/fbd_module/data_type_conv/BToI.h index 96e62982..bc76dc38 100644 --- a/platform/src/application/app_fbd/fbd_module/data_type_conv/BToI.h +++ b/platform/src/application/app_fbd/fbd_module/data_type_conv/BToI.h @@ -7,7 +7,7 @@ #include "DataTypeConvInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -26,4 +26,4 @@ public: typedef boost::shared_ptr CBToIPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/data_type_conv/DataTypeConv.cpp b/platform/src/application/app_fbd/fbd_module/data_type_conv/DataTypeConv.cpp index 0f940ba8..bda1e4c9 100644 --- a/platform/src/application/app_fbd/fbd_module/data_type_conv/DataTypeConv.cpp +++ b/platform/src/application/app_fbd/fbd_module/data_type_conv/DataTypeConv.cpp @@ -13,7 +13,7 @@ #include "IToB.h" #include "IToF.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -41,15 +41,15 @@ int CDataTypeConv::init( const SFbdModKey &stModuleKey, const std::string &strEx if ( m_ptrDiagData == nullptr ) { LOGERROR( "获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } //1.获取输入、输出参数 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stOutputKey )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || + iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stOutputKey )) { LOGERROR( "获取模块[%s]的输入输出参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //< 创建转换处理类 @@ -57,11 +57,11 @@ int CDataTypeConv::init( const SFbdModKey &stModuleKey, const std::string &strEx if ( m_ptrConv == nullptr ) { LOGERROR( "创建运算模块失败.ModName=[%s],Calc=[%s]", stModuleKey.toString().c_str(), strExtraParam.c_str()); - return kbdFailed; + return iotFailed; } LOGINFO( "[%s]加载成功", stModuleKey.toString().c_str()); - return kbdSuccess; + return iotSuccess; } @@ -70,13 +70,13 @@ int CDataTypeConv::calculate() SFbdNumericValue stInput( 0, CN_FBD_STATUS_Invalid ); SFbdNumericValue stOutput( 0, CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey1, stInput )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey1, stInput )) { LOGERROR( "获取参数[%s]值失败", m_stInKey1.toString().c_str()); } else { - if ( kbdSuccess != m_ptrConv->conv( stInput, stOutput )) + if ( iotSuccess != m_ptrConv->conv( stInput, stOutput )) { LOGERROR( "模块[%s]转换失败", m_stModKey.toString().c_str()); } @@ -131,4 +131,4 @@ boost::shared_ptr CDataTypeConv::create() } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/data_type_conv/DataTypeConv.h b/platform/src/application/app_fbd/fbd_module/data_type_conv/DataTypeConv.h index 7185dfd1..126c51a1 100644 --- a/platform/src/application/app_fbd/fbd_module/data_type_conv/DataTypeConv.h +++ b/platform/src/application/app_fbd/fbd_module/data_type_conv/DataTypeConv.h @@ -10,7 +10,7 @@ #include "app_fbd/fbd_common/FbdDiagDataApi.h" #include "DataTypeConvInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -58,4 +58,4 @@ BOOST_DLL_ALIAS( ) } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/data_type_conv/DataTypeConvInterface.h b/platform/src/application/app_fbd/fbd_module/data_type_conv/DataTypeConvInterface.h index c9d1a20e..34559834 100644 --- a/platform/src/application/app_fbd/fbd_module/data_type_conv/DataTypeConvInterface.h +++ b/platform/src/application/app_fbd/fbd_module/data_type_conv/DataTypeConvInterface.h @@ -7,7 +7,7 @@ #include "app_fbd/fbd_common/FbdDiagDataStruct.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -22,7 +22,7 @@ public: @brief 转换 @param const SFbdNumericValue & stInput 输入 @param SFbdNumericValue & stOutput 返回的转换结果 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int conv( const SFbdNumericValue &stInput, SFbdNumericValue &stOutput ) = 0; @@ -31,4 +31,4 @@ public: typedef boost::shared_ptr CDataTypeConvInterfacePtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/data_type_conv/FToI.cpp b/platform/src/application/app_fbd/fbd_module/data_type_conv/FToI.cpp index 003824e0..2f24bede 100644 --- a/platform/src/application/app_fbd/fbd_module/data_type_conv/FToI.cpp +++ b/platform/src/application/app_fbd/fbd_module/data_type_conv/FToI.cpp @@ -6,7 +6,7 @@ #include "FToI.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -21,8 +21,8 @@ int CFToI::conv( const SFbdNumericValue &stInput, SFbdNumericValue &stOutput ) stOutput.m_dValue = static_cast(stInput.m_dValue); stOutput.m_nStatus = stInput.m_nStatus; - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/data_type_conv/FToI.h b/platform/src/application/app_fbd/fbd_module/data_type_conv/FToI.h index 59a56bb5..d0224048 100644 --- a/platform/src/application/app_fbd/fbd_module/data_type_conv/FToI.h +++ b/platform/src/application/app_fbd/fbd_module/data_type_conv/FToI.h @@ -7,7 +7,7 @@ #include "DataTypeConvInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -26,4 +26,4 @@ public: typedef boost::shared_ptr CFToIPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/data_type_conv/IToB.cpp b/platform/src/application/app_fbd/fbd_module/data_type_conv/IToB.cpp index e2c10456..b5fe5cb3 100644 --- a/platform/src/application/app_fbd/fbd_module/data_type_conv/IToB.cpp +++ b/platform/src/application/app_fbd/fbd_module/data_type_conv/IToB.cpp @@ -6,7 +6,7 @@ #include "IToB.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -21,8 +21,8 @@ int CIToB::conv( const SFbdNumericValue &stInput, SFbdNumericValue &stOutput ) stOutput.m_dValue = ( static_cast(stInput.m_dValue) != 0 ); stOutput.m_nStatus = stInput.m_nStatus; - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/data_type_conv/IToB.h b/platform/src/application/app_fbd/fbd_module/data_type_conv/IToB.h index 6c7f143c..34cd1c40 100644 --- a/platform/src/application/app_fbd/fbd_module/data_type_conv/IToB.h +++ b/platform/src/application/app_fbd/fbd_module/data_type_conv/IToB.h @@ -7,7 +7,7 @@ #include "DataTypeConvInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -26,4 +26,4 @@ public: typedef boost::shared_ptr CIToBPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/data_type_conv/IToF.cpp b/platform/src/application/app_fbd/fbd_module/data_type_conv/IToF.cpp index 835e03fb..0d0f43ca 100644 --- a/platform/src/application/app_fbd/fbd_module/data_type_conv/IToF.cpp +++ b/platform/src/application/app_fbd/fbd_module/data_type_conv/IToF.cpp @@ -6,7 +6,7 @@ #include "IToF.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -21,8 +21,8 @@ int CIToF::conv( const SFbdNumericValue &stInput, SFbdNumericValue &stOutput ) stOutput.m_dValue = stInput.m_dValue; stOutput.m_nStatus = stInput.m_nStatus; - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/data_type_conv/IToF.h b/platform/src/application/app_fbd/fbd_module/data_type_conv/IToF.h index aac82aef..5fc6cc07 100644 --- a/platform/src/application/app_fbd/fbd_module/data_type_conv/IToF.h +++ b/platform/src/application/app_fbd/fbd_module/data_type_conv/IToF.h @@ -7,7 +7,7 @@ #include "DataTypeConvInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -26,4 +26,4 @@ public: typedef boost::shared_ptr CIToFPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/do_ctrl/DoCtrl.cpp b/platform/src/application/app_fbd/fbd_module/do_ctrl/DoCtrl.cpp index 1f7a49c2..819279b8 100644 --- a/platform/src/application/app_fbd/fbd_module/do_ctrl/DoCtrl.cpp +++ b/platform/src/application/app_fbd/fbd_module/do_ctrl/DoCtrl.cpp @@ -20,7 +20,7 @@ #include "DoCtrl.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -42,41 +42,41 @@ int CDoCtrl::init( const SFbdModKey &stModuleKey, const std::string & ) if ( m_ptrDiagData == nullptr ) { LOGERROR( "获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } //1.解析配置 - if ( kbdSuccess != initCtrlParam()) + if ( iotSuccess != initCtrlParam()) { LOGERROR( "初始化模块[%s]的控制参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //2.获取输入、输出参数 if ( m_stCmdCfgInfo.strKeyIdTag.empty()) { //< 3个输入，从输入动态获取测点串 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKeyCtrlStr ) || - kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKeyTargetVal ) || - kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 3, m_stInKeyEnable )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKeyCtrlStr ) || + iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKeyTargetVal ) || + iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 3, m_stInKeyEnable )) { LOGERROR( "获取模块[%s]的输入输出参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } } else { //< 2个输入，测点串在配置中 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKeyTargetVal ) || - kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKeyEnable )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKeyTargetVal ) || + iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKeyEnable )) { LOGERROR( "获取模块[%s]的输入输出参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } } LOGINFO( "[%s]加载成功", m_stModKey.toString().c_str()); - return kbdSuccess; + return iotSuccess; } @@ -87,7 +87,7 @@ int CDoCtrl::calculate() if ( nullptr == m_pMbComm ) { LOGERROR( "通讯器指针为空，非预期，检查程序！" ); - return kbdFailed; + return iotFailed; } iot_net::CMbMessage objMsg; @@ -121,20 +121,20 @@ int CDoCtrl::calculate() //< 获取输入 { SFbdNumericValue stInValEnable; - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyEnable, stInValEnable )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyEnable, stInValEnable )) { LOGERROR( "获取模块[%s]的输入 使能 的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //< 判断是否使能，检测到使能，放入命令队列 if ( 0 != static_cast(stInValEnable.m_dValue) && isValidOfStatus( stInValEnable.m_nStatus )) { SFbdNumericValue stInValTargetVal; - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyTargetVal, stInValTargetVal )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyTargetVal, stInValTargetVal )) { LOGERROR( "获取模块[%s]的输入 目标值 的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if ( isValidOfStatus( stInValTargetVal.m_nStatus )) @@ -149,18 +149,18 @@ int CDoCtrl::calculate() { //< 为空，说明从输入获取 SFbdStringValue stInValCtrlStr; - if ( kbdSuccess != m_ptrDiagData->getStringValByKey( m_stInKeyCtrlStr, stInValCtrlStr )) + if ( iotSuccess != m_ptrDiagData->getStringValByKey( m_stInKeyCtrlStr, stInValCtrlStr )) { LOGERROR( "获取模块[%s]的输入 测点 的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != parseKeyIdTag( stInValCtrlStr.m_strValue, *ptrCmd ) + if ( iotSuccess != parseKeyIdTag( stInValCtrlStr.m_strValue, *ptrCmd ) || ptrCmd->strKeyIdTag.empty()) { LOGERROR( "模块[%s]解析输入的控制测点串失败.strCtrlStr=[%s]", m_stModKey.toString().c_str(), stInValCtrlStr.m_strValue.c_str()); - return kbdFailed; + return iotFailed; } } @@ -218,13 +218,13 @@ int CDoCtrl::calculate() } } - return kbdSuccess; + return iotSuccess; } int CDoCtrl::reset( const bool bMaster ) { - int nRet = kbdSuccess; + int nRet = iotSuccess; if ( bMaster ) { if ( nullptr == m_pMbComm ) @@ -264,12 +264,12 @@ int CDoCtrl::initCtrlParam() std::string strRetryTimes; //< 失败重试次数 std::string strInPortCtrlStr; //< 输入控制测点串 - if ( kbdSuccess != m_ptrDiagData->getModProperty( m_stModKey, "ControlTimeout", strCtrlTimeout ) || - kbdSuccess != m_ptrDiagData->getModProperty( m_stModKey, "RedoTimes", strRetryTimes ) || - kbdSuccess != m_ptrDiagData->getModProperty( m_stModKey, "InPortCtrlStr", strInPortCtrlStr )) + if ( iotSuccess != m_ptrDiagData->getModProperty( m_stModKey, "ControlTimeout", strCtrlTimeout ) || + iotSuccess != m_ptrDiagData->getModProperty( m_stModKey, "RedoTimes", strRetryTimes ) || + iotSuccess != m_ptrDiagData->getModProperty( m_stModKey, "InPortCtrlStr", strInPortCtrlStr )) { LOGERROR( "获取模块[%s]属性失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //2.获取超时、失败后处理逻辑等参数 @@ -288,29 +288,29 @@ int CDoCtrl::initCtrlParam() catch ( const std::exception &e ) { LOGERROR( "模块[%s]参数格式非法，Err：\n%s", m_stModKey.toString().c_str(), e.what()); - return kbdFailed; + return iotFailed; } //3.解析控制动作串 if ( 0 == nInPortCtrlStr ) { std::string strCtrlStr; - if ( kbdSuccess != m_ptrDiagData->getModProperty( m_stModKey, "CtrlStr", strCtrlStr )) + if ( iotSuccess != m_ptrDiagData->getModProperty( m_stModKey, "CtrlStr", strCtrlStr )) { LOGERROR( "获取模块[%s]属性 CtrlStr 失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //< m_stCmdCfgInfo.strKeyIdTag 必须不能为空，后续以此判断是否从输入端口获取测点串 - if ( kbdSuccess != parseKeyIdTag( strCtrlStr, m_stCmdCfgInfo ) + if ( iotSuccess != parseKeyIdTag( strCtrlStr, m_stCmdCfgInfo ) || m_stCmdCfgInfo.strKeyIdTag.empty()) { LOGERROR( "模块[%s]解析控制测点串失败.strCtrlStr=[%s]", m_stModKey.toString().c_str(), strCtrlStr.c_str()); - return kbdFailed; + return iotFailed; } } - return kbdSuccess; + return iotSuccess; } @@ -340,7 +340,7 @@ int CDoCtrl::handleCmd( SCmdOfOnePnt &stCmdOfOnePnt ) } } - return kbdSuccess; + return iotSuccess; } @@ -469,38 +469,38 @@ int CDoCtrl::parseKeyIdTag( const std::string &strKeyIdTag, SCtrlCmd &stCtrlCmd if ( strKeyIdTag.empty()) { LOGERROR( "测点信息为空.module_name=[%s]", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } SLongKeyIdTagInfo stKeyInfo; - if ( kbdSuccess != splitLongKeyIdTag( strKeyIdTag, stKeyInfo )) + if ( iotSuccess != splitLongKeyIdTag( strKeyIdTag, stKeyInfo )) { LOGERROR( "解析测点信息失败.KeyIdTag=[%s]", strKeyIdTag.c_str()); - return kbdFailed; + return iotFailed; } CFbdSysInfoApiPtr ptrSysInfo = getFbdSysInfoApi(); if ( ptrSysInfo == nullptr ) { LOGERROR( "获取系统信息库失败" ); - return kbdFailed; + return iotFailed; } iot_public::SSubsystemInfo stSubsysInfo; iot_public::SLocationInfo stLocationInfo; - if ( kbdSuccess != ptrSysInfo->getSysInfo().getSubsystemInfoByName( stKeyInfo.strSubsystemName, stSubsysInfo ) || - kbdSuccess != ptrSysInfo->getSysInfo().getLocationInfoByName( stKeyInfo.strLocationName, stLocationInfo )) + if ( iotSuccess != ptrSysInfo->getSysInfo().getSubsystemInfoByName( stKeyInfo.strSubsystemName, stSubsysInfo ) || + iotSuccess != ptrSysInfo->getSysInfo().getLocationInfoByName( stKeyInfo.strLocationName, stLocationInfo )) { LOGERROR( "获取测点所属域和应用信息失败.位置ID=[%s],专业ID=[%s]", stKeyInfo.strSubsystemName.c_str(), stKeyInfo.strLocationName.c_str()); - return kbdFailed; + return iotFailed; } stCtrlCmd.strKeyIdTag = stKeyInfo.strKeyExcludeLocSub; stCtrlCmd.nDstDomainId = stLocationInfo.nDomainId; stCtrlCmd.nAppId = stSubsysInfo.nAppId; - return kbdSuccess; + return iotSuccess; } @@ -510,4 +510,4 @@ boost::shared_ptr CDoCtrl::create() } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/do_ctrl/DoCtrl.h b/platform/src/application/app_fbd/fbd_module/do_ctrl/DoCtrl.h index b1919671..4135c69d 100644 --- a/platform/src/application/app_fbd/fbd_module/do_ctrl/DoCtrl.h +++ b/platform/src/application/app_fbd/fbd_module/do_ctrl/DoCtrl.h @@ -17,7 +17,7 @@ #include "app_fbd/fbd_common/BaseModule.h" #include "app_fbd/fbd_common/FbdDiagDataApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -95,14 +95,14 @@ private: private: /** @brief 初始化控制相关参数 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initCtrlParam(); /** @brief 处理命令 @param stCmdOfOnePnt 要处理的命令对象 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int handleCmd( SCmdOfOnePnt &stCmdOfOnePnt ); @@ -135,7 +135,7 @@ private: @brief 解析控制字符串 @param const std::string & strKeyIdTag 测点信息 @param SCtrlCmd & stCtrlCmd 解析后的结果 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int parseKeyIdTag( const std::string &strKeyIdTag, SCtrlCmd &stCtrlCmd ); @@ -162,4 +162,4 @@ BOOST_DLL_ALIAS( ) } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/four_arithmetic/Add.cpp b/platform/src/application/app_fbd/fbd_module/four_arithmetic/Add.cpp index 99bc1fe9..86dde6a7 100644 --- a/platform/src/application/app_fbd/fbd_module/four_arithmetic/Add.cpp +++ b/platform/src/application/app_fbd/fbd_module/four_arithmetic/Add.cpp @@ -6,7 +6,7 @@ #include "Add.h" #include "pub_logger_api/logger.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -22,10 +22,10 @@ int CAdd::init( const std::string &strModTagName, const int nInputNum ) if ( nInputNum < 2 ) { LOGERROR( "加法运算输入参数个数必须大于等于2" ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -44,8 +44,8 @@ int CAdd::calc( const std::vector &vecInput, } } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/four_arithmetic/Add.h b/platform/src/application/app_fbd/fbd_module/four_arithmetic/Add.h index 76674b46..7f134622 100644 --- a/platform/src/application/app_fbd/fbd_module/four_arithmetic/Add.h +++ b/platform/src/application/app_fbd/fbd_module/four_arithmetic/Add.h @@ -7,7 +7,7 @@ #include "ArithmeticInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -31,4 +31,4 @@ private: typedef boost::shared_ptr CAddPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/four_arithmetic/ArithmeticInterface.h b/platform/src/application/app_fbd/fbd_module/four_arithmetic/ArithmeticInterface.h index 283c88f8..3c515666 100644 --- a/platform/src/application/app_fbd/fbd_module/four_arithmetic/ArithmeticInterface.h +++ b/platform/src/application/app_fbd/fbd_module/four_arithmetic/ArithmeticInterface.h @@ -7,7 +7,7 @@ #include "app_fbd/fbd_common/FbdDiagDataStruct.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -21,7 +21,7 @@ public: @brief 初始化 @param const std::string & stModTagName 模块名 @param const int nInputNum 输入参数个数 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int init( const std::string &strModTagName, const int nInputNum ) = 0; @@ -29,7 +29,7 @@ public: @brief 计算 @param const std::vector & vecInput 输入参数 @param SFbdNumericValue & stOutput 返回的计算结果 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int calc( const std::vector &vecInput, SFbdNumericValue &stOutput ) = 0; @@ -38,4 +38,4 @@ public: typedef boost::shared_ptr CArithmeticInterfacePtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/four_arithmetic/Div.cpp b/platform/src/application/app_fbd/fbd_module/four_arithmetic/Div.cpp index 9c04ad5b..f44d3e15 100644 --- a/platform/src/application/app_fbd/fbd_module/four_arithmetic/Div.cpp +++ b/platform/src/application/app_fbd/fbd_module/four_arithmetic/Div.cpp @@ -6,7 +6,7 @@ #include "Div.h" #include "pub_logger_api/logger.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -22,10 +22,10 @@ int CDiv::init( const std::string &strModTagName, const int nInputNum ) if ( nInputNum < 2 ) { LOGERROR( "除法运算输入参数个数必须大于等于2" ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -45,7 +45,7 @@ int CDiv::calc( const std::vector &vecInput, { LOGERROR( "非法参数,[%s]除数为0", m_strModTagName.c_str()); stOutput.m_nStatus = CN_FBD_STATUS_Invalid; - return kbdFailed; + return iotFailed; } if ( !isValidOfStatus( vecInput[i].m_nStatus )) @@ -54,8 +54,8 @@ int CDiv::calc( const std::vector &vecInput, } } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/four_arithmetic/Div.h b/platform/src/application/app_fbd/fbd_module/four_arithmetic/Div.h index b10c3f84..dc35da32 100644 --- a/platform/src/application/app_fbd/fbd_module/four_arithmetic/Div.h +++ b/platform/src/application/app_fbd/fbd_module/four_arithmetic/Div.h @@ -7,7 +7,7 @@ #include "ArithmeticInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -30,4 +30,4 @@ private: typedef boost::shared_ptr CDivPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/four_arithmetic/FourArithmetic.cpp b/platform/src/application/app_fbd/fbd_module/four_arithmetic/FourArithmetic.cpp index bd712755..585ce7dc 100644 --- a/platform/src/application/app_fbd/fbd_module/four_arithmetic/FourArithmetic.cpp +++ b/platform/src/application/app_fbd/fbd_module/four_arithmetic/FourArithmetic.cpp @@ -16,7 +16,7 @@ #include "Mul.h" #include "Div.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -47,7 +47,7 @@ int CFourArithmetic::init( const SFbdModKey &stModuleKey, const std::string &str if ( m_ptrDiagData == nullptr ) { LOGERROR( "获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } //1.获取输入、输出参数 @@ -60,17 +60,17 @@ int CFourArithmetic::init( const SFbdModKey &stModuleKey, const std::string &str if ( vecExtraParam.size() != EExtraParamSection ) { LOGERROR( "附加参数[%s]格式不正确", strExtraParam.c_str()); - return kbdFailed; + return iotFailed; } std::string strFuncName = vecExtraParam[0]; //< 运算符名 std::string strPropName = vecExtraParam[1]; //< 输入参数个数属性名 std::string strInputNum = "0"; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, strPropName, strInputNum )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, strPropName, strInputNum )) { LOGERROR( "获取模块[%s]的输入参数数量失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //< 判断输入参数个数合法性 @@ -78,25 +78,25 @@ int CFourArithmetic::init( const SFbdModKey &stModuleKey, const std::string &str if ( nInputNum < CN_MinInputNum ) { LOGERROR( "模块[%s]要求的最小输入参数为%d", stModuleKey.toString().c_str(), CN_MinInputNum ); - return kbdFailed; + return iotFailed; } //< 获取输入参数 m_vecInKey.resize( static_cast(nInputNum)); for ( int i = 0; i < nInputNum; ++i ) { - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, i + 1, m_vecInKey[i] )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, i + 1, m_vecInKey[i] )) { LOGERROR( "获取模块[%s]的输入参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } } //< 获取输出参数 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stOutputKey )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stOutputKey )) { LOGERROR( "获取模块[%s]的输入输出参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //< 创建计算类 @@ -104,11 +104,11 @@ int CFourArithmetic::init( const SFbdModKey &stModuleKey, const std::string &str if ( m_ptrCalc == nullptr ) { LOGERROR( "创建运算模块失败.ModName=[%s],Calc=[%s]", stModuleKey.toString().c_str(), strFuncName.c_str()); - return kbdFailed; + return iotFailed; } LOGINFO( "[%s]加载成功", stModuleKey.toString().c_str()); - return kbdSuccess; + return iotSuccess; } @@ -121,7 +121,7 @@ int CFourArithmetic::calculate() bool bGetInput = true; for ( size_t i = 0; i < m_vecInKey.size(); ++i ) { - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_vecInKey[i], vecInput[i] )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_vecInKey[i], vecInput[i] )) { bGetInput = false; LOGERROR( "获取参数[%s]值失败", m_vecInKey[i].toString().c_str()); @@ -130,7 +130,7 @@ int CFourArithmetic::calculate() if ( bGetInput ) { - if ( kbdSuccess != m_ptrCalc->calc( vecInput, stOutput )) + if ( iotSuccess != m_ptrCalc->calc( vecInput, stOutput )) { LOGERROR( "模块[%s]计算失败", m_stModKey.toString().c_str()); } @@ -183,7 +183,7 @@ CFourArithmetic::createCalcClass( const std::string &strFuncName, const int nInp if ( ptrArithmetic != nullptr ) { - if ( kbdSuccess != ptrArithmetic->init( m_stModKey.toString(), nInputNum )) + if ( iotSuccess != ptrArithmetic->init( m_stModKey.toString(), nInputNum )) { ptrArithmetic.reset(); } @@ -193,4 +193,4 @@ CFourArithmetic::createCalcClass( const std::string &strFuncName, const int nInp } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/four_arithmetic/FourArithmetic.h b/platform/src/application/app_fbd/fbd_module/four_arithmetic/FourArithmetic.h index dacfe7a0..3db35609 100644 --- a/platform/src/application/app_fbd/fbd_module/four_arithmetic/FourArithmetic.h +++ b/platform/src/application/app_fbd/fbd_module/four_arithmetic/FourArithmetic.h @@ -10,7 +10,7 @@ #include "app_fbd/fbd_common/FbdDiagDataApi.h" #include "ArithmeticInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -51,4 +51,4 @@ BOOST_DLL_ALIAS( ) } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/four_arithmetic/Mul.cpp b/platform/src/application/app_fbd/fbd_module/four_arithmetic/Mul.cpp index 88e3620a..a1995b6d 100644 --- a/platform/src/application/app_fbd/fbd_module/four_arithmetic/Mul.cpp +++ b/platform/src/application/app_fbd/fbd_module/four_arithmetic/Mul.cpp @@ -6,7 +6,7 @@ #include "Mul.h" #include "pub_logger_api/logger.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -22,10 +22,10 @@ int CMul::init( const std::string &strModTagName, const int nInputNum ) if ( nInputNum < 2 ) { LOGERROR( "乘法运算输入参数个数必须大于等于2" ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -43,8 +43,8 @@ int CMul::calc( const std::vector &vecInput, } } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/four_arithmetic/Mul.h b/platform/src/application/app_fbd/fbd_module/four_arithmetic/Mul.h index 7bb2d026..5632b4d5 100644 --- a/platform/src/application/app_fbd/fbd_module/four_arithmetic/Mul.h +++ b/platform/src/application/app_fbd/fbd_module/four_arithmetic/Mul.h @@ -7,7 +7,7 @@ #include "ArithmeticInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -30,4 +30,4 @@ private: typedef boost::shared_ptr CMulPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/four_arithmetic/Sub.cpp b/platform/src/application/app_fbd/fbd_module/four_arithmetic/Sub.cpp index 2304d94d..cb23d5bd 100644 --- a/platform/src/application/app_fbd/fbd_module/four_arithmetic/Sub.cpp +++ b/platform/src/application/app_fbd/fbd_module/four_arithmetic/Sub.cpp @@ -6,7 +6,7 @@ #include "Sub.h" #include "pub_logger_api/logger.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -22,10 +22,10 @@ int CSub::init( const std::string &strModTagName, const int nInputNum ) if ( nInputNum < 2 ) { LOGERROR( "减法运算输入参数个数必须大于等于2" ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -43,8 +43,8 @@ int CSub::calc( const std::vector &vecInput, } } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/four_arithmetic/Sub.h b/platform/src/application/app_fbd/fbd_module/four_arithmetic/Sub.h index db8ce9a9..5ab2e71a 100644 --- a/platform/src/application/app_fbd/fbd_module/four_arithmetic/Sub.h +++ b/platform/src/application/app_fbd/fbd_module/four_arithmetic/Sub.h @@ -7,7 +7,7 @@ #include "ArithmeticInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -30,4 +30,4 @@ private: typedef boost::shared_ptr CSubPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/logic_opt/And.cpp b/platform/src/application/app_fbd/fbd_module/logic_opt/And.cpp index 7b57bc48..2af8f790 100644 --- a/platform/src/application/app_fbd/fbd_module/logic_opt/And.cpp +++ b/platform/src/application/app_fbd/fbd_module/logic_opt/And.cpp @@ -7,7 +7,7 @@ #include "pub_logger_api/logger.h" #include "pub_utility_api/CharUtil.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -26,10 +26,10 @@ int CAnd::init( const CFbdDiagDataApiPtr &ptrDiagData, { std::string strInputNum = "0"; - if ( kbdSuccess != ptrDiagData->getModProperty( stModKey, strPropName, strInputNum )) + if ( iotSuccess != ptrDiagData->getModProperty( stModKey, strPropName, strInputNum )) { LOGERROR( "获取模块[%s]的输入参数数量失败", stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //< 判断输入参数个数合法性 @@ -37,10 +37,10 @@ int CAnd::init( const CFbdDiagDataApiPtr &ptrDiagData, if ( m_nInputNum < 2 ) { LOGERROR( "与运算输入参数个数必须大于等于2" ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -68,8 +68,8 @@ int CAnd::calc( const std::vector &vecInput, stOutput.m_dValue = nValue; - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/logic_opt/And.h b/platform/src/application/app_fbd/fbd_module/logic_opt/And.h index b4f7a4e9..c9d8c3ff 100644 --- a/platform/src/application/app_fbd/fbd_module/logic_opt/And.h +++ b/platform/src/application/app_fbd/fbd_module/logic_opt/And.h @@ -7,7 +7,7 @@ #include "LogicInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -34,4 +34,4 @@ private: typedef boost::shared_ptr CAndPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/logic_opt/LogicInterface.h b/platform/src/application/app_fbd/fbd_module/logic_opt/LogicInterface.h index 7742281a..06d9422f 100644 --- a/platform/src/application/app_fbd/fbd_module/logic_opt/LogicInterface.h +++ b/platform/src/application/app_fbd/fbd_module/logic_opt/LogicInterface.h @@ -8,7 +8,7 @@ #include "app_fbd/fbd_common/FbdDiagDataStruct.h" #include "app_fbd/fbd_common/FbdDiagDataApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -24,7 +24,7 @@ public: @param const CFbdDiagDataApiPtr & ptrDiagData Diagram数据接口 @param const SFbdModKey &stModKey 模块唯一标识 @param const std::string & strPropName 属性名 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 @retval */ virtual int init( const CFbdDiagDataApiPtr &ptrDiagData, @@ -38,7 +38,7 @@ public: @brief 计算 @param const std::vector & vecInput 输入参数 @param SFbdNumericValue & stOutput 返回的计算结果 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int calc( const std::vector &vecInput, SFbdNumericValue &stOutput ) = 0; @@ -47,4 +47,4 @@ public: typedef boost::shared_ptr CLogicInterfacePtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/logic_opt/LogicOpt.cpp b/platform/src/application/app_fbd/fbd_module/logic_opt/LogicOpt.cpp index 59e30af8..6e66edbf 100644 --- a/platform/src/application/app_fbd/fbd_module/logic_opt/LogicOpt.cpp +++ b/platform/src/application/app_fbd/fbd_module/logic_opt/LogicOpt.cpp @@ -14,7 +14,7 @@ #include "Or.h" #include "Not.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -43,7 +43,7 @@ int CLogicOpt::init( const SFbdModKey &stModuleKey, const std::string &strExtraP if ( m_ptrDiagData == nullptr ) { LOGERROR( "获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } //< 创建逻辑操作类 @@ -51,7 +51,7 @@ int CLogicOpt::init( const SFbdModKey &stModuleKey, const std::string &strExtraP if ( m_ptrLogic == nullptr ) { LOGERROR( "创建运算模块失败.ModName=[%s],Calc=[%s]", stModuleKey.toString().c_str(), strExtraParam.c_str()); - return kbdFailed; + return iotFailed; } //< 判断输入参数个数合法性 @@ -61,22 +61,22 @@ int CLogicOpt::init( const SFbdModKey &stModuleKey, const std::string &strExtraP m_vecInKey.resize( static_cast(nInputNum)); for ( int i = 0; i < nInputNum; ++i ) { - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, i + 1, m_vecInKey[i] )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, i + 1, m_vecInKey[i] )) { LOGERROR( "获取模块[%s]的输入参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } } //< 获取输出参数 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stOutputKey )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stOutputKey )) { LOGERROR( "获取模块[%s]的输入输出参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } LOGINFO( "[%s]加载成功", stModuleKey.toString().c_str()); - return kbdSuccess; + return iotSuccess; } @@ -90,7 +90,7 @@ int CLogicOpt::calculate() bool bGetInput = true; for ( size_t i = 0; i < m_vecInKey.size(); ++i ) { - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_vecInKey[i], vecInput[i] )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_vecInKey[i], vecInput[i] )) { bGetInput = false; LOGERROR( "获取参数[%s]值失败", m_vecInKey[i].toString().c_str()); @@ -99,7 +99,7 @@ int CLogicOpt::calculate() if ( bGetInput ) { - if ( kbdSuccess != m_ptrLogic->calc( vecInput, stOutput )) + if ( iotSuccess != m_ptrLogic->calc( vecInput, stOutput )) { LOGERROR( "模块[%s]计算失败", m_stModKey.toString().c_str()); } @@ -163,7 +163,7 @@ CLogicOpt::createLogicClass( const std::string &strExtraParam ) if ( ptrLogic != nullptr ) { - if ( kbdSuccess != ptrLogic->init( m_ptrDiagData, m_stModKey, strPropName )) + if ( iotSuccess != ptrLogic->init( m_ptrDiagData, m_stModKey, strPropName )) { ptrLogic.reset(); } @@ -173,4 +173,4 @@ CLogicOpt::createLogicClass( const std::string &strExtraParam ) } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/logic_opt/LogicOpt.h b/platform/src/application/app_fbd/fbd_module/logic_opt/LogicOpt.h index aabe5b01..82b5806b 100644 --- a/platform/src/application/app_fbd/fbd_module/logic_opt/LogicOpt.h +++ b/platform/src/application/app_fbd/fbd_module/logic_opt/LogicOpt.h @@ -10,7 +10,7 @@ #include "app_fbd/fbd_common/FbdDiagDataApi.h" #include "LogicInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -50,4 +50,4 @@ BOOST_DLL_ALIAS( ) } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/logic_opt/Not.cpp b/platform/src/application/app_fbd/fbd_module/logic_opt/Not.cpp index 603dc4f2..bafdde2f 100644 --- a/platform/src/application/app_fbd/fbd_module/logic_opt/Not.cpp +++ b/platform/src/application/app_fbd/fbd_module/logic_opt/Not.cpp @@ -7,7 +7,7 @@ #include "pub_logger_api/logger.h" #include "pub_utility_api/CharUtil.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -25,7 +25,7 @@ int CNot::init( const CFbdDiagDataApiPtr &ptrDiagData, ( void ) stModKey; ( void ) strPropName; - return kbdSuccess; + return iotSuccess; } @@ -35,7 +35,7 @@ int CNot::calc( const std::vector &vecInput, stOutput.m_dValue = !( static_cast(vecInput[0].m_dValue)); stOutput.m_nStatus = vecInput[0].m_nStatus; - return kbdSuccess; + return iotSuccess; } @@ -45,4 +45,4 @@ int CNot::getInputNum() } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/logic_opt/Not.h b/platform/src/application/app_fbd/fbd_module/logic_opt/Not.h index f2fe366a..67744104 100644 --- a/platform/src/application/app_fbd/fbd_module/logic_opt/Not.h +++ b/platform/src/application/app_fbd/fbd_module/logic_opt/Not.h @@ -7,7 +7,7 @@ #include "LogicInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -31,4 +31,4 @@ public: typedef boost::shared_ptr CNotPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/logic_opt/Or.cpp b/platform/src/application/app_fbd/fbd_module/logic_opt/Or.cpp index abbc3a1f..1540a4e6 100644 --- a/platform/src/application/app_fbd/fbd_module/logic_opt/Or.cpp +++ b/platform/src/application/app_fbd/fbd_module/logic_opt/Or.cpp @@ -7,7 +7,7 @@ #include "pub_logger_api/logger.h" #include "pub_utility_api/CharUtil.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -23,10 +23,10 @@ int COr::init( const CFbdDiagDataApiPtr &ptrDiagData, { std::string strInputNum = "0"; - if ( kbdSuccess != ptrDiagData->getModProperty( stModKey, strPropName, strInputNum )) + if ( iotSuccess != ptrDiagData->getModProperty( stModKey, strPropName, strInputNum )) { LOGERROR( "获取模块[%s]的输入参数数量失败", stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //< 判断输入参数个数合法性 @@ -34,10 +34,10 @@ int COr::init( const CFbdDiagDataApiPtr &ptrDiagData, if ( m_nInputNum < 2 ) { LOGERROR( "与运算输入参数个数必须大于等于2" ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -59,7 +59,7 @@ int COr::calc( const std::vector &vecInput, stOutput.m_dValue = nValue; - return kbdSuccess; + return iotSuccess; } @@ -69,4 +69,4 @@ int COr::getInputNum() } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/logic_opt/Or.h b/platform/src/application/app_fbd/fbd_module/logic_opt/Or.h index d974b0c8..0c92f75b 100644 --- a/platform/src/application/app_fbd/fbd_module/logic_opt/Or.h +++ b/platform/src/application/app_fbd/fbd_module/logic_opt/Or.h @@ -7,7 +7,7 @@ #include "LogicInterface.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -34,4 +34,4 @@ private: typedef boost::shared_ptr COrPtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/lua/CLua.cpp b/platform/src/application/app_fbd/fbd_module/lua/CLua.cpp index f3a41435..210a6fd4 100644 --- a/platform/src/application/app_fbd/fbd_module/lua/CLua.cpp +++ b/platform/src/application/app_fbd/fbd_module/lua/CLua.cpp @@ -15,7 +15,7 @@ #include "CLua.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -239,15 +239,15 @@ int CLua::init( const SFbdModKey &stModuleKey, const std::string & ) if ( m_ptrDiagData == nullptr ) { LOGERROR( "获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } // 获取输入端口个数 std::string sInputNum = "-1"; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_InputNum, sInputNum )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_InputNum, sInputNum )) { LOGERROR( "获取模块[%s]的输入端口个数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } // 检查输入端口个数合法性 @@ -256,26 +256,26 @@ int CLua::init( const SFbdModKey &stModuleKey, const std::string & ) if ( m_nInputNum < CN_MinIONum || m_nInputNum > CN_MaxIONum ) //< 判断是否有效 { LOGERROR( "模块[%s]要求的输入端口个数最小=%d,最大=%d", stModuleKey.toString().c_str(), CN_MinIONum, CN_MaxIONum ); - return kbdFailed; + return iotFailed; } // 获取输入端口的信息 m_vecInputKey.resize( static_cast(m_nInputNum)); for ( int i = 0; i < m_nInputNum; ++i ) //< 获取输出参数主键 { - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, i + 1, m_vecInputKey[i] )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, i + 1, m_vecInputKey[i] )) { LOGERROR( "获取模块[%s]的输入参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } } // 获取输出端口个数 std::string sOutputNum = "-1"; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_OutputNum, sOutputNum )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_OutputNum, sOutputNum )) { LOGERROR( "获取模块[%s]的输出端口个数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } // 检查输出端口个数合法性 @@ -284,26 +284,26 @@ int CLua::init( const SFbdModKey &stModuleKey, const std::string & ) if ( m_nOutputNum < CN_MinIONum || m_nOutputNum > CN_MaxIONum ) //< 判断是否有效 { LOGERROR( "模块[%s]要求的输出端口个数最小=%d,最大=%d", stModuleKey.toString().c_str(), CN_MinIONum, CN_MaxIONum ); - return kbdFailed; + return iotFailed; } // 获取输出端口的key m_vecOutputKey.resize( static_cast(m_nOutputNum)); for ( int i = 0; i < m_nOutputNum; ++i ) //< 获取输出参数主键 { - if ( kbdSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, i + 1, m_vecOutputKey[i] )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, i + 1, m_vecOutputKey[i] )) { LOGERROR( "获取模块[%s]的输入参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } } // 获取lua内容 std::string sLuaContent; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_LuaContent, sLuaContent )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_LuaContent, sLuaContent )) { LOGERROR( "获取模块[%s]的LUA脚本内容失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } m_sLuaContent = sLuaContent; @@ -327,14 +327,14 @@ int CLua::init( const SFbdModKey &stModuleKey, const std::string & ) LOGINFO( "初始化模块[%s]成功", stModuleKey.toString().c_str()); m_bInitSucceed = true; - return kbdSuccess; + return iotSuccess; } int CLua::calculate() { if ( !m_bInitSucceed ) - return kbdFailed; + return iotFailed; boost::mutex::scoped_lock lock( g_oMutex ); @@ -348,7 +348,7 @@ int CLua::calculate() for ( int i = 0; i < m_nInputNum; i++ ) { SFbdNumericValue stInput; - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_vecInputKey[i], stInput )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_vecInputKey[i], stInput )) { LOGERROR( "获取模块[%s]的输入参数失败", m_stModKey.toString().c_str()); SFbdNumericValue stInvalid( 0, CN_FBD_STATUS_Invalid ); @@ -364,7 +364,7 @@ int CLua::calculate() if ( 0 != luaL_loadstring( m_pLua, m_sLuaContent.c_str())) { LOGERROR( "加载模块[%s]的LUA脚本失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } } else @@ -373,7 +373,7 @@ int CLua::calculate() if ( 0 == lua_getglobal( m_pLua, "main" )) { LOGERROR( "从模块[%s]的LUA脚本中获取main函数失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } } @@ -381,21 +381,21 @@ int CLua::calculate() if ( lua_pcall( m_pLua, 0, 0, 0 ) != 0 ) { LOGERROR( "运行模块[%s]的LUA脚本失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } // 读取lua脚本输出结果 for ( size_t i = 0; i < g_listOutput.size(); i++ ) { - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_vecOutputKey[i], g_listOutput[i] )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_vecOutputKey[i], g_listOutput[i] )) { LOGERROR( "设置模块[%s]的[%s]输出值失败", m_stModKey.toString().c_str(), m_vecOutputKey[i].toString().c_str()); - return kbdFailed; + return iotFailed; } } - return kbdSuccess; + return iotSuccess; } @@ -414,13 +414,13 @@ int CLua::clean() int CLua::setAllOutput( const SFbdNumericValue &stValue ) { - int nRet = kbdSuccess; + int nRet = iotSuccess; for ( size_t i = 0; i < m_vecOutputKey.size(); ++i ) { - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_vecOutputKey[i], stValue )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_vecOutputKey[i], stValue )) { LOGERROR( "设置[%s]输出值失败", m_vecOutputKey[i].toString().c_str()); - nRet = kbdFailed; + nRet = iotFailed; } } @@ -434,4 +434,4 @@ boost::shared_ptr CLua::create() } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/lua/CLua.h b/platform/src/application/app_fbd/fbd_module/lua/CLua.h index 1f8abc09..f57d71a4 100644 --- a/platform/src/application/app_fbd/fbd_module/lua/CLua.h +++ b/platform/src/application/app_fbd/fbd_module/lua/CLua.h @@ -11,7 +11,7 @@ #include "app_fbd/fbd_common/FbdDiagDataApi.h" #include "lua/lua.hpp" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -38,7 +38,7 @@ private: /** @brief 设置所有输出值 @param const SFbdNumericValue & stValue 要设置的值和状态 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int setAllOutput( const SFbdNumericValue &stValue ); @@ -67,4 +67,4 @@ BOOST_DLL_ALIAS( ) } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/mux/Mux.cpp b/platform/src/application/app_fbd/fbd_module/mux/Mux.cpp index ff8b3f06..40e0926e 100644 --- a/platform/src/application/app_fbd/fbd_module/mux/Mux.cpp +++ b/platform/src/application/app_fbd/fbd_module/mux/Mux.cpp @@ -12,7 +12,7 @@ #include "Mux.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -39,15 +39,15 @@ int CMux::init( const SFbdModKey &stModuleKey, const std::string & ) if ( m_ptrDiagData == nullptr ) { LOGERROR( "获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } //1.获取输入、输出参数 std::string strInputNum = "0"; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_InputNum, strInputNum )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_InputNum, strInputNum )) { LOGERROR( "获取模块[%s]的输入参数数量失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //< 判断输入参数个数合法性 @@ -55,7 +55,7 @@ int CMux::init( const SFbdModKey &stModuleKey, const std::string & ) if ( m_nInputNum < CN_MinInputNum ) { LOGERROR( "模块[%s]要求的最小输入参数为%d", stModuleKey.toString().c_str(), CN_MinInputNum ); - return kbdFailed; + return iotFailed; } //< 获取输入参数 @@ -63,22 +63,22 @@ int CMux::init( const SFbdModKey &stModuleKey, const std::string & ) for ( int i = 0; i < m_nInputNum; ++i ) { //< 第一个参数是：选择第几路，后面的参数才是输入值，所以要+2 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, i + 2, m_vecInKey[i] )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, i + 2, m_vecInKey[i] )) { LOGERROR( "获取模块[%s]的输入参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } } - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stSwitchInKey ) || - kbdSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stOutputKey )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stSwitchInKey ) || + iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stOutputKey )) { LOGERROR( "获取模块[%s]的输入输出参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } LOGINFO( "[%s]加载成功", m_stModKey.toString().c_str()); - return kbdSuccess; + return iotSuccess; } @@ -87,7 +87,7 @@ int CMux::calculate() SFbdNumericValue stSwitchInKey( 0, CN_FBD_STATUS_Invalid ); SFbdNumericValue stOutput( 0, CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stSwitchInKey, stSwitchInKey )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stSwitchInKey, stSwitchInKey )) { LOGERROR( "获取模块[%s]的输入参数失败", m_stModKey.toString().c_str()); return m_ptrDiagData->setNumericValByKey( m_stOutputKey, stOutput ); @@ -102,7 +102,7 @@ int CMux::calculate() if ( stSwitchInKey.m_nStatus == CN_FBD_STATUS_Valid ) { - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_vecInKey[nIndex - 1], + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_vecInKey[nIndex - 1], stOutput )) { LOGERROR( "获取第[%d]路输入值失败", nIndex ); @@ -133,4 +133,4 @@ boost::shared_ptr CMux::create() } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/mux/Mux.h b/platform/src/application/app_fbd/fbd_module/mux/Mux.h index 280b147e..44fce23a 100644 --- a/platform/src/application/app_fbd/fbd_module/mux/Mux.h +++ b/platform/src/application/app_fbd/fbd_module/mux/Mux.h @@ -9,7 +9,7 @@ #include "app_fbd/fbd_common/BaseModule.h" #include "app_fbd/fbd_common/FbdDiagDataApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -49,4 +49,4 @@ BOOST_DLL_ALIAS( ) } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/pnt_input/PntInput.cpp b/platform/src/application/app_fbd/fbd_module/pnt_input/PntInput.cpp index 9f6346e3..f78020d3 100644 --- a/platform/src/application/app_fbd/fbd_module/pnt_input/PntInput.cpp +++ b/platform/src/application/app_fbd/fbd_module/pnt_input/PntInput.cpp @@ -13,7 +13,7 @@ #include "PntInput.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -38,29 +38,29 @@ int CPntInput::init( const SFbdModKey &stModuleKey, const std::string & ) if ( m_ptrDiagData == nullptr ) { LOGERROR( "获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } //1.获取输入、输出参数 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stOutputKey )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stOutputKey )) { LOGERROR( "获取模块[%s]的输入输出参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //< 获取参数 { std::string strInputKeyId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, "InputKeyId", strInputKeyId )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, "InputKeyId", strInputKeyId )) { LOGERROR( "获取模块[%s]属性失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != splitLongKeyIdTag( strInputKeyId, m_stPntInfo )) + if ( iotSuccess != splitLongKeyIdTag( strInputKeyId, m_stPntInfo )) { LOGERROR( "解析测点信息失败.KeyIdTag=[%s]", strInputKeyId.c_str()); - return kbdFailed; + return iotFailed; } //< 本模块暂时仅支持测点表 @@ -68,7 +68,7 @@ int CPntInput::init( const SFbdModKey &stModuleKey, const std::string & ) m_stPntInfo.strTableName != RT_ACC_TBL && m_stPntInfo.strTableName != RT_MIX_TBL ) { LOGERROR( "仅支持关联测点，当前关联表[%s]", m_stPntInfo.strTableName.c_str()); - return kbdFailed; + return iotFailed; } //< 获取测点类型，用于判断状态字 @@ -87,11 +87,11 @@ int CPntInput::init( const SFbdModKey &stModuleKey, const std::string & ) if ( m_ptrPointSub == nullptr ) { LOGERROR( "获取数据订阅单例失败" ); - return kbdFailed; + return iotFailed; } LOGINFO( "[%s]加载成功", m_stModKey.toString().c_str()); - return kbdSuccess; + return iotSuccess; } @@ -101,7 +101,7 @@ int CPntInput::calculate() double dInValue = 0.0; int nInStatus = 0; - if ( kbdSuccess == m_ptrPointSub->getPntValAndSta( m_stPntInfo.strKeyExcludeLocSub, dInValue, nInStatus )) + if ( iotSuccess == m_ptrPointSub->getPntValAndSta( m_stPntInfo.strKeyExcludeLocSub, dInValue, nInStatus )) { stOutput.m_dValue = dInValue; if ( m_ptrPointSub->isValidOfPntSta( m_nPntType, nInStatus )) @@ -150,4 +150,4 @@ boost::shared_ptr CPntInput::create() } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/pnt_input/PntInput.h b/platform/src/application/app_fbd/fbd_module/pnt_input/PntInput.h index b12dbd87..fa03091f 100644 --- a/platform/src/application/app_fbd/fbd_module/pnt_input/PntInput.h +++ b/platform/src/application/app_fbd/fbd_module/pnt_input/PntInput.h @@ -10,7 +10,7 @@ #include "app_fbd/fbd_common/FbdDiagDataApi.h" #include "app_fbd/fbd_common/FbdPointSubApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -53,4 +53,4 @@ BOOST_DLL_ALIAS( ) } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/pnt_output/PntOutput.cpp b/platform/src/application/app_fbd/fbd_module/pnt_output/PntOutput.cpp index 44d38bed..7131a924 100644 --- a/platform/src/application/app_fbd/fbd_module/pnt_output/PntOutput.cpp +++ b/platform/src/application/app_fbd/fbd_module/pnt_output/PntOutput.cpp @@ -21,7 +21,7 @@ #include "PntOutput.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -58,40 +58,40 @@ int CPntOutput::init( const SFbdModKey &stModuleKey, const std::string &strExtra if ( m_ptrDiagData == nullptr ) { LOGERROR( "获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } //1.获取输入、输出参数 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 )) { LOGERROR( "获取模块[%s]的输入输出参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //< 获取参数 { std::string strOutputKeyId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, "OutputKeyId", strOutputKeyId )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, "OutputKeyId", strOutputKeyId )) { LOGERROR( "获取模块[%s]属性失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != splitLongKeyIdTag( strOutputKeyId, m_stPntInfo )) + if ( iotSuccess != splitLongKeyIdTag( strOutputKeyId, m_stPntInfo )) { LOGERROR( "解析测点信息失败.KeyIdTag=[%s]", strOutputKeyId.c_str()); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != parsePntInfo( m_stPntInfo )) + if ( iotSuccess != parsePntInfo( m_stPntInfo )) { LOGERROR( "解析模块[%s]关联的测点[%s]信息失败", stModuleKey.toString().c_str(), m_stPntInfo.strOriginalKey.c_str()); - return kbdFailed; + return iotFailed; } } LOGINFO( "[%s]加载成功", m_stModKey.toString().c_str()); - return kbdSuccess; + return iotSuccess; } @@ -99,7 +99,7 @@ int CPntOutput::calculate() { SFbdNumericValue stInput( 0, CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey1, stInput )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey1, stInput )) { //< 出错不能直接返回，也要向DP发送消息 LOGERROR( "获取模块[%s]输入参数[%s]值失败", m_stModKey.toString().c_str(), @@ -115,14 +115,14 @@ int CPntOutput::calculate() m_stLastValAndSta = stInput; } - return kbdSuccess; + return iotSuccess; } int CPntOutput::reset( const bool /*bMaster*/ ) { m_lLastSendTimeMsec = 0; - return kbdSuccess; + return iotSuccess; } @@ -161,14 +161,14 @@ int CPntOutput::parsePntInfo( const SLongKeyIdTagInfo &stPntInfo ) { LOGERROR( "不支持的测点类型.ModuleName=[%s],TableName=[%s]", m_stModKey.toString().c_str(), stPntInfo.strTableName.c_str()); - return kbdFailed; + return iotFailed; } //< 获取测点的状态字定义 - if ( kbdSuccess != getPntStatusMenu( m_nPntType )) + if ( iotSuccess != getPntStatusMenu( m_nPntType )) { LOGERROR( "获取测点[%s]的状态字定义失败", m_stPntInfo.strOriginalKey.c_str()); - return kbdFailed; + return iotFailed; } //< 获取测点所属域、专业信息 @@ -176,22 +176,22 @@ int CPntOutput::parsePntInfo( const SLongKeyIdTagInfo &stPntInfo ) if ( ptrSysInfo == nullptr ) { LOGERROR( "获取系统信息访问库单例失败" ); - return kbdFailed; + return iotFailed; } iot_public::SSubsystemInfo stSubsystemInfo; iot_public::SLocationInfo stLocationInfo; - if ( kbdSuccess != ptrSysInfo->getSysInfo().getSubsystemInfoByName( stPntInfo.strSubsystemName, stSubsystemInfo ) || - kbdSuccess != ptrSysInfo->getSysInfo().getLocationInfoByName( stPntInfo.strLocationName, stLocationInfo )) + if ( iotSuccess != ptrSysInfo->getSysInfo().getSubsystemInfoByName( stPntInfo.strSubsystemName, stSubsystemInfo ) || + iotSuccess != ptrSysInfo->getSysInfo().getLocationInfoByName( stPntInfo.strLocationName, stLocationInfo )) { LOGERROR( "获取测点所属域、应用失败.测点=[%s]", stPntInfo.strOriginalKey.c_str()); - return kbdFailed; + return iotFailed; } m_nAppIdOfPnt = stSubsystemInfo.nAppId; m_nDomainIdOfPnt = stLocationInfo.nDomainId; - return kbdSuccess; + return iotSuccess; } @@ -203,7 +203,7 @@ int CPntOutput::sendToDP( const SFbdNumericValue &stValAndSta ) if ( pHead == nullptr || pData == nullptr ) { LOGERROR( "构建发送给数据处理的消息失败.模块=[%s]", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } pHead->set_str_src_tag( m_stModKey.toString()); @@ -240,7 +240,7 @@ int CPntOutput::sendToDP( const SFbdNumericValue &stValAndSta ) if ( !objMsg.SerializeToString( &strMsg )) { LOGERROR( "模块[%s]序列化消息失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } return sendMsg( strMsg ); @@ -257,10 +257,10 @@ int CPntOutput::sendMsg( const std::string &strMsg ) { LOGERROR( "模块[%s]发送消息到域[%d]-应用[%d]失败", m_stModKey.toString().c_str(), m_nDomainIdOfPnt, m_nAppIdOfPnt ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -270,13 +270,13 @@ int CPntOutput::getPntStatusMenu( const int nPntType ) if ( ptrDP == nullptr ) { LOGERROR( "getDataProcInstance失败" ); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != ptrDP->initialize()) + if ( iotSuccess != ptrDP->initialize()) { LOGERROR( "DataProcessApi初始化失败" ); - return kbdFailed; + return iotFailed; } std::string strMenuName; @@ -293,16 +293,16 @@ int CPntOutput::getPntStatusMenu( const int nPntType ) } int nBitIndex = 0; - if ( kbdSuccess != ptrDP->getMenuMacToValue( strMenuName.c_str(), strMacroName.c_str(), nBitIndex )) + if ( iotSuccess != ptrDP->getMenuMacToValue( strMenuName.c_str(), strMacroName.c_str(), nBitIndex )) { LOGERROR( "获取[%s]-[%s]状态字失败", strMenuName.c_str(), strMacroName.c_str()); - return kbdFailed; + return iotFailed; } m_nInValidPntStatus = ( static_cast(1) << static_cast(nBitIndex)); - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_fbd/fbd_module/pnt_output/PntOutput.h b/platform/src/application/app_fbd/fbd_module/pnt_output/PntOutput.h index 82556fdb..f91b822e 100644 --- a/platform/src/application/app_fbd/fbd_module/pnt_output/PntOutput.h +++ b/platform/src/application/app_fbd/fbd_module/pnt_output/PntOutput.h @@ -13,7 +13,7 @@ #include "app_fbd/fbd_common/FbdDiagDataApi.h" #include "app_fbd/fbd_common/FbdPointSubApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -40,28 +40,28 @@ private: /** @brief 解析测点信息，解析结果存入成员变量中 @param const SLongKeyIdTagInfo & stPntInfo 要解析的测点 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int parsePntInfo( const SLongKeyIdTagInfo &stPntInfo ); /** @brief 发送命令给DP @param const SFbdNumericValue & stValAndSta 要设置的值和状态 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int sendToDP( const SFbdNumericValue &stValAndSta ); /** @brief 通过消息总线发送消息 @param const std::string & strMsg 要发送的消息 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int sendMsg( const std::string &strMsg ); /** @brief 获取测点的状态字 @param const int nPntType 测点类型 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int getPntStatusMenu( const int nPntType ); @@ -91,4 +91,4 @@ BOOST_DLL_ALIAS( ) } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/application/app_push/app_push_server/MbMsgMng.cpp b/platform/src/application/app_push/app_push_server/MbMsgMng.cpp index 321cad1a..3d3605ce 100644 --- a/platform/src/application/app_push/app_push_server/MbMsgMng.cpp +++ b/platform/src/application/app_push/app_push_server/MbMsgMng.cpp @@ -2,7 +2,7 @@ #include #include "pub_logger_api/logger.h" -namespace kbd_app { +namespace iot_app { CMbMsgMng::CMbMsgMng() = default; CMbMsgMng::~CMbMsgMng() = default; @@ -64,6 +64,6 @@ bool CMbMsgMng::hasMsg() return m_vecMbMessage.size() >= 1; } -} // namespace kbd_app end +} // namespace iot_app end diff --git a/platform/src/application/app_push/app_push_server/MbMsgMng.h b/platform/src/application/app_push/app_push_server/MbMsgMng.h index eedd2d22..1831f716 100644 --- a/platform/src/application/app_push/app_push_server/MbMsgMng.h +++ b/platform/src/application/app_push/app_push_server/MbMsgMng.h @@ -8,7 +8,7 @@ #include "boost/thread/mutex.hpp" -namespace kbd_app { +namespace iot_app { typedef boost::shared_ptr CMbMessagePtr; @@ -41,6 +41,6 @@ typedef boost::shared_ptr CMbMsgMngPtr; CMbMsgMngPtr getCMbMsgMngSingleTon(); /* @brief 销毁单例，注意：由于使用了智能指针，一定要保证外部的引用全部释放掉，这样才能保证真正释放 */ void releaseCMbMsgMngSingleTon(); -} //namespace kbd_app +} //namespace iot_app #endif // MSGMNG_H diff --git a/platform/src/application/app_push/app_push_server/PushConfigParse.cpp b/platform/src/application/app_push/app_push_server/PushConfigParse.cpp index 2e0e070d..f5ce5c39 100644 --- a/platform/src/application/app_push/app_push_server/PushConfigParse.cpp +++ b/platform/src/application/app_push/app_push_server/PushConfigParse.cpp @@ -4,7 +4,7 @@ #include "pub_logger_api/logger.h" #include "pub_utility_api/FileUtil.h" -namespace kbd_app +namespace iot_app { CPushConfigParse::CPushConfigParse() = default; @@ -18,7 +18,7 @@ int CPushConfigParse::initialize() if ( objFullPath.empty()) { LOGERROR( "获取配置文件路径失败" ); - return kbdFailed; + return iotFailed; } //2.解析配置文件 @@ -55,10 +55,10 @@ int CPushConfigParse::initialize() catch ( std::exception &ex ) { LOGERROR( "解析配置文件[%s]失败.Msg=[%s]", objFullPath.string().c_str(), ex.what()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 根据模块类型ID获取模块配置信息 */ @@ -68,11 +68,11 @@ int CPushConfigParse::getModuleCfgInfo( const int nType, SPushModuleCfg &stModCf if ( pIter == m_mapModInfo.end()) { LOGERROR( "获取模块配置信息失败,module_type=[%d]", nType ); - return kbdFailed; + return iotFailed; } stModCfg = pIter->second; - return kbdSuccess; + return iotSuccess; } std::vector CPushConfigParse::getAllType() const diff --git a/platform/src/application/app_push/app_push_server/PushConfigParse.h b/platform/src/application/app_push/app_push_server/PushConfigParse.h index fa363ec3..a4212def 100644 --- a/platform/src/application/app_push/app_push_server/PushConfigParse.h +++ b/platform/src/application/app_push/app_push_server/PushConfigParse.h @@ -8,7 +8,7 @@ #include "boost/typeof/typeof.hpp" #include "boost/filesystem.hpp" -namespace kbd_app +namespace iot_app { /* @brief fbd_server.xml配置文件中每个模块的配置信息 */ @@ -31,7 +31,7 @@ public: /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); @@ -39,7 +39,7 @@ public: @brief 根据模块类型ID获取模块配置信息 @param const int nType 模块类型ID @param SFbdModuleCfg & stModCfg 模块配置信息 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int getModuleCfgInfo( const int nType, SPushModuleCfg &stModCfg ); @@ -56,5 +56,5 @@ private: }; typedef boost::shared_ptr CPushConfigParsePtr; -} //namespace kbd_app +} //namespace iot_app #endif // PUSHCONFIGPARSE_H diff --git a/platform/src/application/app_push/app_push_server/PushServerApp.cpp b/platform/src/application/app_push/app_push_server/PushServerApp.cpp index 1904728d..56028ee2 100644 --- a/platform/src/application/app_push/app_push_server/PushServerApp.cpp +++ b/platform/src/application/app_push/app_push_server/PushServerApp.cpp @@ -9,7 +9,7 @@ using namespace std; using namespace iot_public; using namespace iot_sys; -using namespace kbd_app; +using namespace iot_app; using namespace iot_net; #include @@ -18,7 +18,7 @@ using namespace iot_net; #define OPT_DESC_HELP "help" -kbd_app::CPushServerApp::CPushServerApp() +iot_app::CPushServerApp::CPushServerApp() : m_ptrSysInfo( nullptr ), m_ptrProcMng( nullptr ), @@ -28,13 +28,13 @@ kbd_app::CPushServerApp::CPushServerApp() {} -kbd_app::CPushServerApp::~CPushServerApp() +iot_app::CPushServerApp::~CPushServerApp() { CPushServerApp::stop(); } -int kbd_app::CPushServerApp::toQuit() +int iot_app::CPushServerApp::toQuit() { if ( m_ptrProcMng != nullptr ) { @@ -42,11 +42,11 @@ int kbd_app::CPushServerApp::toQuit() } shutdown(); - return kbdSuccess; + return iotSuccess; } -bool kbd_app::CPushServerApp::start( int argc, char *argv[], int &/*nStatus*/) +bool iot_app::CPushServerApp::start( int argc, char *argv[], int &/*nStatus*/) { //1.解析启动参数 if ( !parseCmdLine( argc, argv )) @@ -98,14 +98,14 @@ bool kbd_app::CPushServerApp::start( int argc, char *argv[], int &/*nStatus*/) } //8.设置冗余通知回调 - if ( kbdSuccess != m_ptrRedundancyMng->setCallback( m_ptrPushSvrMng )) + if ( iotSuccess != m_ptrRedundancyMng->setCallback( m_ptrPushSvrMng )) { LOGERROR( "设置冗余回调接口失败" ); return false; } //9.更新当前进程冗余状态 - if ( kbdSuccess != m_ptrProcMng->updateProcessInfo( true, false, false )) + if ( iotSuccess != m_ptrProcMng->updateProcessInfo( true, false, false )) { LOGERROR( "更新本进程的进程信息失败" ); return false; @@ -114,7 +114,7 @@ bool kbd_app::CPushServerApp::start( int argc, char *argv[], int &/*nStatus*/) return true; } -bool kbd_app::CPushServerApp::stop() +bool iot_app::CPushServerApp::stop() { //9.更新当前进程冗余状态 if ( m_ptrProcMng != nullptr ) @@ -145,7 +145,7 @@ bool kbd_app::CPushServerApp::stop() return true; } -bool kbd_app::CPushServerApp::parseCmdLine(int argc, char *argv[]) +bool iot_app::CPushServerApp::parseCmdLine(int argc, char *argv[]) { /* @brief 拼接启动参数，用于向进程管理注册 */ for ( int i = 1; i < argc; ++i ) @@ -207,7 +207,7 @@ bool kbd_app::CPushServerApp::parseCmdLine(int argc, char *argv[]) return true; } -void kbd_app::CPushServerApp::showHelp(const boost::program_options::options_description &objDesc) +void iot_app::CPushServerApp::showHelp(const boost::program_options::options_description &objDesc) { std::cout << CN_ProcName_PushServer << " [-h] | [-a app]" << std::endl; std::cout << objDesc << std::endl; @@ -215,20 +215,20 @@ void kbd_app::CPushServerApp::showHelp(const boost::program_options::options_des -bool kbd_app::CPushServerApp::isAlreadyRunning() +bool iot_app::CPushServerApp::isAlreadyRunning() { string strUniqueName = CN_ProcName_PushServer; strUniqueName += m_strStartArgs; return CSingleProcInstance::hasInstanceRunning( strUniqueName ); } -bool kbd_app::CPushServerApp::initLog() +bool iot_app::CPushServerApp::initLog() { StartLogSystem( m_strAppName.c_str(), CN_ProcName_PushServer.c_str()); return true; } -bool kbd_app::CPushServerApp::getSystemInfo() +bool iot_app::CPushServerApp::getSystemInfo() { if ( !createSysInfoInstance( m_ptrSysInfo )) { @@ -236,7 +236,7 @@ bool kbd_app::CPushServerApp::getSystemInfo() return false; } - if ( kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName( m_strAppName, m_stRunAppInfo )) + if ( iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName( m_strAppName, m_stRunAppInfo )) { LOGERROR( "获取系统信息失败" ); return false; @@ -246,13 +246,13 @@ bool kbd_app::CPushServerApp::getSystemInfo() } -bool kbd_app::CPushServerApp::initialize() +bool iot_app::CPushServerApp::initialize() { /* @brief 初始化消息总线 */ if ( !initMsgBus( CN_ProcName_PushServer.c_str(), "" )) { LOGERROR( "初始化消息总线失败" ); - return kbdFailed; + return iotFailed; } /* @brief 创建FBD服务管理类 */ @@ -263,7 +263,7 @@ bool kbd_app::CPushServerApp::initialize() return false; } - if ( kbdSuccess != m_ptrPushSvrMng->initialize()) + if ( iotSuccess != m_ptrPushSvrMng->initialize()) { LOGERROR( "初始化FBD服务管理类失败" ); return false; @@ -273,7 +273,7 @@ bool kbd_app::CPushServerApp::initialize() } /* @brief 向进程管理注册 */ -bool kbd_app::CPushServerApp::registToProcMng() +bool iot_app::CPushServerApp::registToProcMng() { SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stRunAppInfo.nDomainId; @@ -289,7 +289,7 @@ bool kbd_app::CPushServerApp::registToProcMng() return false; } - if ( kbdSuccess != m_ptrProcMng->setCallback( this )) + if ( iotSuccess != m_ptrProcMng->setCallback( this )) { LOGERROR( "向进程管理设置回调函数失败" ); return false; @@ -299,7 +299,7 @@ bool kbd_app::CPushServerApp::registToProcMng() } /* @brief 清理业务资源 */ -bool kbd_app::CPushServerApp::clean() +bool iot_app::CPushServerApp::clean() { if ( m_ptrPushSvrMng != nullptr ) { diff --git a/platform/src/application/app_push/app_push_server/PushServerApp.h b/platform/src/application/app_push/app_push_server/PushServerApp.h index 9221bfc0..e837e3e5 100644 --- a/platform/src/application/app_push/app_push_server/PushServerApp.h +++ b/platform/src/application/app_push/app_push_server/PushServerApp.h @@ -8,7 +8,7 @@ #include "sys_node_mng_api/NodeMngInterface.h" #include "PushSrvMng.h" -namespace kbd_app { +namespace iot_app { class CPushServerApp: public iot_public::CBaseService, public iot_sys::CProcessQuitInterface @@ -99,5 +99,5 @@ private: CPushSrvMngPtr m_ptrPushSvrMng; //< FBD服务管理类 }; -} //namespace kbd_app +} //namespace iot_app #endif // PUSHSERVERAPP_H diff --git a/platform/src/application/app_push/app_push_server/PushServerCommon.h b/platform/src/application/app_push/app_push_server/PushServerCommon.h index 66f1ae44..3c7fd7ed 100644 --- a/platform/src/application/app_push/app_push_server/PushServerCommon.h +++ b/platform/src/application/app_push/app_push_server/PushServerCommon.h @@ -8,7 +8,7 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "pub_logger_api/logger.h" -namespace kbd_app +namespace iot_app { const int CN_Min_Refresh_Time = 10; //< 最小的扫描间隔时间，单位ms const std::string CN_DllPath = "push_svr_plugins"; //< fbd模块dll所在目录 diff --git a/platform/src/application/app_push/app_push_server/PushSrvMng.cpp b/platform/src/application/app_push/app_push_server/PushSrvMng.cpp index 57e4d984..d6147633 100644 --- a/platform/src/application/app_push/app_push_server/PushSrvMng.cpp +++ b/platform/src/application/app_push/app_push_server/PushSrvMng.cpp @@ -3,7 +3,7 @@ -kbd_app::CPushSrvMng::CPushSrvMng( const iot_public::SRunAppInfo &stRunAppInfo, +iot_app::CPushSrvMng::CPushSrvMng( const iot_public::SRunAppInfo &stRunAppInfo, const iot_sys::CProcMngInterfacePtr &ptrProcMng ) : m_stRunAppInfo( stRunAppInfo ), m_ptrProcMng( ptrProcMng ), @@ -13,7 +13,7 @@ kbd_app::CPushSrvMng::CPushSrvMng( const iot_public::SRunAppInfo &stRunAppInfo, m_ptrWorkThread ( nullptr ) { } -kbd_app::CPushSrvMng::~CPushSrvMng() +iot_app::CPushSrvMng::~CPushSrvMng() { if ( m_ptrWorkThread != nullptr ) { @@ -32,17 +32,17 @@ kbd_app::CPushSrvMng::~CPushSrvMng() } -int kbd_app::CPushSrvMng::redundantSwitch(bool bMaster, bool bSlave) +int iot_app::CPushSrvMng::redundantSwitch(bool bMaster, bool bSlave) { - int nRecvRet = kbdFailed; - int nWorkRet = kbdFailed; + int nRecvRet = iotFailed; + int nWorkRet = iotFailed; LOGWARN( "接收到冗余切换指令.Master=[%d],Slave=[%d]", bMaster, bSlave ); nRecvRet = m_ptrRecvMsgThread->redundantSwitch( bMaster, bSlave ); nWorkRet = m_ptrWorkThread->redundantSwitch( bMaster, bSlave ); /* @brief 切换失败，报告为非主非备 */ - if ( kbdSuccess == nRecvRet && kbdSuccess == nWorkRet ) + if ( iotSuccess == nRecvRet && iotSuccess == nWorkRet ) { m_ptrProcMng->updateProcessInfo( true, bMaster, bSlave ); LOGWARN( "updateProcessInfo.Master=[%d],Slave=[%d],,nRecvRet=[%d],nWorkRet=[%d]", bMaster, bSlave ,nRecvRet,nWorkRet); @@ -53,60 +53,60 @@ int kbd_app::CPushSrvMng::redundantSwitch(bool bMaster, bool bSlave) LOGWARN( "updateProcessInfo.Master=[%d],Slave=[%d],nRecvRet=[%d],nWorkRet=[%d]", false, false ,nRecvRet,nWorkRet); } - return kbdSuccess; + return iotSuccess; } -int kbd_app::CPushSrvMng::initialize() +int iot_app::CPushSrvMng::initialize() { m_ptrConfigParse = boost::make_shared( ); if ( m_ptrConfigParse == nullptr ) { LOGERROR( "cannot create push server config parse class" ); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrConfigParse->initialize()) + if ( iotSuccess != m_ptrConfigParse->initialize()) { LOGERROR( "cannot initialize config parse class" ); - return kbdFailed; + return iotFailed; } m_ptrMbMsgMng = getCMbMsgMngSingleTon(); if ( m_ptrMbMsgMng == nullptr ) { LOGERROR( "cannot create push server message bus mananger class" ); - return kbdFailed; + return iotFailed; } m_ptrRecvMsgThread = boost::make_shared( m_stRunAppInfo,m_ptrConfigParse,m_ptrMbMsgMng); if ( m_ptrRecvMsgThread == nullptr ) { LOGERROR( "cannot create push server recv thread class" ); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrRecvMsgThread->initialize()) + if ( iotSuccess != m_ptrRecvMsgThread->initialize()) { LOGERROR( "cannot initialize recv thread class" ); - return kbdFailed; + return iotFailed; } m_ptrWorkThread = boost::make_shared( m_stRunAppInfo,m_ptrConfigParse,m_ptrMbMsgMng); if ( m_ptrWorkThread == nullptr ) { LOGERROR( "cannot create push server work thread class" ); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrWorkThread->initialize()) + if ( iotSuccess != m_ptrWorkThread->initialize()) { LOGERROR( "cannot initialize work thread class" ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/application/app_push/app_push_server/PushSrvMng.h b/platform/src/application/app_push/app_push_server/PushSrvMng.h index 3bdbec4a..f6391531 100644 --- a/platform/src/application/app_push/app_push_server/PushSrvMng.h +++ b/platform/src/application/app_push/app_push_server/PushSrvMng.h @@ -10,7 +10,7 @@ #include "RecvMsgThread.h" #include "PushWorkThread.h" -namespace kbd_app { +namespace iot_app { class CPushSrvMng : public iot_sys::CRedundantSwitchInterface @@ -23,12 +23,12 @@ public: 在进程切换过程中，可能会被调用多次切换，业务进程需要保证幂等，无副作用 @param bool bMaster 是否为主 @param bool bSlave 是否为备 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int redundantSwitch( bool bMaster, bool bSlave ); /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); @@ -44,5 +44,5 @@ private: }; typedef boost::shared_ptr CPushSrvMngPtr; -} //namespace kbd_app +} //namespace iot_app #endif // PUSHSRVMNG_H diff --git a/platform/src/application/app_push/app_push_server/PushWorkThread.cpp b/platform/src/application/app_push/app_push_server/PushWorkThread.cpp index bb60f303..c38ca65f 100644 --- a/platform/src/application/app_push/app_push_server/PushWorkThread.cpp +++ b/platform/src/application/app_push/app_push_server/PushWorkThread.cpp @@ -3,7 +3,7 @@ #include "pub_utility_api/FileUtil.h" #include // for import_alias #include "PushServerCommon.h" -namespace kbd_app{ +namespace iot_app{ CPushWorkThread::CPushWorkThread(iot_public::SRunAppInfo stRunAppInfo, @@ -29,19 +29,19 @@ CPushWorkThread::~CPushWorkThread() int CPushWorkThread::initialize() { // 加载所有dll - if(kbdFailed == createAllModule()){ + if(iotFailed == createAllModule()){ LOGERROR( "Fail to create push server modole" ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int CPushWorkThread::unloadAllDll() { m_mapTypeToMod.clear(); m_mapDllHandle.clear(); - return kbdSuccess; + return iotSuccess; } void CPushWorkThread::execute(){ @@ -81,7 +81,7 @@ int CPushWorkThread::redundantSwitch(bool bMaster, bool bSlave) CTimerThreadBase::suspend(); } - return kbdSuccess; + return iotSuccess; } std::string CPushWorkThread::getPushPluginsPath() @@ -108,13 +108,13 @@ int CPushWorkThread::createAllModule() else { LOGERROR( "创建模块[%s]失败", STempPushModuleInfo.strDllName.c_str() ); - return kbdFailed; + return iotFailed; } LOGINFO( "创建模块[%s]成功", STempPushModuleInfo.strDllName.c_str() ); } } - return kbdSuccess; + return iotSuccess; } CBasePushModulePtr CPushWorkThread::createFbdModule(const SPushModuleCfg &stModInfo) @@ -157,7 +157,7 @@ CBasePushModulePtr CPushWorkThread::createFbdModule(const SPushModuleCfg &stModI } /* @brief 调用fbd模块的初始化接口 */ - if ( kbdSuccess != ptrModule->init( m_stRunAppInfo, stModInfo.strDllName, stModInfo.strExtraParam )) + if ( iotSuccess != ptrModule->init( m_stRunAppInfo, stModInfo.strDllName, stModInfo.strExtraParam )) { LOGERROR( "初始化推送模块失败.push_module=[%s]", stModInfo.strDllName.c_str() ); return nullptr; @@ -166,4 +166,4 @@ CBasePushModulePtr CPushWorkThread::createFbdModule(const SPushModuleCfg &stModI return ptrModule; } -} //namespace kbd_app end +} //namespace iot_app end diff --git a/platform/src/application/app_push/app_push_server/PushWorkThread.h b/platform/src/application/app_push/app_push_server/PushWorkThread.h index e292782f..cbb45194 100644 --- a/platform/src/application/app_push/app_push_server/PushWorkThread.h +++ b/platform/src/application/app_push/app_push_server/PushWorkThread.h @@ -7,7 +7,7 @@ #include "PushConfigParse.h" #include "MbMsgMng.h" -namespace kbd_app { +namespace iot_app { class CPushWorkThread final : public iot_public::CTimerThreadBase diff --git a/platform/src/application/app_push/app_push_server/RecvMsgThread.cpp b/platform/src/application/app_push/app_push_server/RecvMsgThread.cpp index 1587337b..6a807333 100644 --- a/platform/src/application/app_push/app_push_server/RecvMsgThread.cpp +++ b/platform/src/application/app_push/app_push_server/RecvMsgThread.cpp @@ -2,7 +2,7 @@ #include "common/MessageChannel.h" #include "pub_logger_api/logger.h" -namespace kbd_app { +namespace iot_app { CRecvMsgThread::CRecvMsgThread(iot_public::SRunAppInfo stRunAppInfo , @@ -41,14 +41,14 @@ int CRecvMsgThread::subscribeMessage() ) { LOGERROR( "订阅通道[CH_PSH_APP_TO_SRV_PRTBF]失败" ); - return kbdFailed; + return iotFailed; } else { LOGINFO( "订阅通道[CH_PSH_APP_TO_SRV_PRTBF]成功" ); } - return kbdSuccess; + return iotSuccess; } int CRecvMsgThread::unsubscribeMessage() @@ -61,7 +61,7 @@ int CRecvMsgThread::unsubscribeMessage() { } - return kbdSuccess; + return iotSuccess; } @@ -96,7 +96,7 @@ void CRecvMsgThread::execute() /* @brief 冗余切换 */ int CRecvMsgThread::redundantSwitch( bool bMaster, bool /*bSlave*/ ) { - int nRet = kbdFailed; + int nRet = iotFailed; if ( bMaster ) { CTimerThreadBase::resume(); @@ -113,4 +113,4 @@ int CRecvMsgThread::redundantSwitch( bool bMaster, bool /*bSlave*/ ) -}//namespace kbd_app end +}//namespace iot_app end diff --git a/platform/src/application/app_push/app_push_server/RecvMsgThread.h b/platform/src/application/app_push/app_push_server/RecvMsgThread.h index 630ba697..460b4eca 100644 --- a/platform/src/application/app_push/app_push_server/RecvMsgThread.h +++ b/platform/src/application/app_push/app_push_server/RecvMsgThread.h @@ -10,7 +10,7 @@ -namespace kbd_app { +namespace iot_app { class CRecvMsgThread final : public iot_public::CTimerThreadBase @@ -31,20 +31,20 @@ public: @brief 冗余切换 @param bool bMaster 是否为主 @param bool bSlave 是否为备 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int redundantSwitch( bool bMaster, bool bSlave ); private: /** @brief 订阅消息 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int subscribeMessage(); /** @brief 取消订阅 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int unsubscribeMessage(); @@ -60,5 +60,5 @@ private: typedef boost::shared_ptr CRecvMsgThreadPtr; -}// namespace kbd_app +}// namespace iot_app #endif // RECVMSGTHREAD_H diff --git a/platform/src/application/app_push/app_push_server/main.cpp b/platform/src/application/app_push/app_push_server/main.cpp index fe26ae74..47d16a5f 100644 --- a/platform/src/application/app_push/app_push_server/main.cpp +++ b/platform/src/application/app_push/app_push_server/main.cpp @@ -7,6 +7,6 @@ int main( int argc, char *argv[] ) { - kbd_app::CPushServerApp objApp; + iot_app::CPushServerApp objApp; return objApp.main( argc, argv ); } diff --git a/platform/src/application/app_push/include/BasePushModule.h b/platform/src/application/app_push/include/BasePushModule.h index 1d01a667..693adf93 100644 --- a/platform/src/application/app_push/include/BasePushModule.h +++ b/platform/src/application/app_push/include/BasePushModule.h @@ -11,7 +11,7 @@ #include "common/Common.h" #include -namespace kbd_app +namespace iot_app { class CBasePushModule { diff --git a/platform/src/application/app_push/push_module/bbniot_vsms/BbniotVsms.cpp b/platform/src/application/app_push/push_module/bbniot_vsms/BbniotVsms.cpp index 56116a17..1924c239 100644 --- a/platform/src/application/app_push/push_module/bbniot_vsms/BbniotVsms.cpp +++ b/platform/src/application/app_push/push_module/bbniot_vsms/BbniotVsms.cpp @@ -3,12 +3,12 @@ #include "BbniotVsmsCient.h" #include "pub_logger_api/logger.h" -kbd_app::CBbniotVsms::CBbniotVsms() +iot_app::CBbniotVsms::CBbniotVsms() { } -kbd_app::CBbniotVsms::~CBbniotVsms() +iot_app::CBbniotVsms::~CBbniotVsms() { } @@ -29,18 +29,18 @@ bool split(std::string str, const std::string & token,std::vector & } -int kbd_app::CBbniotVsms::init(const iot_public::SRunAppInfo &/*stRunAppInfo*/, const std::string &/*strModuleName*/, const std::string &/*strExtraParam*/) +int iot_app::CBbniotVsms::init(const iot_public::SRunAppInfo &/*stRunAppInfo*/, const std::string &/*strModuleName*/, const std::string &/*strExtraParam*/) { - return kbdSuccess; + return iotSuccess; } -int kbd_app::CBbniotVsms::recvAndSend(boost::shared_ptr msg) +int iot_app::CBbniotVsms::recvAndSend(boost::shared_ptr msg) { iot_idl::SBBNIOT_VSMS objData; if ( !objData.ParseFromArray( msg->getDataPtr(), static_cast(msg->getDataSize()))) { LOGERROR( "解析SBBNIOT_VSMS消息失败" ); - return kbdFailed; + return iotFailed; } msg.reset(); @@ -48,7 +48,7 @@ int kbd_app::CBbniotVsms::recvAndSend(boost::shared_ptr msg if(!split(objData.number(),";",recipients)) { LOGERROR( "号码格式有误,%s", objData.number().c_str()); - return kbdFailed; + return iotFailed; } // 解析 并发送告警 @@ -62,15 +62,15 @@ int kbd_app::CBbniotVsms::recvAndSend(boost::shared_ptr msg if(!result) { LOGERROR(" 发送SBBNIOT_VSMS消息失败, 错误原因%s,内容:[%s], 收件人号码:[%s],方式:[%s]", objBbniotClient.getLastErr().c_str(),objData.content().c_str(),recipients[i].c_str(),objData.method().c_str()); - return kbdFailed; + return iotFailed; } LOGINFO("发送SBBNIOT_VSMS消息成功,内容:[%s], 收件人号码:[%s],方式:[%s]",objData.content().c_str(),recipients[i].c_str(),objData.method().c_str() ); } - return kbdSuccess; + return iotSuccess; } -boost::shared_ptr kbd_app::CBbniotVsms::create() +boost::shared_ptr iot_app::CBbniotVsms::create() { return boost::shared_ptr( new CBbniotVsms()); diff --git a/platform/src/application/app_push/push_module/bbniot_vsms/BbniotVsms.h b/platform/src/application/app_push/push_module/bbniot_vsms/BbniotVsms.h index 5ffb06e5..6b011c43 100644 --- a/platform/src/application/app_push/push_module/bbniot_vsms/BbniotVsms.h +++ b/platform/src/application/app_push/push_module/bbniot_vsms/BbniotVsms.h @@ -4,7 +4,7 @@ #include "BasePushModule.h" #include -namespace kbd_app{ +namespace iot_app{ class CBbniotVsms final: public CBasePushModule { public: @@ -29,12 +29,12 @@ public: }; BOOST_DLL_ALIAS( - kbd_app::CBbniotVsms::create, // 要导出的函数 + iot_app::CBbniotVsms::create, // 要导出的函数 create_plugin // 将导出函数重命名，最终调用者访问此函数名 ) -} // namespace kbd_app end +} // namespace iot_app end #endif // BBNIOTVSMS_H diff --git a/platform/src/application/app_push/push_module/smtp_mail/SmtpMail.cpp b/platform/src/application/app_push/push_module/smtp_mail/SmtpMail.cpp index 848b85b4..826bb338 100644 --- a/platform/src/application/app_push/push_module/smtp_mail/SmtpMail.cpp +++ b/platform/src/application/app_push/push_module/smtp_mail/SmtpMail.cpp @@ -3,30 +3,30 @@ #include "pub_logger_api/logger.h" #include "smtp.hpp" -kbd_app::CSmtpMail::CSmtpMail() +iot_app::CSmtpMail::CSmtpMail() { } -kbd_app::CSmtpMail::~CSmtpMail() +iot_app::CSmtpMail::~CSmtpMail() { } -int kbd_app::CSmtpMail::init(const iot_public::SRunAppInfo &/*stRunAppInfo*/, +int iot_app::CSmtpMail::init(const iot_public::SRunAppInfo &/*stRunAppInfo*/, const std::string &/*strModuleName*/, const std::string &/*strExtraParam*/) { - return kbdSuccess; + return iotSuccess; } -int kbd_app::CSmtpMail::recvAndSend(boost::shared_ptr msg) +int iot_app::CSmtpMail::recvAndSend(boost::shared_ptr msg) { iot_idl::SSMTP_MAIL objData; if ( !objData.ParseFromArray( msg->getDataPtr(), static_cast(msg->getDataSize()))) { LOGERROR( "解析SSMTP_MAIL消息失败" ); - return kbdFailed; + return iotFailed; } msg.reset(); @@ -61,16 +61,16 @@ int kbd_app::CSmtpMail::recvAndSend(boost::shared_ptr msg) if(! result ) { LOGERROR(" fail to send mail: %s", objSendMail.getLastErr().c_str()); - return kbdFailed; + return iotFailed; }else { LOGINFO(" send mail, sender:[%s], subject:[%s],content:[%s]", objData.sender().c_str(), objData.subject().c_str(),objData.content().c_str() ); } - return kbdSuccess; + return iotSuccess; } -boost::shared_ptr kbd_app::CSmtpMail::create() +boost::shared_ptr iot_app::CSmtpMail::create() { return boost::shared_ptr( new CSmtpMail()); } diff --git a/platform/src/application/app_push/push_module/smtp_mail/SmtpMail.h b/platform/src/application/app_push/push_module/smtp_mail/SmtpMail.h index 2b9e8077..faa797cb 100644 --- a/platform/src/application/app_push/push_module/smtp_mail/SmtpMail.h +++ b/platform/src/application/app_push/push_module/smtp_mail/SmtpMail.h @@ -4,7 +4,7 @@ #include -namespace kbd_app { +namespace iot_app { class CSmtpMail final: public CBasePushModule @@ -32,9 +32,9 @@ public: }; BOOST_DLL_ALIAS( - kbd_app::CSmtpMail::create, // 要导出的函数 + iot_app::CSmtpMail::create, // 要导出的函数 create_plugin // 将导出函数重命名，最终调用者访问此函数名 ) -} // namespace kbd_app end +} // namespace iot_app end #endif // SMTPMAIL_H diff --git a/platform/src/application/push_debug/main.cpp b/platform/src/application/push_debug/main.cpp index 33a24a93..e0599fcf 100644 --- a/platform/src/application/push_debug/main.cpp +++ b/platform/src/application/push_debug/main.cpp @@ -6,7 +6,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); iot_net::initMsgBus("push_debug",""); diff --git a/platform/src/application/sim_interlock_api/SimInterLockImpl.cpp b/platform/src/application/sim_interlock_api/SimInterLockImpl.cpp index 6d3fd1a5..4f364f9e 100644 --- a/platform/src/application/sim_interlock_api/SimInterLockImpl.cpp +++ b/platform/src/application/sim_interlock_api/SimInterLockImpl.cpp @@ -12,18 +12,18 @@ using namespace std; using namespace iot_public; using namespace iot_dbms; -kbd_app::CSimInterLockImpl::CSimInterLockImpl() +iot_app::CSimInterLockImpl::CSimInterLockImpl() { } -kbd_app::CSimInterLockImpl::~CSimInterLockImpl() +iot_app::CSimInterLockImpl::~CSimInterLockImpl() { } /* @brief 初始化，主要加载相关参数信息 */ -bool kbd_app::CSimInterLockImpl::initialize(const std::vector &vecKeyIdTag, +bool iot_app::CSimInterLockImpl::initialize(const std::vector &vecKeyIdTag, const std::vector &vecCurValue, const std::vector &vecStatus, std::string &strErrDesc) @@ -65,7 +65,7 @@ bool kbd_app::CSimInterLockImpl::initialize(const std::vector &vecK } /* @brief 控制命令（会检查闭锁，闭锁通过则认为控制成功） */ -bool kbd_app::CSimInterLockImpl::setValue(const std::string &/*strTableName*/, +bool iot_app::CSimInterLockImpl::setValue(const std::string &/*strTableName*/, const std::string &strKeyIdTag, const int nCtrlValue, std::string &strErrDesc) @@ -94,7 +94,7 @@ bool kbd_app::CSimInterLockImpl::setValue(const std::string &/*strTableName*/, } /* @brief 获取测点的分量数 */ -bool kbd_app::CSimInterLockImpl::getDotNum(const std::string &/*strTableName*/, +bool iot_app::CSimInterLockImpl::getDotNum(const std::string &/*strTableName*/, const std::string &strKeyIdTag, int &nDotNum) { @@ -110,7 +110,7 @@ bool kbd_app::CSimInterLockImpl::getDotNum(const std::string &/*strTableName*/, } /* @brief 加载所需参数信息 */ -bool kbd_app::CSimInterLockImpl::loadInfoFromDB(const std::string &strTagList) +bool iot_app::CSimInterLockImpl::loadInfoFromDB(const std::string &strTagList) { if (strTagList.empty()) { @@ -154,7 +154,7 @@ bool kbd_app::CSimInterLockImpl::loadInfoFromDB(const std::string &strTagList) } /* @brief 加载闭锁参数信息 */ -bool kbd_app::CSimInterLockImpl::loadInterlockParam(iot_dbms::CDbApi &objDBConnect, +bool iot_app::CSimInterLockImpl::loadInterlockParam(iot_dbms::CDbApi &objDBConnect, const std::string &strTagList, std::string &strFuncNameList) { @@ -231,7 +231,7 @@ bool kbd_app::CSimInterLockImpl::loadInterlockParam(iot_dbms::CDbApi &objDBConne } /* @brief 加载闭锁函数信息 */ -bool kbd_app::CSimInterLockImpl::loadInterlockDef(iot_dbms::CDbApi &objDBConnect, +bool iot_app::CSimInterLockImpl::loadInterlockDef(iot_dbms::CDbApi &objDBConnect, const std::string &strFuncNameList) { if (strFuncNameList.empty()) @@ -259,7 +259,7 @@ bool kbd_app::CSimInterLockImpl::loadInterlockDef(iot_dbms::CDbApi &objDBConnect } /* @brief 加载数字量信息 */ -bool kbd_app::CSimInterLockImpl::loadDigitalInfo(iot_dbms::CDbApi &objDBConnect, +bool iot_app::CSimInterLockImpl::loadDigitalInfo(iot_dbms::CDbApi &objDBConnect, const std::string &strTagList) { if (strTagList.empty()) @@ -289,7 +289,7 @@ bool kbd_app::CSimInterLockImpl::loadDigitalInfo(iot_dbms::CDbApi &objDBConnect, } /* @brief 通过测点长名获取测点短名 */ -std::string kbd_app::CSimInterLockImpl::getPntTagNameByKeyIdTag(const string &strInputTagName) +std::string iot_app::CSimInterLockImpl::getPntTagNameByKeyIdTag(const string &strInputTagName) { string strTagName = strInputTagName; strTagName = strTagName.substr(strTagName.find('.') + 1); @@ -301,7 +301,7 @@ std::string kbd_app::CSimInterLockImpl::getPntTagNameByKeyIdTag(const string &st } /* @brief 检查闭锁 */ -bool kbd_app::CSimInterLockImpl::checkInterlock(const std::string &strKeyIdTag, +bool iot_app::CSimInterLockImpl::checkInterlock(const std::string &strKeyIdTag, const int nCtrlValue, std::string &strResult) { @@ -326,7 +326,7 @@ bool kbd_app::CSimInterLockImpl::checkInterlock(const std::string &strKeyIdTag, const string &strInterlockFunc = pLuaFunc->second; CLuaEngineInterface objLuaEngine; - if (kbdSuccess != objLuaEngine.initialize()) + if (iotSuccess != objLuaEngine.initialize()) { strResult = "初始化脚本引擎失败"; LOGERROR("%s", strResult.c_str()); @@ -355,7 +355,7 @@ bool kbd_app::CSimInterLockImpl::checkInterlock(const std::string &strKeyIdTag, vecInputName.push_back(pInputTag->second.strDesc); } - if (kbdSuccess != objLuaEngine.execFunction(strInterlockTagName, + if (iotSuccess != objLuaEngine.execFunction(strInterlockTagName, strInterlockFunc, vecCtrlValue, vecInputValue, diff --git a/platform/src/application/sim_interlock_api/SimInterLockImpl.h b/platform/src/application/sim_interlock_api/SimInterLockImpl.h index 58cf384f..d5dcd1c4 100644 --- a/platform/src/application/sim_interlock_api/SimInterLockImpl.h +++ b/platform/src/application/sim_interlock_api/SimInterLockImpl.h @@ -8,7 +8,7 @@ #include "pub_lua_engine_api/LuaEngineInterface.h" #include "db_api_ex/CDbApi.h" -namespace kbd_app +namespace iot_app { /* @brief 存储闭锁配置信息，对应表opt_interlock_para */ typedef struct _STableInterlockPara @@ -152,4 +152,4 @@ namespace kbd_app typedef boost::shared_ptr CSimInterLockImplPtr; -} //namespace kbd_app +} //namespace iot_app diff --git a/platform/src/application/sim_interlock_api/SimInterLockInterface.cpp b/platform/src/application/sim_interlock_api/SimInterLockInterface.cpp index 3fe66a6b..462ad415 100644 --- a/platform/src/application/sim_interlock_api/SimInterLockInterface.cpp +++ b/platform/src/application/sim_interlock_api/SimInterLockInterface.cpp @@ -6,9 +6,9 @@ #include "sim_interlock_api/SimInterLockInterface.h" #include "SimInterLockImpl.h" -using namespace kbd_app; +using namespace iot_app; -SERVICE_SIM_INTERLOCK_API CSimInterLockInterfacePtr kbd_app::getSimInterLockInstance() +SERVICE_SIM_INTERLOCK_API CSimInterLockInterfacePtr iot_app::getSimInterLockInstance() { CSimInterLockImplPtr ptrInterLockImpl = boost::make_shared(); return ptrInterLockImpl; diff --git a/platform/src/dbms/db_api_ex/CDbApi_impl.cpp b/platform/src/dbms/db_api_ex/CDbApi_impl.cpp index 49a34a30..9798fe3c 100644 --- a/platform/src/dbms/db_api_ex/CDbApi_impl.cpp +++ b/platform/src/dbms/db_api_ex/CDbApi_impl.cpp @@ -56,7 +56,7 @@ bool CDbApi_impl::getAllDbPara() std::vector vecLocalDbInfo; std::vector vecRemoteDbInfo; int nRet = m_pSysInfo->getLocalDBInfo( stFirstConnectInfo, vecLocalDbInfo, vecRemoteDbInfo ); - if ( kbdFailed == nRet ) + if ( iotFailed == nRet ) { LOGERROR( "getLocalDBInfo 返回失败" ); return false; @@ -85,7 +85,7 @@ bool CDbApi_impl::getAllDbPara() } SNodeInfo stNodeInfo; nRet = m_pSysInfo->getNodeInfoByName( stFirstConnectInfo.strNodeName, stNodeInfo ); - if ( kbdFailed == nRet ) + if ( iotFailed == nRet ) { LOGERROR( "getNodeInfoByName 返回失败" ); return false; @@ -130,7 +130,7 @@ bool CDbApi_impl::getAllDbPara() } SNodeInfo stNodeInfo; nRet = m_pSysInfo->getNodeInfoByName( stTmp.strNodeName, stNodeInfo ); - if ( kbdFailed == nRet ) + if ( iotFailed == nRet ) { LOGERROR( "getNodeInfoByName 返回失败" ); return false; diff --git a/platform/src/dbms/db_his_data_srv/CDumpUtils.cpp b/platform/src/dbms/db_his_data_srv/CDumpUtils.cpp index 07350b8e..1ee59058 100644 --- a/platform/src/dbms/db_his_data_srv/CDumpUtils.cpp +++ b/platform/src/dbms/db_his_data_srv/CDumpUtils.cpp @@ -94,7 +94,7 @@ bool CDumpUtils::getDbConn(const CDbHisCfg &dbCfg,iot_dbms::CDbBaseApi &objDb) std::vector vecLocalDbInfo; std::vector vecRemoteDbInfo; int nRet = ptrSysInfo->getLocalDBInfo( stFirstConnectInfo, vecLocalDbInfo, vecRemoteDbInfo ); - if ( kbdFailed == nRet ) + if ( iotFailed == nRet ) { LOGERROR( "getLocalDBInfo 返回失败" ); return false; diff --git a/platform/src/dbms/db_manager/main.cpp b/platform/src/dbms/db_manager/main.cpp index 0e2a6c88..89dd983f 100644 --- a/platform/src/dbms/db_manager/main.cpp +++ b/platform/src/dbms/db_manager/main.cpp @@ -49,7 +49,7 @@ int main( int argc, char *argv[] ) { //if(iot_public::CSingleProcInstance::hasInstanceRunning("db_manager")) // return 0; - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); SingleApplication a( argc, argv ); diff --git a/platform/src/dbms/db_manager/pj_manager_his/pj_manager_his_data_srv.cpp b/platform/src/dbms/db_manager/pj_manager_his/pj_manager_his_data_srv.cpp index 6d731e63..e4d98604 100644 --- a/platform/src/dbms/db_manager/pj_manager_his/pj_manager_his_data_srv.cpp +++ b/platform/src/dbms/db_manager/pj_manager_his/pj_manager_his_data_srv.cpp @@ -285,7 +285,7 @@ else else { SERVICE_DESCRIPTION stSrvDesc; - TCHAR szDesc[] = _T("康必达监控系统自动清除过期数据服务"); + TCHAR szDesc[] = _T("宏茂技术监控系统自动清除过期数据服务"); stSrvDesc.lpDescription = szDesc; if (::ChangeServiceConfig2(hService, SERVICE_CONFIG_DESCRIPTION, &stSrvDesc)) { diff --git a/platform/src/dbms/db_manager_api/db_manager_api.cpp b/platform/src/dbms/db_manager_api/db_manager_api.cpp index e216503a..ab63d7a6 100644 --- a/platform/src/dbms/db_manager_api/db_manager_api.cpp +++ b/platform/src/dbms/db_manager_api/db_manager_api.cpp @@ -87,14 +87,14 @@ QString db_manager_api::getBackUpPath() const void db_manager_api::loadConfig() { iot_public::CCommonConfigParse config; - if(config.load(iot_public::CFileUtil::getPathOfCfgFile(DB_MANAGER_CFG_NAME)) == kbdFailed) + if(config.load(iot_public::CFileUtil::getPathOfCfgFile(DB_MANAGER_CFG_NAME)) == iotFailed) { LOGERROR("加载db_manager_cfg.xml配置文件出错"); return; } std::string reportFilePath; - if(config.getStringValue(CFG_MD_BACKUP,CFG_MD_BACKUP_KEY_REPORTFILE,reportFilePath) == kbdFailed) + if(config.getStringValue(CFG_MD_BACKUP,CFG_MD_BACKUP_KEY_REPORTFILE,reportFilePath) == iotFailed) { LOGERROR("配置文件无报表文件路径参数"); return; diff --git a/platform/src/dbms/db_save/CDbSaveService.cpp b/platform/src/dbms/db_save/CDbSaveService.cpp index 5b15e6aa..d735c5f7 100644 --- a/platform/src/dbms/db_save/CDbSaveService.cpp +++ b/platform/src/dbms/db_save/CDbSaveService.cpp @@ -55,7 +55,7 @@ bool CDbSaveService::start( int argc, char *argv[], int &nStatus ) return false; } int nRet = sysInfoPtr->getLocalRunAppInfoByName( CN_AppName_PUBLIC, stRunAppInfo ); - if ( kbdSuccess != nRet ) + if ( iotSuccess != nRet ) { LOGFATAL( "getLocalRunAppInfoByName() failed, exit!" ); return false; diff --git a/platform/src/dbms/db_save/CDbSaveServiceThread.cpp b/platform/src/dbms/db_save/CDbSaveServiceThread.cpp index 6f6bfcdb..094d5722 100644 --- a/platform/src/dbms/db_save/CDbSaveServiceThread.cpp +++ b/platform/src/dbms/db_save/CDbSaveServiceThread.cpp @@ -57,7 +57,7 @@ bool CDbSaveServiceThread::init() std::vector vecRemoteDbInfo; int nRc = ptrSysInfo->getDBInfoByDomainId( m_nDomainID, stFirstDbInfo, vecLocalDbInfo, vecRemoteDbInfo ); - if ( kbdSuccess != nRc ) + if ( iotSuccess != nRc ) { LOGERROR( "getDbInfoByNodeName failed , return false !" ); return false; @@ -71,7 +71,7 @@ bool CDbSaveServiceThread::init() { const iot_public::SDatabaseInfo &objDbInfo = vecLocalDbInfo[nDbInfoIndex]; nRc = ptrSysInfo->getNodeInfoByName( objDbInfo.strNodeName, stDbNodeInfo ); - if ( kbdSuccess != nRc ) + if ( iotSuccess != nRc ) { LOGERROR( "getNodeInfoByName failed, continue !" ); continue; @@ -131,7 +131,7 @@ bool CDbSaveServiceThread::init() { const iot_public::SDatabaseInfo &objDbInfo = vecRemoteDbInfo[nDbInfoIndex]; nRc = ptrSysInfo->getNodeInfoByName( objDbInfo.strNodeName, stDbNodeInfo ); - if ( kbdSuccess != nRc ) + if ( iotSuccess != nRc ) { LOGERROR( "getNodeInfoByName failed, continue !" ); continue; @@ -435,7 +435,7 @@ int CDbSaveServiceThread::redundantSwitch( bool bMaster, bool bSlave ) m_oMbComm.delSub( 0, 0 ); //suspend(); } - return kbdSuccess; + return iotSuccess; } } //< namespace iot_dbms diff --git a/platform/src/dbms/db_studio/main.cpp b/platform/src/dbms/db_studio/main.cpp index 6b1ea5f7..bd771ef8 100644 --- a/platform/src/dbms/db_studio/main.cpp +++ b/platform/src/dbms/db_studio/main.cpp @@ -5,7 +5,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); CDbStudio w; diff --git a/platform/src/dbms/db_sync_server/CDbSynService.cpp b/platform/src/dbms/db_sync_server/CDbSynService.cpp index 1a9ba42b..6c74833d 100644 --- a/platform/src/dbms/db_sync_server/CDbSynService.cpp +++ b/platform/src/dbms/db_sync_server/CDbSynService.cpp @@ -137,7 +137,7 @@ bool CDbSynService::start( int argc, char *argv[], int & /*nStatus*/) break; case RM_NO_PROC_MNG_MASTER: { - if ( kbdSuccess != m_ptrRedunSw->redundantSwitch( true, false )) + if ( iotSuccess != m_ptrRedunSw->redundantSwitch( true, false )) { LOGFATAL( "以主机模式启动失败！" ); return false; @@ -146,7 +146,7 @@ bool CDbSynService::start( int argc, char *argv[], int & /*nStatus*/) break; case RM_NO_PROC_MNG_SLAVE: { - if ( kbdSuccess != m_ptrRedunSw->redundantSwitch( false, true )) + if ( iotSuccess != m_ptrRedunSw->redundantSwitch( false, true )) { LOGFATAL( "以备机模式启动失败！" ); return false; @@ -223,7 +223,7 @@ bool CDbSynService::stop() int CDbSynService::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } @@ -234,7 +234,7 @@ int CDbSynService::updateProcInfo( bool bActive, bool bMaster, bool bSlave ) return m_ptrProcMng->updateProcessInfo( bActive, bMaster, bSlave ); } - return kbdFailed; + return iotFailed; } bool CDbSynService::parseCommandLine( int argc, char *argv[] ) diff --git a/platform/src/dbms/db_sync_server/CDbSynSrvRedunSw.cpp b/platform/src/dbms/db_sync_server/CDbSynSrvRedunSw.cpp index 1c758009..a791e879 100644 --- a/platform/src/dbms/db_sync_server/CDbSynSrvRedunSw.cpp +++ b/platform/src/dbms/db_sync_server/CDbSynSrvRedunSw.cpp @@ -89,7 +89,7 @@ int CDbSynSrvRedunSw::redundantSwitch( bool bMaster, bool bSlave ) m_pParent->updateProcInfo( true, bThreadsRunning, bSlave ); - return kbdSuccess; + return iotSuccess; } static bool getDbConnPara( const iot_public::CSysInfoInterfacePtr &ptrSysInfo, @@ -98,7 +98,7 @@ static bool getDbConnPara( const iot_public::CSysInfoInterfacePtr &ptrSysInfo, CDbPara &objDbPara ) { iot_public::SNodeInfo stDbNodeInfo; - if ( kbdSuccess != ptrSysInfo->getNodeInfoByName( stDbInfo.strNodeName, stDbNodeInfo )) + if ( iotSuccess != ptrSysInfo->getNodeInfoByName( stDbInfo.strNodeName, stDbNodeInfo )) { LOGERROR( "getNodeInfoByName failed, continue !" ); return false; @@ -168,7 +168,7 @@ bool CDbSynSrvRedunSw::loadSysInfo() //< 获取本机域ID和主机名 { iot_public::SNodeInfo stLocalNodeInfo; - if ( kbdSuccess != ptrSysInfo->getLocalNodeInfo( stLocalNodeInfo )) + if ( iotSuccess != ptrSysInfo->getLocalNodeInfo( stLocalNodeInfo )) { LOGFATAL( "getLocalNodeInfo() failed !" ); return false; @@ -185,7 +185,7 @@ bool CDbSynSrvRedunSw::loadSysInfo() std::vector vecRemoteDbInfo; int nRc = ptrSysInfo->getDBInfoByDomainId( m_nLocalDomainID, stFirstDbInfo, vecLocalDbInfo, vecRemoteDbInfo ); - if ( kbdSuccess != nRc ) + if ( iotSuccess != nRc ) { LOGFATAL( "getDbInfoByNodeName failed , return false !" ); return false; diff --git a/platform/src/dbms/db_sysinfo_api/CDbSysInfo.cpp b/platform/src/dbms/db_sysinfo_api/CDbSysInfo.cpp index 20ac63fd..c13a6206 100644 --- a/platform/src/dbms/db_sysinfo_api/CDbSysInfo.cpp +++ b/platform/src/dbms/db_sysinfo_api/CDbSysInfo.cpp @@ -70,7 +70,7 @@ int CDbSysInfo::getAppIdByAppName( const std::string appName ) } SAppInfo stAppInfo; int nRet = m_ptrSysInfo->getAppInfoByName( appName, stAppInfo ); - if ( kbdFailed == nRet ) //ret value not right + if ( iotFailed == nRet ) //ret value not right { LOGERROR( "无法获取对应应用信息：%s", appName.c_str() ); return RDBERR_BASE; @@ -178,7 +178,7 @@ int CDbSysInfo::getAppIdByTableName( const std::string& strAppName, const std::s // 根据app名称查找app信息 SAppInfo stAppInfo; - if (kbdSuccess != m_ptrSysInfo->getAppInfoByName(strAppName, stAppInfo)) + if (iotSuccess != m_ptrSysInfo->getAppInfoByName(strAppName, stAppInfo)) { LOGERROR("getAppIdByTableName(): 未找到该应用 strAppName == %s", strAppName.c_str()); return CN_InvalidAppId; diff --git a/platform/src/dbms/rdb_api/CRdbLoadTableAttribute.cpp b/platform/src/dbms/rdb_api/CRdbLoadTableAttribute.cpp index fc3f3bd0..ac5f574d 100644 --- a/platform/src/dbms/rdb_api/CRdbLoadTableAttribute.cpp +++ b/platform/src/dbms/rdb_api/CRdbLoadTableAttribute.cpp @@ -161,16 +161,16 @@ int CRdbLoadTableAttribute::CreateTableByConfig( QString sFile ) { SNodeInfo stNodeInfo; nRet = m_sysInfo->getLocalNodeInfo( stNodeInfo ); - if ( kbdFailed == nRet ) + if ( iotFailed == nRet ) { - LOGERROR( "getLocalNodeInfo return kbdFailed!" ); + LOGERROR( "getLocalNodeInfo return iotFailed!" ); continue; } vector vecLocationInfo; nRet = m_sysInfo->getLocationListByDomainId( stNodeInfo.nDomainId, vecLocationInfo ); - if ( kbdFailed == nRet ) + if ( iotFailed == nRet ) { - LOGERROR( "getLocaltionListByDomainId return kbdFailed!" ); + LOGERROR( "getLocaltionListByDomainId return iotFailed!" ); continue; } for ( vector::iterator iter = vecLocationInfo.begin(); iter != vecLocationInfo.end(); ++iter ) @@ -188,9 +188,9 @@ int CRdbLoadTableAttribute::CreateTableByConfig( QString sFile ) { vector vecSubsystemInfo; int nRet = m_sysInfo->getSubsystemListByAppId( m_nAppId, vecSubsystemInfo ); - if ( kbdFailed == nRet ) + if ( iotFailed == nRet ) { - LOGERROR( "getSubsystemListByAppName return kbdFailed!" ); + LOGERROR( "getSubsystemListByAppName return iotFailed!" ); continue; } for ( vector::iterator iter = vecSubsystemInfo.begin(); iter != vecSubsystemInfo.end(); ++iter ) diff --git a/platform/src/dbms/rdb_api/CRdbLoadTableData.cpp b/platform/src/dbms/rdb_api/CRdbLoadTableData.cpp index 826c0788..6cce435e 100644 --- a/platform/src/dbms/rdb_api/CRdbLoadTableData.cpp +++ b/platform/src/dbms/rdb_api/CRdbLoadTableData.cpp @@ -126,9 +126,9 @@ int CRdbLoadTableData::getLocationAndSubsystemConditon( SRdbTableAttribute* pRdb } vector vecSubsystemInfo; int nRet = ptrSysInfo->getSubsystemListByAppId( m_nAppId, vecSubsystemInfo ); - if ( kbdFailed == nRet ) + if ( iotFailed == nRet ) { - LOGERROR( "getSubsystemListByAppName return kbdFailed!" ); + LOGERROR( "getSubsystemListByAppName return iotFailed!" ); return RDBERR_BASE; } @@ -136,15 +136,15 @@ int CRdbLoadTableData::getLocationAndSubsystemConditon( SRdbTableAttribute* pRdb { SNodeInfo stNodeInfo; nRet = ptrSysInfo->getLocalNodeInfo( stNodeInfo ); - if ( kbdFailed == nRet ) + if ( iotFailed == nRet ) { - LOGERROR( "getLocalNodeInfo return kbdFailed!" ); + LOGERROR( "getLocalNodeInfo return iotFailed!" ); return RDBERR_BASE; } nRet = ptrSysInfo->getLocationListByDomainId( stNodeInfo.nDomainId, vecLocationInfo ); - if ( kbdFailed == nRet ) + if ( iotFailed == nRet ) { - LOGERROR( "getLocaltionListByDomainId return kbdFailed!" ); + LOGERROR( "getLocaltionListByDomainId return iotFailed!" ); return RDBERR_BASE; } } diff --git a/platform/src/dbms/rdb_api/CRdbMngInterface.cpp b/platform/src/dbms/rdb_api/CRdbMngInterface.cpp index ec63edf3..3bc23628 100644 --- a/platform/src/dbms/rdb_api/CRdbMngInterface.cpp +++ b/platform/src/dbms/rdb_api/CRdbMngInterface.cpp @@ -50,7 +50,7 @@ bool iot_dbms::CRdbMngIntereface::loadAppDb( const std::string& strAppName ) } SAppInfo stAppInfo; nRet = ptrSysInfo->getAppInfoByName( strAppName, stAppInfo ); - if ( kbdFailed == nRet ) + if ( iotFailed == nRet ) { LOGERROR( "getAppInfoByName error" ); return false; diff --git a/platform/src/dbms/rdb_api/CRdbServerMemMan.cpp b/platform/src/dbms/rdb_api/CRdbServerMemMan.cpp index 01e3e352..866f7514 100644 --- a/platform/src/dbms/rdb_api/CRdbServerMemMan.cpp +++ b/platform/src/dbms/rdb_api/CRdbServerMemMan.cpp @@ -113,7 +113,7 @@ int CRdbServerMemMan::init( int nAppId ) } SAppInfo stAppInfo; int nRet = ptrSysInfo->getAppInfoById( m_nAppId, stAppInfo ); - if ( kbdFailed == nRet ) //ret value not right + if ( iotFailed == nRet ) //ret value not right { LOGERROR( "无法获取对应应用信息ID：%d", m_nAppId ); return RDBERR_BASE; diff --git a/platform/src/dbms/rdb_api/RdbFunc.cpp b/platform/src/dbms/rdb_api/RdbFunc.cpp index ccb9db0b..b6d77b13 100644 --- a/platform/src/dbms/rdb_api/RdbFunc.cpp +++ b/platform/src/dbms/rdb_api/RdbFunc.cpp @@ -58,14 +58,14 @@ int iot_dbms::getSubSystemFlagByAppName( const std::string& strAppName, unsigned return RDBERR_BASE; } int nRet = ptrSysInfo->getAppInfoByName( strAppName, stAppInfo ); - if ( kbdFailed == nRet ) + if ( iotFailed == nRet ) { LOGERROR( "getAppInfoByName return failed!" ); return RDBERR_BASE; } std::vector vecSubsystemInfo; nRet = ptrSysInfo->getSubsystemListByAppId( stAppInfo.nId, vecSubsystemInfo ); - if ( kbdFailed == nRet ) + if ( iotFailed == nRet ) { LOGERROR( "getSubsystemListByAppId return failed!" ); return RDBERR_BASE; diff --git a/platform/src/dbms/rdb_changedata_server/CRdbChangeDataRedunSw.cpp b/platform/src/dbms/rdb_changedata_server/CRdbChangeDataRedunSw.cpp index 3788d8d8..2604de35 100644 --- a/platform/src/dbms/rdb_changedata_server/CRdbChangeDataRedunSw.cpp +++ b/platform/src/dbms/rdb_changedata_server/CRdbChangeDataRedunSw.cpp @@ -45,7 +45,7 @@ int CRdbChangeDataRedunSw::redundantSwitch( bool bMaster, bool bSlave ) m_pProcManage->updateProcessInfo( true, bMaster, bSlave ); } - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/dbms/rdb_changedata_server/CRdbChangeDataServer.cpp b/platform/src/dbms/rdb_changedata_server/CRdbChangeDataServer.cpp index 1f9898fe..b9cdf376 100644 --- a/platform/src/dbms/rdb_changedata_server/CRdbChangeDataServer.cpp +++ b/platform/src/dbms/rdb_changedata_server/CRdbChangeDataServer.cpp @@ -142,7 +142,7 @@ bool CRdbChangeDataServer::stop() int CRdbChangeDataServer::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } bool CRdbChangeDataServer::isAlreadyRunning() diff --git a/platform/src/dbms/rdb_server/CRdbService.cpp b/platform/src/dbms/rdb_server/CRdbService.cpp index c1f2ca81..57ff0d40 100644 --- a/platform/src/dbms/rdb_server/CRdbService.cpp +++ b/platform/src/dbms/rdb_server/CRdbService.cpp @@ -195,7 +195,7 @@ bool CRdbService::start( int argc, char* argv[], int& nStatus ) return false; } - nStatus = kbdSuccess; + nStatus = iotSuccess; return true; } @@ -406,5 +406,5 @@ bool CRdbService::stop() int CRdbService::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/dbms/rdb_server/CRdbServiceThread.cpp b/platform/src/dbms/rdb_server/CRdbServiceThread.cpp index 943047b8..e8ce7b86 100644 --- a/platform/src/dbms/rdb_server/CRdbServiceThread.cpp +++ b/platform/src/dbms/rdb_server/CRdbServiceThread.cpp @@ -22,7 +22,7 @@ CRdbServiceThread::~CRdbServiceThread() //{ // using namespace iot_net; // m_objMbCommREQ.recvMsg(m_objRequest); -// return kbdSuccess; +// return iotSuccess; //} void CRdbServiceThread::execute() diff --git a/platform/src/dbms/rdb_server/CRedundantSwitch.cpp b/platform/src/dbms/rdb_server/CRedundantSwitch.cpp index 697b618b..81991f34 100644 --- a/platform/src/dbms/rdb_server/CRedundantSwitch.cpp +++ b/platform/src/dbms/rdb_server/CRedundantSwitch.cpp @@ -48,7 +48,7 @@ int CRedundantSwitch::redundantSwitch( bool bMaster, bool bSlave ) { m_ptrProcManage->updateProcessInfo( true, bMaster, bSlave ); } - return kbdSuccess; + return iotSuccess; /* if (m_stRunAppInfo.nAppId != CN_AppId_BASE) diff --git a/platform/src/dbms/rdb_studio/main.cpp b/platform/src/dbms/rdb_studio/main.cpp index 4a35d65b..aef9bc8a 100644 --- a/platform/src/dbms/rdb_studio/main.cpp +++ b/platform/src/dbms/rdb_studio/main.cpp @@ -8,7 +8,7 @@ int main( int argc, char* argv[] ) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); iot_public::StartLogSystem( "default", "rdb_studio" ); QApplication a( argc, argv ); diff --git a/platform/src/dbms/tsdb_api/TsdbApi.cpp b/platform/src/dbms/tsdb_api/TsdbApi.cpp index 37f553c7..4fb2af7b 100644 --- a/platform/src/dbms/tsdb_api/TsdbApi.cpp +++ b/platform/src/dbms/tsdb_api/TsdbApi.cpp @@ -73,7 +73,7 @@ CTsdbConnPtr getOneUseableConn(bool bLocalDomain) //< 本机节点信息 iot_public::SNodeInfo stLocalNodeInfo; int nRc = ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo); - if (kbdSuccess != nRc) + if (iotSuccess != nRc) { LOGERROR("getLocalNodeInfo failed , return NULL !"); return ptrConn; @@ -85,7 +85,7 @@ CTsdbConnPtr getOneUseableConn(bool bLocalDomain) std::vector vecRemoteDbInfo; nRc = ptrSysInfo->getDBInfoByDomainId(stLocalNodeInfo.nDomainId, stFirstDbInfo, vecLocalDbInfo, vecRemoteDbInfo); - if (kbdSuccess != nRc) + if (iotSuccess != nRc) { LOGERROR("getDbInfoByNodeName failed , return NULL !"); return ptrConn; @@ -108,7 +108,7 @@ CTsdbConnPtr getOneUseableConn(bool bLocalDomain) iot_public::SNodeInfo stNodeInfoToCheck; nRc = ptrSysInfo->getNodeInfoByName((*pvecDbToCheck)[nDbInfoIndex].strNodeName, stNodeInfoToCheck); - if (kbdSuccess != nRc) + if (iotSuccess != nRc) { LOGERROR("getNodeInfoByName failed, continue !"); continue; diff --git a/platform/src/dbms/tsdb_save/CNodeMng.cpp b/platform/src/dbms/tsdb_save/CNodeMng.cpp index 05c52ca1..0d5f7076 100644 --- a/platform/src/dbms/tsdb_save/CNodeMng.cpp +++ b/platform/src/dbms/tsdb_save/CNodeMng.cpp @@ -79,7 +79,7 @@ bool CNodeMng::init() //< 获取本机域ID和主机名 { iot_public::SNodeInfo stLocalNodeInfo; - if (kbdSuccess != ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) + if (iotSuccess != ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) { LOGERROR("getLocalNodeInfo() failed !"); return false; @@ -95,7 +95,7 @@ bool CNodeMng::init() std::vector vecRemoteDbInfo; int nRc = ptrSysInfo->getDBInfoByDomainId(m_nLocalDomainID, stFirstDbInfo, vecLocalDbInfo, vecRemoteDbInfo); - if (kbdSuccess != nRc) + if (iotSuccess != nRc) { LOGERROR("getDbInfoByNodeName failed , return false !"); return false; @@ -107,7 +107,7 @@ bool CNodeMng::init() iot_public::SNodeInfo stDbNodeInfo; nRc = ptrSysInfo->getNodeInfoByName(vecLocalDbInfo[nDbInfoIndex].strNodeName, stDbNodeInfo); - if (kbdSuccess != nRc) + if (iotSuccess != nRc) { LOGERROR("getNodeInfoByName failed, continue !"); continue; @@ -146,7 +146,7 @@ bool CNodeMng::init() iot_public::SNodeInfo stDbNodeInfo; nRc = ptrSysInfo->getNodeInfoByName(vecRemoteDbInfo[nDbInfoIndex].strNodeName, stDbNodeInfo); - if (kbdSuccess != nRc) + if (iotSuccess != nRc) { LOGERROR("getNodeInfoByName failed, continue !"); continue; diff --git a/platform/src/dbms/tsdb_save/CTsdbSaveRedunSw.cpp b/platform/src/dbms/tsdb_save/CTsdbSaveRedunSw.cpp index 6938beb8..e1b3fdc3 100644 --- a/platform/src/dbms/tsdb_save/CTsdbSaveRedunSw.cpp +++ b/platform/src/dbms/tsdb_save/CTsdbSaveRedunSw.cpp @@ -41,7 +41,7 @@ int CTsdbSaveRedunSw::redundantSwitch(bool bMaster, bool bSlave) m_pParent->updateProcInfo(true, m_objFrontThread.isThreadRunning(), bSlave); - return kbdSuccess; + return iotSuccess; } } //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_save/CTsdbSaveSrv.cpp b/platform/src/dbms/tsdb_save/CTsdbSaveSrv.cpp index c812cfc6..6e2dc9e8 100644 --- a/platform/src/dbms/tsdb_save/CTsdbSaveSrv.cpp +++ b/platform/src/dbms/tsdb_save/CTsdbSaveSrv.cpp @@ -142,7 +142,7 @@ bool CTsdbSaveSrv::start(int argc, char *argv[], int& /*nStatus*/) break; case RM_NO_PROC_MNG_MASTER: { - if (kbdSuccess != m_ptrRedunSw->redundantSwitch(true, false)) + if (iotSuccess != m_ptrRedunSw->redundantSwitch(true, false)) { LOGFATAL("以主机模式启动失败！"); return false; @@ -151,7 +151,7 @@ bool CTsdbSaveSrv::start(int argc, char *argv[], int& /*nStatus*/) break; case RM_NO_PROC_MNG_SLAVE: { - if (kbdSuccess != m_ptrRedunSw->redundantSwitch(false, true)) + if (iotSuccess != m_ptrRedunSw->redundantSwitch(false, true)) { LOGFATAL("以备机模式启动失败！"); return false; @@ -242,7 +242,7 @@ bool CTsdbSaveSrv::stop() int CTsdbSaveSrv::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } @@ -253,7 +253,7 @@ int CTsdbSaveSrv::updateProcInfo(bool bActive, bool bMaster, bool bSlave) return m_ptrProcMng->updateProcessInfo(bActive, bMaster, bSlave); } - return kbdFailed; + return iotFailed; } diff --git a/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/CAddSampleApp.cpp b/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/CAddSampleApp.cpp index c251b75d..6bf7d94f 100644 --- a/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/CAddSampleApp.cpp +++ b/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/CAddSampleApp.cpp @@ -67,7 +67,7 @@ bool CAddSampleApp::stop() int CAddSampleApp::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } } diff --git a/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/CAddSampleThread.cpp b/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/CAddSampleThread.cpp index d3598de1..9f236070 100644 --- a/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/CAddSampleThread.cpp +++ b/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/CAddSampleThread.cpp @@ -28,9 +28,9 @@ CAddSampleThread::CAddSampleThread() : CSysInfoInterfacePtr spSysInfo; if (iot_public::createSysInfoInstance(spSysInfo)) { - if (kbdSuccess != spSysInfo->getLocalNodeInfo(stNodeInfo)) + if (iotSuccess != spSysInfo->getLocalNodeInfo(stNodeInfo)) { - std::cout << "kbdSuccess != spSysInfo->getLocalNodeInfo(stNodeInfo)" << std::endl; + std::cout << "iotSuccess != spSysInfo->getLocalNodeInfo(stNodeInfo)" << std::endl; } } diff --git a/platform/src/gui/GraphDataAcess/CGraphDataAcess.cpp b/platform/src/gui/GraphDataAcess/CGraphDataAcess.cpp index 9755d95e..8f6d06f9 100644 --- a/platform/src/gui/GraphDataAcess/CGraphDataAcess.cpp +++ b/platform/src/gui/GraphDataAcess/CGraphDataAcess.cpp @@ -778,11 +778,11 @@ QList CGraphDataAcess::getLocationInfoById(int locationId) { QList retList; SLocationInfo stLocationInfo; - int ret = kbdFailed; + int ret = iotFailed; if(m_sysInfo) ret = m_sysInfo->getLocationInfoById(locationId, stLocationInfo); - if(ret == kbdFailed) + if(ret == iotFailed) { retList.push_back(-1); } @@ -819,11 +819,11 @@ QList CGraphDataAcess::getLocationInfoByName(const QString &locationNa { QList retList; SLocationInfo stLocationInfo; - int ret = kbdFailed; + int ret = iotFailed; if(m_sysInfo) ret = m_sysInfo->getLocationInfoByName(locationName.toStdString(), stLocationInfo); - if(ret == kbdFailed) + if(ret == iotFailed) { retList.push_back(-1); } @@ -1574,7 +1574,7 @@ bool CGraphDataAcess::getMenuStringByValue(const QString &menuName, const int &m bool CGraphDataAcess::initSimLock(const std::vector &vecKeyIdTag, const std::vector &vecCurValue, const std::vector &vecStatus, std::string &strErrDesc) { bool bRet = false; - m_lockCal = kbd_app::getSimInterLockInstance(); + m_lockCal = iot_app::getSimInterLockInstance(); qDebug() << "CExplorerView initSimLock1 :" ; bRet = m_lockCal->initialize(vecKeyIdTag, vecCurValue, vecStatus, strErrDesc); qDebug() << "CExplorerView initSimLock2 :" ; @@ -1634,7 +1634,7 @@ bool CGraphDataAcess::health() // int appNo = getAppIdByName("base"); iot_sys::SNodeRedundantInfo stMasterNodeInfo; - if(kbdSuccess != ptrRedundancyInfo->getMasterNodeInfo(stNodeInfo.nDomainId, CN_AppId_BASE, stMasterNodeInfo)) + if(iotSuccess != ptrRedundancyInfo->getMasterNodeInfo(stNodeInfo.nDomainId, CN_AppId_BASE, stMasterNodeInfo)) { return false; } diff --git a/platform/src/gui/GraphDataAcess/CGraphDataAcess.h b/platform/src/gui/GraphDataAcess/CGraphDataAcess.h index b9e3da22..a14c6845 100644 --- a/platform/src/gui/GraphDataAcess/CGraphDataAcess.h +++ b/platform/src/gui/GraphDataAcess/CGraphDataAcess.h @@ -13,7 +13,7 @@ #include "alarm_server_api/CAlmApiForApp.h" #include "sys_dog_auth_api/DogAuthInterface.h" -using namespace kbd_app; +using namespace iot_app; using namespace iot_dbms; using namespace iot_service; using namespace iot_public; diff --git a/platform/src/gui/hmi/main.cpp b/platform/src/gui/hmi/main.cpp index d2714e3f..c20bb4f9 100644 --- a/platform/src/gui/hmi/main.cpp +++ b/platform/src/gui/hmi/main.cpp @@ -6,7 +6,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QTextCodec *codec = QTextCodec::codecForName("UTF-8"); QTextCodec::setCodecForLocale(codec); diff --git a/platform/src/include/application/app_bio_identify/acs_device_api/AcsDeviceApiCommon.h b/platform/src/include/application/app_bio_identify/acs_device_api/AcsDeviceApiCommon.h index 3d3b13fb..92c04284 100644 --- a/platform/src/include/application/app_bio_identify/acs_device_api/AcsDeviceApiCommon.h +++ b/platform/src/include/application/app_bio_identify/acs_device_api/AcsDeviceApiCommon.h @@ -17,7 +17,7 @@ /** * @brief 高级应用相关命名空间 */ -namespace kbd_application +namespace iot_application { class CFingerprintInfo @@ -80,4 +80,4 @@ public: std::list m_listFingerprint; //< 指纹信息，内含下发结果 }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/include/application/app_bio_identify/acs_device_api/CAcsDeviceApi.h b/platform/src/include/application/app_bio_identify/acs_device_api/CAcsDeviceApi.h index 1ceadb61..3383e221 100644 --- a/platform/src/include/application/app_bio_identify/acs_device_api/CAcsDeviceApi.h +++ b/platform/src/include/application/app_bio_identify/acs_device_api/CAcsDeviceApi.h @@ -13,7 +13,7 @@ #include "AcsDeviceApiExport.h" #include "AcsDeviceApiCommon.h" -namespace kbd_application +namespace iot_application { class CAcsDeviceApiImpl; //< 实现类 @@ -158,4 +158,4 @@ private: CAcsDeviceApiImpl *m_pImpl; }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/include/application/app_fbd/fbd_common/BaseModule.h b/platform/src/include/application/app_fbd/fbd_common/BaseModule.h index 722fc01a..7034cf0d 100644 --- a/platform/src/include/application/app_fbd/fbd_common/BaseModule.h +++ b/platform/src/include/application/app_fbd/fbd_common/BaseModule.h @@ -11,7 +11,7 @@ #include "FbdDiagDataStruct.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -27,7 +27,7 @@ public: * @param stModuleKey ：模块的唯一标识 * m_strExtraParam ： 附加参数 * @return 是否成功 - * @retval kbdSuccess、kbdFailed + * @retval iotSuccess、iotFailed **********************************************************************************/ virtual int init( const SFbdModKey &stModuleKey, const std::string &strExtraParam ) = 0; @@ -44,7 +44,7 @@ public: * 3、为备时是否可以释放部分资源 * @param bMaster 当前服务的主备状态 * @return 状态 - * @retval 成功返回kbdSuccess,失败返回错误码 + * @retval 成功返回iotSuccess,失败返回错误码 **********************************************************************************/ virtual int reset( const bool bMaster ) = 0; @@ -57,4 +57,4 @@ public: typedef boost::shared_ptr CBaseModulePtr; } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/include/application/app_fbd/fbd_common/FbdAlarmCltApi.h b/platform/src/include/application/app_fbd/fbd_common/FbdAlarmCltApi.h index 072d12e5..f532172a 100644 --- a/platform/src/include/application/app_fbd/fbd_common/FbdAlarmCltApi.h +++ b/platform/src/include/application/app_fbd/fbd_common/FbdAlarmCltApi.h @@ -26,7 +26,7 @@ class SIntelliAlmBroken; class SIntelliAlmRelease; } -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -41,7 +41,7 @@ public: /******************************************************************************//** * @brief 获取当前最后一条（按告警到达顺序）有效告警 * @param stAlmOutput： 输出获取的告警。若返回失败，则本对象 isValid 为false - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int getLastAlarm( SFbdAlarmInfo &stAlmOutput ) const = 0; @@ -51,7 +51,7 @@ public: * @param stPosition： 传入起始告警，允许与 stLastAlm 为同一个对象的引用 * vecOutput： 输出获取的告警，从 传入的stAlmInput（不包含） 之后的告警 * stLastAlm： 输出最后一条告警，若当前没有告警，则本对象 isValid 为false - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int getAlarmAfter( const SFbdAlarmInfo &stPosition, std::vector &vecOutput, @@ -61,7 +61,7 @@ public: * @brief 通过UUID在当前活动告警中获取告警信息 * @param strUuidBase64： 传入告警的唯一标识 * stOutput： 输出获取的告警。若没有，则本对象 isValid 为false - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int getAlarmByUuid( const std::string &strUuidBase64, SFbdAlarmInfo &stOutput ) const = 0; @@ -75,7 +75,7 @@ public: inline bool isAlarmAlive( const SFbdAlarmInfo &stAlmInfo ) const { SFbdAlarmInfo stOutput; - if ( kbdSuccess != getAlarmByUuid( stAlmInfo.getUuidBase64(), stOutput )) + if ( iotSuccess != getAlarmByUuid( stAlmInfo.getUuidBase64(), stOutput )) return false; return stOutput.isValid(); } @@ -112,7 +112,7 @@ public: * @brief 获取原始告警所属的智能告警 * @param stRawAlm： 传入查询对象，原始告警信息 * stItlAlm： 输出查询到的智能告警，若没有则 isValid 为false - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int getItlAlmByRawAlm( const SFbdAlarmInfo &stRawAlm, SFbdItlAlmInfo &stItlAlm ) const = 0; @@ -121,7 +121,7 @@ public: * @brief 通过UUID在当前活动智能告警中获取智能告警信息 * @param strUuidBase64： 传入智能告警的唯一标识 * stOutput： 输出获取的智能告警。若没有，则本对象 isValid 为false - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int getItlAlmByUuid( const std::string &strUuidBase64, SFbdItlAlmInfo &stOutput ) const = 0; @@ -135,7 +135,7 @@ public: inline bool isItlAlmAlive( const SFbdItlAlmInfo &stItlAlm ) const { SFbdItlAlmInfo stOutput; - if ( kbdSuccess != getItlAlmByUuid( stItlAlm.getUuidBase64(), stOutput )) + if ( iotSuccess != getItlAlmByUuid( stItlAlm.getUuidBase64(), stOutput )) return false; return stOutput.isValid(); } @@ -256,4 +256,4 @@ FBD_COMMON_API CFbdAlarmCltApiPtr getFbdAlarmCltApi(); FBD_COMMON_API long getFbdAlarmCltApiUseCount(); } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/include/application/app_fbd/fbd_common/FbdAlarmSrcApi.h b/platform/src/include/application/app_fbd/fbd_common/FbdAlarmSrcApi.h index fda2ad47..d02aeb92 100644 --- a/platform/src/include/application/app_fbd/fbd_common/FbdAlarmSrcApi.h +++ b/platform/src/include/application/app_fbd/fbd_common/FbdAlarmSrcApi.h @@ -33,7 +33,7 @@ #include "boost/shared_ptr.hpp" #include "FbdCommonExport.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -63,4 +63,4 @@ typedef boost::shared_ptr CFbdAlarmSrcApiPtr; FBD_COMMON_API CFbdAlarmSrcApiPtr getFbdAlarmSrcApi(); } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/include/application/app_fbd/fbd_common/FbdDiagDataApi.h b/platform/src/include/application/app_fbd/fbd_common/FbdDiagDataApi.h index 14472351..fecc7f1a 100644 --- a/platform/src/include/application/app_fbd/fbd_common/FbdDiagDataApi.h +++ b/platform/src/include/application/app_fbd/fbd_common/FbdDiagDataApi.h @@ -18,7 +18,7 @@ class SFBDDebugRequest; class SFBDDebugResponse; } -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -34,7 +34,7 @@ public: * @brief 获取指定模块的属性 * @param stPropertyKey： 属性的唯一标识 * strPropertyValue： 输出参数，属性值 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 *********************************************************************************/ virtual int getModProperty( const SFbdModPropKey &stPropertyKey, std::string &strPropertyValue ) const = 0; @@ -44,7 +44,7 @@ public: * @param stModuleKey： 模块名唯一标识 * strPropertyName： 属性名 * strPropertyValue： 输出参数，属性值 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ inline int getModProperty( const SFbdModKey &stModuleKey, const std::string &strPropertyName, @@ -58,7 +58,7 @@ public: * @brief 获取FBD模块输入端对应的值的key * @param stInputKey： 输入端口的唯一标识 * stValueKey： 输出参数，值的key，可通过此key来获取值 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int getValKeyByModInput( const SFbdModInputKey &stInputKey, SFbdValueKey &stValueKey ) const = 0; @@ -68,7 +68,7 @@ public: * @param stModuleKey： 模块名唯一标识 * nInputIndex： 输入端序号，从1开始 * stValueKey： 输出参数，值的key，可通过此key来获取值 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ inline int getValKeyByModInput( const SFbdModKey &stModuleKey, const int nInputIndex, @@ -82,7 +82,7 @@ public: * @brief 获取FBD模块输入端对应的值的key * @param stOutputKey： 输出端口的唯一标识 * stValueKey： 输出参数，值的key，可通过此key来获取值 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int getValKeyByModOutput( const SFbdModOutputKey &stOutputKey, SFbdValueKey &stValueKey ) const = 0; @@ -92,7 +92,7 @@ public: * @param stModuleKey： 模块名唯一标识 * nOutputIndex： 输出端序号，从1开始 * stValueKey： 输出参数，值的key，可通过此key来获取值 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ inline int getValKeyByModOutput( const SFbdModKey &stModuleKey, const int nOutputIndex, @@ -106,7 +106,7 @@ public: * @brief 获取数字类型量（布尔、整型、浮点）值 * @param stValueKey： 值的key * stValAndSta： 输出，值 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int getNumericValByKey( const SFbdValueKey &stValueKey, SFbdNumericValue &stValAndSta ) const = 0; @@ -115,7 +115,7 @@ public: * @brief 设置数字类型量（布尔、整型、浮点）值 * @param stValueKey： 值的key * stValAndSta： 设置的值 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int setNumericValByKey( const SFbdValueKey &stValueKey, const SFbdNumericValue &stValAndSta ) = 0; @@ -124,7 +124,7 @@ public: * @brief 获取文本类型量值 * @param stValueKey： 值的key * stValAndSta： 输出，值 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int getStringValByKey( const SFbdValueKey &stValueKey, SFbdStringValue &stValAndSta ) const = 0; @@ -133,7 +133,7 @@ public: * @brief 设置文本类型量值 * @param stValueKey： 值的key * stValAndSta： 设置的值 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int setStringValByKey( const SFbdValueKey &stValueKey, const SFbdStringValue &stValAndSta ) = 0; @@ -142,7 +142,7 @@ public: * @brief 获取告警类型量（包括事件）值 * @param stValueKey： 值的key * stValAndSta： 输出，值 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int getAlarmValByKey( const SFbdValueKey &stValueKey, SFbdAlarmValue &stValAndSta ) const = 0; @@ -151,7 +151,7 @@ public: * @brief 设置告警类型量（包括事件）值 * @param stValueKey： 值的key * stValAndSta： 设置的值 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int setAlarmValByKey( const SFbdValueKey &stValueKey, const SFbdAlarmValue &stValAndSta ) = 0; @@ -165,7 +165,7 @@ private: /******************************************************************************//** * @brief 获取本应用所有的FBD组列表 * @param vecGrpInfo： 输出，FBD组列表 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int getAllGroupInfo( std::vector &vecGrpInfo ) const = 0; @@ -173,7 +173,7 @@ private: * @brief 获取指定FBD组的模块信息列表 * @param nFbdGrpId： FBD组ID * vecModuleInfo： 输出，组中所有的模块 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int getModuleInfoByGroup( const int nFbdGrpId, std::vector &vecModuleInfo ) const = 0; @@ -181,7 +181,7 @@ private: /******************************************************************************//** * @brief 从本类管理的内存中，删除指定FBD组的所有数据 * @param nFbdGrpId： 要删除的FBD组ID - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int deleteAllDataByGroup( const int nFbdGrpId ) = 0; @@ -189,7 +189,7 @@ private: * @brief 将指定FBD组的所有数据，插入到本类管理的内存中 * @param stGrpInfo： FBD组信息 * stGrpData： 要插入的FBD组数据 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int insertAllDataByGroup( const SFbdGroupInfo &stGrpInfo, const SFbdGroupData &stGrpData ) = 0; @@ -197,7 +197,7 @@ private: * @brief 传入调试请求消息，获取调试响应消息 * @param objReq：请求消息，输入参数 * objRep： 响应消息，输出参数 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 **********************************************************************************/ virtual int getDebugResponse( const iot_idl::SFBDDebugRequest &objReq, iot_idl::SFBDDebugResponse &objRep ) = 0; @@ -209,4 +209,4 @@ typedef boost::shared_ptr CFbdDiagDataApiPtr; FBD_COMMON_API CFbdDiagDataApiPtr getFbdDiagDataApi(); } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/include/application/app_fbd/fbd_common/FbdDiagDataStruct.h b/platform/src/include/application/app_fbd/fbd_common/FbdDiagDataStruct.h index 05281e82..18724b67 100644 --- a/platform/src/include/application/app_fbd/fbd_common/FbdDiagDataStruct.h +++ b/platform/src/include/application/app_fbd/fbd_common/FbdDiagDataStruct.h @@ -26,7 +26,7 @@ class SIntelliAlmInfo; //< SFbdItlAlmInfo 中使用 class SAlmInfoToAlmClt; //< SFbdAlarmInfo 中使用 } -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -470,7 +470,7 @@ struct SFbdModPropKey //< 屏蔽编译告警，我们的场景没有必要处理 -//< class“boost::shared_ptr”需要有 dll 接口由 struct“kbd_app::app_fbd::SFbdValueKey”的客户端使用 +//< class“boost::shared_ptr”需要有 dll 接口由 struct“iot_app::app_fbd::SFbdValueKey”的客户端使用 #ifdef _MSC_VER #pragma warning(push) #pragma warning(disable: 4251) @@ -505,4 +505,4 @@ private: #endif } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/include/application/app_fbd/fbd_common/FbdPointSubApi.h b/platform/src/include/application/app_fbd/fbd_common/FbdPointSubApi.h index feb04665..2b158fbc 100644 --- a/platform/src/include/application/app_fbd/fbd_common/FbdPointSubApi.h +++ b/platform/src/include/application/app_fbd/fbd_common/FbdPointSubApi.h @@ -7,7 +7,7 @@ #include "FbdCommonExport.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -23,7 +23,7 @@ public: @param const std::string & strTableName 表名 @param const std::string & strTagName 主键 @param const std::string & strColName 列名 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual void addPointSub( const std::string &strTableName, const std::string &strTagName, @@ -34,7 +34,7 @@ public: @param const std::string & strTableName 表名 @param const std::string & strTagName 主键 @param const std::string & strColName 列名 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual void delPointSub( const std::string &strTableName, const std::string &strTagName, @@ -44,7 +44,7 @@ public: @param const std::string & strPntKey 表名.位置.设备.测点.列名 @param double & dValue 返回的值 @param int & nStatus 返回的状态 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int getPntValAndSta( const std::string &strPntKey, double &dValue, int &nStatus ) = 0; @@ -67,7 +67,7 @@ private: @param const std::string & strPntKey 表名.位置.设备.测点.列名 @param double & dValue 返回的值 @param int & nStatus 返回的状态 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int setPntValAndSta( const std::string &strPntKey, double dValue, int nStatus ) = 0; @@ -76,7 +76,7 @@ private: @param const std::vector & vecPntKey 测点主键 @param const std::vector & vecValue 测点值 @param const std::vector & vecSta 测点状态 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int batchSetPntValAndSta( const std::vector &vecPntKey, const std::vector &vecValue, @@ -114,9 +114,9 @@ struct SLongKeyIdTagInfo @brief 拆分系统中长key，比如 station1.subsystem1.analog.station1.device1.yc1.value @param const std::string & strLongKeyIdTag 输入长key字符串 @param SLongKeyIdTagInfo & stKeyInfo 返回的拆分结果 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ FBD_COMMON_API int splitLongKeyIdTag( const std::string &strLongKeyIdTag, SLongKeyIdTagInfo &stKeyInfo ); } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/include/application/app_fbd/fbd_common/FbdSysInfoApi.h b/platform/src/include/application/app_fbd/fbd_common/FbdSysInfoApi.h index 05fd7e5e..828b0856 100644 --- a/platform/src/include/application/app_fbd/fbd_common/FbdSysInfoApi.h +++ b/platform/src/include/application/app_fbd/fbd_common/FbdSysInfoApi.h @@ -13,7 +13,7 @@ #include "FbdCommonExport.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -51,4 +51,4 @@ typedef boost::shared_ptr CFbdSysInfoApiPtr; FBD_COMMON_API CFbdSysInfoApiPtr getFbdSysInfoApi(); } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/platform/src/include/application/sim_interlock_api/SimInterLockInterface.h b/platform/src/include/application/sim_interlock_api/SimInterLockInterface.h index 9e8abeec..a7e33f2f 100644 --- a/platform/src/include/application/sim_interlock_api/SimInterLockInterface.h +++ b/platform/src/include/application/sim_interlock_api/SimInterLockInterface.h @@ -20,7 +20,7 @@ /** * @brief 高级应用相关命名空间 */ -namespace kbd_app +namespace iot_app { /** @brief 模拟操作闭锁检查接口库 diff --git a/platform/src/include/common/Common.h b/platform/src/include/common/Common.h index 44feac12..1d363f7c 100644 --- a/platform/src/include/common/Common.h +++ b/platform/src/include/common/Common.h @@ -40,5 +40,5 @@ const int CN_AppId_PUBLIC = 2; const int CN_AppId_COMAPP = 3; /* @brief 返回值定义 */ -const int kbdSuccess = 0; -const int kbdFailed = 1; +const int iotSuccess = 0; +const int iotFailed = 1; diff --git a/platform/src/include/common/QtAppGlobalSet.h b/platform/src/include/common/QtAppGlobalSet.h index 9909e110..689f85de 100644 --- a/platform/src/include/common/QtAppGlobalSet.h +++ b/platform/src/include/common/QtAppGlobalSet.h @@ -18,7 +18,7 @@ #endif -namespace kbd_common +namespace iot_common { /** diff --git a/platform/src/include/public/pub_lua_engine_api/LuaEngineImpl.inl b/platform/src/include/public/pub_lua_engine_api/LuaEngineImpl.inl index 7172631a..f915243a 100644 --- a/platform/src/include/public/pub_lua_engine_api/LuaEngineImpl.inl +++ b/platform/src/include/public/pub_lua_engine_api/LuaEngineImpl.inl @@ -29,7 +29,7 @@ int CLuaEngineInterface::initialize() if (m_pLuaState == NULL) { LOGERROR("初始化Lua失败"); - return kbdFailed; + return iotFailed; } luaL_openlibs(m_pLuaState); } @@ -41,10 +41,10 @@ int CLuaEngineInterface::initialize() m_pLuaState = NULL; } LOGERROR("初始化Lua失败.error=%s", ex.what()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 加载函数 */ @@ -52,16 +52,16 @@ int CLuaEngineInterface::loadFunction(const std::string &strFunction) { if (strFunction.empty()) { - return kbdSuccess; + return iotSuccess; } if (luaL_dostring(m_pLuaState, strFunction.c_str())) { LOGERROR("加载函数失败.error=[%s]. func=[%s]", lua_tostring(m_pLuaState, -1), strFunction.c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 将C++参数转换为lua参数 */ @@ -114,9 +114,9 @@ bool CLuaEngineInterface::convertToLuaArgs(const LuaVariantTypeSeq &vecArgs, lua template int iot_public::CLuaEngineInterface::execFunction(const std::string &strFuncName, const std::string &strFunction, T1 &ret) { - if (kbdSuccess != loadFunction(strFunction)) + if (iotSuccess != loadFunction(strFunction)) { - return kbdFailed; + return iotFailed; } try @@ -127,15 +127,15 @@ int iot_public::CLuaEngineInterface::execFunction(const std::string &strFuncName ret = objRet.cast(); else{ LOGERROR("ret为nil"); - return kbdFailed; + return iotFailed; } } catch (const std::exception& ex) { LOGERROR("执行函数[%s]失败,error=[%s]", strFuncName.c_str(), ex.what()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 执行指定函数,带1个参数 */ @@ -145,9 +145,9 @@ int iot_public::CLuaEngineInterface::execFunction(const std::string &strFuncName const LuaVariantTypeSeq &vecArgs, T1 &ret) { - if (kbdSuccess != loadFunction(strFunction)) + if (iotSuccess != loadFunction(strFunction)) { - return kbdFailed; + return iotFailed; } try { @@ -155,22 +155,22 @@ int iot_public::CLuaEngineInterface::execFunction(const std::string &strFuncName luabridge::LuaRef v(m_pLuaState); if (!convertToLuaArgs(vecArgs, v)) { - return kbdFailed; + return iotFailed; } luabridge::LuaRef objRet = objFunc(v); if(!objRet.isNil()) ret = objRet.cast(); else{ LOGERROR("ret为nil"); - return kbdFailed; + return iotFailed; } } catch (const std::exception& ex) { LOGERROR("执行函数[%s]失败,error=[%s]", strFuncName.c_str(), ex.what()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 执行指定函数,带2个参数 */ @@ -181,9 +181,9 @@ int CLuaEngineInterface::execFunction(const std::string &strFuncName, const LuaVariantTypeSeq &vecArgs2, T1 &ret) { - if (kbdSuccess != loadFunction(strFunction)) + if (iotSuccess != loadFunction(strFunction)) { - return kbdFailed; + return iotFailed; } try @@ -193,13 +193,13 @@ int CLuaEngineInterface::execFunction(const std::string &strFuncName, luabridge::LuaRef v1(m_pLuaState); if (!convertToLuaArgs(vecArgs1, v1)) { - return kbdFailed; + return iotFailed; } luabridge::LuaRef v2(m_pLuaState); if (!convertToLuaArgs(vecArgs2, v2)) { - return kbdFailed; + return iotFailed; } luabridge::LuaRef objRet = objFunc(v1, v2); @@ -207,16 +207,16 @@ int CLuaEngineInterface::execFunction(const std::string &strFuncName, ret = objRet.cast(); else{ LOGERROR("ret为nil"); - return kbdFailed; + return iotFailed; } } catch (const std::exception& ex) { LOGERROR("执行函数[%s]失败,error=[%s]", strFuncName.c_str(), ex.what()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 执行指定函数,带3个参数 */ @@ -228,9 +228,9 @@ int CLuaEngineInterface::execFunction(const std::string &strFuncName, const LuaVariantTypeSeq &vecArgs3, T1 &ret) { - if (kbdSuccess != loadFunction(strFunction)) + if (iotSuccess != loadFunction(strFunction)) { - return kbdFailed; + return iotFailed; } try @@ -240,19 +240,19 @@ int CLuaEngineInterface::execFunction(const std::string &strFuncName, luabridge::LuaRef v1(m_pLuaState); if (!convertToLuaArgs(vecArgs1, v1)) { - return kbdFailed; + return iotFailed; } luabridge::LuaRef v2(m_pLuaState); if (!convertToLuaArgs(vecArgs2, v2)) { - return kbdFailed; + return iotFailed; } luabridge::LuaRef v3(m_pLuaState); if (!convertToLuaArgs(vecArgs3, v3)) { - return kbdFailed; + return iotFailed; } luabridge::LuaRef objRet = objFunc(v1, v2, v3); @@ -261,16 +261,16 @@ int CLuaEngineInterface::execFunction(const std::string &strFuncName, ret = objRet.cast(); else{ LOGERROR("ret为nil"); - return kbdFailed; + return iotFailed; } } catch (const std::exception& ex) { LOGERROR("执行函数[%s]失败,error=[%s]", strFuncName.c_str(), ex.what()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 执行指定函数,带4个参数 */ @@ -283,9 +283,9 @@ int iot_public::CLuaEngineInterface::execFunction(const std::string &strFuncName const LuaVariantTypeSeq &vecArgs4, T1 &ret) { - if (kbdSuccess != loadFunction(strFunction)) + if (iotSuccess != loadFunction(strFunction)) { - return kbdFailed; + return iotFailed; } try @@ -295,25 +295,25 @@ int iot_public::CLuaEngineInterface::execFunction(const std::string &strFuncName luabridge::LuaRef v1(m_pLuaState); if (!convertToLuaArgs(vecArgs1, v1)) { - return kbdFailed; + return iotFailed; } luabridge::LuaRef v2(m_pLuaState); if (!convertToLuaArgs(vecArgs2, v2)) { - return kbdFailed; + return iotFailed; } luabridge::LuaRef v3(m_pLuaState); if (!convertToLuaArgs(vecArgs3, v3)) { - return kbdFailed; + return iotFailed; } luabridge::LuaRef v4(m_pLuaState); if (!convertToLuaArgs(vecArgs4, v4)) { - return kbdFailed; + return iotFailed; } luabridge::LuaRef objRet = objFunc(v1, v2, v3, v4); @@ -321,14 +321,14 @@ int iot_public::CLuaEngineInterface::execFunction(const std::string &strFuncName ret = objRet.cast(); else{ LOGERROR("ret为nil"); - return kbdFailed; + return iotFailed; } } catch (const std::exception& ex) { LOGERROR("执行函数[%s]失败,error=[%s]", strFuncName.c_str(), ex.what()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/include/public/pub_lua_engine_api/LuaEngineInterface.h b/platform/src/include/public/pub_lua_engine_api/LuaEngineInterface.h index 7015dfef..5185be3b 100644 --- a/platform/src/include/public/pub_lua_engine_api/LuaEngineInterface.h +++ b/platform/src/include/public/pub_lua_engine_api/LuaEngineInterface.h @@ -36,13 +36,13 @@ namespace iot_public __inline virtual ~CLuaEngineInterface(); /** @brief 初始化函数 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ __inline int initialize(); /** @brief 加载函数 @param const std::string & strFunction 函数内容 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ __inline int loadFunction(const std::string &strFunction); @@ -51,7 +51,7 @@ namespace iot_public @param const std::string & strFuncName 函数名 @param const std::string & strFunction 函数内容，可以为空，为空时会调用loadFunction加载过的函数 @param T1 & ret 返回值 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ template int execFunction(const std::string &strFuncName, @@ -63,7 +63,7 @@ namespace iot_public @param const std::string & strFunction 函数内容，可以为空，为空时会调用loadFunction加载过的函数 @param const std::vector & vecArgs 函数参数 @param T2 & ret 返回值 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ template int execFunction(const std::string &strFuncName, @@ -77,7 +77,7 @@ namespace iot_public @param const std::vector & vecArgs1 函数参数1 @param const std::vector & vecArgs2 函数参数2 @param T3 & ret 返回值 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ template int execFunction(const std::string &strFuncName, @@ -93,7 +93,7 @@ namespace iot_public @param const std::vector & vecArgs2 函数参数2 @param const std::vector & vecArgs3 函数参数3 @param T4 & ret 返回值 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ template int execFunction(const std::string &strFuncName, @@ -111,7 +111,7 @@ namespace iot_public @param const std::vector & vecArgs3 函数参数3 @param const std::vector & vecArgs4 函数参数4 @param T5 & ret 返回值 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ template int execFunction(const std::string &strFuncName, diff --git a/platform/src/include/public/pub_sysinfo_api/SysInfoApi.h b/platform/src/include/public/pub_sysinfo_api/SysInfoApi.h index 04081e7b..eb32e861 100644 --- a/platform/src/include/public/pub_sysinfo_api/SysInfoApi.h +++ b/platform/src/include/public/pub_sysinfo_api/SysInfoApi.h @@ -42,7 +42,7 @@ namespace iot_public @brief 获取本机节点信息 @param[out] stNodeInfo 返回的节点信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getLocalNodeInfo(SNodeInfo &stNodeInfo) = 0; @@ -51,7 +51,7 @@ namespace iot_public @param[in] strAppName 应用名 @param[out] stRunAppInfo 返回的运行信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getLocalRunAppInfoByName(const std::string &strAppName, SRunAppInfo &stRunAppInfo) = 0; @@ -60,7 +60,7 @@ namespace iot_public @param[in] nAppId 应用ID @param[out] stRunAppInfo 返回的运行信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getLocalRunAppInfoById(int nAppId, SRunAppInfo &stRunAppInfo) = 0; @@ -68,7 +68,7 @@ namespace iot_public @brief 获取本节点的应用部署信息 @param[out] vecAppDeploy 返回的应用部署信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getLocalAppDeploy(std::vector &vecAppDeploy) = 0; @@ -77,7 +77,7 @@ namespace iot_public @param[in] strNodeName 节点名 @param[out] vecAppDeploy 返回的应用部署信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getAppDeployByNodeName(const std::string &strNodeName, std::vector &vecAppDeploy) = 0; @@ -87,7 +87,7 @@ namespace iot_public @param[in] nAppId 应用号 @param[out] stAppDeploy 返回的应用部署信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getAppDeployById(int nDomainId, int nAppId, SAppDeploy &stAppDeploy) = 0; @@ -97,7 +97,7 @@ namespace iot_public @param[in] strAppName 专业名 @param[out] stAppDeploy 返回的应用部署信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getAppDeployByName(const std::string &strDomainName, const std::string &strAppName, SAppDeploy &stAppDeploy) = 0; @@ -106,7 +106,7 @@ namespace iot_public @param[in] strNodeName 节点名 @param[out] stNodeInfo 返回的节点信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getNodeInfoByName(const std::string strNodeName, SNodeInfo &stNodeInfo) = 0; @@ -115,7 +115,7 @@ namespace iot_public @param[in] nDomainId 域号 @param[out] vecNodeInfo 返回的节点列表 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getNodeListByDomainId(int nDomainId, std::vector &vecNodeInfo) = 0; @@ -124,7 +124,7 @@ namespace iot_public @param[in] strDomainName 域名 @param[out] vecNodeInfo 返回的节点列表 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getNodeListByDomainName(const std::string &strDomainName, std::vector &vecNodeInfo) = 0; @@ -132,7 +132,7 @@ namespace iot_public @brief 获取所有的节点信息 @param[out] vecNodeInfo 返回的节点信息列表 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getAllNodeInfo(std::vector &vecNodeInfo) = 0; @@ -143,7 +143,7 @@ namespace iot_public @param[out] vecLocalDBInfo 返回的本地数据库列表 @param[out] vecRemoteDBInfo 返回的远程数据库列表 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getDBInfoByDomainId(int nDomainId, SDatabaseInfo &stFirstConnect, @@ -155,7 +155,7 @@ namespace iot_public @param[in] strNodeName 节点名 @param[out] stDBInfo 返回的数据库配置信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getDBInfoByNodeName(const std::string &strNodeName, SDatabaseInfo &stDBInfo) = 0; @@ -165,7 +165,7 @@ namespace iot_public @param[out] vecLocalDBInfo 返回的本地数据库列表 @param[out] vecRemoteDBInfo 返回的远程数据库列表 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getLocalDBInfo(SDatabaseInfo &stFirstConnect, std::vector &vecLocalDBInfo, @@ -177,7 +177,7 @@ namespace iot_public @param[in] nLocationId 位置号 @param[out] stLocationInfo 返回的位置信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getLocationInfoById(int nLocationId, SLocationInfo &stLocationInfo) = 0; @@ -186,7 +186,7 @@ namespace iot_public @param[in] strLocationName 位置名称 @param[out] stLocationInfo 返回的位置信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getLocationInfoByName(const std::string &strLocationName, SLocationInfo &stLocationInfo) = 0; @@ -195,7 +195,7 @@ namespace iot_public @param[in] nDomainId 域号 @param[out] vecLocationInfo 返回的位置信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getLocationListByDomainId(int nDomainId, std::vector &vecLocationInfo) = 0; @@ -203,7 +203,7 @@ namespace iot_public @brief 获取所有位置信息 @param[out] vecLocationInfo 返回的位置信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getAllLocationInfo(std::vector &vecLocationInfo) = 0; @@ -212,7 +212,7 @@ namespace iot_public @param[in] nDomainId 域号 @param[out] stDomainInfo 返回的域信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getDomainInfoById(int nDomainId, SDomainInfo &stDomainInfo) = 0; @@ -221,7 +221,7 @@ namespace iot_public @param[in] strDomainName 域名 @param[out] stDomainInfo 返回的域信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getDomainInfoByName(const std::string &strDomainName, SDomainInfo &stDomainInfo) = 0; @@ -230,7 +230,7 @@ namespace iot_public @param[in] strNodeName 节点名 @param[out] stDomainInfo 返回的域信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getDomainInfoByNodeName(const std::string strNodeName, SDomainInfo &stDomainInfo) = 0; @@ -238,7 +238,7 @@ namespace iot_public @brief 获取中心域信息 @param[out] stDomainInfo 返回的中心域信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getCenterDomainInfo(SDomainInfo &stDomainInfo) = 0; @@ -246,7 +246,7 @@ namespace iot_public @brief 获取所有域的信息 @param[out] vecDomainInfo 返回的域信息列表 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getAllDomainInfo(std::vector &vecDomainInfo) = 0; @@ -255,7 +255,7 @@ namespace iot_public @param[in] nSubsystemId 专业ID @param[out] stSubsystemInfo 返回的专业信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getSubsystemInfoById(int nSubsystemId, SSubsystemInfo &stSubsystemInfo) = 0; /** @@ -263,7 +263,7 @@ namespace iot_public @param[in] strSubsystemName 专业名称 @param[out] stSubsystemInfo 返回的专业信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getSubsystemInfoByName(const std::string &strSubsystemName, SSubsystemInfo &stSubsystemInfo) = 0; @@ -272,7 +272,7 @@ namespace iot_public @param[in] nAppId 应用ID @param[out] vecSubsystemInfo 返回的专业信息列表 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getSubsystemListByAppId(int nAppId, std::vector &vecSubsystemInfo) = 0; @@ -281,7 +281,7 @@ namespace iot_public @param[in] strAppName 应用名 @param[out] vecSubsystemInfo 返回的专业信息列表 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getSubsystemListByAppName(const std::string &strAppName, std::vector &vecSubsystemInfo) = 0; @@ -289,7 +289,7 @@ namespace iot_public @brief 获取所有的专业信息 @param[out] vecSubsystemInfo 返回的专业信息列表 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getAllSubsystemInfo(std::vector &vecSubsystemInfo) = 0; //virtual int getSubsystemListByNodeId(int nNodeId,std::vector &vecSubsystemInfo) = 0; @@ -299,7 +299,7 @@ namespace iot_public @param[in] nAppId 应用ID @param[out] stAppInfo 返回的应用信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getAppInfoById(int nAppId, SAppInfo &stAppInfo) = 0; @@ -308,7 +308,7 @@ namespace iot_public @param[in] strAppName 应用名 @param[out] stAppInfo 返回的应用信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getAppInfoByName(const std::string &strAppName, SAppInfo &stAppInfo) = 0; @@ -317,7 +317,7 @@ namespace iot_public @param[in] nSubsystemId 专业ID @param[out] stAppInfo 返回的应用信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getAppInfoBySubsystemId(int nSubsystemId, SAppInfo &stAppInfo) = 0; @@ -326,7 +326,7 @@ namespace iot_public @param[in] strSubsystemName 专业名 @param[out] stAppInfo 返回的应用信息 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getAppInfoBySubsystemName(const std::string &strSubsystemName, SAppInfo &stAppInfo) = 0; @@ -334,7 +334,7 @@ namespace iot_public @brief 获取所有的应用信息 @param[out] vecAppInfo 返回的应用信息列表 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getAllAppInfo(std::vector &vecAppInfo) = 0; @@ -342,7 +342,7 @@ namespace iot_public @brief 获取本节点部署的各应用下的进程列表 @param[out] mapProcInfo 返回的进程列表 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getLocalProcInfoList(SProcessInfoMAP &mapProcInfo) = 0; @@ -351,7 +351,7 @@ namespace iot_public @param[in] nAppId 应用ID @param[out] mapProcInfo 返回的该应用下的进程列表 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getProcInfoListByAppId(int nAppId, SProcessInfoMAP &mapProcInfo) = 0; @@ -359,7 +359,7 @@ namespace iot_public @brief 获取所有消息总线转发信息 @param[out] vecMbRelayInfo:输出 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getAllMbRelayInfo(std::vector &vecMbRelayInfo) = 0; @@ -368,7 +368,7 @@ namespace iot_public @param[in] nSrcDomainID 源域ID @param[out] vecMbRelayInfo 输出 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getMbRelayInfoBySrcDomainID(int nSrcDomainID, std::vector &vecMbRelayInfo) = 0; @@ -378,7 +378,7 @@ namespace iot_public @param[in] nDstDomainID 目标域ID @param[out] vecMbRelayInfo 输出 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getMbRelayInfoByDstDomainID(int nDstDomainID, std::vector &vecMbRelayInfo) = 0; @@ -389,7 +389,7 @@ namespace iot_public @param[in] nDstDomainID 目标域ID @param[out] stMbRelayInfo 输出 @return 执行结果 - @retval 成功返回 kbdSuccess ,失败返回 kbdFailed 或错误码 + @retval 成功返回 iotSuccess ,失败返回 iotFailed 或错误码 */ virtual int getMbRelayInfoBySrcAndDstDomainID(int nSrcDomainID, int nDstDomainID, SMbRelayInfo &stMbRelayInfo) = 0; diff --git a/platform/src/include/service/alarm_server_api/CAlmApiForDpSrv.h b/platform/src/include/service/alarm_server_api/CAlmApiForDpSrv.h index 2bab5d44..38b8756b 100644 --- a/platform/src/include/service/alarm_server_api/CAlmApiForDpSrv.h +++ b/platform/src/include/service/alarm_server_api/CAlmApiForDpSrv.h @@ -60,7 +60,7 @@ public: * 子类实现本函数，处理自身的业务逻辑 * @param strKeyIdTag ： 需要确认告警的测点KeyIdTag * nTimeStamp ： 需要确认告警的时间，RFC1305、POSIX时标标准 - * @return kbdSuccess / kbdFailed 或其他错误码 + * @return iotSuccess / iotFailed 或其他错误码 * * @retval 注意：若测点没有告警状态，重复确认该测点，也应当返回成功 **********************************************************************************/ diff --git a/platform/src/include/sys/sys_login_api/CLoginDlg.h b/platform/src/include/sys/sys_login_api/CLoginDlg.h index bcba0f57..c10f0ff3 100644 --- a/platform/src/include/sys/sys_login_api/CLoginDlg.h +++ b/platform/src/include/sys/sys_login_api/CLoginDlg.h @@ -61,7 +61,7 @@ public: * @param userId 用户id * @param userName 用户名 * @param userAlias 用户别名 - * @return 失败返回kbdFailed 成功返回kbdSuccess + * @return 失败返回iotFailed 成功返回iotSuccess */ int getUserInfo(int &userId,QString &userName,QString &userAlias); @@ -70,7 +70,7 @@ public: * @param usergId 用户组id * @param usergName 用户组名 * @param permLocation1 具有权限的车站 - * @return 失败返回kbdFailed 成功返回kbdSuccess + * @return 失败返回iotFailed 成功返回iotSuccess */ int getUserGroupInfo( int &usergId,QString &usergName,int &permLocation1); /** diff --git a/platform/src/include/sys/sys_network_check_api/NetworkCheckInterface.h b/platform/src/include/sys/sys_network_check_api/NetworkCheckInterface.h index 56289fc5..fc0c9e94 100644 --- a/platform/src/include/sys/sys_network_check_api/NetworkCheckInterface.h +++ b/platform/src/include/sys/sys_network_check_api/NetworkCheckInterface.h @@ -32,7 +32,7 @@ namespace iot_sys /** @brief 获取本节点网络状态 @param SNetStatus & stNetSta - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ virtual int getLocalNetStatus(SNetworkState &stNetSta) = 0; diff --git a/platform/src/include/tools/model_table/kbdexportimportlogic.h b/platform/src/include/tools/model_table/kbdexportimportlogic.h index dbce2aa6..df6b9e85 100644 --- a/platform/src/include/tools/model_table/kbdexportimportlogic.h +++ b/platform/src/include/tools/model_table/kbdexportimportlogic.h @@ -12,7 +12,7 @@ #include /** - * @brief The KbdExportImportLogic class 康必达模板导出，导入逻辑 + * @brief The KbdExportImportLogic class 宏茂技术模板导出，导入逻辑 * @note 随着设计更改,本类大部分功能已无用,只有部分函数有用 */ class TABLEMODULESHARED_EXPORT KbdExportImportLogic : public QObject diff --git a/platform/src/net/net_msg_bus/CMbServer.cpp b/platform/src/net/net_msg_bus/CMbServer.cpp index 958d8357..8a0ceaa8 100644 --- a/platform/src/net/net_msg_bus/CMbServer.cpp +++ b/platform/src/net/net_msg_bus/CMbServer.cpp @@ -282,7 +282,7 @@ bool CMbServer::stop() int CMbServer::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } @@ -402,7 +402,7 @@ bool CMbServer::loadConfig() } iot_public::SNodeInfo stLocalNodeInfo; - if (kbdSuccess != ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) + if (iotSuccess != ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) { LOGERROR("getLocalNodeInfo() failed !"); return false; diff --git a/platform/src/net/net_msg_bus_base_api/kmbmp.bnf b/platform/src/net/net_msg_bus_base_api/kmbmp.bnf index c19ea915..99fad30e 100644 --- a/platform/src/net/net_msg_bus_base_api/kmbmp.bnf +++ b/platform/src/net/net_msg_bus_base_api/kmbmp.bnf @@ -1,4 +1,4 @@ -The following ABNF grammar defines the 康必达消息总线管理协议（KBD Message Bus Management Protocol）: +The following ABNF grammar defines the 宏茂技术消息总线管理协议（KBD Message Bus Management Protocol）: kmbmp = *( MEMORY-ALIGNMENT | COMMON-RETURN-TRUE | COMMON-RETURN-FALSE | M2H-LOCAL-INFO-REQ | H2M-LOCAL-INFO | M2H-REMOTE-INFO-REQ | H2M-REMOTE-INFO ) diff --git a/platform/src/net/net_msg_bus_base_api/kmbmp.c b/platform/src/net/net_msg_bus_base_api/kmbmp.c index 23b76a50..59f0c97b 100644 --- a/platform/src/net/net_msg_bus_base_api/kmbmp.c +++ b/platform/src/net/net_msg_bus_base_api/kmbmp.c @@ -1,5 +1,5 @@ /* ========================================================================= - kmbmp - 康必达消息总线管理协议（KBD Message Bus Management Protocol） + kmbmp - 宏茂技术消息总线管理协议（KBD Message Bus Management Protocol） Codec class for kmbmp. @@ -17,7 +17,7 @@ /** @header - kmbmp - 康必达消息总线管理协议（KBD Message Bus Management Protocol） + kmbmp - 宏茂技术消息总线管理协议（KBD Message Bus Management Protocol） @discuss @end */ diff --git a/platform/src/net/net_msg_bus_base_api/kmbmp.h b/platform/src/net/net_msg_bus_base_api/kmbmp.h index ba3ae12a..dc178db6 100644 --- a/platform/src/net/net_msg_bus_base_api/kmbmp.h +++ b/platform/src/net/net_msg_bus_base_api/kmbmp.h @@ -1,5 +1,5 @@ /* ========================================================================= - kmbmp - 康必达消息总线管理协议（KBD Message Bus Management Protocol） + kmbmp - 宏茂技术消息总线管理协议（KBD Message Bus Management Protocol） Codec header for kmbmp. diff --git a/platform/src/net/net_msg_bus_base_api/kmbmp.xml b/platform/src/net/net_msg_bus_base_api/kmbmp.xml index f6bf5086..c3f7daec 100644 --- a/platform/src/net/net_msg_bus_base_api/kmbmp.xml +++ b/platform/src/net/net_msg_bus_base_api/kmbmp.xml @@ -7,7 +7,7 @@ ******************************************************************************** --> - diff --git a/platform/src/net/net_msg_bus_base_api/kmbp.bnf b/platform/src/net/net_msg_bus_base_api/kmbp.bnf index 146ee782..631da516 100644 --- a/platform/src/net/net_msg_bus_base_api/kmbp.bnf +++ b/platform/src/net/net_msg_bus_base_api/kmbp.bnf @@ -1,4 +1,4 @@ -The following ABNF grammar defines the 康必达消息总线协议（KBD Message Bus Protocol）: +The following ABNF grammar defines the 宏茂技术消息总线协议（KBD Message Bus Protocol）: kmbp = *( MEMORY-ALIGNMENT | COMMON-RETURN-TRUE | COMMON-RETURN-FALSE | C2H-DATA-PEER | C2H-DATA-HOST | C2H-DATA-DOMAIN | H2P-DATA | P2C-DATA | H2H-SUB-ALL | H2H-SUB-ALL-REQ | H2H-SUB-CHGCNT | H2H-SUB-CHGCNT-REQ | H2H-SUB-ADD | H2H-SUB-DEL | P2H-HEARTBEAT | P2H-SUB-ALL | H2P-SUB-ALL-REQ | P2H-SUB-ADD | P2H-SUB-DEL | C2P-REG | C2P-UNREG | C2P-SUB-ADD | C2P-SUB-DEL | C2P-SUB-ALL-REQ | P2C-SUB-ALL ) diff --git a/platform/src/net/net_msg_bus_base_api/kmbp.c b/platform/src/net/net_msg_bus_base_api/kmbp.c index dd0d23dc..a884dfad 100644 --- a/platform/src/net/net_msg_bus_base_api/kmbp.c +++ b/platform/src/net/net_msg_bus_base_api/kmbp.c @@ -1,5 +1,5 @@ /* ========================================================================= - kmbp - 康必达消息总线协议（KBD Message Bus Protocol） + kmbp - 宏茂技术消息总线协议（KBD Message Bus Protocol） Codec class for kmbp. @@ -17,7 +17,7 @@ /** @header - kmbp - 康必达消息总线协议（KBD Message Bus Protocol） + kmbp - 宏茂技术消息总线协议（KBD Message Bus Protocol） @discuss @end */ diff --git a/platform/src/net/net_msg_bus_base_api/kmbp.h b/platform/src/net/net_msg_bus_base_api/kmbp.h index 6ddeb234..cf07c609 100644 --- a/platform/src/net/net_msg_bus_base_api/kmbp.h +++ b/platform/src/net/net_msg_bus_base_api/kmbp.h @@ -1,5 +1,5 @@ /* ========================================================================= - kmbp - 康必达消息总线协议（KBD Message Bus Protocol） + kmbp - 宏茂技术消息总线协议（KBD Message Bus Protocol） Codec header for kmbp. diff --git a/platform/src/net/net_msg_bus_base_api/kmbp.xml b/platform/src/net/net_msg_bus_base_api/kmbp.xml index 9c35a0dc..95d4ebdd 100644 --- a/platform/src/net/net_msg_bus_base_api/kmbp.xml +++ b/platform/src/net/net_msg_bus_base_api/kmbp.xml @@ -7,7 +7,7 @@ ******************************************************************************** --> - diff --git a/platform/src/net/net_msg_bus_relay/CDomainMng.cpp b/platform/src/net/net_msg_bus_relay/CDomainMng.cpp index 722a2f9e..966a39c7 100644 --- a/platform/src/net/net_msg_bus_relay/CDomainMng.cpp +++ b/platform/src/net/net_msg_bus_relay/CDomainMng.cpp @@ -120,7 +120,7 @@ bool CDomainMng::init() //< 获取本机域ID和主机名 { iot_public::SNodeInfo stLocalNodeInfo; - if (kbdSuccess != ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) + if (iotSuccess != ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) { LOGERROR("getLocalNodeInfo() failed !"); return false; @@ -133,7 +133,7 @@ bool CDomainMng::init() //< 本域为原发域，建立与目标域的连接，并订阅本域的转发主题 { std::vector vecSrcRelay; - if (kbdSuccess != ptrSysInfo->getMbRelayInfoBySrcDomainID(m_nLocalDomainID, vecSrcRelay)) + if (iotSuccess != ptrSysInfo->getMbRelayInfoBySrcDomainID(m_nLocalDomainID, vecSrcRelay)) { LOGERROR("getMbRelayInfoBySrcDomainID() failed !"); return false; @@ -200,7 +200,7 @@ bool CDomainMng::init() //< 本域为目标域，建立与原发域的连接，允许消息回复 { std::vector vecDstRelay; - if (kbdSuccess != ptrSysInfo->getMbRelayInfoByDstDomainID(m_nLocalDomainID, vecDstRelay)) + if (iotSuccess != ptrSysInfo->getMbRelayInfoByDstDomainID(m_nLocalDomainID, vecDstRelay)) { LOGERROR("getMbRelayInfoByDstDomainID() failed !"); return false; @@ -257,7 +257,7 @@ bool CDomainMng::init() //< 本转发程序属于 PUBLIC 应用 iot_public::SAppDeploy stAppDep; - if (kbdSuccess != ptrSysInfo->getAppDeployById(nDomainID, CN_AppId_PUBLIC, stAppDep)) + if (iotSuccess != ptrSysInfo->getAppDeployById(nDomainID, CN_AppId_PUBLIC, stAppDep)) { LOGERROR("getAppDeployById() failed , nDomainID = %d , ignore !", nDomainID); continue; @@ -286,7 +286,7 @@ bool CDomainMng::init() } iot_public::SNodeInfo stNodeInfo; - if (kbdSuccess != ptrSysInfo->getNodeInfoByName(strNodeName, stNodeInfo)) + if (iotSuccess != ptrSysInfo->getNodeInfoByName(strNodeName, stNodeInfo)) { LOGERROR("getNodeInfoByName() failed , strNodeName = %s , ignore !", strNodeName.c_str()); continue; @@ -347,7 +347,7 @@ bool CDomainMng::init() const int nDomainID = boost::lexical_cast(itMap->first); std::vector vecNodeInfo; - if (kbdSuccess != ptrSysInfo->getNodeListByDomainId(nDomainID, vecNodeInfo)) + if (iotSuccess != ptrSysInfo->getNodeListByDomainId(nDomainID, vecNodeInfo)) { LOGERROR("getNodeListByDomainId() failed , nDomainID = %d , ignore !", nDomainID); continue; diff --git a/platform/src/net/net_msg_bus_relay/CMbRelayRedunSw.cpp b/platform/src/net/net_msg_bus_relay/CMbRelayRedunSw.cpp index 9fce615a..1bb512cd 100644 --- a/platform/src/net/net_msg_bus_relay/CMbRelayRedunSw.cpp +++ b/platform/src/net/net_msg_bus_relay/CMbRelayRedunSw.cpp @@ -45,7 +45,7 @@ int CMbRelayRedunSw::redundantSwitch(bool bMaster, bool bSlave) CDomainMng::getInstance().setMaster(m_objMainThread.isRunning()); - return kbdSuccess; + return iotSuccess; } } //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_relay/CMbRelaySrv.cpp b/platform/src/net/net_msg_bus_relay/CMbRelaySrv.cpp index 1482a631..dcfae872 100644 --- a/platform/src/net/net_msg_bus_relay/CMbRelaySrv.cpp +++ b/platform/src/net/net_msg_bus_relay/CMbRelaySrv.cpp @@ -133,7 +133,7 @@ bool CMbRelaySrv::start(int argc, char *argv[], int& /*nStatus*/) break; case RM_NO_PROC_MNG_MASTER: { - if (kbdSuccess != m_ptrRedunSw->redundantSwitch(true, false)) + if (iotSuccess != m_ptrRedunSw->redundantSwitch(true, false)) { LOGFATAL("以主机模式启动失败！"); return false; @@ -142,7 +142,7 @@ bool CMbRelaySrv::start(int argc, char *argv[], int& /*nStatus*/) break; case RM_NO_PROC_MNG_SLAVE: { - if (kbdSuccess != m_ptrRedunSw->redundantSwitch(false, true)) + if (iotSuccess != m_ptrRedunSw->redundantSwitch(false, true)) { LOGFATAL("以备机模式启动失败！"); return false; @@ -231,7 +231,7 @@ bool CMbRelaySrv::stop() int CMbRelaySrv::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } @@ -242,7 +242,7 @@ int CMbRelaySrv::updateProcInfo(bool bActive, bool bMaster, bool bSlave) return m_ptrProcMng->updateProcessInfo(bActive, bMaster, bSlave); } - return kbdFailed; + return iotFailed; } diff --git a/platform/src/public/pub_sysinfo_api/SysInfoImp.cpp b/platform/src/public/pub_sysinfo_api/SysInfoImp.cpp index ae3c2ede..151bdec0 100644 --- a/platform/src/public/pub_sysinfo_api/SysInfoImp.cpp +++ b/platform/src/public/pub_sysinfo_api/SysInfoImp.cpp @@ -71,7 +71,7 @@ int CSysInfoImp::getAllAppInfo(std::vector &vecAppInfo) vecAppInfo.push_back(it->second); } - return kbdSuccess; + return iotSuccess; } /** @@ -90,7 +90,7 @@ int CSysInfoImp::getAllDomainInfo(std::vector &vecDomainInfo) vecDomainInfo.push_back(it->second); } - return kbdSuccess; + return iotSuccess; } /** @@ -109,7 +109,7 @@ int CSysInfoImp::getAllLocationInfo(std::vector &vecLocationInfo) vecLocationInfo.push_back(it->second); } - return kbdSuccess; + return iotSuccess; } /** @@ -128,7 +128,7 @@ int CSysInfoImp::getAllNodeInfo(std::vector &vecNodeInfo) vecNodeInfo.push_back(it->second); } - return kbdSuccess; + return iotSuccess; } /** @@ -147,7 +147,7 @@ int CSysInfoImp::getAllSubsystemInfo(std::vector &vecSubsystemIn vecSubsystemInfo.push_back(it->second); } - return kbdSuccess; + return iotSuccess; } /** @@ -167,11 +167,11 @@ int CSysInfoImp::getAppDeployById(int nDomainId, int nAppId, SAppDeploy &stAppDe { LOGERROR("getAppDeployById(): 未找到该部署信息 nDomainId = %d, nAppId = %d", nDomainId, nAppId); - return kbdFailed; + return iotFailed; } stAppDeploy = it->second; - return kbdSuccess; + return iotSuccess; } /** @@ -185,17 +185,17 @@ int CSysInfoImp::getAppDeployById(int nDomainId, int nAppId, SAppDeploy &stAppDe int CSysInfoImp::getAppDeployByName(const std::string &strDomainName, const std::string &strAppName, SAppDeploy &stAppDeploy) { SDomainInfo stDomInfo; - if (kbdSuccess != getDomainInfoByName(strDomainName, stDomInfo)) + if (iotSuccess != getDomainInfoByName(strDomainName, stDomInfo)) { LOGERROR("getAppDeployByName(): 未找到该域 strDomainName == %s", strDomainName.c_str()); - return kbdFailed; + return iotFailed; } SAppInfo stAppInfo; - if (kbdSuccess != getAppInfoByName(strAppName, stAppInfo)) + if (iotSuccess != getAppInfoByName(strAppName, stAppInfo)) { LOGERROR("getAppDeployByName(): 未找到该专业 strAppName == %s", strAppName.c_str()); - return kbdFailed; + return iotFailed; } return getAppDeployById(stDomInfo.nId, stAppInfo.nId, stAppDeploy); @@ -211,10 +211,10 @@ int CSysInfoImp::getAppDeployByName(const std::string &strDomainName, const std: int CSysInfoImp::getAppDeployByNodeName(const std::string &strNodeName, std::vector &vecAppDeploy) { SNodeInfo stNodeInfo; - if (kbdSuccess != getNodeInfoByName(strNodeName, stNodeInfo)) + if (iotSuccess != getNodeInfoByName(strNodeName, stNodeInfo)) { LOGERROR("getAppDeployByNodeName(): 未找到该节点 strNodeName == %s", strNodeName.c_str()); - return kbdFailed; + return iotFailed; } vecAppDeploy.clear(); @@ -230,7 +230,7 @@ int CSysInfoImp::getAppDeployByNodeName(const std::string &strNodeName, std::vec } } - return kbdSuccess; + return iotSuccess; } //virtual int getSubsystemListByNodeId(int nNodeId,std::vector &vecSubsystemInfo) = 0; @@ -247,11 +247,11 @@ int CSysInfoImp::getAppInfoById(int nAppId, SAppInfo &stAppInfo) if (it == m_objData.m_mapAppInfo.end()) { LOGERROR("getAppInfoById(): 未找到该应用 nAppId == %d，请检查配置 。", nAppId); - return kbdFailed; + return iotFailed; } stAppInfo = it->second; - return kbdSuccess; + return iotSuccess; } /** @@ -271,12 +271,12 @@ int CSysInfoImp::getAppInfoByName(const std::string &strAppName, SAppInfo &stApp if (boost::algorithm::iequals(strAppName, it->second.strName)) { stAppInfo = it->second; - return kbdSuccess; + return iotSuccess; } } LOGERROR("getAppInfoByName(): 未找到该应用 strAppName == %s", strAppName.c_str()); - return kbdFailed; + return iotFailed; } /** @@ -289,15 +289,15 @@ int CSysInfoImp::getAppInfoByName(const std::string &strAppName, SAppInfo &stApp int CSysInfoImp::getAppInfoBySubsystemId(int nSubsystemId, SAppInfo &stAppInfo) { SSubsystemInfo stSubSysInfo; - if (kbdSuccess != getSubsystemInfoById(nSubsystemId, stSubSysInfo)) + if (iotSuccess != getSubsystemInfoById(nSubsystemId, stSubSysInfo)) { LOGERROR("getAppInfoBySubsystemId(): 未找到该专业 nSubsystemId == %d", nSubsystemId); - return kbdFailed; + return iotFailed; } if(stSubSysInfo.nAppId < CN_AppId_BASE) { LOGWARN("getAppInfoBySubsystemId(): nAppId == %d 不存在 ", stSubSysInfo.nAppId ); - return kbdFailed; + return iotFailed; } return getAppInfoById(stSubSysInfo.nAppId, stAppInfo); @@ -313,10 +313,10 @@ int CSysInfoImp::getAppInfoBySubsystemId(int nSubsystemId, SAppInfo &stAppInfo) int CSysInfoImp::getAppInfoBySubsystemName(const std::string &strSubsystemName, SAppInfo &stAppInfo) { SSubsystemInfo stSubSysInfo; - if (kbdSuccess != getSubsystemInfoByName(strSubsystemName, stSubSysInfo)) + if (iotSuccess != getSubsystemInfoByName(strSubsystemName, stSubSysInfo)) { LOGERROR("getAppInfoBySubsystemName(): 未找到该专业 strSubsystemName == %s", strSubsystemName.c_str()); - return kbdFailed; + return iotFailed; } return getAppInfoById(stSubSysInfo.nAppId, stAppInfo); @@ -337,13 +337,13 @@ int CSysInfoImp::getCenterDomainInfo(SDomainInfo &stDomainInfo) if (it->second.bIsCenter) { stDomainInfo = it->second; - return kbdSuccess; + return iotSuccess; } } LOGERROR("getCenterDomainInfo(): 未找到中心域"); - return kbdFailed; + return iotFailed; } /** @@ -364,7 +364,7 @@ int CSysInfoImp::getDBInfoByDomainId(int nDomainId, SDatabaseInfo &stFirstConnec { //没有找到该域ID的配置 LOGERROR("getDBInfoByDomainId(): 未找到该域 nDomainId == %d", nDomainId); - return kbdFailed; + return iotFailed; } //stFirstConnect @@ -410,7 +410,7 @@ int CSysInfoImp::getDBInfoByDomainId(int nDomainId, SDatabaseInfo &stFirstConnec } } - return kbdSuccess; + return iotSuccess; } /** @@ -426,11 +426,11 @@ int CSysInfoImp::getDBInfoByNodeName(const std::string &strNodeName, SDatabaseIn if (m_objData.m_mapDatabaseInfo.end() == it) { LOGERROR("getDBInfoByNodeName(): 未找到该数据库节点 strNodeName == %s", strNodeName.c_str()); - return kbdFailed; + return iotFailed; } stDBInfo = it->second; - return kbdSuccess; + return iotSuccess; } /** @@ -446,11 +446,11 @@ int CSysInfoImp::getDomainInfoById(int nDomainId, SDomainInfo &stDomainInfo) if (m_objData.m_mapDomainInfo.end() == it) { LOGERROR("getDomainInfoById(): 未找到该域 nDomainId == %d", nDomainId); - return kbdFailed; + return iotFailed; } stDomainInfo = it->second; - return kbdSuccess; + return iotSuccess; } /** @@ -469,13 +469,13 @@ int CSysInfoImp::getDomainInfoByName(const std::string &strDomainName, SDomainIn if (strDomainName == it->second.strName) { stDomainInfo = it->second; - return kbdSuccess; + return iotSuccess; } } LOGERROR("getDomainInfoByName(): 未找到该域 strDomainName == %s", strDomainName.c_str()); - return kbdFailed; + return iotFailed; } /** @@ -488,10 +488,10 @@ int CSysInfoImp::getDomainInfoByName(const std::string &strDomainName, SDomainIn int CSysInfoImp::getDomainInfoByNodeName(const std::string strNodeName, SDomainInfo &stDomainInfo) { SNodeInfo stNodeInfo; - if (kbdSuccess != getNodeInfoByName(strNodeName, stNodeInfo)) + if (iotSuccess != getNodeInfoByName(strNodeName, stNodeInfo)) { LOGERROR("getDomainInfoByNodeName(): 未找到该节点 strNodeName == %s", strNodeName.c_str()); - return kbdFailed; + return iotFailed; } return getDomainInfoById(stNodeInfo.nDomainId, stDomainInfo); @@ -522,10 +522,10 @@ int CSysInfoImp::getLocalDBInfo(SDatabaseInfo &stFirstConnect, std::vector &vecRemoteDBInfo) { SNodeInfo stNodeInfo; - if (kbdSuccess != getLocalNodeInfo(stNodeInfo)) + if (iotSuccess != getLocalNodeInfo(stNodeInfo)) { LOGERROR("getLocalDBInfo(): 未找到本机节点信息"); - return kbdFailed; + return iotFailed; } return getDBInfoByDomainId(stNodeInfo.nDomainId, stFirstConnect, vecLocalDBInfo, vecRemoteDBInfo); @@ -554,10 +554,10 @@ int CSysInfoImp::getLocalRunAppInfoById(int nAppId, SRunAppInfo &stRunAppInfo) { //获取NodeInfo SNodeInfo stLocalNodeInfo; - if (kbdSuccess != getLocalNodeInfo(stLocalNodeInfo)) + if (iotSuccess != getLocalNodeInfo(stLocalNodeInfo)) { LOGERROR("getLocalRunAppInfoById(): 未找到本机节点信息"); - return kbdFailed; + return iotFailed; } //获取AppInfo @@ -565,7 +565,7 @@ int CSysInfoImp::getLocalRunAppInfoById(int nAppId, SRunAppInfo &stRunAppInfo) if (m_objData.m_mapAppInfo.end() == itAppInfo) { LOGERROR("getLocalRunAppInfoById(): 未找到该应用 nAppId == %d", nAppId); - return kbdFailed; + return iotFailed; } //获取DomainInfo @@ -573,7 +573,7 @@ int CSysInfoImp::getLocalRunAppInfoById(int nAppId, SRunAppInfo &stRunAppInfo) if (m_objData.m_mapDomainInfo.end() == itDomInfo) { LOGERROR("getLocalRunAppInfoById(): 未找到该域 nDomainId == %d", stLocalNodeInfo.nDomainId); - return kbdFailed; + return iotFailed; } //获取LocationInfo @@ -581,7 +581,7 @@ int CSysInfoImp::getLocalRunAppInfoById(int nAppId, SRunAppInfo &stRunAppInfo) if (m_objData.m_mapLocationInfo.end() == itLocatInfo) { LOGERROR("getLocalRunAppInfoById(): 未找到该位置 nLocationId == %d", stLocalNodeInfo.nLocationId); - return kbdFailed; + return iotFailed; } stRunAppInfo.nDomainId = stLocalNodeInfo.nDomainId; @@ -600,7 +600,7 @@ int CSysInfoImp::getLocalRunAppInfoById(int nAppId, SRunAppInfo &stRunAppInfo) stRunAppInfo.setSubsystemId.insert(i); } - return kbdSuccess; + return iotSuccess; } /** @@ -613,10 +613,10 @@ int CSysInfoImp::getLocalRunAppInfoById(int nAppId, SRunAppInfo &stRunAppInfo) int CSysInfoImp::getLocalRunAppInfoByName(const std::string &strAppName, SRunAppInfo &stRunAppInfo) { SAppInfo stAppInfo; - if (kbdSuccess != getAppInfoByName(strAppName, stAppInfo)) + if (iotSuccess != getAppInfoByName(strAppName, stAppInfo)) { LOGERROR("getLocalRunAppInfoByName(): 未找到该应用 strAppName == %s", strAppName.c_str()); - return kbdFailed; + return iotFailed; } return getLocalRunAppInfoById(stAppInfo.nId, stRunAppInfo); @@ -636,11 +636,11 @@ int CSysInfoImp::getLocationInfoById(int nLocationId, SLocationInfo &stLocationI if (m_objData.m_mapLocationInfo.end() == it) { LOGERROR("getLocationInfoById(): 未找到该位置 nLocationId == %d", nLocationId); - return kbdFailed; + return iotFailed; } stLocationInfo = it->second; - return kbdSuccess; + return iotSuccess; } /** @@ -659,13 +659,13 @@ int CSysInfoImp::getLocationInfoByName(const std::string &strLocationName, SLoca if (strLocationName == it->second.strName) { stLocationInfo = it->second; - return kbdSuccess; + return iotSuccess; } } LOGERROR("getLocationInfoByName(): 未找到该位置 strLocationName == %s", strLocationName.c_str()); - return kbdFailed; + return iotFailed; } /** @@ -688,7 +688,7 @@ int CSysInfoImp::getLocationListByDomainId(int nDomainId, std::vectorsecond.strName.c_str()); } - return kbdFailed; + return iotFailed; } stNodeInfo = it->second; - return kbdSuccess; + return iotSuccess; } /** @@ -738,7 +738,7 @@ int CSysInfoImp::getNodeListByDomainId(int nDomainId, std::vector &ve } } - return kbdSuccess; + return iotSuccess; } /** @@ -751,10 +751,10 @@ int CSysInfoImp::getNodeListByDomainId(int nDomainId, std::vector &ve int CSysInfoImp::getNodeListByDomainName(const std::string &strDomainName, std::vector &vecNodeInfo) { SDomainInfo stDomInfo; - if (kbdSuccess != getDomainInfoByName(strDomainName, stDomInfo)) + if (iotSuccess != getDomainInfoByName(strDomainName, stDomInfo)) { LOGERROR("getNodeListByDomainName(): 未找到该域 strDomainName == %s", strDomainName.c_str()); - return kbdFailed; + return iotFailed; } return getNodeListByDomainId(stDomInfo.nId, vecNodeInfo); @@ -773,11 +773,11 @@ int CSysInfoImp::getSubsystemInfoById(int nSubsystemId, SSubsystemInfo &stSubsys if (m_objData.m_mapSubsystemInfo.end() == it) { LOGERROR("getSubsystemInfoById(): 未找到该专业 nSubsystemId = %d", nSubsystemId); - return kbdFailed; + return iotFailed; } stSubsystemInfo = it->second; - return kbdSuccess; + return iotSuccess; } /** @@ -796,12 +796,12 @@ int CSysInfoImp::getSubsystemInfoByName(const std::string &strSubsystemName, SSu if (strSubsystemName == it->second.strName) { stSubsystemInfo = it->second; - return kbdSuccess; + return iotSuccess; } } LOGERROR("getSubsystemInfoByName(): 未找到该专业 strSubsystemName == %s", strSubsystemName.c_str()); - return kbdFailed; + return iotFailed; } /** @@ -815,10 +815,10 @@ int CSysInfoImp::getSubsystemListByAppId(int nAppId, std::vector { vecSubsystemInfo.clear(); SAppInfo stAppInfo; - if (kbdSuccess != getAppInfoById(nAppId, stAppInfo)) + if (iotSuccess != getAppInfoById(nAppId, stAppInfo)) { LOGERROR("getSubsystemListByAppId(): 未找到该应用 nAppId == %d", nAppId); - return kbdFailed; + return iotFailed; } for (size_t i = 0; i < stAppInfo.vecSubsystemId.size(); i++) @@ -831,7 +831,7 @@ int CSysInfoImp::getSubsystemListByAppId(int nAppId, std::vector } } - return kbdSuccess; + return iotSuccess; } /** @@ -845,10 +845,10 @@ int CSysInfoImp::getSubsystemListByAppName(const std::string &strAppName, std::v { vecSubsystemInfo.clear(); SAppInfo stAppInfo; - if (kbdSuccess != getAppInfoByName(strAppName, stAppInfo)) + if (iotSuccess != getAppInfoByName(strAppName, stAppInfo)) { LOGERROR("getSubsystemListByAppName(): 未找到该应用 strAppName == %s", strAppName.c_str()); - return kbdFailed; + return iotFailed; } for (size_t i = 0; i < stAppInfo.vecSubsystemId.size(); i++) @@ -861,17 +861,17 @@ int CSysInfoImp::getSubsystemListByAppName(const std::string &strAppName, std::v } } - return kbdSuccess; + return iotSuccess; } /* @brief 获取本节点部署的各应用下的进程列表 */ int CSysInfoImp::getLocalProcInfoList(SProcessInfoMAP &mapProcInfo) { std::vector vecAppDeploy; - if (kbdSuccess != getLocalAppDeploy(vecAppDeploy)) + if (iotSuccess != getLocalAppDeploy(vecAppDeploy)) { LOGERROR("getLocalProcInfoList(): 未找到本节点应用部署信息"); - return kbdFailed; + return iotFailed; } SProcessInfoSeq vecProcInfo; @@ -889,7 +889,7 @@ int CSysInfoImp::getLocalProcInfoList(SProcessInfoMAP &mapProcInfo) } } - return kbdSuccess; + return iotSuccess; } /* @brief 获取指定应用部署的进程列表 */ @@ -903,13 +903,13 @@ int CSysInfoImp::getProcInfoListByAppId(int nAppId, SProcessInfoMAP &mapProcInfo } } - return kbdSuccess; + return iotSuccess; } /** @brief 获取所有消息总线转发信息 @param vecMbRelayInfo:输出 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int CSysInfoImp::getAllMbRelayInfo(std::vector &vecMbRelayInfo) @@ -923,13 +923,13 @@ int CSysInfoImp::getAllMbRelayInfo(std::vector &vecMbRelayInfo) vecMbRelayInfo.push_back(itMap->second); } - return kbdSuccess; + return iotSuccess; } /** @brief 按源域ID获取消息总线转发信息 @param vecMbRelayInfo：输出 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int CSysInfoImp::getMbRelayInfoBySrcDomainID(int nSrcDomainID, @@ -948,13 +948,13 @@ int CSysInfoImp::getMbRelayInfoBySrcDomainID(int nSrcDomainID, } } - return kbdSuccess; + return iotSuccess; } /** @brief 按目标域ID获取消息总线转发信息 @param vecMbRelayInfo：输出 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int CSysInfoImp::getMbRelayInfoByDstDomainID(int nDstDomainID, @@ -973,13 +973,13 @@ int CSysInfoImp::getMbRelayInfoByDstDomainID(int nDstDomainID, } } - return kbdSuccess; + return iotSuccess; } /** @brief 按目标域ID获取消息总线转发信息 @param objMbRelayInfo：输出 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int CSysInfoImp::getMbRelayInfoBySrcAndDstDomainID(int nSrcDomainID, int nDstDomainID, @@ -994,12 +994,12 @@ int CSysInfoImp::getMbRelayInfoBySrcAndDstDomainID(int nSrcDomainID, int nDstDom { LOGERROR("getMbRelayInfoBySrcAndDstDomainID(): 未找到转发配置 nSrcDomainID == %d, nDstDomainID == %d", nSrcDomainID, nDstDomainID); - return kbdFailed; + return iotFailed; } stMbRelayInfo = itMap->second; - return kbdSuccess; + return iotSuccess; } /** @@ -1010,7 +1010,7 @@ unsigned int CSysInfoImp::getUniqueIdOfNodeInfo() { unsigned int nRet = 0; std::vector vecNodeInfo; - if ( kbdSuccess != getAllNodeInfo(vecNodeInfo) || vecNodeInfo.size() <= 0 ) + if ( iotSuccess != getAllNodeInfo(vecNodeInfo) || vecNodeInfo.size() <= 0 ) return nRet; // 按节点名排序 diff --git a/platform/src/public/pub_sysinfo_api/SysInfoImp.h b/platform/src/public/pub_sysinfo_api/SysInfoImp.h index 211112c5..a1e89e5f 100644 --- a/platform/src/public/pub_sysinfo_api/SysInfoImp.h +++ b/platform/src/public/pub_sysinfo_api/SysInfoImp.h @@ -335,7 +335,7 @@ public: /** @brief 获取本节点部署的各应用下的进程列表 @param SProcessInfoMAP & mapProcInfo 返回的进程列表 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int getLocalProcInfoList(SProcessInfoMAP &mapProcInfo)override; @@ -343,7 +343,7 @@ public: @brief 获取指定应用部署的进程列表 @param int nAppId 应用ID @param SProcessInfoMAP & mapProcInfo 返回的该应用下的进程列表 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int getProcInfoListByAppId(int nAppId, SProcessInfoMAP &mapProcInfo)override; @@ -351,7 +351,7 @@ public: /** @brief 获取所有消息总线转发信息 @param vecMbRelayInfo:输出 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int getAllMbRelayInfo(std::vector &vecMbRelayInfo)override; @@ -359,7 +359,7 @@ public: /** @brief 按源域ID获取消息总线转发信息 @param vecMbRelayInfo：输出 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int getMbRelayInfoBySrcDomainID(int nSrcDomainID, @@ -368,7 +368,7 @@ public: /** @brief 按目标域ID获取消息总线转发信息 @param vecMbRelayInfo：输出 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int getMbRelayInfoByDstDomainID(int nDstDomainID, @@ -377,7 +377,7 @@ public: /** @brief 按目标域ID获取消息总线转发信息 @param objMbRelayInfo：输出 - @return 找到返回kbdSuccess，失败返回错误码 + @return 找到返回iotSuccess，失败返回错误码 @retval */ int getMbRelayInfoBySrcAndDstDomainID(int nSrcDomainID, int nDstDomainID, diff --git a/platform/src/public/pub_utility_api/CommonConfigParse.cpp b/platform/src/public/pub_utility_api/CommonConfigParse.cpp index 6141af1b..6d5006ae 100644 --- a/platform/src/public/pub_utility_api/CommonConfigParse.cpp +++ b/platform/src/public/pub_utility_api/CommonConfigParse.cpp @@ -32,7 +32,7 @@ int iot_public::CCommonConfigParse::load( const std::string &strFilePath, const if ( strConfFullPath.empty()) { m_mapParam.clear(); - return kbdFailed; + return iotFailed; } return load( strConfFullPath ); } @@ -65,10 +65,10 @@ int iot_public::CCommonConfigParse::load(const std::string &strFullPath) catch (std::exception &ex) { LOGERROR("解析配置文件[%s]失败.Msg=[%s]", strFullPath.c_str(), ex.what()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_public::CCommonConfigParse::getIntValue(const std::string &strModuleName, const std::string &strKey, int &nValue) @@ -77,10 +77,10 @@ int iot_public::CCommonConfigParse::getIntValue(const std::string &strModuleName if (pIter != m_mapParam.end()) { nValue = StringToInt(pIter->second[0]); - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } int iot_public::CCommonConfigParse::getIntWithDefault(const std::string &strModuleName, @@ -102,10 +102,10 @@ int iot_public::CCommonConfigParse::getStringValue(const std::string &strModuleN if (pIter != m_mapParam.end()) { strValue = pIter->second[0]; - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } std::string iot_public::CCommonConfigParse::getStringWithDefault(const std::string &strModuleName, @@ -127,10 +127,10 @@ int iot_public::CCommonConfigParse::getBoolValue(const std::string &strModuleNam if (pIter != m_mapParam.end()) { bValue = StringToBool(pIter->second[0]); - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } bool iot_public::CCommonConfigParse::getBoolWithDefault(const std::string &strModuleName, @@ -155,10 +155,10 @@ int iot_public::CCommonConfigParse::getFloatValue(const std::string &strModuleNa if (pIter != m_mapParam.end()) { fValue = StringToFloat(pIter->second[0]); - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } float iot_public::CCommonConfigParse::getFloatWithDefault(const std::string &strModuleName, @@ -183,8 +183,8 @@ int iot_public::CCommonConfigParse::getStringSeqValue(const std::string &strModu if (pIter != m_mapParam.end()) { vecValue = pIter->second; - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } diff --git a/platform/src/public/pub_utility_api/FileStyle.cpp b/platform/src/public/pub_utility_api/FileStyle.cpp index 239107d8..2fbb4f07 100644 --- a/platform/src/public/pub_utility_api/FileStyle.cpp +++ b/platform/src/public/pub_utility_api/FileStyle.cpp @@ -29,7 +29,7 @@ std::string CFileStyle::getCurStyle( const std::string &strDefault ) return strDefault; } - if ( kbdSuccess != ObjConfig.load( strCfgFile )) + if ( iotSuccess != ObjConfig.load( strCfgFile )) { LOGWARN( "getCurStyle(): 读取样式配置文件[%s]失败，使用默认样式[%s]", strCfgFile.c_str(), strDefault.c_str()); diff --git a/platform/src/public/pub_utility_api/I18N.cpp b/platform/src/public/pub_utility_api/I18N.cpp index fab0a90b..d08a9159 100644 --- a/platform/src/public/pub_utility_api/I18N.cpp +++ b/platform/src/public/pub_utility_api/I18N.cpp @@ -21,7 +21,7 @@ boost::locale::generator gen; std::string getCurLanguage( const std::string &strDefault ) { CCommonConfigParse config; - if ( kbdSuccess != config.load( CFileUtil::getPathOfCfgFile( "language.xml" ))) + if ( iotSuccess != config.load( CFileUtil::getPathOfCfgFile( "language.xml" ))) { LOGERROR( "getCurLanguage(): 读取国际化配置文件[language.xml]失败，返回默认值[%s]", strDefault.c_str()); return strDefault; diff --git a/platform/src/public/pub_utility_api/ProcUtil.cpp b/platform/src/public/pub_utility_api/ProcUtil.cpp index 3145d3ca..ef54536b 100644 --- a/platform/src/public/pub_utility_api/ProcUtil.cpp +++ b/platform/src/public/pub_utility_api/ProcUtil.cpp @@ -100,7 +100,7 @@ int iot_public::CProcUtil::execScript( const std::string &strFileFullPath, const { namespace fs = boost::filesystem; - int nRet = kbdFailed; + int nRet = iotFailed; if ( fs::exists( strFileFullPath ) && fs::is_regular_file( strFileFullPath )) { #ifdef WIN32 diff --git a/platform/src/public/pub_utility_api/TimerThreadBase.cpp b/platform/src/public/pub_utility_api/TimerThreadBase.cpp index 84e68266..b9950bb5 100644 --- a/platform/src/public/pub_utility_api/TimerThreadBase.cpp +++ b/platform/src/public/pub_utility_api/TimerThreadBase.cpp @@ -45,7 +45,7 @@ iot_public::CTimerThreadBase::~CTimerThreadBase() int iot_public::CTimerThreadBase::beforeExecute() { - return kbdSuccess; + return iotSuccess; } void iot_public::CTimerThreadBase::suspend() @@ -190,7 +190,7 @@ void iot_public::CTimerThreadBase::run() if (!m_bHaveDoneExecBefore) //< 判断beforeExecute是否已经执行过，一个线程仅会执行一次 { LOGINFO("[%s] beforeExecute", m_strThreadDesc.c_str()); - if (kbdSuccess != beforeExecute()) + if (iotSuccess != beforeExecute()) { LOGERROR("[%s] beforeExecute error.Thread exit!", m_strThreadDesc.c_str()); m_bRunning = false; @@ -279,7 +279,7 @@ void iot_public::CTimerThreadBase::run() if (!m_bHaveDoneExecBefore) { LOGINFO("[%s] beforeExecute", m_strThreadDesc.c_str()); - if (kbdSuccess != beforeExecute()) + if (iotSuccess != beforeExecute()) { LOGERROR("[%s] beforeExecute error.Thread exit!", m_strThreadDesc.c_str()); m_bRunning = false; diff --git a/platform/src/service/alarm_resource/CAlarmResource.cpp b/platform/src/service/alarm_resource/CAlarmResource.cpp index 66b7db1a..12593b9e 100644 --- a/platform/src/service/alarm_resource/CAlarmResource.cpp +++ b/platform/src/service/alarm_resource/CAlarmResource.cpp @@ -88,14 +88,14 @@ bool iot_service::CAlarmResource::start(int argc, char *argv[], int &/*nStatus*/ } //9.设置冗余通知回调 - if (kbdSuccess != m_pRedundancyMng->setCallback(m_pAlarmResourceRedundantSwitchMng)) + if (iotSuccess != m_pRedundancyMng->setCallback(m_pAlarmResourceRedundantSwitchMng)) { LOGERROR("设置冗余回调接口失败"); return false; } //10.更新当前进程冗余状态 - if (kbdSuccess != m_pProcMng->updateProcessInfo(true, true, false)) + if (iotSuccess != m_pProcMng->updateProcessInfo(true, true, false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -151,7 +151,7 @@ int iot_service::CAlarmResource::toQuit() } shutdown(); - return kbdSuccess; + return iotSuccess; } bool iot_service::CAlarmResource::parseCmdLine(int argc, char *argv[]) @@ -228,7 +228,7 @@ bool iot_service::CAlarmResource::getSystemInfo() return false; } - if (kbdSuccess != m_pSysInfo->getLocalRunAppInfoByName(m_sAppName, m_stRunAppInfo)) + if (iotSuccess != m_pSysInfo->getLocalRunAppInfoByName(m_sAppName, m_stRunAppInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -259,7 +259,7 @@ bool iot_service::CAlarmResource::registToProcMng() return false; } - if (kbdSuccess != m_pProcMng->setCallback(this)) + if (iotSuccess != m_pProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -278,7 +278,7 @@ bool iot_service::CAlarmResource::initialize() return false; } - if ( kbdSuccess != m_pAlarmResourceRedundantSwitchMng->initialize() ) + if ( iotSuccess != m_pAlarmResourceRedundantSwitchMng->initialize() ) { LOGERROR("初始化服务管理类失败"); return false; diff --git a/platform/src/service/alarm_resource/CAlarmResourceRedundantSwitch.cpp b/platform/src/service/alarm_resource/CAlarmResourceRedundantSwitch.cpp index 25248faf..d0b326bf 100644 --- a/platform/src/service/alarm_resource/CAlarmResourceRedundantSwitch.cpp +++ b/platform/src/service/alarm_resource/CAlarmResourceRedundantSwitch.cpp @@ -28,7 +28,7 @@ int iot_service::CAlarmResourceRedundantSwitch::redundantSwitch(bool bMaster, bo m_pProcMng->updateProcessInfo(true, bMaster, bSlave); - return kbdSuccess; + return iotSuccess; } /* @brief 初始化 */ @@ -38,17 +38,17 @@ int iot_service::CAlarmResourceRedundantSwitch::initialize() if (m_ptrAlarmResourceThread == nullptr) { LOGERROR("创建线程失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrAlarmResourceThread->initialize()) + if (iotSuccess != m_ptrAlarmResourceThread->initialize()) { LOGERROR("初始化线程失败"); - return kbdFailed; + return iotFailed; } // 本线程无论主备都需要运行，所以初始化以后直接启动 m_ptrAlarmResourceThread->resume(); - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/service/alarm_resource/CAlarmResourceRedundantSwitch.h b/platform/src/service/alarm_resource/CAlarmResourceRedundantSwitch.h index 8d05d516..ce170b8f 100644 --- a/platform/src/service/alarm_resource/CAlarmResourceRedundantSwitch.h +++ b/platform/src/service/alarm_resource/CAlarmResourceRedundantSwitch.h @@ -20,12 +20,12 @@ public: 在进程切换过程中，可能会被调用多次切换，业务进程需要保证幂等，无副作用 @param bool bMaster 是否为主 @param bool bSlave 是否为备 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int redundantSwitch(bool bMaster, bool bSlave); /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); diff --git a/platform/src/service/alarm_resource/CAlarmResourceThread.cpp b/platform/src/service/alarm_resource/CAlarmResourceThread.cpp index 6fcc82db..ac22b512 100644 --- a/platform/src/service/alarm_resource/CAlarmResourceThread.cpp +++ b/platform/src/service/alarm_resource/CAlarmResourceThread.cpp @@ -74,13 +74,13 @@ int CAlarmResourceThread::initialize() if ( false == createSysInfoInstance(m_objSysInfo) ) { LOGERROR( "create sysinfo instance failed!" ); - return kbdFailed; + return iotFailed; } SNodeInfo stNodeInfo; - if ( kbdSuccess != m_objSysInfo->getLocalNodeInfo(stNodeInfo) ) + if ( iotSuccess != m_objSysInfo->getLocalNodeInfo(stNodeInfo) ) { LOGERROR( "getLocalNodeInfo failed!" ); - return kbdFailed; + return iotFailed; } m_sNodeName = stNodeInfo.strName; @@ -90,28 +90,28 @@ int CAlarmResourceThread::initialize() // 读取告警参数 CCommonConfigParse objConfig; - if ( kbdSuccess != objConfig.load(CFileUtil::getPathOfCfgFile("proc_param_cfg.xml")) ) + if ( iotSuccess != objConfig.load(CFileUtil::getPathOfCfgFile("proc_param_cfg.xml")) ) { LOGERROR("加载配置文件proc_param_cfg.xml失败"); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != objConfig.getIntValue("alarm_resource","cpu_high",m_nCpuHighPercent) ) + if ( iotSuccess != objConfig.getIntValue("alarm_resource","cpu_high",m_nCpuHighPercent) ) { LOGWARN("获取参数cpu_high失败，采用默认值 85"); m_nCpuHighPercent = 85; } - if ( kbdSuccess != objConfig.getIntValue("alarm_resource","mem_high",m_nMemHighPercent) ) + if ( iotSuccess != objConfig.getIntValue("alarm_resource","mem_high",m_nMemHighPercent) ) { LOGWARN("获取参数mem_high失败，采用默认值 85"); m_nMemHighPercent = 85; } - if ( kbdSuccess != objConfig.getIntValue("alarm_resource","disk_high",m_nDiskHighPercent) ) + if ( iotSuccess != objConfig.getIntValue("alarm_resource","disk_high",m_nDiskHighPercent) ) { LOGWARN("获取参数disk_high失败，采用默认值 85"); m_nDiskHighPercent = 85; } int nExecutePeriod = 0; - if ( kbdSuccess != objConfig.getIntValue("alarm_resource","execute_period",nExecutePeriod) ) + if ( iotSuccess != objConfig.getIntValue("alarm_resource","execute_period",nExecutePeriod) ) { LOGWARN("获取参数execute_period失败，采用默认值 60"); m_nRunPeriodMsec = 60 * 1000; @@ -125,12 +125,12 @@ int CAlarmResourceThread::initialize() if ( SIGAR_OK != sigar_open(&m_pSigar) ) { LOGERROR("sigar_open() error"); - return kbdFailed; + return iotFailed; } saveComputerInfoToLog(); - return kbdSuccess; + return iotSuccess; } void CAlarmResourceThread::clean() diff --git a/platform/src/service/alarm_resource/CAlarmResourceThread.h b/platform/src/service/alarm_resource/CAlarmResourceThread.h index e287062b..6f1616d0 100644 --- a/platform/src/service/alarm_resource/CAlarmResourceThread.h +++ b/platform/src/service/alarm_resource/CAlarmResourceThread.h @@ -24,7 +24,7 @@ public: public: /** * @brief initialize 初始化 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 */ int initialize(); diff --git a/platform/src/service/alarm_server/CAlarmServer.cpp b/platform/src/service/alarm_server/CAlarmServer.cpp index ec8eaff4..9cb3fed6 100644 --- a/platform/src/service/alarm_server/CAlarmServer.cpp +++ b/platform/src/service/alarm_server/CAlarmServer.cpp @@ -208,7 +208,7 @@ bool CAlarmServer::start(int argc, char *argv[], int & /*nStatus*/) break; case RM_NO_PROC_MNG_MASTER: { - if (kbdSuccess != m_ptrRedunSw->redundantSwitch(true, false)) + if (iotSuccess != m_ptrRedunSw->redundantSwitch(true, false)) { LOGFATAL("以主机模式启动失败！"); return false; @@ -217,7 +217,7 @@ bool CAlarmServer::start(int argc, char *argv[], int & /*nStatus*/) break; case RM_NO_PROC_MNG_SLAVE: { - if (kbdSuccess != m_ptrRedunSw->redundantSwitch(false, true)) + if (iotSuccess != m_ptrRedunSw->redundantSwitch(false, true)) { LOGFATAL("以备机模式启动失败！"); return false; @@ -293,7 +293,7 @@ bool CAlarmServer::stop() int CAlarmServer::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } @@ -304,7 +304,7 @@ int CAlarmServer::updateProcInfo(bool bActive, bool bMaster, bool bSlave) return m_ptrProcMng->updateProcessInfo(bActive, bMaster, bSlave); } - return kbdFailed; + return iotFailed; } @@ -427,7 +427,7 @@ bool CAlarmServer::loadSysInfo() iot_public::SRunAppInfo objRunAppInfo; int nRc = sysInfoPtr->getLocalRunAppInfoById(CN_AppId_PUBLIC, objRunAppInfo); - if (kbdSuccess != nRc) + if (iotSuccess != nRc) { LOGERROR("loadSysInfo(): getLocalRunAppInfoByName failed !"); return false; diff --git a/platform/src/service/alarm_server/CAlmSrvRedunSw.cpp b/platform/src/service/alarm_server/CAlmSrvRedunSw.cpp index 7fc8b319..026aa16a 100644 --- a/platform/src/service/alarm_server/CAlmSrvRedunSw.cpp +++ b/platform/src/service/alarm_server/CAlmSrvRedunSw.cpp @@ -103,7 +103,7 @@ int CAlmSrvRedunSw::redundantSwitch(bool bMaster, bool bSlave) //< CAlmDataMng 非线程安全 //< 只允许CMainProcThread或CSlaveSyncThread中的一个操作 LOGERROR("redundantSwitch(): 不允许即是主，又是备！"); - return kbdFailed; + return iotFailed; } //< 先停，再启 @@ -135,7 +135,7 @@ int CAlmSrvRedunSw::redundantSwitch(bool bMaster, bool bSlave) isMasterThreadsWorking(), isSlaveThreadsWorking()); - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/service/alarm_server_api/CAlmApiForDpSrvImp.cpp b/platform/src/service/alarm_server_api/CAlmApiForDpSrvImp.cpp index 437b0823..f03c1a64 100644 --- a/platform/src/service/alarm_server_api/CAlmApiForDpSrvImp.cpp +++ b/platform/src/service/alarm_server_api/CAlmApiForDpSrvImp.cpp @@ -184,7 +184,7 @@ void CAlmApiForDpSrvImp::handle_MT_ALM_AS2DP_CFM_REQ(const iot_net::CMbMessage & std::string &strKeyIdTag = *objCfmAlmRcv.mutable_key_id_tag(i); const int nRc = m_pParent->handleCfmAlmReqMsg(strKeyIdTag, nTimeStamp); - if (kbdSuccess == nRc) + if (iotSuccess == nRc) { objCfmAlmSend.add_time_stamp(nTimeStamp); diff --git a/platform/src/service/alarm_server_api/test/alarm_test_add_alm/CAddAlmApp.cpp b/platform/src/service/alarm_server_api/test/alarm_test_add_alm/CAddAlmApp.cpp index 49a092f6..80c9387a 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_add_alm/CAddAlmApp.cpp +++ b/platform/src/service/alarm_server_api/test/alarm_test_add_alm/CAddAlmApp.cpp @@ -67,7 +67,7 @@ bool CAddAlmApp::stop() int CAddAlmApp::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } } diff --git a/platform/src/service/alarm_server_api/test/alarm_test_add_alm/CAddAlmThread.cpp b/platform/src/service/alarm_server_api/test/alarm_test_add_alm/CAddAlmThread.cpp index d7843c03..04f8a7d8 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_add_alm/CAddAlmThread.cpp +++ b/platform/src/service/alarm_server_api/test/alarm_test_add_alm/CAddAlmThread.cpp @@ -40,9 +40,9 @@ CAddAlmThread::CAddAlmThread() : CSysInfoInterfacePtr spSysInfo; if (iot_public::createSysInfoInstance(spSysInfo)) { - if (kbdSuccess != spSysInfo->getLocalNodeInfo(stNodeInfo)) + if (iotSuccess != spSysInfo->getLocalNodeInfo(stNodeInfo)) { - std::cout << "kbdSuccess != spSysInfo->getLocalNodeInfo(stNodeInfo)" << std::endl; + std::cout << "iotSuccess != spSysInfo->getLocalNodeInfo(stNodeInfo)" << std::endl; } } diff --git a/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/CAlmClt.cpp b/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/CAlmClt.cpp index 0414ea43..ba6ec8ac 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/CAlmClt.cpp +++ b/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/CAlmClt.cpp @@ -72,7 +72,7 @@ bool CAlmClt::stop() int CAlmClt::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } } diff --git a/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/CFakeDp.cpp b/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/CFakeDp.cpp index 3f73d64f..d3bf000a 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/CFakeDp.cpp +++ b/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/CFakeDp.cpp @@ -72,7 +72,7 @@ bool CFakeDp::stop() int CFakeDp::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } } diff --git a/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/CMsgThread.cpp b/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/CMsgThread.cpp index f9a66087..dc61866a 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/CMsgThread.cpp +++ b/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/CMsgThread.cpp @@ -23,7 +23,7 @@ int CMsgThread::handleCfmAlmReqMsg(const std::string &strKeyIdTag, long long nTi std::cout << "handleCfmAlmReqMsg() , strKeyIdTag == " << strKeyIdTag << " , nTimeStamp == " << nTimeStamp << std::endl; - return kbdSuccess; + return iotSuccess; } } diff --git a/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/CEvtClt.cpp b/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/CEvtClt.cpp index 67b4a521..6de7e663 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/CEvtClt.cpp +++ b/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/CEvtClt.cpp @@ -72,7 +72,7 @@ bool CEvtClt::stop() int CEvtClt::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } } diff --git a/platform/src/service/alarm_system/CAlarmSystem.cpp b/platform/src/service/alarm_system/CAlarmSystem.cpp index 42f2b9d0..c123490e 100644 --- a/platform/src/service/alarm_system/CAlarmSystem.cpp +++ b/platform/src/service/alarm_system/CAlarmSystem.cpp @@ -86,14 +86,14 @@ bool iot_service::CAlarmSystem::start(int argc, char *argv[], int &/*nStatus*/) } //9.设置冗余通知回调 - if (kbdSuccess != m_ptrRedundancyMng->setCallback(m_ptrAlarmSystemRedundantSwitchMng)) + if (iotSuccess != m_ptrRedundancyMng->setCallback(m_ptrAlarmSystemRedundantSwitchMng)) { LOGERROR("设置冗余回调接口失败"); return false; } //10.更新当前进程冗余状态 - if (kbdSuccess != m_ptrProcMng->updateProcessInfo(true, false, false)) + if (iotSuccess != m_ptrProcMng->updateProcessInfo(true, false, false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -149,7 +149,7 @@ int iot_service::CAlarmSystem::toQuit() } shutdown(); - return kbdSuccess; + return iotSuccess; } bool iot_service::CAlarmSystem::parseCmdLine(int argc, char *argv[]) @@ -241,7 +241,7 @@ bool iot_service::CAlarmSystem::getSystemInfo() return false; } - if (kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName, m_stRunAppInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName, m_stRunAppInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -272,7 +272,7 @@ bool iot_service::CAlarmSystem::registToProcMng() return false; } - if (kbdSuccess != m_ptrProcMng->setCallback(this)) + if (iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -291,7 +291,7 @@ bool iot_service::CAlarmSystem::initialize() return false; } - if (kbdSuccess != m_ptrAlarmSystemRedundantSwitchMng->initialize()) + if (iotSuccess != m_ptrAlarmSystemRedundantSwitchMng->initialize()) { LOGERROR("初始化服务管理类失败"); return false; diff --git a/platform/src/service/alarm_system/CAlarmSystemRedundantSwitch.cpp b/platform/src/service/alarm_system/CAlarmSystemRedundantSwitch.cpp index ff763553..e48de53f 100644 --- a/platform/src/service/alarm_system/CAlarmSystemRedundantSwitch.cpp +++ b/platform/src/service/alarm_system/CAlarmSystemRedundantSwitch.cpp @@ -33,7 +33,7 @@ int iot_service::CAlarmSystemRedundantSwitch::redundantSwitch(bool bMaster, bool m_ptrProcMng->updateProcessInfo(true, bMaster, bSlave); - return kbdSuccess; + return iotSuccess; } /* @brief 初始化 */ @@ -43,17 +43,17 @@ int iot_service::CAlarmSystemRedundantSwitch::initialize() if (m_ptrAlarmSystemThread == NULL) { LOGERROR("创建线程失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrAlarmSystemThread->initialize()) + if (iotSuccess != m_ptrAlarmSystemThread->initialize()) { LOGERROR("初始化线程失败"); - return kbdFailed; + return iotFailed; } // 本线程无论主备都需要运行，所以初始化以后直接启动 m_ptrAlarmSystemThread->resume(); - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/service/alarm_system/CAlarmSystemRedundantSwitch.h b/platform/src/service/alarm_system/CAlarmSystemRedundantSwitch.h index 5db1d0a6..11156faf 100644 --- a/platform/src/service/alarm_system/CAlarmSystemRedundantSwitch.h +++ b/platform/src/service/alarm_system/CAlarmSystemRedundantSwitch.h @@ -17,12 +17,12 @@ namespace iot_service 在进程切换过程中，可能会被调用多次切换，业务进程需要保证幂等，无副作用 @param bool bMaster 是否为主 @param bool bSlave 是否为备 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int redundantSwitch(bool bMaster, bool bSlave); /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); diff --git a/platform/src/service/alarm_system/CAlarmSystemThread.cpp b/platform/src/service/alarm_system/CAlarmSystemThread.cpp index f7bd8521..5bad96cb 100644 --- a/platform/src/service/alarm_system/CAlarmSystemThread.cpp +++ b/platform/src/service/alarm_system/CAlarmSystemThread.cpp @@ -58,14 +58,14 @@ int CAlarmSystemThread::initialize() if ( false == createSysInfoInstance( m_objSysInfo ) ) { LOGERROR( "create sysinfo instance failed!" ); - return kbdFailed; + return iotFailed; } // 添加消息订阅 if (!m_objCom.addSub(CN_AppId_BASE, CH_NODE_MNG_INTRA_DOMAIN)) { LOGERROR("通道[CH_NODE_MNG_INTRA_DOMAIN]订阅失败."); - return kbdFailed; + return iotFailed; } // 初始化告警接口 @@ -78,7 +78,7 @@ int CAlarmSystemThread::initialize() if ( bRet == false ) { LOGERROR("UDP绑定失败，端口号【%d】",UDP_RECV_PORT); - return kbdFailed; + return iotFailed; } // 获取iscs组号 @@ -86,16 +86,16 @@ int CAlarmSystemThread::initialize() if ( m_nGroupId == 0 ) { LOGERROR("获取iscs组号失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } QString CAlarmSystemThread::getDomainNameById( int nId ) { SDomainInfo stDomainInfo; - if ( kbdSuccess == m_objSysInfo->getDomainInfoById(nId,stDomainInfo) ) + if ( iotSuccess == m_objSysInfo->getDomainInfoById(nId,stDomainInfo) ) return QString::fromStdString(stDomainInfo.strName); return QString::number(nId); } @@ -103,7 +103,7 @@ QString CAlarmSystemThread::getDomainNameById( int nId ) QString CAlarmSystemThread::getAppNameById( int nId ) { SAppInfo stAppInfo; - if ( kbdSuccess == m_objSysInfo->getAppInfoById(nId,stAppInfo) ) + if ( iotSuccess == m_objSysInfo->getAppInfoById(nId,stAppInfo) ) return QString::fromStdString(stAppInfo.strName); return QString::number(nId); } @@ -138,7 +138,7 @@ int CAlarmSystemThread::handleSingleNodeHeartbeatInfo( const iot_net::CMbMessage if (!stHeartbeat.ParseFromArray(objMsg.getDataPtr(), static_cast(objMsg.getDataSize()))) { LOGERROR("反序列化失败.消息通道[%d],类型[%d]", objMsg.getChannelID(), objMsg.getMsgType()); - return kbdFailed; + return iotFailed; } SAppHeartbeatInfo stAppInfo; @@ -176,7 +176,7 @@ int CAlarmSystemThread::handleSingleNodeHeartbeatInfo( const iot_net::CMbMessage m_mapInfo[sKey] = stAppInfo; } - return kbdSuccess; + return iotSuccess; } void CAlarmSystemThread::checkMasterSlave( const SAppHeartbeatInfo& oldInfo, const SAppHeartbeatInfo& newInfo ) diff --git a/platform/src/service/alarm_system/CAlarmSystemThread.h b/platform/src/service/alarm_system/CAlarmSystemThread.h index bbddb169..b049bfcd 100644 --- a/platform/src/service/alarm_system/CAlarmSystemThread.h +++ b/platform/src/service/alarm_system/CAlarmSystemThread.h @@ -75,7 +75,7 @@ public: /** * @brief initialize 初始化 - * @return 成功返回kbdSuccess，失败返回错误码 + * @return 成功返回iotSuccess，失败返回错误码 */ int initialize(); diff --git a/platform/src/service/data_process/AlarmAckProcess.cpp b/platform/src/service/data_process/AlarmAckProcess.cpp index 1ece58cc..98f69617 100644 --- a/platform/src/service/data_process/AlarmAckProcess.cpp +++ b/platform/src/service/data_process/AlarmAckProcess.cpp @@ -80,7 +80,7 @@ CAlarmAckProcess::~CAlarmAckProcess(void) * 子类实现本函数，处理自身的业务逻辑 * @param strKeyIdTag ： 需要确认报警的测点KeyIdTag * nTimeStamp ： 需要确认报警的时间，RFC1305、POSIX时标标准 -* @return kbdSuccess / kbdFailed 或其他错误码 +* @return iotSuccess / iotFailed 或其他错误码 * * @retval 注意：若测点没有报警状态，重复确认该测点，也应当返回成功 **********************************************************************************/ @@ -97,7 +97,7 @@ int CAlarmAckProcess::handleCfmAlmReqMsg(const std::string &strKeyIdTag, long lo if (SplitKeyidTag(strKeyIdTag, strTableName, strTagName, strColumnName) < 0) { LOGWARN("handleCfmAlmReqMsg(), SplitKeyidTag error! strKeyIdTag = %s",strKeyIdTag.c_str()); - return kbdFailed; + return iotFailed; } //原始状态增加报警已经确认状态 @@ -114,7 +114,7 @@ int CAlarmAckProcess::handleCfmAlmReqMsg(const std::string &strKeyIdTag, long lo if(nRetCode == false) { LOGWARN("CAlarmAckProcess::handleCfmAlmReqMsg(), getRecordOneColumnByKey error! strTagName = %s",strKeyTagName.c_str()); - return kbdSuccess; + return iotSuccess; } nTimeStampTemp = stPointSelect.last_update_time; nStatus = stPointSelect.status;*/ @@ -124,14 +124,14 @@ int CAlarmAckProcess::handleCfmAlmReqMsg(const std::string &strKeyIdTag, long lo int64 nTimeStampTemp = 0; if( getTagInfo(strTableName,strTagName,nStatus,nTimeStampTemp) <0 ) { - return kbdSuccess ; + return iotSuccess ; } if(nTimeStampTemp > (int64)nTimeStamp) //老事件，直接返回成功，不修改报警未确认标志 { LOGDEBUG("handleCfmAlmReqMsg(), 测点last_update_time > nTimeStamp,不修改报警确认状态 ! strTagName = %s",\ strKeyIdTag.c_str()); - return kbdSuccess; + return iotSuccess; } if(strTableName == RT_DIG_TBL) @@ -151,10 +151,10 @@ int CAlarmAckProcess::handleCfmAlmReqMsg(const std::string &strKeyIdTag, long lo //======================================================================================== if(ModAlmAckStatus(strTableName, strTagName, nNewStatus) <0 ) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } //得到测点状态最后更新时间 diff --git a/platform/src/service/data_process/AlarmAckProcess.h b/platform/src/service/data_process/AlarmAckProcess.h index d6c67f69..3049970c 100644 --- a/platform/src/service/data_process/AlarmAckProcess.h +++ b/platform/src/service/data_process/AlarmAckProcess.h @@ -44,7 +44,7 @@ public: * 子类实现本函数，处理自身的业务逻辑 * @param strKeyIdTag ： 需要确认报警的测点KeyIdTag * nTimeStamp ： 需要确认报警的时间，RFC1305、POSIX时标标准 - * @return kbdSuccess / kbdFailed 或其他错误码 + * @return iotSuccess / iotFailed 或其他错误码 * * @retval 注意：若测点没有报警状态，重复确认该测点，也应当返回成功 **********************************************************************************/ diff --git a/platform/src/service/data_process/AnaWorkThread.cpp b/platform/src/service/data_process/AnaWorkThread.cpp index 75f00d4d..c0654442 100644 --- a/platform/src/service/data_process/AnaWorkThread.cpp +++ b/platform/src/service/data_process/AnaWorkThread.cpp @@ -273,5 +273,5 @@ int iot_service::CAnaWorkThread::requestAllDataFromFes() //m_ptrDataPublish->SendFesDataRequest(); }*/ - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/service/data_process/DataProcessApp.cpp b/platform/src/service/data_process/DataProcessApp.cpp index 5fa1cc28..1e07f580 100644 --- a/platform/src/service/data_process/DataProcessApp.cpp +++ b/platform/src/service/data_process/DataProcessApp.cpp @@ -164,20 +164,20 @@ bool CDataProcessApp::start(int argc, char *argv[], int &nStatus) } //8.设置冗余通知回调 - if (kbdSuccess != m_ptrRedundantMng->setCallback(m_ptrWorkThreadMng)) + if (iotSuccess != m_ptrRedundantMng->setCallback(m_ptrWorkThreadMng)) { LOGERROR("设置冗余回调接口失败"); return false; } //9.更新当前进程冗余状态 - if (kbdSuccess != m_ptrProcManage->updateProcessInfo(true, false, false)) + if (iotSuccess != m_ptrProcManage->updateProcessInfo(true, false, false)) { LOGERROR("更新本进程的进程信息失败"); return false; } - nStatus = kbdSuccess; + nStatus = iotSuccess; return true; } @@ -221,7 +221,7 @@ bool CDataProcessApp::registToProcMng() return false; } - if (kbdSuccess != m_ptrProcManage->setCallback(this)) + if (iotSuccess != m_ptrProcManage->setCallback(this)) { LOGERROR("registToProcMng()::向进程管理设置回调函数失败"); return false; @@ -348,5 +348,5 @@ bool CDataProcessApp::stop() int CDataProcessApp::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/service/data_process/DigProcess.cpp b/platform/src/service/data_process/DigProcess.cpp index 74452ced..ff98bca0 100644 --- a/platform/src/service/data_process/DigProcess.cpp +++ b/platform/src/service/data_process/DigProcess.cpp @@ -60,7 +60,7 @@ CDigProcess::~CDigProcess() bool CDigProcess::readConfig() { iot_public::CCommonConfigParse objCfgParse; - if(objCfgParse.load( iot_public::CFileUtil::getPathOfCfgFile("dataprocess_cfg.xml") ) == kbdFailed) + if(objCfgParse.load( iot_public::CFileUtil::getPathOfCfgFile("dataprocess_cfg.xml") ) == iotFailed) { LOGDEBUG("CDigProcess::readConfig() dataprocess_cfg.xml load fail .\n"); return false; diff --git a/platform/src/service/data_process/LimitProcess.cpp b/platform/src/service/data_process/LimitProcess.cpp index 1a6785ec..9e1a53c0 100644 --- a/platform/src/service/data_process/LimitProcess.cpp +++ b/platform/src/service/data_process/LimitProcess.cpp @@ -37,7 +37,7 @@ bool CLimitProcess::initialize() LOGINFO( "CLimitProcess::initialize start !"); nRetCode = m_ptrDataProcApi->initialize(); - if (nRetCode != kbdSuccess) + if (nRetCode != iotSuccess) { LOGERROR("CLimitProcess::initialize() nRetCode=%d,m_ptrDataProcApi->initialize()", nRetCode); return false; diff --git a/platform/src/service/data_process/WorkThreadMng.cpp b/platform/src/service/data_process/WorkThreadMng.cpp index 9020182a..af17d420 100644 --- a/platform/src/service/data_process/WorkThreadMng.cpp +++ b/platform/src/service/data_process/WorkThreadMng.cpp @@ -210,5 +210,5 @@ int CWorkThreadMng::redundantSwitch(bool bMaster, bool bSlave) { m_ptrProcManage->updateProcessInfo(true,bMaster,bSlave) ; } - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/service/data_process_api/DataProcessApi.cpp b/platform/src/service/data_process_api/DataProcessApi.cpp index 99087c23..1aea8391 100644 --- a/platform/src/service/data_process_api/DataProcessApi.cpp +++ b/platform/src/service/data_process_api/DataProcessApi.cpp @@ -15,7 +15,7 @@ SERVICE_DP_API CDataProcessApiPtr iot_service::getDataProcInstance(std::string s CDataProcessImplPtr ptrDataProcImpl = boost::make_shared(strAppName); if (ptrDataProcImpl != NULL) { - if (kbdSuccess != ptrDataProcImpl->initialize()) + if (iotSuccess != ptrDataProcImpl->initialize()) { /* @brief 注册失败后清理资源 */ ptrDataProcImpl.reset(); diff --git a/platform/src/service/data_process_api/DataProcessImpl.cpp b/platform/src/service/data_process_api/DataProcessImpl.cpp index 6197c6af..a470c3ea 100644 --- a/platform/src/service/data_process_api/DataProcessImpl.cpp +++ b/platform/src/service/data_process_api/DataProcessImpl.cpp @@ -43,7 +43,7 @@ int CDataProcessImpl::initialize() LOGERROR( "CDataProcessImpl::Init(), nRetCode = %d, m_RdbMng.Open(public) error!",nRetCode); return -1; } - if(m_IsRdbInit == true) return kbdSuccess ; + if(m_IsRdbInit == true) return iotSuccess ; m_IsRdbInit = true; @@ -196,7 +196,7 @@ int CDataProcessImpl::initialize() m_IsInit = true; - return kbdSuccess; + return iotSuccess; } /** diff --git a/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/CItlAlmClt.cpp b/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/CItlAlmClt.cpp index ea77e5cf..620825fa 100644 --- a/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/CItlAlmClt.cpp +++ b/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/CItlAlmClt.cpp @@ -72,7 +72,7 @@ bool CItlAlmClt::stop() int CItlAlmClt::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } } diff --git a/platform/src/service/intelli_alm_srv/CTopoThread.cpp b/platform/src/service/intelli_alm_srv/CTopoThread.cpp index 11e31a17..5447842f 100644 --- a/platform/src/service/intelli_alm_srv/CTopoThread.cpp +++ b/platform/src/service/intelli_alm_srv/CTopoThread.cpp @@ -160,7 +160,7 @@ bool CTopoThread::loadTopoInfoFromDB() QString strWhereCase; { std::vector vecLocationInfo; - if (kbdSuccess != CDbSysInfo::m_ptrSysInfo-> + if (iotSuccess != CDbSysInfo::m_ptrSysInfo-> getLocationListByDomainId(m_objParent.m_nDomainID, vecLocationInfo) || vecLocationInfo.empty()) { diff --git a/platform/src/service/interlock_api/InterLockImpl.cpp b/platform/src/service/interlock_api/InterLockImpl.cpp index 0b161cf4..fb7a84bc 100644 --- a/platform/src/service/interlock_api/InterLockImpl.cpp +++ b/platform/src/service/interlock_api/InterLockImpl.cpp @@ -42,12 +42,12 @@ int CInterLockImpl::initialize() if(createSysInfoInstance(m_ptrSysInfoPtr) == false) { LOGERROR("InstName=%s ,CInterLockImpl::initialize(), createSysInfoInstance fail!\n", m_strProcessName.c_str()); - return kbdFailed; + return iotFailed; } if(m_ptrSysInfoPtr == NULL) { LOGERROR("InstName=%s ,CInterLockImpl::initialize(), Get System Info fail!\n", m_strProcessName.c_str()); - return kbdFailed; + return iotFailed; } //RDB管理实例 @@ -55,10 +55,10 @@ int CInterLockImpl::initialize() if (m_ptrRdbTableMng == NULL) { LOGERROR("CInterLockImpl ::initialize(), make_shared fail!\n"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /** @@ -66,7 +66,7 @@ int CInterLockImpl::initialize() @param const char *strCtrlPointName IN:需要进行互锁判断的测点，一般为控制点，如AO,DO,MO等 string &strInterlockResult OUT 返回结果字符串 string &bInterlockSuccess OUT 返回结果，成功/失败 - @return 成功返回kbdSucces,失败返回 kbdFailed + @return 成功返回kbdSucces,失败返回 iotFailed */ int CInterLockImpl::CheckCtrlInterlock(const char *strCtrlPointName,const double dTargValue, string &strResult, bool &bSuccess) { @@ -82,14 +82,14 @@ int CInterLockImpl::CheckCtrlInterlock(const char *strCtrlPointName,const double { LOGERROR( "CheckCtrlInterlock, 得到闭锁参数表[OPT_INTERLOCK_PARA] getRecordAllColumnByKey error! \n"); strResult = I18N("获取控制点闭锁参数表失败 !") ; - return kbdFailed; + return iotFailed; } else if (nRetCode == 0) { bSuccess = true; strResult = I18N("控制点没有配置闭锁,检查通过 !"); LOGDEBUG( "CheckCtrlInterlock, 该控制点[%s]没有配置闭锁参数 ! \n",strTagName.c_str()); - return kbdSuccess; + return iotSuccess; } string strInterlockTag = stInterLockParaAll.interlock_tag; @@ -98,7 +98,7 @@ int CInterLockImpl::CheckCtrlInterlock(const char *strCtrlPointName,const double if ( (strInterlockTag.size() <=0) || (nInterlockTagNum <= 0) ) { strResult = I18N("闭锁入口参数小于等于零,请检查配置 !"); - return kbdFailed; + return iotFailed; } for(int i=0;i &vecInterlockKey：IN 输入参数队列 VECTOR string &strInterlockResult OUT 返回结果字符串 string &bInterlockSuccess OUT 返回结果，成功/失败 - @return 成功返回kbdSucces,失败返回 kbdFailed + @return 成功返回kbdSucces,失败返回 iotFailed */ int CInterLockImpl::CheckCtrlInterlock(const char *strInterlockName, const double dTargValue,const int nInterlockNum, const vector &vecInterLockInPara, string &strInterlockResult, bool &bInterlockSuccess) @@ -186,14 +186,14 @@ int CInterLockImpl::CheckCtrlInterlock(const char *strInterlockName, const doubl } string strInterLockScript = strInterlock; iot_public::CLuaEngineInterface m_objLuoInterface; - if(m_objLuoInterface.initialize() != kbdSuccess) + if(m_objLuoInterface.initialize() != iotSuccess) { LOGERROR("CInterLockImpl::initialize(),initialize lua interface fail !\n"); - return -1;//kbdFailed; + return -1;//iotFailed; } string strInterlockOutput; // 闭锁检测输出；空表示检查通过，否则输出错误信息； nRetCode = m_objLuoInterface.execFunction(strInterlockName,strInterLockScript,vecTargValue,vecValue,vecStatus,vecName,strInterlockOutput); - if (nRetCode != kbdSuccess) + if (nRetCode != iotSuccess) { LOGWARN( "CheckCtrlInterlock, exec Function[%s] error!", strInterlockName); bInterlockSuccess = false; @@ -344,7 +344,7 @@ int CInterLockImpl::SplitDmAppKeyidTag(const std::string &strDmAppKeyIdTag, int string strSubSystemName = vecStr[1]; SSubsystemInfo stSubsystemInfo; nRetCode = m_ptrSysInfoPtr->getSubsystemInfoByName(strSubSystemName,stSubsystemInfo); - if (nRetCode == kbdFailed) + if (nRetCode == iotFailed) { LOGWARN("SplitDmAppKeyidTag, nRetCode(%d), SubSystemName(%s), getSubsystemInfoByName error!", nRetCode, strSubSystemName.c_str()); diff --git a/platform/src/service/interlock_api/InterLockImpl.h b/platform/src/service/interlock_api/InterLockImpl.h index c1145ebd..224fd2db 100644 --- a/platform/src/service/interlock_api/InterLockImpl.h +++ b/platform/src/service/interlock_api/InterLockImpl.h @@ -37,13 +37,13 @@ namespace iot_service public: /** @brief 初始化 - @return 成功返回kbdSucces,失败返回kbdFailed + @return 成功返回kbdSucces,失败返回iotFailed */ int initialize(); /** @brief 判断联锁关系 - @return 成功返回kbdSucces,失败返回kbdFailed + @return 成功返回kbdSucces,失败返回iotFailed */ int CheckCtrlInterlock(const char *strCtrlPointName, const double dTargValue,std::string &strResult, bool &bSuccess); private: diff --git a/platform/src/service/interlock_api/InterLockInterface.cpp b/platform/src/service/interlock_api/InterLockInterface.cpp index 91213421..92129c4c 100644 --- a/platform/src/service/interlock_api/InterLockInterface.cpp +++ b/platform/src/service/interlock_api/InterLockInterface.cpp @@ -17,7 +17,7 @@ SERVICE_INTERLOCK_API CInterLockInterfacePtr iot_service::getInterLockInstance( CInterLockImplPtr ptrInterLockImpl = boost::make_shared(stRunAppInfo,strProcess); if (ptrInterLockImpl != NULL) { - if (kbdSuccess != ptrInterLockImpl->initialize()) + if (iotSuccess != ptrInterLockImpl->initialize()) { /* @brief 注册失败后清理资源 */ ptrInterLockImpl.reset(); diff --git a/platform/src/service/iscs_wise_mnp/CAsyncRcvSubThread.cpp b/platform/src/service/iscs_wise_mnp/CAsyncRcvSubThread.cpp index 4e00bd18..4cc593c5 100644 --- a/platform/src/service/iscs_wise_mnp/CAsyncRcvSubThread.cpp +++ b/platform/src/service/iscs_wise_mnp/CAsyncRcvSubThread.cpp @@ -55,10 +55,10 @@ iot_service::CAsyncRcvSubThread::~CAsyncRcvSubThread() int iot_service::CAsyncRcvSubThread::initialize() { //读配置 - if(kbdSuccess != readConfig()) + if(iotSuccess != readConfig()) { LOGERROR("读取配置失败"); - return kbdFailed; + return iotFailed; } #ifdef OS_LINUX //base_event指针 @@ -66,10 +66,10 @@ int iot_service::CAsyncRcvSubThread::initialize() if(NULL == m_pEventBase) { LOGERROR("创建event base 指针失败"); - return kbdFailed; + return iotFailed; } #endif - return kbdSuccess; + return iotSuccess; } void iot_service::CAsyncRcvSubThread::execute() @@ -125,7 +125,7 @@ int iot_service::CAsyncRcvSubThread::beforeSlave() // aeStop(m_pLoop); // } #endif - return kbdSuccess; + return iotSuccess; } @@ -134,7 +134,7 @@ int iot_service::CAsyncRcvSubThread::readConfig() m_vecChannel.push_back(CN_Real_Data_Sub_Channel); m_stEventLoopTv = {0,500*1000}; //最长500ms一次阻塞,事件循环的阻塞 - return kbdSuccess; + return iotSuccess; } int iot_service::CAsyncRcvSubThread::asyncConnect() @@ -142,24 +142,24 @@ int iot_service::CAsyncRcvSubThread::asyncConnect() CRedisConMng redisConMngObj(m_vecRedisInfo); uint64_t start = iot_public::getUTCTimeMsec(); - if(kbdSuccess != redisConMngObj.redisReCon()) + if(iotSuccess != redisConMngObj.redisReCon()) { LOGINFO("同步连接失败"); LOGINFO("超时连接的时间%d 单为ms",(int)(iot_public::getUTCTimeMsec() - start)); - return kbdFailed; + return iotFailed; } LOGINFO("超时连接的时间%d 单为ms",(int)(iot_public::getUTCTimeMsec() - start)); if(false == redisConMngObj.getConnentStatus()) { LOGINFO("同步连接标志位为：未连接"); - return kbdFailed; + return iotFailed; } redisConMngObj.getMasterSrvInfo(m_stMasterRedisSrvInfo); if(0 == m_stMasterRedisSrvInfo.strIp.compare("") || m_stMasterRedisSrvInfo.nPort <= 0) { LOGINFO("获取的主IP：%s 端口号:%d有误",m_stMasterRedisSrvInfo.strIp.c_str(),m_stMasterRedisSrvInfo.nPort); - return kbdFailed; + return iotFailed; } #ifdef OS_LINUX signal(SIGPIPE, SIG_IGN); @@ -180,7 +180,7 @@ int iot_service::CAsyncRcvSubThread::asyncConnect() #elif OS_LINUX LOGWARN("Async Error: %s", m_pRedisAsyncCon->errstr); #endif - return kbdFailed; + return iotFailed; } #ifdef OS_LINUX redisLibeventAttach(m_pRedisAsyncCon,m_pEventBase); @@ -202,7 +202,7 @@ int iot_service::CAsyncRcvSubThread::asyncConnect() redisAsyncCommand(m_pRedisAsyncCon,authPasswdCallBack,(char*)"verfiyPasswd","AUTH %s",m_stMasterRedisSrvInfo.strPasswd.c_str()); redisAsyncCommand(m_pRedisAsyncCon,subCallback, (char*)"sub", redisCmd.c_str()); m_bConFlags = true; - return kbdSuccess; + return iotSuccess; } #ifdef OS_WINDOWS std::string iot_service::CAsyncRcvSubThread::GbkToUtf8(std::string src_str) diff --git a/platform/src/service/iscs_wise_mnp/CRcvRDWrtRdsThread.cpp b/platform/src/service/iscs_wise_mnp/CRcvRDWrtRdsThread.cpp index 1988a304..ccef5b21 100644 --- a/platform/src/service/iscs_wise_mnp/CRcvRDWrtRdsThread.cpp +++ b/platform/src/service/iscs_wise_mnp/CRcvRDWrtRdsThread.cpp @@ -48,31 +48,31 @@ iot_service::CRcvRDWrtRdsThread::~CRcvRDWrtRdsThread() int iot_service::CRcvRDWrtRdsThread::initialize() { LOGINFO("接收实时数据写入redis线程初始化"); - if(kbdSuccess != readConfig()) + if(iotSuccess != readConfig()) { LOGERROR("读取配置文件失败"); - return kbdFailed; + return iotFailed; } /*if(!CDpcdaForApp::initGlobalThread()) { LOGERROR("初始化全局处理线程失败"); - return kbdFailed; + return iotFailed; }*/ m_pMbCommunicator = new iot_net::CMbCommunicator(); if(NULL == m_pMbCommunicator) { LOGERROR("初始化通讯器指针失败"); - return kbdFailed; + return iotFailed; } m_pRedisConMng = new iot_service::CRedisConMng(m_vecRedisInfo); if(NULL == m_pRedisConMng) { LOGERROR("初始化redis连接指针失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CRcvRDWrtRdsThread::beforeMaster() @@ -83,12 +83,12 @@ int iot_service::CRcvRDWrtRdsThread::beforeMaster() if(m_pMbCommunicator->addSub(0,CH_SCADA_TO_HMI_DATA_CHANGE)) { LOGINFO("订阅通道:%d成功",CH_SCADA_TO_HMI_DATA_CHANGE); - ret = kbdSuccess; + ret = iotSuccess; } else { LOGERROR("订阅通道:%d失败",CH_SCADA_TO_HMI_DATA_CHANGE); - ret = kbdFailed; + ret = iotFailed; } m_bMaster = true; @@ -115,7 +115,7 @@ void iot_service::CRcvRDWrtRdsThread::execute() if(!m_pRedisConMng->getConnentStatus()) { LOGINFO("*********************连接redis****************"); - if(kbdSuccess == m_pRedisConMng->redisReCon()) + if(iotSuccess == m_pRedisConMng->redisReCon()) { LOGINFO("-----------接收实时数据写入redis线程连接redis成功-----------------"); } @@ -210,7 +210,7 @@ int iot_service::CRcvRDWrtRdsThread::readConfig() { initStatusWorthMap(); - return kbdSuccess; + return iotSuccess; } bool iot_service::CRcvRDWrtRdsThread::parserMsg(iot_net::CMbMessage &_msg) @@ -261,7 +261,7 @@ bool iot_service::CRcvRDWrtRdsThread::pipeWriteToRedis() vecCmd.push_back(cmd); //事务的执行 // LOGDEBUG("REDIS COMMAND =%s", boost::join(vecCmd, ",").c_str()); - if(kbdSuccess != m_pRedisConMng->exeRedisPipeCmd(vecCmd)) + if(iotSuccess != m_pRedisConMng->exeRedisPipeCmd(vecCmd)) { LOGWARN("实时数据写入redis ip:[%s] port:[%d]执行存在失败",m_pRedisConMng->getMasterIp().c_str(),m_pRedisConMng->getMasterPort()); return false; diff --git a/platform/src/service/iscs_wise_mnp/CRealAlarmThread.cpp b/platform/src/service/iscs_wise_mnp/CRealAlarmThread.cpp index b2b54132..15571082 100644 --- a/platform/src/service/iscs_wise_mnp/CRealAlarmThread.cpp +++ b/platform/src/service/iscs_wise_mnp/CRealAlarmThread.cpp @@ -33,19 +33,19 @@ iot_service::CRealAlarmThread::~CRealAlarmThread() int iot_service::CRealAlarmThread::initialize() { - if(kbdSuccess != readConfig()) + if(iotSuccess != readConfig()) { LOGERROR("读取配置文件失败"); - return kbdFailed; + return iotFailed; } m_pRedisCon = new CRedisConMng(m_vecRedisInfo); if(NULL == m_pRedisCon) { LOGERROR("创建redis连接指针失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } void iot_service::CRealAlarmThread::handleReleaseAlmMsg(iot_idl::SAlmCltReleaseAlm &objReleaseAlm) @@ -70,7 +70,7 @@ void iot_service::CRealAlarmThread::handleReleaseAlmMsg(iot_idl::SAlmCltReleaseA } LOGDEBUG("CRealAlarmThread::handleDelAlmMsg()释放后:%d",(int)m_mapWaterAlm.size()); LOGINFO("收到报警释放，开始释放redis的报警"); - if(kbdSuccess != updateRedisAlm(vecDelAlmId,vecAddAlm)) + if(iotSuccess != updateRedisAlm(vecDelAlmId,vecAddAlm)) { m_bRedisWriteFaild = true; LOGERROR("释放报警过程中存在失败"); @@ -110,7 +110,7 @@ void iot_service::CRealAlarmThread::handleAllAlmMsg(int /*nDomainID*/, iot_idl:: } LOGDEBUG("CRealAlarmThread::handleAllAlmMsg()添加后:%d",(int)m_mapWaterAlm.size()); LOGINFO("【报警线程】收到所有的报警，报警线程开始向redis写入所有的报警"); - if(kbdSuccess != syncAllAlmLocalToRedis()) + if(iotSuccess != syncAllAlmLocalToRedis()) { m_bRedisWriteFaild = true; LOGERROR("【报警线程】向redis写入所有的报警存在失败"); @@ -152,7 +152,7 @@ void iot_service::CRealAlarmThread::handleAddAlmMsg(iot_idl::SAlmCltAddAlm &objA } LOGDEBUG("CRealAlarmThread::handleAddAlmMsg()添加后:%d",(int)m_mapWaterAlm.size()); LOGINFO("收到报警增加，开始增加报警信息"); - if(kbdSuccess != updateRedisAlm(vecDelAlmId,vecAddAlm)) + if(iotSuccess != updateRedisAlm(vecDelAlmId,vecAddAlm)) { m_bRedisWriteFaild = true; LOGERROR("报警添加存在失败"); @@ -202,7 +202,7 @@ void iot_service::CRealAlarmThread::handleCfmAlmMsg(iot_idl::SAlmCltCfmAlm &objC } LOGDEBUG("CRealAlarmThread::handleCfmAlmMsg()确认后:%d",(int)m_mapWaterAlm.size()); LOGINFO("开始更新报警的确认"); - if(kbdSuccess != updateRedisAlm(vecDelAlmId,vecAddAlm)) + if(iotSuccess != updateRedisAlm(vecDelAlmId,vecAddAlm)) { m_bRedisWriteFaild = true; LOGERROR("报警确认更新存在失败"); @@ -239,7 +239,7 @@ void iot_service::CRealAlarmThread::handleDelAlmMsg(iot_idl::SAlmCltDelAlm &objD } LOGDEBUG("CRealAlarmThread::handleDelAlmMsg()删除后:%d",(int)m_mapWaterAlm.size()); LOGINFO("收到报警删除，开始删除redis的报警"); - if(kbdSuccess != updateRedisAlm(vecDelAlmId,vecAddAlm)) + if(iotSuccess != updateRedisAlm(vecDelAlmId,vecAddAlm)) { m_bRedisWriteFaild = true; LOGERROR("删除报警过程中存在失败"); @@ -254,17 +254,17 @@ int iot_service::CRealAlarmThread::realAlmRedisReconnect() { if(m_pRedisCon->getConnentStatus()) { - return kbdSuccess; + return iotSuccess; } - if(kbdSuccess == m_pRedisCon->redisReCon()) + if(iotSuccess == m_pRedisCon->redisReCon()) { LOGINFO("实时报警线程redis重连接成功"); - return kbdSuccess; + return iotSuccess; } else { LOGWARN("实时报警线程redis重接失败"); - return kbdFailed; + return iotFailed; } } @@ -273,42 +273,42 @@ int iot_service::CRealAlarmThread::webSrvToRedisAllSync() { if(!m_bRedisWriteFaild) //如果是非失败状态、那就不用进行全同步 { - return kbdSuccess; + return iotSuccess; } if(!m_pRedisCon->getConnentStatus()) //如果是连接状态，根本不可能全同步 { - return kbdFailed; + return iotFailed; } LOGINFO("【外部线程】对报警进行全同步"); - if(kbdSuccess == syncAllAlmLocalToRedis()) + if(iotSuccess == syncAllAlmLocalToRedis()) { m_bRedisWriteFaild = false; LOGINFO("【外部线程】 全同步所有的报警至 redis 全部成功"); - return kbdSuccess; + return iotSuccess; } else { LOGERROR("【外部线程】报警信息全同步失败"); - return kbdFailed; + return iotFailed; } } int iot_service::CRealAlarmThread::readConfig() { - return kbdSuccess; + return iotSuccess; } int iot_service::CRealAlarmThread::syncAllAlmLocalToRedis() { if(!m_pRedisCon->getConnentStatus()) { - return kbdFailed; + return iotFailed; } std::vector vecAlmId; - if(kbdSuccess != getAllAlmIdFromRedis(vecAlmId)) + if(iotSuccess != getAllAlmIdFromRedis(vecAlmId)) { LOGWARN("从redis获取所有的报警ID失败"); - return kbdFailed; + return iotFailed; } std::string cmdDel; generateDelAllAlmInfoCmd(vecAlmId,cmdDel); //生成报警删除的命令 @@ -327,10 +327,10 @@ int iot_service::CRealAlarmThread::syncAllAlmLocalToRedis() size_t replySize =2 + 1 + 1; int ret1 = m_pRedisCon->redisGetReplyAll(replySize); - if(kbdSuccess != ret1) + if(iotSuccess != ret1) { LOGERROR("删除redis告警失败"); - return kbdFailed; + return iotFailed; } else { @@ -430,10 +430,10 @@ int iot_service::CRealAlarmThread::syncAllAlmLocalToRedis() replySize =2 + vecSetAlmKv.size() + 1; int ret2 = m_pRedisCon->redisGetReplyAll(replySize); - if(kbdSuccess != ret2) + if(iotSuccess != ret2) { LOGERROR("添加redis告警失败"); - return kbdFailed; + return iotFailed; } else { @@ -456,10 +456,10 @@ int iot_service::CRealAlarmThread::syncAllAlmLocalToRedis() replySize =2 + 1 + 1; int ret3 = m_pRedisCon->redisGetReplyAll(replySize); - if(kbdSuccess != ret3) + if(iotSuccess != ret3) { LOGERROR("添加Priority索引失败"); - return kbdFailed; + return iotFailed; } else { @@ -477,10 +477,10 @@ int iot_service::CRealAlarmThread::syncAllAlmLocalToRedis() replySize =2 + 1 + 1; int ret3 = m_pRedisCon->redisGetReplyAll(replySize); - if(kbdSuccess != ret3) + if(iotSuccess != ret3) { LOGERROR("添加RegionId索引失败"); - return kbdFailed; + return iotFailed; } else { @@ -498,10 +498,10 @@ int iot_service::CRealAlarmThread::syncAllAlmLocalToRedis() replySize =2 + 1 + 1; int ret3 = m_pRedisCon->redisGetReplyAll(replySize); - if(kbdSuccess != ret3) + if(iotSuccess != ret3) { LOGERROR("添加LocationId索引失败"); - return kbdFailed; + return iotFailed; } else { @@ -518,10 +518,10 @@ int iot_service::CRealAlarmThread::syncAllAlmLocalToRedis() replySize =2 + 1 + 1; int ret3 = m_pRedisCon->redisGetReplyAll(replySize); - if(kbdSuccess != ret3) + if(iotSuccess != ret3) { LOGERROR("添加AlarmType索引失败"); - return kbdFailed; + return iotFailed; } else { @@ -539,10 +539,10 @@ int iot_service::CRealAlarmThread::syncAllAlmLocalToRedis() replySize =2 + 1 + 1; int ret3 = m_pRedisCon->redisGetReplyAll(replySize); - if(kbdSuccess != ret3) + if(iotSuccess != ret3) { LOGERROR("添加DevType索引失败"); - return kbdFailed; + return iotFailed; } else { @@ -560,10 +560,10 @@ int iot_service::CRealAlarmThread::syncAllAlmLocalToRedis() replySize =2 + 1 + 1; int ret3 = m_pRedisCon->redisGetReplyAll(replySize); - if(kbdSuccess != ret3) + if(iotSuccess != ret3) { LOGERROR("添加Time索引失败"); - return kbdFailed; + return iotFailed; } else { @@ -581,10 +581,10 @@ int iot_service::CRealAlarmThread::syncAllAlmLocalToRedis() replySize =2 + 1 + 1; int ret3 = m_pRedisCon->redisGetReplyAll(replySize); - if(kbdSuccess != ret3) + if(iotSuccess != ret3) { LOGERROR("添加Status索引失败"); - return kbdFailed; + return iotFailed; } else { @@ -598,7 +598,7 @@ int iot_service::CRealAlarmThread::syncAllAlmLocalToRedis() // replySize =2 + zaddSize + 1; // int ret3 = m_pRedisCon->redisGetReplyAll(replySize); -// if(kbdSuccess != ret3) +// if(iotSuccess != ret3) // { // LOGERROR("添加索引失败"); // } @@ -607,7 +607,7 @@ int iot_service::CRealAlarmThread::syncAllAlmLocalToRedis() // LOGINFO("添加索引成功"); // } - return kbdSuccess; + return iotSuccess; // std::string cmdPubAlmNotice = "PUBLISH "; // cmdPubAlmNotice.append(CN_Real_Alm_Notice_Channel); // cmdPubAlmNotice.append(" "); @@ -627,7 +627,7 @@ int iot_service::CRealAlarmThread::syncAllAlmLocalToRedis() // size_t replySize =2 + 1 + 1 +vecSetAlmKv.size() + zaddSize; // int ret = m_pRedisCon->redisGetReplyAll(replySize); -// if(kbdSuccess != ret) +// if(iotSuccess != ret) // { // LOGERROR("本地报警信息同步到redis存在失败"); // } @@ -769,26 +769,26 @@ int iot_service::CRealAlarmThread::getAllAlmIdFromRedis(std::vector //ZRANGE key min max redisReply *reply = NULL; CRedisReplyDestructor objDestructor(&reply); - if(kbdSuccess != m_pRedisCon->exeRedisCmd(reply,cmd)) + if(iotSuccess != m_pRedisCon->exeRedisCmd(reply,cmd)) { LOGWARN("执行命令[%s]失败",cmd.c_str()); - return kbdFailed; + return iotFailed; } if(NULL == reply) { LOGWARN("执行命令[%s]应答指针为NULL",cmd.c_str()); - return kbdFailed; + return iotFailed; } if(REDIS_REPLY_ARRAY != reply->type) { LOGWARN("执行命令[%s]应答类型错误,错误原因:[%s]",cmd.c_str(),reply->str); - return kbdFailed; + return iotFailed; } for(size_t i = 0; i < reply->elements;++i) { _vecAlmId.push_back(reply->element[i]->str); } - return kbdSuccess; + return iotSuccess; } int iot_service::CRealAlarmThread::changeAlmLogicStatus(const int &_status) @@ -837,7 +837,7 @@ int iot_service::CRealAlarmThread::changeAlmLogicStatus(const int &_status) // m_mapNotWaterAlm.insert({key,_vecStAlmItem[i]}); // } // } -// return kbdSuccess; +// return iotSuccess; //} /* int iot_service::CRealAlarmThread::addAlaUpdateRedis(std::vector &_vecStAlmItem) @@ -917,7 +917,7 @@ int iot_service::CRealAlarmThread::updateRedisAlm(std::vector &_vecDel { if(!m_pRedisCon->getConnentStatus()) { - return kbdFailed; + return iotFailed; } std::string cmdZremPriority = "ZREM "; cmdZremPriority.append(CN_Redis_Alm_Index_Priority); //依据报警ID 移除优先级索引 @@ -1052,7 +1052,7 @@ int iot_service::CRealAlarmThread::updateRedisAlm(std::vector &_vecDel // 最后的1代表 PUBLISH 发布通知消息的 size_t allCmdSize = 2 + delCmdNum + vecAlmKv.size() + addIndexSize + 1; int ret = m_pRedisCon->redisGetReplyAll(allCmdSize); - if(kbdSuccess != ret) + if(iotSuccess != ret) { LOGERROR("更新redis信息 存在失败"); } @@ -1089,7 +1089,7 @@ int iot_service::CRealAlarmThread::getAlmFromRedisPrintLog() if(!m_pRedisCon->getConnentStatus()) { LOGINFO("------------------redis未连接----------------------"); - return kbdFailed; + return iotFailed; } LOGINFO("ptint Region_Id"); std::string cmdRegionId = "ZRANGE "; @@ -1102,25 +1102,25 @@ int iot_service::CRealAlarmThread::getAlmFromRedisPrintLog() cmdRegionId.append("WITHSCORES"); redisReply *reply = NULL; CRedisReplyDestructor objDestructor(&reply); - if(kbdSuccess != m_pRedisCon->exeRedisCmd(reply,cmdRegionId)) + if(iotSuccess != m_pRedisCon->exeRedisCmd(reply,cmdRegionId)) { LOGWARN("执行命令[%s]获取所有的优先级索引失败",cmdRegionId.c_str()); - return kbdFailed; + return iotFailed; } if(NULL == reply) { LOGWARN("执行命令获取所有的优先级索引返回为NULL"); - return kbdFailed; + return iotFailed; } if(REDIS_REPLY_ARRAY != reply->type) { LOGWARN("执行命令[%s]获取所有优先级索引返回类型错误。类型:[%d]原因[%s]",cmdRegionId.c_str(),reply->type,reply->str);\ - return kbdFailed; + return iotFailed; } if(0 != reply->elements % 2) { LOGWARN("返回值数量:[%d]错误，非偶数",(int)reply->elements); - return kbdFailed; + return iotFailed; } int almNum; for(int i = 0; i < (int)(reply->elements);i+=2) @@ -1128,6 +1128,6 @@ int iot_service::CRealAlarmThread::getAlmFromRedisPrintLog() almNum = i / 2 + 1; LOGINFO("第[%d]条报警，报警ID:[%s]，责任区:[%s]",almNum,reply->element[i]->str,reply->element[i+1]->str); } - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/service/iscs_wise_mnp/CRealEventThread.cpp b/platform/src/service/iscs_wise_mnp/CRealEventThread.cpp index 51f89b0a..371b2767 100644 --- a/platform/src/service/iscs_wise_mnp/CRealEventThread.cpp +++ b/platform/src/service/iscs_wise_mnp/CRealEventThread.cpp @@ -52,7 +52,7 @@ void iot_service::CRealEventThread::handleAllEvtMsg(int, iot_idl::SEvtCltAddEvt m_mapEvent.insert({m_nMaxId,stEvtItemObj}); } LOGINFO("收到所有的事件，开始向redis写入所有的事件"); - if(kbdSuccess != syncAllEvtLocalToRedis()) + if(iotSuccess != syncAllEvtLocalToRedis()) { m_bRedisWriteFaild = true; LOGERROR("向redis写入所有的事件存在失败"); @@ -96,7 +96,7 @@ void iot_service::CRealEventThread::handleAddEvtMsg(iot_idl::SEvtCltAddEvt &objA vecAddEvt.push_back(stEvtItemObj); m_mapEvent.insert({m_nMaxId,stEvtItemObj}); } - if(kbdSuccess != updateEvtLocalToRedis(vecDelEvtId,vecAddEvt)) //有死锁现象 --zzl add + if(iotSuccess != updateEvtLocalToRedis(vecDelEvtId,vecAddEvt)) //有死锁现象 --zzl add { m_bRedisWriteFaild = true; LOGWARN("实时事件增加，更新至redis存在失败"); @@ -111,40 +111,40 @@ int iot_service::CRealEventThread::realEvtRedisReconnect() { if(m_pRedisCon->getConnentStatus()) { - return kbdSuccess; + return iotSuccess; } - if(kbdSuccess == m_pRedisCon->redisReCon()) + if(iotSuccess == m_pRedisCon->redisReCon()) { LOGINFO("实时事件线程redis连接成功"); - return kbdSuccess; + return iotSuccess; } else { LOGWARN("实时事件线程redis连接失败"); - return kbdFailed; + return iotFailed; } } int iot_service::CRealEventThread::initialize() { - if(kbdSuccess != readConfig()) + if(iotSuccess != readConfig()) { LOGERROR("实时事件线程初始化失败"); - return kbdFailed; + return iotFailed; } m_pRedisCon = new CRedisConMng(m_vecRedisInfo); if(NULL == m_pRedisCon) { LOGERROR("实时事件线程 创建redis连接指针失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CRealEventThread::readConfig() { //read config - return kbdSuccess; + return iotSuccess; } void iot_service::CRealEventThread::SEvtInfoToEvtClt2stEvtItem(const iot_idl::SEvtInfoToEvtClt &_evtInfoClt, @@ -194,13 +194,13 @@ int iot_service::CRealEventThread::syncAllEvtLocalToRedis() { if(!m_pRedisCon->getConnentStatus()) { - return kbdFailed; + return iotFailed; } std::vector vecAlmId; - if(kbdSuccess != getAllEvtIdFromRedis(vecAlmId)) + if(iotSuccess != getAllEvtIdFromRedis(vecAlmId)) { LOGWARN("从redis获取所有的报警ID失败"); - return kbdFailed; + return iotFailed; } std::string cmdDel; generateDelAllEvtInfoCmd(vecAlmId,cmdDel); @@ -270,7 +270,7 @@ int iot_service::CRealEventThread::syncAllEvtLocalToRedis() size_t replySize = 2 + 1 + vecSetEvtKv.size() + zaddSize + 1; int ret = m_pRedisCon->redisGetReplyAll(replySize); - if(kbdSuccess != ret) + if(iotSuccess != ret) { LOGERROR("本地事件信息同步到redis存在失败"); } @@ -285,7 +285,7 @@ int iot_service::CRealEventThread::updateEvtLocalToRedis(std::vector & { if(!m_pRedisCon->getConnentStatus()) { - return kbdFailed; + return iotFailed; } std::string cmdZremPriority = "ZREM "; cmdZremPriority.append(CN_Redis_Evt_Index_Priority); //依据报警ID 移除优先级索引 @@ -392,7 +392,7 @@ int iot_service::CRealEventThread::updateEvtLocalToRedis(std::vector & // 最后的1代表 PUBLISH 发布通知消息的 size_t allCmdSize = 2 + delCmdNum + vecEvtKv.size() + addIndexSize + 1; int ret = m_pRedisCon->redisGetReplyAll(allCmdSize); - if(kbdSuccess != ret) + if(iotSuccess != ret) { LOGERROR("实时事件更新存在失败"); } @@ -412,49 +412,49 @@ int iot_service::CRealEventThread::getAllEvtIdFromRedis(std::vector //ZRANGE key min max redisReply *reply = NULL; CRedisReplyDestructor objDestructor(&reply); - if(kbdSuccess != m_pRedisCon->exeRedisCmd(reply,cmd)) + if(iotSuccess != m_pRedisCon->exeRedisCmd(reply,cmd)) { LOGWARN("执行命令[%s]失败",cmd.c_str()); - return kbdFailed; + return iotFailed; } if(NULL == reply) { LOGWARN("执行命令[%s]应答指针为NULL",cmd.c_str()); - return kbdFailed; + return iotFailed; } if(REDIS_REPLY_ARRAY != reply->type) { LOGWARN("执行命令[%s]应答类型错误,错误原因:[%s]",cmd.c_str(),reply->str); - return kbdFailed; + return iotFailed; } for(size_t i = 0; i < reply->elements;++i) { _vecEvtId.push_back(reply->element[i]->str); } - return kbdSuccess; + return iotSuccess; } int iot_service::CRealEventThread::webSrvToRedisAllSync() { if(!m_bRedisWriteFaild) { - return kbdSuccess; + return iotSuccess; } if(!m_pRedisCon->getConnentStatus()) { - return kbdFailed; + return iotFailed; } LOGINFO("外部线程开始对 [实时事件] 进行全同步"); - if(kbdSuccess == syncAllEvtLocalToRedis()) + if(iotSuccess == syncAllEvtLocalToRedis()) { m_bRedisWriteFaild = false; LOGINFO("外部线程对 [实时事件] 全同步至redis成功"); - return kbdSuccess; + return iotSuccess; } else { LOGERROR("外部线程对 [实时事件] 全同步至redis成功"); - return kbdFailed; + return iotFailed; } } diff --git a/platform/src/service/iscs_wise_mnp/CRedisConMng.cpp b/platform/src/service/iscs_wise_mnp/CRedisConMng.cpp index 7cb80973..5718876f 100644 --- a/platform/src/service/iscs_wise_mnp/CRedisConMng.cpp +++ b/platform/src/service/iscs_wise_mnp/CRedisConMng.cpp @@ -35,11 +35,11 @@ int iot_service::CRedisConMng::redisReCon() for(size_t i = 0; i < maxSize; ++i) { m_stCurrentRedis = m_vecRedisInfo[i]; - if(kbdSuccess != RedisConWithTimeoutVerifyPasswd(m_vecRedisInfo[i])) + if(iotSuccess != RedisConWithTimeoutVerifyPasswd(m_vecRedisInfo[i])) { continue; } - if(kbdSuccess != judgeMaster(m_stCurrentRedis)) + if(iotSuccess != judgeMaster(m_stCurrentRedis)) { if(0 == m_stCurrentRedis.strIp.compare("") || -1 == m_stCurrentRedis.nPort) //如果没有得到了给定的主 ip：port，下一组 { @@ -47,38 +47,38 @@ int iot_service::CRedisConMng::redisReCon() } else //如果得到了给定的主 ip：port { - if(kbdSuccess != RedisConWithTimeoutVerifyPasswd(m_stCurrentRedis)) //连接给定的主 ip：port失败，下一组 + if(iotSuccess != RedisConWithTimeoutVerifyPasswd(m_stCurrentRedis)) //连接给定的主 ip：port失败，下一组 { continue; } else //连接给定的主 ip：port成功 { - if(kbdSuccess != writeToMaster()) //向新连接写入失败 ，下一组 + if(iotSuccess != writeToMaster()) //向新连接写入失败 ，下一组 { continue; } else //向新连接写入成功 { setRedisConnected(); - return kbdSuccess; + return iotSuccess; } } } } else { - if(kbdSuccess != writeToMaster()) + if(iotSuccess != writeToMaster()) { continue; } else { setRedisConnected(); - return kbdSuccess; + return iotSuccess; } } } - return kbdFailed; + return iotFailed; } @@ -105,12 +105,12 @@ int iot_service::CRedisConMng::exeRedisCmd(redisReply *&_reply, std::string &_cm { if(NULL == m_pCon || false == m_bConFlag) { - return kbdFailed; + return iotFailed; } _reply = (redisReply *)redisCommand(m_pCon,_cmd.c_str()); switch (m_pCon->err) { case REDIS_OK: - return kbdSuccess; + return iotSuccess; break; case REDIS_ERR: LOGWARN("连接ip：%s port ：%d执行命令%s出错：%s",m_stMasterRedis.strIp.c_str(),m_stMasterRedis.nPort,_cmd.c_str(),m_pCon->errstr); @@ -132,7 +132,7 @@ int iot_service::CRedisConMng::exeRedisCmd(redisReply *&_reply, std::string &_cm default: break; } - return kbdFailed; + return iotFailed; } int iot_service::CRedisConMng::exeRedisPipeCmd(std::vector &_vecCmd) @@ -141,12 +141,12 @@ int iot_service::CRedisConMng::exeRedisPipeCmd(std::vector &_vecCmd if(NULL == m_pCon || false == m_bConFlag) { - return kbdFailed; + return iotFailed; } size_t cmdSize = _vecCmd.size(); if(cmdSize <= 0) { - return kbdSuccess; + return iotSuccess; } for(size_t i = 0; i < cmdSize; ++i) { @@ -187,7 +187,7 @@ int iot_service::CRedisConMng::redisGetReplyAll(size_t replySize) LOGDEBUG("redisGetReplyAll()size=%d",(int)replySize); redisReply *reply = NULL; - int ret = kbdSuccess, nErrCnt = 0; + int ret = iotSuccess, nErrCnt = 0; while(1) { @@ -218,7 +218,7 @@ int iot_service::CRedisConMng::redisGetReplyAll(size_t replySize) if(REDIS_REPLY_ERROR == reply->type) { LOGERROR("管道添加命令错误:%s",reply->str); - ret = kbdFailed; + ret = iotFailed; continue; } else if(REDIS_REPLY_ARRAY == reply->type) @@ -228,7 +228,7 @@ int iot_service::CRedisConMng::redisGetReplyAll(size_t replySize) if(REDIS_REPLY_ERROR == reply->element[j]->type) { LOGERROR("管道执行命令错误：%s",reply->element[j]->str); - ret = kbdFailed; + ret = iotFailed; } } } @@ -301,7 +301,7 @@ int iot_service::CRedisConMng::RedisConWithTimeout(const std::string &_strIp, co { sleepMsec(intervalMsec); } - return kbdFailed; + return iotFailed; } if(REDIS_OK != m_pCon->err) { @@ -311,10 +311,10 @@ int iot_service::CRedisConMng::RedisConWithTimeout(const std::string &_strIp, co sleepMsec(intervalMsec); } m_pCon = NULL; - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CRedisConMng::RedisConWithTimeoutVerifyPasswd(iot_service::stRedisSrvInfo &_stObj) @@ -322,7 +322,7 @@ int iot_service::CRedisConMng::RedisConWithTimeoutVerifyPasswd(iot_service::stRe if(0 == _stObj.strIp.compare("") || -1 == _stObj.nPort) { LOGERROR("redis Ip:[%s]或者port:[%d]未初始化",_stObj.strIp.c_str(),_stObj.nPort); - return kbdFailed; + return iotFailed; } if(_stObj.bExistPasswd) { @@ -330,7 +330,7 @@ int iot_service::CRedisConMng::RedisConWithTimeoutVerifyPasswd(iot_service::stRe if(0 == _stObj.strPasswd.compare("")) { LOGERROR("redis Ip:[%s] port:[%d]被设置了密码，却没有写入密码",_stObj.strIp.c_str(),_stObj.nPort); - return kbdFailed; + return iotFailed; } } @@ -348,7 +348,7 @@ int iot_service::CRedisConMng::RedisConWithTimeoutVerifyPasswd(iot_service::stRe { sleepMsec(intervalMsec); } - return kbdFailed; + return iotFailed; } if(REDIS_OK != m_pCon->err) { @@ -359,7 +359,7 @@ int iot_service::CRedisConMng::RedisConWithTimeoutVerifyPasswd(iot_service::stRe } redisFree(m_pCon); m_pCon = NULL; - return kbdFailed; + return iotFailed; } if(_stObj.bExistPasswd) { @@ -378,7 +378,7 @@ int iot_service::CRedisConMng::RedisConWithTimeoutVerifyPasswd(iot_service::stRe } redisFree(m_pCon); m_pCon = NULL; - return kbdFailed; + return iotFailed; } if(NULL == reply) { @@ -391,7 +391,7 @@ int iot_service::CRedisConMng::RedisConWithTimeoutVerifyPasswd(iot_service::stRe } redisFree(m_pCon); m_pCon = NULL; - return kbdFailed; + return iotFailed; } if(REDIS_REPLY_ERROR == reply->type) { @@ -405,7 +405,7 @@ int iot_service::CRedisConMng::RedisConWithTimeoutVerifyPasswd(iot_service::stRe } redisFree(m_pCon); m_pCon = NULL; - return kbdFailed; + return iotFailed; } } @@ -415,18 +415,18 @@ int iot_service::CRedisConMng::RedisConWithTimeoutVerifyPasswd(iot_service::stRe //< 已修改win下hiredis源码并编译解决此问题，见ISCS6000_HOME\src\3rd\src_package\hiredis\windows下说明 redisSetTimeout(m_pCon,{30,0}) ; - return kbdSuccess; + return iotSuccess; } int iot_service::CRedisConMng::judgeMaster(iot_service::stRedisSrvInfo &_stObj) { //< yikn,不区分主备，都连本机redis干活，Java后台同步修改，始终连本机redis - return kbdSuccess; + return iotSuccess; /* if(NULL == m_pCon) { - return kbdFailed; + return iotFailed; } redisReply *reply; CRedisReplyDestructor objDestructor(&reply); @@ -434,12 +434,12 @@ int iot_service::CRedisConMng::judgeMaster(iot_service::stRedisSrvInfo &_stObj) if(REDIS_OK != m_pCon->err) { LOGWARN("ip:%s ,port : %d 得到key:%s 失败，原因%s",m_stCurrentRedis.strIp.c_str(),m_stCurrentRedis.nPort,CN_Master_Key.c_str(),m_pCon->errstr); - return kbdFailed; + return iotFailed; } if(NULL == reply) { LOGWARN("读取ip:%s port:%d key：%s返回指针为空",m_stCurrentRedis.strIp.c_str(),m_stCurrentRedis.nPort,CN_Master_Key.c_str()); - return kbdFailed; + return iotFailed; } if(REDIS_REPLY_STRING != reply->type) ///类型错误 { @@ -448,7 +448,7 @@ int iot_service::CRedisConMng::judgeMaster(iot_service::stRedisSrvInfo &_stObj) m_stCurrentRedis.nPort, CN_Master_Key.c_str(), reply->type); - return kbdFailed; + return iotFailed; } std::string ipAndProt = reply->str; std::vector vecSplit; @@ -456,7 +456,7 @@ int iot_service::CRedisConMng::judgeMaster(iot_service::stRedisSrvInfo &_stObj) if(2 != vecSplit.size()) { LOGWARN("解析redis主服务器的IP和Port字符串（%s）错误。",ipAndProt.c_str()); - return kbdFailed; + return iotFailed; } std::string currentIp,masterIp; int currentPort,masterPort; @@ -473,7 +473,7 @@ int iot_service::CRedisConMng::judgeMaster(iot_service::stRedisSrvInfo &_stObj) catch(boost::bad_lexical_cast &e) ///端口类型转化失败 { LOGWARN("端口号%s转化成int类型失败，失败原因%s",vecSplit.at(1).c_str(),e.what()); - return kbdFailed; + return iotFailed; } _stObj = m_vecRedisInfo[0]; //除去IP和port以外，其他的都一样 @@ -483,11 +483,11 @@ int iot_service::CRedisConMng::judgeMaster(iot_service::stRedisSrvInfo &_stObj) if(0 == currentIp.compare(masterIp) && currentPort == masterPort) { LOGINFO("当前连接与redis主服务一致IP : %s port : %d ",masterIp.c_str(),masterPort); - return kbdSuccess; + return iotSuccess; } LOGINFO("当前连接与redis主服务不一致，主服务IP : %s port : %d ，当前服务IP：%s,port : %d", masterIp.c_str(),masterPort,currentIp.c_str(),currentPort); - return kbdFailed; + return iotFailed; */ } @@ -495,7 +495,7 @@ int iot_service::CRedisConMng::writeToMaster() { if(NULL == m_pCon) { - return kbdFailed; + return iotFailed; } redisReply *reply = NULL; CRedisReplyDestructor objDestructor(&reply); @@ -511,7 +511,7 @@ int iot_service::CRedisConMng::writeToMaster() key.c_str(), value.c_str(), m_pCon->errstr); - return kbdFailed; + return iotFailed; } if(NULL == reply) ///失败 { @@ -521,7 +521,7 @@ int iot_service::CRedisConMng::writeToMaster() key.c_str(), value.c_str(), m_pCon->errstr); - return kbdFailed; + return iotFailed; } if(REDIS_REPLY_STATUS != reply->type) ///失败，这里有可能不是主，所以无法写入 { @@ -531,11 +531,11 @@ int iot_service::CRedisConMng::writeToMaster() key.c_str(), value.c_str(), reply->str); - return kbdFailed; + return iotFailed; } LOGINFO("向IP : %s port : %d 写入key ： %s value ： %s 成功，验证Redis Master 成功", m_stCurrentRedis.strIp.c_str(),m_stCurrentRedis.nPort,key.c_str(),value.c_str()); - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/service/iscs_wise_mnp/CRedisConMng.h b/platform/src/service/iscs_wise_mnp/CRedisConMng.h index e1378477..92dcd1cb 100644 --- a/platform/src/service/iscs_wise_mnp/CRedisConMng.h +++ b/platform/src/service/iscs_wise_mnp/CRedisConMng.h @@ -71,7 +71,7 @@ private: * @_in _strIp ip地址 * @_in _port port号 * @_in _tv 超时时间 - * @return 连接成功返回kdbuccess，否则返回 kbdFailed + * @return 连接成功返回kdbuccess，否则返回 iotFailed */ int RedisConWithTimeout(const std::string &_strIp,const int &_port,const timeval &_tv); @@ -84,7 +84,7 @@ private: * @判断当前连接与读取的主ip port是否一致 * @_out _masterIp 读取主ip，如果为"" 表示读取IP失败 * @_out _masterPort 读取主 port，如果为-1 表示读取 port 失败 - * @return 一致返回kdbuccess，否则返回 kbdFailed + * @return 一致返回kdbuccess，否则返回 iotFailed */ // int judgeMaster(std::string &_masterIp,int &_masterPort); @@ -92,13 +92,13 @@ private: /* * @判断当前连接与读取的主ip port是否一致 * @_out _stObj 返回redis主服务器的信息 - * @return 一致返回kdbuccess，否则返回 kbdFailed + * @return 一致返回kdbuccess，否则返回 iotFailed */ int judgeMaster(stRedisSrvInfo &_stObj); /* * @试图向当前连接m_pCon写入测试是否为主 - * @return 成功返回kdbuccess，否则返回 kbdFailed + * @return 成功返回kdbuccess，否则返回 iotFailed */ int writeToMaster(); diff --git a/platform/src/service/iscs_wise_mnp/CRedisConnectThread.cpp b/platform/src/service/iscs_wise_mnp/CRedisConnectThread.cpp index 7a313f74..4bc62553 100644 --- a/platform/src/service/iscs_wise_mnp/CRedisConnectThread.cpp +++ b/platform/src/service/iscs_wise_mnp/CRedisConnectThread.cpp @@ -45,5 +45,5 @@ void iot_service::CRedisConnectThread::execute() int iot_service::CRedisConnectThread::initllize() { - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/service/iscs_wise_mnp/CRelativeCallback.cpp b/platform/src/service/iscs_wise_mnp/CRelativeCallback.cpp index d7690415..b0143210 100644 --- a/platform/src/service/iscs_wise_mnp/CRelativeCallback.cpp +++ b/platform/src/service/iscs_wise_mnp/CRelativeCallback.cpp @@ -24,11 +24,11 @@ int iot_service::CRelativeCallback::init(iot_service::CAsyncRcvSubThreadPtr _ptr { if(NULL == _ptrRedisAsyncRcv || NULL == _ptrRcvRealData) { - return kbdFailed; + return iotFailed; } m_ptrCAsyncRcvSubThread = _ptrRedisAsyncRcv; m_ptrRcvRDWrtRdsThread = _ptrRcvRealData; - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/service/iscs_wise_mnp/CWebServerMng.cpp b/platform/src/service/iscs_wise_mnp/CWebServerMng.cpp index 1f612f22..52df490b 100644 --- a/platform/src/service/iscs_wise_mnp/CWebServerMng.cpp +++ b/platform/src/service/iscs_wise_mnp/CWebServerMng.cpp @@ -44,102 +44,102 @@ int iot_service::CWebServerMng::redundantSwitch(bool bMaster, bool bSlave) m_ptrProcMng->updateProcessInfo(true, bMaster, bSlave); - return kbdSuccess; + return iotSuccess; } int iot_service::CWebServerMng::initialize() { - if(kbdSuccess != readConfig()) + if(iotSuccess != readConfig()) { LOGERROR("读取配置文件失败"); - return kbdFailed; + return iotFailed; } /*************************************我是分割线***********************************************/ m_ptrAsyncRcvSubThread = boost::make_shared(m_vecRedisInfo); if(NULL == m_ptrAsyncRcvSubThread) { LOGERROR("创建redis 异步接收实时数据订阅线程失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrAsyncRcvSubThread->initialize()) + if(iotSuccess != m_ptrAsyncRcvSubThread->initialize()) { LOGERROR("redis 异步接收实时数据订阅线程 初始化失败"); - return kbdFailed; + return iotFailed; } /*************************************我是分割线***********************************************/ m_ptrRcvRDWrtRdsThread = boost::make_shared(m_vecRedisInfo); if(NULL == m_ptrRcvRDWrtRdsThread) { LOGERROR("创建redis 接收实时数据并写入redis线程失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrRcvRDWrtRdsThread->initialize()) + if(iotSuccess != m_ptrRcvRDWrtRdsThread->initialize()) { LOGERROR("redis 异步接收线程初始化失败"); - return kbdFailed; + return iotFailed; } /*************************************我是分割线***********************************************/ - if (kbdSuccess != CRelativeCallbackSingle::get_mutable_instance().init(m_ptrAsyncRcvSubThread,m_ptrRcvRDWrtRdsThread)) + if (iotSuccess != CRelativeCallbackSingle::get_mutable_instance().init(m_ptrAsyncRcvSubThread,m_ptrRcvRDWrtRdsThread)) { LOGERROR("关联redis 回调函数的单例线程初始化失败"); - return kbdFailed; + return iotFailed; } /*************************************我是分割线***********************************************/ m_ptrCRealAlarmThread = boost::make_shared(m_vecRedisInfo); if(NULL == m_ptrCRealAlarmThread) { LOGERROR("创建实时报警线程失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrCRealAlarmThread->initialize()) + if(iotSuccess != m_ptrCRealAlarmThread->initialize()) { LOGERROR("初始化报警线程失败"); - return kbdFailed; + return iotFailed; } /*************************************我是分割线***********************************************/ m_ptrCRealEventThread = boost::make_shared(m_vecRedisInfo); if(NULL == m_ptrCRealEventThread) { LOGERROR("创建实时事件线程失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrCRealEventThread->initialize()) + if(iotSuccess != m_ptrCRealEventThread->initialize()) { LOGERROR("初始化实时线程失败"); - return kbdFailed; + return iotFailed; } /*************************************我是分割线***********************************************/ m_ptrRedisConnectThread = boost::make_shared(m_ptrCRealAlarmThread,m_ptrCRealEventThread); if(NULL == m_ptrRedisConnectThread) { LOGERROR("创建redis重联连接线程失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrRedisConnectThread->initllize()) + if(iotSuccess != m_ptrRedisConnectThread->initllize()) { LOGERROR("redis重联线程初始化失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CWebServerMng::readConfig() { - if(kbdSuccess != readConfigForGenerate()) + if(iotSuccess != readConfigForGenerate()) { LOGERROR("获取redis的通用配置(端口号、超时时间、密码等)失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CWebServerMng::readConfigForGenerate() { iot_public::CCommonConfigParse objCfgParse; - if(kbdSuccess != objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile("iscs_wise_mnp.xml"))) + if(iotSuccess != objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile("iscs_wise_mnp.xml"))) { LOGERROR("加载redis通用配置文件失败"); - return kbdFailed; + return iotFailed; } std::string strIp = ""; @@ -148,14 +148,14 @@ int iot_service::CWebServerMng::readConfigForGenerate() bool bExistPasswd = false; std::string strPasswd = ""; - if(kbdSuccess != objCfgParse.getStringValue("redis_config","ip",strIp) || - kbdSuccess != objCfgParse.getIntValue("redis_config","port",nPort) || - kbdSuccess != objCfgParse.getIntValue("redis_config","con_timeout",nTimeOut) || - kbdSuccess != objCfgParse.getBoolValue("redis_config","need_passwd",bExistPasswd) || - kbdSuccess != objCfgParse.getStringValue("redis_config","passwd",strPasswd)) + if(iotSuccess != objCfgParse.getStringValue("redis_config","ip",strIp) || + iotSuccess != objCfgParse.getIntValue("redis_config","port",nPort) || + iotSuccess != objCfgParse.getIntValue("redis_config","con_timeout",nTimeOut) || + iotSuccess != objCfgParse.getBoolValue("redis_config","need_passwd",bExistPasswd) || + iotSuccess != objCfgParse.getStringValue("redis_config","passwd",strPasswd)) { LOGERROR("获取ip、端口号、超时时间、密码等信息失败"); - return kbdFailed; + return iotFailed; } int sec; int uSec; @@ -183,7 +183,7 @@ int iot_service::CWebServerMng::readConfigForGenerate() } m_vecRedisInfo.push_back(redisSrvInfo1); LOGINFO("m_vecRedisInfo.size() = %d",(int)m_vecRedisInfo.size()); - return kbdSuccess; + return iotSuccess; } void iot_service::CWebServerMng::allThreadRedundantSwitch(bool bMaster, bool bSlave) diff --git a/platform/src/service/iscs_wise_mnp/CWebServerMng.h b/platform/src/service/iscs_wise_mnp/CWebServerMng.h index bb48f3ca..df79a1c8 100644 --- a/platform/src/service/iscs_wise_mnp/CWebServerMng.h +++ b/platform/src/service/iscs_wise_mnp/CWebServerMng.h @@ -26,7 +26,7 @@ namespace iot_service { virtual int redundantSwitch(bool bMaster, bool bSlave); /* * brief initialize 初始化 - * return 成功返回kbdSuccess,失败返回错误码 + * return 成功返回iotSuccess,失败返回错误码 */ int initialize(); private: diff --git a/platform/src/service/iscs_wise_mnp/CWebSrvApp.cpp b/platform/src/service/iscs_wise_mnp/CWebSrvApp.cpp index 9e243444..69dd70d1 100644 --- a/platform/src/service/iscs_wise_mnp/CWebSrvApp.cpp +++ b/platform/src/service/iscs_wise_mnp/CWebSrvApp.cpp @@ -74,13 +74,13 @@ bool iot_service::CWebSrvApp::start(int argc, char *argv[], int &) return false; } //9.设置冗余通知回调 - if(kbdSuccess !=m_ptrRedundancyMng->setCallback(m_ptrWebSrvMng)) + if(iotSuccess !=m_ptrRedundancyMng->setCallback(m_ptrWebSrvMng)) { LOGERROR("设置冗余回调接口失败"); return false; } //10.更新当前进程冗余状态 - if(kbdSuccess !=m_ptrProcMng->updateProcessInfo(true,false,false)) + if(iotSuccess !=m_ptrProcMng->updateProcessInfo(true,false,false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -129,7 +129,7 @@ int iot_service::CWebSrvApp::toQuit() m_ptrProcMng->unsetCallback(); } shutdown(); - return kbdSuccess; + return iotSuccess; } bool iot_service::CWebSrvApp::parseCmdLine(int argc, char *argv[]) @@ -215,7 +215,7 @@ bool iot_service::CWebSrvApp::getSystemInfo() LOGERROR("创建系统信息访问库失败"); return false; } - if(kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) + if(iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -238,7 +238,7 @@ bool iot_service::CWebSrvApp::registToProcMng() LOGERROR("创建进程管理访问库失败"); return false; } - if(kbdSuccess != m_ptrProcMng->setCallback(this)) + if(iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -252,25 +252,25 @@ bool iot_service::CWebSrvApp::initialize() if(! iot_net::initMsgBus(CN_ProcName_IscsWiseServer.c_str(),strUniqueName.c_str())) { LOGERROR("初始化消息总线失败"); - return kbdFailed; + return iotFailed; } if(!CDpcdaForApp::initGlobalThread()) { LOGERROR("初始化全局处理线程失败"); - return kbdFailed; + return iotFailed; } //创建 web_server管理 m_ptrWebSrvMng =boost::make_shared(m_stRunAppInfo,m_ptrProcMng); if(NULL == m_ptrWebSrvMng) { LOGERROR("创建web管理智能指针失败"); - return kbdFailed; + return iotFailed; } //web_server管理初始化 - if(kbdSuccess != m_ptrWebSrvMng->initialize()) + if(iotSuccess != m_ptrWebSrvMng->initialize()) { LOGERROR("web管理类初始化失败"); - return kbdFailed; + return iotFailed; } return true; diff --git a/platform/src/service/operate_server/OperateServer.cpp b/platform/src/service/operate_server/OperateServer.cpp index 6a665646..976fd659 100644 --- a/platform/src/service/operate_server/OperateServer.cpp +++ b/platform/src/service/operate_server/OperateServer.cpp @@ -345,5 +345,5 @@ bool COperateServer::stop() int COperateServer::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/service/operate_server/OptControl.cpp b/platform/src/service/operate_server/OptControl.cpp index 1f31f90b..0a6e4da6 100644 --- a/platform/src/service/operate_server/OptControl.cpp +++ b/platform/src/service/operate_server/OptControl.cpp @@ -49,7 +49,7 @@ bool COperateServerClass::checkCtrlInterlock(const string &strTagName,const doub { bool bInterlockSuccess(true); - if (m_ptrInterLockApi->CheckCtrlInterlock(strTagName.c_str(),dTargValue,strResult, bInterlockSuccess) != kbdSuccess) + if (m_ptrInterLockApi->CheckCtrlInterlock(strTagName.c_str(),dTargValue,strResult, bInterlockSuccess) != iotSuccess) { LOGWARN("checkCtrlInterlock, strTagName = %s, CheckCtrlInterlock error!", strTagName.c_str()); return false; diff --git a/platform/src/service/operate_server/OptMainThread.cpp b/platform/src/service/operate_server/OptMainThread.cpp index 02b935ef..293fd843 100644 --- a/platform/src/service/operate_server/OptMainThread.cpp +++ b/platform/src/service/operate_server/OptMainThread.cpp @@ -384,7 +384,7 @@ int COptMainThread::beforeExecute() { std::cout << "Thread beforeExecute" << std::endl; - return kbdSuccess; + return iotSuccess; } /** diff --git a/platform/src/service/operate_server/RedundantSwitch.cpp b/platform/src/service/operate_server/RedundantSwitch.cpp index 133060de..7611e530 100644 --- a/platform/src/service/operate_server/RedundantSwitch.cpp +++ b/platform/src/service/operate_server/RedundantSwitch.cpp @@ -39,7 +39,7 @@ int CRedundantSwitch::redundantSwitch(bool bMaster, bool bSlave) { m_ptrProcManage->updateProcessInfo(true,bMaster,bSlave) ; } - return kbdSuccess; + return iotSuccess; } /** diff --git a/platform/src/service/perm_mng_api/PermMngApi.cpp b/platform/src/service/perm_mng_api/PermMngApi.cpp index 94d78a0e..f186d3ec 100644 --- a/platform/src/service/perm_mng_api/PermMngApi.cpp +++ b/platform/src/service/perm_mng_api/PermMngApi.cpp @@ -14,7 +14,7 @@ SERVICE_PERM_MNG_API CPermMngApiPtr iot_service::getPermMngInstance(const std::s CPermMngImplPtr ptrPermMngImpl = boost::make_shared(strAppName, bUseGlobalUserInfo); if (ptrPermMngImpl != NULL) { - if (kbdSuccess != ptrPermMngImpl->PermDllInit()) + if (iotSuccess != ptrPermMngImpl->PermDllInit()) { /* @brief 注册失败后清理资源 */ ptrPermMngImpl.reset(); diff --git a/platform/src/service/web_server/module_alarm/AlmCntWsLsnr.hpp b/platform/src/service/web_server/module_alarm/AlmCntWsLsnr.hpp index 7af84ae1..0b300122 100644 --- a/platform/src/service/web_server/module_alarm/AlmCntWsLsnr.hpp +++ b/platform/src/service/web_server/module_alarm/AlmCntWsLsnr.hpp @@ -55,7 +55,7 @@ private: { std::vector vecRegionId; std::vector vecLocationId; - if ( m_spPermApi->GetSpeFunc( "FUNC_SPE_ALARM_VIEW", vecRegionId, vecLocationId ) == kbdSuccess ) + if ( m_spPermApi->GetSpeFunc( "FUNC_SPE_ALARM_VIEW", vecRegionId, vecLocationId ) == iotSuccess ) { for ( auto nId:vecRegionId ) m_setUserPermRegionId.emplace( nId ); diff --git a/platform/src/service/web_server/module_alarm/AlmWsLsnr.hpp b/platform/src/service/web_server/module_alarm/AlmWsLsnr.hpp index 22ba96a5..9cc64d06 100644 --- a/platform/src/service/web_server/module_alarm/AlmWsLsnr.hpp +++ b/platform/src/service/web_server/module_alarm/AlmWsLsnr.hpp @@ -57,7 +57,7 @@ private: { std::vector vecRegionId; std::vector vecLocationId; - if ( m_spPermApi->GetSpeFunc( "FUNC_SPE_ALARM_VIEW", vecRegionId, vecLocationId ) == kbdSuccess ) + if ( m_spPermApi->GetSpeFunc( "FUNC_SPE_ALARM_VIEW", vecRegionId, vecLocationId ) == iotSuccess ) { for ( auto nId:vecRegionId ) m_setUserPermRegionId.emplace( nId ); diff --git a/platform/src/service/web_server/module_alarm/SimpleCtrl.cpp b/platform/src/service/web_server/module_alarm/SimpleCtrl.cpp index 43cdb235..aa25788b 100644 --- a/platform/src/service/web_server/module_alarm/SimpleCtrl.cpp +++ b/platform/src/service/web_server/module_alarm/SimpleCtrl.cpp @@ -580,7 +580,7 @@ CSimpleCtrl::queryAlarmTreeMs( const std::shared_ptr &spRequest { std::vector vecRegionId; std::vector vecLocationId; - if ( spPermApi->GetSpeFunc( "FUNC_SPE_ALARM_VIEW", vecRegionId, vecLocationId ) != kbdSuccess ) + if ( spPermApi->GetSpeFunc( "FUNC_SPE_ALARM_VIEW", vecRegionId, vecLocationId ) != iotSuccess ) { LOGERROR( "GetSpeFunc 执行失败" ); return createResponse( Status::CODE_500, "GetSpeFunc 执行失败" ); @@ -688,7 +688,7 @@ CSimpleCtrl::queryEventConditionMs( /*const oatpp::Int32 &type, const oatpp::Int // 获取责任区id集合、位置id集合 std::vector vecRegionId; std::vector vecLocationId; - if ( spPermApi->GetSpeFunc( "FUNC_SPE_ALARM_VIEW", vecRegionId, vecLocationId ) != kbdSuccess ) + if ( spPermApi->GetSpeFunc( "FUNC_SPE_ALARM_VIEW", vecRegionId, vecLocationId ) != iotSuccess ) { LOGERROR( "GetSpeFunc 执行失败" ); return createResponse( Status::CODE_500, "GetSpeFunc 执行失败" ); diff --git a/platform/src/service/web_server/module_realTimeData/CListener.cpp b/platform/src/service/web_server/module_realTimeData/CListener.cpp index 0c018491..53ebbb5b 100644 --- a/platform/src/service/web_server/module_realTimeData/CListener.cpp +++ b/platform/src/service/web_server/module_realTimeData/CListener.cpp @@ -39,16 +39,16 @@ void CListener::clean() int CListener::beforeExecute() { - int nRet = kbdSuccess; + int nRet = iotSuccess; if( m_pComm->addSub(0,CH_SCADA_TO_HMI_DATA_CHANGE) ) { LOGINFO( "订阅通道:%d成功", CH_SCADA_TO_HMI_DATA_CHANGE ); - nRet = kbdSuccess; + nRet = iotSuccess; } else { LOGERROR( "订阅通道:%d失败", CH_SCADA_TO_HMI_DATA_CHANGE ); - nRet = kbdFailed; + nRet = iotFailed; } return nRet; } diff --git a/platform/src/service/web_server/module_realTimeData/CSocket.cpp b/platform/src/service/web_server/module_realTimeData/CSocket.cpp index 4078d791..23fe3b41 100644 --- a/platform/src/service/web_server/module_realTimeData/CSocket.cpp +++ b/platform/src/service/web_server/module_realTimeData/CSocket.cpp @@ -31,7 +31,7 @@ CSocket::CSocket() // 获取location信息 std::vector vecLocationInfo; - if ( kbdSuccess != pSysInfo->getAllLocationInfo(vecLocationInfo) ) + if ( iotSuccess != pSysInfo->getAllLocationInfo(vecLocationInfo) ) { LOGERROR( "getAllLocationInfo失败" ); return; @@ -43,7 +43,7 @@ CSocket::CSocket() // 获取subsystem信息 std::vector vecSubsystemInfo; - if ( kbdSuccess != pSysInfo->getAllSubsystemInfo(vecSubsystemInfo) ) + if ( iotSuccess != pSysInfo->getAllSubsystemInfo(vecSubsystemInfo) ) { LOGERROR( "getAllSubsystemInfo失败" ); return; diff --git a/platform/src/service/web_server/server/GlobalMng.cpp b/platform/src/service/web_server/server/GlobalMng.cpp index 36ec50ab..a219b060 100644 --- a/platform/src/service/web_server/server/GlobalMng.cpp +++ b/platform/src/service/web_server/server/GlobalMng.cpp @@ -74,7 +74,7 @@ bool CGlobalMng::init( const std::string &strAppName ) } //< 获取运行参数 - if ( kbdSuccess != ptrSysInfo->getLocalRunAppInfoByName( strAppName, m_stRunAppInfo )) + if ( iotSuccess != ptrSysInfo->getLocalRunAppInfoByName( strAppName, m_stRunAppInfo )) { LOGFATAL( "getLocalRunAppInfoByName() failed !" ); return false; diff --git a/platform/src/service/web_server/server/WebServer.cpp b/platform/src/service/web_server/server/WebServer.cpp index 3dfc12e1..071d4676 100644 --- a/platform/src/service/web_server/server/WebServer.cpp +++ b/platform/src/service/web_server/server/WebServer.cpp @@ -179,7 +179,7 @@ bool CWebServer::start( int argc, char *argv[], int & /*nStatus*/) break; case RM_NO_PROC_MNG_MASTER: { - if ( kbdSuccess != m_ptrRedunSw->redundantSwitch( true, false )) + if ( iotSuccess != m_ptrRedunSw->redundantSwitch( true, false )) { LOGFATAL( "以主机模式启动失败！" ); return false; @@ -188,7 +188,7 @@ bool CWebServer::start( int argc, char *argv[], int & /*nStatus*/) break; case RM_NO_PROC_MNG_SLAVE: { - if ( kbdSuccess != m_ptrRedunSw->redundantSwitch( false, true )) + if ( iotSuccess != m_ptrRedunSw->redundantSwitch( false, true )) { LOGFATAL( "以备机模式启动失败！" ); return false; @@ -287,7 +287,7 @@ bool CWebServer::stop() int CWebServer::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } @@ -298,7 +298,7 @@ int CWebServer::updateProcInfo( bool bActive, bool bMaster, bool bSlave ) return m_ptrProcMng->updateProcessInfo( bActive, bMaster, bSlave ); } - return kbdFailed; + return iotFailed; } diff --git a/platform/src/service/web_server/server/WebSrvRedunSw.cpp b/platform/src/service/web_server/server/WebSrvRedunSw.cpp index 1192f884..5308b5b6 100644 --- a/platform/src/service/web_server/server/WebSrvRedunSw.cpp +++ b/platform/src/service/web_server/server/WebSrvRedunSw.cpp @@ -26,10 +26,10 @@ int CWebSrvRedunSw::redundantSwitch( bool bMaster, bool bSlave ) if ( getGlobalMngInstance()->redundantSwitch( bMaster, bSlave )) { m_pParent->updateProcInfo( true, bMaster, bSlave ); - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } } //< namespace web_server diff --git a/platform/src/service/web_server/server/auth/AuthInterceptor.cpp b/platform/src/service/web_server/server/auth/AuthInterceptor.cpp index 5de235a1..0399323c 100644 --- a/platform/src/service/web_server/server/auth/AuthInterceptor.cpp +++ b/platform/src/service/web_server/server/auth/AuthInterceptor.cpp @@ -61,12 +61,12 @@ static void generateUuidBase64(std::string &strOut) bool getAddrAlwayAllow(std::string &strAddrAllow) { iot_public::CCommonConfigParse objCfgParse; - if(objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile("web_server.xml"))==kbdFailed) + if(objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile("web_server.xml"))==iotFailed) { LOGDEBUG("AuthInterceptor::getAddrAlawyAllow() web_server.xml load fail .\n"); return false; } - if(objCfgParse.getStringValue("web_server","addr_allow",strAddrAllow) != kbdSuccess) + if(objCfgParse.getStringValue("web_server","addr_allow",strAddrAllow) != iotSuccess) { strAddrAllow=""; return false; diff --git a/platform/src/service/web_server/server/auth/SesssionApiImpl.cpp b/platform/src/service/web_server/server/auth/SesssionApiImpl.cpp index 3372f7c9..8930647c 100644 --- a/platform/src/service/web_server/server/auth/SesssionApiImpl.cpp +++ b/platform/src/service/web_server/server/auth/SesssionApiImpl.cpp @@ -62,7 +62,7 @@ int CSesssionApiImpl::beforeExecute() { m_runAppInfo = getServerApi()->getRunAppInfo(); m_netWebAuthRdbApi.connect( m_runAppInfo.nDomainId, m_runAppInfo.nAppId ); - return kbdSuccess; + return iotSuccess; } void CSesssionApiImpl::execute() @@ -263,7 +263,7 @@ iot_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt return false; } - if( kbdSuccess != pPermMngApi->PermDllInit()) + if( iotSuccess != pPermMngApi->PermDllInit()) { LOGERROR("pPermMngApi failed to PermDllInit"); return false; @@ -536,7 +536,7 @@ iot_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt return nullptr; } - if( kbdSuccess != pPermMngApi->PermDllInit()) + if( iotSuccess != pPermMngApi->PermDllInit()) { LOGERROR("pPermMngApi failed to PermDllInit"); return nullptr; diff --git a/platform/src/service/web_server_bi/module_realTimeData/CListener.cpp b/platform/src/service/web_server_bi/module_realTimeData/CListener.cpp index 9cdc8023..5306f9fd 100644 --- a/platform/src/service/web_server_bi/module_realTimeData/CListener.cpp +++ b/platform/src/service/web_server_bi/module_realTimeData/CListener.cpp @@ -39,16 +39,16 @@ void CListener::clean() int CListener::beforeExecute() { - int nRet = kbdSuccess; + int nRet = iotSuccess; if( m_pComm->addSub(0,CH_SCADA_TO_HMI_DATA_CHANGE) ) { LOGINFO( "订阅通道:%d成功", CH_SCADA_TO_HMI_DATA_CHANGE ); - nRet = kbdSuccess; + nRet = iotSuccess; } else { LOGERROR( "订阅通道:%d失败", CH_SCADA_TO_HMI_DATA_CHANGE ); - nRet = kbdFailed; + nRet = iotFailed; } return nRet; } diff --git a/platform/src/service/web_server_bi/module_realTimeData/CSocket.cpp b/platform/src/service/web_server_bi/module_realTimeData/CSocket.cpp index a8bbf533..14f13eaf 100644 --- a/platform/src/service/web_server_bi/module_realTimeData/CSocket.cpp +++ b/platform/src/service/web_server_bi/module_realTimeData/CSocket.cpp @@ -31,7 +31,7 @@ CSocket::CSocket() // 获取location信息 std::vector vecLocationInfo; - if ( kbdSuccess != pSysInfo->getAllLocationInfo(vecLocationInfo) ) + if ( iotSuccess != pSysInfo->getAllLocationInfo(vecLocationInfo) ) { LOGERROR( "getAllLocationInfo失败" ); return; @@ -43,7 +43,7 @@ CSocket::CSocket() // 获取subsystem信息 std::vector vecSubsystemInfo; - if ( kbdSuccess != pSysInfo->getAllSubsystemInfo(vecSubsystemInfo) ) + if ( iotSuccess != pSysInfo->getAllSubsystemInfo(vecSubsystemInfo) ) { LOGERROR( "getAllSubsystemInfo失败" ); return; diff --git a/platform/src/service/web_server_bi/server/GlobalMng.cpp b/platform/src/service/web_server_bi/server/GlobalMng.cpp index a1e04a4a..dced2a80 100644 --- a/platform/src/service/web_server_bi/server/GlobalMng.cpp +++ b/platform/src/service/web_server_bi/server/GlobalMng.cpp @@ -84,7 +84,7 @@ bool CGlobalMng::init( const std::string &strAppName ) } //< 获取运行参数 - if ( kbdSuccess != ptrSysInfo->getLocalRunAppInfoByName( strAppName, m_stRunAppInfo )) + if ( iotSuccess != ptrSysInfo->getLocalRunAppInfoByName( strAppName, m_stRunAppInfo )) { LOGFATAL( "getLocalRunAppInfoByName() failed !" ); return false; diff --git a/platform/src/service/web_server_bi/server/WebServer.cpp b/platform/src/service/web_server_bi/server/WebServer.cpp index aa385bb5..6dc5439d 100644 --- a/platform/src/service/web_server_bi/server/WebServer.cpp +++ b/platform/src/service/web_server_bi/server/WebServer.cpp @@ -144,7 +144,7 @@ bool CWebServer::start( int argc, char *argv[], int & /*nStatus*/) break; case RM_NO_PROC_MNG_MASTER: { - if ( kbdSuccess != m_ptrRedunSw->redundantSwitch( true, false )) + if ( iotSuccess != m_ptrRedunSw->redundantSwitch( true, false )) { LOGFATAL( "以主机模式启动失败！" ); return false; @@ -153,7 +153,7 @@ bool CWebServer::start( int argc, char *argv[], int & /*nStatus*/) break; case RM_NO_PROC_MNG_SLAVE: { - if ( kbdSuccess != m_ptrRedunSw->redundantSwitch( false, true )) + if ( iotSuccess != m_ptrRedunSw->redundantSwitch( false, true )) { LOGFATAL( "以备机模式启动失败！" ); return false; @@ -244,7 +244,7 @@ bool CWebServer::stop() int CWebServer::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } @@ -255,7 +255,7 @@ int CWebServer::updateProcInfo( bool bActive, bool bMaster, bool bSlave ) return m_ptrProcMng->updateProcessInfo( bActive, bMaster, bSlave ); } - return kbdFailed; + return iotFailed; } diff --git a/platform/src/service/web_server_bi/server/WebSrvRedunSw.cpp b/platform/src/service/web_server_bi/server/WebSrvRedunSw.cpp index b6569fb8..a1997924 100644 --- a/platform/src/service/web_server_bi/server/WebSrvRedunSw.cpp +++ b/platform/src/service/web_server_bi/server/WebSrvRedunSw.cpp @@ -26,10 +26,10 @@ int CWebSrvRedunSw::redundantSwitch( bool bMaster, bool bSlave ) if ( getGlobalMngInstance()->redundantSwitch( bMaster, bSlave )) { m_pParent->updateProcInfo( true, bMaster, bSlave ); - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } } //< namespace web_server_bi diff --git a/platform/src/service/web_server_bi/server/auth/SesssionApiImpl.cpp b/platform/src/service/web_server_bi/server/auth/SesssionApiImpl.cpp index 1a0bd800..1d85a2f6 100644 --- a/platform/src/service/web_server_bi/server/auth/SesssionApiImpl.cpp +++ b/platform/src/service/web_server_bi/server/auth/SesssionApiImpl.cpp @@ -61,7 +61,7 @@ int CSesssionApiImpl::beforeExecute() { m_runAppInfo = getServerApi()->getRunAppInfo(); m_netWebAuthRdbApi.connect( m_runAppInfo.nDomainId, m_runAppInfo.nAppId ); - return kbdSuccess; + return iotSuccess; } void CSesssionApiImpl::execute() @@ -386,7 +386,7 @@ iot_service::CPermMngApiPtr CSesssionApiImpl::getPermMngApi(int perm_id,const st return nullptr; } - if( kbdSuccess != pPermMngApi->PermDllInit()) + if( iotSuccess != pPermMngApi->PermDllInit()) { LOGERROR("pPermMngApi failed to PermDllInit"); return nullptr; diff --git a/platform/src/sys/file_sync_auto/FileSyncAuto.cpp b/platform/src/sys/file_sync_auto/FileSyncAuto.cpp index 73b86e19..4d633e15 100644 --- a/platform/src/sys/file_sync_auto/FileSyncAuto.cpp +++ b/platform/src/sys/file_sync_auto/FileSyncAuto.cpp @@ -91,14 +91,14 @@ bool CFileSyncAuto::start(int argc, char *argv[], int &/*nStatus*/) } //9.设置冗余通知回调 - if (kbdSuccess != m_pRedundancyMng->setCallback(m_pFileSyncRedundantSwitchMng)) + if (iotSuccess != m_pRedundancyMng->setCallback(m_pFileSyncRedundantSwitchMng)) { LOGERROR("设置冗余回调接口失败"); return false; } //10.更新当前进程冗余状态 - if (kbdSuccess != m_pProcMng->updateProcessInfo(true, true, false)) + if (iotSuccess != m_pProcMng->updateProcessInfo(true, true, false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -154,7 +154,7 @@ int CFileSyncAuto::toQuit() } shutdown(); - return kbdSuccess; + return iotSuccess; } @@ -231,7 +231,7 @@ bool CFileSyncAuto::getSystemInfo() return false; } - if (kbdSuccess != m_pSysInfo->getLocalRunAppInfoByName(m_sAppName, m_stRunAppInfo)) + if (iotSuccess != m_pSysInfo->getLocalRunAppInfoByName(m_sAppName, m_stRunAppInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -256,7 +256,7 @@ bool CFileSyncAuto::registToProcMng() return false; } - if (kbdSuccess != m_pProcMng->setCallback(this)) + if (iotSuccess != m_pProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -281,7 +281,7 @@ bool CFileSyncAuto::initialize() return false; } - if ( kbdSuccess != m_pFileSyncRedundantSwitchMng->initialize() ) + if ( iotSuccess != m_pFileSyncRedundantSwitchMng->initialize() ) { LOGERROR("初始化服务管理类失败"); return false; diff --git a/platform/src/sys/file_sync_auto/FileSyncAutoReSwMng.cpp b/platform/src/sys/file_sync_auto/FileSyncAutoReSwMng.cpp index 90d54037..ec95df75 100644 --- a/platform/src/sys/file_sync_auto/FileSyncAutoReSwMng.cpp +++ b/platform/src/sys/file_sync_auto/FileSyncAutoReSwMng.cpp @@ -26,7 +26,7 @@ int CFileSyncAutoReSwMng::redundantSwitch(bool bMaster, bool bSlave) m_pProcMng->updateProcessInfo(true, bMaster, bSlave); - return kbdSuccess; + return iotSuccess; } int CFileSyncAutoReSwMng::initialize() @@ -37,16 +37,16 @@ int CFileSyncAutoReSwMng::initialize() if ( iot_public::createSysInfoInstance( ptrSysInfo ) == false ) { LOGFATAL( "createSysInfoInstance() return false !" ); - return kbdFailed; + return iotFailed; } //< 获取本机域ID和主机名 { iot_public::SNodeInfo stLocalNodeInfo; - if ( kbdSuccess != ptrSysInfo->getLocalNodeInfo( stLocalNodeInfo )) + if ( iotSuccess != ptrSysInfo->getLocalNodeInfo( stLocalNodeInfo )) { LOGFATAL( "getLocalNodeInfo() failed !" ); - return kbdFailed; + return iotFailed; } if( "127.0.0.1" == stLocalNodeInfo.strNic1Addr) @@ -67,15 +67,15 @@ int CFileSyncAutoReSwMng::initialize() if ( m_ptrSyncthingMngThread == nullptr ) { LOGERROR( "cannot syncthingmngthread class" ); - return kbdFailed; + return iotFailed; } if ( false == m_ptrSyncthingMngThread->init()) { LOGERROR( "cannot initialize syncthingmngthread class " ); - return kbdFailed; + return iotFailed; } } - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/sys/file_sync_auto/FileSyncAutoReSwMng.h b/platform/src/sys/file_sync_auto/FileSyncAutoReSwMng.h index 47501aa2..3e1b18a4 100644 --- a/platform/src/sys/file_sync_auto/FileSyncAutoReSwMng.h +++ b/platform/src/sys/file_sync_auto/FileSyncAutoReSwMng.h @@ -22,12 +22,12 @@ public: 在进程切换过程中，可能会被调用多次切换，业务进程需要保证幂等，无副作用 @param bool bMaster 是否为主 @param bool bSlave 是否为备 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int redundantSwitch(bool bMaster, bool bSlave); /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); diff --git a/platform/src/sys/file_sync_auto/SyncthingMngThread.cpp b/platform/src/sys/file_sync_auto/SyncthingMngThread.cpp index 46f8e3c9..af011536 100644 --- a/platform/src/sys/file_sync_auto/SyncthingMngThread.cpp +++ b/platform/src/sys/file_sync_auto/SyncthingMngThread.cpp @@ -107,7 +107,7 @@ bool SyncthingMngThread::init() } iot_public::SNodeInfo stNodeInfo; - if ( kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(stNodeInfo) ) + if ( iotSuccess != m_ptrSysInfo->getLocalNodeInfo(stNodeInfo) ) { LOGERROR( "getLocalNodeInfo failed!" ); return false; @@ -136,10 +136,10 @@ int SyncthingMngThread::beforeExecute() { LOGERROR("beyond limited times to get device id, stop syncthing"); stopSyncthing(); - return kbdFailed; + return iotFailed; } } - return kbdSuccess; + return iotSuccess; } bool SyncthingMngThread::startSyncthing() @@ -239,7 +239,7 @@ bool SyncthingMngThread::loadCfg() bool SyncthingMngThread::getEnabledProcess() { iot_public::SNodeInfo stLocalNodeInfo; - if ( kbdSuccess != m_ptrSysInfo->getLocalNodeInfo( stLocalNodeInfo )) + if ( iotSuccess != m_ptrSysInfo->getLocalNodeInfo( stLocalNodeInfo )) { LOGFATAL( "getLocalNodeInfo() failed !" ); return false; @@ -248,7 +248,7 @@ bool SyncthingMngThread::getEnabledProcess() // 获取本机部署的应用下的所有进程 std::vector vecApp; - if (kbdSuccess != m_ptrSysInfo->getLocalAppDeploy(vecApp)) + if (iotSuccess != m_ptrSysInfo->getLocalAppDeploy(vecApp)) { LOGFATAL("获取本机部署信息失败"); return false; @@ -356,7 +356,7 @@ bool SyncthingMngThread::addEnableProcessByAppid(const int nAppId) { //1.获取应用信息 iot_public::SProcessInfoMAP mapProcInfo; - if (kbdSuccess != m_ptrSysInfo->getProcInfoListByAppId(nAppId, mapProcInfo)) + if (iotSuccess != m_ptrSysInfo->getProcInfoListByAppId(nAppId, mapProcInfo)) { LOGERROR("获取%d应用的进程列表失败", nAppId); return false; diff --git a/platform/src/sys/sys_ctrl/BaseCfgParam.cpp b/platform/src/sys/sys_ctrl/BaseCfgParam.cpp index bbc69ad1..507d75a1 100644 --- a/platform/src/sys/sys_ctrl/BaseCfgParam.cpp +++ b/platform/src/sys/sys_ctrl/BaseCfgParam.cpp @@ -91,7 +91,7 @@ bool iot_sys::CBaseCfgParam::loadBaseProcess() bool iot_sys::CBaseCfgParam::loadConfig() { CCommonConfigParse objCfg; - if (kbdSuccess != objCfg.load(CFileUtil::getPathOfCfgFile("sys_ctrl.xml"))) + if (iotSuccess != objCfg.load(CFileUtil::getPathOfCfgFile("sys_ctrl.xml"))) { CUSTOM_LOGERROR(I18N_C("加载配置文件:%s失败"), "sys_ctrl.xml"); return false; @@ -99,9 +99,9 @@ bool iot_sys::CBaseCfgParam::loadConfig() m_bVerifyIP = objCfg.getBoolWithDefault("console_option", "verify_ip", true); //< 默认检查 - if (kbdSuccess == objCfg.getBoolValue("console_option", "show_console", m_bShowConsole) && - kbdSuccess == objCfg.getIntValue("console_option", "check_interval", m_nCheckInterval) && - kbdSuccess == objCfg.getIntValue("console_option", "check_time", m_nCheckTime)) + if (iotSuccess == objCfg.getBoolValue("console_option", "show_console", m_bShowConsole) && + iotSuccess == objCfg.getIntValue("console_option", "check_interval", m_nCheckInterval) && + iotSuccess == objCfg.getIntValue("console_option", "check_time", m_nCheckTime)) { return true; } diff --git a/platform/src/sys/sys_ctrl/StartCfgParam.cpp b/platform/src/sys/sys_ctrl/StartCfgParam.cpp index 7d7ffffd..959dcabe 100644 --- a/platform/src/sys/sys_ctrl/StartCfgParam.cpp +++ b/platform/src/sys/sys_ctrl/StartCfgParam.cpp @@ -41,7 +41,7 @@ bool iot_sys::CStartCfgParam::loadAppProcess() //2.获取本机部署的应用下的所有进程 vector vecApp; - if (kbdSuccess != m_ptrSysInfo->getLocalAppDeploy(vecApp)) + if (iotSuccess != m_ptrSysInfo->getLocalAppDeploy(vecApp)) { CUSTOM_LOGERROR(I18N_C("获取本机部署信息失败")); return false; @@ -62,7 +62,7 @@ bool iot_sys::CStartCfgParam::loadProcess(const int nAppId) { //1.获取应用信息 SAppInfo stAppInfo; - if (kbdSuccess != m_ptrSysInfo->getAppInfoById(nAppId, stAppInfo)) + if (iotSuccess != m_ptrSysInfo->getAppInfoById(nAppId, stAppInfo)) { CUSTOM_LOGERROR(I18N_C("获取应用%d信息失败"), nAppId); return false; @@ -70,7 +70,7 @@ bool iot_sys::CStartCfgParam::loadProcess(const int nAppId) //2.获取本应用的进程信息列表 SProcessInfoMAP mapProcInfo; - if (kbdSuccess != m_ptrSysInfo->getProcInfoListByAppId(nAppId, mapProcInfo)) + if (iotSuccess != m_ptrSysInfo->getProcInfoListByAppId(nAppId, mapProcInfo)) { CUSTOM_LOGERROR(I18N_C("获取%s应用的进程列表失败"), stAppInfo.strName.c_str()); return false; diff --git a/platform/src/sys/sys_ctrl/StopCfgParam.cpp b/platform/src/sys/sys_ctrl/StopCfgParam.cpp index e1f22f48..6fcee5ca 100644 --- a/platform/src/sys/sys_ctrl/StopCfgParam.cpp +++ b/platform/src/sys/sys_ctrl/StopCfgParam.cpp @@ -33,7 +33,7 @@ bool iot_sys::CStopCfgParam::getLocalInfo(int &nDomainId, std::string &strNodeNa * 将原本从内存库获取应用id列表改成从配置文件获取 */ SNodeInfo stLocalNodeInfo; - if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) { CUSTOM_LOGERROR(I18N_C("获取本地节点信息失败")); return false; @@ -72,7 +72,7 @@ bool iot_sys::CStopCfgParam::getLocalInfo(int &nDomainId, std::string &strNodeNa // else // { // SNodeInfo stLocalNodeInfo; -// if (kbdSuccess == m_ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) +// if (iotSuccess == m_ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) // { // nDomainId = stLocalNodeInfo.nDomainId; // strNodeName = stLocalNodeInfo.strName; @@ -127,7 +127,7 @@ bool iot_sys::CStopCfgParam::getLocalAppIdList(std::set &setAppId) */ setAppId.clear(); std::vector vecAppDeploy; - if (kbdSuccess != m_ptrSysInfo->getLocalAppDeploy(vecAppDeploy)) + if (iotSuccess != m_ptrSysInfo->getLocalAppDeploy(vecAppDeploy)) { CUSTOM_LOGERROR(I18N_C("获取本地部署的所有应用信息失败")); return false; @@ -184,7 +184,7 @@ bool iot_sys::CStopCfgParam::getAllAppIdList(std::set &setAppId) */ setAppId.clear(); std::vector vecAppInfo; - if (kbdSuccess != m_ptrSysInfo->getAllAppInfo(vecAppInfo)) + if (iotSuccess != m_ptrSysInfo->getAllAppInfo(vecAppInfo)) { CUSTOM_LOGERROR(I18N_C("获取所有应用信息失败")); return false; @@ -264,7 +264,7 @@ bool iot_sys::CStopCfgParam::loadProcess(const int nAppId) { //1.获取应用信息 SAppInfo stAppInfo; - if (kbdSuccess != m_ptrSysInfo->getAppInfoById(nAppId, stAppInfo)) + if (iotSuccess != m_ptrSysInfo->getAppInfoById(nAppId, stAppInfo)) { CUSTOM_LOGERROR(I18N_C("获取应用%d信息失败"), nAppId); return false; @@ -272,7 +272,7 @@ bool iot_sys::CStopCfgParam::loadProcess(const int nAppId) //2.获取本应用的进程信息列表 SProcessInfoMAP mapProcInfo; - if (kbdSuccess != m_ptrSysInfo->getProcInfoListByAppId(nAppId, mapProcInfo)) + if (iotSuccess != m_ptrSysInfo->getProcInfoListByAppId(nAppId, mapProcInfo)) { CUSTOM_LOGERROR(I18N_C("获取%s应用的进程列表失败"), stAppInfo.strName.c_str()); return false; diff --git a/platform/src/sys/sys_ctrl/SysCtrlStart.cpp b/platform/src/sys/sys_ctrl/SysCtrlStart.cpp index b32996c4..8af9f418 100644 --- a/platform/src/sys/sys_ctrl/SysCtrlStart.cpp +++ b/platform/src/sys/sys_ctrl/SysCtrlStart.cpp @@ -40,7 +40,7 @@ iot_sys::CSysCtrlStart::~CSysCtrlStart() bool iot_sys::CSysCtrlStart::initialize() { - if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) { CUSTOM_LOGERROR(I18N_C("获取本机节点信息失败")); return false; @@ -84,14 +84,14 @@ int iot_sys::CSysCtrlStart::isAppRunning(int nAppId, bool &bRunning) if (nAppId == CN_AppId_BASE) //< BASE应用，打不开表认为没有启动 { bRunning = m_objRunProcInfoTable.open(CN_AppName_BASE.c_str(), CN_TN_SysRunProcInfo.c_str()); - return kbdSuccess; + return iotSuccess; } /* @brief 其它应用 */ if (!m_objRunProcInfoTable.open(CN_AppName_BASE.c_str(), CN_TN_SysRunProcInfo.c_str())) { CUSTOM_LOGERROR(I18N_C("打开内存表失败")); - return kbdFailed; + return iotFailed; } else { @@ -107,7 +107,7 @@ int iot_sys::CSysCtrlStart::isAppRunning(int nAppId, bool &bRunning) if (!m_objRunProcInfoTable.select(vecCondInfo, objResult, RUN_PROC_COL_STARTUP)) { CUSTOM_LOGERROR(I18N_C("查询表记录失败")); - return kbdFailed; + return iotFailed; } else { @@ -118,7 +118,7 @@ int iot_sys::CSysCtrlStart::isAppRunning(int nAppId, bool &bRunning) } } - return kbdSuccess; + return iotSuccess; } /* @brief 启动整个系统 */ @@ -171,7 +171,7 @@ bool iot_sys::CSysCtrlStart::startProcess(int nAppId, const std::string &strAppN bool iot_sys::CSysCtrlStart::startAppProcess(int nAppId, const StartOrderToProcInfoMAP &mapProcInfo) { SAppInfo stAppInfo; - if (kbdSuccess != m_ptrSysInfo->getAppInfoById(nAppId, stAppInfo)) + if (iotSuccess != m_ptrSysInfo->getAppInfoById(nAppId, stAppInfo)) { CUSTOM_LOGERROR(I18N_C("获取应用信息失败")); return false; @@ -217,7 +217,7 @@ bool iot_sys::CSysCtrlStart::startOnceProcess(int nAppId, const std::string &str CUSTOM_LOGINFO(I18N_C("开始启动进程 %s"), stProcInfo.strProcName.c_str()); - if (kbdSuccess != CProcUtil::execScript(strModulePath, strArgs)) + if (iotSuccess != CProcUtil::execScript(strModulePath, strArgs)) { CUSTOM_LOGERROR(I18N_C("启动进程失败:%s.[%s %s]"), stProcInfo.strProcName.c_str(), strModulePath.c_str(), strArgs.c_str()); return false; @@ -462,7 +462,7 @@ bool iot_sys::CSysCtrlStart::startApp(const std::string &strAppName) { /* @brief 判断对应的应用是否已经启动 */ SAppInfo stAppInfo; - if (kbdSuccess != m_ptrSysInfo->getAppInfoByName(strAppName, stAppInfo)) + if (iotSuccess != m_ptrSysInfo->getAppInfoByName(strAppName, stAppInfo)) { CUSTOM_LOGERROR(I18N_C("获取应用信息失败")); return false; @@ -471,7 +471,7 @@ bool iot_sys::CSysCtrlStart::startApp(const std::string &strAppName) bool bAppRunning = false; if (stAppInfo.nId != CN_AppId_BASE) //< 非BASE应用首先判断BASE是否已经运行 { - if (kbdSuccess != isAppRunning(CN_AppId_BASE, bAppRunning)) + if (iotSuccess != isAppRunning(CN_AppId_BASE, bAppRunning)) { return false; } @@ -484,7 +484,7 @@ bool iot_sys::CSysCtrlStart::startApp(const std::string &strAppName) } /* @brief 判断应用是否已经启动 */ - if (kbdSuccess != isAppRunning(stAppInfo.nId, bAppRunning)) + if (iotSuccess != isAppRunning(stAppInfo.nId, bAppRunning)) { return false; } diff --git a/platform/src/sys/sys_ctrl/SysCtrlStart.h b/platform/src/sys/sys_ctrl/SysCtrlStart.h index 3249c3e9..4246506c 100644 --- a/platform/src/sys/sys_ctrl/SysCtrlStart.h +++ b/platform/src/sys/sys_ctrl/SysCtrlStart.h @@ -43,7 +43,7 @@ namespace iot_sys @brief 判断应用是否运行 @param int nAppId 应用ID @param bool & bRunning 返回是否运行 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int isAppRunning(int nAppId, bool &bRunning); /** diff --git a/platform/src/sys/sys_ctrl/SysCtrlStop.cpp b/platform/src/sys/sys_ctrl/SysCtrlStop.cpp index c25ded34..b39ed400 100644 --- a/platform/src/sys/sys_ctrl/SysCtrlStop.cpp +++ b/platform/src/sys/sys_ctrl/SysCtrlStop.cpp @@ -94,7 +94,7 @@ bool iot_sys::CSysCtrlStop::stopApp(const std::string &strAppName) if (stAppInfo.nId == CN_AppId_BASE) { bool bRunning = false; - if (kbdSuccess != isAppRunningExcludeBASE(bRunning)) + if (iotSuccess != isAppRunningExcludeBASE(bRunning)) { return false; } @@ -179,7 +179,7 @@ int iot_sys::CSysCtrlStop::isAppRunningExcludeBASE(bool &bRunning) if (!m_objRunProcInfoTable.select(vecCond, objResult, RUN_PROC_COL_STARTUP)) { CUSTOM_LOGERROR(I18N_C("查询记录失败")); - return kbdFailed; + return iotFailed; } if (objResult.getRecordCount() > 0) @@ -187,14 +187,14 @@ int iot_sys::CSysCtrlStop::isAppRunningExcludeBASE(bool &bRunning) bRunning = true; } - return kbdSuccess; + return iotSuccess; } /* @brief 停止应用下的进程 */ bool iot_sys::CSysCtrlStop::stopAppProcess(int nAppId, const StartOrderToProcInfoMAP &mapProcInfo) { SAppInfo stAppInfo; - if (kbdSuccess != m_ptrSysInfo->getAppInfoById(nAppId, stAppInfo)) + if (iotSuccess != m_ptrSysInfo->getAppInfoById(nAppId, stAppInfo)) { CUSTOM_LOGERROR(I18N_C("获取应用信息失败")); return false; diff --git a/platform/src/sys/sys_ctrl/SysCtrlStop.h b/platform/src/sys/sys_ctrl/SysCtrlStop.h index 4aab6dab..6c1830a6 100644 --- a/platform/src/sys/sys_ctrl/SysCtrlStop.h +++ b/platform/src/sys/sys_ctrl/SysCtrlStop.h @@ -49,7 +49,7 @@ namespace iot_sys /** @brief 除BASE应用外，是否有应用运行 @param bool & bRunning true-运行，false-未运行 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int isAppRunningExcludeBASE(bool &bRunning); /** diff --git a/platform/src/sys/sys_dog_auth_api/DogAuthImpl.cpp b/platform/src/sys/sys_dog_auth_api/DogAuthImpl.cpp index c5497c81..c6e8449c 100644 --- a/platform/src/sys/sys_dog_auth_api/DogAuthImpl.cpp +++ b/platform/src/sys/sys_dog_auth_api/DogAuthImpl.cpp @@ -180,16 +180,16 @@ int iot_sys::CDogAuthImpl::initialize() iot_public::CCommonConfigParse objCfgParse; //加载配置文件，失败则使用默认值，构造函数中已设置 m_nProductId = PRODUCT_ID_PSCADA - if(kbdSuccess == objCfgParse.load( + if(iotSuccess == objCfgParse.load( iot_public::CFileUtil::getPathOfCfgFile("setup_config.xml",CN_DIR_PRODUCT))) { //获取产品ID - if(kbdSuccess != objCfgParse.getIntValue("setup_config","software_product_id", m_nProductId)) + if(iotSuccess != objCfgParse.getIntValue("setup_config","software_product_id", m_nProductId)) { LOGWARN("CDogAuthImpl::initialize() get product id fail, use default.\n"); } //获取授权模式 - if (objCfgParse.getIntValue("setup_config", "authModel", m_nAuthModel) != kbdSuccess) + if (objCfgParse.getIntValue("setup_config", "authModel", m_nAuthModel) != iotSuccess) { m_nAuthModel = AUTH_MODEL_SUPPERDOG; } @@ -203,16 +203,16 @@ int iot_sys::CDogAuthImpl::initialize() if(NULL == m_ptrLicenseAuth) { LOGERROR("CDogAuthImpl::initialize() getLicenseAuthInstance fail .\n"); - return kbdFailed; + return iotFailed; } #endif - return kbdSuccess; + return iotSuccess; } /** * @brief :CDogAuthImpl::loginSupperDog() * 超级狗登录 -* @return 成功返回kbdSuccess，失败返回kbdFailed +* @return 成功返回iotSuccess，失败返回iotFailed */ int iot_sys::CDogAuthImpl::loginSupperDog(int nProductId) { @@ -251,8 +251,8 @@ int iot_sys::CDogAuthImpl::loginSupperDog(int nProductId) } } #else - return kbdFailed; + return iotFailed; #endif #endif - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/sys/sys_dog_auth_api/DogAuthImpl.h b/platform/src/sys/sys_dog_auth_api/DogAuthImpl.h index 044d6aaf..a69e7d86 100644 --- a/platform/src/sys/sys_dog_auth_api/DogAuthImpl.h +++ b/platform/src/sys/sys_dog_auth_api/DogAuthImpl.h @@ -50,7 +50,7 @@ namespace iot_sys /** * @brief :CDogAuthImpl::loginSupperDog() * 超级狗登录 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int loginSupperDog(int nProductId); private: diff --git a/platform/src/sys/sys_dog_auth_api/DogAuthInterface.cpp b/platform/src/sys/sys_dog_auth_api/DogAuthInterface.cpp index e3e84351..4fd47359 100644 --- a/platform/src/sys/sys_dog_auth_api/DogAuthInterface.cpp +++ b/platform/src/sys/sys_dog_auth_api/DogAuthInterface.cpp @@ -14,7 +14,7 @@ SYS_DOG_AUTH_API CDogAuthInterfacePtr iot_sys::getDogAuthInstance() CDogAuthImplPtr ptrDogAuthImp = boost::make_shared(); if (ptrDogAuthImp != NULL) { - if (kbdSuccess != ptrDogAuthImp->initialize()) + if (iotSuccess != ptrDogAuthImp->initialize()) { /* @brief 注册失败后清理资源 */ ptrDogAuthImp.reset(); diff --git a/platform/src/sys/sys_launcher_srv/CSysLauncher.cpp b/platform/src/sys/sys_launcher_srv/CSysLauncher.cpp index e0d81ada..aa60aafd 100644 --- a/platform/src/sys/sys_launcher_srv/CSysLauncher.cpp +++ b/platform/src/sys/sys_launcher_srv/CSysLauncher.cpp @@ -134,7 +134,7 @@ bool CSysLauncher::doStart() } const int nRc = iot_public::CProcUtil::execScript(strPath, "-l"); - if (kbdSuccess != nRc) + if (iotSuccess != nRc) { LOGERROR("doStart(): 启动系统失败\n%s\nRetrun value == %d", strPath.c_str(), nRc); @@ -161,7 +161,7 @@ bool CSysLauncher::doStop() } const int nRc = iot_public::CProcUtil::execScript(strPath, "-s"); - if (kbdSuccess != nRc) + if (iotSuccess != nRc) { LOGERROR("doStop(): 停止系统失败\n%s\nRetrun value == %d", strPath.c_str(), nRc); diff --git a/platform/src/sys/sys_license_auth_api/LicenseAuthImpl.cpp b/platform/src/sys/sys_license_auth_api/LicenseAuthImpl.cpp index 1e4275c3..c49fd0a7 100644 --- a/platform/src/sys/sys_license_auth_api/LicenseAuthImpl.cpp +++ b/platform/src/sys/sys_license_auth_api/LicenseAuthImpl.cpp @@ -380,4 +380,4 @@ bool CLicenseAuthImpl::checkRegistration_private return true; } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/sys/sys_license_auth_api/LicenseAuthImpl.h b/platform/src/sys/sys_license_auth_api/LicenseAuthImpl.h index 409b9ad0..5ccf1d1b 100644 --- a/platform/src/sys/sys_license_auth_api/LicenseAuthImpl.h +++ b/platform/src/sys/sys_license_auth_api/LicenseAuthImpl.h @@ -48,4 +48,4 @@ private: typedef boost::shared_ptr CLicenseAuthImplPtr; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/platform/src/sys/sys_license_auth_api/LicenseAuthInterface.cpp b/platform/src/sys/sys_license_auth_api/LicenseAuthInterface.cpp index 88ed061a..8ca7db04 100644 --- a/platform/src/sys/sys_license_auth_api/LicenseAuthInterface.cpp +++ b/platform/src/sys/sys_license_auth_api/LicenseAuthInterface.cpp @@ -14,7 +14,7 @@ SYS_LICENSE_AUTH_API CLicenseAuthInterfacePtr iot_sys::getLicenseAuthInstance() CLicenseAuthImplPtr ptrLicenseAuthImp = boost::make_shared(); if (ptrLicenseAuthImp != NULL) { - //if (kbdSuccess != ptrLicenseAuthImp->initialize()) + //if (iotSuccess != ptrLicenseAuthImp->initialize()) { /* @brief 注册失败后清理资源 */ //ptrLicenseAuthImp.reset(); diff --git a/platform/src/sys/sys_login_api/CLoginDlg.cpp b/platform/src/sys/sys_login_api/CLoginDlg.cpp index 1e8999f9..3cef74c3 100644 --- a/platform/src/sys/sys_login_api/CLoginDlg.cpp +++ b/platform/src/sys/sys_login_api/CLoginDlg.cpp @@ -62,9 +62,9 @@ int CLoginDlg::getUserInfo(int &userId, QString &userName, QString &userAlias) userId = it.value().permId; userName = it.value().permName; userAlias = it.value().permAlias; - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } int CLoginDlg::getUserGroupInfo(int &usergId, QString &usergName, int &permLocation1) @@ -75,9 +75,9 @@ int CLoginDlg::getUserGroupInfo(int &usergId, QString &usergName, int &permLocat usergId = m_usergId; usergName = it.value().permName; permLocation1 = it.value().permLocation1; - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } void CLoginDlg::setCheckPerm(const QString &permFun1) @@ -159,7 +159,7 @@ bool CLoginDlg::eventFilter(QObject *obj, QEvent *event) void CLoginDlg::init() { - if(kbdSuccess == initMember()) + if(iotSuccess == initMember()) { loadNomPerm(); loadRoleNomPerm(); @@ -178,17 +178,17 @@ int CLoginDlg::initMember() qDebug()<<"create db object failed!"; QMessageBox::warning(0,tr("警告"),tr("创建数据库对象失败!")); LOGERROR("create db object failed!"); - return kbdFailed; + return iotFailed; } if(!m_pReadDb->open()) { QMessageBox::warning(0,tr("警告"),tr("打开数据库失败!")); qDebug()<<"open db failed!"; LOGERROR("open db failed!"); - return kbdFailed; + return iotFailed; } } - return kbdSuccess; + return iotSuccess; } void CLoginDlg::loadUserGroupInfo() diff --git a/platform/src/sys/sys_network_check/NetworkCfgParam.cpp b/platform/src/sys/sys_network_check/NetworkCfgParam.cpp index 2eec3ce3..9009840a 100644 --- a/platform/src/sys/sys_network_check/NetworkCfgParam.cpp +++ b/platform/src/sys/sys_network_check/NetworkCfgParam.cpp @@ -33,23 +33,23 @@ iot_sys::CNetworkCfgParam::~CNetworkCfgParam() int iot_sys::CNetworkCfgParam::load() { CCommonConfigParse objCfgParse; - if (kbdSuccess != objCfgParse.load(CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) + if (iotSuccess != objCfgParse.load(CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) { LOGERROR("加载配置文件proc_param_cfg.xml失败"); - return kbdFailed; + return iotFailed; } - if ((kbdSuccess == objCfgParse.getIntValue(CN_ProcName_NetworkCheck, PING_TIMEOUT, m_nPingTimeoutMsec)) && - (kbdSuccess == objCfgParse.getIntValue(CN_ProcName_NetworkCheck, PING_RETRY_TIME, m_nPingRetryTime)) && - (kbdSuccess == objCfgParse.getIntValue(CN_ProcName_NetworkCheck, PING_PERIOD, m_nPingCheckIntervalMsec))) + if ((iotSuccess == objCfgParse.getIntValue(CN_ProcName_NetworkCheck, PING_TIMEOUT, m_nPingTimeoutMsec)) && + (iotSuccess == objCfgParse.getIntValue(CN_ProcName_NetworkCheck, PING_RETRY_TIME, m_nPingRetryTime)) && + (iotSuccess == objCfgParse.getIntValue(CN_ProcName_NetworkCheck, PING_PERIOD, m_nPingCheckIntervalMsec))) { LOGINFO("解析配置参数成功"); - return kbdSuccess; + return iotSuccess; } else { LOGINFO("解析配置参数失败，请检查配置文件proc_param_cfg.xml"); - return kbdFailed; + return iotFailed; } } diff --git a/platform/src/sys/sys_network_check/NetworkCfgParam.h b/platform/src/sys/sys_network_check/NetworkCfgParam.h index d1ea6afb..6647dbcc 100644 --- a/platform/src/sys/sys_network_check/NetworkCfgParam.h +++ b/platform/src/sys/sys_network_check/NetworkCfgParam.h @@ -16,7 +16,7 @@ namespace iot_sys /** @brief 加载相关参数 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ static int load(); /** diff --git a/platform/src/sys/sys_network_check/NetworkCheckApp.cpp b/platform/src/sys/sys_network_check/NetworkCheckApp.cpp index 22c0c859..24fedd21 100644 --- a/platform/src/sys/sys_network_check/NetworkCheckApp.cpp +++ b/platform/src/sys/sys_network_check/NetworkCheckApp.cpp @@ -64,7 +64,7 @@ bool iot_sys::CNetworkCheckApp::start(int argc, char *argv[], int &/*nStatus*/) } //7.向进程管理报告启动成功 - if (kbdSuccess != m_ptrProcMng->updateProcessInfo(true, true, false)) + if (iotSuccess != m_ptrProcMng->updateProcessInfo(true, true, false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -113,7 +113,7 @@ int iot_sys::CNetworkCheckApp::toQuit() } m_objIOService.stop(); shutdown(); - return kbdSuccess; + return iotSuccess; } /* @brief 解析启动参数 */ @@ -145,7 +145,7 @@ bool iot_sys::CNetworkCheckApp::getSystemInfo() return false; } - if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -171,7 +171,7 @@ bool iot_sys::CNetworkCheckApp::registToProcMng() return false; } - if (kbdSuccess != m_ptrProcMng->setCallback(this)) //< 设置回调，用来接收进程管理的退出通知 + if (iotSuccess != m_ptrProcMng->setCallback(this)) //< 设置回调，用来接收进程管理的退出通知 { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -196,7 +196,7 @@ bool iot_sys::CNetworkCheckApp::unregistProcMng() bool iot_sys::CNetworkCheckApp::initialize() { //1.加载配置文件 - if (kbdSuccess != CNetworkCfgParam::load()) + if (iotSuccess != CNetworkCfgParam::load()) { LOGERROR("加载网络检测相关配置失败"); return false; @@ -210,7 +210,7 @@ bool iot_sys::CNetworkCheckApp::initialize() return false; } - if (kbdSuccess != m_ptrNetworkTable->initialize()) + if (iotSuccess != m_ptrNetworkTable->initialize()) { LOGERROR("初始化内存表操作类失败"); return false; @@ -275,7 +275,7 @@ bool iot_sys::CNetworkCheckApp::initPinger() } else { - if (kbdSuccess != ptrPinger->initialize()) + if (iotSuccess != ptrPinger->initialize()) { return false; } diff --git a/platform/src/sys/sys_network_check/NetworkTableOperate.cpp b/platform/src/sys/sys_network_check/NetworkTableOperate.cpp index 3e682f3c..a03bae4d 100644 --- a/platform/src/sys/sys_network_check/NetworkTableOperate.cpp +++ b/platform/src/sys/sys_network_check/NetworkTableOperate.cpp @@ -32,18 +32,18 @@ iot_sys::CNetworkTableOperate::~CNetworkTableOperate() int iot_sys::CNetworkTableOperate::initialize() { /* @brief 打开表 */ - if (kbdSuccess != openTable()) + if (iotSuccess != openTable()) { - return kbdFailed; + return iotFailed; } /* @brief 初始化表内容 */ - if (kbdSuccess != initTable()) + if (iotSuccess != initTable()) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 更新IP状态 */ @@ -65,16 +65,16 @@ int iot_sys::CNetworkTableOperate::updateState(const std::string &strGatewayIP, else { LOGERROR("错误的IP地址[%s]", strGatewayIP.c_str()); - return kbdFailed; + return iotFailed; } if (!m_objNetworkTable.updateRecordByIndexEX(0, strColName, nIPState)) /* @brief 表中仅一条记录 */ { LOGERROR("更新表[%s]记录失败.Error=[%s]", CN_TN_SysRunNetworkInfo.c_str(), m_objNetworkTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 打开表sys_run_network_info */ @@ -88,10 +88,10 @@ int iot_sys::CNetworkTableOperate::openTable() { LOGERROR("打开应用[%s]的[%s]表失败.原因[%s]", CN_AppName_BASE.c_str(), CN_TN_SysRunNetworkInfo.c_str(), m_objNetworkTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 初始化表内容 */ @@ -103,7 +103,7 @@ int iot_sys::CNetworkTableOperate::initTable() if (NULL == m_objNetworkTable.getTableInfo(stTableInfo)) { LOGERROR("获取表[%s]信息失败", CN_TN_SysRunNetworkInfo.c_str()); - return kbdFailed; + return iotFailed; } STableRunNetworkInfo stRecord; @@ -115,7 +115,7 @@ int iot_sys::CNetworkTableOperate::initTable() if (!m_objNetworkTable.addRecordEX(stRecord)) { LOGERROR("表[%s]中增加记录失败.Error=[%s]", CN_TN_SysRunNetworkInfo.c_str(), m_objNetworkTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } } else if (stTableInfo.rcdcount > 1) //< 正常不会大于1条，如果大于1条，就先删除所有记录，然后添加1条记录 @@ -124,15 +124,15 @@ int iot_sys::CNetworkTableOperate::initTable() if (!m_objNetworkTable.deleteRecordByIndex(0, stTableInfo.rcdcount)) { LOGERROR("表[%s]中删除记录失败.Error=[%s]", CN_TN_SysRunNetworkInfo.c_str(), m_objNetworkTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } if (!m_objNetworkTable.addRecordEX(stRecord)) { LOGERROR("表[%s]中增加记录失败.Error=[%s]", CN_TN_SysRunNetworkInfo.c_str(), m_objNetworkTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } } - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/sys/sys_network_check/NetworkTableOperate.h b/platform/src/sys/sys_network_check/NetworkTableOperate.h index 4a9aae26..97f50393 100644 --- a/platform/src/sys/sys_network_check/NetworkTableOperate.h +++ b/platform/src/sys/sys_network_check/NetworkTableOperate.h @@ -21,26 +21,26 @@ namespace iot_sys /** @brief 初始化，主要打开内存表 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int initialize(); /** @brief 更新IP状态 @param const std::string & strGatewayIP 要ping的地址 @param bool bNormal 是否正常，true-正常 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int updateState(const std::string &strGatewayIP, bool bNormal); private: /** @brief 打开内存表 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int openTable(); /** @brief 初始化表内容 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int initTable(); diff --git a/platform/src/sys/sys_network_check/Ping.cpp b/platform/src/sys/sys_network_check/Ping.cpp index 45755e9a..46012191 100644 --- a/platform/src/sys/sys_network_check/Ping.cpp +++ b/platform/src/sys/sys_network_check/Ping.cpp @@ -76,7 +76,7 @@ int iot_sys::CPinger::initialize() catch (std::exception& ex) { LOGERROR("创建endpoint失败.IP=[%s].error=[%s]", m_strDstIP.c_str(), ex.what()); - return kbdFailed; + return iotFailed; } #endif #ifdef OS_LINUX @@ -86,7 +86,7 @@ int iot_sys::CPinger::initialize() startSend(); startReceive(); - return kbdSuccess; + return iotSuccess; } /* @brief 启动发送 */ diff --git a/platform/src/sys/sys_network_check/Ping.h b/platform/src/sys/sys_network_check/Ping.h index 02441e1f..e4f78560 100644 --- a/platform/src/sys/sys_network_check/Ping.h +++ b/platform/src/sys/sys_network_check/Ping.h @@ -34,7 +34,7 @@ namespace iot_sys virtual ~CPinger(); /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int initialize(); diff --git a/platform/src/sys/sys_network_check_api/NetworkCheckImpl.cpp b/platform/src/sys/sys_network_check_api/NetworkCheckImpl.cpp index 626cca35..61dc47ac 100644 --- a/platform/src/sys/sys_network_check_api/NetworkCheckImpl.cpp +++ b/platform/src/sys/sys_network_check_api/NetworkCheckImpl.cpp @@ -34,7 +34,7 @@ iot_sys::CNetworkCheckImpl::~CNetworkCheckImpl() bool iot_sys::CNetworkCheckImpl::isNormal() { SNetworkState stNetSta; - if (kbdSuccess != getLocalNetStatus(stNetSta)) + if (iotSuccess != getLocalNetStatus(stNetSta)) { LOGERROR("获取本机网络状态失败"); return false; @@ -65,13 +65,13 @@ int iot_sys::CNetworkCheckImpl::getLocalNetStatus(SNetworkState &stNetSta) stNetSta.strIP2 = stNetworkInfo.szIP2; stNetSta.bIP2State = stNetworkInfo.nIP2State != 0; - return kbdSuccess; + return iotSuccess; } else { LOGERROR("获取表[%s]记录失败.error=[%s]", CN_TN_SysRunNetworkInfo.c_str(), m_objRunNetworkInfoTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } } @@ -82,13 +82,13 @@ int iot_sys::CNetworkCheckImpl::initialize() if (m_objRunNetworkInfoTable.open(CN_AppName_BASE.c_str(), CN_TN_SysRunNetworkInfo.c_str())) { LOGINFO("打开应用[%s]的表[%s]成功", CN_AppName_BASE.c_str(), CN_TN_SysRunNetworkInfo.c_str()); - return kbdSuccess; + return iotSuccess; } else { LOGERROR("打开应用[%s]的表[%s]失败.error=[%s]", CN_AppName_BASE.c_str(), CN_TN_SysRunNetworkInfo.c_str(), m_objRunNetworkInfoTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } } diff --git a/platform/src/sys/sys_network_check_api/NetworkCheckImpl.h b/platform/src/sys/sys_network_check_api/NetworkCheckImpl.h index 825d3a0a..6d519189 100644 --- a/platform/src/sys/sys_network_check_api/NetworkCheckImpl.h +++ b/platform/src/sys/sys_network_check_api/NetworkCheckImpl.h @@ -24,13 +24,13 @@ namespace iot_sys /** @brief 获取本节点网络状态 @param SNetStatus & stNetSta - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ virtual int getLocalNetStatus(SNetworkState &stNetSta); /** @brief 初始化本类资源，主要打开内存表 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int initialize(); diff --git a/platform/src/sys/sys_network_check_api/NetworkCheckInterface.cpp b/platform/src/sys/sys_network_check_api/NetworkCheckInterface.cpp index 89149765..4bf875fb 100644 --- a/platform/src/sys/sys_network_check_api/NetworkCheckInterface.cpp +++ b/platform/src/sys/sys_network_check_api/NetworkCheckInterface.cpp @@ -13,7 +13,7 @@ NETWORK_CHECK_API CNetworkCheckInterfacePtr iot_sys::getNetworkCheckInstance() CNetworkCheckImplPtr ptrNetworkCheck = boost::make_shared(); if (ptrNetworkCheck != NULL) { - if (kbdSuccess != ptrNetworkCheck->initialize()) + if (iotSuccess != ptrNetworkCheck->initialize()) { ptrNetworkCheck.reset(); } diff --git a/platform/src/sys/sys_node_mng/AppLevelArbitrate.cpp b/platform/src/sys/sys_node_mng/AppLevelArbitrate.cpp index fcd54daa..e115305f 100644 --- a/platform/src/sys/sys_node_mng/AppLevelArbitrate.cpp +++ b/platform/src/sys/sys_node_mng/AppLevelArbitrate.cpp @@ -64,14 +64,14 @@ int iot_sys::CAppLevelArbitrate::initialize() if (m_ptrNetworkCheck == NULL) { LOGERROR("获取网络检测接口失败"); - return kbdFailed; + return iotFailed; } /* @brief 获取本机节点信息 */ - if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) { LOGERROR("获取本机节点信息失败"); - return kbdFailed; + return iotFailed; } /* @brief 构造本应用类的主键 */ @@ -82,9 +82,9 @@ int iot_sys::CAppLevelArbitrate::initialize() LOGDEBUG("应用级冗余.域[%d],应用[%d],节点[%s]", m_stAppDeploy.nDomainId, m_stAppDeploy.nAppId, m_stLocalNodeInfo.strName.c_str()); /* @brief 启动时清理表，防止之前数据的干扰 */ - if (kbdSuccess != deleteRedundancyCmdFromTable(m_stAppInfoKey)) + if (iotSuccess != deleteRedundancyCmdFromTable(m_stAppInfoKey)) { - return kbdFailed; + return iotFailed; } /* @brief 生成本应用的部署信息列表（即8机冗余配置） */ @@ -105,7 +105,7 @@ int iot_sys::CAppLevelArbitrate::initialize() } } - return kbdSuccess; + return iotSuccess; } /* @brief 处理接收的冗余切换指令 */ @@ -114,7 +114,7 @@ int iot_sys::CAppLevelArbitrate::handleRecvRedundancyCmd(const SRedundancyCmd &s if (m_stAppInfoKey.strNodeName == stRedundancyCmd.strArbiterNode) { /* @brief 本机是仲裁节点时，已经通过LocalNodeInfoMngThread处理，所以过滤掉发给自己的消息 */ - return kbdSuccess; + return iotSuccess; } else { @@ -131,7 +131,7 @@ int iot_sys::CAppLevelArbitrate::arbitrate() /* @brief 检查切换是否完成，正在切换直接返回 */ if (m_bSwitching) { - return kbdSuccess; + return iotSuccess; } bool bLocalNodeIsActive = false; //< 保存本机节点是否可用 @@ -160,14 +160,14 @@ int iot_sys::CAppLevelArbitrate::arbitrate() LOGERROR("本机网络不稳定.节点[%s]", m_stAppInfoKey.strNodeName.c_str()); } - return kbdSuccess; + return iotSuccess; } /* @brief 更新本应用的冗余状态信息 */ int iot_sys::CAppLevelArbitrate::updateAppRedundancyInfo(bool &bLocalNodeIsActive) { /* @brief 遍历本应用所有部署的节点 */ - int nRet = kbdSuccess; + int nRet = iotSuccess; for (size_t i = 0; i < m_vecArbiterNodeInfo.size(); ++i) { SArbiterAppInfo &stArbiterNodeInfo = m_vecArbiterNodeInfo[i]; @@ -177,7 +177,7 @@ int iot_sys::CAppLevelArbitrate::updateAppRedundancyInfo(bool &bLocalNodeIsActiv } SAppRedundancyInfo stAppRedundancyInfo; - if (kbdSuccess == m_ptrNodeInfoMng->getAppInfo(stArbiterNodeInfo.stKey, stAppRedundancyInfo)) + if (iotSuccess == m_ptrNodeInfoMng->getAppInfo(stArbiterNodeInfo.stKey, stAppRedundancyInfo)) { stArbiterNodeInfo.bActive = stAppRedundancyInfo.bActive; stArbiterNodeInfo.bMaster = stAppRedundancyInfo.bMaster; @@ -192,7 +192,7 @@ int iot_sys::CAppLevelArbitrate::updateAppRedundancyInfo(bool &bLocalNodeIsActiv } else { - nRet = kbdFailed; + nRet = iotFailed; LOGERROR("获取节点信息失败.域[%d],应用[%d],节点[%s]", stArbiterNodeInfo.stKey.nDomainId, stArbiterNodeInfo.stKey.nAppId, stArbiterNodeInfo.stKey.strNodeName.c_str()); } @@ -221,7 +221,7 @@ int iot_sys::CAppLevelArbitrate::updateLocalNetworkState() m_nLocalNetNotAvailableCount = (std::min)(m_nLocalNetNotAvailableCount + 1, CN_MaxPersistCount); } - return kbdSuccess; + return iotSuccess; } /* @brief 判断本机是否裁决者 */ @@ -318,7 +318,7 @@ void iot_sys::CAppLevelArbitrate::collectNodeStatus() /* @brief 进行裁决 */ int iot_sys::CAppLevelArbitrate::doArbitrate() { - int nRet = kbdFailed; + int nRet = iotFailed; if (m_nMasterNodeCount == 0) { nRet = arbitrateWhenNoMaster(); @@ -369,7 +369,7 @@ bool iot_sys::CAppLevelArbitrate::isAllNodeStatusAlreadySteady() /* @brief 无主时的裁决 */ int iot_sys::CAppLevelArbitrate::arbitrateWhenNoMaster() { - int nRet = kbdFailed; + int nRet = iotFailed; if (m_nHasMasterNodeCount == 0) { nRet = arbitrateWhenNoHasMaster(); @@ -420,7 +420,7 @@ int iot_sys::CAppLevelArbitrate::arbitrateWhenNoHasMaster() } } - return kbdSuccess; + return iotSuccess; } /* @brief 有一个主时的裁决 */ @@ -470,7 +470,7 @@ int iot_sys::CAppLevelArbitrate::arbitrateWhenOneMaster() }//for }//if - return kbdSuccess; + return iotSuccess; } /* @brief 有一个有主时的裁决 */ @@ -513,7 +513,7 @@ int iot_sys::CAppLevelArbitrate::arbitrateWhenOneHasMaster() } } - return kbdSuccess; + return iotSuccess; } /* @brief 有多主时的裁决 */ @@ -533,7 +533,7 @@ int iot_sys::CAppLevelArbitrate::arbitrateWhenMultiMaster() } } - return kbdSuccess; + return iotSuccess; } /* @brief 有多个 有主 时的裁决 */ @@ -555,7 +555,7 @@ int iot_sys::CAppLevelArbitrate::arbitrateWhenMultiHasMater() } } - return kbdSuccess; + return iotSuccess; } /* @brief 本机网络不正常时的裁决 */ @@ -579,7 +579,7 @@ int iot_sys::CAppLevelArbitrate::arbitrateWhenLocalNotAvailable() } } - return kbdSuccess; + return iotSuccess; } /* @brief 调度应用的主备状态 */ @@ -601,7 +601,7 @@ int iot_sys::CAppLevelArbitrate::scheduleNode(const SAppInfoKey &stAppKey, bool stRedundancyCmd.bMaster, stRedundancyCmd.bSlave); int nRet = handleRedundancyCmd(stRedundancyCmd); //< 处理冗余切换命令 - if (kbdSuccess == nRet) + if (iotSuccess == nRet) { nRet = sendScheduleCmd(stRedundancyCmd); //< 将冗余命令发送出去 } @@ -649,7 +649,7 @@ int iot_sys::CAppLevelArbitrate::handleRedundancyCmd(const SRedundancyCmd &stRed } } - return kbdSuccess; + return iotSuccess; } /* @brief 将冗余切换指令写入内存表中，供各个应用程序进行冗余切换 */ @@ -668,7 +668,7 @@ int iot_sys::CAppLevelArbitrate::insertRedundancyCmdToTable(const SRedundancyCmd /* @brief 处理切换过程中，又接收到的变化的冗余切换命令 */ int iot_sys::CAppLevelArbitrate::handleChangedSwtichCmd(const SRedundancyCmd &stRedundancyCmd) { - int nRet = kbdSuccess; + int nRet = iotSuccess; /* @brief 正在切换中，如果冗余指令发生变化 */ /* @brief 如果原来本节点是切换节点 */ if (m_stCurRedundancyCmd.strSwitchNode == m_stAppInfoKey.strNodeName) @@ -680,7 +680,7 @@ int iot_sys::CAppLevelArbitrate::handleChangedSwtichCmd(const SRedundancyCmd &st stAppInfoKey.strNodeName = m_stCurRedundancyCmd.strSwitchNode; SAppRedundancyInfo stNodeInfo; - if (kbdSuccess == m_ptrNodeInfoMng->getAppInfo(stAppInfoKey, stNodeInfo)) + if (iotSuccess == m_ptrNodeInfoMng->getAppInfo(stAppInfoKey, stNodeInfo)) { /* @brief 为主和有主达到预期则认为切换成功 */ if (m_stCurRedundancyCmd.bMaster == stNodeInfo.bMaster && @@ -699,18 +699,18 @@ int iot_sys::CAppLevelArbitrate::handleChangedSwtichCmd(const SRedundancyCmd &st m_stCurRedundancyCmd.nDomainId, m_stCurRedundancyCmd.nAppId, m_stCurRedundancyCmd.strSwitchNode.c_str()); - if (kbdSuccess != m_ptrLocalAppInfoMng->setSwitchFailedFlag(m_stAppInfoKey) || - kbdSuccess != m_ptrNodeInfoMng->setSwitchFailedFlag(m_stAppInfoKey)) + if (iotSuccess != m_ptrLocalAppInfoMng->setSwitchFailedFlag(m_stAppInfoKey) || + iotSuccess != m_ptrNodeInfoMng->setSwitchFailedFlag(m_stAppInfoKey)) { - return kbdFailed; //< 函数中已经打印日志 + return iotFailed; //< 函数中已经打印日志 } } }//if_getNodeInfo /* @brief 清理sys_run_redundancy_cmd中记录 */ - if (kbdFailed != deleteRedundancyCmdFromTable(m_stAppInfoKey)) + if (iotFailed != deleteRedundancyCmdFromTable(m_stAppInfoKey)) { - return kbdFailed; + return iotFailed; } }//if(m_stCurRedundancyCmd.strSwitchNode == m_stLocalNodeInfo.strNodeName) @@ -742,7 +742,7 @@ void iot_sys::CAppLevelArbitrate::doSwitch() /* @brief 获取失败，直接认为异常，将内存表中记录清理，同时结束本次切换 */ SAppRedundancyInfo stAppRedundancyInfo; - if (kbdSuccess != m_ptrNodeInfoMng->getAppInfo(stAppInfoKey, stAppRedundancyInfo)) + if (iotSuccess != m_ptrNodeInfoMng->getAppInfo(stAppInfoKey, stAppRedundancyInfo)) { endSwitch(); @@ -803,7 +803,7 @@ int iot_sys::CAppLevelArbitrate::sendScheduleCmd(const SRedundancyCmd &stRedunda /* @brief 如果是本机是 被调度节点，则不需要发送，因为已经将切换命令插入到内存表中了 */ if (stRedundancyCmd.strSwitchNode == m_stLocalNodeInfo.strName) { - return kbdSuccess; + return iotSuccess; } /* @brief 发送消息 */ @@ -822,7 +822,7 @@ int iot_sys::CAppLevelArbitrate::sendScheduleCmd(const SRedundancyCmd &stRedunda if (!stSend.SerializeToString(&strMsg)) { LOGERROR("序列化失败"); - return kbdFailed; + return iotFailed; } CMbMessage objMsg(strMsg, CN_AppId_BASE, CH_NODE_MNG_INTRA_DOMAIN, MT_RedundancyCommand); @@ -831,16 +831,16 @@ int iot_sys::CAppLevelArbitrate::sendScheduleCmd(const SRedundancyCmd &stRedunda if (!m_objCommunicator.sendMsgToDomain(objMsg)) { LOGERROR("发送消息失败.应用[%d],通道[%d],消息类型[%d]", CN_AppId_BASE, CH_NODE_MNG_INTRA_DOMAIN, MT_RedundancyCommand); - return kbdFailed; + return iotFailed; } } else { LOGERROR("设置消息参数失败.应用[%d],通道[%d],消息类型[%d]", CN_AppId_BASE, CH_NODE_MNG_INTRA_DOMAIN, MT_RedundancyCommand); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 接收切换，进行相关清理 */ diff --git a/platform/src/sys/sys_node_mng/AppLevelArbitrate.h b/platform/src/sys/sys_node_mng/AppLevelArbitrate.h index 32ddfab2..a8295991 100644 --- a/platform/src/sys/sys_node_mng/AppLevelArbitrate.h +++ b/platform/src/sys/sys_node_mng/AppLevelArbitrate.h @@ -36,30 +36,30 @@ namespace iot_sys virtual ~CAppLevelArbitrate(); /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int initialize(); /** @brief 处理接收的冗余切换指令 @param const SRedundancyCmd & stRedundancyCmd - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int handleRecvRedundancyCmd(const SRedundancyCmd &stRedundancyCmd); /** @brief 进行裁决 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int arbitrate(); private: /** @brief 更新本机的网络状态 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int updateLocalNetworkState(); /** @brief 更新本应用的冗余状态信息 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int updateAppRedundancyInfo(bool &bLocalNodeIsActive); /** @@ -77,7 +77,7 @@ namespace iot_sys void collectNodeStatus(); /** @brief 进行裁决 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int doArbitrate(); /** @@ -87,37 +87,37 @@ namespace iot_sys bool isAllNodeStatusAlreadySteady(); /** @brief 无主时的裁决 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int arbitrateWhenNoMaster(); /** @brief 无 有主 时的裁决 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int arbitrateWhenNoHasMaster(); /** @brief 有一个主时的裁决 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int arbitrateWhenOneMaster(); /** @brief 有一个有主时的裁决 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int arbitrateWhenOneHasMaster(); /** @brief 有多主时的裁决 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int arbitrateWhenMultiMaster(); /** @brief 有多个 有主 时的裁决 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int arbitrateWhenMultiHasMater(); /** @brief 本机不可用时的裁决（将本机将为非主非备） - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int arbitrateWhenLocalNotAvailable(); /** @@ -125,13 +125,13 @@ namespace iot_sys @param const SAppInfoKey & stAppKey 要调度的应用 @param bool bMaster 为主 @param bool bSlave 为备 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int scheduleNode(const SAppInfoKey &stAppKey, bool bMaster, bool bSlave); /** @brief 从表sys_redundancy_cmd中删除指定记录 @param const SAppInfoKey & stAppInfoKey 记录主键 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int deleteRedundancyCmdFromTable(const SAppInfoKey &stAppInfoKey); /** @@ -143,13 +143,13 @@ namespace iot_sys /** @brief 将冗余切换指令写入内存表中，供各个应用程序进行冗余切换 @param const SRedundancyCmd & stRedundancyCmd 要执行的冗余切换指令 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int insertRedundancyCmdToTable(const SRedundancyCmd &stRedundancyCmd); /** @brief 处理切换过程中，又接收到的变化的冗余切换命令 @param const SRedundancyCmd & stRedundancyCmd 要执行的冗余切换命令 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int handleChangedSwtichCmd(const SRedundancyCmd &stRedundancyCmd); /* @brief 执行切换 */ @@ -157,7 +157,7 @@ namespace iot_sys /** @brief 本节点是裁决节点时，将裁决命令通过消息总线发送出去 @param const SRedundancyCmd & stRedundancyCmd 要发送的冗余切换命令 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int sendScheduleCmd(const SRedundancyCmd &stRedundancyCmd); /* @brief 接收切换，进行相关清理 */ diff --git a/platform/src/sys/sys_node_mng/HeartbeatCheckThread.cpp b/platform/src/sys/sys_node_mng/HeartbeatCheckThread.cpp index 1d2bfba0..79bdb899 100644 --- a/platform/src/sys/sys_node_mng/HeartbeatCheckThread.cpp +++ b/platform/src/sys/sys_node_mng/HeartbeatCheckThread.cpp @@ -35,5 +35,5 @@ void iot_sys::CHeartbeatCheckThread::execute() int iot_sys::CHeartbeatCheckThread::initialize() { m_nRunPeriodMsec = CNodeMngCfgParam::getHeartbeatCheckPeriod(); //< 线程运行周期 - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/sys/sys_node_mng/HeartbeatCheckThread.h b/platform/src/sys/sys_node_mng/HeartbeatCheckThread.h index 7f7680f6..c6060ae5 100644 --- a/platform/src/sys/sys_node_mng/HeartbeatCheckThread.h +++ b/platform/src/sys/sys_node_mng/HeartbeatCheckThread.h @@ -23,7 +23,7 @@ namespace iot_sys /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int initialize(); diff --git a/platform/src/sys/sys_node_mng/LocalAppInfoMng.cpp b/platform/src/sys/sys_node_mng/LocalAppInfoMng.cpp index 3cb4b4e9..9a84cc7e 100644 --- a/platform/src/sys/sys_node_mng/LocalAppInfoMng.cpp +++ b/platform/src/sys/sys_node_mng/LocalAppInfoMng.cpp @@ -47,7 +47,7 @@ void iot_sys::CLocalAppInfoMng::checkLocalHeartbeat() for (AppKeyToHeartbeatMAP::iterator pNode = m_mapLocalAppInfo.begin(); pNode != m_mapLocalAppInfo.end(); ++pNode) { SAppHeartbeatInfo &stLocalNodeInfo = pNode->second; - if (kbdSuccess == updateLocalNodeInfo(stLocalNodeInfo)) + if (iotSuccess == updateLocalNodeInfo(stLocalNodeInfo)) { SAppHeartbeatMsg *pApp = stHeartbeat.add_vecappheartbeat(); pApp->set_nappid(stLocalNodeInfo.stKey.nAppId); @@ -72,16 +72,16 @@ int iot_sys::CLocalAppInfoMng::initialize() //获取本机部署的所有应用，填充到本类成员变量m_mapLocalNodeInfo中管理 vector vecAppDeploy; - if (kbdSuccess != m_ptrSysInfo->getLocalAppDeploy(vecAppDeploy)) + if (iotSuccess != m_ptrSysInfo->getLocalAppDeploy(vecAppDeploy)) { LOGERROR("获取本机的应用部署信息失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) { LOGERROR("获取节点[%s]信息失败", m_stLocalNodeInfo.strName.c_str()); - return kbdFailed; + return iotFailed; } //TODO:暂时BASE应用添加进MAP没有使用，后续可能需要实现：BASE应用出问题后，整个节点就无效了, @@ -116,11 +116,11 @@ int iot_sys::CLocalAppInfoMng::initialize() { LOGERROR("系统组态错误.域[%d],应用[%d],节点[%s]重复", stAppInfoKey.nDomainId, stAppInfoKey.nAppId, stAppInfoKey.strNodeName.c_str()); - return kbdFailed; + return iotFailed; } } - return kbdSuccess; + return iotSuccess; } /* @brief 设置切换失败标识 */ @@ -151,11 +151,11 @@ int iot_sys::CLocalAppInfoMng::setSwitchFailedFlag(const SAppInfoKey &stKey) else { LOGERROR("记录不存在.域[%d],应用[%d],节点[%s]", stKey.nDomainId, stKey.nAppId, stKey.strNodeName.c_str()); - return kbdFailed; + return iotFailed; } } - return kbdSuccess; + return iotSuccess; } /* @brief 更新传入的应用的冗余状态信息 */ @@ -163,12 +163,12 @@ int iot_sys::CLocalAppInfoMng::updateLocalNodeInfo(SAppHeartbeatInfo &stLocalNod { /* @brief 从sys_run_app_info获取应用信息 */ STableRunAppInfo stRunAppInfo; - if (kbdSuccess != getLocalRunAppInfo(stLocalNodeInfo.stKey, stRunAppInfo)) + if (iotSuccess != getLocalRunAppInfo(stLocalNodeInfo.stKey, stRunAppInfo)) { /* @brief 正常不应该进入此路径，暂不处理异常，仅打印日志 */ LOGWARN("获取应用信息失败.域[%d],应用[%d],节点[%s]重复", stLocalNodeInfo.stKey.nDomainId, stLocalNodeInfo.stKey.nAppId, stLocalNodeInfo.stKey.strNodeName.c_str()); - return kbdFailed; + return iotFailed; } //1.检查心跳时间是否超时 @@ -192,7 +192,7 @@ int iot_sys::CLocalAppInfoMng::updateLocalNodeInfo(SAppHeartbeatInfo &stLocalNod int nTimeoutCont = static_cast(lTimeInterval / m_nCheckPeriodMsec); m_ptrNodeInfoMng->heartbeatTimeout(stLocalNodeInfo, nTimeoutCont); - return kbdSuccess; + return iotSuccess; } //2.心跳正常的情况，检查、更新相应的标识 @@ -264,7 +264,7 @@ int iot_sys::CLocalAppInfoMng::updateLocalNodeInfo(SAppHeartbeatInfo &stLocalNod stLocalNodeInfo.bRedundancyStateChanged = false; } - return kbdSuccess; + return iotSuccess; } /* @brief 获取本机各个应用的冗余状态信息 */ diff --git a/platform/src/sys/sys_node_mng/LocalAppInfoMng.h b/platform/src/sys/sys_node_mng/LocalAppInfoMng.h index fbe5f564..7ca406f3 100644 --- a/platform/src/sys/sys_node_mng/LocalAppInfoMng.h +++ b/platform/src/sys/sys_node_mng/LocalAppInfoMng.h @@ -30,13 +30,13 @@ namespace iot_sys void checkLocalHeartbeat(); /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int initialize(); /** @brief 设置切换失败标识 @param const SAppInfoKey & stKey 主键 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int setSwitchFailedFlag(const SAppInfoKey &stKey); @@ -44,20 +44,20 @@ namespace iot_sys /** @brief 更新传入的应用的冗余状态信息 @param SAppRedundancyInfo & stLocalNodeInfo 即是传入也是传出参数，要更新的应用的冗余信息 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int updateLocalNodeInfo(SAppHeartbeatInfo &stLocalNodeInfo); /** @brief 获取本机各个应用的冗余状态信息 @param const SAppInfoKey & stAppInfoKey 应用的主键 @param STableRunAppInfo & stRunAppInfo 返回的应用的冗余状态信息 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int getLocalRunAppInfo(const SAppInfoKey &stAppInfoKey, STableRunAppInfo &stRunAppInfo); /** @brief 发送本节点的应用的冗余状态信息 @param const iot_idl::SNodeHeartbeatMsg & stHeartbeat 本节点的应用的冗余信息 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ void sendLocalNodeInfo(const iot_idl::SNodeHeartbeatMsg &stHeartbeat); diff --git a/platform/src/sys/sys_node_mng/MsgBusMngThread.cpp b/platform/src/sys/sys_node_mng/MsgBusMngThread.cpp index 15338dc0..1506ae4e 100644 --- a/platform/src/sys/sys_node_mng/MsgBusMngThread.cpp +++ b/platform/src/sys/sys_node_mng/MsgBusMngThread.cpp @@ -42,7 +42,7 @@ int iot_sys::CMsgBusMngThread::handleSingleNodeHeartbeatInfo(const CMbMessage &o if (!stHeartbeat.ParseFromArray(objMsg.getDataPtr(), static_cast(objMsg.getDataSize()))) { LOGERROR("反序列化失败.消息通道[%d],类型[%d]", objMsg.getChannelID(), objMsg.getMsgType()); - return kbdFailed; + return iotFailed; } return parseNodeHeartbeatInfo(stHeartbeat); @@ -55,7 +55,7 @@ int iot_sys::CMsgBusMngThread::handleMultiNodeHeartbeatInfo(const CMbMessage &ob if (!stMultiNodeHeartbeat.ParseFromArray(objMsg.getDataPtr(), static_cast(objMsg.getDataSize()))) { LOGERROR("反序列化失败.消息通道[%d],类型[%d]", objMsg.getChannelID(), objMsg.getMsgType()); - return kbdFailed; + return iotFailed; } for (int i = 0; i < stMultiNodeHeartbeat.vecnodeheartbeat_size(); ++i) @@ -63,7 +63,7 @@ int iot_sys::CMsgBusMngThread::handleMultiNodeHeartbeatInfo(const CMbMessage &ob parseNodeHeartbeatInfo(stMultiNodeHeartbeat.vecnodeheartbeat(i)); } - return kbdSuccess; + return iotSuccess; } /* @brief 解析单个节点心跳信息 */ @@ -92,7 +92,7 @@ int iot_sys::CMsgBusMngThread::parseNodeHeartbeatInfo(const SNodeHeartbeatMsg &s m_ptrRemoteAppInfoMng->updateRecvHeartbeatInfo(stAppInfo); } - return kbdSuccess; + return iotSuccess; } /* @brief 处理冗余裁决命令 */ @@ -100,14 +100,14 @@ int iot_sys::CMsgBusMngThread::handleRedundancyCmd(const CMbMessage &objMsg) { if (m_ptrRedundancyArbitrateThread == NULL) { - return kbdSuccess; + return iotSuccess; } SRedundancyCmdMsg stRedundancyCmdMsg; if (!stRedundancyCmdMsg.ParseFromArray(objMsg.getDataPtr(), static_cast(objMsg.getDataSize()))) { LOGERROR("反序列化失败.消息通道[%d],类型[%d]", objMsg.getChannelID(), objMsg.getMsgType()); - return kbdFailed; + return iotFailed; } SRedundancyCmd stSwitchCmd; @@ -169,12 +169,12 @@ void iot_sys::CMsgBusMngThread::execute() int iot_sys::CMsgBusMngThread::initialize() { m_nMsgRecvTimeoutMsec = CNodeMngCfgParam::getMsgRecvTimeoutMsec(); - if (kbdSuccess != subscribeMessage()) + if (iotSuccess != subscribeMessage()) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 订阅相关消息通道 */ @@ -183,12 +183,12 @@ int iot_sys::CMsgBusMngThread::subscribeMessage() if (!m_objCommunicator.addSub(CN_AppId_BASE, CH_NODE_MNG_INTRA_DOMAIN)) { LOGERROR("通道[CH_NODE_MNG_INTRA_DOMAIN]订阅失败."); - return kbdFailed; + return iotFailed; } else { LOGINFO("订阅通道[CH_NODE_MNG_INTRA_DOMAIN]成功"); - return kbdSuccess; + return iotSuccess; } } @@ -198,11 +198,11 @@ int iot_sys::CMsgBusMngThread::unsubscribeMessage() if (!m_objCommunicator.delSub(CN_AppId_BASE, CH_NODE_MNG_INTRA_DOMAIN)) { LOGERROR("取消通道[CH_NODE_MNG_INTRA_DOMAIN]订阅失败."); - return kbdFailed; + return iotFailed; } else { LOGINFO("取消订阅通道[CH_NODE_MNG_INTRA_DOMAIN]成功"); - return kbdSuccess; + return iotSuccess; } } diff --git a/platform/src/sys/sys_node_mng/MsgBusMngThread.h b/platform/src/sys/sys_node_mng/MsgBusMngThread.h index 231b4e01..897fbdab 100644 --- a/platform/src/sys/sys_node_mng/MsgBusMngThread.h +++ b/platform/src/sys/sys_node_mng/MsgBusMngThread.h @@ -30,43 +30,43 @@ namespace iot_sys virtual void execute(); /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int initialize(); private: /** @brief 订阅相关消息通道 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int subscribeMessage(); /** @brief 取消订阅相关消息通道 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int unsubscribeMessage(); /** @brief 处理单个节点心跳信息 @param const iot_net::CMbMessage & objMsg 接收到的消息 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int handleSingleNodeHeartbeatInfo(const iot_net::CMbMessage &objMsg); /** @brief 处理多个节点心跳信息 @param const iot_net::CMbMessage & objMsg 接收到的消息 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int handleMultiNodeHeartbeatInfo(const iot_net::CMbMessage &objMsg); /** @brief 解析单个节点心跳信息 @param const iot_idl::SNodeHeartbeatMsg & stHeartbeat 返回的节点心跳信息 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int parseNodeHeartbeatInfo(const iot_idl::SNodeHeartbeatMsg &stHeartbeat); /** @brief 处理冗余裁决命令 @param const iot_net::CMbMessage & objMsg 裁决消息 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int handleRedundancyCmd(const iot_net::CMbMessage &objMsg); diff --git a/platform/src/sys/sys_node_mng/NodeInfoMng.cpp b/platform/src/sys/sys_node_mng/NodeInfoMng.cpp index 8bf6c66c..78e061d8 100644 --- a/platform/src/sys/sys_node_mng/NodeInfoMng.cpp +++ b/platform/src/sys/sys_node_mng/NodeInfoMng.cpp @@ -28,26 +28,26 @@ iot_sys::CNodeInfoMng::~CNodeInfoMng() int iot_sys::CNodeInfoMng::initialize() { //1.获取本节点信息 - if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) { LOGERROR("获取本机信息失败"); - return kbdFailed; + return iotFailed; } //2. 获取本机的应用部署信息 - if (kbdSuccess != m_ptrSysInfo->getLocalAppDeploy(m_vecLocalAppDeploy)) + if (iotSuccess != m_ptrSysInfo->getLocalAppDeploy(m_vecLocalAppDeploy)) { LOGERROR("获取本机的应用部署信息失败"); - return kbdFailed; + return iotFailed; } //3.初始化要管理的应用列表 - if (kbdSuccess != initializeAppInfoMAP()) + if (iotSuccess != initializeAppInfoMAP()) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 更新应用的冗余信息 */ @@ -81,10 +81,10 @@ int iot_sys::CNodeInfoMng::updateAppRedundancyInfo(const SAppHeartbeatInfo &stLo { LOGERROR("记录不存在.域[%d],应用[%d],节点[%s]", stLocalNodeInfo.stKey.nDomainId, stLocalNodeInfo.stKey.nAppId, stLocalNodeInfo.stKey.strNodeName.c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 设置指定应用心跳超时 */ @@ -133,10 +133,10 @@ int iot_sys::CNodeInfoMng::heartbeatTimeout(const SAppHeartbeatInfo &stLocalNode { LOGERROR("记录不存在.域[%d],应用[%d],节点[%s]", stLocalNodeInfo.stKey.nDomainId, stLocalNodeInfo.stKey.nAppId, stLocalNodeInfo.stKey.strNodeName.c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 更新应用的冗余相关状态 */ @@ -199,10 +199,10 @@ int iot_sys::CNodeInfoMng::increasePersistCount(const SAppInfoKey &stKey) else { LOGERROR("记录不存在.域[%d],应用[%d],节点[%s]", stKey.nDomainId, stKey.nAppId, stKey.strNodeName.c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 获取应用冗余信息 */ @@ -226,9 +226,9 @@ int iot_sys::CNodeInfoMng::getAppInfo(const SAppInfoKey &stKey, SAppRedundancyIn SAppInfoKey stKeyTemp = stKey; stKeyTemp.nAppId = m_vecLocalAppDeploy[i].nAppId; - if (kbdSuccess != getAppInfoByKey(stKeyTemp, stAppInfoTemp)) + if (iotSuccess != getAppInfoByKey(stKeyTemp, stAppInfoTemp)) { - return kbdFailed; + return iotFailed; } if (!stAppInfoTemp.bActive) @@ -277,7 +277,7 @@ int iot_sys::CNodeInfoMng::getAppInfo(const SAppInfoKey &stKey, SAppRedundancyIn return getAppInfoByKey(stKey, stAppInfo); } - return kbdSuccess; + return iotSuccess; } /* @brief 设置冗余失败的切换标识 */ @@ -290,12 +290,12 @@ int iot_sys::CNodeInfoMng::setSwitchFailedFlagByKey(const SAppInfoKey &stKey) SAppRedundancyInfo &stNodeInfo = pIter->second; stNodeInfo.bSwitchNG = true; LOGINFO("设置应用切换失败标识.域[%d],应用[%d],节点[%s]", stKey.nDomainId, stKey.nAppId, stKey.strNodeName.c_str()); - return kbdSuccess; + return iotSuccess; } else { LOGERROR("记录不存在.域[%d],应用[%d],节点[%s]", stKey.nDomainId, stKey.nAppId, stKey.strNodeName.c_str()); - return kbdFailed; + return iotFailed; } } @@ -308,9 +308,9 @@ int iot_sys::CNodeInfoMng::setSwitchFailedFlag(const SAppInfoKey &stKey) { SAppInfoKey stKeyTemp = stKey; stKeyTemp.nAppId = m_vecLocalAppDeploy[i].nAppId; - if (kbdSuccess != setSwitchFailedFlagByKey(stKeyTemp)) + if (iotSuccess != setSwitchFailedFlagByKey(stKeyTemp)) { - return kbdFailed; + return iotFailed; } } } @@ -319,7 +319,7 @@ int iot_sys::CNodeInfoMng::setSwitchFailedFlag(const SAppInfoKey &stKey) return setSwitchFailedFlagByKey(stKey); } - return kbdSuccess; + return iotSuccess; } iot_sys::AppKeyToRedundancyInfoMAP iot_sys::CNodeInfoMng::getAllAppInfo() @@ -331,10 +331,10 @@ int iot_sys::CNodeInfoMng::initializeAppInfoMAP() { /* @brief 获取跟本域有关联的域列表 */ std::vector vecMbRelayInfo; - if (kbdSuccess != m_ptrSysInfo->getMbRelayInfoByDstDomainID(m_stLocalNodeInfo.nDomainId, vecMbRelayInfo)) + if (iotSuccess != m_ptrSysInfo->getMbRelayInfoByDstDomainID(m_stLocalNodeInfo.nDomainId, vecMbRelayInfo)) { LOGERROR("获取域间转发信息失败"); - return kbdFailed; + return iotFailed; } /* @brief 将本域也填充进去 */ @@ -345,19 +345,19 @@ int iot_sys::CNodeInfoMng::initializeAppInfoMAP() for (std::vector::const_iterator pDomain = vecMbRelayInfo.begin(); pDomain != vecMbRelayInfo.end(); ++pDomain) { std::vector vecNodeInfo; - if (kbdSuccess != m_ptrSysInfo->getNodeListByDomainId(pDomain->m_nSrcDomainID, vecNodeInfo)) + if (iotSuccess != m_ptrSysInfo->getNodeListByDomainId(pDomain->m_nSrcDomainID, vecNodeInfo)) { LOGERROR("获取[%d]域节点列表失败", pDomain->m_nSrcDomainID); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != insertAppInfoToMap(vecNodeInfo)) + if (iotSuccess != insertAppInfoToMap(vecNodeInfo)) { - return kbdFailed; + return iotFailed; } } - return kbdSuccess; + return iotSuccess; } int iot_sys::CNodeInfoMng::insertAppInfoToMap(const std::vector &vecNodeInfo) @@ -372,10 +372,10 @@ int iot_sys::CNodeInfoMng::insertAppInfoToMap(const std::vector vecAppDeploy; - if (kbdSuccess != m_ptrSysInfo->getAppDeployByNodeName(stNodeInfo.strName, vecAppDeploy)) + if (iotSuccess != m_ptrSysInfo->getAppDeployByNodeName(stNodeInfo.strName, vecAppDeploy)) { LOGERROR("获取节点[%s]的应用部署信息失败", stNodeInfo.strName.c_str()); - return kbdFailed; + return iotFailed; } //TODO:BASE应用加入之后，后续是否需要使用？？应该BASE应用无效时，本机所有的应用都不可用 @@ -400,22 +400,22 @@ int iot_sys::CNodeInfoMng::insertAppInfoToMap(const std::vectorsecond; - return kbdSuccess; + return iotSuccess; } else { LOGERROR("获取冗余信息失败.域[%d],应用[%d],节点[%s]", stKey.nDomainId, stKey.nAppId, stKey.strNodeName.c_str()); - return kbdFailed; + return iotFailed; } } diff --git a/platform/src/sys/sys_node_mng/NodeInfoMng.h b/platform/src/sys/sys_node_mng/NodeInfoMng.h index 7cd087d5..a35a711c 100644 --- a/platform/src/sys/sys_node_mng/NodeInfoMng.h +++ b/platform/src/sys/sys_node_mng/NodeInfoMng.h @@ -23,20 +23,20 @@ namespace iot_sys virtual ~CNodeInfoMng(); /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int initialize(); /** @brief 更新应用的冗余信息 @param const SAppRedundancyInfo & stLocalNodeInfo 要更新的应用的冗余信息 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int updateAppRedundancyInfo(const SAppHeartbeatInfo &stLocalNodeInfo); /** @brief 设置指定应用心跳超时 @param const SAppRedundancyInfo & stLocalNodeInfo 超时的应用 @param int nTimeoutCount 超时持续次数 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int heartbeatTimeout(const SAppHeartbeatInfo &stLocalNodeInfo, int nTimeoutCount); /** @@ -56,20 +56,20 @@ namespace iot_sys /** @brief 增加冗余状态持续次数 @param const SAppInfoKey & stKey 要增加次数的应用主键 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int increasePersistCount(const SAppInfoKey &stKey); /** @brief 获取应用冗余信息 @param const SAppInfoKey & stKey 要获取的应用的主键 @param SAppRedundancyInfo & stAppInfo 返回的应用的冗余信息 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int getAppInfo(const SAppInfoKey &stKey, SAppRedundancyInfo &stAppInfo); /** @brief 设置冗余切换失败标识 @param const SAppInfoKey & stKey 应用的主键 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int setSwitchFailedFlag(const SAppInfoKey &stKey); @@ -83,33 +83,33 @@ namespace iot_sys /** @brief insert节点列表中的应用信息到MAP中 @param const std::vector & vecNodeInfo 节点列表 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int insertAppInfoToMap(const std::vector &vecNodeInfo); /** @brief 添加记录到sys_redundancy_info表中 @param const SAppRedundancyInfo & stAppInfo 要添加的记录 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int insertToRedundancyInfoTable(const SAppRedundancyInfo &stAppInfo); /** @brief 更新表sys_redundancy_info中记录 @param const SAppRedundancyInfo & stAppInfo 要更新的记录 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int updateRedundantInfoTable(const SAppRedundancyInfo &stAppInfo); /** @brief 获取应用的状态信息 @param const SAppInfoKey & stKey 应用主键 @param SAppRedundancyInfo & stAppInfo 返回的应用的状态信息 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int getAppInfoByKey(const SAppInfoKey &stKey, SAppRedundancyInfo &stAppInfo); /** @brief 设置冗余失败的切换标识 @param const SAppInfoKey & stKey 要设置的应用的主键 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int setSwitchFailedFlagByKey(const SAppInfoKey &stKey); diff --git a/platform/src/sys/sys_node_mng/NodeMngApp.cpp b/platform/src/sys/sys_node_mng/NodeMngApp.cpp index 63de4070..d2de6723 100644 --- a/platform/src/sys/sys_node_mng/NodeMngApp.cpp +++ b/platform/src/sys/sys_node_mng/NodeMngApp.cpp @@ -75,7 +75,7 @@ bool iot_sys::CNodeMngApp::start(int argc, char *argv[], int &/*nStatus*/) } //7.向进程管理报告启动成功 - if (kbdSuccess != m_ptrProcMng->updateProcessInfo(true, true, false)) + if (iotSuccess != m_ptrProcMng->updateProcessInfo(true, true, false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -110,7 +110,7 @@ int iot_sys::CNodeMngApp::toQuit() } shutdown(); - return kbdSuccess; + return iotSuccess; } bool iot_sys::CNodeMngApp::parseCmdLine(int /*argc*/, char *[]) @@ -138,7 +138,7 @@ bool iot_sys::CNodeMngApp::getSystemInfo() return false; } - if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) { LOGERROR("获取本节点信息失败"); return false; @@ -164,7 +164,7 @@ bool iot_sys::CNodeMngApp::registToProcMng() } /* @brief 设置回调，用于接收进程退出通知 */ - if (kbdSuccess != m_ptrProcMng->setCallback(this)) + if (iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -188,7 +188,7 @@ bool iot_sys::CNodeMngApp::unregistProcMng() bool iot_sys::CNodeMngApp::initialize() { //1.加载节点管理相关配置 - if (kbdSuccess != CNodeMngCfgParam::load()) + if (iotSuccess != CNodeMngCfgParam::load()) { LOGERROR("加载节点管理相关配置失败"); return false; @@ -202,7 +202,7 @@ bool iot_sys::CNodeMngApp::initialize() return false; } - if (kbdSuccess != m_ptrRtdbOperate->initialize()) + if (iotSuccess != m_ptrRtdbOperate->initialize()) { LOGERROR("初始化内存表操作类失败"); return false; @@ -212,7 +212,7 @@ bool iot_sys::CNodeMngApp::initialize() if (!initMsgBus(CN_ProcName_NodeMng.c_str(), "")) { LOGERROR("初始化消息总线失败"); - return kbdFailed; + return iotFailed; } //4.节点信息管理类 @@ -223,7 +223,7 @@ bool iot_sys::CNodeMngApp::initialize() return false; } - if (kbdSuccess != m_ptrNodeInfoMng->initialize()) + if (iotSuccess != m_ptrNodeInfoMng->initialize()) { LOGERROR("初始化节点信息管理失败"); return false; @@ -240,7 +240,7 @@ bool iot_sys::CNodeMngApp::initialize() return false; } - if (kbdSuccess != m_ptrLocalAppInfoMng->initialize()) + if (iotSuccess != m_ptrLocalAppInfoMng->initialize()) { LOGERROR("初始化本机节点信息管理类失败"); return false; @@ -255,7 +255,7 @@ bool iot_sys::CNodeMngApp::initialize() return false; } - if (kbdSuccess != m_ptrRemoteAppInfoMng->initialize()) + if (iotSuccess != m_ptrRemoteAppInfoMng->initialize()) { LOGERROR("初始化远程节点信息管理类失败"); return false; @@ -269,7 +269,7 @@ bool iot_sys::CNodeMngApp::initialize() return false; } - if (kbdSuccess != m_ptrHeartbeatThread->initialize()) + if (iotSuccess != m_ptrHeartbeatThread->initialize()) { LOGERROR("创建心跳检测线程失败"); return false; @@ -290,7 +290,7 @@ bool iot_sys::CNodeMngApp::initialize() return false; } - if (kbdSuccess != m_ptrRedundancyArbitrateThread->initialize()) + if (iotSuccess != m_ptrRedundancyArbitrateThread->initialize()) { LOGERROR("初始化冗余仲裁线程失败"); return false; @@ -306,7 +306,7 @@ bool iot_sys::CNodeMngApp::initialize() return false; } - if (kbdSuccess != m_ptrMsgBusMngThread->initialize()) + if (iotSuccess != m_ptrMsgBusMngThread->initialize()) { LOGERROR("初始化消息管理类失败"); return false; diff --git a/platform/src/sys/sys_node_mng/NodeMngCfgParam.cpp b/platform/src/sys/sys_node_mng/NodeMngCfgParam.cpp index 91ff7f75..3b9aeea0 100644 --- a/platform/src/sys/sys_node_mng/NodeMngCfgParam.cpp +++ b/platform/src/sys/sys_node_mng/NodeMngCfgParam.cpp @@ -44,29 +44,29 @@ iot_sys::CNodeMngCfgParam::~CNodeMngCfgParam() int iot_sys::CNodeMngCfgParam::load() { CCommonConfigParse objCfgParse; - if (kbdSuccess != objCfgParse.load(CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) + if (iotSuccess != objCfgParse.load(CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) { LOGERROR("加载配置文件proc_param_cfg.xml失败"); - return kbdFailed; + return iotFailed; } - if ((kbdSuccess == objCfgParse.getIntValue(CN_ProcName_NodeMng, LOCAL_HEARTBEAT_TIMEOUT, m_nLocalHeartbeatTimeoutMsec)) && - (kbdSuccess == objCfgParse.getIntValue(CN_ProcName_NodeMng, RECV_HEARTBEAT_TIMEOUT, m_nRemoteHeartbeatTimeoutMsec)) && - (kbdSuccess == objCfgParse.getIntValue(CN_ProcName_NodeMng, HEARTBEAT_CHECK_PERIOD, m_nHeartbeatCheckPeriod)) && - (kbdSuccess == objCfgParse.getIntValue(CN_ProcName_NodeMng, REDUNDANCY_CHECK_PERIOD, m_nRedundancyCheckPeriod)) && - (kbdSuccess == objCfgParse.getIntValue(CN_ProcName_NodeMng, SWITCH_TIMEOUT, m_nSwitchTimeoutMsec)) && - (kbdSuccess == objCfgParse.getBoolValue(CN_ProcName_NodeMng, APP_REDUNDANCY, m_bIsAppRedundancy)) && - (kbdSuccess == objCfgParse.getIntValue(CN_ProcName_NodeMng, REDUNDANCY_STABLE_THRESHOLD, m_nRedundancyStableThreshold)) && - (kbdSuccess == objCfgParse.getIntValue(CN_ProcName_NodeMng, NETWORK_STABLE_THRESHOLD, m_nNetworkStableThreshold)) && - (kbdSuccess == objCfgParse.getIntValue(CN_ProcName_NodeMng, MSG_RECV_TIMEOUT, m_nMsgRecvTimeoutMsec))) + if ((iotSuccess == objCfgParse.getIntValue(CN_ProcName_NodeMng, LOCAL_HEARTBEAT_TIMEOUT, m_nLocalHeartbeatTimeoutMsec)) && + (iotSuccess == objCfgParse.getIntValue(CN_ProcName_NodeMng, RECV_HEARTBEAT_TIMEOUT, m_nRemoteHeartbeatTimeoutMsec)) && + (iotSuccess == objCfgParse.getIntValue(CN_ProcName_NodeMng, HEARTBEAT_CHECK_PERIOD, m_nHeartbeatCheckPeriod)) && + (iotSuccess == objCfgParse.getIntValue(CN_ProcName_NodeMng, REDUNDANCY_CHECK_PERIOD, m_nRedundancyCheckPeriod)) && + (iotSuccess == objCfgParse.getIntValue(CN_ProcName_NodeMng, SWITCH_TIMEOUT, m_nSwitchTimeoutMsec)) && + (iotSuccess == objCfgParse.getBoolValue(CN_ProcName_NodeMng, APP_REDUNDANCY, m_bIsAppRedundancy)) && + (iotSuccess == objCfgParse.getIntValue(CN_ProcName_NodeMng, REDUNDANCY_STABLE_THRESHOLD, m_nRedundancyStableThreshold)) && + (iotSuccess == objCfgParse.getIntValue(CN_ProcName_NodeMng, NETWORK_STABLE_THRESHOLD, m_nNetworkStableThreshold)) && + (iotSuccess == objCfgParse.getIntValue(CN_ProcName_NodeMng, MSG_RECV_TIMEOUT, m_nMsgRecvTimeoutMsec))) { LOGINFO("解析配置参数成功"); - return kbdSuccess; + return iotSuccess; } else { LOGINFO("解析配置参数失败，请检查配置文件proc_param_cfg.xml"); - return kbdFailed; + return iotFailed; } } diff --git a/platform/src/sys/sys_node_mng/NodeMngCfgParam.h b/platform/src/sys/sys_node_mng/NodeMngCfgParam.h index 9c6cd75b..6a6d94f1 100644 --- a/platform/src/sys/sys_node_mng/NodeMngCfgParam.h +++ b/platform/src/sys/sys_node_mng/NodeMngCfgParam.h @@ -16,7 +16,7 @@ namespace iot_sys /** @brief 加载相关参数 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ static int load(); /* @brief 本机节点信息心跳超时时间 */ diff --git a/platform/src/sys/sys_node_mng/RedundancyArbitrateThread.cpp b/platform/src/sys/sys_node_mng/RedundancyArbitrateThread.cpp index d42ecbda..fadffa00 100644 --- a/platform/src/sys/sys_node_mng/RedundancyArbitrateThread.cpp +++ b/platform/src/sys/sys_node_mng/RedundancyArbitrateThread.cpp @@ -70,30 +70,30 @@ int iot_sys::CRedundancyArbitrateThread::addRedundancyCmd(const SRedundancyCmd& } notify(); //< 唤醒线程及时处理 - return kbdSuccess; + return iotSuccess; } /* @brief 初始化整机冗余 */ int iot_sys::CRedundancyArbitrateThread::initNodeRedundancy() { SNodeInfo stLocalNodeInfo; - if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) { LOGERROR("获取本节点信息失败"); - return kbdFailed; + return iotFailed; } vector vecAppDeploy; - if (kbdSuccess != m_ptrSysInfo->getLocalAppDeploy(vecAppDeploy)) + if (iotSuccess != m_ptrSysInfo->getLocalAppDeploy(vecAppDeploy)) { LOGERROR("获取本机的应用部署信息失败.节点[%s]", stLocalNodeInfo.strName.c_str()); - return kbdFailed; + return iotFailed; } if (vecAppDeploy.empty()) { LOGINFO("本节点未部署应用.域[%d],节点[%s]", stLocalNodeInfo.nDomainId, stLocalNodeInfo.strName.c_str()); - return kbdSuccess; + return iotSuccess; } /* @brief 整机切换时，应用的部署必须是一致的，不允许交叉，所以只取第一个应用的配置就可以 */ @@ -109,35 +109,35 @@ int iot_sys::CRedundancyArbitrateThread::initNodeRedundancy() if (ptrAppArbitrate == NULL) { LOGERROR("创建CAppLevelArbitrate失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != ptrAppArbitrate->initialize()) + if (iotSuccess != ptrAppArbitrate->initialize()) { LOGERROR("初始化CAppLevelArbitrate失败.域[%d],应用[%d]", stAppDeploy.nDomainId, CN_AppId_All); - return kbdFailed; + return iotFailed; } m_mapAppLevelArbitrate[stKey] = ptrAppArbitrate; - return kbdSuccess; + return iotSuccess; } /* @brief 初始化应用级冗余 */ int iot_sys::CRedundancyArbitrateThread::initAppRedundancy() { SNodeInfo stLocalNodeInfo; - if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) { LOGERROR("获取本节点信息失败"); - return kbdFailed; + return iotFailed; } vector vecAppDeploy; - if (kbdSuccess != m_ptrSysInfo->getLocalAppDeploy(vecAppDeploy)) + if (iotSuccess != m_ptrSysInfo->getLocalAppDeploy(vecAppDeploy)) { LOGERROR("获取本机的应用部署信息失败.节点[%s]", stLocalNodeInfo.strName.c_str()); - return kbdFailed; + return iotFailed; } for (vector::const_iterator pApp = vecAppDeploy.begin(); pApp != vecAppDeploy.end(); ++pApp) @@ -154,19 +154,19 @@ int iot_sys::CRedundancyArbitrateThread::initAppRedundancy() if (ptrAppArbitrate == NULL) { LOGERROR("创建CAppLevelArbitrate失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != ptrAppArbitrate->initialize()) + if (iotSuccess != ptrAppArbitrate->initialize()) { LOGERROR("初始化CAppLevelArbitrate失败.域[%d],应用[%d]", stAppDeploy.nDomainId, stAppDeploy.nAppId); - return kbdFailed; + return iotFailed; } m_mapAppLevelArbitrate[stKey] = ptrAppArbitrate; } - return kbdSuccess; + return iotSuccess; } /* @brief 处理接收到的冗余切换指令 */ @@ -193,7 +193,7 @@ int iot_sys::CRedundancyArbitrateThread::handleRecvRedundancyCmd() } } - return kbdSuccess; + return iotSuccess; } /* @brief 驱动裁决 */ @@ -205,5 +205,5 @@ int iot_sys::CRedundancyArbitrateThread::appArbitrate() ptrAppArbitrate->arbitrate(); } - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/sys/sys_node_mng/RedundancyArbitrateThread.h b/platform/src/sys/sys_node_mng/RedundancyArbitrateThread.h index a4219965..8c34059a 100644 --- a/platform/src/sys/sys_node_mng/RedundancyArbitrateThread.h +++ b/platform/src/sys/sys_node_mng/RedundancyArbitrateThread.h @@ -26,7 +26,7 @@ namespace iot_sys virtual void execute(); /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int initialize(); /** @@ -37,22 +37,22 @@ namespace iot_sys private: /** @brief 初始化整机冗余 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int initNodeRedundancy(); /** @brief 初始化应用级冗余 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int initAppRedundancy(); /** @brief 处理接收到的冗余切换指令 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int handleRecvRedundancyCmd(); /** @brief 驱动裁决 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int appArbitrate(); diff --git a/platform/src/sys/sys_node_mng/RemoteAppInfoMng.cpp b/platform/src/sys/sys_node_mng/RemoteAppInfoMng.cpp index 6a7133f9..a3141a80 100644 --- a/platform/src/sys/sys_node_mng/RemoteAppInfoMng.cpp +++ b/platform/src/sys/sys_node_mng/RemoteAppInfoMng.cpp @@ -33,10 +33,10 @@ iot_sys::CRemoteAppInfoMng::~CRemoteAppInfoMng() int iot_sys::CRemoteAppInfoMng::initialize() { //1.获取本节点信息 - if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) { LOGERROR("获取本机信息失败"); - return kbdFailed; + return iotFailed; } //2.获取相关的参数配置信息 @@ -50,23 +50,23 @@ int iot_sys::CRemoteAppInfoMng::initialize() if (m_ptrNetworkCheck == NULL) { LOGERROR("创建网络检测类失败"); - return kbdFailed; + return iotFailed; } //4.初始化要管理的应用列表 - if (kbdSuccess != initializeAppInfoMAP()) + if (iotSuccess != initializeAppInfoMAP()) { - return kbdFailed; + return iotFailed; } //5.获取本机的应用部署信息 - if (kbdSuccess != m_ptrSysInfo->getLocalAppDeploy(m_vecLocalAppDeploy)) + if (iotSuccess != m_ptrSysInfo->getLocalAppDeploy(m_vecLocalAppDeploy)) { LOGERROR("获取本机的应用部署信息失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 初始化要管理的应用列表 */ @@ -84,10 +84,10 @@ int iot_sys::CRemoteAppInfoMng::initializeAppInfoMAP() } SNodeInfo stNode; - if (kbdSuccess != m_ptrSysInfo->getNodeInfoByName(stAppInfoKey.strNodeName, stNode)) + if (iotSuccess != m_ptrSysInfo->getNodeInfoByName(stAppInfoKey.strNodeName, stNode)) { LOGERROR("获取节点[%s]信息失败", stAppInfoKey.strNodeName.c_str()); - return kbdFailed; + return iotFailed; } SAppHeartbeatInfo stRecvAppInfo; @@ -102,7 +102,7 @@ int iot_sys::CRemoteAppInfoMng::initializeAppInfoMAP() } - return kbdSuccess; + return iotSuccess; } /* @brief 检查接收到的应用的冗余状态信息，判断是否有超时的 */ @@ -177,7 +177,7 @@ int iot_sys::CRemoteAppInfoMng::checkRemoteBuffer() m_bLastNetworkIsActive = bNetworkIsActive; - return kbdSuccess; + return iotSuccess; } /* @brief 设置冗余切换失败标识 */ @@ -189,9 +189,9 @@ int iot_sys::CRemoteAppInfoMng::setSwitchFailedFlag(const SAppInfoKey &stKey) { SAppInfoKey stKeyTemp = stKey; stKeyTemp.nAppId = m_vecLocalAppDeploy[i].nAppId; - if (kbdSuccess != setSwitchFailedFlagByKey(stKeyTemp)) + if (iotSuccess != setSwitchFailedFlagByKey(stKeyTemp)) { - return kbdFailed; + return iotFailed; } } } @@ -200,7 +200,7 @@ int iot_sys::CRemoteAppInfoMng::setSwitchFailedFlag(const SAppInfoKey &stKey) return setSwitchFailedFlagByKey(stKey); } - return kbdSuccess; + return iotSuccess; } //TODO:可以考虑直接更新nodemngbuf，而不是通过本类的线程扫描然后更新 @@ -280,10 +280,10 @@ int iot_sys::CRemoteAppInfoMng::updateRecvHeartbeatInfo(const SAppHeartbeatInfo { LOGERROR("记录不存在.域[%d],应用[%d],节点[%s]", stHeartbeat.stKey.nDomainId, stHeartbeat.stKey.nAppId, stHeartbeat.stKey.strNodeName.c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 设置指定应用的冗余切换失败标识 */ @@ -296,11 +296,11 @@ int iot_sys::CRemoteAppInfoMng::setSwitchFailedFlagByKey(const SAppInfoKey &stKe SAppHeartbeatInfo &stAppInfo = pIter->second; stAppInfo.bSwitchNG = true; LOGINFO("设置应用切换失败标识.域[%d],应用[%d],节点[%s]", stKey.nDomainId, stKey.nAppId, stKey.strNodeName.c_str()); - return kbdSuccess; + return iotSuccess; } else { LOGERROR("记录不存在.域[%d],应用[%d],节点[%s]", stKey.nDomainId, stKey.nAppId, stKey.strNodeName.c_str()); - return kbdFailed; + return iotFailed; } } diff --git a/platform/src/sys/sys_node_mng/RemoteAppInfoMng.h b/platform/src/sys/sys_node_mng/RemoteAppInfoMng.h index 4a8f9ec6..8805d649 100644 --- a/platform/src/sys/sys_node_mng/RemoteAppInfoMng.h +++ b/platform/src/sys/sys_node_mng/RemoteAppInfoMng.h @@ -28,7 +28,7 @@ namespace iot_sys /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int initialize(); @@ -37,7 +37,7 @@ namespace iot_sys /** @brief 设置冗余切换失败标识 @param const SAppInfoKey & stKey 应用主键 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int setSwitchFailedFlag(const SAppInfoKey &stKey); /** @@ -54,7 +54,7 @@ namespace iot_sys /** @brief 设置指定应用的冗余切换失败标识 @param const SAppInfoKey & stKey 应用主键 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int setSwitchFailedFlagByKey(const SAppInfoKey &stKey); diff --git a/platform/src/sys/sys_node_mng/RtdbOperate.cpp b/platform/src/sys/sys_node_mng/RtdbOperate.cpp index de0cd11b..99e2daa2 100644 --- a/platform/src/sys/sys_node_mng/RtdbOperate.cpp +++ b/platform/src/sys/sys_node_mng/RtdbOperate.cpp @@ -31,7 +31,7 @@ int iot_sys::CRdbOperate::initialize() { LOGERROR("打开应用[%s]的[%s]表失败.原因[%s]", CN_AppName_BASE.c_str(), CN_TN_SysRunRedundancyCmd.c_str(), m_objRunRedundancyCmdTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } /* @brief 打开表sys_run_redundancy_info */ @@ -43,7 +43,7 @@ int iot_sys::CRdbOperate::initialize() { LOGERROR("打开应用[%s]的[%s]表失败.原因[%s]", CN_AppName_BASE.c_str(), CN_TN_SysRunRedundancyInfo.c_str(), m_objRunRedundancyInfoTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } /* @brief 打开表sys_run_app_info */ @@ -55,10 +55,10 @@ int iot_sys::CRdbOperate::initialize() { LOGERROR("打开应用[%s]的[%s]表失败.原因[%s]", CN_AppName_BASE.c_str(), CN_TN_SysRunAppInfo.c_str(), m_objRunAppInfoTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 删除表sys_run_redundancy_cmd记录 */ @@ -71,13 +71,13 @@ int iot_sys::CRdbOperate::deleteFromRedundancyCmd(const SRunRedundancyCmdKey &st { LOGINFO("从表[%s]中删除记录成功.域[%d],应用[%d],节点[%s]", CN_TN_SysRunRedundancyCmd.c_str(), stKey.nDomainId, stKey.nAppId, stKey.szNodeName); - return kbdSuccess; + return iotSuccess; } else { LOGERROR("从表[%s]中删除记录失败.域[%d],应用[%d],节点[%s]", CN_TN_SysRunRedundancyCmd.c_str(), stKey.nDomainId, stKey.nAppId, stKey.szNodeName); - return kbdFailed; + return iotFailed; } } @@ -98,14 +98,14 @@ int iot_sys::CRdbOperate::insertToRedundancyCmd(const SRunRedundancyCmd &stRecor LOGERROR("删除记录失败.表[%s],域[%d],应用[%d],节点[%s],is_active=[%d],is_master=[%d],is_slave=[%d]", CN_TN_SysRunRedundancyCmd.c_str(), stRecord.stKey.nDomainId, stRecord.stKey.nAppId, stRecord.stKey.szNodeName, stRecord.nIsActive, stRecord.nIsMaster, stRecord.nIsSlave); - return kbdFailed; + return iotFailed; } } else { LOGERROR("记录已存在.表[%s],域[%d],应用[%d],节点[%s]", CN_TN_SysRunRedundancyCmd.c_str(), stRecord.stKey.nDomainId, stRecord.stKey.nAppId, stRecord.stKey.szNodeName); - return kbdFailed; + return iotFailed; } } @@ -114,14 +114,14 @@ int iot_sys::CRdbOperate::insertToRedundancyCmd(const SRunRedundancyCmd &stRecor { LOGERROR("添加记录失败.表[%s],域[%d],应用[%d],节点[%s]", CN_TN_SysRunRedundancyCmd.c_str(), stRecord.stKey.nDomainId, stRecord.stKey.nAppId, stRecord.stKey.szNodeName); - return kbdFailed; + return iotFailed; } else { LOGINFO("添加记录成功.表[%s],域[%d],应用[%d],节点[%s],is_active=[%d],is_master=[%d],is_slave=[%d]", CN_TN_SysRunRedundancyCmd.c_str(), stRecord.stKey.nDomainId, stRecord.stKey.nAppId, stRecord.stKey.szNodeName, stRecord.nIsActive, stRecord.nIsMaster, stRecord.nIsSlave); - return kbdSuccess; + return iotSuccess; } } @@ -141,14 +141,14 @@ int iot_sys::CRdbOperate::insertToRedundancyInfo(const SRunRedundancyInfo &stRec { LOGERROR("删除记录失败.表[%s],域[%d],应用[%d],节点[%s]", CN_TN_SysRunRedundancyInfo.c_str(), stRecord.stKey.nDomainId, stRecord.stKey.nAppId, stRecord.stKey.szNodeName); - return kbdFailed; + return iotFailed; } } else { LOGERROR("记录已存在.表[%s],域[%d],应用[%d],节点[%s]", CN_TN_SysRunRedundancyInfo.c_str(), stRecord.stKey.nDomainId, stRecord.stKey.nAppId, stRecord.stKey.szNodeName); - return kbdFailed; + return iotFailed; } } @@ -156,11 +156,11 @@ int iot_sys::CRdbOperate::insertToRedundancyInfo(const SRunRedundancyInfo &stRec { LOGERROR("添加记录失败.表[%s],域[%d],应用[%d],节点[%s]", CN_TN_SysRunRedundancyInfo.c_str(), stRecord.stKey.nDomainId, stRecord.stKey.nAppId, stRecord.stKey.szNodeName); - return kbdFailed; + return iotFailed; } else { - return kbdSuccess; + return iotSuccess; } } @@ -173,10 +173,10 @@ int iot_sys::CRdbOperate::updateRedundancyInfo(const SRunRedundancyInfoKey &stKe if (!m_objRunRedundancyInfoTable.updateRecordByKey(&stKey, vecCol)) { LOGERROR("更新记录失败.域[%d],应用[%d],节点[%s]", stKey.nDomainId, stKey.nAppId, stKey.szNodeName); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 获取表sys_run_app_info指定记录信息 */ @@ -189,10 +189,10 @@ int iot_sys::CRdbOperate::getLocalRunAppInfo(const STableRunAppInfoKey &stAppInf { LOGERROR("获取[%s]中记录失败.域[%d],应用[%d],节点[%s]", CN_TN_SysRunAppInfo.c_str(), stAppInfoKey.nDomainId, stAppInfoKey.nAppId, stAppInfoKey.szNodeName); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 清理表中所有数据并关闭 */ diff --git a/platform/src/sys/sys_node_mng/RtdbOperate.h b/platform/src/sys/sys_node_mng/RtdbOperate.h index f34664f5..868cae91 100644 --- a/platform/src/sys/sys_node_mng/RtdbOperate.h +++ b/platform/src/sys/sys_node_mng/RtdbOperate.h @@ -20,41 +20,41 @@ namespace iot_sys /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int initialize(); /** @brief 删除表sys_run_redundancy_cmd记录 @param const SRunRedundantCmdKey & stKey 主键 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int deleteFromRedundancyCmd(const SRunRedundancyCmdKey &stKey); /** @brief 表sys_run_redundancy_cmd中增加记录 @param const SRunRedundancyCmd & stRecord 要增加的记录 @param const bool bDelBeforeInsert insert前是否先delete - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int insertToRedundancyCmd(const SRunRedundancyCmd &stRecord, const bool bDelBeforeInsert); /** @brief 表sys_run_redundancy_info中增加记录 @param const SRunRedundancyInfo & stRecord 要增加的记录 @param const bool bDelBeforeInsert insert前是否先delete - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int insertToRedundancyInfo(const SRunRedundancyInfo &stRecord, const bool bDelBeforeInsert); /** @brief 更新表sys_run_redundancy_info记录 @param const SRunRedundancyInfoKey & stKey 主键 @param std::vector vecCol 要更新的字段 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int updateRedundancyInfo(const SRunRedundancyInfoKey &stKey, std::vector vecCol); /** @brief 获取表sys_run_app_info指定记录信息 @param const STableRunAppInfoKey & stAppInfoKey 主键 @param STableRunAppInfo & stRunAppInfo 返回的记录 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int getLocalRunAppInfo(const STableRunAppInfoKey &stAppInfoKey, STableRunAppInfo &stRunAppInfo); diff --git a/platform/src/sys/sys_node_mng_api/NodeMngInterface.cpp b/platform/src/sys/sys_node_mng_api/NodeMngInterface.cpp index d1a24802..1209b499 100644 --- a/platform/src/sys/sys_node_mng_api/NodeMngInterface.cpp +++ b/platform/src/sys/sys_node_mng_api/NodeMngInterface.cpp @@ -17,7 +17,7 @@ SYS_NODE_MNG_API CRedundantMngInterfacePtr iot_sys::getRedundantMngInstance(int CRedundantMngImplPtr ptrRedundantMng = boost::make_shared(nDomainId, nAppId, strNodeName); if (ptrRedundantMng != NULL) { - if (kbdSuccess != ptrRedundantMng->initialize()) + if (iotSuccess != ptrRedundantMng->initialize()) { LOGERROR("初始化CRedundantMngImpl失败"); ptrRedundantMng.reset(); @@ -32,7 +32,7 @@ SYS_NODE_MNG_API CRedundantInfoInterfacePtr iot_sys::getRedundantInfoInstance() CRedundantInfoImplPtr ptrRedundantInfo = boost::make_shared(); if (ptrRedundantInfo != NULL) { - if (kbdSuccess != ptrRedundantInfo->initialize()) + if (iotSuccess != ptrRedundantInfo->initialize()) { LOGERROR("初始化CRedundantInfoImpl失败"); ptrRedundantInfo.reset(); diff --git a/platform/src/sys/sys_node_mng_api/RedundantInfoImpl.cpp b/platform/src/sys/sys_node_mng_api/RedundantInfoImpl.cpp index 3b8742e4..130996a7 100644 --- a/platform/src/sys/sys_node_mng_api/RedundantInfoImpl.cpp +++ b/platform/src/sys/sys_node_mng_api/RedundantInfoImpl.cpp @@ -41,13 +41,13 @@ int iot_sys::CRedundantInfoImpl::getMasterNodeInfo(int nDomainId, int nAppId, SN { LOGERROR("获取表[%s]信息失败.error=[%s]", CN_TN_SysRunRedundancyInfo.c_str(), m_objRunRedundantInfo.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } if (stTableInfo.recordlen != sizeof(SRunRedundancyInfo)) { LOGERROR("表[%s]结构不一致", CN_TN_SysRunRedundancyInfo.c_str()); - return kbdFailed; + return iotFailed; } for (int i = 0; i < stTableInfo.rcdcount; ++i) @@ -57,7 +57,7 @@ int iot_sys::CRedundantInfoImpl::getMasterNodeInfo(int nDomainId, int nAppId, SN { LOGERROR("获取表[%s]记录失败.error=[%s]", CN_TN_SysRunRedundancyInfo.c_str(), m_objRunRedundantInfo.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } if ((nDomainId == stInfo.stKey.nDomainId) && @@ -75,11 +75,11 @@ int iot_sys::CRedundantInfoImpl::getMasterNodeInfo(int nDomainId, int nAppId, SN stMasterNodeInfo.bIP1Active = stInfo.nIP1Active != 0; stMasterNodeInfo.strIP2 = stInfo.szIP2; stMasterNodeInfo.bIP2Active = stInfo.nIP2Active != 0; - return kbdSuccess; + return iotSuccess; } } - return kbdFailed; //< 未找到，返回失败 + return iotFailed; //< 未找到，返回失败 } /* @brief 指定域、应用、节点的是否为主 */ @@ -126,12 +126,12 @@ int iot_sys::CRedundantInfoImpl::initialize() if (m_objRunRedundantInfo.open(CN_AppName_BASE.c_str(), CN_TN_SysRunRedundancyInfo.c_str())) { LOGINFO("打开应用[%s]的[%s]表成功", CN_AppName_BASE.c_str(), CN_TN_SysRunRedundancyInfo.c_str()); - return kbdSuccess; + return iotSuccess; } else { LOGERROR("打开应用[%s]的[%s]表失败.原因[%s]", CN_AppName_BASE.c_str(), CN_TN_SysRunRedundancyInfo.c_str(), m_objRunRedundantInfo.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } } diff --git a/platform/src/sys/sys_node_mng_api/RedundantInfoImpl.h b/platform/src/sys/sys_node_mng_api/RedundantInfoImpl.h index e30116e9..06ca1747 100644 --- a/platform/src/sys/sys_node_mng_api/RedundantInfoImpl.h +++ b/platform/src/sys/sys_node_mng_api/RedundantInfoImpl.h @@ -45,7 +45,7 @@ namespace iot_sys virtual bool isSlave(int nDomainId, int nAppId, const std::string &strNodeName); /** @brief 初始化，主要用来打开内存库 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int initialize(); diff --git a/platform/src/sys/sys_node_mng_api/RedundantMngImpl.cpp b/platform/src/sys/sys_node_mng_api/RedundantMngImpl.cpp index bc1726f3..a429b638 100644 --- a/platform/src/sys/sys_node_mng_api/RedundantMngImpl.cpp +++ b/platform/src/sys/sys_node_mng_api/RedundantMngImpl.cpp @@ -32,11 +32,11 @@ int iot_sys::CRedundantMngImpl::setCallback(const CRedundantSwitchInterfacePtr & if (m_ptrRedundantMngThread == NULL) { LOGERROR("未初始化成功，无法执行setCallback"); - return kbdFailed; + return iotFailed; } int nRet = m_ptrRedundantMngThread->setCallback(ptrSwitch); - if (kbdSuccess == nRet) + if (iotSuccess == nRet) { m_ptrRedundantMngThread->resume(); //< 设置了回调之后，唤醒线程 } @@ -57,15 +57,15 @@ int iot_sys::CRedundantMngImpl::initialize() if (m_ptrRedundantMngThread == NULL) { LOGERROR("创建节点管理线程失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrRedundantMngThread->initialize()) + if (iotSuccess != m_ptrRedundantMngThread->initialize()) { LOGERROR("节点管理线程初始化失败"); - return kbdFailed; + return iotFailed; } LOGINFO("创建节点管理线程成功"); - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/sys/sys_node_mng_api/RedundantMngImpl.h b/platform/src/sys/sys_node_mng_api/RedundantMngImpl.h index 6bf45876..92d83229 100644 --- a/platform/src/sys/sys_node_mng_api/RedundantMngImpl.h +++ b/platform/src/sys/sys_node_mng_api/RedundantMngImpl.h @@ -18,7 +18,7 @@ namespace iot_sys @param int nDomainId 域ID @param int nAppId 应用ID @param const std::string & strNodeName 节点名 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ CRedundantMngImpl(int nDomainId, int nAppId, const std::string &strNodeName); @@ -37,7 +37,7 @@ namespace iot_sys virtual void unsetCallback(); /** @brief 初始化本类所需资源 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int initialize(); diff --git a/platform/src/sys/sys_node_mng_api/RedundantMngThread.cpp b/platform/src/sys/sys_node_mng_api/RedundantMngThread.cpp index 8dd00aa5..e6525a4a 100644 --- a/platform/src/sys/sys_node_mng_api/RedundantMngThread.cpp +++ b/platform/src/sys/sys_node_mng_api/RedundantMngThread.cpp @@ -58,7 +58,7 @@ void iot_sys::CRedundantMngThread::execute() { bool bMaster = (stRunRedundantCmd.nIsMaster != 0); bool bSlave = (stRunRedundantCmd.nIsSlave != 0); - if (kbdSuccess == m_ptrSwitch->redundantSwitch(bMaster, bSlave)) + if (iotSuccess == m_ptrSwitch->redundantSwitch(bMaster, bSlave)) { m_nIsActive = stRunRedundantCmd.nIsActive; m_nIsMaster = stRunRedundantCmd.nIsMaster; @@ -90,12 +90,12 @@ int iot_sys::CRedundantMngThread::setCallback(const CRedundantSwitchInterfacePtr if (ptrSwitch == NULL) { LOGERROR("回调指针为空"); - return kbdFailed; + return iotFailed; } m_ptrSwitch = ptrSwitch; LOGINFO("设置回调成功"); - return kbdSuccess; + return iotSuccess; } /* @brief 清除冗余切换回调 */ @@ -113,14 +113,14 @@ int iot_sys::CRedundantMngThread::initialize() if (m_objRunRedundantCmdTable.open(CN_AppName_BASE.c_str(), CN_TN_SysRunRedundancyCmd.c_str())) { LOGINFO("打开应用[%s]的[%s]表成功", CN_AppName_BASE.c_str(), CN_TN_SysRunRedundancyCmd.c_str()); - return kbdSuccess; + return iotSuccess; } else { LOGERROR("打开应用[%s]的[%s]表失败.原因[%s]", CN_AppName_BASE.c_str(), CN_TN_SysRunRedundancyCmd.c_str(), m_objRunRedundantCmdTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } } diff --git a/platform/src/sys/sys_node_mng_api/RedundantMngThread.h b/platform/src/sys/sys_node_mng_api/RedundantMngThread.h index 0dcf5ea0..97f93c32 100644 --- a/platform/src/sys/sys_node_mng_api/RedundantMngThread.h +++ b/platform/src/sys/sys_node_mng_api/RedundantMngThread.h @@ -20,7 +20,7 @@ namespace iot_sys @param int nDomainId 域ID @param int nAppId 应用ID @param const std::string & strNodeName 节点名 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ CRedundantMngThread(int nDomainId, int nAppId, const std::string &strNodeName); @@ -43,7 +43,7 @@ namespace iot_sys void unsetCallback(); /** @brief 初始化，主要用来打开内存表 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int initialize(); diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoRecvThread.cpp b/platform/src/sys/sys_nodeinfo_tran/NodeInfoRecvThread.cpp index 6b93cbd0..477c25d9 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoRecvThread.cpp +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoRecvThread.cpp @@ -56,7 +56,7 @@ void iot_sys::CNodeInfoRecvThread::execute() int iot_sys::CNodeInfoRecvThread::initialize() { m_nMsgRecvTimeoutMsec = m_ptrCfgParam->getMsgRecvTimeoutMsec(); //< 消息接收超时时间 - return kbdSuccess; + return iotSuccess; } /* @brief 订阅相关消息通道 */ @@ -66,7 +66,7 @@ int iot_sys::CNodeInfoRecvThread::subscribeMessage() if (!m_objCommunicator.addSub(CN_AppId_BASE, CH_NODE_MNG_INTRA_DOMAIN)) { LOGERROR("通道[CH_NODE_MNG_INTRA_DOMAIN]订阅失败."); - return kbdFailed; + return iotFailed; } else { @@ -77,14 +77,14 @@ int iot_sys::CNodeInfoRecvThread::subscribeMessage() if (!m_objCommunicator.addSub(m_stRunAppInfo.nAppId, CH_NODE_MNG_INTER_DOMAIN)) { LOGERROR("通道[CH_NODE_MNG_INTER_DOMAIN]订阅失败."); - return kbdFailed; + return iotFailed; } else { LOGINFO("订阅通道[CH_NODE_MNG_INTER_DOMAIN]成功"); } - return kbdSuccess; + return iotSuccess; } /* @brief 取消订阅相关消息通道 */ @@ -98,7 +98,7 @@ int iot_sys::CNodeInfoRecvThread::unsubscribeMessage() { } - return kbdSuccess; + return iotSuccess; } /* @brief 转发心跳信息到其它域 */ @@ -108,17 +108,17 @@ int iot_sys::CNodeInfoRecvThread::transmitHeartbeatToInterDomain(const iot_net:: if (!stHeartbeat.ParseFromArray(objMsg.getDataPtr(), static_cast(objMsg.getDataSize()))) { LOGERROR("反序列化失败.消息通道[%d],类型[%d]", objMsg.getChannelID(), objMsg.getMsgType()); - return kbdFailed; + return iotFailed; } m_ptrSendThread->addMsgToInterDomain(stHeartbeat); - return kbdSuccess; + return iotSuccess; } /* @brief 转发心跳信息到本域 */ int iot_sys::CNodeInfoRecvThread::transmitHeartbeatToIntraDomain(const iot_net::CMbMessage &objMsg) { m_ptrSendThread->addMsgToIntraDomain(objMsg); - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoRecvThread.h b/platform/src/sys/sys_nodeinfo_tran/NodeInfoRecvThread.h index 2d48120d..7d74412c 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoRecvThread.h +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoRecvThread.h @@ -25,17 +25,17 @@ namespace iot_sys virtual void execute(); /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); /** @brief 订阅相关消息通道 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int subscribeMessage(); /** @brief 取消订阅相关消息通道 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int unsubscribeMessage(); @@ -44,13 +44,13 @@ namespace iot_sys /** @brief 转发心跳信息到其它域 @param const iot_net::CMbMessage & objMsg 接收到的消息 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int transmitHeartbeatToInterDomain(const iot_net::CMbMessage &objMsg); /** @brief 转发心跳信息到本域 @param const iot_net::CMbMessage & objMsg 接收到的消息 - @return 成功返回kbdSuccess,失败返回kbdFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int transmitHeartbeatToIntraDomain(const iot_net::CMbMessage &objMsg); diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoSendThread.cpp b/platform/src/sys/sys_nodeinfo_tran/NodeInfoSendThread.cpp index 58cc0db0..6cb9af00 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoSendThread.cpp +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoSendThread.cpp @@ -39,7 +39,7 @@ int iot_sys::CNodeInfoSendThread::initialize() { m_nRunPeriodMsec = m_ptrCfgParam->getSendMsgPeriodMsec(); //< 发送间隔时间 m_vecDstDomainId = m_ptrCfgParam->getDstDomainId(); - return kbdSuccess; + return iotSuccess; } /* @brief 添加心跳信息到域间缓冲区 */ @@ -68,7 +68,7 @@ int iot_sys::CNodeInfoSendThread::sendNodeInfoToInterDomain() if (mapHeartbeatMsg.empty()) { - return kbdSuccess; + return iotSuccess; } /* @brief 将本域内节点的心跳信息汇总 */ @@ -84,14 +84,14 @@ int iot_sys::CNodeInfoSendThread::sendNodeInfoToInterDomain() if (!objMsg.SerializeToString(&strMsg)) { LOGERROR("信息流化失败"); - return kbdFailed; + return iotFailed; } CMbMessage objSendMsg(strMsg, m_stRunAppInfo.nAppId, CH_NODE_MNG_INTER_DOMAIN, MT_InterDomainNodeInfo); if (!objSendMsg.isValid()) { LOGERROR("构建消息总线消息失败"); - return kbdFailed; + return iotFailed; } /* @brief 发送到需要转发到的域 */ @@ -104,7 +104,7 @@ int iot_sys::CNodeInfoSendThread::sendNodeInfoToInterDomain() } } - return kbdSuccess; + return iotSuccess; } /* @brief 发送心跳信息到域内 */ @@ -135,5 +135,5 @@ int iot_sys::CNodeInfoSendThread::sendNodeInfoToIntraDomain() } } - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoSendThread.h b/platform/src/sys/sys_nodeinfo_tran/NodeInfoSendThread.h index af0a31cb..698671f5 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoSendThread.h +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoSendThread.h @@ -24,7 +24,7 @@ namespace iot_sys virtual void execute(); /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); /** @@ -41,12 +41,12 @@ namespace iot_sys private: /** @brief 发送心跳信息到域间 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int sendNodeInfoToInterDomain(); /** @brief 发送心跳信息到域内 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int sendNodeInfoToIntraDomain(); diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranApp.cpp b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranApp.cpp index 8c62d17d..d715ecec 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranApp.cpp +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranApp.cpp @@ -80,14 +80,14 @@ bool iot_sys::CNodeInfoTranApp::start(int argc, char *argv[], int &/*nStatus*/) } //8.设置冗余通知回调 - if (kbdSuccess != m_ptrRedundancyMng->setCallback(m_ptrNodeInfoTranMng)) + if (iotSuccess != m_ptrRedundancyMng->setCallback(m_ptrNodeInfoTranMng)) { LOGERROR("设置冗余回调接口失败"); return false; } //9.更新当前进程冗余状态 - if (kbdSuccess != m_ptrProcMng->updateProcessInfo(true, false, false)) + if (iotSuccess != m_ptrProcMng->updateProcessInfo(true, false, false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -137,7 +137,7 @@ int iot_sys::CNodeInfoTranApp::toQuit() } shutdown(); - return kbdSuccess; + return iotSuccess; } bool iot_sys::CNodeInfoTranApp::parseCmdLine(int argc, char *argv[]) @@ -232,7 +232,7 @@ bool iot_sys::CNodeInfoTranApp::getSystemInfo() return false; } - if (kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName, m_stRunAppInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName, m_stRunAppInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -258,7 +258,7 @@ bool iot_sys::CNodeInfoTranApp::registToProcMng() return false; } - if (kbdSuccess != m_ptrProcMng->setCallback(this)) + if (iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -274,7 +274,7 @@ bool iot_sys::CNodeInfoTranApp::initialize() if (!initMsgBus(CN_ProcName_NodeInfoTran.c_str(), "")) { LOGERROR("初始化消息总线失败"); - return kbdFailed; + return iotFailed; } /* @brief 创建节点心跳信息管理类 */ @@ -285,7 +285,7 @@ bool iot_sys::CNodeInfoTranApp::initialize() return false; } - if (kbdSuccess != m_ptrNodeInfoTranMng->initialize()) + if (iotSuccess != m_ptrNodeInfoTranMng->initialize()) { LOGERROR("初始化节点信息转发管理类失败"); return false; diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranCfgParam.cpp b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranCfgParam.cpp index 4ee50c2a..fb90fba5 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranCfgParam.cpp +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranCfgParam.cpp @@ -28,14 +28,14 @@ bool iot_sys::CNodeInfoTranCfgParam::load() { //1.加载程序配置信息 CCommonConfigParse objCfg; - if (kbdSuccess != objCfg.load(CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) + if (iotSuccess != objCfg.load(CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) { LOGERROR("配置文件proc_param_cfg.xml加载失败"); return false; } - if (kbdSuccess != objCfg.getIntValue(CN_ProcName_NodeInfoTran, "msg_recv_timeout", m_nMsgRecvTimeoutMsec) || - kbdSuccess != objCfg.getIntValue(CN_ProcName_NodeInfoTran, "msg_send_period", m_nSendMsgPeriodMsec)) + if (iotSuccess != objCfg.getIntValue(CN_ProcName_NodeInfoTran, "msg_recv_timeout", m_nMsgRecvTimeoutMsec) || + iotSuccess != objCfg.getIntValue(CN_ProcName_NodeInfoTran, "msg_send_period", m_nSendMsgPeriodMsec)) { LOGERROR("获取配置参数失败"); return false; @@ -43,14 +43,14 @@ bool iot_sys::CNodeInfoTranCfgParam::load() //2.加载转发域信息 SNodeInfo stNodeInfo; - if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(stNodeInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalNodeInfo(stNodeInfo)) { LOGERROR("获取节点信息失败"); return false; } vector vecRelayInfo; - if (kbdSuccess != m_ptrSysInfo->getMbRelayInfoBySrcDomainID(stNodeInfo.nDomainId, vecRelayInfo)) + if (iotSuccess != m_ptrSysInfo->getMbRelayInfoBySrcDomainID(stNodeInfo.nDomainId, vecRelayInfo)) { LOGERROR("获取域转发信息失败"); return false; diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranMng.cpp b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranMng.cpp index 373eff97..04c66ce5 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranMng.cpp +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranMng.cpp @@ -39,7 +39,7 @@ iot_sys::CNodeInfoTranMng::~CNodeInfoTranMng() int iot_sys::CNodeInfoTranMng::redundantSwitch(bool bMaster, bool bSlave) { - int nRet = kbdSuccess; + int nRet = iotSuccess; LOGWARN("接收到冗余切换指令.Master=[%d],Slave=[%d]", bMaster, bSlave); if (bMaster && !bSlave) //< 为主 { @@ -54,12 +54,12 @@ int iot_sys::CNodeInfoTranMng::redundantSwitch(bool bMaster, bool bSlave) nRet = m_ptrRecvThread->unsubscribeMessage(); } - if (nRet == kbdSuccess) + if (nRet == iotSuccess) { m_ptrProcMng->updateProcessInfo(true, bMaster, bSlave); } - return kbdSuccess; + return iotSuccess; } /* @brief 初始化 */ @@ -70,13 +70,13 @@ int iot_sys::CNodeInfoTranMng::initialize() if (m_ptrCfgParam == NULL) { LOGERROR("创建参数解析类失败"); - return kbdFailed; + return iotFailed; } if (!m_ptrCfgParam->load()) { LOGERROR("加载配置文件失败"); - return kbdFailed; + return iotFailed; } /* @brief 2.创建发送线程 */ @@ -84,13 +84,13 @@ int iot_sys::CNodeInfoTranMng::initialize() if (m_ptrSendThread == NULL) { LOGERROR("创建节点信息发送线程失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrSendThread->initialize()) + if (iotSuccess != m_ptrSendThread->initialize()) { LOGERROR("初始化节点信息发送线程失败"); - return kbdFailed; + return iotFailed; } /* @brief 3.创建接收线程 */ @@ -98,14 +98,14 @@ int iot_sys::CNodeInfoTranMng::initialize() if (m_ptrRecvThread == NULL) { LOGERROR("创建节点信息接收线程失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrRecvThread->initialize()) + if (iotSuccess != m_ptrRecvThread->initialize()) { LOGERROR("初始化节点信息接收线程失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranMng.h b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranMng.h index b73ea442..b41c9d80 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranMng.h +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranMng.h @@ -24,12 +24,12 @@ namespace iot_sys 在进程切换过程中，可能会被调用多次切换，业务进程需要保证幂等，无副作用 @param bool bMaster 是否为主 @param bool bSlave 是否为备 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int redundantSwitch(bool bMaster, bool bSlave); /** @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); diff --git a/platform/src/sys/sys_proc_mng/ProcMngApp.cpp b/platform/src/sys/sys_proc_mng/ProcMngApp.cpp index ad4dfbe8..b4ea9d80 100644 --- a/platform/src/sys/sys_proc_mng/ProcMngApp.cpp +++ b/platform/src/sys/sys_proc_mng/ProcMngApp.cpp @@ -68,7 +68,7 @@ bool iot_sys::CProcMngApp::start(int argc, char *argv[], int &/*nStatus*/) } //7.向进程管理报告启动成功 - if (kbdSuccess != m_ptrProcMng->updateProcessInfo(true, true, false)) + if (iotSuccess != m_ptrProcMng->updateProcessInfo(true, true, false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -115,7 +115,7 @@ int iot_sys::CProcMngApp::toQuit() } shutdown(); - return kbdSuccess; + return iotSuccess; } /* @brief 解析启动参数 */ @@ -147,7 +147,7 @@ bool iot_sys::CProcMngApp::getSystemInfo() return false; } - if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -173,7 +173,7 @@ bool iot_sys::CProcMngApp::registToProcMng() return false; } - if (kbdSuccess != m_ptrProcMng->setCallback(this)) + if (iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -192,7 +192,7 @@ bool iot_sys::CProcMngApp::initialize() return false; } - if (kbdSuccess != m_ptrProcMngThread->initialize()) + if (iotSuccess != m_ptrProcMngThread->initialize()) { LOGERROR("初始化业务处理线程失败"); return false; diff --git a/platform/src/sys/sys_proc_mng/ProcMngConfigParam.cpp b/platform/src/sys/sys_proc_mng/ProcMngConfigParam.cpp index 22e8020b..793ad521 100644 --- a/platform/src/sys/sys_proc_mng/ProcMngConfigParam.cpp +++ b/platform/src/sys/sys_proc_mng/ProcMngConfigParam.cpp @@ -42,16 +42,16 @@ int iot_sys::CProcMngConfigParam::load() //2.加载进程管理配置文件 //3.加载base组件 //4.加载应用组件 - if (kbdSuccess == loadSysControlConfigFile() && - kbdSuccess == loadProcMngConfigFile() && - kbdSuccess == loadBaseProcInfo() && - kbdSuccess == loadAppProcInfo()) + if (iotSuccess == loadSysControlConfigFile() && + iotSuccess == loadProcMngConfigFile() && + iotSuccess == loadBaseProcInfo() && + iotSuccess == loadAppProcInfo()) { - return kbdSuccess; + return iotSuccess; } else { - return kbdFailed; + return iotFailed; } } @@ -98,15 +98,15 @@ int iot_sys::CProcMngConfigParam::loadSysControlConfigFile() LOGINFO("开始加载配置文件sys_ctrl.xml"); CCommonConfigParse objConfig; - if (kbdSuccess != objConfig.load(CFileUtil::getPathOfCfgFile("sys_ctrl.xml"))) + if (iotSuccess != objConfig.load(CFileUtil::getPathOfCfgFile("sys_ctrl.xml"))) { LOGERROR("加载配置文件sys_ctrl.xml失败"); - return kbdFailed; + return iotFailed; } m_bShowWindow = objConfig.getBoolWithDefault("console_option", "show_console", false); - return kbdSuccess; + return iotSuccess; } /* @brief 加载进程管理配置文件 */ @@ -115,59 +115,59 @@ int iot_sys::CProcMngConfigParam::loadProcMngConfigFile() LOGINFO("开始加载配置文件proc_param_cfg.xml"); CCommonConfigParse objConfig; - if (kbdSuccess != objConfig.load(CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) + if (iotSuccess != objConfig.load(CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) { LOGERROR("加载配置文件proc_param_cfg.xml失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != objConfig.getIntValue("sys_proc_mng", + if (iotSuccess != objConfig.getIntValue("sys_proc_mng", "proc_mng_thread_interval", m_nProcMngThreadIntervalMsec)) { LOGERROR("获取参数proc_mng_thread_interval失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != objConfig.getIntValue("sys_proc_mng", + if (iotSuccess != objConfig.getIntValue("sys_proc_mng", "heartbeat_timeout", m_nHeartbeatTimeoutMsec)) { LOGERROR("获取参数heartbeat_timeout失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != objConfig.getIntValue("sys_proc_mng", + if (iotSuccess != objConfig.getIntValue("sys_proc_mng", "max_failure_mng_time", m_nFailureCumulativeTimeMsec)) { LOGERROR("获取参数max_failure_mng_time失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != objConfig.getIntValue("sys_proc_mng", "max_failure_count", m_nMaxFailureCount)) + if (iotSuccess != objConfig.getIntValue("sys_proc_mng", "max_failure_count", m_nMaxFailureCount)) { LOGERROR("获取参数max_failure_count失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != objConfig.getIntValue("sys_proc_mng", "max_once_failure_count", m_nMaxOnceFailureCount)) + if (iotSuccess != objConfig.getIntValue("sys_proc_mng", "max_once_failure_count", m_nMaxOnceFailureCount)) { LOGERROR("获取参数max_once_failure_count失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 加载基础进程配置文件 */ int iot_sys::CProcMngConfigParam::loadBaseProcInfo() { SProcessInfoMAP mapProcInfo; - if (kbdSuccess != m_ptrSysInfo->getProcInfoListByAppId(CN_AppId_BASE, mapProcInfo)) + if (iotSuccess != m_ptrSysInfo->getProcInfoListByAppId(CN_AppId_BASE, mapProcInfo)) { LOGERROR("获取BASE应用的进程列表失败"); - return kbdFailed; + return iotFailed; } for (BOOST_AUTO(pProcIter, mapProcInfo[CN_AppId_BASE].begin()); pProcIter != mapProcInfo[CN_AppId_BASE].end(); ++pProcIter) @@ -188,7 +188,7 @@ int iot_sys::CProcMngConfigParam::loadBaseProcInfo() } } - return kbdSuccess; + return iotSuccess; } /* @brief 加载应用进程信息 */ @@ -197,24 +197,24 @@ int iot_sys::CProcMngConfigParam::loadAppProcInfo() //1.仅为服务器类型才加载应用配置，防止工作站被部署上应用 if (m_stLocalNodeInfo.eNodeType != ENodeType_ApplicationServer) { - return kbdSuccess; + return iotSuccess; } SProcessInfoMAP mapProcInfo; - if (kbdSuccess != m_ptrSysInfo->getLocalProcInfoList(mapProcInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalProcInfoList(mapProcInfo)) { LOGERROR("获取进程信息失败"); - return kbdFailed; + return iotFailed; } for (SProcessInfoMAP::const_iterator pAppIter = mapProcInfo.begin(); pAppIter != mapProcInfo.end(); ++pAppIter) { int nAppId = pAppIter->first; SAppInfo stAppInfo; - if (kbdSuccess != m_ptrSysInfo->getAppInfoById(nAppId, stAppInfo)) + if (iotSuccess != m_ptrSysInfo->getAppInfoById(nAppId, stAppInfo)) { LOGERROR("获取应用信息失败.AppID=[%d]", nAppId); - return kbdFailed; + return iotFailed; } const SProcessInfoSeq &vecProcInfo = pAppIter->second; @@ -241,7 +241,7 @@ int iot_sys::CProcMngConfigParam::loadAppProcInfo() } } - return kbdSuccess; + return iotSuccess; } /* @brief 获取配置文件的绝对路径 */ diff --git a/platform/src/sys/sys_proc_mng/ProcMngConfigParam.h b/platform/src/sys/sys_proc_mng/ProcMngConfigParam.h index 4e7c9114..4105566f 100644 --- a/platform/src/sys/sys_proc_mng/ProcMngConfigParam.h +++ b/platform/src/sys/sys_proc_mng/ProcMngConfigParam.h @@ -25,7 +25,7 @@ namespace iot_sys virtual ~CProcMngConfigParam(); /** @brief 加载相关参数 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int load(); /** @@ -57,22 +57,22 @@ namespace iot_sys private: /** @brief 加载系统启停配置文件,主要用来加载m_bShowWindows参数 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int loadSysControlConfigFile(); /** @brief 加载进程管理配置文件 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int loadProcMngConfigFile(); /** @brief 加载基础进程配置文件 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int loadBaseProcInfo(); /** @brief 加载应用进程信息 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int loadAppProcInfo(); /** diff --git a/platform/src/sys/sys_proc_mng/ProcMngThread.cpp b/platform/src/sys/sys_proc_mng/ProcMngThread.cpp index d3aeafd4..06c9f185 100644 --- a/platform/src/sys/sys_proc_mng/ProcMngThread.cpp +++ b/platform/src/sys/sys_proc_mng/ProcMngThread.cpp @@ -60,13 +60,13 @@ int iot_sys::CProcMngThread::initialize() if (m_ptrProcMngConfig == NULL) { LOGERROR("创建参数解析类CProcMngConfigParam失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrProcMngConfig->load()) + if (iotSuccess != m_ptrProcMngConfig->load()) { LOGERROR("加载参数配置文件失败"); - return kbdFailed; + return iotFailed; } m_ptrProcMngConfig->getAppIdToProcInfo(m_mapAppIdToProcInfo); //< 获取每个应用下的进程列表 @@ -77,12 +77,12 @@ int iot_sys::CProcMngThread::initialize() if (m_ptrRunProcInfoOpt == NULL) { LOGERROR("创建sys_run_proc_info操作类失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrRunProcInfoOpt->initialize()) + if (iotSuccess != m_ptrRunProcInfoOpt->initialize()) { LOGERROR("初始化sys_run_proc_info操作类失败"); - return kbdFailed; + return iotFailed; } //3.创建sys_run_app_info操作类 @@ -90,12 +90,12 @@ int iot_sys::CProcMngThread::initialize() if (m_ptrRunAppInfoOpt == NULL) { LOGERROR("创建sys_run_app_info操作类失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrRunAppInfoOpt->initialize()) + if (iotSuccess != m_ptrRunAppInfoOpt->initialize()) { LOGERROR("初始化sys_run_app_info操作类失败"); - return kbdFailed; + return iotFailed; } //4.创建网络检测访问库 @@ -103,11 +103,11 @@ int iot_sys::CProcMngThread::initialize() if (m_ptrNetCheck == NULL) { LOGERROR("创建网络检测访问库失败"); - return kbdFailed; + return iotFailed; } LOGINFO("CProcMngThread::initialize成功"); - return kbdSuccess; + return iotSuccess; } /* @brief 收集所有的进程信息 */ @@ -133,16 +133,16 @@ int iot_sys::CProcMngThread::collectSingleProcessInfo(SProcInfoMngParam &stProcI int nRet = m_ptrRunProcInfoOpt->getProcInfoByKey(stProcInfo.stProcKey, stRunProcInfo); if (kbdErrProcMngApi_NoRecord == nRet) //< 进程管理启动时，其它应用进程可能未启动 { - return kbdSuccess; + return iotSuccess; } - if (kbdSuccess != nRet && kbdErrProcMngApi_NoRecord != nRet) + if (iotSuccess != nRet && kbdErrProcMngApi_NoRecord != nRet) { LOGERROR("更新进程信息失败.域[%d],应用[%d],节点[%s],进程[%s],启动参数[%s]", stProcInfo.stProcKey.nDomainId, stProcInfo.stProcKey.nAppId, stProcInfo.stProcKey.strNodeName.c_str(), stProcInfo.stProcKey.strProcName.c_str(), stProcInfo.stProcKey.strProcParam.c_str()); - return kbdFailed; + return iotFailed; } //< 先缓存上一次的状态 @@ -157,7 +157,7 @@ int iot_sys::CProcMngThread::collectSingleProcessInfo(SProcInfoMngParam &stProcI stProcInfo.bFailure = stRunProcInfo.nIsFault != 0; stProcInfo.lLastTime = stRunProcInfo.lLastTime; - return kbdSuccess; + return iotSuccess; } /* @brief 检测所有进程是否超时，并进行管理 */ @@ -175,7 +175,7 @@ int iot_sys::CProcMngThread::checkAllProcess() checkAppProcess(pApp->second); } } - return kbdSuccess; + return iotSuccess; } /* @brief 检测基础进程是否超时，并进行管理 */ @@ -197,7 +197,7 @@ int iot_sys::CProcMngThread::checkBaseProcess(SProcInfoMngParamSeq &vecProc) } } - return kbdSuccess; + return iotSuccess; } /* @brief 检测应用进程是否超时，并进行管理 */ @@ -252,7 +252,7 @@ int iot_sys::CProcMngThread::checkAppProcess(SProcInfoMngParamSeq &vecProc) } } - return kbdSuccess; + return iotSuccess; } /* @brief 检测进程心跳是否超时 */ @@ -287,7 +287,7 @@ int iot_sys::CProcMngThread::startBaseProcess(const SProcInfoMngParam &stProcInf LOGERROR("进程仍存在.域[%d],应用[%d],节点[%s],进程名[%s],启动参数[%s],进程ID[%" PRId64 "]", stProcInfo.stProcKey.nDomainId, stProcInfo.stProcKey.nAppId, stProcInfo.stProcKey.strNodeName.c_str(), strProcName.c_str(), strProcArgs.c_str(), stProcInfo.lProcId); - return kbdFailed; + return iotFailed; } else { @@ -315,7 +315,7 @@ int iot_sys::CProcMngThread::handelAppProcessWhenTimeout(SProcInfoMngParam &stPr //设置failure标识，标识进程故障 m_ptrRunProcInfoOpt->updateProcFlagWhenFailed(stProcInfo.stProcKey); - return kbdFailed; + return iotFailed; } if (0 == stProcInfo.nFailureOccurCount) @@ -344,7 +344,7 @@ int iot_sys::CProcMngThread::startAppProcessWithPriority(SProcInfoMngParam &stPr LOGERROR("进程仍存在.域[%d],应用[%d],节点[%s],进程名[%s],启动参数[%s],进程ID[%" PRId64 "]", stProcInfo.stProcKey.nDomainId, stProcInfo.stProcKey.nAppId, stProcInfo.stProcKey.strNodeName.c_str(), strProcName.c_str(), strProcArgs.c_str(), stProcInfo.lProcId); - return kbdFailed; + return iotFailed; } ++stProcInfo.nFailureOccurCount; //< 故障次数+1 @@ -374,7 +374,7 @@ int iot_sys::CProcMngThread::startAppProcessWithPriority(SProcInfoMngParam &stPr } } - return kbdSuccess; + return iotSuccess; } /* @brief 启动进程 */ @@ -388,7 +388,7 @@ int iot_sys::CProcMngThread::startProcess(const SProcInfoMngParam &stProcInfo) if (strModulePath.empty()) { LOGERROR("获取进程目录失败"); - return kbdFailed; + return iotFailed; } LOGERROR("启动进程.域[%d],应用[%d],节点[%s],进程名[%s],启动参数[%s]", @@ -400,10 +400,10 @@ int iot_sys::CProcMngThread::startProcess(const SProcInfoMngParam &stProcInfo) LOGERROR("启动进程失败.域[%d],应用[%d],节点[%s],进程名[%s],启动参数[%s]", stProcInfo.stProcKey.nDomainId, stProcInfo.stProcKey.nAppId, stProcInfo.stProcKey.strNodeName.c_str(), strProcName.c_str(), strProcArgs.c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 汇总进程信息，更新应用信息sys_run_app_info */ @@ -414,7 +414,7 @@ int iot_sys::CProcMngThread::updateRunAppInfos() { updateSingleAppInfo(pApp->first, pApp->second); } - return kbdSuccess; + return iotSuccess; } /* @brief 汇总单个应用信息，更新应用信息sys_run_app_info */ @@ -468,7 +468,7 @@ int iot_sys::CProcMngThread::updateSingleAppInfo(int nAppId, const SProcInfoMngP } SNetworkState stNetSta; - if (kbdSuccess == m_ptrNetCheck->getLocalNetStatus(stNetSta)) + if (iotSuccess == m_ptrNetCheck->getLocalNetStatus(stNetSta)) { stAppInfo.nIP1Active = stNetSta.bIP1State; stAppInfo.nIP2Active = stNetSta.bIP2State; @@ -481,7 +481,7 @@ int iot_sys::CProcMngThread::updateSingleAppInfo(int nAppId, const SProcInfoMngP stAppInfo.lLastTime = getMonotonicMsec(); - int nRet = kbdSuccess; + int nRet = iotSuccess; if (nProcCount > 0) //< 只有有进程参与冗余的情况下，才更新应用状态表 { nRet = m_ptrRunAppInfoOpt->updateRunAppInfo(stAppInfo); diff --git a/platform/src/sys/sys_proc_mng/ProcMngThread.h b/platform/src/sys/sys_proc_mng/ProcMngThread.h index cd0cb86c..43a2a80c 100644 --- a/platform/src/sys/sys_proc_mng/ProcMngThread.h +++ b/platform/src/sys/sys_proc_mng/ProcMngThread.h @@ -31,7 +31,7 @@ namespace iot_sys virtual void execute(); /** @brief 初始化 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int initialize(); @@ -43,25 +43,25 @@ namespace iot_sys /** @brief 收集单个进程信息 @param SProcInfoMngParam & stProcInfo 返回的进程信息 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int collectSingleProcessInfo(SProcInfoMngParam &stProcInfo); /** @brief 检测所有进程是否超时，并进行管理 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int checkAllProcess(); /** @brief 检测基础进程是否超时，并进行管理 @param SProcInfoMngParamSeq & vecProc in/out参数，基础进程列表 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int checkBaseProcess(SProcInfoMngParamSeq &vecProc); /** @brief 检测应用进程是否超时，并进行管理 @param SProcInfoMngParamSeq & vecProc in/out参数，应用进程列表 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int checkAppProcess(SProcInfoMngParamSeq &vecProc); /** @@ -73,34 +73,34 @@ namespace iot_sys /** @brief 启动基础组件 @param const SProcInfoMngParam & stProcInfo 进程信息 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int startBaseProcess(const SProcInfoMngParam &stProcInfo); /** @brief 处理心跳超时的应用进程 @param SProcInfoMngParam & stProcInfo 进程信息 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int handelAppProcessWhenTimeout(SProcInfoMngParam &stProcInfo); /** @brief 启动应用进程,不同进程优先级处理不同 @param SProcInfoMngParam & stProcInfo 进程信息 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int startAppProcessWithPriority(SProcInfoMngParam &stProcInfo); /** @brief 启动进程 @param const SProcInfoMngParam & stProcInfo 进程相关参数 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int startProcess(const SProcInfoMngParam &stProcInfo); /** @brief 汇总进程信息，更新应用信息sys_run_app_info - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int updateRunAppInfos(); @@ -108,7 +108,7 @@ namespace iot_sys @brief 汇总单个应用信息，更新应用信息sys_run_app_info @param int nAppId 应用ID @param const SProcInfoMngParamSeq & vecProc 该应用下的进程列表 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int updateSingleAppInfo(int nAppId, const SProcInfoMngParamSeq &vecProc); diff --git a/platform/src/sys/sys_proc_mng/RunAppInfoTableOperate.cpp b/platform/src/sys/sys_proc_mng/RunAppInfoTableOperate.cpp index 1ac6eaf0..98605b53 100644 --- a/platform/src/sys/sys_proc_mng/RunAppInfoTableOperate.cpp +++ b/platform/src/sys/sys_proc_mng/RunAppInfoTableOperate.cpp @@ -49,23 +49,23 @@ int iot_sys::CRunAppInfoTableOperate::initialize() else { LOGERROR("打开内存表[%s]失败.Error=[%s]", CN_TN_SysRunAppInfo.c_str(), m_objRunAppInfoTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } SNodeInfo stLocalNodeInfo; - if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) { LOGERROR("获取本节点信息失败"); - return kbdFailed; + return iotFailed; } vector vecAppDeploy; if (stLocalNodeInfo.eNodeType == ENodeType_ApplicationServer) { - if (kbdSuccess != m_ptrSysInfo->getLocalAppDeploy(vecAppDeploy)) //< 应该不包含BASE应用 + if (iotSuccess != m_ptrSysInfo->getLocalAppDeploy(vecAppDeploy)) //< 应该不包含BASE应用 { LOGERROR("获取本节点[%s]的部署信息失败", m_stLocalNodeInfo.strName.c_str()); - return kbdFailed; + return iotFailed; } } @@ -103,7 +103,7 @@ int iot_sys::CRunAppInfoTableOperate::initialize() { LOGERROR("向表[%s]中添加记录失败.域[%d],应用[%d],节点[%s]", CN_TN_SysRunAppInfo.c_str(), stAppInfo.stKey.nDomainId, stAppInfo.stKey.nAppId, stAppInfo.stKey.szNodeName); - return kbdFailed; + return iotFailed; } } else @@ -113,7 +113,7 @@ int iot_sys::CRunAppInfoTableOperate::initialize() } } - return kbdSuccess; + return iotSuccess; } /* @brief 更新应用运行信息（传入参数仅包含动态参数，静态参数(除了主键)未赋值 */ @@ -134,8 +134,8 @@ int iot_sys::CRunAppInfoTableOperate::updateRunAppInfo(const STableRunAppInfo &s { LOGERROR("更新表[%s]记录失败.域[%d],应用[%d],节点[%s]", CN_TN_SysRunAppInfo.c_str(), stRunAppInfo.stKey.nDomainId, stRunAppInfo.stKey.nAppId, stRunAppInfo.stKey.szNodeName); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/sys/sys_proc_mng/RunAppInfoTableOperate.h b/platform/src/sys/sys_proc_mng/RunAppInfoTableOperate.h index d6426d67..8bf941c0 100644 --- a/platform/src/sys/sys_proc_mng/RunAppInfoTableOperate.h +++ b/platform/src/sys/sys_proc_mng/RunAppInfoTableOperate.h @@ -22,14 +22,14 @@ namespace iot_sys /** @brief 初始化 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int initialize(); /** @brief 更新应用运行信息（传入参数仅包含动态参数，静态参数(除了主键)未赋值 @param const STableRunAppInfo & stRunAppInfo - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int updateRunAppInfo(const STableRunAppInfo &stRunAppInfo); diff --git a/platform/src/sys/sys_proc_mng/RunProcInfoTableOperate.cpp b/platform/src/sys/sys_proc_mng/RunProcInfoTableOperate.cpp index f0c5efd6..0ffbee22 100644 --- a/platform/src/sys/sys_proc_mng/RunProcInfoTableOperate.cpp +++ b/platform/src/sys/sys_proc_mng/RunProcInfoTableOperate.cpp @@ -36,13 +36,13 @@ int iot_sys::CRunProcInfoTableOperate::initialize() if (m_objRunProcInfoTable.open(CN_AppName_BASE.c_str(), CN_TN_SysRunProcInfo.c_str())) { LOGINFO("打开应用[%s]的表[%s]成功", CN_AppName_BASE.c_str(), CN_TN_SysRunProcInfo.c_str()); - return kbdSuccess; + return iotSuccess; } else { LOGERROR("打开应用[%s]的表[%s]失败.error=[%s]", CN_AppName_BASE.c_str(), CN_TN_SysRunProcInfo.c_str(), m_objRunProcInfoTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } } @@ -58,7 +58,7 @@ int iot_sys::CRunProcInfoTableOperate::getProcInfoByKey(const SProcessInfoKey &s { LOGERROR("获取表[%s]中记录失败.域[%d],应用[%d],节点[%s],进程[%s],参数[%s]", CN_TN_SysRunProcInfo.c_str(), stKey.nDomainId, stKey.nAppId, stKey.szNodeName, stKey.szProcName, stKey.szProcParam); - return kbdFailed; + return iotFailed; } else if (nCount == 0) { @@ -66,7 +66,7 @@ int iot_sys::CRunProcInfoTableOperate::getProcInfoByKey(const SProcessInfoKey &s } else { - return kbdSuccess; + return iotSuccess; } } @@ -100,8 +100,8 @@ int iot_sys::CRunProcInfoTableOperate::updateProcFlagWhenFailed(const SProcessIn LOGERROR("设置进程故障标识失败.域[%d],应用[%d],节点[%s],进程[%s],启动参数[%s]", stProcKey.nDomainId, stProcKey.nAppId, stProcKey.strNodeName.c_str(), stProcKey.strProcName.c_str(), stProcKey.strProcParam.c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/sys/sys_proc_mng/RunProcInfoTableOperate.h b/platform/src/sys/sys_proc_mng/RunProcInfoTableOperate.h index 4e910b67..e345a29a 100644 --- a/platform/src/sys/sys_proc_mng/RunProcInfoTableOperate.h +++ b/platform/src/sys/sys_proc_mng/RunProcInfoTableOperate.h @@ -22,7 +22,7 @@ namespace iot_sys /** @brief 初始化 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int initialize(); @@ -30,14 +30,14 @@ namespace iot_sys @brief 获取指定进程的运行信息 @param const SProcessInfoKey & stProcKey 进程标识主键 @param STableRunProcInfo & stRunProcInfo 返回的进程运行信息 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int getProcInfoByKey(const SProcessInfoKey &stProcKey, STableRunProcInfo &stRunProcInfo); /** @brief 设置指定记录的is_fault字段值 @param const SProcessInfoKey & stProcKey 进程标识主键 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int updateProcFlagWhenFailed(const SProcessInfoKey &stProcKey); diff --git a/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.cpp b/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.cpp index 9f1aec62..91c27228 100644 --- a/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.cpp +++ b/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.cpp @@ -49,7 +49,7 @@ iot_sys::CProcMngApiThread::~CProcMngApiThread() void iot_sys::CProcMngApiThread::execute() { /* @brief 心跳 */ - if (kbdSuccess != heartbeat()) + if (iotSuccess != heartbeat()) { notifyProcToQuit();//< 通知进程退出 return; @@ -144,12 +144,12 @@ int iot_sys::CProcMngApiThread::setProcQuitCallback(CProcessQuitInterface *pProc if (pProcQuit == NULL) { LOGERROR("CProcessQuitInterface回调指针为空"); - return kbdFailed; + return iotFailed; } LOGINFO("设置CProcessQuitInterface回调指针成功"); m_pProcQuit = pProcQuit; - return kbdSuccess; + return iotSuccess; } /* @brief 取消进程退出通知回调 */ @@ -171,7 +171,7 @@ int iot_sys::CProcMngApiThread::updateProcessInfo(bool bActive, bool bMaster, bo LOGERROR("记录不存在.域[%d],应用[%d],节点[%s],进程[%s],启动参数[%s]", m_stProcRunInfo.stKey.nDomainId, m_stProcRunInfo.stKey.nAppId, m_stProcRunInfo.stKey.szNodeName, m_stProcRunInfo.stKey.szProcName, m_stProcRunInfo.stKey.szProcParam); - return kbdFailed; + return iotFailed; } m_stProcRunInfo.nIsActive = bActive; @@ -191,7 +191,7 @@ int iot_sys::CProcMngApiThread::updateProcessInfo(bool bActive, bool bMaster, bo m_stProcRunInfo.stKey.nDomainId, m_stProcRunInfo.stKey.nAppId, m_stProcRunInfo.stKey.szNodeName, m_stProcRunInfo.stKey.szProcName, m_stProcRunInfo.stKey.szProcParam, m_stProcRunInfo.nIsActive, m_stProcRunInfo.nIsMaster, m_stProcRunInfo.nIsSlave); - return kbdSuccess; + return iotSuccess; } else { @@ -199,7 +199,7 @@ int iot_sys::CProcMngApiThread::updateProcessInfo(bool bActive, bool bMaster, bo m_stProcRunInfo.stKey.nDomainId, m_stProcRunInfo.stKey.nAppId, m_stProcRunInfo.stKey.szNodeName, m_stProcRunInfo.stKey.szProcName, m_stProcRunInfo.stKey.szProcParam, m_stProcRunInfo.nIsActive, m_stProcRunInfo.nIsMaster, m_stProcRunInfo.nIsSlave); - return kbdFailed; + return iotFailed; } } @@ -235,7 +235,7 @@ int iot_sys::CProcMngApiThread::initProcInfo(bool bActive, bool bMaster /*= fals m_stProcRunInfo.stKey.nDomainId, m_stProcRunInfo.stKey.nAppId, m_stProcRunInfo.stKey.szNodeName, m_stProcRunInfo.stKey.szProcName, m_stProcRunInfo.stKey.szProcParam, m_stProcRunInfo.nIsActive, m_stProcRunInfo.nIsMaster, m_stProcRunInfo.nIsSlave); - return kbdSuccess; + return iotSuccess; } else { @@ -245,7 +245,7 @@ int iot_sys::CProcMngApiThread::initProcInfo(bool bActive, bool bMaster /*= fals m_stProcRunInfo.stKey.nDomainId, m_stProcRunInfo.stKey.nAppId, m_stProcRunInfo.stKey.szNodeName, m_stProcRunInfo.stKey.szProcName, m_stProcRunInfo.stKey.szProcParam, m_stProcRunInfo.nIsActive, m_stProcRunInfo.nIsMaster, m_stProcRunInfo.nIsSlave); - return kbdFailed; + return iotFailed; } } else @@ -269,7 +269,7 @@ int iot_sys::CProcMngApiThread::initProcInfo(bool bActive, bool bMaster /*= fals m_stProcRunInfo.stKey.nDomainId, m_stProcRunInfo.stKey.nAppId, m_stProcRunInfo.stKey.szNodeName, m_stProcRunInfo.stKey.szProcName, m_stProcRunInfo.stKey.szProcParam, m_stProcRunInfo.nIsActive, m_stProcRunInfo.nIsMaster, m_stProcRunInfo.nIsSlave); - return kbdSuccess; + return iotSuccess; } else { @@ -277,7 +277,7 @@ int iot_sys::CProcMngApiThread::initProcInfo(bool bActive, bool bMaster /*= fals m_stProcRunInfo.stKey.nDomainId, m_stProcRunInfo.stKey.nAppId, m_stProcRunInfo.stKey.szNodeName, m_stProcRunInfo.stKey.szProcName, m_stProcRunInfo.stKey.szProcParam, m_stProcRunInfo.nIsActive, m_stProcRunInfo.nIsMaster, m_stProcRunInfo.nIsSlave); - return kbdFailed; + return iotFailed; } } } @@ -307,14 +307,14 @@ int iot_sys::CProcMngApiThread::getProcessInfo(SProcRunInfo &stProcInfo) stProcInfo.bFault = stRecord.nIsFault != 0; stProcInfo.lLastTime = stRecord.lLastTime; - return kbdSuccess; + return iotSuccess; } else { LOGERROR("获取退出标识失败,当前记录不存在.域[%d],应用[%d],节点[%s],进程[%s],启动参数[%s]", m_stProcRunInfo.stKey.nDomainId, m_stProcRunInfo.stKey.nAppId, m_stProcRunInfo.stKey.szNodeName, m_stProcRunInfo.stKey.szProcName, m_stProcRunInfo.stKey.szProcParam); - return kbdFailed; + return iotFailed; } } @@ -329,7 +329,7 @@ int iot_sys::CProcMngApiThread::initialize() if (!m_ptrDogAuthApi) { LOGERROR("创建加密狗实例失败"); - return kbdFailed; + return iotFailed; } } #endif @@ -338,13 +338,13 @@ int iot_sys::CProcMngApiThread::initialize() if (m_objRunProcInfoTable.open(CN_AppName_BASE.c_str(), CN_TN_SysRunProcInfo.c_str())) { LOGINFO("打开应用[%s]的表[%s]成功", CN_AppName_BASE.c_str(), CN_TN_SysRunProcInfo.c_str()); - return kbdSuccess; + return iotSuccess; } else { LOGERROR("打开应用[%s]的表[%s]失败.error=[%s]", CN_AppName_BASE.c_str(), CN_TN_SysRunProcInfo.c_str(), m_objRunProcInfoTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } } @@ -389,7 +389,7 @@ int iot_sys::CProcMngApiThread::notifyProcToQuit() LOGWARN("进程[%s]未设置回调指针，无法通知进程退出", m_stProcRunInfo.stKey.szProcName); } - return kbdSuccess; + return iotSuccess; } /* @brief 进程信息心跳 */ @@ -411,8 +411,8 @@ int iot_sys::CProcMngApiThread::heartbeat() if (!m_objRunProcInfoTable.updateRecordByKeyOneValue(&m_stProcRunInfo.stKey, RUN_PROC_COL_LAST_TIME, m_stProcRunInfo.lLastTime)) { LOGERROR("更新字段[%s]失败.ERR=[%s]", RUN_PROC_COL_LAST_TIME, m_objRunProcInfoTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.h b/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.h index 9cfe1702..e1640ac1 100644 --- a/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.h +++ b/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.h @@ -51,7 +51,7 @@ namespace iot_sys /** @brief 设置进程退出通知回调 @param CProcessQuitInterface * pProcQuit 回调对象指针 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int setProcQuitCallback(CProcessQuitInterface *pProcQuit); @@ -64,13 +64,13 @@ namespace iot_sys @param bool bActive 是否可用 @param bool bMaster 是否为主 @param bool bSlave 是否为备 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int initProcInfo(bool bActive, bool bMaster = false, bool bSlave = false); /** @brief 初始化线程相关资源 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int initialize(); @@ -84,13 +84,13 @@ namespace iot_sys bool isToQuit(); /** @brief 通知进程退出 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int notifyProcToQuit(); /** @brief 进程信息心跳 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 @retval */ int heartbeat(); diff --git a/platform/src/sys/sys_proc_mng_api/ProcMngImpl.cpp b/platform/src/sys/sys_proc_mng_api/ProcMngImpl.cpp index 1de16cf2..e8aa7c1f 100644 --- a/platform/src/sys/sys_proc_mng_api/ProcMngImpl.cpp +++ b/platform/src/sys/sys_proc_mng_api/ProcMngImpl.cpp @@ -31,11 +31,11 @@ int iot_sys::CProcMngImpl::setCallback(CProcessQuitInterface *pQuitInterface) if (m_ptrProcMngThread != NULL && pQuitInterface != NULL) { m_ptrProcMngThread->setProcQuitCallback(pQuitInterface); - return kbdSuccess; + return iotSuccess; } else { - return kbdFailed; + return iotFailed; } } @@ -51,7 +51,7 @@ void iot_sys::CProcMngImpl::unsetCallback() /* @brief 更新进程信息 */ int iot_sys::CProcMngImpl::updateProcessInfo(bool bActive, bool bMaster, bool bSlave) { - int nRet = kbdFailed; + int nRet = iotFailed; if (!m_bIsInitProcInfo) { LOGINFO("初始化进程信息"); @@ -74,7 +74,7 @@ int iot_sys::CProcMngImpl::getProcessInfo(SProcRunInfo &stProcInfo) if (m_ptrProcMngThread == NULL) { LOGERROR("未初始化，无法获取进程信息"); - return kbdFailed; + return iotFailed; } return m_ptrProcMngThread->getProcessInfo(stProcInfo); } @@ -87,15 +87,15 @@ int iot_sys::CProcMngImpl::initialize() if (NULL == m_ptrProcMngThread) { LOGERROR("创建进程信息监测线程失败"); - return kbdFailed; + return iotFailed; } //< 初始化线程资源，主要初始化内存库相关资源 - if (kbdSuccess != m_ptrProcMngThread->initialize()) + if (iotSuccess != m_ptrProcMngThread->initialize()) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/platform/src/sys/sys_proc_mng_api/ProcMngImpl.h b/platform/src/sys/sys_proc_mng_api/ProcMngImpl.h index 93c906d7..82581b50 100644 --- a/platform/src/sys/sys_proc_mng_api/ProcMngImpl.h +++ b/platform/src/sys/sys_proc_mng_api/ProcMngImpl.h @@ -48,7 +48,7 @@ namespace iot_sys /** @brief 向进程管理注册进程信息 @param const SProcessInfoKey & stProcKey 进程标识主键 - @return 成功返回kbdSucces,失败返回kbdFailed + @return 成功返回kbdSucces,失败返回iotFailed @retval */ //int registerProcInfo(const SProcessInfoKey &stProcKey); diff --git a/platform/src/sys/sys_proc_mng_api/ProcMngInterface.cpp b/platform/src/sys/sys_proc_mng_api/ProcMngInterface.cpp index 6e130f5e..fc4caa71 100644 --- a/platform/src/sys/sys_proc_mng_api/ProcMngInterface.cpp +++ b/platform/src/sys/sys_proc_mng_api/ProcMngInterface.cpp @@ -14,7 +14,7 @@ SYS_PROC_MNG_API CProcMngInterfacePtr iot_sys::getProcMngInstance(const SProcess CProcMngImplPtr ptrProcMng = boost::make_shared(stProcKey); if (ptrProcMng != NULL) { - if (kbdSuccess != ptrProcMng->initialize()) + if (iotSuccess != ptrProcMng->initialize()) { /* @brief 注册失败后清理资源 */ ptrProcMng.reset(); diff --git a/platform/src/tools/Other/lua_function_test/CExecFunction.cpp b/platform/src/tools/Other/lua_function_test/CExecFunction.cpp index 85061bcf..55495a63 100644 --- a/platform/src/tools/Other/lua_function_test/CExecFunction.cpp +++ b/platform/src/tools/Other/lua_function_test/CExecFunction.cpp @@ -58,7 +58,7 @@ int CExecFunction::execFunction(bool &ret, int num, QString &desc) result = m_obj.execFunction(m_strFuncName, m_strFuncText, m_vecArg1, m_vecArg2, m_vecArg3, m_vecArg4, ret); break; default: - result = kbdFailed; + result = iotFailed; break; } } @@ -92,7 +92,7 @@ int CExecFunction::execFunction(std::string &ret, int num, QString &desc) result = m_obj.execFunction(m_strFuncName, m_strFuncText, m_vecArg1, m_vecArg2, m_vecArg3, m_vecArg4, ret); break; default: - result = kbdFailed; + result = iotFailed; break; } } diff --git a/platform/src/tools/fbd_designer/fbd_designer/main.cpp b/platform/src/tools/fbd_designer/fbd_designer/main.cpp index 316dbf35..b9981563 100644 --- a/platform/src/tools/fbd_designer/fbd_designer/main.cpp +++ b/platform/src/tools/fbd_designer/fbd_designer/main.cpp @@ -11,7 +11,7 @@ using namespace iot_net; int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); diff --git a/platform/src/tools/fbd_designer/fbd_editor/CAbout.ui b/platform/src/tools/fbd_designer/fbd_editor/CAbout.ui index e4cb8e2a..a3d4ef44 100644 --- a/platform/src/tools/fbd_designer/fbd_editor/CAbout.ui +++ b/platform/src/tools/fbd_designer/fbd_editor/CAbout.ui @@ -43,7 +43,7 @@ - 深圳市康必达控制技术有限公司 逻辑编程工具 版本 V1.0 + 广州市宏茂技术有限公司 逻辑编程工具 版本 V1.0 Qt::AlignCenter diff --git a/platform/src/tools/fbd_designer/fbd_editor/CGroup.cpp b/platform/src/tools/fbd_designer/fbd_editor/CGroup.cpp index cbb40d6a..3fadb41e 100644 --- a/platform/src/tools/fbd_designer/fbd_editor/CGroup.cpp +++ b/platform/src/tools/fbd_designer/fbd_editor/CGroup.cpp @@ -41,14 +41,14 @@ CGroup::CGroup(QMap objMap, QWidget *parent) : } // 查询位置信息 - if ( kbdSuccess != pSysInfo->getAllLocationInfo(m_vecLocationInfo) || m_vecLocationInfo.size() <= 0 ) + if ( iotSuccess != pSysInfo->getAllLocationInfo(m_vecLocationInfo) || m_vecLocationInfo.size() <= 0 ) { QMessageBox::critical(0,tr("错误"),tr("获取所有位置信息失败")); return; } // 查询专业信息 - if ( kbdSuccess != pSysInfo->getAllSubsystemInfo(m_vecSubsystemInfo) || m_vecSubsystemInfo.size() <= 0 ) + if ( iotSuccess != pSysInfo->getAllSubsystemInfo(m_vecSubsystemInfo) || m_vecSubsystemInfo.size() <= 0 ) { QMessageBox::critical(0,tr("错误"),tr("获取所有专业信息失败")); return; diff --git a/platform/src/tools/fbd_designer/fbd_editor/CGroupEdit.cpp b/platform/src/tools/fbd_designer/fbd_editor/CGroupEdit.cpp index db513d41..e79281c7 100644 --- a/platform/src/tools/fbd_designer/fbd_editor/CGroupEdit.cpp +++ b/platform/src/tools/fbd_designer/fbd_editor/CGroupEdit.cpp @@ -37,7 +37,7 @@ CGroupEdit::CGroupEdit(QMap objMap, QWidget *parent) : // 查询位置信息 std::vector vecLocationInfo; - if ( kbdSuccess != pSysInfo->getAllLocationInfo(vecLocationInfo) || vecLocationInfo.size() <= 0 ) + if ( iotSuccess != pSysInfo->getAllLocationInfo(vecLocationInfo) || vecLocationInfo.size() <= 0 ) { QMessageBox::critical(0,tr("错误"),tr("获取所有位置信息失败")); return; @@ -45,7 +45,7 @@ CGroupEdit::CGroupEdit(QMap objMap, QWidget *parent) : // 查询专业信息 std::vector vecSubsystemInfo; - if ( kbdSuccess != pSysInfo->getAllSubsystemInfo(vecSubsystemInfo) || vecSubsystemInfo.size() <= 0 ) + if ( iotSuccess != pSysInfo->getAllSubsystemInfo(vecSubsystemInfo) || vecSubsystemInfo.size() <= 0 ) { QMessageBox::critical(0,tr("错误"),tr("获取所有专业信息失败")); return; diff --git a/platform/src/tools/model_studio/main.cpp b/platform/src/tools/model_studio/main.cpp index 4011a64f..f1c67420 100644 --- a/platform/src/tools/model_studio/main.cpp +++ b/platform/src/tools/model_studio/main.cpp @@ -21,7 +21,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication::addLibraryPath("./sqldrivers"); SingleApplication a(argc, argv); diff --git a/platform/src/tools/model_system_config/main.cpp b/platform/src/tools/model_system_config/main.cpp index cfcb05d1..1aef29a2 100644 --- a/platform/src/tools/model_system_config/main.cpp +++ b/platform/src/tools/model_system_config/main.cpp @@ -15,7 +15,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication::addLibraryPath("./sqldrivers"); SingleApplication a(argc, argv); diff --git a/platform/src/tools/model_user/kbdacscollectdlg.cpp b/platform/src/tools/model_user/kbdacscollectdlg.cpp index c9a17c4b..841d364f 100644 --- a/platform/src/tools/model_user/kbdacscollectdlg.cpp +++ b/platform/src/tools/model_user/kbdacscollectdlg.cpp @@ -9,7 +9,7 @@ #include #include -using namespace kbd_application; +using namespace iot_application; kbdAcsCollectDlg::kbdAcsCollectDlg(QWidget *parent) : QDialog(parent) { @@ -172,7 +172,7 @@ void kbdAcsCollectDlg::handleFingerprintInfo(bool bSuccess, size_t nDataLen, con m_LabNotes->setText(tr("采集失败")); } -void kbdAcsCollectDlg::handleSetUserInfoResult(const std::list &, void *) +void kbdAcsCollectDlg::handleSetUserInfoResult(const std::list &, void *) { } diff --git a/platform/src/tools/model_user/kbdacscollectdlg.h b/platform/src/tools/model_user/kbdacscollectdlg.h index 663a43be..fb3c4d8f 100644 --- a/platform/src/tools/model_user/kbdacscollectdlg.h +++ b/platform/src/tools/model_user/kbdacscollectdlg.h @@ -24,7 +24,7 @@ enum EM_AcsCollectType EM_CapUserFinger, }; -class kbdAcsCollectDlg : public QDialog, private kbd_application::CAcsDeviceApi +class kbdAcsCollectDlg : public QDialog, private iot_application::CAcsDeviceApi { Q_OBJECT public: @@ -37,7 +37,7 @@ public: private: void handleFaceInfo(bool bSuccess, size_t nDataLen, const char *pData, void *pUserData) override; void handleFingerprintInfo(bool bSuccess, size_t nDataLen, const char *pData, void *pUserData) override; - void handleSetUserInfoResult(const std::list &, void *) override; + void handleSetUserInfoResult(const std::list &, void *) override; void handleIdentificationEvent(bool , int , size_t , const char *) override; private: void initLayout(); diff --git a/platform/src/tools/model_user/kbdloadacsinfotodevdlg.cpp b/platform/src/tools/model_user/kbdloadacsinfotodevdlg.cpp index 7d14c388..90c260ba 100644 --- a/platform/src/tools/model_user/kbdloadacsinfotodevdlg.cpp +++ b/platform/src/tools/model_user/kbdloadacsinfotodevdlg.cpp @@ -10,7 +10,7 @@ #include #include -using namespace kbd_application; +using namespace iot_application; kbdLoadAcsInfoToDevDlg::kbdLoadAcsInfoToDevDlg(QWidget *parent) : QDialog(parent) { @@ -27,7 +27,7 @@ kbdLoadAcsInfoToDevDlg::~kbdLoadAcsInfoToDevDlg() void kbdLoadAcsInfoToDevDlg::initLayout() { qRegisterMetaType("std::string"); - qRegisterMetaType>("std::list"); + qRegisterMetaType>("std::list"); qRegisterMetaType("size_t"); QVBoxLayout* vLayout = new QVBoxLayout; @@ -135,7 +135,7 @@ void kbdLoadAcsInfoToDevDlg::accept() for(int i = 0;i < m_listSelectAcsDevData.size();i++) { CAcsDevInst* acsInst = new CAcsDevInst(this); - connect(acsInst,SIGNAL(setUserInfoFinish(std::list,void*)),this,SLOT(onLoadAcsDevResult(std::list,void*))); + connect(acsInst,SIGNAL(setUserInfoFinish(std::list,void*)),this,SLOT(onLoadAcsDevResult(std::list,void*))); acsInst->setUserData(m_listUserData); if(acsInst->logIn(m_listSelectAcsDevData.at(i).at(0),m_listSelectAcsDevData.at(i).at(1).toInt(), m_listSelectAcsDevData.at(i).at(2), m_listSelectAcsDevData.at(i).at(3))) @@ -157,7 +157,7 @@ void kbdLoadAcsInfoToDevDlg::accept() } } -void kbdLoadAcsInfoToDevDlg::onLoadAcsDevResult(std::list listUserInfo, void *pUserData) +void kbdLoadAcsInfoToDevDlg::onLoadAcsDevResult(std::list listUserInfo, void *pUserData) { m_hasLoadNum++; int* index = (int*)pUserData; @@ -240,7 +240,7 @@ void CAcsDevInst::handleFingerprintInfo(bool, size_t, const char *, void *) { } -void CAcsDevInst::handleSetUserInfoResult(const std::list &listUserInfo, void *pUserData) +void CAcsDevInst::handleSetUserInfoResult(const std::list &listUserInfo, void *pUserData) { emit setUserInfoFinish(listUserInfo,pUserData); } diff --git a/platform/src/tools/model_user/kbdloadacsinfotodevdlg.h b/platform/src/tools/model_user/kbdloadacsinfotodevdlg.h index 3b481956..53193ec2 100644 --- a/platform/src/tools/model_user/kbdloadacsinfotodevdlg.h +++ b/platform/src/tools/model_user/kbdloadacsinfotodevdlg.h @@ -8,7 +8,7 @@ class kbdAcsCollectDlg; class CAcsErrorDlg; -class CAcsDevInst : public QObject, private kbd_application::CAcsDeviceApi +class CAcsDevInst : public QObject, private iot_application::CAcsDeviceApi { Q_OBJECT public: @@ -21,15 +21,15 @@ private: void handleFingerprintInfo(bool , size_t , const char *, void *) override; - void handleSetUserInfoResult(const std::list &listUserInfo, void *pUserData) override; + void handleSetUserInfoResult(const std::list &listUserInfo, void *pUserData) override; void handleIdentificationEvent(bool , int , size_t , const char *) override; signals: - void setUserInfoFinish(std::list listUserInfo, void *pUserData); + void setUserInfoFinish(std::list listUserInfo, void *pUserData); private: - std::list m_listUserInfo; + std::list m_listUserInfo; }; @@ -51,7 +51,7 @@ private: public slots: void accept(); - void onLoadAcsDevResult(std::list listUserInfo, void *pUserData); + void onLoadAcsDevResult(std::list listUserInfo, void *pUserData); private: QTableWidget* m_tableAcsDev; diff --git a/product/common/resource/zh/fbd_editor/temp/evtpushstyletemp.json b/product/common/resource/zh/fbd_editor/temp/evtpushstyletemp.json index 8bd8496e..4d718103 100644 --- a/product/common/resource/zh/fbd_editor/temp/evtpushstyletemp.json +++ b/product/common/resource/zh/fbd_editor/temp/evtpushstyletemp.json @@ -2,13 +2,13 @@ "size":12, "1":{ "desc":"邮件智能推送1", - "content":"[康必达]:您好,此次一共${evts_cnt}条告警,其中1级告警${evts_1_priority}条,2级告警${evts_2_priority}条,3级告警${evts_3_priority}条,4级告警${evts_4_priority}条,5级告警${evts_5_priority}条,智能告警内容:${content}", + "content":"[宏茂技术]:您好,此次一共${evts_cnt}条告警,其中1级告警${evts_1_priority}条,2级告警${evts_2_priority}条,3级告警${evts_3_priority}条,4级告警${evts_4_priority}条,5级告警${evts_5_priority}条,智能告警内容:${content}", "style":1, "type":0 }, "2":{ "desc":"邮件原始推送1", - "content":"[康必达]:您好,此次一共${evts_cnt}条告警,其中1级告警${evts_1_priority}条,2级告警${evts_2_priority}条,3级告警${evts_3_priority}条,4级告警${evts_4_priority}条,5级告警${evts_5_priority}条.分别为:$$evts:30:告警时间:${time},位置:${location},应用:${app},告警状态:${alm_status},告警内容:${content}$$", + "content":"[宏茂技术]:您好,此次一共${evts_cnt}条告警,其中1级告警${evts_1_priority}条,2级告警${evts_2_priority}条,3级告警${evts_3_priority}条,4级告警${evts_4_priority}条,5级告警${evts_5_priority}条.分别为:$$evts:30:告警时间:${time},位置:${location},应用:${app},告警状态:${alm_status},告警内容:${content}$$", "style":0, "type":0 }, @@ -26,25 +26,25 @@ }, "5":{ "desc":"电话智能推送1", - "content":"[康必达]:您好,此次一共${evts_cnt}条告警,其中1级告警${evts_1_priority}条,2级告警${evts_2_priority}条,3级告警${evts_3_priority}条,4级告警${evts_4_priority}条,5级告警${evts_5_priority}条,智能告警内容:${content}", + "content":"[宏茂技术]:您好,此次一共${evts_cnt}条告警,其中1级告警${evts_1_priority}条,2级告警${evts_2_priority}条,3级告警${evts_3_priority}条,4级告警${evts_4_priority}条,5级告警${evts_5_priority}条,智能告警内容:${content}", "style":1, "type":2 }, "6":{ "desc":"电话原始推送1", - "content":"[康必达]:您好,此次一共${evts_cnt}条告警,其中1级告警${evts_1_priority}条,2级告警${evts_2_priority}条,3级告警${evts_3_priority}条,4级告警${evts_4_priority}条,5级告警${evts_5_priority}条.分别为:$$evts:6:告警时间:${time},位置:${location},应用:${app},告警状态:${alm_status},告警内容:${content}$$", + "content":"[宏茂技术]:您好,此次一共${evts_cnt}条告警,其中1级告警${evts_1_priority}条,2级告警${evts_2_priority}条,3级告警${evts_3_priority}条,4级告警${evts_4_priority}条,5级告警${evts_5_priority}条.分别为:$$evts:6:告警时间:${time},位置:${location},应用:${app},告警状态:${alm_status},告警内容:${content}$$", "style":0, "type":2 }, "7":{ "desc":"邮件智能推送2", - "content":"[康必达]:您好,此次一共${evts_cnt}条告警,其中1级告警${evts_1_priority}条,2级告警${evts_2_priority}条,3级告警${evts_3_priority}条,4级告警${evts_4_priority}条,5级告警${evts_5_priority}条,智能告警内容:${content},其下告警分别为:$$evts:30:告警时间:${time},位置:${location},应用:${app},告警状态:${alm_status},告警内容:${content}$$", + "content":"[宏茂技术]:您好,此次一共${evts_cnt}条告警,其中1级告警${evts_1_priority}条,2级告警${evts_2_priority}条,3级告警${evts_3_priority}条,4级告警${evts_4_priority}条,5级告警${evts_5_priority}条,智能告警内容:${content},其下告警分别为:$$evts:30:告警时间:${time},位置:${location},应用:${app},告警状态:${alm_status},告警内容:${content}$$", "style":1, "type":0 }, "8":{ "desc":"邮件原始推送2", - "content":"[康必达]:您好,此次一共${evts_cnt}条告警,其中1级告警${evts_1_priority}条,2级告警${evts_2_priority}条,3级告警${evts_3_priority}条,4级告警${evts_4_priority}条,5级告警${evts_5_priority}条.分别为:$$evts:10:告警时间:${time},位置:${location},应用:${app},告警状态:${alm_status},告警内容:${content}$$", + "content":"[宏茂技术]:您好,此次一共${evts_cnt}条告警,其中1级告警${evts_1_priority}条,2级告警${evts_2_priority}条,3级告警${evts_3_priority}条,4级告警${evts_4_priority}条,5级告警${evts_5_priority}条.分别为:$$evts:10:告警时间:${time},位置:${location},应用:${app},告警状态:${alm_status},告警内容:${content}$$", "style":0, "type":0 }, @@ -62,13 +62,13 @@ }, "11":{ "desc":"电话智能推送2", - "content":"[康必达]:您好,此次一共${evts_cnt}条告警,其中1级告警${evts_1_priority}条,2级告警${evts_2_priority}条,3级告警${evts_3_priority}条,4级告警${evts_4_priority}条,5级告警${evts_5_priority}条,智能告警内容:${content},其下告警分别为:$$evts:6:告警时间:${time},位置:${location},应用:${app},告警状态:${alm_status},告警内容:${content}$$", + "content":"[宏茂技术]:您好,此次一共${evts_cnt}条告警,其中1级告警${evts_1_priority}条,2级告警${evts_2_priority}条,3级告警${evts_3_priority}条,4级告警${evts_4_priority}条,5级告警${evts_5_priority}条,智能告警内容:${content},其下告警分别为:$$evts:6:告警时间:${time},位置:${location},应用:${app},告警状态:${alm_status},告警内容:${content}$$", "style":1, "type":2 }, "12":{ "desc":"电话原始推送2", - "content":"[康必达]:您好,此次一共${evts_cnt}条告警,其中1级告警${evts_1_priority}条,2级告警${evts_2_priority}条,3级告警${evts_3_priority}条,4级告警${evts_4_priority}条,5级告警${evts_5_priority}条.分别为:$$evts:2:告警时间:${time},位置:${location},应用:${app},告警状态:${alm_status},告警内容:${content}$$", + "content":"[宏茂技术]:您好,此次一共${evts_cnt}条告警,其中1级告警${evts_1_priority}条,2级告警${evts_2_priority}条,3级告警${evts_3_priority}条,4级告警${evts_4_priority}条,5级告警${evts_5_priority}条.分别为:$$evts:2:告警时间:${time},位置:${location},应用:${app},告警状态:${alm_status},告警内容:${content}$$", "style":0, "type":2 } diff --git a/product/common/resource/zh/gui/translate/plugin_zh.ts b/product/common/resource/zh/gui/translate/plugin_zh.ts index 24324d80..a85429b3 100644 --- a/product/common/resource/zh/gui/translate/plugin_zh.ts +++ b/product/common/resource/zh/gui/translate/plugin_zh.ts @@ -9868,7 +9868,7 @@ SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 diff --git a/product/src/application/DataImput_cfd/Client_DataProThread.cpp b/product/src/application/DataImput_cfd/Client_DataProThread.cpp index c58bfd58..0987eb5e 100644 --- a/product/src/application/DataImput_cfd/Client_DataProThread.cpp +++ b/product/src/application/DataImput_cfd/Client_DataProThread.cpp @@ -46,7 +46,7 @@ clienDataprothread::~clienDataprothread() int clienDataprothread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } @@ -370,20 +370,20 @@ struct memory { int clienDataprothread::readConfigForGenerate() { iot_public::CCommonConfigParse objCfgParse; - if(kbdSuccess != objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile("DataImput_cfd.xml"))) + if(iotSuccess != objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile("DataImput_cfd.xml"))) { LOGERROR("加载HTTP转发配置文件失败"); - return kbdFailed; + return iotFailed; } std::string user = ""; std::string pwd = ""; - if(kbdSuccess != objCfgParse.getStringValue("DataImputSet","user",user) || - kbdSuccess != objCfgParse.getStringValue("DataImputSet","pwd",pwd)) + if(iotSuccess != objCfgParse.getStringValue("DataImputSet","user",user) || + iotSuccess != objCfgParse.getStringValue("DataImputSet","pwd",pwd)) { LOGERROR("获取用户，密码失败"); - return kbdFailed; + return iotFailed; } LOGINFO(("user:"+user).c_str()); @@ -407,7 +407,7 @@ int clienDataprothread::readConfigForGenerate() } - return kbdSuccess; + return iotSuccess; } //发送前一天历史数据 diff --git a/product/src/application/DataImput_cfd/Client_MsgManger.cpp b/product/src/application/DataImput_cfd/Client_MsgManger.cpp index 2d0a67a7..fa3a8363 100644 --- a/product/src/application/DataImput_cfd/Client_MsgManger.cpp +++ b/product/src/application/DataImput_cfd/Client_MsgManger.cpp @@ -85,7 +85,7 @@ client_MsgManger::~client_MsgManger() int client_MsgManger::beforeExecute() { - return kbdSuccess; + return iotSuccess; } void client_MsgManger::execute() @@ -113,16 +113,16 @@ void client_MsgManger::execute() if(m_pComm==nullptr) { m_pComm = new iot_net::CMbCommunicator(); - int nRet = kbdSuccess; + int nRet = iotSuccess; if( m_pComm->addSub(0,CH_SCADA_TO_HMI_DATA_CHANGE) ) { LOGINFO( "订阅通道:%d成功", CH_SCADA_TO_HMI_DATA_CHANGE ); - nRet = kbdSuccess; + nRet = iotSuccess; } else { LOGERROR( "订阅通道:%d失败", CH_SCADA_TO_HMI_DATA_CHANGE ); - nRet = kbdFailed; + nRet = iotFailed; } } } @@ -180,19 +180,19 @@ void client_MsgManger::offCommun() void client_MsgManger::onCommun() { - int nRet = kbdSuccess; + int nRet = iotSuccess; if(m_pComm==nullptr) { m_pComm = new iot_net::CMbCommunicator(); if( m_pComm->addSub(0,CH_SCADA_TO_HMI_DATA_CHANGE) ) { LOGINFO( "订阅通道:%d成功", CH_SCADA_TO_HMI_DATA_CHANGE ); - nRet = kbdSuccess; + nRet = iotSuccess; } else { LOGERROR( "订阅通道:%d失败", CH_SCADA_TO_HMI_DATA_CHANGE ); - nRet = kbdFailed; + nRet = iotFailed; } } if(m_pDpSub == nullptr) diff --git a/product/src/application/DataImput_cfd/Client_cfd.cpp b/product/src/application/DataImput_cfd/Client_cfd.cpp index 312ffce7..557ad627 100644 --- a/product/src/application/DataImput_cfd/Client_cfd.cpp +++ b/product/src/application/DataImput_cfd/Client_cfd.cpp @@ -31,7 +31,7 @@ bool client_cfd::start(int argc, char *argv[], int &nStatus) } //< 获取运行参数 - if ( kbdSuccess != ptrSysInfo->getLocalRunAppInfoByName(strAppName,m_stRunAppInfo)) + if ( iotSuccess != ptrSysInfo->getLocalRunAppInfoByName(strAppName,m_stRunAppInfo)) { LOGFATAL( "getLocalRunAppInfoByName() failed !" ); return false; @@ -116,7 +116,7 @@ bool client_cfd::start(int argc, char *argv[], int &nStatus) break; case RM_NO_PROC_MNG_MASTER: { - if ( kbdSuccess != m_ptrRedunSw->redundantSwitch( true, false )) + if ( iotSuccess != m_ptrRedunSw->redundantSwitch( true, false )) { LOGFATAL( "以主机模式启动失败！" ); return false; @@ -125,7 +125,7 @@ bool client_cfd::start(int argc, char *argv[], int &nStatus) break; case RM_NO_PROC_MNG_SLAVE: { - if ( kbdSuccess != m_ptrRedunSw->redundantSwitch( false, true )) + if ( iotSuccess != m_ptrRedunSw->redundantSwitch( false, true )) { LOGFATAL( "以备机模式启动失败！" ); return false; @@ -201,7 +201,7 @@ bool client_cfd::stop() int client_cfd::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } int client_cfd::updateProcInfo(bool bActive, bool bMaster, bool bSlave) @@ -211,7 +211,7 @@ int client_cfd::updateProcInfo(bool bActive, bool bMaster, bool bSlave) return m_ptrProcMng->updateProcessInfo( bActive, bMaster, bSlave ); } - return kbdFailed; + return iotFailed; } bool client_cfd::isAlreadyRunning() diff --git a/product/src/application/DataImput_cfd/WebSrvRedunSw.cpp b/product/src/application/DataImput_cfd/WebSrvRedunSw.cpp index 36177c52..383b26b1 100644 --- a/product/src/application/DataImput_cfd/WebSrvRedunSw.cpp +++ b/product/src/application/DataImput_cfd/WebSrvRedunSw.cpp @@ -38,7 +38,7 @@ int CWebSrvRedunSw::redundantSwitch( bool bMaster, bool bSlave ) m_pParent->p_manger->resume(); } m_pParent->updateProcInfo(true, bMaster, bSlave ); - return kbdSuccess; + return iotSuccess; } } //< namespace web_server diff --git a/product/src/application/alarm_send_server/CAlmRcvThread.cpp b/product/src/application/alarm_send_server/CAlmRcvThread.cpp index 405a28c6..9b37caba 100644 --- a/product/src/application/alarm_send_server/CAlmRcvThread.cpp +++ b/product/src/application/alarm_send_server/CAlmRcvThread.cpp @@ -23,17 +23,17 @@ iot_service::CAlmRcvThread::~CAlmRcvThread() int iot_service::CAlmRcvThread::initialize() { - if(kbdSuccess != readConfig()) + if(iotSuccess != readConfig()) { LOGERROR("读取配置文件失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != initCurl()) + if(iotSuccess != initCurl()) { LOGERROR("初始化CURL相关内容失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } //全同步的直接不处理 @@ -165,7 +165,7 @@ void iot_service::CAlmRcvThread::httpPostMultiAlm(int sendNum, int nTimeoutMs) { hasBeenSend++; //直接就发送失败，或者没有得到正确的返回 - if(kbdSuccess != httpPostOneAlm(m_queueAlmInfo.front(),nTimeoutMs,strRespose)) + if(iotSuccess != httpPostOneAlm(m_queueAlmInfo.front(),nTimeoutMs,strRespose)) { LOGERROR("发送报警失败"); return; @@ -303,56 +303,56 @@ int iot_service::CAlmRcvThread::readConfig() { iot_public::CCommonConfigParse objCfgParse; - if(kbdSuccess != objCfgParse.load(CN_Alm_Send_Path,CN_Alm_Send_Url_Config_File)) + if(iotSuccess != objCfgParse.load(CN_Alm_Send_Path,CN_Alm_Send_Url_Config_File)) { LOGERROR("加载URL配置文件失败"); - return kbdFailed; + return iotFailed; } /********************************我是骄傲的分割线******************************************/ /********************************我是骄傲的分割线******************************************/ - if(kbdSuccess != objCfgParse.getStringValue("token_config","url",m_strTokenUrl)) + if(iotSuccess != objCfgParse.getStringValue("token_config","url",m_strTokenUrl)) { LOGERROR("获取token的URL失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != objCfgParse.getStringValue("token_config","apiId",m_strApiId)) + if(iotSuccess != objCfgParse.getStringValue("token_config","apiId",m_strApiId)) { LOGERROR("获取token的机构ID失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != objCfgParse.getStringValue("token_config","apiSecret",m_strApiSecret)) + if(iotSuccess != objCfgParse.getStringValue("token_config","apiSecret",m_strApiSecret)) { LOGERROR("获取token的密钥失败"); - return kbdFailed; + return iotFailed; } /********************************我是骄傲的分割线******************************************/ - if(kbdSuccess != objCfgParse.getStringValue("alm_config","url",m_strAlmUrl)) + if(iotSuccess != objCfgParse.getStringValue("alm_config","url",m_strAlmUrl)) { LOGERROR("获取报警的URL失败"); - return kbdFailed; + return iotFailed; } /********************************我是骄傲的分割线******************************************/ - if(kbdSuccess != objCfgParse.getStringValue("dev_config","url",m_strDevUrl)) + if(iotSuccess != objCfgParse.getStringValue("dev_config","url",m_strDevUrl)) { LOGERROR("获取设备的URL失败"); - return kbdFailed; + return iotFailed; } /********************************我是骄傲的分割线******************************************/ /********************************我是骄傲的分割线******************************************/ - if(kbdSuccess != objCfgParse.load(CN_Alm_Send_Path,CN_Alm_Send_Filter_Config_File)) + if(iotSuccess != objCfgParse.load(CN_Alm_Send_Path,CN_Alm_Send_Filter_Config_File)) { LOGERROR("加载报警过滤文件失败"); - return kbdFailed; + return iotFailed; } /********************************我是骄傲的分割线******************************************/ /********************************我是骄傲的分割线******************************************/ std::vector vecTagName; - if(kbdSuccess != objCfgParse.getStringSeqValue("alm_filter","tag_name",vecTagName)) + if(iotSuccess != objCfgParse.getStringSeqValue("alm_filter","tag_name",vecTagName)) { //未能成功读取到报警过滤配置文件， //未读取到报警过滤文件，将不对报警进行过滤 @@ -368,7 +368,7 @@ int iot_service::CAlmRcvThread::readConfig() } - return kbdSuccess; + return iotSuccess; } int iot_service::CAlmRcvThread::initCurl() @@ -377,7 +377,7 @@ int iot_service::CAlmRcvThread::initCurl() if(CURLE_OK != nRc) { LOGERROR("curl_global_init() failed,Err : %s",curl_easy_strerror(nRc)); - return kbdFailed; + return iotFailed; } @@ -387,11 +387,11 @@ int iot_service::CAlmRcvThread::initCurl() if(NULL == m_pCurl) { LOGERROR("curl_easy_init() return NULL , failed !"); - return kbdFailed; + return iotFailed; } } - return kbdSuccess; + return iotSuccess; } std::string iot_service::CAlmRcvThread::convertUin64ToString(const uint64 &time) @@ -448,7 +448,7 @@ int iot_service::CAlmRcvThread::httpPostOneAlm(const iot_service::stAlmInfo &_al if(!m_objAlmJson.generateAlmInfoToJson(_almInfoElem,jsonStr)) { LOGERROR("生成报警json的字符串失败"); - return kbdFailed; + return iotFailed; } CURLcode retCode = CURL_LAST; long statusCode = 0; @@ -457,15 +457,15 @@ int iot_service::CAlmRcvThread::httpPostOneAlm(const iot_service::stAlmInfo &_al if(CURLE_OK != retCode) { LOGERROR("发送报警失败,原因:[%s]",curl_easy_strerror(retCode)); - return kbdFailed; + return iotFailed; } if(statusCode < 200 || statusCode >= 300) { LOGERROR("发送报警返回状态码:[%d],内容:[%s]",statusCode,response.c_str()); - return kbdFailed; + return iotFailed; } strReponse = response; - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/alarm_send_server/CAlmSendApp.cpp b/product/src/application/alarm_send_server/CAlmSendApp.cpp index 65bda85b..0db0d486 100644 --- a/product/src/application/alarm_send_server/CAlmSendApp.cpp +++ b/product/src/application/alarm_send_server/CAlmSendApp.cpp @@ -74,13 +74,13 @@ bool iot_service::CAlmSendApp::start(int argc, char *argv[], int &nStatus) return false; } //8.设置冗余回调 - if(kbdSuccess != m_ptrRedundantMng->setCallback(m_ptrAlmSendMng)) + if(iotSuccess != m_ptrRedundantMng->setCallback(m_ptrAlmSendMng)) { LOGERROR("设置冗余回调接口失败"); return false; } //9.更新进程状态 - if(kbdSuccess != m_ptrProcMng->updateProcessInfo(true,false,false)); + if(iotSuccess != m_ptrProcMng->updateProcessInfo(true,false,false)); { LOGERROR("更新本进程的进程信息失败"); return false; @@ -129,7 +129,7 @@ int iot_service::CAlmSendApp::toQuit() m_ptrProcMng->unsetCallback(); } shutdown(); - return kbdSuccess; + return iotSuccess; } bool iot_service::CAlmSendApp::parseCmdLine(int argc, char *argv[]) @@ -207,7 +207,7 @@ bool iot_service::CAlmSendApp::getSystemInfo() LOGERROR("创建系统信息访问库失败"); return false; } - if(kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) + if(iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) { LOGERROR("获取系统访问信息失败"); return false; @@ -230,7 +230,7 @@ bool iot_service::CAlmSendApp::registerToProcMng() LOGERROR("创建进程管理访问库失败"); return false; } - if(kbdSuccess != m_ptrProcMng->setCallback(this)) + if(iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回掉函数失败"); return false; @@ -252,7 +252,7 @@ bool iot_service::CAlmSendApp::initialize() LOGERROR("创建线程管理类智能指针失败"); return false; } - if(kbdSuccess != m_ptrAlmSendMng->initialize()) + if(iotSuccess != m_ptrAlmSendMng->initialize()) { LOGERROR("初始化线程管理类失败"); return false; diff --git a/product/src/application/alarm_send_server/CAlmSendMng.cpp b/product/src/application/alarm_send_server/CAlmSendMng.cpp index 725dcf66..156ad39a 100644 --- a/product/src/application/alarm_send_server/CAlmSendMng.cpp +++ b/product/src/application/alarm_send_server/CAlmSendMng.cpp @@ -44,7 +44,7 @@ int iot_service::CAlmSendMng::redundantSwitch(bool bMaster, bool bSlave) m_ptrProcMng->updateProcessInfo(true, bMaster, bSlave); - return kbdSuccess; + return iotSuccess; } int iot_service::CAlmSendMng::initialize() @@ -53,12 +53,12 @@ int iot_service::CAlmSendMng::initialize() if(NULL == m_ptrAlmRcvThread) { LOGERROR("创建报警接收线程失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrAlmRcvThread->initialize()) + if(iotSuccess != m_ptrAlmRcvThread->initialize()) { LOGERROR("初始化报警接受线程失败"); - return kbdFailed; + return iotFailed; } /********************************我是 分割线*******************************************/ @@ -66,12 +66,12 @@ int iot_service::CAlmSendMng::initialize() if(NULL == m_ptrAlmSendThread) { LOGERROR("创建报警发送线程失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrAlmSendThread->initialize()) + if(iotSuccess != m_ptrAlmSendThread->initialize()) { LOGERROR("报警发送线程初始化失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/alarm_send_server/CAlmSendMng.h b/product/src/application/alarm_send_server/CAlmSendMng.h index aca30bca..84af3255 100644 --- a/product/src/application/alarm_send_server/CAlmSendMng.h +++ b/product/src/application/alarm_send_server/CAlmSendMng.h @@ -21,7 +21,7 @@ namespace iot_service { virtual int redundantSwitch(bool bMaster, bool bSlave); /* * brief initialize 初始化 - * return 成功返回kbdSuccess,失败返回错误码 + * return 成功返回iotSuccess,失败返回错误码 */ int initialize(); diff --git a/product/src/application/alarm_send_server/CAlmSendThread.cpp b/product/src/application/alarm_send_server/CAlmSendThread.cpp index 664e8d23..a31e4b1d 100644 --- a/product/src/application/alarm_send_server/CAlmSendThread.cpp +++ b/product/src/application/alarm_send_server/CAlmSendThread.cpp @@ -25,5 +25,5 @@ void iot_service::CAlmSendThread::execute() int iot_service::CAlmSendThread::initialize() { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/apc_if_srv/ApcIfSrvCommon.cpp b/product/src/application/apc_if_srv/ApcIfSrvCommon.cpp index aa3aea01..8ca99ae3 100644 --- a/product/src/application/apc_if_srv/ApcIfSrvCommon.cpp +++ b/product/src/application/apc_if_srv/ApcIfSrvCommon.cpp @@ -16,7 +16,7 @@ #include "ApcIfSrvCommon.h" -namespace kbd_application +namespace iot_application { const char *g_pSzProcName = "apc_if_srv"; @@ -61,4 +61,4 @@ bool splitKeyIdTag(const std::string &strKeyIdTag, return true; } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/apc_if_srv/ApcIfSrvCommon.h b/product/src/application/apc_if_srv/ApcIfSrvCommon.h index 3ea2341b..ef04b641 100644 --- a/product/src/application/apc_if_srv/ApcIfSrvCommon.h +++ b/product/src/application/apc_if_srv/ApcIfSrvCommon.h @@ -12,7 +12,7 @@ #include "service/common/RdbTableDefine.h" #include "service/common/CommonDefine.h" -namespace kbd_application +namespace iot_application { extern const char *g_pSzProcName; @@ -21,4 +21,4 @@ bool splitKeyIdTag(const std::string &strKeyIdTag, std::string *pStrTagName = NULL, std::string *pStrColumnName = NULL); -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/apc_if_srv/CApcIfRedunSw.cpp b/product/src/application/apc_if_srv/CApcIfRedunSw.cpp index 6302f728..a5d2de9c 100644 --- a/product/src/application/apc_if_srv/CApcIfRedunSw.cpp +++ b/product/src/application/apc_if_srv/CApcIfRedunSw.cpp @@ -14,7 +14,7 @@ #include "CApcIfRedunSw.h" -namespace kbd_application +namespace iot_application { CApcIfRedunSw::CApcIfRedunSw() @@ -67,8 +67,8 @@ int CApcIfRedunSw::redundantSwitch(bool bMaster, bool bSlave) CApcIfSrv::getInstance().updateProcInfo(true, bMasterRunning, bSlave); - return kbdSuccess; + return iotSuccess; } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/apc_if_srv/CApcIfRedunSw.h b/product/src/application/apc_if_srv/CApcIfRedunSw.h index 7e98dc6a..8c1e29f6 100644 --- a/product/src/application/apc_if_srv/CApcIfRedunSw.h +++ b/product/src/application/apc_if_srv/CApcIfRedunSw.h @@ -11,7 +11,7 @@ #include "sys_node_mng_api/NodeMngInterface.h" -namespace kbd_application +namespace iot_application { class CThreadAnalog; @@ -41,5 +41,5 @@ private: typedef boost::shared_ptr CApcIfRedunSwPtr; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/apc_if_srv/CApcIfSrv.cpp b/product/src/application/apc_if_srv/CApcIfSrv.cpp index 5c077540..b247319c 100644 --- a/product/src/application/apc_if_srv/CApcIfSrv.cpp +++ b/product/src/application/apc_if_srv/CApcIfSrv.cpp @@ -20,7 +20,7 @@ #include "ApcIfSrvCommon.h" #include "CApcIfSrv.h" -namespace kbd_application +namespace iot_application { bool g_bVerboseLog = false; @@ -207,7 +207,7 @@ bool CApcIfSrv::start(int argc, char *argv[], int & /*nStatus*/) break; case RM_NO_PROC_MNG_MASTER: { - if (kbdSuccess != m_ptrRedunSw->redundantSwitch(true, false)) + if (iotSuccess != m_ptrRedunSw->redundantSwitch(true, false)) { LOGFATAL("以主机模式启动失败！"); return false; @@ -216,7 +216,7 @@ bool CApcIfSrv::start(int argc, char *argv[], int & /*nStatus*/) break; case RM_NO_PROC_MNG_SLAVE: { - if (kbdSuccess != m_ptrRedunSw->redundantSwitch(false, true)) + if (iotSuccess != m_ptrRedunSw->redundantSwitch(false, true)) { LOGFATAL("以备机模式启动失败！"); return false; @@ -300,7 +300,7 @@ bool CApcIfSrv::stop() int CApcIfSrv::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } @@ -311,7 +311,7 @@ int CApcIfSrv::updateProcInfo(bool bActive, bool bMaster, bool bSlave) return m_ptrProcMng->updateProcessInfo(bActive, bMaster, bSlave); } - return kbdFailed; + return iotFailed; } @@ -442,7 +442,7 @@ bool CApcIfSrv::loadSysInfo() iot_public::SRunAppInfo objRunAppInfo; int nRc = sysInfoPtr->getLocalRunAppInfoByName(m_strAppName, objRunAppInfo); - if (kbdSuccess != nRc) + if (iotSuccess != nRc) { LOGERROR("getLocalRunAppInfoByName failed !"); return false; @@ -466,21 +466,21 @@ bool CApcIfSrv::initPntStatus() return false; } - if (kbdSuccess != ptrDP->initialize()) + if (iotSuccess != ptrDP->initialize()) { LOGERROR("initPntStatus(): DataProcessApi初始化失败"); return false; } int nBitIndex = 0; - if (kbdSuccess != ptrDP->getMenuMacToValue("数字量状态", "MENU_STATE_DI_INVALID", nBitIndex)) + if (iotSuccess != ptrDP->getMenuMacToValue("数字量状态", "MENU_STATE_DI_INVALID", nBitIndex)) { LOGERROR("initPntStatus(): 获取 [数字量状态]-[MENU_STATE_DI_INVALID] 失败"); return false; } m_nInvalidStatus_DI = (1 << nBitIndex); - if (kbdSuccess != ptrDP->getMenuMacToValue("模拟量状态", "MENU_STATE_AI_INVALID", nBitIndex)) + if (iotSuccess != ptrDP->getMenuMacToValue("模拟量状态", "MENU_STATE_AI_INVALID", nBitIndex)) { LOGERROR("initPntStatus(): 获取 [模拟量状态]-[MENU_STATE_AI_INVALID] 失败"); return false; @@ -501,5 +501,5 @@ unsigned int CApcIfSrv::getInvalidStatus_DI() const return m_nInvalidStatus_DI; } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/apc_if_srv/CApcIfSrv.h b/product/src/application/apc_if_srv/CApcIfSrv.h index 2cc1a81f..fe5f063b 100644 --- a/product/src/application/apc_if_srv/CApcIfSrv.h +++ b/product/src/application/apc_if_srv/CApcIfSrv.h @@ -15,7 +15,7 @@ #include "CApcIfRedunSw.h" -namespace kbd_application +namespace iot_application { class CApcIfSrv : @@ -112,4 +112,4 @@ private: iot_service::CAlmApiForAppPtr m_ptrAlmApi; //< 报警服务接口 }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/apc_if_srv/CThreadAnalog.cpp b/product/src/application/apc_if_srv/CThreadAnalog.cpp index 210646db..87c7c571 100644 --- a/product/src/application/apc_if_srv/CThreadAnalog.cpp +++ b/product/src/application/apc_if_srv/CThreadAnalog.cpp @@ -47,7 +47,7 @@ #include "CThreadAnalog.h" -namespace kbd_application +namespace iot_application { extern bool g_bVerboseLog; @@ -692,5 +692,5 @@ void CThreadAnalog::handleOutput() } } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/apc_if_srv/CThreadAnalog.h b/product/src/application/apc_if_srv/CThreadAnalog.h index af2ee43f..a342b52d 100644 --- a/product/src/application/apc_if_srv/CThreadAnalog.h +++ b/product/src/application/apc_if_srv/CThreadAnalog.h @@ -15,7 +15,7 @@ #include "rdb_api/CRdbAccess.h" #include "OptDataMessage.pb.h" -namespace kbd_application +namespace iot_application { class CThreadAnalog @@ -58,5 +58,5 @@ private: }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/apc_if_srv/CThreadDigital.cpp b/product/src/application/apc_if_srv/CThreadDigital.cpp index 7769e594..44292d86 100644 --- a/product/src/application/apc_if_srv/CThreadDigital.cpp +++ b/product/src/application/apc_if_srv/CThreadDigital.cpp @@ -46,7 +46,7 @@ #include "CThreadDigital.h" -namespace kbd_application +namespace iot_application { extern bool g_bVerboseLog; @@ -518,5 +518,5 @@ void CThreadDigital::handleOutput() m_objSetDataToDp.clear_seq_set_data_info(); } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/apc_if_srv/CThreadDigital.h b/product/src/application/apc_if_srv/CThreadDigital.h index 48ff96c2..df14510b 100644 --- a/product/src/application/apc_if_srv/CThreadDigital.h +++ b/product/src/application/apc_if_srv/CThreadDigital.h @@ -15,7 +15,7 @@ #include "rdb_api/CRdbAccess.h" #include "OptDataMessage.pb.h" -namespace kbd_application +namespace iot_application { class CThreadDigital @@ -57,5 +57,5 @@ private: }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/apc_if_srv/CThreadLocalCurve.cpp b/product/src/application/apc_if_srv/CThreadLocalCurve.cpp index 2e698231..c90ba6b4 100644 --- a/product/src/application/apc_if_srv/CThreadLocalCurve.cpp +++ b/product/src/application/apc_if_srv/CThreadLocalCurve.cpp @@ -45,7 +45,7 @@ #include "CThreadLocalCurve.h" -namespace kbd_application +namespace iot_application { extern bool g_bVerboseLog; @@ -764,4 +764,4 @@ void CThreadLocalCurve::updateModelCurrentDayRuleId(const char *pSzKeyIdTag, con } } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/apc_if_srv/CThreadLocalCurve.h b/product/src/application/apc_if_srv/CThreadLocalCurve.h index 1250bcdd..6494d8ae 100644 --- a/product/src/application/apc_if_srv/CThreadLocalCurve.h +++ b/product/src/application/apc_if_srv/CThreadLocalCurve.h @@ -18,7 +18,7 @@ #include "rdb_api/CRdbAccess.h" #include "OptDataMessage.pb.h" -namespace kbd_application +namespace iot_application { class CThreadLocalCurve @@ -116,5 +116,5 @@ private: }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/apc_if_srv/Main.cpp b/product/src/application/apc_if_srv/Main.cpp index 43dc7326..7d933a3d 100644 --- a/product/src/application/apc_if_srv/Main.cpp +++ b/product/src/application/apc_if_srv/Main.cpp @@ -12,8 +12,8 @@ int main(int argc, char *argv[]) { //< 控制单例生命周期 - kbd_application::CApcIfSrv::GC objSrvGc; + iot_application::CApcIfSrv::GC objSrvGc; - return kbd_application::CApcIfSrv::getInstance().main(argc, argv); + return iot_application::CApcIfSrv::getInstance().main(argc, argv); } diff --git a/product/src/application/app_ats_timetable/CAtsTimeTable.cpp b/product/src/application/app_ats_timetable/CAtsTimeTable.cpp index eef26a33..e5818905 100644 --- a/product/src/application/app_ats_timetable/CAtsTimeTable.cpp +++ b/product/src/application/app_ats_timetable/CAtsTimeTable.cpp @@ -5,14 +5,14 @@ using namespace std; using namespace iot_public; using namespace iot_sys; -using namespace kbd_app; +using namespace iot_app; #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" const std::string CN_ProcName_AtsTimeTable = "app_ats_timetable"; //< 当前进程名 -kbd_app::CAtsTimeTable::CAtsTimeTable() +iot_app::CAtsTimeTable::CAtsTimeTable() :m_ptrSysInfo(NULL), m_ptrProcMng(NULL), m_ptrRedundancyMng(NULL), @@ -20,12 +20,12 @@ kbd_app::CAtsTimeTable::CAtsTimeTable() { } -kbd_app::CAtsTimeTable::~CAtsTimeTable() +iot_app::CAtsTimeTable::~CAtsTimeTable() { CAtsTimeTable::stop(); } -bool kbd_app::CAtsTimeTable::start(int argc, char *argv[], int &/*nStatus*/) +bool iot_app::CAtsTimeTable::start(int argc, char *argv[], int &/*nStatus*/) { //1.解析启动参数 if (!parseCmdLine(argc, argv)) @@ -77,14 +77,14 @@ bool kbd_app::CAtsTimeTable::start(int argc, char *argv[], int &/*nStatus*/) } //8.设置冗余通知回调 - if (kbdSuccess != m_ptrRedundancyMng->setCallback(m_ptrAtsTimeTableRedundantSwitchMng)) + if (iotSuccess != m_ptrRedundancyMng->setCallback(m_ptrAtsTimeTableRedundantSwitchMng)) { LOGERROR("设置冗余回调接口失败"); return false; } //9.更新当前进程冗余状态 - if (kbdSuccess != m_ptrProcMng->updateProcessInfo(true, false, false)) + if (iotSuccess != m_ptrProcMng->updateProcessInfo(true, false, false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -93,7 +93,7 @@ bool kbd_app::CAtsTimeTable::start(int argc, char *argv[], int &/*nStatus*/) return true; } -bool kbd_app::CAtsTimeTable::stop() +bool iot_app::CAtsTimeTable::stop() { //9.更新当前进程冗余状态 if (m_ptrProcMng != NULL) @@ -126,7 +126,7 @@ bool kbd_app::CAtsTimeTable::stop() return true; } -int kbd_app::CAtsTimeTable::toQuit() +int iot_app::CAtsTimeTable::toQuit() { if (m_ptrProcMng != NULL) { @@ -134,10 +134,10 @@ int kbd_app::CAtsTimeTable::toQuit() } shutdown(); - return kbdSuccess; + return iotSuccess; } -bool kbd_app::CAtsTimeTable::parseCmdLine(int argc, char *argv[]) +bool iot_app::CAtsTimeTable::parseCmdLine(int argc, char *argv[]) { /* @brief 拼接启动参数，用于向进程管理注册 */ for (int i = 1; i < argc; ++i) @@ -199,26 +199,26 @@ bool kbd_app::CAtsTimeTable::parseCmdLine(int argc, char *argv[]) return true; } -void kbd_app::CAtsTimeTable::showHelp(const boost::program_options::options_description &objDesc) +void iot_app::CAtsTimeTable::showHelp(const boost::program_options::options_description &objDesc) { std::cout << CN_ProcName_AtsTimeTable << " [-h] | [-a app]" << std::endl; std::cout << objDesc << std::endl; } -bool kbd_app::CAtsTimeTable::isAlreadyRunning() +bool iot_app::CAtsTimeTable::isAlreadyRunning() { string strUniqueName = CN_ProcName_AtsTimeTable; strUniqueName += m_strStartArgs; return CSingleProcInstance::hasInstanceRunning(strUniqueName); } -bool kbd_app::CAtsTimeTable::initLog() +bool iot_app::CAtsTimeTable::initLog() { StartLogSystem(m_strAppName.c_str(), CN_ProcName_AtsTimeTable.c_str()); return true; } -bool kbd_app::CAtsTimeTable::getSystemInfo() +bool iot_app::CAtsTimeTable::getSystemInfo() { if (!createSysInfoInstance(m_ptrSysInfo)) { @@ -226,7 +226,7 @@ bool kbd_app::CAtsTimeTable::getSystemInfo() return false; } - if (kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName, m_stRunAppInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName, m_stRunAppInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -236,7 +236,7 @@ bool kbd_app::CAtsTimeTable::getSystemInfo() } /* @brief 向进程管理注册 */ -bool kbd_app::CAtsTimeTable::registToProcMng() +bool iot_app::CAtsTimeTable::registToProcMng() { SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stRunAppInfo.nDomainId; @@ -252,7 +252,7 @@ bool kbd_app::CAtsTimeTable::registToProcMng() return false; } - if (kbdSuccess != m_ptrProcMng->setCallback(this)) + if (iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -261,7 +261,7 @@ bool kbd_app::CAtsTimeTable::registToProcMng() return true; } -bool kbd_app::CAtsTimeTable::initialize() +bool iot_app::CAtsTimeTable::initialize() { /* @brief 创建ats时间表服务管理类 */ m_ptrAtsTimeTableRedundantSwitchMng = boost::make_shared(m_stRunAppInfo, m_ptrProcMng); @@ -271,7 +271,7 @@ bool kbd_app::CAtsTimeTable::initialize() return false; } - if (kbdSuccess != m_ptrAtsTimeTableRedundantSwitchMng->initialize()) + if (iotSuccess != m_ptrAtsTimeTableRedundantSwitchMng->initialize()) { LOGERROR("初始化ats时间表服务管理类失败"); return false; @@ -281,7 +281,7 @@ bool kbd_app::CAtsTimeTable::initialize() } /* @brief 清理业务资源 */ -bool kbd_app::CAtsTimeTable::clean() +bool iot_app::CAtsTimeTable::clean() { if (m_ptrAtsTimeTableRedundantSwitchMng != NULL) { diff --git a/product/src/application/app_ats_timetable/CAtsTimeTable.h b/product/src/application/app_ats_timetable/CAtsTimeTable.h index 8428b69b..6ade9bc9 100644 --- a/product/src/application/app_ats_timetable/CAtsTimeTable.h +++ b/product/src/application/app_ats_timetable/CAtsTimeTable.h @@ -10,7 +10,7 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "CAtsTimeTableRedundantSwitch.h" -namespace kbd_app +namespace iot_app { class CAtsTimeTable : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { @@ -99,4 +99,4 @@ namespace kbd_app CAtsTimeTableRedundantSwitchPtr m_ptrAtsTimeTableRedundantSwitchMng; //< ats时间表服务管理类 }; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_ats_timetable/CAtsTimeTableRedundantSwitch.cpp b/product/src/application/app_ats_timetable/CAtsTimeTableRedundantSwitch.cpp index c0f2c996..0e76ce9a 100644 --- a/product/src/application/app_ats_timetable/CAtsTimeTableRedundantSwitch.cpp +++ b/product/src/application/app_ats_timetable/CAtsTimeTableRedundantSwitch.cpp @@ -1,7 +1,7 @@ #include "CAtsTimeTableRedundantSwitch.h" #include "pub_logger_api/logger.h" -kbd_app::CAtsTimeTableRedundantSwitch::CAtsTimeTableRedundantSwitch(const iot_public::SRunAppInfo &stRunAppInfo, +iot_app::CAtsTimeTableRedundantSwitch::CAtsTimeTableRedundantSwitch(const iot_public::SRunAppInfo &stRunAppInfo, const iot_sys::CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProcMng), @@ -9,7 +9,7 @@ kbd_app::CAtsTimeTableRedundantSwitch::CAtsTimeTableRedundantSwitch(const iot_pu { } -kbd_app::CAtsTimeTableRedundantSwitch::~CAtsTimeTableRedundantSwitch() +iot_app::CAtsTimeTableRedundantSwitch::~CAtsTimeTableRedundantSwitch() { if (m_ptrAtsTimeTableThread != NULL) { @@ -21,7 +21,7 @@ kbd_app::CAtsTimeTableRedundantSwitch::~CAtsTimeTableRedundantSwitch() } /* @brief 冗余切换 */ -int kbd_app::CAtsTimeTableRedundantSwitch::redundantSwitch(bool bMaster, bool bSlave) +int iot_app::CAtsTimeTableRedundantSwitch::redundantSwitch(bool bMaster, bool bSlave) { LOGWARN("接收到冗余切换指令.Master=[%d],Slave=[%d]", bMaster, bSlave); if (bMaster && !bSlave) //< 为主 @@ -35,24 +35,24 @@ int kbd_app::CAtsTimeTableRedundantSwitch::redundantSwitch(bool bMaster, bool bS m_ptrProcMng->updateProcessInfo(true, bMaster, bSlave); - return kbdSuccess; + return iotSuccess; } /* @brief 初始化 */ -int kbd_app::CAtsTimeTableRedundantSwitch::initialize() +int iot_app::CAtsTimeTableRedundantSwitch::initialize() { m_ptrAtsTimeTableThread = boost::make_shared(m_stRunAppInfo); if (m_ptrAtsTimeTableThread == NULL) { LOGERROR("创建ats时间表线程失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrAtsTimeTableThread->initialize()) + if (iotSuccess != m_ptrAtsTimeTableThread->initialize()) { LOGERROR("初始化ats时间表线程失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/app_ats_timetable/CAtsTimeTableRedundantSwitch.h b/product/src/application/app_ats_timetable/CAtsTimeTableRedundantSwitch.h index 41691cb8..565fc96d 100644 --- a/product/src/application/app_ats_timetable/CAtsTimeTableRedundantSwitch.h +++ b/product/src/application/app_ats_timetable/CAtsTimeTableRedundantSwitch.h @@ -8,7 +8,7 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "CAtsTimeTableThread.h" -namespace kbd_app +namespace iot_app { class CAtsTimeTableRedundantSwitch : public iot_sys::CRedundantSwitchInterface { @@ -22,12 +22,12 @@ namespace kbd_app 在进程切换过程中，可能会被调用多次切换，业务进程需要保证幂等，无副作用 @param bool bMaster 是否为主 @param bool bSlave 是否为备 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int redundantSwitch(bool bMaster, bool bSlave); /* @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); diff --git a/product/src/application/app_ats_timetable/CAtsTimeTableThread.cpp b/product/src/application/app_ats_timetable/CAtsTimeTableThread.cpp index d17e71bc..4758f139 100644 --- a/product/src/application/app_ats_timetable/CAtsTimeTableThread.cpp +++ b/product/src/application/app_ats_timetable/CAtsTimeTableThread.cpp @@ -8,21 +8,21 @@ #include "pub_logger_api/logger.h" #include "CAtsTimeTableThread.h" -kbd_app::CAtsTimeTableThread::CAtsTimeTableThread(const iot_public::SRunAppInfo &stRunAppInfo) +iot_app::CAtsTimeTableThread::CAtsTimeTableThread(const iot_public::SRunAppInfo &stRunAppInfo) :iot_public::CTimerThreadBase("CAtsTimeTableThread", 10000), m_stRunAppInfo(stRunAppInfo), m_pDb(NULL) { } -kbd_app::CAtsTimeTableThread::~CAtsTimeTableThread() +iot_app::CAtsTimeTableThread::~CAtsTimeTableThread() { delete m_pDb; m_pDb = NULL; } /* @brief 初始化 */ -int kbd_app::CAtsTimeTableThread::initialize() +int iot_app::CAtsTimeTableThread::initialize() { m_pDb = new iot_dbms::CDbApi(DB_CONN_MODEL_WRITE); if ( m_pDb->open() ) @@ -32,7 +32,7 @@ int kbd_app::CAtsTimeTableThread::initialize() else { LOGFATAL("初始化数据链接或打开失败"); - return kbdFailed; + return iotFailed; } LOGINFO("DatabaseName: [%s]", m_pDb->getCurrentDbPara().getDatabaseName().toStdString().c_str()); LOGINFO("HostName: [%s]", m_pDb->getCurrentDbPara().getHostName().toStdString().c_str()); @@ -46,20 +46,20 @@ int kbd_app::CAtsTimeTableThread::initialize() if ( m_sDirectoryPath.size() <= 0 ) { LOGFATAL("从配置文件app_ats_timetable.cfg中获取路径失败"); - return kbdFailed; + return iotFailed; } boost::filesystem::path timeTablePath( m_sDirectoryPath ); if ( !boost::filesystem::exists(timeTablePath) ) { LOGFATAL("从配置文件app_ats_timetable.cfg中获取的时间表路径[%s]不存在", m_sDirectoryPath.c_str()); - return kbdFailed; + return iotFailed; } LOGINFO( "从配置文件app_ats_timetable.cfg中获取路径成功，路径为[%s]", m_sDirectoryPath.c_str() ); - return kbdSuccess; + return iotSuccess; } -void kbd_app::CAtsTimeTableThread::execute() +void iot_app::CAtsTimeTableThread::execute() { LOGINFO("开始检查[%s]路径下的文件夹", m_sDirectoryPath.c_str()); diff --git a/product/src/application/app_ats_timetable/CAtsTimeTableThread.h b/product/src/application/app_ats_timetable/CAtsTimeTableThread.h index 272034b2..31ef37dd 100644 --- a/product/src/application/app_ats_timetable/CAtsTimeTableThread.h +++ b/product/src/application/app_ats_timetable/CAtsTimeTableThread.h @@ -4,7 +4,7 @@ #include "db_api_ex/CDbApi.h" #include "db_sysinfo_api/CDbSysInfo.h" -namespace kbd_app +namespace iot_app { class CAtsTimeTableThread : public iot_public::CTimerThreadBase @@ -20,7 +20,7 @@ public: /* @brief 初始化 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int initialize(); diff --git a/product/src/application/app_ats_timetable/main.cpp b/product/src/application/app_ats_timetable/main.cpp index ad8f874f..e6465ee8 100644 --- a/product/src/application/app_ats_timetable/main.cpp +++ b/product/src/application/app_ats_timetable/main.cpp @@ -7,6 +7,6 @@ int main(int argc, char *argv[]) { - kbd_app::CAtsTimeTable objApp; + iot_app::CAtsTimeTable objApp; return objApp.main(argc, argv); } diff --git a/product/src/application/app_bas_timetable/BasicOperation.cpp b/product/src/application/app_bas_timetable/BasicOperation.cpp index 2a908702..667a74e7 100644 --- a/product/src/application/app_bas_timetable/BasicOperation.cpp +++ b/product/src/application/app_bas_timetable/BasicOperation.cpp @@ -13,11 +13,11 @@ using namespace std; using namespace iot_public; -using namespace kbd_app; +using namespace iot_app; using namespace iot_service; using namespace iot_idl; -kbd_app::CBasicOperation::CBasicOperation(const iot_public::SRunAppInfo &stRunAppInfo, +iot_app::CBasicOperation::CBasicOperation(const iot_public::SRunAppInfo &stRunAppInfo, const iot_public::CSysInfoInterfacePtr &ptrSysInfo, const CParamMngPtr &ptrParamMng, const CTimetableMsgBusMngPtr &ptrMsgMng) @@ -30,7 +30,7 @@ kbd_app::CBasicOperation::CBasicOperation(const iot_public::SRunAppInfo &stRunAp { } -kbd_app::CBasicOperation::~CBasicOperation() +iot_app::CBasicOperation::~CBasicOperation() { m_ptrAlarmApi.reset(); m_ptrTableOpt.reset(); @@ -39,20 +39,20 @@ kbd_app::CBasicOperation::~CBasicOperation() m_ptrSysInfo.reset(); } -int kbd_app::CBasicOperation::initialize() +int iot_app::CBasicOperation::initialize() { //初始化内存表操作类 m_ptrTableOpt = boost::make_shared(m_stRunAppInfo); if (m_ptrTableOpt == NULL) { LOGERROR("创建内存库操作类失败"); - return kbdFailed; + return iotFailed; } if (m_ptrTableOpt->initialize()) { LOGERROR("初始化内存库操作类失败"); - return kbdFailed; + return iotFailed; } /* @brief 初始化报警接口 */ @@ -60,29 +60,29 @@ int kbd_app::CBasicOperation::initialize() if (m_ptrAlarmApi == NULL) { LOGERROR("创建报警接口失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 启动报警服务 */ -bool kbd_app::CBasicOperation::startAlarmSvr() +bool iot_app::CBasicOperation::startAlarmSvr() { return m_ptrAlarmApi->resumeThread(); } /* @brief 停止报警服务 */ -bool kbd_app::CBasicOperation::stopAlarmSvr() +bool iot_app::CBasicOperation::stopAlarmSvr() { return m_ptrAlarmApi->suspendThread(); } /* @brief 发送报警信息 */ -bool kbd_app::CBasicOperation::sendAlarm(const STimetableCmd &stCmd) +bool iot_app::CBasicOperation::sendAlarm(const STimetableCmd &stCmd) { STableTimetableDef stTimetable; - if (kbdSuccess != m_ptrTableOpt->getTimetableDefine(stCmd.nLocationId, stCmd.nTimetableId, stTimetable)) + if (iotSuccess != m_ptrTableOpt->getTimetableDefine(stCmd.nLocationId, stCmd.nTimetableId, stTimetable)) { LOGERROR("获取车站[%d]中时间表ID=[%d]的时间表信息失败", stCmd.nLocationId, stCmd.nTimetableId); return false; @@ -122,7 +122,7 @@ bool kbd_app::CBasicOperation::sendAlarm(const STimetableCmd &stCmd) } /* @brief 发送命令反馈给HMI */ -void kbd_app::CBasicOperation::sendResponse(const STimetableCmd &stCmd) +void iot_app::CBasicOperation::sendResponse(const STimetableCmd &stCmd) { //TODO:写报警事件。。 sendAlarm(stCmd); @@ -171,12 +171,12 @@ void kbd_app::CBasicOperation::sendResponse(const STimetableCmd &stCmd) } /* @brief 获取指定车站的指定时间表的版本号 */ -int kbd_app::CBasicOperation::getTimetableVersion(const int nLocationId, const int nTimetableId) +int iot_app::CBasicOperation::getTimetableVersion(const int nLocationId, const int nTimetableId) { int nTimetableVersion = CN_InvalidTimetableVersion; STableTimetableDef stTimetable; - if (kbdSuccess == m_ptrTableOpt->getTimetableDefine(nLocationId, nTimetableId, stTimetable)) + if (iotSuccess == m_ptrTableOpt->getTimetableDefine(nLocationId, nTimetableId, stTimetable)) { nTimetableVersion = stTimetable.nVersion; } @@ -189,7 +189,7 @@ int kbd_app::CBasicOperation::getTimetableVersion(const int nLocationId, const i } /* @brief 获取车站当前的时间表ID和时间表版本号 */ -bool kbd_app::CBasicOperation::getRunTimetableIdAndVersion(const int nLocationId, int &nTimetableId, int &nVersion) +bool iot_app::CBasicOperation::getRunTimetableIdAndVersion(const int nLocationId, int &nTimetableId, int &nVersion) { STableCtrlParam stCtrlParam; if (!m_ptrParamMng->getCtrlParamByLocationId(nLocationId, stCtrlParam)) @@ -198,8 +198,8 @@ bool kbd_app::CBasicOperation::getRunTimetableIdAndVersion(const int nLocationId return false; } - if ((kbdSuccess == m_ptrTableOpt->getPointValue(stCtrlParam.szTimetableIdTag, nTimetableId)) && - (kbdSuccess == m_ptrTableOpt->getPointValue(stCtrlParam.szTimetableVerTag, nVersion))) + if ((iotSuccess == m_ptrTableOpt->getPointValue(stCtrlParam.szTimetableIdTag, nTimetableId)) && + (iotSuccess == m_ptrTableOpt->getPointValue(stCtrlParam.szTimetableVerTag, nVersion))) { return true; } @@ -210,7 +210,7 @@ bool kbd_app::CBasicOperation::getRunTimetableIdAndVersion(const int nLocationId } /* @brief 获取当天的时间表ID */ -int kbd_app::CBasicOperation::getTimetableId(const boost::gregorian::date &stCurDate, const STableTimetableSchedule &stTimetable) +int iot_app::CBasicOperation::getTimetableId(const boost::gregorian::date &stCurDate, const STableTimetableSchedule &stTimetable) { int nTimetableId = CN_InvalidTimetableId; boost::gregorian::date beginDate, endDate; @@ -255,7 +255,7 @@ int kbd_app::CBasicOperation::getTimetableId(const boost::gregorian::date &stCur } /* @brief 生成日期(2018-6-1) */ -bool kbd_app::CBasicOperation::makeDateTime(const int nCurYear, +bool iot_app::CBasicOperation::makeDateTime(const int nCurYear, const std::string &strMdDate, boost::gregorian::date &outYmdDate) { @@ -284,7 +284,7 @@ bool kbd_app::CBasicOperation::makeDateTime(const int nCurYear, } /* @brief 根据HMI发送的控制命令生成内部的命令结构 */ -bool kbd_app::CBasicOperation::makeManualTimetableCmd(const int nMsgType, const SOptCustCtrlRequest &stReq, STimetableCmd &stCmd) +bool iot_app::CBasicOperation::makeManualTimetableCmd(const int nMsgType, const SOptCustCtrlRequest &stReq, STimetableCmd &stCmd) { //1.记录消息头 stCmd.stReq = stReq; //< 首先填充头信息，以便发生错误时，能正确的填充反馈关键字 @@ -362,7 +362,7 @@ bool kbd_app::CBasicOperation::makeManualTimetableCmd(const int nMsgType, const } /* @brief 通过控制点获取车站ID */ -bool kbd_app::CBasicOperation::getLocationIdByKeyIdTag(const std::string &strKeyIdTag, int &nLocationId) +bool iot_app::CBasicOperation::getLocationIdByKeyIdTag(const std::string &strKeyIdTag, int &nLocationId) { vector vecField; boost::algorithm::split(vecField, strKeyIdTag, boost::algorithm::is_any_of(".")); @@ -373,7 +373,7 @@ bool kbd_app::CBasicOperation::getLocationIdByKeyIdTag(const std::string &strKey } SLocationInfo stLocationInfo; - if (kbdSuccess != m_ptrSysInfo->getLocationInfoByName(vecField[1], stLocationInfo)) + if (iotSuccess != m_ptrSysInfo->getLocationInfoByName(vecField[1], stLocationInfo)) { LOGERROR("获取测点所属车站失败.[%s]", strKeyIdTag.c_str()); return false; @@ -384,12 +384,12 @@ bool kbd_app::CBasicOperation::getLocationIdByKeyIdTag(const std::string &strKey } /* @brief 获取定时时间表列表 */ -bool kbd_app::CBasicOperation::getScheduleList(const boost::gregorian::date &stCurDate, +bool iot_app::CBasicOperation::getScheduleList(const boost::gregorian::date &stCurDate, std::vector &vecSchedule) { vecSchedule.clear(); vector vecTimetable; - if (kbdSuccess != m_ptrTableOpt->getAllTimetableOrderPri(vecTimetable)) //< 获取所有的时间表排定记录 + if (iotSuccess != m_ptrTableOpt->getAllTimetableOrderPri(vecTimetable)) //< 获取所有的时间表排定记录 { return false; } @@ -422,10 +422,10 @@ bool kbd_app::CBasicOperation::getScheduleList(const boost::gregorian::date &stC } /* @brief 获取车站控制参数配置 */ -bool kbd_app::CBasicOperation::getLocationCtrlParam(LocationIdToCtrlParamMAP &mapCtrlParam) +bool iot_app::CBasicOperation::getLocationCtrlParam(LocationIdToCtrlParamMAP &mapCtrlParam) { mapCtrlParam.clear(); - if (kbdSuccess != m_ptrTableOpt->getCtrlParam(mapCtrlParam)) + if (iotSuccess != m_ptrTableOpt->getCtrlParam(mapCtrlParam)) { LOGERROR("获取车站控制参数配置失败"); return false; @@ -435,55 +435,55 @@ bool kbd_app::CBasicOperation::getLocationCtrlParam(LocationIdToCtrlParamMAP &ma } /* @brief 获取指定测点的值（状态字无效，则认为获取失败） */ -int kbd_app::CBasicOperation::getPointValue(const std::string &strKeyIdTag, int &nValue) +int iot_app::CBasicOperation::getPointValue(const std::string &strKeyIdTag, int &nValue) { return m_ptrTableOpt->getPointValue(strKeyIdTag, nValue); } /* @brief 获取时间表信息 */ -int kbd_app::CBasicOperation::getTimetableDetail(const int nLocationId, +int iot_app::CBasicOperation::getTimetableDetail(const int nLocationId, const int nTimetableId, std::vector &vecInfo) { return m_ptrTableOpt->getTimetableInfo(nLocationId, nTimetableId, vecInfo); } -int kbd_app::CBasicOperation::checkFlag(const STimetableCmd &stCmd, std::string &strErrMsg) +int iot_app::CBasicOperation::checkFlag(const STimetableCmd &stCmd, std::string &strErrMsg) { STableCtrlParam stCtrlParam; if (!m_ptrParamMng->getCtrlParamByLocationId(stCmd.nLocationId, stCtrlParam)) { LOGERROR("获取车站[%d]的时间表控制参数失败", stCmd.nLocationId); strErrMsg = I18N("获取时间表控制参数失败"); - return kbdFailed; + return iotFailed; } int nDCF = 1; int nURF = 1; int nRRF = 1; - if (kbdSuccess == getPointValue(stCtrlParam.szDCFTag, nDCF) && - kbdSuccess == getPointValue(stCtrlParam.szURFTag, nURF) && - kbdSuccess == getPointValue(stCtrlParam.szRRFTag, nRRF)) + if (iotSuccess == getPointValue(stCtrlParam.szDCFTag, nDCF) && + iotSuccess == getPointValue(stCtrlParam.szURFTag, nURF) && + iotSuccess == getPointValue(stCtrlParam.szRRFTag, nRRF)) { if (nDCF == 0 && nURF == 0 && nRRF == 0) { LOGINFO("时间表相关标志位已经复位"); - return kbdSuccess; + return iotSuccess; } } strErrMsg = I18N("时间表控制相关标志未复位"); - return kbdFailed; + return iotFailed; } /* @brief 获取模式信息 */ -int kbd_app::CBasicOperation::getModeInfo(int nLocationId, int nCraftId, int nModeId, STableModeDef &stModeInfo) +int iot_app::CBasicOperation::getModeInfo(int nLocationId, int nCraftId, int nModeId, STableModeDef &stModeInfo) { return m_ptrTableOpt->getModeInfo(nLocationId, nCraftId, nModeId, stModeInfo); } /* @brief 生成测点控制消息 */ -std::string kbd_app::CBasicOperation::makePntCtrlMsg(int nUserId, int nUserGrpId, int64 lOptTime, const std::string &strKeyIdTag) +std::string iot_app::CBasicOperation::makePntCtrlMsg(int nUserId, int nUserGrpId, int64 lOptTime, const std::string &strKeyIdTag) { SOptCtrlRequest stReq; stReq.stHead.strSrcTag = CN_ProcName_TimetableServer; diff --git a/product/src/application/app_bas_timetable/BasicOperation.h b/product/src/application/app_bas_timetable/BasicOperation.h index de4563b7..16f52d6e 100644 --- a/product/src/application/app_bas_timetable/BasicOperation.h +++ b/product/src/application/app_bas_timetable/BasicOperation.h @@ -12,7 +12,7 @@ #include "TimetableMsgBusMng.h" #include "ParamMng.h" -namespace kbd_app +namespace iot_app { class CBasicOperation { @@ -25,7 +25,7 @@ namespace kbd_app /* @brief 初始化内存表操作类 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int initialize(); @@ -89,14 +89,14 @@ namespace kbd_app /* @brief 获取车站控制参数配置 @param LocationIdToCtrlParamMAP & mapCtrlParam 返回的车站控制参数配置 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ bool getLocationCtrlParam(LocationIdToCtrlParamMAP &mapCtrlParam); /* @brief 获取指定测点的值（状态字无效，则认为获取失败） @param const std::string & strKeyIdTag 测点ID @param int & nValue 返回的测点值 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int getPointValue(const std::string &strKeyIdTag, int &nValue); /* @@ -104,7 +104,7 @@ namespace kbd_app @param const int nLocationId 车站ID @param const int nTimetableId 时间表ID @param std::vector & vecInfo 返回的时间表信息 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int getTimetableDetail(const int nLocationId, const int nTimetableId, std::vector &vecInfo); @@ -112,7 +112,7 @@ namespace kbd_app @brief 检查时间表下载或者读取的三个标志位是否已经复位 @param const STimetableCmd & stCmd 当前命令 @param std::string & strErrMsg 错误描述 - @return 检查通过返回kbdSuccess，不通过返回错误码 + @return 检查通过返回iotSuccess，不通过返回错误码 */ int checkFlag(const STimetableCmd &stCmd, std::string &strErrMsg); @@ -122,7 +122,7 @@ namespace kbd_app @param int nCraftId 工艺ID @param int nModeId 模式ID @param STableModeDef & stModeInfo 返回的模式信息 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int getModeInfo(int nLocationId, int nCraftId, int nModeId, STableModeDef &stModeInfo); diff --git a/product/src/application/app_bas_timetable/DownloadTimetable.cpp b/product/src/application/app_bas_timetable/DownloadTimetable.cpp index 48bbd797..cbd800a1 100644 --- a/product/src/application/app_bas_timetable/DownloadTimetable.cpp +++ b/product/src/application/app_bas_timetable/DownloadTimetable.cpp @@ -8,11 +8,11 @@ using namespace std; using namespace iot_public; -using namespace kbd_app; +using namespace iot_app; // using namespace iot_net; // using namespace iot_dbms; -kbd_app::CDownloadTimetable::CDownloadTimetable(const iot_public::SRunAppInfo &stRunAppInfo, +iot_app::CDownloadTimetable::CDownloadTimetable(const iot_public::SRunAppInfo &stRunAppInfo, const CParamMngPtr &ptrParamMng, const CTimetableMsgBusMngPtr &ptrMsgMng, const CBasicOperationPtr &ptrBasicOpt) @@ -23,7 +23,7 @@ kbd_app::CDownloadTimetable::CDownloadTimetable(const iot_public::SRunAppInfo &s { } -kbd_app::CDownloadTimetable::~CDownloadTimetable() +iot_app::CDownloadTimetable::~CDownloadTimetable() { m_ptrBasicOpt.reset(); m_ptrMsgMng.reset(); @@ -31,7 +31,7 @@ kbd_app::CDownloadTimetable::~CDownloadTimetable() } /* @brief 处理下载命令 */ -void kbd_app::CDownloadTimetable::handleDownloadCmd(STimetableCmd &stCmd) +void iot_app::CDownloadTimetable::handleDownloadCmd(STimetableCmd &stCmd) { ETimetableCmdState eTemp = ETimetableCmdState_Invalid; while (eTemp != stCmd.eState) @@ -71,12 +71,12 @@ void kbd_app::CDownloadTimetable::handleDownloadCmd(STimetableCmd &stCmd) } /* @brief 检查DCF、URF、RRF标识 */ -void kbd_app::CDownloadTimetable::checkFlag(STimetableCmd &stCmd, +void iot_app::CDownloadTimetable::checkFlag(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) { string strErrMsg; - if (kbdSuccess == m_ptrBasicOpt->checkFlag(stCmd, strErrMsg)) + if (iotSuccess == m_ptrBasicOpt->checkFlag(stCmd, strErrMsg)) { stCmd.setResult(true, strErrMsg, eSuccessState); } @@ -87,7 +87,7 @@ void kbd_app::CDownloadTimetable::checkFlag(STimetableCmd &stCmd, } /* @brief 等待关系库中的配置同步到内存库 */ -void kbd_app::CDownloadTimetable::waitSyncTimetableInfo(STimetableCmd &stCmd, +void iot_app::CDownloadTimetable::waitSyncTimetableInfo(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) { @@ -117,7 +117,7 @@ void kbd_app::CDownloadTimetable::waitSyncTimetableInfo(STimetableCmd &stCmd, } /* @brief 发送下载命令消息 */ -void kbd_app::CDownloadTimetable::sendDownloadCmd(STimetableCmd &stCmd, +void iot_app::CDownloadTimetable::sendDownloadCmd(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) { @@ -146,10 +146,10 @@ void kbd_app::CDownloadTimetable::sendDownloadCmd(STimetableCmd &stCmd, } /* @brief 生成下载命令报文 */ -bool kbd_app::CDownloadTimetable::makeDownloadMsg(const STimetableCmd &stCmd, std::string &strMsg) +bool iot_app::CDownloadTimetable::makeDownloadMsg(const STimetableCmd &stCmd, std::string &strMsg) { vector vecInfo; - if (kbdSuccess != m_ptrBasicOpt->getTimetableDetail(stCmd.nLocationId, stCmd.nTimetableId, vecInfo) + if (iotSuccess != m_ptrBasicOpt->getTimetableDetail(stCmd.nLocationId, stCmd.nTimetableId, vecInfo) || vecInfo.empty()) { LOGERROR("获取时间表信息失败.LocationId=[%d],TimetableId=[%d]", stCmd.nLocationId, stCmd.nTimetableId); @@ -197,7 +197,7 @@ bool kbd_app::CDownloadTimetable::makeDownloadMsg(const STimetableCmd &stCmd, st stCustomCmd.vecOptCustCtrlQueue.push_back(stKV); STableModeDef stModeInfo; - if (kbdSuccess != m_ptrBasicOpt->getModeInfo(stInfo.stKey.nLocationId, stInfo.nCraftId, stInfo.nModeId, stModeInfo)) + if (iotSuccess != m_ptrBasicOpt->getModeInfo(stInfo.stKey.nLocationId, stInfo.nCraftId, stInfo.nModeId, stModeInfo)) { LOGERROR("获取模式号失败.LocationId=[%d],CraftId=[%d],ModeId=[%d]", stInfo.stKey.nLocationId, stInfo.nCraftId, stInfo.nModeId); @@ -222,7 +222,7 @@ bool kbd_app::CDownloadTimetable::makeDownloadMsg(const STimetableCmd &stCmd, st /* @brief 检查下载命令反馈结果 */ -void kbd_app::CDownloadTimetable::waitDownloadResponse(STimetableCmd &stCmd, +void iot_app::CDownloadTimetable::waitDownloadResponse(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) { @@ -266,7 +266,7 @@ void kbd_app::CDownloadTimetable::waitDownloadResponse(STimetableCmd &stCmd, } /* @brief 设置下载完成标识DCF */ -void kbd_app::CDownloadTimetable::setDownloadFlag(STimetableCmd &stCmd, +void iot_app::CDownloadTimetable::setDownloadFlag(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) { @@ -325,7 +325,7 @@ void kbd_app::CDownloadTimetable::setDownloadFlag(STimetableCmd &stCmd, } /* @brief 等待设置下载完成标识DCF的命令反馈 */ -void kbd_app::CDownloadTimetable::waitDownloadFlagRep(STimetableCmd &stCmd, +void iot_app::CDownloadTimetable::waitDownloadFlagRep(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) { @@ -365,7 +365,7 @@ void kbd_app::CDownloadTimetable::waitDownloadFlagRep(STimetableCmd &stCmd, } } -void kbd_app::CDownloadTimetable::verifyVersion(STimetableCmd &stCmd, +void iot_app::CDownloadTimetable::verifyVersion(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) { @@ -397,7 +397,7 @@ void kbd_app::CDownloadTimetable::verifyVersion(STimetableCmd &stCmd, } /* @brief 下载命令完成后的处理 */ -void kbd_app::CDownloadTimetable::downloadCompleted(STimetableCmd &stCmd) +void iot_app::CDownloadTimetable::downloadCompleted(STimetableCmd &stCmd) { //TODO:产生事件 if (stCmd.bIsSuccess) diff --git a/product/src/application/app_bas_timetable/DownloadTimetable.h b/product/src/application/app_bas_timetable/DownloadTimetable.h index 547d4088..895adf6a 100644 --- a/product/src/application/app_bas_timetable/DownloadTimetable.h +++ b/product/src/application/app_bas_timetable/DownloadTimetable.h @@ -11,7 +11,7 @@ #include "TimetableMsgBusMng.h" #include "BasicOperation.h" -namespace kbd_app +namespace iot_app { class CDownloadTimetable { diff --git a/product/src/application/app_bas_timetable/ParamMng.cpp b/product/src/application/app_bas_timetable/ParamMng.cpp index 729f5bce..b15332d7 100644 --- a/product/src/application/app_bas_timetable/ParamMng.cpp +++ b/product/src/application/app_bas_timetable/ParamMng.cpp @@ -4,29 +4,29 @@ using namespace std; using namespace iot_public; -using namespace kbd_app; +using namespace iot_app; -kbd_app::CParamMng::CParamMng(const iot_public::SRunAppInfo &stRunAppInfo, +iot_app::CParamMng::CParamMng(const iot_public::SRunAppInfo &stRunAppInfo, const iot_public::CSysInfoInterfacePtr &ptrSysInfo) :m_stRunAppInfo(stRunAppInfo), m_ptrSysInfo(ptrSysInfo) { } -kbd_app::CParamMng::~CParamMng() +iot_app::CParamMng::~CParamMng() { m_ptrSysInfo.reset(); } /* @brief 初始化 */ -int kbd_app::CParamMng::initialize() +int iot_app::CParamMng::initialize() { //1.获取车站列表 vector vecLocationInfo; - if (kbdSuccess != m_ptrSysInfo->getLocationListByDomainId(m_stRunAppInfo.nDomainId, vecLocationInfo)) + if (iotSuccess != m_ptrSysInfo->getLocationListByDomainId(m_stRunAppInfo.nDomainId, vecLocationInfo)) { LOGERROR("获取域[%d]的车站列表失败", m_stRunAppInfo.nDomainId); - return kbdFailed; + return iotFailed; } for (size_t i = 0; i < vecLocationInfo.size(); ++i) @@ -35,11 +35,11 @@ int kbd_app::CParamMng::initialize() m_mapLocationInfo[stLcInfo.nId] = stLcInfo; } - return kbdSuccess; + return iotSuccess; } /* @brief 通过车站ID获取车站信息 */ -bool kbd_app::CParamMng::getLocationInfoById(const int nLocationId, iot_public::SLocationInfo &stLocationInfo) +bool iot_app::CParamMng::getLocationInfoById(const int nLocationId, iot_public::SLocationInfo &stLocationInfo) { BOOST_AUTO(pIter, m_mapLocationInfo.find(nLocationId)); if (pIter != m_mapLocationInfo.end()) @@ -54,7 +54,7 @@ bool kbd_app::CParamMng::getLocationInfoById(const int nLocationId, iot_public:: } /* @brief 通过车站ID获取控制参数信息 */ -bool kbd_app::CParamMng::getCtrlParamByLocationId(const int nLocationId, STableCtrlParam &stCtrlParam) +bool iot_app::CParamMng::getCtrlParamByLocationId(const int nLocationId, STableCtrlParam &stCtrlParam) { BOOST_AUTO(pIter, m_mapLocationIdToCtrlParam.find(nLocationId)); if (pIter != m_mapLocationIdToCtrlParam.end()) @@ -69,13 +69,13 @@ bool kbd_app::CParamMng::getCtrlParamByLocationId(const int nLocationId, STableC } /* @brief 更新车站控制参数信息引用 */ -void kbd_app::CParamMng::updateLocationCtrlParam(const LocationIdToCtrlParamMAP &mapCtrlParam) +void iot_app::CParamMng::updateLocationCtrlParam(const LocationIdToCtrlParamMAP &mapCtrlParam) { m_mapLocationIdToCtrlParam = mapCtrlParam; } /* @brief 获取自定义命令反馈信息 */ -bool kbd_app::CParamMng::getCustomRepMsgByKey(const STimetableCmdKey &stKey, SOptCustCtrlReply &stRep) +bool iot_app::CParamMng::getCustomRepMsgByKey(const STimetableCmdKey &stKey, SOptCustCtrlReply &stRep) { BOOST_AUTO(pIter, m_mapCustomRep.find(stKey)); if (pIter != m_mapCustomRep.end()) @@ -90,14 +90,14 @@ bool kbd_app::CParamMng::getCustomRepMsgByKey(const STimetableCmdKey &stKey, SOp } /* @brief 增加自定义命令反馈 */ -void kbd_app::CParamMng::addCustomRepMsg(const SOptCustCtrlReply &stRep) +void iot_app::CParamMng::addCustomRepMsg(const SOptCustCtrlReply &stRep) { STimetableCmdKey stRepKey(stRep.stHead.strKeyIdTag, stRep.stHead.nOptTime); m_mapCustomRep[stRepKey] = stRep; } /* @brief 获取测点控制反馈信息 */ -bool kbd_app::CParamMng::getPntRepMsgByKey(const STimetableCmdKey &stKey, SOptCtrlReply &stRep) +bool iot_app::CParamMng::getPntRepMsgByKey(const STimetableCmdKey &stKey, SOptCtrlReply &stRep) { BOOST_AUTO(pIter, m_mapPntRep.find(stKey)); if (pIter != m_mapPntRep.end()) @@ -112,39 +112,39 @@ bool kbd_app::CParamMng::getPntRepMsgByKey(const STimetableCmdKey &stKey, SOptCt } /* @brief 增加测点控制命令反馈 */ -void kbd_app::CParamMng::addPntRepMsg(const SOptCtrlReply &stRep) +void iot_app::CParamMng::addPntRepMsg(const SOptCtrlReply &stRep) { STimetableCmdKey stRepKey(stRep.stHead.strKeyIdTag, stRep.stHead.nOptTime); m_mapPntRep[stRepKey] = stRep; } /* @brief 获取时间表控制命令缓冲区引用 */ -LocationToTimetableCmdMAP& kbd_app::CParamMng::getTimetableCmdBufRef() +LocationToTimetableCmdMAP& iot_app::CParamMng::getTimetableCmdBufRef() { return m_mapLocationToCmd; } /* @brief 增加时间表控制命令 */ -void kbd_app::CParamMng::addTimetableCmd(const STimetableCmd &stCmd) +void iot_app::CParamMng::addTimetableCmd(const STimetableCmd &stCmd) { m_mapLocationToCmd[stCmd.nLocationId] = stCmd; } /* @brief 清空命令缓冲区 */ -void kbd_app::CParamMng::clearCmdCache() +void iot_app::CParamMng::clearCmdCache() { m_mapLocationToCmd.clear(); } /* @brief 清空反馈缓冲区 */ -void kbd_app::CParamMng::clearRepCache() +void iot_app::CParamMng::clearRepCache() { m_mapCustomRep.clear(); m_mapPntRep.clear(); } /* @brief 清空车站控制参数缓冲区 */ -void kbd_app::CParamMng::clearLocationCtrlParam() +void iot_app::CParamMng::clearLocationCtrlParam() { m_mapLocationIdToCtrlParam.clear(); } diff --git a/product/src/application/app_bas_timetable/ParamMng.h b/product/src/application/app_bas_timetable/ParamMng.h index e1bab314..8c9e3223 100644 --- a/product/src/application/app_bas_timetable/ParamMng.h +++ b/product/src/application/app_bas_timetable/ParamMng.h @@ -8,7 +8,7 @@ #include "TimetableCommon.h" #include "TimetableCtrlParamTable.h" -namespace kbd_app +namespace iot_app { class CParamMng { @@ -19,7 +19,7 @@ namespace kbd_app /* @brief 初始化 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int initialize(); @@ -104,4 +104,4 @@ namespace kbd_app }; typedef boost::shared_ptr CParamMngPtr; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_bas_timetable/ReadTimetable.cpp b/product/src/application/app_bas_timetable/ReadTimetable.cpp index 02408190..43c2eb4e 100644 --- a/product/src/application/app_bas_timetable/ReadTimetable.cpp +++ b/product/src/application/app_bas_timetable/ReadTimetable.cpp @@ -8,7 +8,7 @@ using namespace std; using namespace iot_public; -kbd_app::CReadTimetable::CReadTimetable(const iot_public::SRunAppInfo &stRunAppInfo, +iot_app::CReadTimetable::CReadTimetable(const iot_public::SRunAppInfo &stRunAppInfo, const CParamMngPtr &ptrParamMng, const CTimetableMsgBusMngPtr &ptrMsgMng, const CBasicOperationPtr &ptrBasicOpt) @@ -19,7 +19,7 @@ kbd_app::CReadTimetable::CReadTimetable(const iot_public::SRunAppInfo &stRunAppI { } -kbd_app::CReadTimetable::~CReadTimetable() +iot_app::CReadTimetable::~CReadTimetable() { m_ptrBasicOpt.reset(); m_ptrMsgMng.reset(); @@ -27,7 +27,7 @@ kbd_app::CReadTimetable::~CReadTimetable() } /* @brief 处理读取命令 */ -void kbd_app::CReadTimetable::handleManualRead(STimetableCmd &stCmd) +void iot_app::CReadTimetable::handleManualRead(STimetableCmd &stCmd) { ETimetableCmdState eTemp = ETimetableCmdState_Invalid; while (eTemp != stCmd.eState) @@ -69,7 +69,7 @@ void kbd_app::CReadTimetable::handleManualRead(STimetableCmd &stCmd) } } -void kbd_app::CReadTimetable::setURFFlag(STimetableCmd &stCmd, +void iot_app::CReadTimetable::setURFFlag(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) { @@ -128,7 +128,7 @@ void kbd_app::CReadTimetable::setURFFlag(STimetableCmd &stCmd, } -void kbd_app::CReadTimetable::waitURFFlagRep(STimetableCmd &stCmd, +void iot_app::CReadTimetable::waitURFFlagRep(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) { @@ -170,7 +170,7 @@ void kbd_app::CReadTimetable::waitURFFlagRep(STimetableCmd &stCmd, } } -void kbd_app::CReadTimetable::waitRRFFlag(STimetableCmd &stCmd, +void iot_app::CReadTimetable::waitRRFFlag(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) { @@ -192,7 +192,7 @@ void kbd_app::CReadTimetable::waitRRFFlag(STimetableCmd &stCmd, //检查RRF == 1 int nRRF = 0; - if (kbdSuccess == m_ptrBasicOpt->getPointValue(stCtrlParam.szRRFTag, nRRF)) + if (iotSuccess == m_ptrBasicOpt->getPointValue(stCtrlParam.szRRFTag, nRRF)) { if (nRRF == 1) { @@ -201,12 +201,12 @@ void kbd_app::CReadTimetable::waitRRFFlag(STimetableCmd &stCmd, } } -void kbd_app::CReadTimetable::checkFlag(STimetableCmd &stCmd, +void iot_app::CReadTimetable::checkFlag(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) { string strErrMsg; - if (kbdSuccess == m_ptrBasicOpt->checkFlag(stCmd, strErrMsg)) + if (iotSuccess == m_ptrBasicOpt->checkFlag(stCmd, strErrMsg)) { stCmd.setResult(true, strErrMsg, eSuccessState); } @@ -216,7 +216,7 @@ void kbd_app::CReadTimetable::checkFlag(STimetableCmd &stCmd, } } -void kbd_app::CReadTimetable::resetRRFFlag(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) +void iot_app::CReadTimetable::resetRRFFlag(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) { stCmd.lCurCmdTimeMsec = getUTCTimeMsec(); @@ -252,7 +252,7 @@ void kbd_app::CReadTimetable::resetRRFFlag(STimetableCmd &stCmd, const ETimetabl } } -void kbd_app::CReadTimetable::waitResetRRFFlagRep(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) +void iot_app::CReadTimetable::waitResetRRFFlagRep(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) { int64 lCurTimeMsec = getUTCTimeMsec(); if (lCurTimeMsec - stCmd.lCmdBeginTimeMsec > stCmd.nTimeoutMsec) @@ -291,7 +291,7 @@ void kbd_app::CReadTimetable::waitResetRRFFlagRep(STimetableCmd &stCmd, const ET } /* @brief 发送读取命令消息 */ -void kbd_app::CReadTimetable::sendReadCmd(STimetableCmd &stCmd, +void iot_app::CReadTimetable::sendReadCmd(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) { @@ -318,7 +318,7 @@ void kbd_app::CReadTimetable::sendReadCmd(STimetableCmd &stCmd, } /* @brief 检查读取命令执行结果 */ -void kbd_app::CReadTimetable::waitReadResult(STimetableCmd &stCmd, +void iot_app::CReadTimetable::waitReadResult(STimetableCmd &stCmd, const ETimetableCmdState eSuccessState, const ETimetableCmdState eFailState) { @@ -360,7 +360,7 @@ void kbd_app::CReadTimetable::waitReadResult(STimetableCmd &stCmd, } /* @brief 读取命令完成后的处理 */ -void kbd_app::CReadTimetable::readCompleted(STimetableCmd &stCmd) +void iot_app::CReadTimetable::readCompleted(STimetableCmd &stCmd) { //TODO:产生事件 if (stCmd.bIsSuccess) @@ -378,7 +378,7 @@ void kbd_app::CReadTimetable::readCompleted(STimetableCmd &stCmd) } /* @brief 生成读取时间表命令报文 */ -bool kbd_app::CReadTimetable::makeReadMsg(const STimetableCmd &stCmd, std::string &strMsg) +bool iot_app::CReadTimetable::makeReadMsg(const STimetableCmd &stCmd, std::string &strMsg) { STableCtrlParam stCtrlParam; if (!m_ptrParamMng->getCtrlParamByLocationId(stCmd.nLocationId, stCtrlParam)) diff --git a/product/src/application/app_bas_timetable/ReadTimetable.h b/product/src/application/app_bas_timetable/ReadTimetable.h index 9398a3ce..61a870aa 100644 --- a/product/src/application/app_bas_timetable/ReadTimetable.h +++ b/product/src/application/app_bas_timetable/ReadTimetable.h @@ -4,7 +4,7 @@ #include "TimetableMsgBusMng.h" #include "BasicOperation.h" -namespace kbd_app +namespace iot_app { class CReadTimetable { @@ -71,4 +71,4 @@ namespace kbd_app }; typedef boost::shared_ptr CReadTimetablePtr; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_bas_timetable/TimetableCommon.h b/product/src/application/app_bas_timetable/TimetableCommon.h index 045b0826..54cc22dd 100644 --- a/product/src/application/app_bas_timetable/TimetableCommon.h +++ b/product/src/application/app_bas_timetable/TimetableCommon.h @@ -10,7 +10,7 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "operate_server_api/JsonOptCommand.h" -namespace kbd_app +namespace iot_app { const std::string CN_ProcName_TimetableServer = "app_bas_timetable"; //< 当前进程名 diff --git a/product/src/application/app_bas_timetable/TimetableCtrlParamTable.h b/product/src/application/app_bas_timetable/TimetableCtrlParamTable.h index 2bcfa20b..29f56663 100644 --- a/product/src/application/app_bas_timetable/TimetableCtrlParamTable.h +++ b/product/src/application/app_bas_timetable/TimetableCtrlParamTable.h @@ -5,7 +5,7 @@ */ #pragma once -namespace kbd_app +namespace iot_app { const std::string CN_TN_BasTimetableCtrlParam = "bas_timetable_ctrl_param"; //< 车站控制参数表名 @@ -34,4 +34,4 @@ namespace kbd_app }STableCtrlParam, *PSTableCtrlParam; typedef std::map LocationIdToCtrlParamMAP; //< 车站控制参数<车站ID，控制参数配置> -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_bas_timetable/TimetableDefTable.h b/product/src/application/app_bas_timetable/TimetableDefTable.h index 2b80462f..49d4e79b 100644 --- a/product/src/application/app_bas_timetable/TimetableDefTable.h +++ b/product/src/application/app_bas_timetable/TimetableDefTable.h @@ -6,7 +6,7 @@ #pragma once #include "TimetableCommon.h" -namespace kbd_app +namespace iot_app { const std::string CN_TN_BasTimetableDef = "bas_timetable_def"; //< 表名 @@ -36,4 +36,4 @@ namespace kbd_app } }STableTimetableDef, *PSTableTimetableDef; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_bas_timetable/TimetableInfoTable.h b/product/src/application/app_bas_timetable/TimetableInfoTable.h index 3aec0bae..bb3a26df 100644 --- a/product/src/application/app_bas_timetable/TimetableInfoTable.h +++ b/product/src/application/app_bas_timetable/TimetableInfoTable.h @@ -5,7 +5,7 @@ */ #pragma once -namespace kbd_app +namespace iot_app { const std::string CN_TN_BasTimetableInfo = "bas_timetable_info"; @@ -37,4 +37,4 @@ namespace kbd_app } }STableTimetableInfo, *PSTableTimetableInfo; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_bas_timetable/TimetableModeTable.h b/product/src/application/app_bas_timetable/TimetableModeTable.h index c1c3c11c..36e216bd 100644 --- a/product/src/application/app_bas_timetable/TimetableModeTable.h +++ b/product/src/application/app_bas_timetable/TimetableModeTable.h @@ -5,7 +5,7 @@ */ #pragma once -namespace kbd_app +namespace iot_app { const std::string CN_TN_BasModeDef = "bas_mode_def"; @@ -40,4 +40,4 @@ namespace kbd_app } }STableModeDef, *PSTableModeDef; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_bas_timetable/TimetableMsgBusMng.cpp b/product/src/application/app_bas_timetable/TimetableMsgBusMng.cpp index 6fae5e5e..b18481af 100644 --- a/product/src/application/app_bas_timetable/TimetableMsgBusMng.cpp +++ b/product/src/application/app_bas_timetable/TimetableMsgBusMng.cpp @@ -12,12 +12,12 @@ using namespace std; using namespace iot_public; -using namespace kbd_app; +using namespace iot_app; using namespace iot_dbms; using namespace iot_net; -kbd_app::CTimetableMsgBusMng::CTimetableMsgBusMng(const iot_public::SRunAppInfo &stRunAppInfo, +iot_app::CTimetableMsgBusMng::CTimetableMsgBusMng(const iot_public::SRunAppInfo &stRunAppInfo, const iot_public::CSysInfoInterfacePtr &ptrSysInfo) :m_stRunAppInfo(stRunAppInfo), m_ptrSysInfo(ptrSysInfo) @@ -25,18 +25,18 @@ kbd_app::CTimetableMsgBusMng::CTimetableMsgBusMng(const iot_public::SRunAppInfo } -kbd_app::CTimetableMsgBusMng::~CTimetableMsgBusMng() +iot_app::CTimetableMsgBusMng::~CTimetableMsgBusMng() { m_ptrSysInfo.reset(); } /* @brief 订阅消息通道 */ -int kbd_app::CTimetableMsgBusMng::subscribeMessage() +int iot_app::CTimetableMsgBusMng::subscribeMessage() { if (!m_objCommunicator.addSub(m_stRunAppInfo.nAppId, CH_HMI_TO_TIMETABLE)) { LOGERROR("通道[CH_HMI_TO_TIMETABLE]订阅失败."); - return kbdFailed; + return iotFailed; } else { @@ -46,18 +46,18 @@ int kbd_app::CTimetableMsgBusMng::subscribeMessage() if (!m_objCommunicator.addSub(m_stRunAppInfo.nAppId, CH_OPT_TO_HMI_OPTCMD_UP)) { LOGERROR("通道[CH_OPT_TO_HMI_OPTCMD_UP]订阅失败."); - return kbdFailed; + return iotFailed; } else { LOGINFO("订阅通道[CH_OPT_TO_HMI_OPTCMD_UP]成功"); } - return kbdSuccess; + return iotSuccess; } /* @brief 取消消息订阅 */ -int kbd_app::CTimetableMsgBusMng::unsubscribeMessage() +int iot_app::CTimetableMsgBusMng::unsubscribeMessage() { std::vector vecSub = m_objCommunicator.getMySub(); for (size_t i = 0; i < vecSub.size(); ++i) @@ -65,7 +65,7 @@ int kbd_app::CTimetableMsgBusMng::unsubscribeMessage() if (!m_objCommunicator.delSub(vecSub[i].getAppID(), vecSub[i].getChannelID())) { LOGERROR("取消通道[%d-%d]订阅失败.", vecSub[i].getAppID(), vecSub[i].getChannelID()); - return kbdFailed; + return iotFailed; } } @@ -75,23 +75,23 @@ int kbd_app::CTimetableMsgBusMng::unsubscribeMessage() { } - return kbdSuccess; + return iotSuccess; } /* @brief 初始化 */ -int kbd_app::CTimetableMsgBusMng::initialize() +int iot_app::CTimetableMsgBusMng::initialize() { - return kbdSuccess; + return iotSuccess; } /* @brief 接收消息 */ -bool kbd_app::CTimetableMsgBusMng::recvMsg(iot_net::CMbMessage &objMsg, int nTimeoutMsec /*= 0*/) +bool iot_app::CTimetableMsgBusMng::recvMsg(iot_net::CMbMessage &objMsg, int nTimeoutMsec /*= 0*/) { return m_objCommunicator.recvMsg(objMsg, nTimeoutMsec); } /* @brief 发送消息 */ -bool kbd_app::CTimetableMsgBusMng::sendMsgToMsgBus(const std::string &strMsg, +bool iot_app::CTimetableMsgBusMng::sendMsgToMsgBus(const std::string &strMsg, const int nChannel, const int nMsgType, const int nDstDomain, @@ -127,7 +127,7 @@ bool kbd_app::CTimetableMsgBusMng::sendMsgToMsgBus(const std::string &strMsg, } /* @brief 获取通信器名称 */ -std::string kbd_app::CTimetableMsgBusMng::getCommunicatorName() +std::string iot_app::CTimetableMsgBusMng::getCommunicatorName() { return m_objCommunicator.getName(); } diff --git a/product/src/application/app_bas_timetable/TimetableMsgBusMng.h b/product/src/application/app_bas_timetable/TimetableMsgBusMng.h index c0e71ed0..d55027b3 100644 --- a/product/src/application/app_bas_timetable/TimetableMsgBusMng.h +++ b/product/src/application/app_bas_timetable/TimetableMsgBusMng.h @@ -9,7 +9,7 @@ #include "rdb_api/CRdbAccessEx.h" #include "TimetableRtdbTableOperate.h" -namespace kbd_app +namespace iot_app { class CTimetableMsgBusMng { @@ -20,17 +20,17 @@ namespace kbd_app /* @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); /* @brief 订阅消息通道 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int subscribeMessage(); /* @brief 取消消息订阅 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int unsubscribeMessage(); /* diff --git a/product/src/application/app_bas_timetable/TimetableRtdbTableOperate.cpp b/product/src/application/app_bas_timetable/TimetableRtdbTableOperate.cpp index 9a79ddbf..da5dc5f9 100644 --- a/product/src/application/app_bas_timetable/TimetableRtdbTableOperate.cpp +++ b/product/src/application/app_bas_timetable/TimetableRtdbTableOperate.cpp @@ -4,18 +4,18 @@ using namespace std; using namespace iot_public; -using namespace kbd_app; +using namespace iot_app; using namespace iot_dbms; using namespace iot_service; -kbd_app::CTimetableRtdbTableOperate::CTimetableRtdbTableOperate(const iot_public::SRunAppInfo &stRunAppInfo) +iot_app::CTimetableRtdbTableOperate::CTimetableRtdbTableOperate(const iot_public::SRunAppInfo &stRunAppInfo) :m_stRunAppInfo(stRunAppInfo), m_ptrTableMng(NULL), m_ptrDpApi(NULL) { } -kbd_app::CTimetableRtdbTableOperate::~CTimetableRtdbTableOperate() +iot_app::CTimetableRtdbTableOperate::~CTimetableRtdbTableOperate() { if (m_objTimetableDefTable.isOpen()) { @@ -42,71 +42,71 @@ kbd_app::CTimetableRtdbTableOperate::~CTimetableRtdbTableOperate() } /* @brief 初始化内存表操作类 */ -int kbd_app::CTimetableRtdbTableOperate::initialize() +int iot_app::CTimetableRtdbTableOperate::initialize() { m_ptrDpApi = getDataProcInstance(m_stRunAppInfo.strAppName); if (m_ptrDpApi == NULL) { LOGERROR("创建DataProcessApi接口失败"); - return kbdFailed; + return iotFailed; } m_ptrTableMng = boost::make_shared(m_stRunAppInfo.strAppName); if (m_ptrTableMng == NULL) { LOGERROR("创建测点内存表管理类失败"); - return kbdFailed; + return iotFailed; } if (!m_objScheduleTable.open(m_stRunAppInfo.nAppId, CN_TN_BasTimetableSchedule.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]", m_stRunAppInfo.nAppId, CN_TN_BasTimetableSchedule.c_str()); - return kbdFailed; + return iotFailed; } if (!m_objCtrlParamTable.open(m_stRunAppInfo.nAppId, CN_TN_BasTimetableCtrlParam.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]", m_stRunAppInfo.nAppId, CN_TN_BasTimetableCtrlParam.c_str()); - return kbdFailed; + return iotFailed; } if (!m_objTimetableDefTable.open(m_stRunAppInfo.nAppId, CN_TN_BasTimetableDef.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]", m_stRunAppInfo.nAppId, CN_TN_BasTimetableDef.c_str()); - return kbdFailed; + return iotFailed; } if (!m_objTimetableInfoTable.open(m_stRunAppInfo.nAppId, CN_TN_BasTimetableInfo.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]", m_stRunAppInfo.nAppId, CN_TN_BasTimetableInfo.c_str()); - return kbdFailed; + return iotFailed; } if (!m_objModeDefTable.open(m_stRunAppInfo.nAppId, CN_TN_BasModeDef.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]", m_stRunAppInfo.nAppId, CN_TN_BasModeDef.c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 获取定时时间表列表 */ -int kbd_app::CTimetableRtdbTableOperate::getAllTimetableOrderPri(std::vector &vecRecord) +int iot_app::CTimetableRtdbTableOperate::getAllTimetableOrderPri(std::vector &vecRecord) { CTableLockGuard tableLock(m_objScheduleTable); //< 加锁保护表 if (!m_objScheduleTable.selectJustAll(vecRecord, TIMETABLE_SCHEDULE_COL_DATE_TYPE)) { LOGERROR("获取[%s]表记录失败", CN_TN_BasTimetableSchedule.c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 获取时间表定义 */ -int kbd_app::CTimetableRtdbTableOperate::getTimetableDefine(const int nLocationId, const int nTimetableId, STableTimetableDef &stTimetableDef) +int iot_app::CTimetableRtdbTableOperate::getTimetableDefine(const int nLocationId, const int nTimetableId, STableTimetableDef &stTimetableDef) { vector vecCol; vector vecCond; @@ -120,23 +120,23 @@ int kbd_app::CTimetableRtdbTableOperate::getTimetableDefine(const int nLocationI { LOGERROR("查询表[%s]记录[%s=%d,%s=%d]失败.", CN_TN_BasTimetableDef.c_str(), BAS_TIMETABLE_DEF_COL_LOCATION_ID, nLocationId, BAS_TIMETABLE_DEF_COL_ID, nTimetableId); - return kbdFailed; + return iotFailed; } if (vecRecord.size() != 1) //< 查询正确的话，只会返回一条信息 { LOGERROR("查询表[%s]记录[%s=%d,%s=%d]失败,预期记录数[1],实际[%d].", CN_TN_BasTimetableDef.c_str(), BAS_TIMETABLE_DEF_COL_LOCATION_ID, nLocationId, BAS_TIMETABLE_DEF_COL_ID, nTimetableId, (int)vecRecord.size()); - return kbdFailed; + return iotFailed; } stTimetableDef = vecRecord[0]; - return kbdSuccess; + return iotSuccess; } /* @brief 获取时间表信息 */ -int kbd_app::CTimetableRtdbTableOperate::getTimetableInfo(const int nLocationId, +int iot_app::CTimetableRtdbTableOperate::getTimetableInfo(const int nLocationId, const int nTimetableId, std::vector &vecInfo) { @@ -151,21 +151,21 @@ int kbd_app::CTimetableRtdbTableOperate::getTimetableInfo(const int nLocationId, { LOGERROR("查询表[%s]记录[%s=%d,%s=%d]失败.", CN_TN_BasTimetableInfo.c_str(), BAS_TIMETABLE_INFO_COL_LOCATION_ID, nLocationId, BAS_TIMETABLE_INFO_COL_ID, nTimetableId); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 获取车站控制参数配置 */ -int kbd_app::CTimetableRtdbTableOperate::getCtrlParam(LocationIdToCtrlParamMAP &mapCtrlParam) +int iot_app::CTimetableRtdbTableOperate::getCtrlParam(LocationIdToCtrlParamMAP &mapCtrlParam) { vector vecCtrlParam; CTableLockGuard tableLock(m_objCtrlParamTable); //< 加锁保护表 if (!m_objCtrlParamTable.selectJustAll(vecCtrlParam)) { LOGERROR("获取表[%s]记录失败.Error=[%s]", CN_TN_BasTimetableCtrlParam.c_str(), m_objCtrlParamTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } for (BOOST_AUTO(pIter, vecCtrlParam.begin()); pIter != vecCtrlParam.end(); ++pIter) @@ -174,18 +174,18 @@ int kbd_app::CTimetableRtdbTableOperate::getCtrlParam(LocationIdToCtrlParamMAP & mapCtrlParam[stCtrlParam.nLocationId] = stCtrlParam; } - return kbdSuccess; + return iotSuccess; } /* @brief 获取指定测点的值（状态字无效，则认为获取失败） */ -int kbd_app::CTimetableRtdbTableOperate::getPointValue(const std::string &strKeyIdTag, int &nValue) +int iot_app::CTimetableRtdbTableOperate::getPointValue(const std::string &strKeyIdTag, int &nValue) { vector vecField; boost::algorithm::split(vecField, strKeyIdTag, boost::algorithm::is_any_of(".")); if (vecField.size() != CN_KEY_ID_TAG_FIELD_LEN) { LOGERROR("测点格式不正确.[%s]", strKeyIdTag.c_str()); - return kbdFailed; + return iotFailed; } string strTableName = vecField[0]; @@ -231,7 +231,7 @@ int kbd_app::CTimetableRtdbTableOperate::getPointValue(const std::string &strKey if (m_ptrDpApi->isNormal(TYPE_STATUS_AI, stValue.nStatus)) { nValue = static_cast(stValue.dValue); - return kbdSuccess; + return iotSuccess; } } } @@ -243,7 +243,7 @@ int kbd_app::CTimetableRtdbTableOperate::getPointValue(const std::string &strKey if (m_ptrDpApi->isNormal(TYPE_STATUS_AI, stValue.nStatus)) { nValue = stValue.nValue; - return kbdSuccess; + return iotSuccess; } } } @@ -255,16 +255,16 @@ int kbd_app::CTimetableRtdbTableOperate::getPointValue(const std::string &strKey if (m_ptrDpApi->isNormal(TYPE_STATUS_DI, stValue.nStatus)) { nValue = stValue.nValue; - return kbdSuccess; + return iotSuccess; } } } - return kbdFailed; + return iotFailed; } /* @brief 获取模式信息 */ -int kbd_app::CTimetableRtdbTableOperate::getModeInfo(int nLocationId, int nCraftId, int nModeId, STableModeDef &stModeInfo) +int iot_app::CTimetableRtdbTableOperate::getModeInfo(int nLocationId, int nCraftId, int nModeId, STableModeDef &stModeInfo) { vector vecCol; vector vecCond; @@ -279,7 +279,7 @@ int kbd_app::CTimetableRtdbTableOperate::getModeInfo(int nLocationId, int nCraft LOGERROR("查询表[%s]记录[%s=%d,%s=%d,%s=%d]失败.", CN_TN_BasModeDef.c_str(), BAS_MODE_DEF_COL_LOCATION_ID, nLocationId, BAS_MODE_DEF_COL_CRAFT_ID, nCraftId, BAS_MODE_DEF_COL_ID, nModeId); - return kbdFailed; + return iotFailed; } if (vecRecord.size() != 1) @@ -287,10 +287,10 @@ int kbd_app::CTimetableRtdbTableOperate::getModeInfo(int nLocationId, int nCraft LOGERROR("查询表[%s]记录[%s=%d,%s=%d,%s=%d]失败,预期记录数[1],实际[%d].", CN_TN_BasModeDef.c_str(), BAS_MODE_DEF_COL_LOCATION_ID, nLocationId, BAS_MODE_DEF_COL_CRAFT_ID, nCraftId, BAS_MODE_DEF_COL_ID, nModeId, (int)vecRecord.size()); - return kbdFailed; + return iotFailed; } stModeInfo = vecRecord[0]; - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/app_bas_timetable/TimetableRtdbTableOperate.h b/product/src/application/app_bas_timetable/TimetableRtdbTableOperate.h index ed3f6409..0cd752b1 100644 --- a/product/src/application/app_bas_timetable/TimetableRtdbTableOperate.h +++ b/product/src/application/app_bas_timetable/TimetableRtdbTableOperate.h @@ -15,7 +15,7 @@ #include "TimetableInfoTable.h" #include "TimetableModeTable.h" -namespace kbd_app +namespace iot_app { class CTimetableRtdbTableOperate { @@ -25,14 +25,14 @@ namespace kbd_app /* @brief 初始化内存表操作类 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int initialize(); /* @brief 获取定时时间表列表 @param std::vector & vecRecord 返回的定时时间表记录 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int getAllTimetableOrderPri(std::vector &vecRecord); @@ -41,7 +41,7 @@ namespace kbd_app @param const int nLocationId 车站ID @param const int nTimetableId 时间表ID @param STableTimetableDef & stTimetableDef 返回的时间表定义 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int getTimetableDefine(const int nLocationId, const int nTimetableId, STableTimetableDef &stTimetableDef); @@ -50,14 +50,14 @@ namespace kbd_app @param const int nLocationId 车站ID @param const int nTimetableId 时间表ID @param std::vector & vecInfo 返回的时间表信息 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int getTimetableInfo(const int nLocationId, const int nTimetableId, std::vector &vecInfo); /* @brief 获取车站控制参数配置 @param LocationIdToCtrlParamMAP & mapCtrlParam 返回的车站控制参数配置 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int getCtrlParam(LocationIdToCtrlParamMAP &mapCtrlParam); @@ -65,7 +65,7 @@ namespace kbd_app @brief 获取指定测点的值（状态字无效，则认为获取失败） @param const std::string & strKeyIdTag 测点ID @param int & nValue 返回的测点值 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int getPointValue(const std::string &strKeyIdTag, int &nValue); @@ -75,7 +75,7 @@ namespace kbd_app @param int nCraftId 工艺ID @param int nModeId 模式ID @param STableModeDef & stModeInfo 返回的模式信息 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int getModeInfo(int nLocationId, int nCraftId, int nModeId, STableModeDef &stModeInfo); @@ -92,4 +92,4 @@ namespace kbd_app typedef boost::shared_ptr CRtdbTableOperatePtr; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_bas_timetable/TimetableScheduleTable.h b/product/src/application/app_bas_timetable/TimetableScheduleTable.h index 78f5d0ae..b005f8c1 100644 --- a/product/src/application/app_bas_timetable/TimetableScheduleTable.h +++ b/product/src/application/app_bas_timetable/TimetableScheduleTable.h @@ -5,7 +5,7 @@ */ #pragma once -namespace kbd_app +namespace iot_app { const std::string CN_TN_BasTimetableSchedule = "bas_timetable_schedule"; @@ -52,4 +52,4 @@ namespace kbd_app } }STableTimetableSchedule, *PSTableTimetableSchedule; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_bas_timetable/TimetableServerApp.cpp b/product/src/application/app_bas_timetable/TimetableServerApp.cpp index ec679fdc..bc331744 100644 --- a/product/src/application/app_bas_timetable/TimetableServerApp.cpp +++ b/product/src/application/app_bas_timetable/TimetableServerApp.cpp @@ -13,13 +13,13 @@ using namespace std; using namespace iot_public; using namespace iot_sys; -using namespace kbd_app; +using namespace iot_app; using namespace iot_net; #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" -kbd_app::CTimetableServerApp::CTimetableServerApp() +iot_app::CTimetableServerApp::CTimetableServerApp() :m_ptrSysInfo(NULL), m_ptrProcMng(NULL), m_ptrRedundancyMng(NULL), @@ -27,12 +27,12 @@ kbd_app::CTimetableServerApp::CTimetableServerApp() { } -kbd_app::CTimetableServerApp::~CTimetableServerApp() +iot_app::CTimetableServerApp::~CTimetableServerApp() { CTimetableServerApp::stop(); } -bool kbd_app::CTimetableServerApp::start(int argc, char *argv[], int &/*nStatus*/) +bool iot_app::CTimetableServerApp::start(int argc, char *argv[], int &/*nStatus*/) { iot_public::initI18N(".", "", ""); //1.解析启动参数 @@ -83,14 +83,14 @@ bool kbd_app::CTimetableServerApp::start(int argc, char *argv[], int &/*nStatus* } //8.设置冗余通知回调 - if (kbdSuccess != m_ptrRedundancyMng->setCallback(m_ptrTimetableSrvMng)) + if (iotSuccess != m_ptrRedundancyMng->setCallback(m_ptrTimetableSrvMng)) { LOGERROR("设置冗余回调接口失败"); return false; } //9.更新当前进程冗余状态 - if (kbdSuccess != m_ptrProcMng->updateProcessInfo(true, false, false)) + if (iotSuccess != m_ptrProcMng->updateProcessInfo(true, false, false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -99,7 +99,7 @@ bool kbd_app::CTimetableServerApp::start(int argc, char *argv[], int &/*nStatus* return true; } -bool kbd_app::CTimetableServerApp::stop() +bool iot_app::CTimetableServerApp::stop() { //9.更新当前进程冗余状态 if (m_ptrProcMng != NULL) @@ -132,7 +132,7 @@ bool kbd_app::CTimetableServerApp::stop() return true; } -int kbd_app::CTimetableServerApp::toQuit() +int iot_app::CTimetableServerApp::toQuit() { if (m_ptrProcMng != NULL) { @@ -140,11 +140,11 @@ int kbd_app::CTimetableServerApp::toQuit() } shutdown(); - return kbdSuccess; + return iotSuccess; } /* @brief 解析启动参数 */ -bool kbd_app::CTimetableServerApp::parseCmdLine(int argc, char *argv[]) +bool iot_app::CTimetableServerApp::parseCmdLine(int argc, char *argv[]) { /* @brief 拼接启动参数，用于向进程管理注册 */ for (int i = 1; i < argc; ++i) @@ -205,26 +205,26 @@ bool kbd_app::CTimetableServerApp::parseCmdLine(int argc, char *argv[]) return true; } -void kbd_app::CTimetableServerApp::showHelp(const boost::program_options::options_description &objDesc) +void iot_app::CTimetableServerApp::showHelp(const boost::program_options::options_description &objDesc) { std::cout << CN_ProcName_TimetableServer << " [-h] | [-a app]" << std::endl; std::cout << objDesc << std::endl; } -bool kbd_app::CTimetableServerApp::isAlreadyRunning() +bool iot_app::CTimetableServerApp::isAlreadyRunning() { string strUniqueName = CN_ProcName_TimetableServer; strUniqueName += m_strStartArgs; return CSingleProcInstance::hasInstanceRunning(strUniqueName); } -bool kbd_app::CTimetableServerApp::initLog() +bool iot_app::CTimetableServerApp::initLog() { StartLogSystem(m_strAppName.c_str(), CN_ProcName_TimetableServer.c_str()); return true; } -bool kbd_app::CTimetableServerApp::getSystemInfo() +bool iot_app::CTimetableServerApp::getSystemInfo() { if (!createSysInfoInstance(m_ptrSysInfo)) { @@ -232,7 +232,7 @@ bool kbd_app::CTimetableServerApp::getSystemInfo() return false; } - if (kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName, m_stRunAppInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName, m_stRunAppInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -242,7 +242,7 @@ bool kbd_app::CTimetableServerApp::getSystemInfo() } /* @brief 向进程管理注册 */ -bool kbd_app::CTimetableServerApp::registToProcMng() +bool iot_app::CTimetableServerApp::registToProcMng() { SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stRunAppInfo.nDomainId; @@ -258,7 +258,7 @@ bool kbd_app::CTimetableServerApp::registToProcMng() return false; } - if (kbdSuccess != m_ptrProcMng->setCallback(this)) + if (iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -267,13 +267,13 @@ bool kbd_app::CTimetableServerApp::registToProcMng() return true; } -bool kbd_app::CTimetableServerApp::initialize() +bool iot_app::CTimetableServerApp::initialize() { /* @brief 初始化消息总线 */ if (!initMsgBus(CN_ProcName_TimetableServer.c_str(), "")) { LOGERROR("初始化消息总线失败"); - return kbdFailed; + return iotFailed; } /* @brief 创建时间表服务管理类 */ @@ -284,7 +284,7 @@ bool kbd_app::CTimetableServerApp::initialize() return false; } - if (kbdSuccess != m_ptrTimetableSrvMng->initialize()) + if (iotSuccess != m_ptrTimetableSrvMng->initialize()) { LOGERROR("初始化时间表服务管理类失败"); return false; @@ -294,7 +294,7 @@ bool kbd_app::CTimetableServerApp::initialize() } /* @brief 清理业务资源 */ -bool kbd_app::CTimetableServerApp::clean() +bool iot_app::CTimetableServerApp::clean() { if (m_ptrTimetableSrvMng != NULL) { diff --git a/product/src/application/app_bas_timetable/TimetableServerApp.h b/product/src/application/app_bas_timetable/TimetableServerApp.h index 0a07054d..ae172b97 100644 --- a/product/src/application/app_bas_timetable/TimetableServerApp.h +++ b/product/src/application/app_bas_timetable/TimetableServerApp.h @@ -10,7 +10,7 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "TimetableServerMng.h" -namespace kbd_app +namespace iot_app { class CTimetableServerApp : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { @@ -99,4 +99,4 @@ namespace kbd_app CPaServerMngPtr m_ptrTimetableSrvMng; //< 时间表服务管理类 }; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_bas_timetable/TimetableServerMng.cpp b/product/src/application/app_bas_timetable/TimetableServerMng.cpp index 8ac69743..88596287 100644 --- a/product/src/application/app_bas_timetable/TimetableServerMng.cpp +++ b/product/src/application/app_bas_timetable/TimetableServerMng.cpp @@ -6,7 +6,7 @@ #include "TimetableServerMng.h" #include "pub_logger_api/logger.h" -kbd_app::CTimetableServerMng::CTimetableServerMng(const iot_public::SRunAppInfo &stRunAppInfo, +iot_app::CTimetableServerMng::CTimetableServerMng(const iot_public::SRunAppInfo &stRunAppInfo, const iot_public::CSysInfoInterfacePtr &ptrSysInfo, const iot_sys::CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), @@ -16,7 +16,7 @@ kbd_app::CTimetableServerMng::CTimetableServerMng(const iot_public::SRunAppInfo { } -kbd_app::CTimetableServerMng::~CTimetableServerMng() +iot_app::CTimetableServerMng::~CTimetableServerMng() { if (m_ptrTimetableThread != NULL) { @@ -29,9 +29,9 @@ kbd_app::CTimetableServerMng::~CTimetableServerMng() } /* @brief 冗余切换 */ -int kbd_app::CTimetableServerMng::redundantSwitch(bool bMaster, bool bSlave) +int iot_app::CTimetableServerMng::redundantSwitch(bool bMaster, bool bSlave) { - int nRet = kbdSuccess; + int nRet = iotSuccess; LOGWARN("接收到冗余切换指令.Master=[%d],Slave=[%d]", bMaster, bSlave); if (bMaster && !bSlave) //< 为主 { @@ -44,33 +44,33 @@ int kbd_app::CTimetableServerMng::redundantSwitch(bool bMaster, bool bSlave) m_ptrTimetableThread->setSlave(); } - if (nRet == kbdSuccess) + if (nRet == iotSuccess) { m_ptrProcMng->updateProcessInfo(true, bMaster, bSlave); } - return kbdSuccess; + return iotSuccess; } /* @brief 初始化 */ -int kbd_app::CTimetableServerMng::initialize() +int iot_app::CTimetableServerMng::initialize() { //1.初始化时间表线程类 m_ptrTimetableThread = boost::make_shared(m_stRunAppInfo, m_ptrSysInfo); if (m_ptrTimetableThread == NULL) { LOGERROR("创建时间表下载线程失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrTimetableThread->initialize()) + if (iotSuccess != m_ptrTimetableThread->initialize()) { LOGERROR("初始化时间表下载线程失败"); - return kbdFailed; + return iotFailed; } //TODO: //redundantSwitch(true, false); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/app_bas_timetable/TimetableServerMng.h b/product/src/application/app_bas_timetable/TimetableServerMng.h index 1bf9e3e8..11bc6103 100644 --- a/product/src/application/app_bas_timetable/TimetableServerMng.h +++ b/product/src/application/app_bas_timetable/TimetableServerMng.h @@ -8,7 +8,7 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "TimetableThread.h" -namespace kbd_app +namespace iot_app { class CTimetableServerMng : public iot_sys::CRedundantSwitchInterface { @@ -23,12 +23,12 @@ namespace kbd_app 在进程切换过程中，可能会被调用多次切换，业务进程需要保证幂等，无副作用 @param bool bMaster 是否为主 @param bool bSlave 是否为备 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int redundantSwitch(bool bMaster, bool bSlave); /* @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); diff --git a/product/src/application/app_bas_timetable/TimetableThread.cpp b/product/src/application/app_bas_timetable/TimetableThread.cpp index 4ecfa70d..e0bc3a7c 100644 --- a/product/src/application/app_bas_timetable/TimetableThread.cpp +++ b/product/src/application/app_bas_timetable/TimetableThread.cpp @@ -10,11 +10,11 @@ using namespace std; using namespace iot_public; -using namespace kbd_app; +using namespace iot_app; using namespace iot_dbms; using namespace iot_net; -kbd_app::CTimetableThread::CTimetableThread(const iot_public::SRunAppInfo &stRunAppInfo, +iot_app::CTimetableThread::CTimetableThread(const iot_public::SRunAppInfo &stRunAppInfo, const iot_public::CSysInfoInterfacePtr &ptrSysInfo) :iot_public::CTimerThreadBase("CTimetableThread", 0), m_ptrSysInfo(ptrSysInfo), @@ -27,7 +27,7 @@ kbd_app::CTimetableThread::CTimetableThread(const iot_public::SRunAppInfo &stRun { } -kbd_app::CTimetableThread::~CTimetableThread() +iot_app::CTimetableThread::~CTimetableThread() { m_ptrReadCmd.reset(); m_ptrReadCmd.reset(); @@ -38,19 +38,19 @@ kbd_app::CTimetableThread::~CTimetableThread() } /* @brief 初始化 */ -int kbd_app::CTimetableThread::initialize() +int iot_app::CTimetableThread::initialize() { //1.获取车站列表 m_ptrParamMng = boost::make_shared(m_stRunAppInfo, m_ptrSysInfo); if (m_ptrParamMng == NULL) { LOGERROR("创建参数信息管理类失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrParamMng->initialize()) + if (iotSuccess != m_ptrParamMng->initialize()) { LOGERROR("初始化参数信息管理类失败"); - return kbdFailed; + return iotFailed; } //2.初始化消息总线管理类 @@ -58,12 +58,12 @@ int kbd_app::CTimetableThread::initialize() if (m_ptrMsgbusMng == NULL) { LOGERROR("创建消息总线管理类失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrMsgbusMng->initialize()) + if (iotSuccess != m_ptrMsgbusMng->initialize()) { LOGERROR("初始化消息总线管理类失败"); - return kbdFailed; + return iotFailed; } //3.初始化基础操作类 @@ -71,13 +71,13 @@ int kbd_app::CTimetableThread::initialize() if (m_ptrBasicOpt == NULL) { LOGERROR("创建基础操作类失败"); - return kbdFailed; + return iotFailed; } if (m_ptrBasicOpt->initialize()) { LOGERROR("初始化基础操作类失败"); - return kbdFailed; + return iotFailed; } //4.初始化时间表下载操作类 @@ -85,13 +85,13 @@ int kbd_app::CTimetableThread::initialize() if (m_ptrDownloadCmd == NULL) { LOGERROR("创建时间表下载操作类失败"); - return kbdFailed; + return iotFailed; } // if (m_ptrDownloadCmd->initialize()) // { // LOGERROR("初始化时间表下载操作类失败"); - // return kbdFailed; + // return iotFailed; // } //5.初始化读取时间表操作类 @@ -99,20 +99,20 @@ int kbd_app::CTimetableThread::initialize() if (m_ptrReadCmd == NULL) { LOGERROR("创建时间表读取操作类失败"); - return kbdFailed; + return iotFailed; } // if (m_ptrReadCmd->initialize()) // { // LOGERROR("初始化时间表读取操作类失败"); - // return kbdFailed; + // return iotFailed; // } - return kbdSuccess; + return iotSuccess; } /* @brief 添加定时任务到命令缓冲区 */ -bool kbd_app::CTimetableThread::addScheduleCmd(const STableTimetableSchedule &stSchedule) +bool iot_app::CTimetableThread::addScheduleCmd(const STableTimetableSchedule &stSchedule) { LOGINFO("车站[%d]开始执行定时下载时间表", stSchedule.stKey.nLocationId); @@ -150,7 +150,7 @@ bool kbd_app::CTimetableThread::addScheduleCmd(const STableTimetableSchedule &st } -void kbd_app::CTimetableThread::execute() +void iot_app::CTimetableThread::execute() { m_curTime = boost::posix_time::second_clock::local_time(); if (m_curTime.date() != m_readCfgDate) //< 新的一天,读取一遍配置参数 @@ -206,7 +206,7 @@ void kbd_app::CTimetableThread::execute() } /* @brief 设置为主 */ -int kbd_app::CTimetableThread::setMaster() +int iot_app::CTimetableThread::setMaster() { m_ptrBasicOpt->startAlarmSvr(); @@ -217,7 +217,7 @@ int kbd_app::CTimetableThread::setMaster() } /* @brief 设置为备 */ -int kbd_app::CTimetableThread::setSlave() +int iot_app::CTimetableThread::setSlave() { m_ptrBasicOpt->stopAlarmSvr(); @@ -227,7 +227,7 @@ int kbd_app::CTimetableThread::setSlave() } /* @brief 判断当前定时任务是否需要下载 */ -bool kbd_app::CTimetableThread::needDownload(const STableTimetableSchedule &stSchedule) +bool iot_app::CTimetableThread::needDownload(const STableTimetableSchedule &stSchedule) { //TODO:1、检查是否在时间范围内; // 2、检查PLC中的时间表ID和版本号与当前是否一致 @@ -270,7 +270,7 @@ bool kbd_app::CTimetableThread::needDownload(const STableTimetableSchedule &stSc } /* @brief 添加人工操作命令到命令缓冲区 */ -bool kbd_app::CTimetableThread::addManualCmd(const iot_net::CMbMessage &objMsg) +bool iot_app::CTimetableThread::addManualCmd(const iot_net::CMbMessage &objMsg) { if (objMsg.getMsgType() != MT_OPT_TIMETABLE_DOWNLOAD_DOWN && objMsg.getMsgType() != MT_OPT_TIMETABLE_READ_DOWN) @@ -316,7 +316,7 @@ bool kbd_app::CTimetableThread::addManualCmd(const iot_net::CMbMessage &objMsg) } /* @brief 添加命令反馈到缓冲区 */ -bool kbd_app::CTimetableThread::dispatchResponse(const iot_net::CMbMessage &objMsg) +bool iot_app::CTimetableThread::dispatchResponse(const iot_net::CMbMessage &objMsg) { bool bRet = false; switch (objMsg.getMsgType()) @@ -334,7 +334,7 @@ bool kbd_app::CTimetableThread::dispatchResponse(const iot_net::CMbMessage &objM return bRet; } -bool kbd_app::CTimetableThread::addCustomResponse(const iot_net::CMbMessage &objMsg) +bool iot_app::CTimetableThread::addCustomResponse(const iot_net::CMbMessage &objMsg) { COptCustCtrlReply objParse; SOptCustCtrlReply stRep; @@ -357,7 +357,7 @@ bool kbd_app::CTimetableThread::addCustomResponse(const iot_net::CMbMessage &obj return true; } -bool kbd_app::CTimetableThread::addPntResponse(const iot_net::CMbMessage &objMsg) +bool iot_app::CTimetableThread::addPntResponse(const iot_net::CMbMessage &objMsg) { COptCtrlReply objParse; SOptCtrlReply stRep; @@ -381,7 +381,7 @@ bool kbd_app::CTimetableThread::addPntResponse(const iot_net::CMbMessage &objMsg } /* @brief 处理命令 */ -void kbd_app::CTimetableThread::handleCmd() +void iot_app::CTimetableThread::handleCmd() { LocationToTimetableCmdMAP &mapLocationToCmd = m_ptrParamMng->getTimetableCmdBufRef(); for (LocationToTimetableCmdMAP::iterator pIter = mapLocationToCmd.begin(); pIter != mapLocationToCmd.end();) diff --git a/product/src/application/app_bas_timetable/TimetableThread.h b/product/src/application/app_bas_timetable/TimetableThread.h index 6a3f4c9e..1ffdb7c8 100644 --- a/product/src/application/app_bas_timetable/TimetableThread.h +++ b/product/src/application/app_bas_timetable/TimetableThread.h @@ -13,7 +13,7 @@ #include "DownloadTimetable.h" #include "ReadTimetable.h" -namespace kbd_app +namespace iot_app { class CTimetableThread : public iot_public::CTimerThreadBase { @@ -29,18 +29,18 @@ namespace kbd_app /* @brief 初始化 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int initialize(); /* @brief 设置为主 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int setMaster(); /* @brief 设置为备 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int setSlave(); diff --git a/product/src/application/app_bas_timetable/main.cpp b/product/src/application/app_bas_timetable/main.cpp index 3a60294f..6e76d92a 100644 --- a/product/src/application/app_bas_timetable/main.cpp +++ b/product/src/application/app_bas_timetable/main.cpp @@ -7,6 +7,6 @@ int main(int argc, char *argv[]) { - kbd_app::CTimetableServerApp objApp; + iot_app::CTimetableServerApp objApp; return objApp.main(argc, argv); } diff --git a/product/src/application/app_fbd/fbd_module/alarm_delay/CAlarmDelay.cpp b/product/src/application/app_fbd/fbd_module/alarm_delay/CAlarmDelay.cpp index 5bbf1010..73be432b 100644 --- a/product/src/application/app_fbd/fbd_module/alarm_delay/CAlarmDelay.cpp +++ b/product/src/application/app_fbd/fbd_module/alarm_delay/CAlarmDelay.cpp @@ -16,7 +16,7 @@ #include "rapidjson/stringbuffer.h" #include "rapidjson/error/en.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -52,35 +52,35 @@ int CAlarmDelay::init(const SFbdModKey &stModuleKey, const std::string &) if ( m_ptrDiagData == nullptr ) { LOGERROR( "模块[%s]获取Diagram数据接口单例失败",m_stModKey.toString().c_str() ); - return kbdFailed; + return iotFailed; } //1.获取输入、输出参数 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKey2 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 1, m_stOutputKey1 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 2, m_stOutputKey2 )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || + iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKey2 ) || + iotSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 1, m_stOutputKey1 ) || + iotSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 2, m_stOutputKey2 )) { LOGERROR( "获取模块[%s]的输入输出参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //2.获取屏蔽配置信息 std::string sFilter = ""; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_Filter, sFilter )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_Filter, sFilter )) { LOGERROR( "获取模块[%s]的屏蔽配置信息失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if(!fromFilterJson(sFilter.c_str())) { - return kbdFailed; + return iotFailed; } //4.获取延迟时间 std::string sDelayTime = ""; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_DelayTime, sDelayTime )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_DelayTime, sDelayTime )) { LOGERROR( "获取模块[%s]的延迟时间失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } m_nDelayTime = iot_public::StringToInt(sDelayTime); @@ -89,11 +89,11 @@ int CAlarmDelay::init(const SFbdModKey &stModuleKey, const std::string &) if(m_fbdAlarmCltApi == nullptr) { LOGERROR("模块[%s]初始化fbd告警接口指针失败!",m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } LOGINFO( "[%s]加载成功", m_stModKey.toString().c_str()); m_bInitialized = true; - return kbdSuccess; + return iotSuccess; } int CAlarmDelay::calculate() @@ -101,7 +101,7 @@ int CAlarmDelay::calculate() if ( !m_bInitialized ) { LOGERROR( "calculate(): 模块[%s]未成功初始化，不应执行延时！",m_stModKey.toString().c_str() ); - return kbdFailed; + return iotFailed; } //处理业务逻辑 @@ -109,20 +109,20 @@ int CAlarmDelay::calculate() setOLToZero(); SFbdNumericValue stValAndSta2; - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey2, stValAndSta2 )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey2, stValAndSta2 )) { LOGERROR( "获取模块[%s]的输入参数2的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } int nInValue2 = static_cast(stValAndSta2.m_dValue); if ( nInValue2 != 0 && isValidOfStatus( stValAndSta2.m_nStatus )) { SFbdAlarmValue almValAndSta; - if ( kbdSuccess != m_ptrDiagData->getAlarmValByKey( m_stInKey1, almValAndSta )) + if ( iotSuccess != m_ptrDiagData->getAlarmValByKey( m_stInKey1, almValAndSta )) { LOGERROR( "获取模块[%s]的输入参数1的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if ( isValidOfStatus( almValAndSta.m_nStatus )) @@ -193,14 +193,14 @@ void CAlarmDelay::setOLToZero() int CAlarmDelay::setAllOutputInvalid() { - int nRet = kbdSuccess; + int nRet = iotSuccess; SFbdNumericValue stNumericOutput( 0, CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputKey2, stNumericOutput )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputKey2, stNumericOutput )) { LOGERROR( "设置[%s]输出值失败", m_stOutputKey2.toString().c_str()); - nRet = kbdFailed; + nRet = iotFailed; } SFbdAlarmValue alarmInfoOutput; @@ -211,10 +211,10 @@ int CAlarmDelay::setAllOutputInvalid() SFbdAlarmValue alarmOutput; alarmOutput.m_vecValue = m_AlmInfoVec; alarmOutput.m_nStatus = CN_FBD_STATUS_Valid; - if ( kbdSuccess != m_ptrDiagData->setAlarmValByKey( m_stOutputKey1, alarmOutput )) + if ( iotSuccess != m_ptrDiagData->setAlarmValByKey( m_stOutputKey1, alarmOutput )) { LOGERROR( "设置[%s]输出值失败", m_stOutputKey1.toString().c_str()); - nRet = kbdFailed; + nRet = iotFailed; } return nRet; @@ -245,7 +245,7 @@ int CAlarmDelay::handleDelay() } if(m_AlmInfoVec.size()<=0) { - return kbdSuccess; + return iotSuccess; } //推送所有 return pushAlm(); @@ -259,7 +259,7 @@ int CAlarmDelay::pushAlm() SFbdNumericValue stNumericOutput( 1, CN_FBD_STATUS_Valid ); m_ptrDiagData->setAlarmValByKey( m_stOutputKey1, alarmOutput ); m_ptrDiagData->setNumericValByKey( m_stOutputKey2, stNumericOutput ); - return kbdSuccess; + return iotSuccess; } //什么条件都没有，则认为只做延迟需要发送，若有条件则被过滤掉则不会发送 bool CAlarmDelay::checkFilter(SFbdAlarmInfo &info) diff --git a/product/src/application/app_fbd/fbd_module/alarm_delay/CAlarmDelay.h b/product/src/application/app_fbd/fbd_module/alarm_delay/CAlarmDelay.h index c4853cd2..fa770e86 100644 --- a/product/src/application/app_fbd/fbd_module/alarm_delay/CAlarmDelay.h +++ b/product/src/application/app_fbd/fbd_module/alarm_delay/CAlarmDelay.h @@ -16,7 +16,7 @@ #include "list" #include "app_fbd/fbd_common/FbdAlarmCltApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -92,5 +92,5 @@ BOOST_DLL_ALIAS( create_plugin // 将导出函数重命名，最终调用者访问此函数名 ) }//< namespace app_fbd -}//< namespace kbd_app +}//< namespace iot_app #endif // CALARMDELAY_H diff --git a/product/src/application/app_fbd/fbd_module/alarm_push/CAlarmPush.cpp b/product/src/application/app_fbd/fbd_module/alarm_push/CAlarmPush.cpp index f3160f34..e992b42f 100644 --- a/product/src/application/app_fbd/fbd_module/alarm_push/CAlarmPush.cpp +++ b/product/src/application/app_fbd/fbd_module/alarm_push/CAlarmPush.cpp @@ -20,7 +20,7 @@ #include "rapidjson/stringbuffer.h" #include "rapidjson/error/en.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -79,67 +79,67 @@ int CAlarmPush::init(const SFbdModKey &stModuleKey, const std::string &) if ( m_ptrDiagData == nullptr ) { LOGERROR( "模块[%s],获取Diagram数据接口单例失败",m_stModKey.toString().c_str() ); - return kbdFailed; + return iotFailed; } //1.获取输入参数 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKey2 )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || + iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKey2 )) { LOGERROR( "获取模块[%s]的输入参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //2.获取push_type ,然后获取输出端口 std::string sPushType = ""; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_PushType, sPushType )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_PushType, sPushType )) { LOGERROR( "获取模块[%s]的推送类型失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if(sPushType.size() <= 0) { LOGERROR( "模块[%s]未配置输出", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if(!fromPushTypeJson(sPushType.c_str())) { - return kbdFailed; + return iotFailed; } if(m_nType == EN_PUSH_ALARM_EMAIL)//输出端口4个 { - if ( kbdSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 1, m_stOutputKey1 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 2, m_stOutputKey2 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 3, m_stOutputKey3 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 4, m_stOutputKey4 )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 1, m_stOutputKey1 ) || + iotSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 2, m_stOutputKey2 ) || + iotSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 3, m_stOutputKey3 ) || + iotSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 4, m_stOutputKey4 )) { LOGERROR( "获取模块[%s]的输入参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } }else//输出端口3个 { - if ( kbdSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 1, m_stOutputKey1 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 2, m_stOutputKey3 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 3, m_stOutputKey4 )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 1, m_stOutputKey1 ) || + iotSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 2, m_stOutputKey3 ) || + iotSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 3, m_stOutputKey4 )) { LOGERROR( "获取模块[%s]的输入参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } } //3.获取发送用户信息 std::string sReceiver = ""; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_Receiver, sReceiver )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_Receiver, sReceiver )) { LOGERROR( "获取模块[%s]的接收用户信息失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if(sReceiver.size() <= 0) { LOGERROR( "模块[%s]未配置用户", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if(!fromReceiverJson(sReceiver.c_str())) { - return kbdFailed; + return iotFailed; } //4.加载配置是否启用了智能告警 @@ -172,7 +172,7 @@ int CAlarmPush::init(const SFbdModKey &stModuleKey, const std::string &) if(!m_bEnable && m_nIsAi == EN_PUSH_ALARM_AI) { LOGERROR("智能告警服务未配置启动,但是事件推送模块[%s]推送格式选择了智能推送",stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } } //6.初始化fbd告警接口指针 @@ -180,12 +180,12 @@ int CAlarmPush::init(const SFbdModKey &stModuleKey, const std::string &) if(m_fbdAlarmCltApi == nullptr) { LOGERROR("模块[%s]初始化fbd告警接口指针失败!",m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } LOGINFO( "[%s]加载成功", m_stModKey.toString().c_str()); m_bInitialized = true; - return kbdSuccess; + return iotSuccess; } int CAlarmPush::calculate() @@ -193,26 +193,26 @@ int CAlarmPush::calculate() if ( !m_bInitialized ) { LOGERROR( "calculate(): 模块[%s]未成功初始化，不应执行推送!",m_stModKey.toString().c_str() ); - return kbdFailed; + return iotFailed; } //处理业务逻辑 //< 1.当前没有执行命令时,将输出设置0 setOLToZero(); SFbdNumericValue stValAndSta2; - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey2, stValAndSta2 )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey2, stValAndSta2 )) { LOGERROR( "获取模块[%s]的输入参数2的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } int nInValue2 = static_cast(stValAndSta2.m_dValue); if ( nInValue2 != 0 && isValidOfStatus( stValAndSta2.m_nStatus )) { SFbdAlarmValue almValAndSta; - if ( kbdSuccess != m_ptrDiagData->getAlarmValByKey( m_stInKey1, almValAndSta )) + if ( iotSuccess != m_ptrDiagData->getAlarmValByKey( m_stInKey1, almValAndSta )) { LOGERROR( "获取模块[%s]的输入参数1的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if ( isValidOfStatus( almValAndSta.m_nStatus )) @@ -336,33 +336,33 @@ void CAlarmPush::setOLToZero() int CAlarmPush::setAllOutputInvalid() { - int nRet = kbdSuccess; + int nRet = iotSuccess; SFbdNumericValue stNumericOutput( 0, CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputKey4, stNumericOutput )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputKey4, stNumericOutput )) { LOGERROR( "设置[%s]输出值失败", m_stOutputKey4.toString().c_str()); - nRet = kbdFailed; + nRet = iotFailed; } SFbdStringValue stStringOutput( "", CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->setStringValByKey( m_stOutputKey1, stStringOutput )) + if ( iotSuccess != m_ptrDiagData->setStringValByKey( m_stOutputKey1, stStringOutput )) { LOGERROR( "设置[%s]输出值失败", m_stOutputKey1.toString().c_str()); - nRet = kbdFailed; + nRet = iotFailed; } - if ( kbdSuccess != m_ptrDiagData->setStringValByKey( m_stOutputKey3, stStringOutput )) + if ( iotSuccess != m_ptrDiagData->setStringValByKey( m_stOutputKey3, stStringOutput )) { LOGERROR( "设置[%s]输出值失败", m_stOutputKey3.toString().c_str()); - nRet = kbdFailed; + nRet = iotFailed; } if(m_nType == EN_PUSH_ALARM_EMAIL) { - if ( kbdSuccess != m_ptrDiagData->setStringValByKey( m_stOutputKey2, stStringOutput )) + if ( iotSuccess != m_ptrDiagData->setStringValByKey( m_stOutputKey2, stStringOutput )) { LOGERROR( "设置[%s]输出值失败", m_stOutputKey2.toString().c_str()); - nRet = kbdFailed; + nRet = iotFailed; } } @@ -406,7 +406,7 @@ int CAlarmPush::handlePush() if(m_almInfoVec.size()<= 0) { - return kbdSuccess; + return iotSuccess; } //推送所有 return pushAlmInfo(); @@ -417,7 +417,7 @@ int CAlarmPush::handleAiAlm(SFbdAlarmInfo &almInfo) SFbdItlAlmInfo itlInfo; uint64 nTime = iot_public::getUTCTimeMsec(); - if(m_fbdAlarmCltApi->getItlAlmByRawAlm(almInfo,itlInfo) == kbdSuccess) + if(m_fbdAlarmCltApi->getItlAlmByRawAlm(almInfo,itlInfo) == iotSuccess) { std::string itluuid = itlInfo.getUuidBase64(); std::map::iterator it = m_itluuidTimeMap.find(itluuid); @@ -439,7 +439,7 @@ int CAlarmPush::handleAiAlm(SFbdAlarmInfo &almInfo) m_uuidTypeList.push_back(uuidType); LOGDEBUG("已超过聚类时间,但是[%s]原始告警未聚类!",uuid.c_str()); } - return kbdSuccess; + return iotSuccess; } int CAlarmPush::pushAlmInfo() @@ -449,7 +449,7 @@ int CAlarmPush::pushAlmInfo() m_mainEvtInfo = m_almInfoVec.at(0); }else { - return kbdSuccess; + return iotSuccess; } //1.获取数量 @@ -483,7 +483,7 @@ int CAlarmPush::pushAlmInfo() m_ptrDiagData->setStringValByKey( m_stOutputKey1, stReceiverOutput ); m_ptrDiagData->setStringValByKey( m_stOutputKey3, stContentOutput ); m_ptrDiagData->setNumericValByKey( m_stOutputKey4, stNumericOutput ); - return kbdSuccess; + return iotSuccess; } std::string CAlarmPush::preview(const std::string &text, int index) @@ -698,7 +698,7 @@ std::string CAlarmPush::domain_descText(int index) LOGERROR( "模块[%s]获取系统信息库失败",m_stModKey.toString().c_str() ); return ""; } - if(kbdSuccess != ptrSysInfo->getSysInfo().getDomainInfoById(domainId,stDomainInfo)) + if(iotSuccess != ptrSysInfo->getSysInfo().getDomainInfoById(domainId,stDomainInfo)) { LOGERROR("模块[%s]获取域[%d]的描述失败!",m_stModKey.toString().c_str(),domainId); domain_desc = " "; @@ -729,7 +729,7 @@ std::string CAlarmPush::locationText(int index) LOGERROR( "模块[%s]获取系统信息库失败",m_stModKey.toString().c_str() ); return ""; } - if(kbdSuccess != ptrSysInfo->getSysInfo().getLocationInfoById(locId,stLocationInfo)) + if(iotSuccess != ptrSysInfo->getSysInfo().getLocationInfoById(locId,stLocationInfo)) { LOGERROR("模块[%s]获取位置[%d]的描述失败!",m_stModKey.toString().c_str(),locId); location = " "; @@ -758,7 +758,7 @@ std::string CAlarmPush::appText(int index) LOGERROR( "模块[%s]获取系统信息库失败",m_stModKey.toString().c_str() ); return ""; } - if(kbdSuccess != ptrSysInfo->getSysInfo().getAppInfoById(appId,stAppInfo)) + if(iotSuccess != ptrSysInfo->getSysInfo().getAppInfoById(appId,stAppInfo)) { LOGERROR("模块[%s]获取应用[%d]的描述失败!",m_stModKey.toString().c_str(),appId); app = " "; @@ -834,7 +834,7 @@ std::string CAlarmPush::sub_systemText(int index) LOGERROR( "模块[%s]获取系统信息库失败",m_stModKey.toString().c_str() ); return ""; } - if(kbdSuccess != ptrSysInfo->getSysInfo().getSubsystemInfoById(subId,stSubsystemInfo)) + if(iotSuccess != ptrSysInfo->getSysInfo().getSubsystemInfoById(subId,stSubsystemInfo)) { LOGERROR("模块[%s]获取专业[%d]的描述失败!",m_stModKey.toString().c_str(),subId); sub_system = " "; @@ -986,7 +986,7 @@ int CAlarmPush::makeAlmData() { if(m_uuidTypeList.size()<= 0) { - return kbdSuccess; + return iotSuccess; } AlmUUIDType uuidType; std::list::iterator it = m_uuidTypeList.begin(); @@ -996,31 +996,31 @@ int CAlarmPush::makeAlmData() m_uuidTypeList.pop_front(); }else { - return kbdSuccess; + return iotSuccess; } if(uuidType.type == EN_TYPE_ALM) { SFbdAlarmInfo alminfo; - if(m_fbdAlarmCltApi->getAlarmByUuid(uuidType.uuid,alminfo) == kbdSuccess) + if(m_fbdAlarmCltApi->getAlarmByUuid(uuidType.uuid,alminfo) == iotSuccess) { m_mainEvtInfo = alminfo; m_almInfoVec.push_back(alminfo); }else { - return kbdFailed; + return iotFailed; } }else { SFbdItlAlmInfo itlinfo; - if(m_fbdAlarmCltApi->getItlAlmByUuid(uuidType.uuid,itlinfo) == kbdSuccess) + if(m_fbdAlarmCltApi->getItlAlmByUuid(uuidType.uuid,itlinfo) == iotSuccess) { const std::vector uuidVec = std::move(itlinfo.getRawAlmUuid()); for(int index(0);index<(int)uuidVec.size();index++) { SFbdAlarmInfo alminfo; - if(m_fbdAlarmCltApi->getAlarmByUuid(*uuidVec[index],alminfo) == kbdSuccess) + if(m_fbdAlarmCltApi->getAlarmByUuid(*uuidVec[index],alminfo) == iotSuccess) { if(index==0) { @@ -1034,10 +1034,10 @@ int CAlarmPush::makeAlmData() } }else { - return kbdFailed; + return iotFailed; } } - return kbdSuccess; + return iotSuccess; } void CAlarmPush::makeAlmCount() diff --git a/product/src/application/app_fbd/fbd_module/alarm_push/CAlarmPush.h b/product/src/application/app_fbd/fbd_module/alarm_push/CAlarmPush.h index c08d3bc4..2022932f 100644 --- a/product/src/application/app_fbd/fbd_module/alarm_push/CAlarmPush.h +++ b/product/src/application/app_fbd/fbd_module/alarm_push/CAlarmPush.h @@ -23,7 +23,7 @@ #include "app_fbd/fbd_common/FbdAlarmCltApi.h" #include "app_fbd/fbd_common/FbdSysInfoApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -189,6 +189,6 @@ BOOST_DLL_ALIAS( create_plugin // 将导出函数重命名，最终调用者访问此函数名 ) }//< namespace app_fbd -}//< namespace kbd_app +}//< namespace iot_app #endif // CALARMPUSH_H diff --git a/product/src/application/app_fbd/fbd_module/alarm_split/CAlarmSplit.cpp b/product/src/application/app_fbd/fbd_module/alarm_split/CAlarmSplit.cpp index 859a9724..3534eb7d 100644 --- a/product/src/application/app_fbd/fbd_module/alarm_split/CAlarmSplit.cpp +++ b/product/src/application/app_fbd/fbd_module/alarm_split/CAlarmSplit.cpp @@ -12,7 +12,7 @@ #include "pub_utility_api/TimeUtil.h" #include "pub_utility_api/CharUtil.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -44,30 +44,30 @@ int CAlarmSplit::init(const SFbdModKey &stModuleKey, const std::string &) if ( m_ptrDiagData == nullptr ) { LOGERROR( "模块[%s]获取Diagram数据接口单例失败",m_stModKey.toString().c_str() ); - return kbdFailed; + return iotFailed; } //1.获取输入参数 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKey2 )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || + iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKey2 )) { LOGERROR( "获取模块[%s]的输入参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //2.获取输出个数 std::string sOutCount = ""; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_OutCount, sOutCount )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_OutCount, sOutCount )) { LOGERROR( "获取模块[%s]的拆分个数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } int outCount = iot_public::StringToInt(sOutCount); for(int index(0);indexgetValKeyByModOutput( stModuleKey, index+1, key )) + if(iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, index+1, key )) { LOGERROR( "获取模块[%s]的输出参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; }else { m_stOutputVec.push_back(key); @@ -75,10 +75,10 @@ int CAlarmSplit::init(const SFbdModKey &stModuleKey, const std::string &) } } //3.获取输出的使能参数 - if(kbdSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, outCount+1, m_stOutputL )) + if(iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, outCount+1, m_stOutputL )) { LOGERROR( "获取模块[%s]的输出使能参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //4.获取输出的数据 for(int index(0);indexgetModProperty( stModuleKey, CN_OutData, value )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_OutData, value )) { LOGERROR( "获取模块[%s]的输出的数据失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; }else { m_nOutputType.push_back(iot_public::StringToInt(value)); @@ -99,11 +99,11 @@ int CAlarmSplit::init(const SFbdModKey &stModuleKey, const std::string &) if(m_nOutputType.size() != m_stOutputVec.size()) { LOGERROR( "模块[%s]输出参数个数和获取的数据不一致!",m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } LOGINFO( "[%s]加载成功", m_stModKey.toString().c_str()); m_bInitialized = true; - return kbdSuccess; + return iotSuccess; } int CAlarmSplit::calculate() @@ -111,7 +111,7 @@ int CAlarmSplit::calculate() if ( !m_bInitialized ) { LOGERROR( "calculate(): 模块[%s]未成功初始化，不应执行拆分！",m_stModKey.toString().c_str() ); - return kbdFailed; + return iotFailed; } //处理业务逻辑 @@ -119,20 +119,20 @@ int CAlarmSplit::calculate() setOLToZero(); SFbdNumericValue stValAndSta2; - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey2, stValAndSta2 )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey2, stValAndSta2 )) { LOGERROR( "获取模块[%s]的输入参数2的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } int nInValue2 = static_cast(stValAndSta2.m_dValue); if ( nInValue2 != 0 && isValidOfStatus( stValAndSta2.m_nStatus )) { SFbdAlarmValue almValAndSta; - if ( kbdSuccess != m_ptrDiagData->getAlarmValByKey( m_stInKey1, almValAndSta )) + if ( iotSuccess != m_ptrDiagData->getAlarmValByKey( m_stInKey1, almValAndSta )) { LOGERROR( "获取模块[%s]的输入参数1的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if ( isValidOfStatus( almValAndSta.m_nStatus )) @@ -173,13 +173,13 @@ void CAlarmSplit::setOLToZero() int CAlarmSplit::setAllOutputInvalid() { - int nRet = kbdSuccess; + int nRet = iotSuccess; SFbdNumericValue stNumericOutput( 0, CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputL, stNumericOutput )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputL, stNumericOutput )) { LOGERROR( "设置[%s]输出值使能失败", m_stOutputL.toString().c_str()); - nRet = kbdFailed; + nRet = iotFailed; } SFbdStringValue stStringOutput("",CN_FBD_STATUS_Invalid); @@ -193,17 +193,17 @@ int CAlarmSplit::setAllOutputInvalid() m_nOutputType.at(index) == EN_ALARM_SPLIT_BLOCK_SUBID || m_nOutputType.at(index) == EN_ALARM_SPLIT_BLOCK_REGIONID) { - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputVec.at(index), stNumericOutput )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputVec.at(index), stNumericOutput )) { LOGERROR( "设置[%s]输出失败", m_stOutputVec.at(index).toString().c_str()); - nRet = kbdFailed; + nRet = iotFailed; } }else { - if ( kbdSuccess != m_ptrDiagData->setStringValByKey( m_stOutputVec.at(index), stStringOutput )) + if ( iotSuccess != m_ptrDiagData->setStringValByKey( m_stOutputVec.at(index), stStringOutput )) { LOGERROR( "设置[%s]输出失败", m_stOutputVec.at(index).toString().c_str()); - nRet = kbdFailed; + nRet = iotFailed; } } } @@ -222,7 +222,7 @@ int CAlarmSplit::handleSplit() pushSplit(info); } - return kbdSuccess; + return iotSuccess; } void CAlarmSplit::pushSplit(SFbdAlarmInfo &info) diff --git a/product/src/application/app_fbd/fbd_module/alarm_split/CAlarmSplit.h b/product/src/application/app_fbd/fbd_module/alarm_split/CAlarmSplit.h index e1df619f..498c4feb 100644 --- a/product/src/application/app_fbd/fbd_module/alarm_split/CAlarmSplit.h +++ b/product/src/application/app_fbd/fbd_module/alarm_split/CAlarmSplit.h @@ -15,7 +15,7 @@ #include "map" #include "list" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -80,5 +80,5 @@ BOOST_DLL_ALIAS( create_plugin // 将导出函数重命名，最终调用者访问此函数名 ) }//< namespace app_fbd -}//< namespace kbd_app +}//< namespace iot_app #endif // CALARMSPLIT_H diff --git a/product/src/application/app_fbd/fbd_module/alarm_subscribe/CAlarmSubscribe.cpp b/product/src/application/app_fbd/fbd_module/alarm_subscribe/CAlarmSubscribe.cpp index c3b6a4df..beaf1752 100644 --- a/product/src/application/app_fbd/fbd_module/alarm_subscribe/CAlarmSubscribe.cpp +++ b/product/src/application/app_fbd/fbd_module/alarm_subscribe/CAlarmSubscribe.cpp @@ -16,7 +16,7 @@ #include "CAlarmSubscribe.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -46,22 +46,22 @@ int CAlarmSubscribe::init( const SFbdModKey &stModuleKey, const std::string &str if ( nullptr == m_ptrDiagData ) { LOGERROR( "init(): 获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } // 获取输入、输出参数 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stOutKeyAlarm ) - || kbdSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 2, m_stOutKeyEnable )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stOutKeyAlarm ) + || iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 2, m_stOutKeyEnable )) { LOGERROR( "获取模块[%s]的输入输出参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //< 加载属性 if ( !initPropertys()) { cleanProperty(); - return kbdFailed; + return iotFailed; } } @@ -71,7 +71,7 @@ int CAlarmSubscribe::init( const SFbdModKey &stModuleKey, const std::string &str if ( nullptr == m_ptrAlmCltApi ) { LOGERROR( "init(): 获取告警客户端接口单例失败" ); - return kbdFailed; + return iotFailed; } //< 获取当前最后的告警，允许返回失败，比如FBD服务刚启动还没与告警服务同步 @@ -79,7 +79,7 @@ int CAlarmSubscribe::init( const SFbdModKey &stModuleKey, const std::string &str } LOGINFO( "init(): [%s]加载成功", m_stModKey.toString().c_str()); - return kbdSuccess; + return iotSuccess; } @@ -224,7 +224,7 @@ int CAlarmSubscribe::calculate() m_ptrDiagData->setNumericValByKey( m_stOutKeyEnable, m_stOutValEnable ); } - return kbdSuccess; + return iotSuccess; } @@ -238,18 +238,18 @@ int CAlarmSubscribe::reset( const bool bMaster ) m_ptrDiagData->setAlarmValByKey( m_stOutKeyAlarm, stAlmInvalid ); m_ptrDiagData->setNumericValByKey( m_stOutKeyEnable, stNumInvalid ); - return kbdSuccess; + return iotSuccess; } int CAlarmSubscribe::clean() { - if ( kbdSuccess != reset( false )) - return kbdFailed; + if ( iotSuccess != reset( false )) + return iotFailed; cleanProperty(); - return kbdSuccess; + return iotSuccess; } @@ -291,7 +291,7 @@ bool CAlarmSubscribe::initPropertys() std::string strPropVelue; strPropName = "PointEnable"; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initProperty(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -322,7 +322,7 @@ bool CAlarmSubscribe::initPropertys() assert( nullptr != m_pSetPointTag ); strPropName = "Point"; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -402,7 +402,7 @@ bool CAlarmSubscribe::initProperty( const std::string &strPropName, std::unorder //< 都是按此规则，比如 AlarmType - AlarmTypeEnable const std::string strPropNameEnable = strPropName + "Enable"; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropNameEnable, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropNameEnable, strPropVelue )) { LOGERROR( "initProperty(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropNameEnable.c_str()); @@ -427,7 +427,7 @@ bool CAlarmSubscribe::initProperty( const std::string &strPropName, std::unorder if ( nullptr != rpSetDest ) { - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initProperty(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -497,4 +497,4 @@ void CAlarmSubscribe::cleanProperty() } //< namespace alarm_subscribe } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/alarm_subscribe/CAlarmSubscribe.h b/product/src/application/app_fbd/fbd_module/alarm_subscribe/CAlarmSubscribe.h index c744bcd6..1d36f617 100644 --- a/product/src/application/app_fbd/fbd_module/alarm_subscribe/CAlarmSubscribe.h +++ b/product/src/application/app_fbd/fbd_module/alarm_subscribe/CAlarmSubscribe.h @@ -16,7 +16,7 @@ #include "app_fbd/fbd_common/FbdDiagDataApi.h" #include "app_fbd/fbd_common/FbdAlarmCltApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -99,4 +99,4 @@ BOOST_DLL_ALIAS( } //< namespace alarm_subscribe } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_gen/ApcPdGenCommon.cpp b/product/src/application/app_fbd/fbd_module/apc_pd_gen/ApcPdGenCommon.cpp index 7f03b41c..a3db5d7d 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_gen/ApcPdGenCommon.cpp +++ b/product/src/application/app_fbd/fbd_module/apc_pd_gen/ApcPdGenCommon.cpp @@ -12,7 +12,7 @@ #include "ApcPdGenCommon.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -47,4 +47,4 @@ const char *g_szUpUseDownMarginInput = "UseDownMarginInput"; //< 使用可减有 } //< namespace apc_pd_gen } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_gen/ApcPdGenCommon.h b/product/src/application/app_fbd/fbd_module/apc_pd_gen/ApcPdGenCommon.h index 54e5a774..68ed2f65 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_gen/ApcPdGenCommon.h +++ b/product/src/application/app_fbd/fbd_module/apc_pd_gen/ApcPdGenCommon.h @@ -14,7 +14,7 @@ #include "app_fbd/fbd_common/FbdDiagDataStruct.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -198,4 +198,4 @@ enum EnUnitErrorCode } //< namespace apc_pd_gen } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_gen/CApcPdGen.cpp b/product/src/application/app_fbd/fbd_module/apc_pd_gen/CApcPdGen.cpp index 3fd8ce81..e7bff637 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_gen/CApcPdGen.cpp +++ b/product/src/application/app_fbd/fbd_module/apc_pd_gen/CApcPdGen.cpp @@ -21,7 +21,7 @@ #include "CApcPdGen.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -64,7 +64,7 @@ int CApcPdGen::init( const SFbdModKey &stModuleKey, const std::string &strExtraP if ( !m_ptrDiagData ) { LOGERROR( "init(): 获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } //< 构造并初始化全局数据管理 @@ -73,7 +73,7 @@ int CApcPdGen::init( const SFbdModKey &stModuleKey, const std::string &strExtraP if ( !m_pGenGlobal->init()) { deletePointer(); - return kbdFailed; + return iotFailed; } } @@ -92,7 +92,7 @@ int CApcPdGen::init( const SFbdModKey &stModuleKey, const std::string &strExtraP else { deletePointer(); - return kbdFailed; + return iotFailed; } } @@ -103,7 +103,7 @@ int CApcPdGen::init( const SFbdModKey &stModuleKey, const std::string &strExtraP m_bInitialized = true; - return kbdSuccess; + return iotSuccess; } @@ -112,7 +112,7 @@ int CApcPdGen::calculate() if ( !m_bInitialized ) { LOGERROR( "calculate(): 未成功初始化，不应执行运算！" ); - return kbdFailed; + return iotFailed; } //< 处理全局 @@ -189,7 +189,7 @@ int CApcPdGen::calculate() } } - return kbdSuccess; + return iotSuccess; } @@ -737,7 +737,7 @@ int CApcPdGen::reset( const bool bMaster ) m_vecpGenUnit[i]->reset(); } - return kbdSuccess; + return iotSuccess; } @@ -780,4 +780,4 @@ void CApcPdGen::deletePointer() } //< namespace apc_pd_gen } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_gen/CApcPdGen.h b/product/src/application/app_fbd/fbd_module/apc_pd_gen/CApcPdGen.h index fefa0757..18b20318 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_gen/CApcPdGen.h +++ b/product/src/application/app_fbd/fbd_module/apc_pd_gen/CApcPdGen.h @@ -20,7 +20,7 @@ #include "CGenGlobal.h" #include "CGenUnit.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -108,4 +108,4 @@ BOOST_DLL_ALIAS( } //< namespace apc_pd_gen } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenGlobal.cpp b/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenGlobal.cpp index 704635a4..ef6ff2a1 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenGlobal.cpp +++ b/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenGlobal.cpp @@ -19,7 +19,7 @@ #include "CGenGlobal.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -83,7 +83,7 @@ bool CGenGlobal::initPropertys() //< 机组个数 { strPropName = g_szGpUnitCnt; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -113,7 +113,7 @@ bool CGenGlobal::initPropertys() //< 调节死区 { strPropName = g_szGpDeadband; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -143,7 +143,7 @@ bool CGenGlobal::initPropertys() //< 最大调节步进 { strPropName = g_szGpMaxStep; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -173,7 +173,7 @@ bool CGenGlobal::initPropertys() //< 最小调节周期 { strPropName = g_szGpMinInterval; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -203,7 +203,7 @@ bool CGenGlobal::initPropertys() //< 通讯超时时间 { strPropName = g_szGpCommTimeout; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -233,7 +233,7 @@ bool CGenGlobal::initPropertys() //< 通讯异常延迟复归时间 { strPropName = g_szGpCommRecovDelay; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -263,7 +263,7 @@ bool CGenGlobal::initPropertys() //< 机组通讯异常数据策略 { strPropName = g_szGpValueWhenComloss; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -300,7 +300,7 @@ bool CGenGlobal::initInputKeys() const SFbdModKey &stModKey = m_pParent->getModKey(); //< 总有功目标值 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, GIID_P_TARGET, m_stInKeyP_Target )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输入键[总有功目标值]失败", stModKey.toString().c_str()); @@ -308,7 +308,7 @@ bool CGenGlobal::initInputKeys() } //< 总有功上限 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, GIID_P_UPPER_LIMIT, m_stInKeyP_UpperLimit )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输入键[总有功上限]失败", stModKey.toString().c_str()); @@ -316,7 +316,7 @@ bool CGenGlobal::initInputKeys() } //< 总有功下限 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, GIID_P_LOWER_LIMIT, m_stInKeyP_LowerLimit )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输入键[总有功下限]失败", stModKey.toString().c_str()); @@ -324,7 +324,7 @@ bool CGenGlobal::initInputKeys() } //< 总调节使能 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, GIID_ENABLE_REGULATE, m_stInKeyEnableRegulate )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输入键[总调节使能]失败", stModKey.toString().c_str()); @@ -340,7 +340,7 @@ bool CGenGlobal::initOutputKeys() const SFbdModKey &stModKey = m_pParent->getModKey(); //< 总有功 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, GOID_P_REAL, m_stOutKeyP_Real )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输出键[总有功]失败", stModKey.toString().c_str()); @@ -348,7 +348,7 @@ bool CGenGlobal::initOutputKeys() } //< 总可增有功 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, GOID_P_UP_MARGIN, m_stOutKeyP_UpMargin )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输出键[总可增有功]失败", stModKey.toString().c_str()); @@ -356,7 +356,7 @@ bool CGenGlobal::initOutputKeys() } //< 总可减有功 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, GOID_P_DOWN_MARGIN, m_stOutKeyP_DownMargin )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输出键[总可减有功]失败", stModKey.toString().c_str()); @@ -364,7 +364,7 @@ bool CGenGlobal::initOutputKeys() } //< 状态码 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, GOID_STATE_CODE, m_stOutKeyStateCode )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输出键[状态码]失败", stModKey.toString().c_str()); @@ -372,7 +372,7 @@ bool CGenGlobal::initOutputKeys() } //< 错误码 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, GOID_ERROR_CODE, m_stOutKeyErrorCode )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输出键[错误码]失败", stModKey.toString().c_str()); @@ -423,7 +423,7 @@ void CGenGlobal::refreshInputValues() const SFbdModKey &stModKey = m_pParent->getModKey(); //< 总有功目标值 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_Target, m_stInValP_Target )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_Target, m_stInValP_Target )) { LOGERROR( "refreshInputValues(): 模块[%s]获取输入值[总有功目标值]失败", stModKey.toString().c_str()); @@ -431,7 +431,7 @@ void CGenGlobal::refreshInputValues() } //< 总有功上限 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_UpperLimit, m_stInValP_UpperLimit )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_UpperLimit, m_stInValP_UpperLimit )) { LOGERROR( "refreshInputValues(): 模块[%s]获取输入值[总有功上限]失败", stModKey.toString().c_str()); @@ -439,7 +439,7 @@ void CGenGlobal::refreshInputValues() } //< 总有功下限 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_LowerLimit, m_stInValP_LowerLimit )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_LowerLimit, m_stInValP_LowerLimit )) { LOGERROR( "refreshInputValues(): 模块[%s]获取输入值[总有功下限]失败", stModKey.toString().c_str()); @@ -447,7 +447,7 @@ void CGenGlobal::refreshInputValues() } //< 总调节使能 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyEnableRegulate, m_stInValEnableRegulate )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyEnableRegulate, m_stInValEnableRegulate )) { LOGERROR( "refreshInputValues(): 模块[%s]获取输入值[总调节使能]失败", stModKey.toString().c_str()); @@ -508,19 +508,19 @@ void CGenGlobal::outputValues() const SFbdModKey &stModKey = m_pParent->getModKey(); //< 总有功 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyP_Real, m_stOutValP_Real )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyP_Real, m_stOutValP_Real )) { LOGERROR( "outputValues(): 模块[%s]设置输出值[总有功]失败", stModKey.toString().c_str()); } //< 总可增有功 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyP_UpMargin, m_stOutValP_UpMargin )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyP_UpMargin, m_stOutValP_UpMargin )) { LOGERROR( "outputValues(): 模块[%s]设置输出值[总可增有功]失败", stModKey.toString().c_str()); } //< 总可减有功 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyP_DownMargin, m_stOutValP_DownMargin )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyP_DownMargin, m_stOutValP_DownMargin )) { LOGERROR( "outputValues(): 模块[%s]设置输出值[总可减有功]失败", stModKey.toString().c_str()); } @@ -529,14 +529,14 @@ void CGenGlobal::outputValues() SFbdNumericValue stStateCode( m_enStateCode, CN_FBD_STATUS_Valid ); //< 状态始终有效 if ( m_bExitState ) stStateCode.m_dValue = GSC_EXIT; - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyStateCode, stStateCode )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyStateCode, stStateCode )) { LOGERROR( "outputValues(): 模块[%s]设置输出值[状态码]失败", stModKey.toString().c_str()); } //< 错误码 SFbdNumericValue stErrorCode( m_enErrorCode, CN_FBD_STATUS_Valid ); //< 状态始终有效 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyErrorCode, stErrorCode )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyErrorCode, stErrorCode )) { LOGERROR( "outputValues(): 模块[%s]设置输出值[错误码]失败", stModKey.toString().c_str()); } @@ -602,4 +602,4 @@ void CGenGlobal::setErrorCode( const EnGlobalErrorCode enCode, bool bForce ) } //< namespace apc_pd_gen } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenGlobal.h b/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenGlobal.h index f5c58f74..5a0ead09 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenGlobal.h +++ b/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenGlobal.h @@ -14,7 +14,7 @@ #include "ApcPdGenCommon.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -138,4 +138,4 @@ public: } //< namespace apc_pd_gen } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenUnit.cpp b/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenUnit.cpp index 6b642767..6c1ac1c3 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenUnit.cpp +++ b/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenUnit.cpp @@ -20,7 +20,7 @@ #include "CGenUnit.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -95,7 +95,7 @@ bool CGenUnit::initPropertys() //< 最大功率 { strPropName = g_szUpMaxP + strUnitId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -125,7 +125,7 @@ bool CGenUnit::initPropertys() //< 最小功率 { strPropName = g_szUpMinP + strUnitId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -155,7 +155,7 @@ bool CGenUnit::initPropertys() //< 通讯精度 { strPropName = g_szUpCommPrecision + strUnitId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -185,7 +185,7 @@ bool CGenUnit::initPropertys() //< 调节精度 { strPropName = g_szUpRegulatePrecision + strUnitId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -215,7 +215,7 @@ bool CGenUnit::initPropertys() //< 调节超时时间 { strPropName = g_szUpRegulateTimeout + strUnitId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -245,7 +245,7 @@ bool CGenUnit::initPropertys() //< 使用可增有功输入 { strPropName = g_szUpUseUpMarginInput + strUnitId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -268,7 +268,7 @@ bool CGenUnit::initPropertys() //< 使用可减有功输入 { strPropName = g_szUpUseDownMarginInput + strUnitId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -307,7 +307,7 @@ bool CGenUnit::initInputKeys() const SFbdModKey &stModKey = m_pParent->getModKey(); //< 有功设定值 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, nBaseID + UIID_P_SET, m_stInKeyP_Set )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输入键[有功设定值]失败", @@ -316,7 +316,7 @@ bool CGenUnit::initInputKeys() } //< 有功实际值 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, nBaseID + UIID_P_REAL, m_stInKeyP_Real )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输入键[有功实际值]失败", @@ -325,7 +325,7 @@ bool CGenUnit::initInputKeys() } //< 可增有功 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, nBaseID + UIID_P_UP_MARGIN, m_stInKeyP_UpMargin )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输入键[可增有功]失败", @@ -334,7 +334,7 @@ bool CGenUnit::initInputKeys() } //< 可减有功 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, nBaseID + UIID_P_DOWN_MARGIN, m_stInKeyP_DownMargin )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输入键[可减有功]失败", @@ -343,7 +343,7 @@ bool CGenUnit::initInputKeys() } //< 调节使能 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, nBaseID + UIID_ENABLE_REGULATE, m_stInKeyEnableRegulate )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输入键[调节使能]失败", @@ -370,7 +370,7 @@ bool CGenUnit::initOutputKeys() const SFbdModKey &stModKey = m_pParent->getModKey(); //< 有功分配值 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, nBaseID + UOID_P_ALLOCATED, m_stOutKeyP_Allocated )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输出键[有功分配值]失败", @@ -379,7 +379,7 @@ bool CGenUnit::initOutputKeys() } //< 执行调节 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, nBaseID + UOID_DO_REGULATE, m_stOutKeyDoRegulate )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输出键[执行调节]失败", @@ -388,7 +388,7 @@ bool CGenUnit::initOutputKeys() } //< 状态码 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, nBaseID + UOID_STATE_CODE, m_stOutKeyStateCode )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输出键[状态码]失败", @@ -397,7 +397,7 @@ bool CGenUnit::initOutputKeys() } //< 错误码 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, nBaseID + UOID_ERROR_CODE, m_stOutKeyErrorCode )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输出键[错误码]失败", @@ -455,7 +455,7 @@ void CGenUnit::refreshInputValues() const SFbdModKey &stModKey = m_pParent->getModKey(); //< 有功设定值 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_Set, m_stInValP_Set )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_Set, m_stInValP_Set )) { LOGERROR( "refreshInputValues(): 模块[%s]的机组[%d]获取输入值[有功设定值]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -464,7 +464,7 @@ void CGenUnit::refreshInputValues() } //< 有功实际值 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_Real, m_stInValP_Real )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_Real, m_stInValP_Real )) { LOGERROR( "refreshInputValues(): 模块[%s]的机组[%d]获取输入值[有功实际值]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -473,7 +473,7 @@ void CGenUnit::refreshInputValues() } //< 可增有功 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_UpMargin, m_stInValP_Real_UpMargin )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_UpMargin, m_stInValP_Real_UpMargin )) { LOGERROR( "refreshInputValues(): 模块[%s]的机组[%d]获取输入值[可增有功]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -482,7 +482,7 @@ void CGenUnit::refreshInputValues() } //< 可减有功 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_DownMargin, m_stInValP_Real_DownMargin )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_DownMargin, m_stInValP_Real_DownMargin )) { LOGERROR( "refreshInputValues(): 模块[%s]的机组[%d]获取输入值[可减有功]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -491,7 +491,7 @@ void CGenUnit::refreshInputValues() } //< 调节使能 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyEnableRegulate, m_stInValEnableRegulate )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyEnableRegulate, m_stInValEnableRegulate )) { LOGERROR( "refreshInputValues(): 模块[%s]的机组[%d]获取输入值[调节使能]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -989,7 +989,7 @@ void CGenUnit::outputValues() const SFbdModKey &stModKey = m_pParent->getModKey(); //< 有功分配值 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyP_Allocated, m_stOutValP_Allocated )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyP_Allocated, m_stOutValP_Allocated )) { LOGERROR( "outputValues(): 模块[%s]的机组[%d]设置输出值[有功分配值]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -999,7 +999,7 @@ void CGenUnit::outputValues() } //< 执行调节 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyDoRegulate, m_stOutValDoRegulate )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyDoRegulate, m_stOutValDoRegulate )) { LOGERROR( "outputValues(): 模块[%s]的机组[%d]设置输出值[执行调节]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -1007,7 +1007,7 @@ void CGenUnit::outputValues() //< 机组状态码 SFbdNumericValue stStateCode( m_enStateCode, CN_FBD_STATUS_Valid ); //< 状态始终有效 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyStateCode, stStateCode )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyStateCode, stStateCode )) { LOGERROR( "outputValues(): 模块[%s]的机组[%d]设置输出值[机组状态码]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -1015,7 +1015,7 @@ void CGenUnit::outputValues() //< 机组错误码 SFbdNumericValue stErrorCode( m_enErrorCode, CN_FBD_STATUS_Valid ); //< 状态始终有效 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyErrorCode, stErrorCode )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyErrorCode, stErrorCode )) { LOGERROR( "outputValues(): 模块[%s]的机组[%d]设置输出值[机组错误码]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -1160,4 +1160,4 @@ bool &CGenUnit::getExcludeFromRegulation_2() } //< namespace apc_pd_gen } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenUnit.h b/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenUnit.h index f224487e..e95e3264 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenUnit.h +++ b/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenUnit.h @@ -16,7 +16,7 @@ #include "ApcPdGenCommon.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -262,4 +262,4 @@ private: } //< namespace apc_pd_gen } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/ApcPdPcsCommon.cpp b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/ApcPdPcsCommon.cpp index 9a11bec7..a15b7452 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/ApcPdPcsCommon.cpp +++ b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/ApcPdPcsCommon.cpp @@ -12,7 +12,7 @@ #include "ApcPdPcsCommon.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -48,4 +48,4 @@ const char *g_szUpRegulateTimeout = "RegulateTimeout"; //< 调节超时时间 } //< namespace apc_pd_pcs } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/ApcPdPcsCommon.h b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/ApcPdPcsCommon.h index 298dd2a8..d88622bb 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/ApcPdPcsCommon.h +++ b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/ApcPdPcsCommon.h @@ -14,7 +14,7 @@ #include "app_fbd/fbd_common/FbdDiagDataStruct.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -222,4 +222,4 @@ enum EnUnitErrorCode } //< namespace apc_pd_pcs } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CApcPdPcs.cpp b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CApcPdPcs.cpp index 76531805..501a2348 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CApcPdPcs.cpp +++ b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CApcPdPcs.cpp @@ -21,7 +21,7 @@ #include "CApcPdPcs.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -64,7 +64,7 @@ int CApcPdPcs::init( const SFbdModKey &stModuleKey, const std::string &strExtraP if ( !m_ptrDiagData ) { LOGERROR( "init(): 获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } //< 构造并初始化全局数据管理 @@ -73,7 +73,7 @@ int CApcPdPcs::init( const SFbdModKey &stModuleKey, const std::string &strExtraP if ( !m_pPcsGlobal->init()) { deletePointer(); - return kbdFailed; + return iotFailed; } } @@ -92,7 +92,7 @@ int CApcPdPcs::init( const SFbdModKey &stModuleKey, const std::string &strExtraP else { deletePointer(); - return kbdFailed; + return iotFailed; } } @@ -103,7 +103,7 @@ int CApcPdPcs::init( const SFbdModKey &stModuleKey, const std::string &strExtraP m_bInitialized = true; - return kbdSuccess; + return iotSuccess; } @@ -112,7 +112,7 @@ int CApcPdPcs::calculate() if ( !m_bInitialized ) { LOGERROR( "calculate(): 未成功初始化，不应执行运算！" ); - return kbdFailed; + return iotFailed; } //< 处理全局 @@ -204,7 +204,7 @@ int CApcPdPcs::calculate() } } - return kbdSuccess; + return iotSuccess; } @@ -758,7 +758,7 @@ int CApcPdPcs::reset( const bool bMaster ) m_vecpPcsUnit[i]->reset(); } - return kbdSuccess; + return iotSuccess; } @@ -801,4 +801,4 @@ void CApcPdPcs::deletePointer() } //< namespace apc_pd_pcs } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CApcPdPcs.h b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CApcPdPcs.h index 74919157..b847ea0e 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CApcPdPcs.h +++ b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CApcPdPcs.h @@ -20,7 +20,7 @@ #include "CPcsGlobal.h" #include "CPcsUnit.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -109,4 +109,4 @@ BOOST_DLL_ALIAS( } //< namespace apc_pd_pcs } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsGlobal.cpp b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsGlobal.cpp index 8ccd1727..9fba6420 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsGlobal.cpp +++ b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsGlobal.cpp @@ -19,7 +19,7 @@ #include "CPcsGlobal.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -83,7 +83,7 @@ bool CPcsGlobal::initPropertys() //< 机组个数 { strPropName = g_szGpUnitCnt; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -113,7 +113,7 @@ bool CPcsGlobal::initPropertys() //< 调节死区 { strPropName = g_szGpDeadband; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -143,7 +143,7 @@ bool CPcsGlobal::initPropertys() //< 最大调节步进 { strPropName = g_szGpMaxStep; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -173,7 +173,7 @@ bool CPcsGlobal::initPropertys() //< 最小调节周期 { strPropName = g_szGpMinInterval; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -203,7 +203,7 @@ bool CPcsGlobal::initPropertys() //< 通讯超时时间 { strPropName = g_szGpCommTimeout; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -233,7 +233,7 @@ bool CPcsGlobal::initPropertys() //< 通讯异常延迟复归时间 { strPropName = g_szGpCommRecovDelay; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -263,7 +263,7 @@ bool CPcsGlobal::initPropertys() //< 机组通讯异常数据策略 { strPropName = g_szGpValueWhenComloss; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -300,7 +300,7 @@ bool CPcsGlobal::initInputKeys() const SFbdModKey &stModKey = m_pParent->getModKey(); //< 总有功目标值 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, GIID_P_TARGET, m_stInKeyP_Target )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输入键[总有功目标值]失败", stModKey.toString().c_str()); @@ -308,7 +308,7 @@ bool CPcsGlobal::initInputKeys() } //< 总有功上限 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, GIID_P_UPPER_LIMIT, m_stInKeyP_UpperLimit )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输入键[总有功上限]失败", stModKey.toString().c_str()); @@ -316,7 +316,7 @@ bool CPcsGlobal::initInputKeys() } //< 总有功下限 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, GIID_P_LOWER_LIMIT, m_stInKeyP_LowerLimit )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输入键[总有功下限]失败", stModKey.toString().c_str()); @@ -324,7 +324,7 @@ bool CPcsGlobal::initInputKeys() } //< 总调节使能 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, GIID_ENABLE_REGULATE, m_stInKeyEnableRegulate )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输入键[总调节使能]失败", stModKey.toString().c_str()); @@ -332,7 +332,7 @@ bool CPcsGlobal::initInputKeys() } //< 停止充电SOC - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, GIID_MAX_SOC, m_stInKeyMaxSoc )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输入键[停止充电SOC]失败", stModKey.toString().c_str()); @@ -340,7 +340,7 @@ bool CPcsGlobal::initInputKeys() } //< 恢复充电SOC - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, GIID_RECHARGE_SOC, m_stInKeyReChargeSoc )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输入键[恢复充电SOC]失败", stModKey.toString().c_str()); @@ -348,7 +348,7 @@ bool CPcsGlobal::initInputKeys() } //< 恢复放电SOC - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, GIID_REDISCHARGE_SOC, m_stInKeyReDischargeSoc )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输入键[恢复放电SOC]失败", stModKey.toString().c_str()); @@ -356,7 +356,7 @@ bool CPcsGlobal::initInputKeys() } //< 停止放电SOC - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, GIID_MIN_SOC, m_stInKeyMinSoc )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输入键[停止放电SOC]失败", stModKey.toString().c_str()); @@ -372,7 +372,7 @@ bool CPcsGlobal::initOutputKeys() const SFbdModKey &stModKey = m_pParent->getModKey(); //< 总有功 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, GOID_P_REAL, m_stOutKeyP_Real )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输出键[总有功]失败", stModKey.toString().c_str()); @@ -380,7 +380,7 @@ bool CPcsGlobal::initOutputKeys() } //< 总可增有功 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, GOID_P_UP_MARGIN, m_stOutKeyP_UpMargin )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输出键[总可增有功]失败", stModKey.toString().c_str()); @@ -388,7 +388,7 @@ bool CPcsGlobal::initOutputKeys() } //< 总可减有功 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, GOID_P_DOWN_MARGIN, m_stOutKeyP_DownMargin )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输出键[总可减有功]失败", stModKey.toString().c_str()); @@ -396,7 +396,7 @@ bool CPcsGlobal::initOutputKeys() } //< SOC - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, GOID_SOC, m_stOutKeySoc )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输出键[SOC]失败", stModKey.toString().c_str()); @@ -404,7 +404,7 @@ bool CPcsGlobal::initOutputKeys() } //< 状态码 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, GOID_STATE_CODE, m_stOutKeyStateCode )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输出键[状态码]失败", stModKey.toString().c_str()); @@ -412,7 +412,7 @@ bool CPcsGlobal::initOutputKeys() } //< 错误码 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, GOID_ERROR_CODE, m_stOutKeyErrorCode )) { LOGERROR( "initInputKeys(): 获取模块[%s]的输出键[错误码]失败", stModKey.toString().c_str()); @@ -465,7 +465,7 @@ void CPcsGlobal::refreshInputValues() const SFbdModKey &stModKey = m_pParent->getModKey(); //< 总有功目标值 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_Target, m_stInValP_Target )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_Target, m_stInValP_Target )) { LOGERROR( "refreshInputValues(): 模块[%s]获取输入值[总有功目标值]失败", stModKey.toString().c_str()); @@ -473,7 +473,7 @@ void CPcsGlobal::refreshInputValues() } //< 总有功上限 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_UpperLimit, m_stInValP_UpperLimit )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_UpperLimit, m_stInValP_UpperLimit )) { LOGERROR( "refreshInputValues(): 模块[%s]获取输入值[总有功上限]失败", stModKey.toString().c_str()); @@ -481,7 +481,7 @@ void CPcsGlobal::refreshInputValues() } //< 总有功下限 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_LowerLimit, m_stInValP_LowerLimit )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_LowerLimit, m_stInValP_LowerLimit )) { LOGERROR( "refreshInputValues(): 模块[%s]获取输入值[总有功下限]失败", stModKey.toString().c_str()); @@ -489,7 +489,7 @@ void CPcsGlobal::refreshInputValues() } //< 总调节使能 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyEnableRegulate, m_stInValEnableRegulate )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyEnableRegulate, m_stInValEnableRegulate )) { LOGERROR( "refreshInputValues(): 模块[%s]获取输入值[总调节使能]失败", stModKey.toString().c_str()); @@ -497,7 +497,7 @@ void CPcsGlobal::refreshInputValues() } //< 停止充电SOC - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyMaxSoc, m_stInValMaxSoc )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyMaxSoc, m_stInValMaxSoc )) { LOGERROR( "refreshInputValues(): 模块[%s]获取输入值[停止充电SOC]失败", stModKey.toString().c_str()); @@ -505,7 +505,7 @@ void CPcsGlobal::refreshInputValues() } //< 恢复充电SOC - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyReChargeSoc, m_stInValReChargeSoc )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyReChargeSoc, m_stInValReChargeSoc )) { LOGERROR( "refreshInputValues(): 模块[%s]获取输入值[恢复充电SOC]失败", stModKey.toString().c_str()); @@ -513,7 +513,7 @@ void CPcsGlobal::refreshInputValues() } //< 恢复放电SOC - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyReDischargeSoc, m_stInValReDischargeSoc )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyReDischargeSoc, m_stInValReDischargeSoc )) { LOGERROR( "refreshInputValues(): 模块[%s]获取输入值[恢复放电SOC]失败", stModKey.toString().c_str()); @@ -521,7 +521,7 @@ void CPcsGlobal::refreshInputValues() } //< 停止放电SOC - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyMinSoc, m_stInValMinSoc )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyMinSoc, m_stInValMinSoc )) { LOGERROR( "refreshInputValues(): 模块[%s]获取输入值[停止放电SOC]失败", stModKey.toString().c_str()); @@ -602,25 +602,25 @@ void CPcsGlobal::outputValues() const SFbdModKey &stModKey = m_pParent->getModKey(); //< 总有功 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyP_Real, m_stOutValP_Real )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyP_Real, m_stOutValP_Real )) { LOGERROR( "outputValues(): 模块[%s]设置输出值[总有功]失败", stModKey.toString().c_str()); } //< 总可增有功 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyP_UpMargin, m_stOutValP_UpMargin )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyP_UpMargin, m_stOutValP_UpMargin )) { LOGERROR( "outputValues(): 模块[%s]设置输出值[总可增有功]失败", stModKey.toString().c_str()); } //< 总可减有功 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyP_DownMargin, m_stOutValP_DownMargin )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyP_DownMargin, m_stOutValP_DownMargin )) { LOGERROR( "outputValues(): 模块[%s]设置输出值[总可减有功]失败", stModKey.toString().c_str()); } //< SOC - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeySoc, m_stOutValSoc )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeySoc, m_stOutValSoc )) { LOGERROR( "outputValues(): 模块[%s]设置输出值[SOC]失败", stModKey.toString().c_str()); } @@ -629,14 +629,14 @@ void CPcsGlobal::outputValues() SFbdNumericValue stStateCode( m_enStateCode, CN_FBD_STATUS_Valid ); //< 状态始终有效 if ( m_bExitState ) stStateCode.m_dValue = GSC_EXIT; - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyStateCode, stStateCode )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyStateCode, stStateCode )) { LOGERROR( "outputValues(): 模块[%s]设置输出值[状态码]失败", stModKey.toString().c_str()); } //< 错误码 SFbdNumericValue stErrorCode( m_enErrorCode, CN_FBD_STATUS_Valid ); //< 状态始终有效 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyErrorCode, stErrorCode )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyErrorCode, stErrorCode )) { LOGERROR( "outputValues(): 模块[%s]设置输出值[错误码]失败", stModKey.toString().c_str()); } @@ -702,4 +702,4 @@ void CPcsGlobal::setErrorCode( const EnGlobalErrorCode enCode, bool bForce ) } //< namespace apc_pd_pcs } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsGlobal.h b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsGlobal.h index 402b9d37..9c37b3df 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsGlobal.h +++ b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsGlobal.h @@ -14,7 +14,7 @@ #include "ApcPdPcsCommon.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -150,4 +150,4 @@ public: } //< namespace apc_pd_pcs } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsUnit.cpp b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsUnit.cpp index 3926e2f5..e01c7156 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsUnit.cpp +++ b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsUnit.cpp @@ -20,7 +20,7 @@ #include "CPcsUnit.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -97,7 +97,7 @@ bool CPcsUnit::initPropertys() //< 最大放电功率 { strPropName = g_szUpMaxDischargeP + strUnitId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -127,7 +127,7 @@ bool CPcsUnit::initPropertys() //< 最小放电功率 { strPropName = g_szUpMinDischargeP + strUnitId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -157,7 +157,7 @@ bool CPcsUnit::initPropertys() //< 最小充电功率 { strPropName = g_szUpMinChargeP + strUnitId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -187,7 +187,7 @@ bool CPcsUnit::initPropertys() //< 最大充电功率 { strPropName = g_szUpMaxChargeP + strUnitId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -217,7 +217,7 @@ bool CPcsUnit::initPropertys() //< 额定容量 { strPropName = g_szUpEnergyCapacity + strUnitId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -247,7 +247,7 @@ bool CPcsUnit::initPropertys() //< 通讯精度 { strPropName = g_szUpCommPrecision + strUnitId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -277,7 +277,7 @@ bool CPcsUnit::initPropertys() //< 调节精度 { strPropName = g_szUpRegulatePrecision + strUnitId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -307,7 +307,7 @@ bool CPcsUnit::initPropertys() //< 调节超时时间 { strPropName = g_szUpRegulateTimeout + strUnitId; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModKey, strPropName, strPropVelue )) { LOGERROR( "initPropertys(): 获取模块[%s]的参数[%s]失败", stModKey.toString().c_str(), strPropName.c_str()); @@ -353,7 +353,7 @@ bool CPcsUnit::initInputKeys() const SFbdModKey &stModKey = m_pParent->getModKey(); //< 有功设定值 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, nBaseID + UIID_P_SET, m_stInKeyP_Set )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输入键[有功设定值]失败", @@ -362,7 +362,7 @@ bool CPcsUnit::initInputKeys() } //< 有功实际值 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, nBaseID + UIID_P_REAL, m_stInKeyP_Real )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输入键[有功实际值]失败", @@ -371,7 +371,7 @@ bool CPcsUnit::initInputKeys() } //< SOC - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, nBaseID + UIID_SOC, m_stInKeySoc )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输入键[SOC]失败", @@ -380,7 +380,7 @@ bool CPcsUnit::initInputKeys() } //< 调节使能 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModInput( stModKey, nBaseID + UIID_ENABLE_REGULATE, m_stInKeyEnableRegulate )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输入键[调节使能]失败", @@ -407,7 +407,7 @@ bool CPcsUnit::initOutputKeys() const SFbdModKey &stModKey = m_pParent->getModKey(); //< 有功分配值 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, nBaseID + UOID_P_ALLOCATED, m_stOutKeyP_Allocated )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输出键[有功分配值]失败", @@ -416,7 +416,7 @@ bool CPcsUnit::initOutputKeys() } //< 执行调节 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, nBaseID + UOID_DO_REGULATE, m_stOutKeyDoRegulate )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输出键[执行调节]失败", @@ -425,7 +425,7 @@ bool CPcsUnit::initOutputKeys() } //< 状态码 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, nBaseID + UOID_STATE_CODE, m_stOutKeyStateCode )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输出键[状态码]失败", @@ -434,7 +434,7 @@ bool CPcsUnit::initOutputKeys() } //< 错误码 - if ( kbdSuccess != m_ptrDiagData-> + if ( iotSuccess != m_ptrDiagData-> getValKeyByModOutput( stModKey, nBaseID + UOID_ERROR_CODE, m_stOutKeyErrorCode )) { LOGERROR( "initInputKeys(): 获取模块[%s]的机组[%d]的输出键[错误码]失败", @@ -494,7 +494,7 @@ void CPcsUnit::refreshInputValues() const SFbdModKey &stModKey = m_pParent->getModKey(); //< 有功设定值 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_Set, m_stInValP_Set )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_Set, m_stInValP_Set )) { LOGERROR( "refreshInputValues(): 模块[%s]的机组[%d]获取输入值[有功设定值]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -503,7 +503,7 @@ void CPcsUnit::refreshInputValues() } //< 有功实际值 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_Real, m_stInValP_Real )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyP_Real, m_stInValP_Real )) { LOGERROR( "refreshInputValues(): 模块[%s]的机组[%d]获取输入值[有功实际值]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -512,7 +512,7 @@ void CPcsUnit::refreshInputValues() } //< SOC - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeySoc, m_stInValSoc )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeySoc, m_stInValSoc )) { LOGERROR( "refreshInputValues(): 模块[%s]的机组[%d]获取输入值[SOC]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -521,7 +521,7 @@ void CPcsUnit::refreshInputValues() } //< 调节使能 - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyEnableRegulate, m_stInValEnableRegulate )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyEnableRegulate, m_stInValEnableRegulate )) { LOGERROR( "refreshInputValues(): 模块[%s]的机组[%d]获取输入值[调节使能]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -1048,7 +1048,7 @@ void CPcsUnit::outputValues() const SFbdModKey &stModKey = m_pParent->getModKey(); //< 有功分配值 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyP_Allocated, m_stOutValP_Allocated )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyP_Allocated, m_stOutValP_Allocated )) { LOGERROR( "outputValues(): 模块[%s]的机组[%d]设置输出值[有功分配值]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -1058,7 +1058,7 @@ void CPcsUnit::outputValues() } //< 执行调节 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyDoRegulate, m_stOutValDoRegulate )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyDoRegulate, m_stOutValDoRegulate )) { LOGERROR( "outputValues(): 模块[%s]的机组[%d]设置输出值[执行调节]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -1066,7 +1066,7 @@ void CPcsUnit::outputValues() //< 机组状态码 SFbdNumericValue stStateCode( m_enStateCode, CN_FBD_STATUS_Valid ); //< 状态始终有效 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyStateCode, stStateCode )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyStateCode, stStateCode )) { LOGERROR( "outputValues(): 模块[%s]的机组[%d]设置输出值[机组状态码]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -1074,7 +1074,7 @@ void CPcsUnit::outputValues() //< 机组错误码 SFbdNumericValue stErrorCode( m_enErrorCode, CN_FBD_STATUS_Valid ); //< 状态始终有效 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyErrorCode, stErrorCode )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutKeyErrorCode, stErrorCode )) { LOGERROR( "outputValues(): 模块[%s]的机组[%d]设置输出值[机组错误码]失败", stModKey.toString().c_str(), m_nUnitId ); @@ -1297,4 +1297,4 @@ bool &CPcsUnit::getExcludeFromRegulation_2() } //< namespace apc_pd_pcs } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsUnit.h b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsUnit.h index 56bd2f08..885a54b0 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsUnit.h +++ b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsUnit.h @@ -16,7 +16,7 @@ #include "ApcPdPcsCommon.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -265,4 +265,4 @@ private: } //< namespace apc_pd_pcs } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/fmt_text/FmtText.cpp b/product/src/application/app_fbd/fbd_module/fmt_text/FmtText.cpp index 99aeac48..c7a24e9a 100644 --- a/product/src/application/app_fbd/fbd_module/fmt_text/FmtText.cpp +++ b/product/src/application/app_fbd/fbd_module/fmt_text/FmtText.cpp @@ -18,7 +18,7 @@ #define VAR_TOKEN_BEGIN '{' #define VAR_TOKEN_END '}' -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -55,15 +55,15 @@ int CFmtText::init( const SFbdModKey &stModuleKey, const std::string & ) if ( m_ptrDiagData == nullptr ) { LOGERROR( "获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } // 获取输入端口个数 std::string sInputNum = "-1"; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_InputNum, sInputNum )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_InputNum, sInputNum )) { LOGERROR( "获取模块[%s]的输入端口个数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } // 检查输入端口个数合法性 @@ -71,17 +71,17 @@ int CFmtText::init( const SFbdModKey &stModuleKey, const std::string & ) if ( m_nInputNum < CN_MinIONum || m_nInputNum > CN_MaxIONum ) //< 判断是否有效 { LOGERROR( "模块[%s]要求的输入端口个数最小=%d,最大=%d", stModuleKey.toString().c_str(), CN_MinIONum, CN_MaxIONum ); - return kbdFailed; + return iotFailed; } // 获取输入端口的信息 m_vecInputKey.resize( static_cast(m_nInputNum)); for ( int i = 0; i < m_nInputNum; ++i ) //< 获取输入参数主键 { - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, i + 2, m_vecInputKey[i] )) // index=1是使能，可伸缩参数从2开始 + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, i + 2, m_vecInputKey[i] )) // index=1是使能，可伸缩参数从2开始 { LOGERROR( "获取模块[%s]的输入参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } } @@ -92,10 +92,10 @@ int CFmtText::init( const SFbdModKey &stModuleKey, const std::string & ) for ( int i = 0; i < m_nInputNum; ++i ) //< 获取输入参数主键 { std::string propTypeVal; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, std::string("InputType") + std::to_string(i+1), propTypeVal) ) // index=1是使能，可伸缩参数从2开始 + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, std::string("InputType") + std::to_string(i+1), propTypeVal) ) // index=1是使能，可伸缩参数从2开始 { LOGERROR( "获取模块[%s]的输入参数[%d]失败", stModuleKey.toString().c_str(),i); - return kbdFailed; + return iotFailed; } if(propTypeVal == "0"){ @@ -108,44 +108,44 @@ int CFmtText::init( const SFbdModKey &stModuleKey, const std::string & ) m_vecInputEnType[i] = EN_STRING; }else{ LOGERROR( "获取模块[%s]的输入参数[%d]类型[%s]错误", stModuleKey.toString().c_str(),i,propTypeVal.c_str()); - return kbdFailed; + return iotFailed; } } // LOGINFO("init() end type"); // 获取格式化内容 - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_OutputFmt, m_sOutputFmt )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_OutputFmt, m_sOutputFmt )) { LOGERROR( "获取模块[%s]的格式化配置内容失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } { - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKeyInIsEnabled )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKeyInIsEnabled )) { LOGERROR( "获取模块[%s]的输入参数[%s]失败", stModuleKey.toString().c_str(),CN_InIsEnabled); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stInKeyOutIsEnabled )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 1, m_stInKeyOutIsEnabled )) { LOGERROR( "获取模块[%s]的输入参数[%s]失败", stModuleKey.toString().c_str(),CN_OutIsEnabled); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 2, m_stOutKeyOutContent )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, 2, m_stOutKeyOutContent )) { LOGERROR( "获取模块[%s]的输入参数[%s]失败", stModuleKey.toString().c_str(),CN_OutContent); - return kbdFailed; + return iotFailed; } } //LOGINFO("init() end"); - return kbdSuccess; + return iotSuccess; } @@ -155,25 +155,25 @@ int CFmtText::calculate() SFbdNumericValue stInIsEnabled( 0, CN_FBD_STATUS_Invalid ); // 未使能直接退出 { - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyInIsEnabled, stInIsEnabled )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyInIsEnabled, stInIsEnabled )) { LOGERROR( "获取模块[%s]输入参数[%s]值失败", m_stModKey.toString().c_str(), m_stInKeyInIsEnabled.toString().c_str()); - return kbdFailed; + return iotFailed; } bool isEnabled = ( static_cast(stInIsEnabled.m_dValue) != 0 ); if(!isEnabled) { // 并取消置位输出使能 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stInKeyOutIsEnabled, stInIsEnabled )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stInKeyOutIsEnabled, stInIsEnabled )) { LOGERROR( "设置模块[%s]速出参数[%s]值失败", m_stModKey.toString().c_str(), m_stInKeyOutIsEnabled.toString().c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } } @@ -212,41 +212,41 @@ int CFmtText::calculate() if(varIdx <0 || varIdx >= m_nInputNum) { LOGERROR("错误变量，解析错误，模块[%s]",m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if( m_vecInputEnType[varIdx] == EN_INT ) { - if( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_vecInputKey[varIdx], numVal ) ) + if( iotSuccess != m_ptrDiagData->getNumericValByKey( m_vecInputKey[varIdx], numVal ) ) { LOGERROR("模块[%s]获取参数[%s]值失败",m_stModKey.toString().c_str(), m_vecInputKey[varIdx].toString().c_str()); - return kbdFailed; + return iotFailed; } previewText += std::to_string((int)numVal.m_dValue); } else if( m_vecInputEnType[varIdx] == EN_BOOL ) { - if( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_vecInputKey[varIdx], numVal ) ) + if( iotSuccess != m_ptrDiagData->getNumericValByKey( m_vecInputKey[varIdx], numVal ) ) { LOGERROR("模块[%s]获取参数[%s]值失败",m_stModKey.toString().c_str(), m_vecInputKey[varIdx].toString().c_str()); - return kbdFailed; + return iotFailed; } previewText += std::to_string((bool)numVal.m_dValue); } else if( m_vecInputEnType[varIdx] == EN_FLOAT) { - if( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_vecInputKey[varIdx], numVal ) ) + if( iotSuccess != m_ptrDiagData->getNumericValByKey( m_vecInputKey[varIdx], numVal ) ) { LOGERROR("模块[%s]获取参数[%s]值失败",m_stModKey.toString().c_str(), m_vecInputKey[varIdx].toString().c_str()); - return kbdFailed; + return iotFailed; } std::string strFVal = std::to_string(numVal.m_dValue); strFVal.erase ( strFVal.find_last_not_of('0') + 1, std::string::npos ); // 移除 尾部0 previewText += strFVal; } else { - if( kbdSuccess != m_ptrDiagData->getStringValByKey( m_vecInputKey[varIdx], strVal ) ) + if( iotSuccess != m_ptrDiagData->getStringValByKey( m_vecInputKey[varIdx], strVal ) ) { LOGERROR("模块[%s]获取参数[%s]值失败",m_stModKey.toString().c_str(), m_vecInputKey[varIdx].toString().c_str()); - return kbdFailed; + return iotFailed; } previewText += strVal.m_strValue; } @@ -254,7 +254,7 @@ int CFmtText::calculate() } else{ LOGERROR("未能找到 } 再 模块[%s]",m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } @@ -272,28 +272,28 @@ int CFmtText::calculate() strContent.m_strValue = previewText; strContent.m_nStatus = CN_FBD_STATUS_Valid; // 计算成功后输出使能 - if ( kbdSuccess != m_ptrDiagData->setStringValByKey( m_stOutKeyOutContent, strContent )) + if ( iotSuccess != m_ptrDiagData->setStringValByKey( m_stOutKeyOutContent, strContent )) { LOGERROR( "设置模块[%s]速出参数[%s]值失败,值为[]", m_stModKey.toString().c_str(), m_stOutKeyOutContent.toString().c_str()); - return kbdFailed; + return iotFailed; } // 计算成功后输出使能 - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stInKeyOutIsEnabled, stInIsEnabled )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stInKeyOutIsEnabled, stInIsEnabled )) { LOGERROR( "设置模块[%s]速出参数[%s]值失败", m_stModKey.toString().c_str(), m_stInKeyOutIsEnabled.toString().c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int CFmtText::reset( const bool /*bMaster*/ ) { - return kbdSuccess; + return iotSuccess; } @@ -311,4 +311,4 @@ boost::shared_ptr CFmtText::create() } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/fmt_text/FmtText.h b/product/src/application/app_fbd/fbd_module/fmt_text/FmtText.h index ffa1f858..80484f40 100644 --- a/product/src/application/app_fbd/fbd_module/fmt_text/FmtText.h +++ b/product/src/application/app_fbd/fbd_module/fmt_text/FmtText.h @@ -10,7 +10,7 @@ #include "app_fbd/fbd_common/BaseModule.h" #include "app_fbd/fbd_common/FbdDiagDataApi.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -66,4 +66,4 @@ BOOST_DLL_ALIAS( ) } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/multi_map/CMultiMap.cpp b/product/src/application/app_fbd/fbd_module/multi_map/CMultiMap.cpp index 5640ff2c..916e2d36 100644 --- a/product/src/application/app_fbd/fbd_module/multi_map/CMultiMap.cpp +++ b/product/src/application/app_fbd/fbd_module/multi_map/CMultiMap.cpp @@ -16,7 +16,7 @@ #include "rapidjson/error/en.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -49,35 +49,35 @@ int MultiMap::init(const SFbdModKey &stModuleKey, const std::string &) if ( m_ptrDiagData == nullptr ) { LOGERROR( "模块[%s]获取Diagram数据接口单例失败",m_stModKey.toString().c_str() ); - return kbdFailed; + return iotFailed; } //1.获取第一个输入类型 std::string sFirstType = ""; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_FirstType, sFirstType )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_FirstType, sFirstType )) { LOGERROR( "获取模块[%s]的第一个输入类型失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } m_nFirstType = iot_public::StringToInt(sFirstType); //2.获取输入参数 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKey2 )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || + iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKey2 )) { LOGERROR( "获取模块[%s]的输入参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //3.获取映射的输出个数 std::string sOutputNum = ""; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_OutputNum, sOutputNum )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_OutputNum, sOutputNum )) { LOGERROR( "获取模块[%s]的输出个数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if(sOutputNum.size() <= 0) { LOGERROR( "模块[%s]未配置输出个数", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } m_nOutputNum = iot_public::StringToInt(sOutputNum); @@ -87,10 +87,10 @@ int MultiMap::init(const SFbdModKey &stModuleKey, const std::string &) std::string value; std::string stoutdata = "OutputType"+ iot_public::IntToString(index+1); const char *CN_OutData = stoutdata.c_str(); - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_OutData, value )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_OutData, value )) { LOGERROR( "获取模块[%s]的输出的数据类型失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; }else { m_outTypeVec.push_back(iot_public::StringToInt(value)); @@ -100,46 +100,46 @@ int MultiMap::init(const SFbdModKey &stModuleKey, const std::string &) for(int index(0);indexgetValKeyByModOutput( stModuleKey, index+1, key )) + if(iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, index+1, key )) { LOGERROR( "获取模块[%s]的输出参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; }else { m_stOutputVec.push_back(key); } } //6.获取输出的使能参数 - if(kbdSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, m_nOutputNum+1, m_stOutputL )) + if(iotSuccess != m_ptrDiagData->getValKeyByModOutput( stModuleKey, m_nOutputNum+1, m_stOutputL )) { LOGERROR( "获取模块[%s]的输出使能参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //7.获取映射配置 std::string sMultiMapCfg = ""; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_MultiMapCfg, sMultiMapCfg )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_MultiMapCfg, sMultiMapCfg )) { LOGERROR( "获取模块[%s]的映射配置失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if(sMultiMapCfg.size() <= 0) { LOGERROR( "模块[%s]未配置映射", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if(!fromMultiMapJson(sMultiMapCfg.c_str())) { - return kbdFailed; + return iotFailed; } //8.检查 if(m_nOutputNum != (int)m_stOutputVec.size() &&m_nOutputNum != (int)m_outTypeVec.size()) { LOGERROR("模块[%s]配置错误!",m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } LOGINFO( "[%s]加载成功", m_stModKey.toString().c_str()); m_bInitialized = true; - return kbdSuccess; + return iotSuccess; } int MultiMap::calculate() @@ -147,16 +147,16 @@ int MultiMap::calculate() if ( !m_bInitialized ) { LOGERROR( "calculate(): 模块[%s]未成功初始化，不应执行映射!",m_stModKey.toString().c_str() ); - return kbdFailed; + return iotFailed; } //处理业务逻辑 //< 1.当前没有执行命令时,将使能设置为false setOLToZero(); SFbdNumericValue stValAndSta2; - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey2, stValAndSta2 )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey2, stValAndSta2 )) { LOGERROR( "获取模块[%s]的输入参数2的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } int nInValue2 = static_cast(stValAndSta2.m_dValue); if ( nInValue2 != 0 && isValidOfStatus( stValAndSta2.m_nStatus )) @@ -165,10 +165,10 @@ int MultiMap::calculate() SFbdStringValue sttValAndSta; switch (m_nFirstType) { case EN_Multi_Map_Int: - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey1, stNValAndSta )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey1, stNValAndSta )) { LOGERROR( "获取模块[%s]的输入参数1的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if ( isValidOfStatus( stNValAndSta.m_nStatus )) { @@ -181,10 +181,10 @@ int MultiMap::calculate() } break; case EN_Multi_Map_Double: - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey1, stNValAndSta )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey1, stNValAndSta )) { LOGERROR( "获取模块[%s]的输入参数1的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if ( isValidOfStatus( stNValAndSta.m_nStatus )) { @@ -197,10 +197,10 @@ int MultiMap::calculate() } break; case EN_Multi_Map_Bool: - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey1, stNValAndSta )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey1, stNValAndSta )) { LOGERROR( "获取模块[%s]的输入参数1的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if ( isValidOfStatus( stNValAndSta.m_nStatus )) { @@ -217,10 +217,10 @@ int MultiMap::calculate() } break; case EN_Multi_Map_String: - if ( kbdSuccess != m_ptrDiagData->getStringValByKey( m_stInKey1, sttValAndSta )) + if ( iotSuccess != m_ptrDiagData->getStringValByKey( m_stInKey1, sttValAndSta )) { LOGERROR( "获取模块[%s]的输入参数1的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if ( isValidOfStatus( sttValAndSta.m_nStatus )) { @@ -235,7 +235,7 @@ int MultiMap::calculate() break; } } - return kbdSuccess; + return iotSuccess; } int MultiMap::reset(const bool /*bMaster*/) @@ -412,13 +412,13 @@ void MultiMap::setOLToZero() int MultiMap::setAllOutputInvalid() { - int nRet = kbdSuccess; + int nRet = iotSuccess; SFbdNumericValue stNumericOutput( 0, CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputL, stNumericOutput )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputL, stNumericOutput )) { LOGERROR( "设置[%s]输出值使能失败", m_stOutputL.toString().c_str()); - nRet = kbdFailed; + nRet = iotFailed; } SFbdStringValue stStringOutput( "", CN_FBD_STATUS_Invalid ); for(int index(0);index<(int)m_outTypeVec.size() && index<(int)m_stOutputVec.size();index++) @@ -427,17 +427,17 @@ int MultiMap::setAllOutputInvalid() case EN_Multi_Map_Int: case EN_Multi_Map_Double: case EN_Multi_Map_Bool: - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputVec.at(index), stNumericOutput )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputVec.at(index), stNumericOutput )) { LOGERROR( "设置[%s]输出值失败", m_stOutputVec.at(index).toString().c_str()); - nRet = kbdFailed; + nRet = iotFailed; } break; case EN_Multi_Map_String: - if ( kbdSuccess != m_ptrDiagData->setStringValByKey( m_stOutputVec.at(index), stStringOutput )) + if ( iotSuccess != m_ptrDiagData->setStringValByKey( m_stOutputVec.at(index), stStringOutput )) { LOGERROR( "设置[%s]输出值失败", m_stOutputVec.at(index).toString().c_str()); - nRet = kbdFailed; + nRet = iotFailed; } default: break; @@ -451,7 +451,7 @@ int MultiMap::handleMap(std::vector &valueVec) SFbdNumericValue stNumericOutput( 1, CN_FBD_STATUS_Valid ); if(valueVec.size()<= 0) { - return kbdSuccess; + return iotSuccess; } for(int index(0);index<(int)valueVec.size();index++) { @@ -494,11 +494,11 @@ int MultiMap::handleMap(std::vector &valueVec) } } stNumericOutput.m_dValue =1; - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputL, stNumericOutput )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputL, stNumericOutput )) { LOGERROR( "设置[%s]输出值使能失败", m_stOutputL.toString().c_str()); } - return kbdSuccess; + return iotSuccess; } } diff --git a/product/src/application/app_fbd/fbd_module/multi_map/CMultiMap.h b/product/src/application/app_fbd/fbd_module/multi_map/CMultiMap.h index 345abdec..03387e9c 100644 --- a/product/src/application/app_fbd/fbd_module/multi_map/CMultiMap.h +++ b/product/src/application/app_fbd/fbd_module/multi_map/CMultiMap.h @@ -12,7 +12,7 @@ #include "app_fbd/fbd_common/FbdDiagDataApi.h" #include "map" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -92,5 +92,5 @@ BOOST_DLL_ALIAS( create_plugin // 将导出函数重命名，最终调用者访问此函数名 ) }//< namespace app_fbd -}//< namespace kbd_app +}//< namespace iot_app #endif // CMUTILMAP_H diff --git a/product/src/application/app_fbd/fbd_module/phone_call/Call.cpp b/product/src/application/app_fbd/fbd_module/phone_call/Call.cpp index 8a77f0e0..854bc00e 100644 --- a/product/src/application/app_fbd/fbd_module/phone_call/Call.cpp +++ b/product/src/application/app_fbd/fbd_module/phone_call/Call.cpp @@ -14,7 +14,7 @@ #include "app_fbd/fbd_common/FbdSysInfoApi.h" #include "Call.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -39,28 +39,28 @@ int CCall::init( const SFbdModKey &stModuleKey, const std::string &/*strExtraPar if ( m_ptrDiagData == nullptr ) { LOGERROR( "获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } // 配置参数获取参数 { - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, "SrvAddr", m_strSrvAddr )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, "SrvAddr", m_strSrvAddr )) { LOGERROR( "获取模块[%s]属性[%s]失败", m_stModKey.toString().c_str(),"SrvAddr"); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, "Username", m_strUsername )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, "Username", m_strUsername )) { LOGERROR( "获取模块[%s]属性[%s]失败", m_stModKey.toString().c_str(),"Username"); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, "Password", m_strPassword )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, "Password", m_strPassword )) { LOGERROR( "获取模块[%s]属性[%s]失败", m_stModKey.toString().c_str(),"Password"); - return kbdFailed; + return iotFailed; } @@ -70,29 +70,29 @@ int CCall::init( const SFbdModKey &stModuleKey, const std::string &/*strExtraPar || m_strPassword == "") { LOGERROR("Some args are empty, please check."); - return kbdFailed; + return iotFailed; } } // input参数 { - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKeyRecipients )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKeyRecipients )) { LOGERROR( "获取模块[%s]的输入参数[%s]失败", stModuleKey.toString().c_str(),"Recipients"); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKeyContent )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKeyContent )) { LOGERROR( "获取模块[%s]的输入参数[%s]失败", stModuleKey.toString().c_str(),"content"); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 3, m_stInKeyIsEnabled )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 3, m_stInKeyIsEnabled )) { LOGERROR( "获取模块[%s]的输入参数[%s]失败", stModuleKey.toString().c_str(),"isEnabled"); - return kbdFailed; + return iotFailed; } m_objVsmsMsg.set_server_address(m_strSrvAddr); @@ -102,7 +102,7 @@ int CCall::init( const SFbdModKey &stModuleKey, const std::string &/*strExtraPar } LOGINFO( "[%s]加载成功", m_stModKey.toString().c_str()); - return kbdSuccess; + return iotSuccess; } @@ -113,42 +113,42 @@ int CCall::calculate() // 未使能直接退出 { SFbdNumericValue stIsEnabled( 0, CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyIsEnabled, stIsEnabled )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyIsEnabled, stIsEnabled )) { LOGERROR( "获取模块[%s]输入参数[%s]值失败", m_stModKey.toString().c_str(), m_stInKeyIsEnabled.toString().c_str()); - return kbdFailed; + return iotFailed; } if(stIsEnabled.m_nStatus == CN_FBD_STATUS_Invalid) { LOGERROR("Input arg [isEnabled] status is wrong"); - return kbdFailed; + return iotFailed; } bool isEnabled = ( static_cast(stIsEnabled.m_dValue) != 0 ); if(!isEnabled) { - return kbdSuccess; + return iotSuccess; } } //< 获取参数 SFbdStringValue stRecipients( "", CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->getStringValByKey( m_stInKeyRecipients, stRecipients )) + if ( iotSuccess != m_ptrDiagData->getStringValByKey( m_stInKeyRecipients, stRecipients )) { LOGERROR( "获取模块[%s]输入参数[%s]值失败", m_stModKey.toString().c_str(), m_stInKeyRecipients.toString().c_str()); - return kbdFailed; + return iotFailed; } SFbdStringValue stContent( "", CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->getStringValByKey( m_stInKeyContent, stContent )) + if ( iotSuccess != m_ptrDiagData->getStringValByKey( m_stInKeyContent, stContent )) { LOGERROR( "获取模块[%s]输入参数[%s]值失败", m_stModKey.toString().c_str(), m_stInKeyContent.toString().c_str()); - return kbdFailed; + return iotFailed; } //> 获取参数 @@ -158,7 +158,7 @@ int CCall::calculate() ) { LOGERROR( "the status of the input args arg wrong."); - return kbdFailed; + return iotFailed; } // 判断是否为空 @@ -166,7 +166,7 @@ int CCall::calculate() || stContent.m_strValue == "") { LOGERROR("Some args are empty, please check."); - return kbdFailed; + return iotFailed; } // 拼接参数 @@ -180,7 +180,7 @@ int CCall::calculate() int CCall::reset( const bool /*bMaster*/ ) { - return kbdSuccess; + return iotSuccess; } @@ -207,14 +207,14 @@ int CCall::sendToPushSrv( ) { LOGERROR( "模块[%s]发送消息失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/phone_call/Call.h b/product/src/application/app_fbd/fbd_module/phone_call/Call.h index 6c69abf3..265b669e 100644 --- a/product/src/application/app_fbd/fbd_module/phone_call/Call.h +++ b/product/src/application/app_fbd/fbd_module/phone_call/Call.h @@ -15,7 +15,7 @@ #include "PushMessage.pb.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -41,7 +41,7 @@ public: private: /* @brief 发送命令给推送服务 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int sendToPushSrv(); @@ -72,4 +72,4 @@ BOOST_DLL_ALIAS( ) } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/send_sms/Sms.cpp b/product/src/application/app_fbd/fbd_module/send_sms/Sms.cpp index cdb597db..f7046585 100644 --- a/product/src/application/app_fbd/fbd_module/send_sms/Sms.cpp +++ b/product/src/application/app_fbd/fbd_module/send_sms/Sms.cpp @@ -14,7 +14,7 @@ #include "app_fbd/fbd_common/FbdSysInfoApi.h" #include "Sms.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -39,28 +39,28 @@ int CSms::init( const SFbdModKey &stModuleKey, const std::string &/*strExtraPara if ( m_ptrDiagData == nullptr ) { LOGERROR( "获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } // 配置参数获取参数 { - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, "SrvAddr", m_strSrvAddr )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, "SrvAddr", m_strSrvAddr )) { LOGERROR( "获取模块[%s]属性[%s]失败", m_stModKey.toString().c_str(),"SrvAddr"); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, "Username", m_strUsername )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, "Username", m_strUsername )) { LOGERROR( "获取模块[%s]属性[%s]失败", m_stModKey.toString().c_str(),"Username"); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, "Password", m_strPassword )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, "Password", m_strPassword )) { LOGERROR( "获取模块[%s]属性[%s]失败", m_stModKey.toString().c_str(),"Password"); - return kbdFailed; + return iotFailed; } @@ -70,29 +70,29 @@ int CSms::init( const SFbdModKey &stModuleKey, const std::string &/*strExtraPara || m_strPassword == "") { LOGERROR("Some args are empty, please check."); - return kbdFailed; + return iotFailed; } } // input参数key { - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKeyRecipients )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKeyRecipients )) { LOGERROR( "获取模块[%s]的输入参数[%s]失败", stModuleKey.toString().c_str(),"Recipients"); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKeyContent )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKeyContent )) { LOGERROR( "获取模块[%s]的输入参数[%s]失败", stModuleKey.toString().c_str(),"content"); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 3, m_stInKeyIsEnabled )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 3, m_stInKeyIsEnabled )) { LOGERROR( "获取模块[%s]的输入参数[%s]失败", stModuleKey.toString().c_str(),"isEnabled"); - return kbdFailed; + return iotFailed; } m_objVsmsMsg.set_server_address(m_strSrvAddr); @@ -102,7 +102,7 @@ int CSms::init( const SFbdModKey &stModuleKey, const std::string &/*strExtraPara } LOGINFO( "[%s]加载成功", m_stModKey.toString().c_str()); - return kbdSuccess; + return iotSuccess; } @@ -111,23 +111,23 @@ int CSms::calculate() // 未使能直接退出 { SFbdNumericValue stIsEnabled( 0, CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyIsEnabled, stIsEnabled )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyIsEnabled, stIsEnabled )) { LOGERROR( "获取模块[%s]输入参数[%s]值失败", m_stModKey.toString().c_str(), m_stInKeyIsEnabled.toString().c_str()); - return kbdFailed; + return iotFailed; } if(stIsEnabled.m_nStatus == CN_FBD_STATUS_Invalid) { LOGERROR("Input arg [isEnabled] status is wrong"); - return kbdFailed; + return iotFailed; } bool isEnabled = ( static_cast(stIsEnabled.m_dValue) != 0 ); if(!isEnabled) { - return kbdSuccess; + return iotSuccess; } } @@ -135,19 +135,19 @@ int CSms::calculate() //< 获取参数 SFbdStringValue stRecipients( "", CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->getStringValByKey( m_stInKeyRecipients, stRecipients )) + if ( iotSuccess != m_ptrDiagData->getStringValByKey( m_stInKeyRecipients, stRecipients )) { LOGERROR( "获取模块[%s]输入参数[%s]值失败", m_stModKey.toString().c_str(), m_stInKeyRecipients.toString().c_str()); - return kbdFailed; + return iotFailed; } SFbdStringValue stContent( "", CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->getStringValByKey( m_stInKeyContent, stContent )) + if ( iotSuccess != m_ptrDiagData->getStringValByKey( m_stInKeyContent, stContent )) { LOGERROR( "获取模块[%s]输入参数[%s]值失败", m_stModKey.toString().c_str(), m_stInKeyContent.toString().c_str()); - return kbdFailed; + return iotFailed; } //> 获取参数 @@ -157,7 +157,7 @@ int CSms::calculate() ) { LOGERROR( "the status of the input args arg wrong."); - return kbdFailed; + return iotFailed; } // 判断是否为空 @@ -165,7 +165,7 @@ int CSms::calculate() || stContent.m_strValue == "") { LOGERROR("Some args are empty, please check."); - return kbdFailed; + return iotFailed; } // 拼接参数 @@ -180,7 +180,7 @@ int CSms::calculate() int CSms::reset( const bool /*bMaster*/ ) { - return kbdSuccess; + return iotSuccess; } @@ -207,14 +207,14 @@ int CSms::sendToPushSrv( ) { LOGERROR( "模块[%s]发送消息失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/send_sms/Sms.h b/product/src/application/app_fbd/fbd_module/send_sms/Sms.h index c5768141..1187ae7f 100644 --- a/product/src/application/app_fbd/fbd_module/send_sms/Sms.h +++ b/product/src/application/app_fbd/fbd_module/send_sms/Sms.h @@ -15,7 +15,7 @@ #include "PushMessage.pb.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -41,7 +41,7 @@ public: private: /* @brief 发送命令给推送服务 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int sendToPushSrv(); @@ -72,4 +72,4 @@ BOOST_DLL_ALIAS( ) } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/smtp_mail/SmtpMail.cpp b/product/src/application/app_fbd/fbd_module/smtp_mail/SmtpMail.cpp index ac09af62..75aa9cd8 100644 --- a/product/src/application/app_fbd/fbd_module/smtp_mail/SmtpMail.cpp +++ b/product/src/application/app_fbd/fbd_module/smtp_mail/SmtpMail.cpp @@ -14,7 +14,7 @@ #include "app_fbd/fbd_common/FbdSysInfoApi.h" #include "SmtpMail.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -39,48 +39,48 @@ int CSmtpMail::init( const SFbdModKey &stModuleKey, const std::string &/*strExtr if ( m_ptrDiagData == nullptr ) { LOGERROR( "获取Diagram数据接口单例失败" ); - return kbdFailed; + return iotFailed; } // 配置参数获取参数 { - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, "SrvAddr", m_strSrvAddr )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, "SrvAddr", m_strSrvAddr )) { LOGERROR( "获取模块[%s]属性[%s]失败", m_stModKey.toString().c_str(),"SrvAddr"); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, "Port", m_strPort )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, "Port", m_strPort )) { LOGERROR( "获取模块[%s]属性[%s]失败", m_stModKey.toString().c_str(),"Port"); - return kbdFailed; + return iotFailed; } std::string strConnType; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, "ConnType", strConnType )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, "ConnType", strConnType )) { LOGERROR( "获取模块[%s]属性[%s]失败", m_stModKey.toString().c_str(),"ConnType"); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, "Sender", m_strSender )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, "Sender", m_strSender )) { LOGERROR( "获取模块[%s]属性[%s]失败", m_stModKey.toString().c_str(),"Sender"); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, "Username", m_strUsername )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, "Username", m_strUsername )) { LOGERROR( "获取模块[%s]属性[%s]失败", m_stModKey.toString().c_str(),"Username"); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, "Password", m_strPassword )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, "Password", m_strPassword )) { LOGERROR( "获取模块[%s]属性[%s]失败", m_stModKey.toString().c_str(),"Password"); - return kbdFailed; + return iotFailed; } @@ -93,7 +93,7 @@ int CSmtpMail::init( const SFbdModKey &stModuleKey, const std::string &/*strExtr || m_strPassword == "") { LOGERROR("Some args are empty, please check."); - return kbdFailed; + return iotFailed; } int nConnType = std::stoi( strConnType ); @@ -103,7 +103,7 @@ int CSmtpMail::init( const SFbdModKey &stModuleKey, const std::string &/*strExtr ) { LOGERROR("unknown smtp connection type-[%d]",nConnType); - return kbdFailed; + return iotFailed; }else { if(nConnType == iot_idl::SSMTP_MAIL_enConnectionType_CT_TCP_CONNECTION){ @@ -120,29 +120,29 @@ int CSmtpMail::init( const SFbdModKey &stModuleKey, const std::string &/*strExtr // input参数 { - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKeyRecipients )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKeyRecipients )) { LOGERROR( "获取模块[%s]的输入参数[%s]失败", stModuleKey.toString().c_str(),"Recipients"); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKeySubject )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKeySubject )) { LOGERROR( "获取模块[%s]的输入参数[%s]失败", stModuleKey.toString().c_str(),"subject"); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 3, m_stInKeyContent )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 3, m_stInKeyContent )) { LOGERROR( "获取模块[%s]的输入参数[%s]失败", stModuleKey.toString().c_str(),"content"); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 4, m_stInKeyIsEnabled )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 4, m_stInKeyIsEnabled )) { LOGERROR( "获取模块[%s]的输入参数[%s]失败", stModuleKey.toString().c_str(),"isEnabled"); - return kbdFailed; + return iotFailed; } m_objMail.set_server_address(m_strSrvAddr); @@ -153,7 +153,7 @@ int CSmtpMail::init( const SFbdModKey &stModuleKey, const std::string &/*strExtr m_objMail.set_password(m_strPassword); } - return kbdSuccess; + return iotSuccess; } @@ -162,49 +162,49 @@ int CSmtpMail::calculate() // 未使能直接退出 { SFbdNumericValue stIsEnabled( 0, CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyIsEnabled, stIsEnabled )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKeyIsEnabled, stIsEnabled )) { LOGERROR( "获取模块[%s]输入参数[%s]值失败", m_stModKey.toString().c_str(), m_stInKeyIsEnabled.toString().c_str()); - return kbdFailed; + return iotFailed; } if(stIsEnabled.m_nStatus == CN_FBD_STATUS_Invalid) { LOGERROR("Input arg [isEnabled] status is wrong"); - return kbdFailed; + return iotFailed; } bool isEnabled = ( static_cast(stIsEnabled.m_dValue) != 0 ); if(!isEnabled) { - return kbdSuccess; + return iotSuccess; } } //< 获取参数 SFbdStringValue stRecipients( "", CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->getStringValByKey( m_stInKeyRecipients, stRecipients )) + if ( iotSuccess != m_ptrDiagData->getStringValByKey( m_stInKeyRecipients, stRecipients )) { LOGERROR( "获取模块[%s]输入参数[%s]值失败", m_stModKey.toString().c_str(), m_stInKeyRecipients.toString().c_str()); - return kbdFailed; + return iotFailed; } SFbdStringValue stSubject( "", CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->getStringValByKey( m_stInKeySubject, stSubject )) + if ( iotSuccess != m_ptrDiagData->getStringValByKey( m_stInKeySubject, stSubject )) { LOGERROR( "获取模块[%s]输入参数[%s]值失败", m_stModKey.toString().c_str(), m_stInKeySubject.toString().c_str()); - return kbdFailed; + return iotFailed; } SFbdStringValue stContent( "", CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->getStringValByKey( m_stInKeyContent, stContent )) + if ( iotSuccess != m_ptrDiagData->getStringValByKey( m_stInKeyContent, stContent )) { LOGERROR( "获取模块[%s]输入参数[%s]值失败", m_stModKey.toString().c_str(), m_stInKeyContent.toString().c_str()); - return kbdFailed; + return iotFailed; } //> 获取参数 @@ -214,7 +214,7 @@ int CSmtpMail::calculate() ) { LOGERROR( "the status of the input args arg wrong."); - return kbdFailed; + return iotFailed; } // 判断是否为空 @@ -223,7 +223,7 @@ int CSmtpMail::calculate() || stContent.m_strValue == "") { LOGERROR("Some args are empty, please check."); - return kbdFailed; + return iotFailed; } // 拼接参数 @@ -239,7 +239,7 @@ int CSmtpMail::calculate() int CSmtpMail::reset( const bool /*bMaster*/ ) { - return kbdSuccess; + return iotSuccess; } @@ -266,14 +266,14 @@ int CSmtpMail::sendToPushSrv( ) { LOGERROR( "模块[%s]发送消息失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/smtp_mail/SmtpMail.h b/product/src/application/app_fbd/fbd_module/smtp_mail/SmtpMail.h index 15508f24..57a2c67d 100644 --- a/product/src/application/app_fbd/fbd_module/smtp_mail/SmtpMail.h +++ b/product/src/application/app_fbd/fbd_module/smtp_mail/SmtpMail.h @@ -15,7 +15,7 @@ #include "PushMessage.pb.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -41,7 +41,7 @@ public: private: /* @brief 发送命令给推送服务 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int sendToPushSrv(); @@ -76,4 +76,4 @@ BOOST_DLL_ALIAS( ) } //< namespace app_fbd -} //< namespace kbd_app +} //< namespace iot_app diff --git a/product/src/application/app_fbd/fbd_module/time_trigger/CTimeTrigger.cpp b/product/src/application/app_fbd/fbd_module/time_trigger/CTimeTrigger.cpp index 2da83aae..06e592d7 100644 --- a/product/src/application/app_fbd/fbd_module/time_trigger/CTimeTrigger.cpp +++ b/product/src/application/app_fbd/fbd_module/time_trigger/CTimeTrigger.cpp @@ -12,7 +12,7 @@ #include "pub_utility_api/CharUtil.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -42,38 +42,38 @@ int TimeTrigger::init(const SFbdModKey &stModuleKey, const std::string &) if ( m_ptrDiagData == nullptr ) { LOGERROR( "模块[%s]获取Diagram数据接口单例失败",m_stModKey.toString().c_str() ); - return kbdFailed; + return iotFailed; } //1.获取输出参数 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 1, m_stOutputKey )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModOutput(stModuleKey, 1, m_stOutputKey )) { LOGERROR( "获取模块[%s]的输出使能参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } //2.获取配置信息 std::string sTimeConfig = ""; - if ( kbdSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_TimeConfig, sTimeConfig )) + if ( iotSuccess != m_ptrDiagData->getModProperty( stModuleKey, CN_TimeConfig, sTimeConfig )) { LOGERROR( "获取模块[%s]的启停信息失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if(!parseTime(sTimeConfig)) { LOGERROR( "模块[%s]解析时间失败[%s]",m_stModKey.toString().c_str(), sTimeConfig.c_str()); - return kbdFailed; + return iotFailed; } boost::posix_time::ptime curTime = boost::posix_time::second_clock::local_time(); m_nLastTriggerTime = iot_public::convertLocalTimeToUTC(curTime); //3.计算下次触发时间 - if(calcNextTime(curTime) != kbdSuccess) + if(calcNextTime(curTime) != iotSuccess) { LOGERROR( "模块[%s]计算下次计算时间出错",m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } LOGINFO( "[%s]加载成功", m_stModKey.toString().c_str()); m_bInitialized = true; - return kbdSuccess; + return iotSuccess; } int TimeTrigger::calculate() @@ -81,7 +81,7 @@ int TimeTrigger::calculate() if ( !m_bInitialized ) { LOGERROR( "calculate(): 模块[%s]未成功初始化，不应执行推送!",m_stModKey.toString().c_str() ); - return kbdFailed; + return iotFailed; } //处理业务逻辑 //< 1.当前没有执行命令时,将使能设置为0 @@ -113,12 +113,12 @@ void TimeTrigger::setOLToZero() int TimeTrigger::setAllOutputInvalid() { - int nRet = kbdSuccess; + int nRet = iotSuccess; SFbdNumericValue stNumericOutput( 0, CN_FBD_STATUS_Invalid ); - if ( kbdSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputKey, stNumericOutput )) + if ( iotSuccess != m_ptrDiagData->setNumericValByKey( m_stOutputKey, stNumericOutput )) { LOGERROR( "设置[%s]输出使能失败", m_stOutputKey.toString().c_str()); - nRet = kbdFailed; + nRet = iotFailed; } return nRet; } @@ -130,7 +130,7 @@ int TimeTrigger::handleTrigger() if(m_nCurTime < m_nLastTriggerTime) { //此处不打印日志，不然很多 - return kbdSuccess; + return iotSuccess; } switch (m_nTriggerType) { case E_TIMETRIGGER_CONST: @@ -146,7 +146,7 @@ int TimeTrigger::handleTrigger() LOGERROR("模块[%s]触发类型[%d]有误!",m_stModKey.toString().c_str(),m_nTriggerType); break; } - return kbdSuccess; + return iotSuccess; } void TimeTrigger::constTrigger() @@ -186,7 +186,7 @@ int TimeTrigger::pushTrigger() SFbdNumericValue stNumericOutput( 1, CN_FBD_STATUS_Valid ); m_ptrDiagData->setNumericValByKey( m_stOutputKey, stNumericOutput ); LOGDEBUG("推送成功! 模块:[%s],当前时间:[%lld],下次触发时间:[%lld],上次触发时间:[%lld]",m_stModKey.toString().c_str(),m_nCurTime,m_nNextTriggerTime,m_nLastTriggerTime); - return kbdSuccess; + return iotSuccess; } bool TimeTrigger::parseTime(const std::string &time) @@ -418,7 +418,7 @@ void TimeTrigger::updateLastTime() { boost::posix_time::ptime curTime = boost::posix_time::second_clock::local_time(); m_nLastTriggerTime = iot_public::convertLocalTimeToUTC(curTime); - if(kbdSuccess != calcNextTime(curTime)) + if(iotSuccess != calcNextTime(curTime)) { LOGERROR( "模块[%s]计算下次计算时间出错",m_stModKey.toString().c_str()); } @@ -429,12 +429,12 @@ int TimeTrigger::calcNextTime(const boost::posix_time::ptime &lastTime) if(m_nTriggerType == E_TIMETRIGGER_CONST) { m_nNextTriggerTime = m_nConstTriggerTime; - return kbdSuccess; + return iotSuccess; } if(m_nTriggerType == E_TIMETRIGGER_INTERVAL) { m_nNextTriggerTime = m_nLastTriggerTime+m_nIntervalTime*1000; - return kbdSuccess; + return iotSuccess; } if(m_nTriggerType == E_TIMETRIGGER_PERIOD) { @@ -483,15 +483,15 @@ int TimeTrigger::calcNextTime(const boost::posix_time::ptime &lastTime) { m_nNextTriggerTime = m_nLastTriggerTime+1000; - return kbdSuccess; + return iotSuccess; break; } default: - return kbdFailed; + return iotFailed; break; } } - return kbdFailed; + return iotFailed; } int TimeTrigger::calcYear(int year) @@ -512,7 +512,7 @@ int TimeTrigger::calcYear(int year) { return calcYear(year+1); } - return kbdSuccess; + return iotSuccess; } int TimeTrigger::calcMonth(int year,int month) @@ -543,7 +543,7 @@ int TimeTrigger::calcMonth(int year,int month) return calcMonth(year,month+1); } } - return kbdSuccess; + return iotSuccess; } int TimeTrigger::calcWeek(int year, int month, int day, int week, int hour, int minute, int second) @@ -572,7 +572,7 @@ int TimeTrigger::calcWeek(int year, int month, int day, int week, int hour, int } } m_nNextTriggerTime = iot_public::convertLocalTimeToUTC(t1); - return kbdSuccess; + return iotSuccess; } int TimeTrigger::calcDay(int year, int month, int day) @@ -587,9 +587,9 @@ int TimeTrigger::calcDay(int year, int month, int day) days dd(1); t1+= dd; m_nNextTriggerTime = iot_public::convertLocalTimeToUTC(t1); - return kbdSuccess; + return iotSuccess; } - return kbdSuccess; + return iotSuccess; } int TimeTrigger::calcHour(int year, int month, int day, int hour) @@ -604,9 +604,9 @@ int TimeTrigger::calcHour(int year, int month, int day, int hour) hours hh(1); t1+= hh; m_nNextTriggerTime = iot_public::convertLocalTimeToUTC(t1); - return kbdSuccess; + return iotSuccess; } - return kbdSuccess; + return iotSuccess; } int TimeTrigger::calcMinute(int year, int month, int day, int hour, int minute) @@ -621,9 +621,9 @@ int TimeTrigger::calcMinute(int year, int month, int day, int hour, int minute) minutes mm(1); t1+= mm; m_nNextTriggerTime = iot_public::convertLocalTimeToUTC(t1); - return kbdSuccess; + return iotSuccess; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/app_fbd/fbd_module/time_trigger/CTimeTrigger.h b/product/src/application/app_fbd/fbd_module/time_trigger/CTimeTrigger.h index a5f1a878..e70d5b54 100644 --- a/product/src/application/app_fbd/fbd_module/time_trigger/CTimeTrigger.h +++ b/product/src/application/app_fbd/fbd_module/time_trigger/CTimeTrigger.h @@ -13,7 +13,7 @@ #include "app_fbd/fbd_common/FbdDiagDataApi.h" #include "boost/dll/alias.hpp" #include "pub_utility_api/TimeUtil.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -152,6 +152,6 @@ BOOST_DLL_ALIAS( create_plugin // 将导出函数重命名，最终调用者访问此函数名 ) }//< namespace app_fbd -}//< namespace kbd_app +}//< namespace iot_app #endif // CTIMETRIGGER_H diff --git a/product/src/application/app_fbd/fbd_module/video_control/CVideoControl.cpp b/product/src/application/app_fbd/fbd_module/video_control/CVideoControl.cpp index 67c43d99..a857a82a 100644 --- a/product/src/application/app_fbd/fbd_module/video_control/CVideoControl.cpp +++ b/product/src/application/app_fbd/fbd_module/video_control/CVideoControl.cpp @@ -31,7 +31,7 @@ #define PTZ_SPEED "speed" #define PRESET_TAG "preset_tag" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -58,21 +58,21 @@ int VideoControl::init(const SFbdModKey &stModuleKey, const std::string &) if ( m_ptrDiagData == nullptr ) { LOGERROR( "模块[%s]获取Diagram数据接口单例失败",m_stModKey.toString().c_str() ); - return kbdFailed; + return iotFailed; } //1.获取输入参数 - if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKey2 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 3, m_stInKey3 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 4, m_stInKey4 ) || - kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 5, m_stInKey5 )) + if ( iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || + iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 2, m_stInKey2 ) || + iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 3, m_stInKey3 ) || + iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 4, m_stInKey4 ) || + iotSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 5, m_stInKey5 )) { LOGERROR( "获取模块[%s]的输入参数失败", stModuleKey.toString().c_str()); - return kbdFailed; + return iotFailed; } LOGINFO( "[%s]加载成功", m_stModKey.toString().c_str()); m_bInitialized = true; - return kbdSuccess; + return iotSuccess; } int VideoControl::calculate() @@ -80,15 +80,15 @@ int VideoControl::calculate() if ( !m_bInitialized ) { LOGERROR( "calculate(): 模块[%s]未成功初始化，不应执行推送!",m_stModKey.toString().c_str() ); - return kbdFailed; + return iotFailed; } SFbdNumericValue stValAndSta5; - if ( kbdSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey5, stValAndSta5 )) + if ( iotSuccess != m_ptrDiagData->getNumericValByKey( m_stInKey5, stValAndSta5 )) { LOGERROR( "获取模块[%s]的输入参数5的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } int nInValue5 = static_cast(stValAndSta5.m_dValue); @@ -96,28 +96,28 @@ int VideoControl::calculate() { SFbdStringValue stValAndSta1; - if ( kbdSuccess != m_ptrDiagData->getStringValByKey( m_stInKey1, stValAndSta1 )) + if ( iotSuccess != m_ptrDiagData->getStringValByKey( m_stInKey1, stValAndSta1 )) { LOGERROR( "获取模块[%s]的输入参数1的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } SFbdStringValue stValAndSta2; - if ( kbdSuccess != m_ptrDiagData->getStringValByKey( m_stInKey2, stValAndSta2 )) + if ( iotSuccess != m_ptrDiagData->getStringValByKey( m_stInKey2, stValAndSta2 )) { LOGERROR( "获取模块[%s]的输入参数2的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } SFbdStringValue stValAndSta3; - if ( kbdSuccess != m_ptrDiagData->getStringValByKey( m_stInKey3, stValAndSta3 )) + if ( iotSuccess != m_ptrDiagData->getStringValByKey( m_stInKey3, stValAndSta3 )) { LOGERROR( "获取模块[%s]的输入参数3的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } SFbdStringValue stValAndSta4; - if ( kbdSuccess != m_ptrDiagData->getStringValByKey( m_stInKey4, stValAndSta4 )) + if ( iotSuccess != m_ptrDiagData->getStringValByKey( m_stInKey4, stValAndSta4 )) { LOGERROR( "获取模块[%s]的输入参数4的值失败", m_stModKey.toString().c_str()); - return kbdFailed; + return iotFailed; } if ( isValidOfStatus( stValAndSta1.m_nStatus ) &&isValidOfStatus( stValAndSta2.m_nStatus ) @@ -127,13 +127,13 @@ int VideoControl::calculate() return handleControl(stValAndSta1.m_strValue,stValAndSta2.m_strValue,stValAndSta3.m_strValue,stValAndSta4.m_strValue); } } - return kbdSuccess; + return iotSuccess; } int VideoControl::reset(const bool /*bMaster*/) { - return kbdSuccess; + return iotSuccess; } int VideoControl::clean() @@ -151,7 +151,7 @@ int VideoControl::handleControl(const std::string &locTag, const std::string &ap if(locTag == "" || camera =="" || preset == "" || app=="") { LOGERROR("模块[%s]车站或者应用或者摄像头或者预置位为空!",m_stModKey.toString().c_str()); - return kbdSuccess; + return iotSuccess; } const iot_public::SRunAppInfo &stRunAppInfo = getFbdSysInfoApi()->getCurrentRunAppInfo(); @@ -161,19 +161,19 @@ int VideoControl::handleControl(const std::string &locTag, const std::string &ap if ( ptrSysInfo == nullptr ) { LOGERROR( "模块[%s]获取系统信息库失败",m_stModKey.toString().c_str() ); - return kbdSuccess; + return iotSuccess; } if(ptrSysInfo->getSysInfo().getLocationInfoByName(locTag,stLocationInfo)) { LOGERROR("模块[%s]获取位置信息出错[%s]!",m_stModKey.toString().c_str(),locTag.c_str()); - return kbdSuccess; + return iotSuccess; } iot_public::SAppInfo stAppInfo; if(ptrSysInfo->getSysInfo().getAppInfoByName(app,stAppInfo)) { LOGERROR("模块[%s]获取应用信息出错[%s]!",m_stModKey.toString().c_str(),app.c_str()); - return kbdSuccess; + return iotSuccess; } ::iot_idl::SVideoControlRequest videoControlRequest; @@ -201,19 +201,19 @@ int VideoControl::handleControl(const std::string &locTag, const std::string &ap if (strSendBuff.empty()) { LOGERROR("模块[%s]生成控制命令失败",m_stModKey.toString().c_str()); - return kbdSuccess; + return iotSuccess; } iot_net::CMbMessage objMsg( strSendBuff, stRunAppInfo.nAppId, CH_APP_TO_VIDEO_CTRL_DOWN, ::iot_idl::MT_VIDEO_CONTROL_MSG_FROM_FBD ); if ( !objMsg.isValid()) { LOGERROR( "模块[%s]构造CMbMessage失败",m_stModKey.toString().c_str() ); - return kbdSuccess; + return iotSuccess; } if ( !m_objCommon.sendMsgToDomain( objMsg ,stLocationInfo.nDomainId)) { LOGERROR( "模块[%s]发送控制命令到域[%d],应用[%d]失败:\n%s",m_stModKey.toString().c_str(), stLocationInfo.nDomainId, stAppInfo.nId,strSendBuff.c_str()); } - return kbdSuccess; + return iotSuccess; } } diff --git a/product/src/application/app_fbd/fbd_module/video_control/CVideoControl.h b/product/src/application/app_fbd/fbd_module/video_control/CVideoControl.h index e6345c69..bc63eae9 100644 --- a/product/src/application/app_fbd/fbd_module/video_control/CVideoControl.h +++ b/product/src/application/app_fbd/fbd_module/video_control/CVideoControl.h @@ -13,7 +13,7 @@ #include "net_msg_bus_api/CMbCommunicator.h" -namespace kbd_app +namespace iot_app { namespace app_fbd { @@ -58,6 +58,6 @@ BOOST_DLL_ALIAS( create_plugin // 将导出函数重命名，最终调用者访问此函数名 ) }//< namespace app_fbd -}//< namespace kbd_app +}//< namespace iot_app #endif // CVIDEOCONTROL_H diff --git a/product/src/application/app_pa_server/BasicOperation.cpp b/product/src/application/app_pa_server/BasicOperation.cpp index 93677cbe..ef934fd6 100644 --- a/product/src/application/app_pa_server/BasicOperation.cpp +++ b/product/src/application/app_pa_server/BasicOperation.cpp @@ -16,47 +16,47 @@ using namespace std; using namespace iot_public; -using namespace kbd_app; +using namespace iot_app; using namespace iot_service; using namespace iot_idl; -kbd_app::CBasicOperation::CBasicOperation(const iot_public::SRunAppInfo &stRunAppInfo) +iot_app::CBasicOperation::CBasicOperation(const iot_public::SRunAppInfo &stRunAppInfo) :m_stRunAppInfo(stRunAppInfo), m_ptrAlarmApi(NULL) { } -kbd_app::CBasicOperation::~CBasicOperation() +iot_app::CBasicOperation::~CBasicOperation() { m_ptrAlarmApi.reset(); } -int kbd_app::CBasicOperation::initialize() +int iot_app::CBasicOperation::initialize() { /* @brief 初始化报警接口 */ m_ptrAlarmApi = boost::make_shared(m_stRunAppInfo.nDomainId, m_stRunAppInfo.nAppId); if (m_ptrAlarmApi == NULL) { LOGERROR("创建报警接口失败"); - return kbdFailed; + return iotFailed; } LOGERROR("报警参数初始化，%d,%d",m_stRunAppInfo.nDomainId,m_stRunAppInfo.nAppId); - return kbdSuccess; + return iotSuccess; } -bool kbd_app::CBasicOperation::startAlarmSvr() +bool iot_app::CBasicOperation::startAlarmSvr() { return m_ptrAlarmApi->resumeThread(); } /* @brief 停止报警服务 */ -bool kbd_app::CBasicOperation::stopAlarmSvr() +bool iot_app::CBasicOperation::stopAlarmSvr() { return m_ptrAlarmApi->suspendThread(); } /* @brief 发送报警信息 */ -bool kbd_app::CBasicOperation::sendAlarm(const SConstPaCmdValue &sConstPaCmdValue,const std::string &resultStr) +bool iot_app::CBasicOperation::sendAlarm(const SConstPaCmdValue &sConstPaCmdValue,const std::string &resultStr) { iot_idl::SAppAddAlm objAlarm; SAlmInfoFromApp *pAlmInfo = objAlarm.add_alm_info(); @@ -88,7 +88,7 @@ bool kbd_app::CBasicOperation::sendAlarm(const SConstPaCmdValue &sConstPaCmdValu } return bSendRet; } -bool kbd_app::CBasicOperation::sendAlarm(const std::string &resultStr,const SOptAlarmInfo &sOptAlarmInfo) +bool iot_app::CBasicOperation::sendAlarm(const std::string &resultStr,const SOptAlarmInfo &sOptAlarmInfo) { iot_idl::SAppAddAlm objAlarm; SAlmInfoFromApp *pAlmInfo = objAlarm.add_alm_info(); diff --git a/product/src/application/app_pa_server/BasicOperation.h b/product/src/application/app_pa_server/BasicOperation.h index 8095833f..14124d1f 100644 --- a/product/src/application/app_pa_server/BasicOperation.h +++ b/product/src/application/app_pa_server/BasicOperation.h @@ -9,7 +9,7 @@ #include "PaRtdbTableOperate.h" #include "PaMsgBusMng.h" #include "alarm_server_api/AlarmCommonDef.h" -namespace kbd_app +namespace iot_app { class CBasicOperation { diff --git a/product/src/application/app_pa_server/PaAudioInfoTable.h b/product/src/application/app_pa_server/PaAudioInfoTable.h index 441e4cc4..f6139402 100644 --- a/product/src/application/app_pa_server/PaAudioInfoTable.h +++ b/product/src/application/app_pa_server/PaAudioInfoTable.h @@ -5,7 +5,7 @@ */ #pragma once -namespace kbd_app +namespace iot_app { const std::string CN_TN_PaAudioInfo = "pa_audio_info"; @@ -36,4 +36,4 @@ namespace kbd_app } }STableAudioInfo, *PSTableAudioInfo; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_pa_server/PaCtrlParamTable.h b/product/src/application/app_pa_server/PaCtrlParamTable.h index 6f98251f..950e54bf 100644 --- a/product/src/application/app_pa_server/PaCtrlParamTable.h +++ b/product/src/application/app_pa_server/PaCtrlParamTable.h @@ -5,7 +5,7 @@ */ #pragma once -namespace kbd_app +namespace iot_app { const std::string CN_TN_PaCtrlParam = "pa_ctrl_param"; @@ -23,4 +23,4 @@ namespace kbd_app } }STableCtrlTag, *PSTableCtrlTag; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_pa_server/PaMsgBusMng.cpp b/product/src/application/app_pa_server/PaMsgBusMng.cpp index 50247211..1311c46d 100644 --- a/product/src/application/app_pa_server/PaMsgBusMng.cpp +++ b/product/src/application/app_pa_server/PaMsgBusMng.cpp @@ -12,29 +12,29 @@ using namespace std; using namespace iot_public; -using namespace kbd_app; +using namespace iot_app; using namespace iot_dbms; using namespace iot_net; -kbd_app::CPaMsgBusMng::CPaMsgBusMng(const iot_public::SRunAppInfo &stRunAppInfo) +iot_app::CPaMsgBusMng::CPaMsgBusMng(const iot_public::SRunAppInfo &stRunAppInfo) :m_stRunAppInfo(stRunAppInfo) { } -kbd_app::CPaMsgBusMng::~CPaMsgBusMng() +iot_app::CPaMsgBusMng::~CPaMsgBusMng() { } /* @brief 订阅消息通道 */ -int kbd_app::CPaMsgBusMng::subscribeMessage() +int iot_app::CPaMsgBusMng::subscribeMessage() { if (!m_objCommunicator.addSub(m_stRunAppInfo.nAppId, CH_HMI_TO_PA_OPTCMD_DOWN)) { LOGERROR("通道[CH_HMI_TO_PA_OPTCMD_DOWN]订阅失败."); - return kbdFailed; + return iotFailed; } else { @@ -44,18 +44,18 @@ int kbd_app::CPaMsgBusMng::subscribeMessage() if (!m_objCommunicator.addSub(m_stRunAppInfo.nAppId, CH_OPT_TO_HMI_OPTCMD_UP)) { LOGERROR("通道[CH_OPT_TO_PA_OPTCMD_UP]订阅失败."); - return kbdFailed; + return iotFailed; } else { LOGINFO("订阅通道[CH_OPT_TO_PA_OPTCMD_UP]成功"); } - return kbdSuccess; + return iotSuccess; } /* @brief 取消消息订阅 */ -int kbd_app::CPaMsgBusMng::unsubscribeMessage() +int iot_app::CPaMsgBusMng::unsubscribeMessage() { std::vector vecSub = m_objCommunicator.getMySub(); for (size_t i = 0; i < vecSub.size(); ++i) @@ -63,7 +63,7 @@ int kbd_app::CPaMsgBusMng::unsubscribeMessage() if (!m_objCommunicator.delSub(vecSub[i].getAppID(), vecSub[i].getChannelID())) { LOGERROR("取消通道[%d-%d]订阅失败.", vecSub[i].getAppID(), vecSub[i].getChannelID()); - return kbdFailed; + return iotFailed; } } @@ -73,24 +73,24 @@ int kbd_app::CPaMsgBusMng::unsubscribeMessage() { } - return kbdSuccess; + return iotSuccess; } /* @brief 初始化 */ -int kbd_app::CPaMsgBusMng::initialize() +int iot_app::CPaMsgBusMng::initialize() { - return kbdSuccess; + return iotSuccess; } /* @brief 接收消息 */ -bool kbd_app::CPaMsgBusMng::recvMsg(iot_net::CMbMessage &objMsg, int nTimeoutMsec /*= 0*/) +bool iot_app::CPaMsgBusMng::recvMsg(iot_net::CMbMessage &objMsg, int nTimeoutMsec /*= 0*/) { return m_objCommunicator.recvMsg(objMsg, nTimeoutMsec); } /* @brief 发送消息 */ -bool kbd_app::CPaMsgBusMng::sendMsgToMsgBus(const std::string &strMsg, +bool iot_app::CPaMsgBusMng::sendMsgToMsgBus(const std::string &strMsg, const int nChannel, const int nMsgType, const int nDstDomain) @@ -118,7 +118,7 @@ bool kbd_app::CPaMsgBusMng::sendMsgToMsgBus(const std::string &strMsg, } /* @brief 获取通信器名称 */ -std::string kbd_app::CPaMsgBusMng::getCommunicatorName() +std::string iot_app::CPaMsgBusMng::getCommunicatorName() { return m_objCommunicator.getName(); } diff --git a/product/src/application/app_pa_server/PaMsgBusMng.h b/product/src/application/app_pa_server/PaMsgBusMng.h index 1d5cfee8..b316520f 100644 --- a/product/src/application/app_pa_server/PaMsgBusMng.h +++ b/product/src/application/app_pa_server/PaMsgBusMng.h @@ -6,7 +6,7 @@ #include "net_msg_bus_api/CMbCommunicator.h" #include "rdb_api/CRdbAccessEx.h" #include "PaRtdbTableOperate.h" -namespace kbd_app +namespace iot_app { class CPaMsgBusMng { @@ -16,17 +16,17 @@ namespace kbd_app /* @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); /* @brief 订阅消息通道 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int subscribeMessage(); /* @brief 取消消息订阅 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int unsubscribeMessage(); /* diff --git a/product/src/application/app_pa_server/PaOperatorMapTable.h b/product/src/application/app_pa_server/PaOperatorMapTable.h index a08ce665..fbec33d5 100644 --- a/product/src/application/app_pa_server/PaOperatorMapTable.h +++ b/product/src/application/app_pa_server/PaOperatorMapTable.h @@ -5,7 +5,7 @@ */ #pragma once -namespace kbd_app +namespace iot_app { const std::string CN_TN_PaOperatorMap = "pa_operator_map"; @@ -22,4 +22,4 @@ namespace kbd_app } }STableOperatorMap, *PSTableOperatorMap; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_pa_server/PaRtdbTableOperate.cpp b/product/src/application/app_pa_server/PaRtdbTableOperate.cpp index c81fa81b..b8808046 100644 --- a/product/src/application/app_pa_server/PaRtdbTableOperate.cpp +++ b/product/src/application/app_pa_server/PaRtdbTableOperate.cpp @@ -7,15 +7,15 @@ using namespace std; using namespace iot_public; -using namespace kbd_app; +using namespace iot_app; using namespace iot_dbms; -kbd_app::CPaRtdbTableOperate::CPaRtdbTableOperate(const iot_public::SRunAppInfo &stRunAppInfo) +iot_app::CPaRtdbTableOperate::CPaRtdbTableOperate(const iot_public::SRunAppInfo &stRunAppInfo) :m_stRunAppInfo(stRunAppInfo) { } -kbd_app::CPaRtdbTableOperate::~CPaRtdbTableOperate() +iot_app::CPaRtdbTableOperate::~CPaRtdbTableOperate() { if (m_objPaCtrlTagTable.isOpen()) { @@ -39,37 +39,37 @@ kbd_app::CPaRtdbTableOperate::~CPaRtdbTableOperate() } /* @brief 初始化内存表操作类 */ -int kbd_app::CPaRtdbTableOperate::initialize() +int iot_app::CPaRtdbTableOperate::initialize() { if (!m_objPaAudioInfoTable.open(m_stRunAppInfo.nAppId, CN_TN_PaAudioInfo.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]", m_stRunAppInfo.nAppId, CN_TN_PaAudioInfo.c_str()); - return kbdFailed; + return iotFailed; } if (!m_objPaTimedAudioTable.open(m_stRunAppInfo.nAppId, CN_TN_PaTimedAudio.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]", m_stRunAppInfo.nAppId, CN_TN_PaTimedAudio.c_str()); - return kbdFailed; + return iotFailed; } if (!m_objPaCtrlTagTable.open(m_stRunAppInfo.nAppId, CN_TN_PaCtrlParam.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]", m_stRunAppInfo.nAppId, CN_TN_PaCtrlParam.c_str()); - return kbdFailed; + return iotFailed; } if (!m_objPaOperatorMapTable.open(m_stRunAppInfo.nAppId, CN_TN_PaOperatorMap.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]", m_stRunAppInfo.nAppId, CN_TN_PaOperatorMap.c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 通过语音ID获取语音信息 */ -int kbd_app::CPaRtdbTableOperate::getAudioInfoById(int nAudioId, STableAudioInfo &stAudioInfo) +int iot_app::CPaRtdbTableOperate::getAudioInfoById(int nAudioId, STableAudioInfo &stAudioInfo) { vector vecCol; vector vecCond; @@ -81,38 +81,38 @@ int kbd_app::CPaRtdbTableOperate::getAudioInfoById(int nAudioId, STableAudioInfo if (!m_objPaAudioInfoTable.selectAllVec(vecCond, vecRecord, vecCol)) { LOGERROR("查询表[%s]记录[%s=%d]失败.", CN_TN_PaAudioInfo.c_str(), PA_AUDIO_INFO_COL_ID, nAudioId); - return kbdFailed; + return iotFailed; } if (vecRecord.size() != 1) //< 查询正确的话，只会返回一条信息 { LOGERROR("查询表[%s]记录[%s=%d]失败,预期记录数[1],实际[%d].", CN_TN_PaAudioInfo.c_str(), PA_AUDIO_INFO_COL_ID, nAudioId, (int)vecRecord.size()); - return kbdFailed; + return iotFailed; } stAudioInfo = vecRecord[0]; - return kbdSuccess; + return iotSuccess; } /* @brief 获取定时广播所有记录 */ -int kbd_app::CPaRtdbTableOperate::getTimedAudioAllRecord(std::vector &vecTimedAudio) +int iot_app::CPaRtdbTableOperate::getTimedAudioAllRecord(std::vector &vecTimedAudio) { CTableLockGuard tableLock(m_objPaTimedAudioTable); //< 加锁保护表 if (m_objPaTimedAudioTable.selectJustAll(vecTimedAudio)) { - return kbdSuccess; + return iotSuccess; } else { LOGERROR("获取内存表[%s]记录失败.Error=[%s]", CN_TN_PaTimedAudio.c_str(), m_objPaTimedAudioTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } } /* @brief 更新指定的定时广播记录 */ -int kbd_app::CPaRtdbTableOperate::updateTimedAudioByKey(const STableTimedAudioKey &stTimedAudioKey, +int iot_app::CPaRtdbTableOperate::updateTimedAudioByKey(const STableTimedAudioKey &stTimedAudioKey, int64 lOptTimeSec, int nDurationSec, int nNextAudioIndex) @@ -127,38 +127,38 @@ int kbd_app::CPaRtdbTableOperate::updateTimedAudioByKey(const STableTimedAudioKe { LOGERROR("更新[%s]记录失败.ID=[%d],Location=[%d]", CN_TN_PaTimedAudio.c_str(), stTimedAudioKey.nId, stTimedAudioKey.nLocationId); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 获取指定车站的控制测点名 */ -int kbd_app::CPaRtdbTableOperate::getCtrlTag(int nLocationId, std::string &strTagName) +int iot_app::CPaRtdbTableOperate::getCtrlTag(int nLocationId, std::string &strTagName) { CTableLockGuard tableLock(m_objPaCtrlTagTable); //< 加锁保护表 if (m_objPaCtrlTagTable.getRecordByKeyOneColumn(&nLocationId, PA_CTRL_TAG_COL_CTRL_TAG_NAME, strTagName)) { - return kbdSuccess; + return iotSuccess; } else { LOGERROR("获取LocationId=[%d]的测点名失败", nLocationId); - return kbdFailed; + return iotFailed; } } /* @brief 获取PA操作员ID */ -int kbd_app::CPaRtdbTableOperate::getPaOperatorId(int nUserGrpId, int &nOperatorId) +int iot_app::CPaRtdbTableOperate::getPaOperatorId(int nUserGrpId, int &nOperatorId) { CTableLockGuard tableLock(m_objPaOperatorMapTable); //< 加锁保护表 if (m_objPaOperatorMapTable.getRecordByKeyOneColumn(&nUserGrpId, PA_OPERATOR_MAP_COL_ID, nOperatorId)) { - return kbdSuccess; + return iotSuccess; } else { LOGERROR("获取PA操作员ID失败.nUserGrpId=[%d]", nUserGrpId); - return kbdFailed; + return iotFailed; } } diff --git a/product/src/application/app_pa_server/PaRtdbTableOperate.h b/product/src/application/app_pa_server/PaRtdbTableOperate.h index 3c48367a..88d8cc14 100644 --- a/product/src/application/app_pa_server/PaRtdbTableOperate.h +++ b/product/src/application/app_pa_server/PaRtdbTableOperate.h @@ -11,7 +11,7 @@ #include "PaCtrlParamTable.h" #include "PaOperatorMapTable.h" -namespace kbd_app +namespace iot_app { class CPaRtdbTableOperate { @@ -21,7 +21,7 @@ namespace kbd_app /* @brief 初始化内存表操作类 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int initialize(); @@ -29,14 +29,14 @@ namespace kbd_app @brief 通过语音ID获取语音信息 @param int nAudioId 语音ID @param STableAudioInfo & stAudioInfo 返回的语音信息 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int getAudioInfoById(int nAudioId, STableAudioInfo &stAudioInfo); /* @brief 获取定时广播所有记录 @param std::vector & vecTimedAudio 返回的定时广播列表 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int getTimedAudioAllRecord(std::vector &vecTimedAudio); @@ -46,7 +46,7 @@ namespace kbd_app @param int64 lOptTimeSec 操作时间 @param int nDurationSec 持续时间 @param int nNextAudioIndex 下次要播放的语音ID - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int updateTimedAudioByKey(const STableTimedAudioKey &stTimedAudioKey, int64 lOptTimeSec, @@ -57,7 +57,7 @@ namespace kbd_app @brief 获取指定车站的控制测点名 @param int nLocationId 车站ID @param std::string & strTagName 返回的控制测点名 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int getCtrlTag(int nLocationId, std::string &strTagName); @@ -65,7 +65,7 @@ namespace kbd_app @brief 获取PA操作员ID @param int nUserGrpId ISCS用户组ID @param int & nOperatorId 返回的PA操作员ID - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int getPaOperatorId(int nUserGrpId, int &nOperatorId); @@ -79,4 +79,4 @@ namespace kbd_app typedef boost::shared_ptr CPaRtdbTableOperatePtr; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_pa_server/PaServerApp.cpp b/product/src/application/app_pa_server/PaServerApp.cpp index c47fc484..3ec7d7e6 100644 --- a/product/src/application/app_pa_server/PaServerApp.cpp +++ b/product/src/application/app_pa_server/PaServerApp.cpp @@ -12,13 +12,13 @@ using namespace std; using namespace iot_public; using namespace iot_sys; -using namespace kbd_app; +using namespace iot_app; using namespace iot_net; #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" -kbd_app::CPaServerApp::CPaServerApp() +iot_app::CPaServerApp::CPaServerApp() :m_ptrSysInfo(NULL), m_ptrProcMng(NULL), m_ptrRedundancyMng(NULL), @@ -26,12 +26,12 @@ kbd_app::CPaServerApp::CPaServerApp() { } -kbd_app::CPaServerApp::~CPaServerApp() +iot_app::CPaServerApp::~CPaServerApp() { CPaServerApp::stop(); } -bool kbd_app::CPaServerApp::start(int argc, char *argv[], int &/*nStatus*/) +bool iot_app::CPaServerApp::start(int argc, char *argv[], int &/*nStatus*/) { //1.解析启动参数 if (!parseCmdLine(argc, argv)) @@ -81,14 +81,14 @@ bool kbd_app::CPaServerApp::start(int argc, char *argv[], int &/*nStatus*/) } //8.设置冗余通知回调 - if (kbdSuccess != m_ptrRedundancyMng->setCallback(m_ptrPaSrvMng)) + if (iotSuccess != m_ptrRedundancyMng->setCallback(m_ptrPaSrvMng)) { LOGERROR("设置冗余回调接口失败"); return false; } //9.更新当前进程冗余状态 - if (kbdSuccess != m_ptrProcMng->updateProcessInfo(true, false, false)) + if (iotSuccess != m_ptrProcMng->updateProcessInfo(true, false, false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -97,7 +97,7 @@ bool kbd_app::CPaServerApp::start(int argc, char *argv[], int &/*nStatus*/) return true; } -bool kbd_app::CPaServerApp::stop() +bool iot_app::CPaServerApp::stop() { //9.更新当前进程冗余状态 if (m_ptrProcMng != NULL) @@ -130,7 +130,7 @@ bool kbd_app::CPaServerApp::stop() return true; } -int kbd_app::CPaServerApp::toQuit() +int iot_app::CPaServerApp::toQuit() { if (m_ptrProcMng != NULL) { @@ -138,10 +138,10 @@ int kbd_app::CPaServerApp::toQuit() } shutdown(); - return kbdSuccess; + return iotSuccess; } -bool kbd_app::CPaServerApp::parseCmdLine(int argc, char *argv[]) +bool iot_app::CPaServerApp::parseCmdLine(int argc, char *argv[]) { /* @brief 拼接启动参数，用于向进程管理注册 */ for (int i = 1; i < argc; ++i) @@ -203,26 +203,26 @@ bool kbd_app::CPaServerApp::parseCmdLine(int argc, char *argv[]) return true; } -void kbd_app::CPaServerApp::showHelp(const boost::program_options::options_description &objDesc) +void iot_app::CPaServerApp::showHelp(const boost::program_options::options_description &objDesc) { std::cout << CN_ProcName_PaServer << " [-h] | [-a app]" << std::endl; std::cout << objDesc << std::endl; } -bool kbd_app::CPaServerApp::isAlreadyRunning() +bool iot_app::CPaServerApp::isAlreadyRunning() { string strUniqueName = CN_ProcName_PaServer; strUniqueName += m_strStartArgs; return CSingleProcInstance::hasInstanceRunning(strUniqueName); } -bool kbd_app::CPaServerApp::initLog() +bool iot_app::CPaServerApp::initLog() { StartLogSystem(m_strAppName.c_str(), CN_ProcName_PaServer.c_str()); return true; } -bool kbd_app::CPaServerApp::getSystemInfo() +bool iot_app::CPaServerApp::getSystemInfo() { if (!createSysInfoInstance(m_ptrSysInfo)) { @@ -230,7 +230,7 @@ bool kbd_app::CPaServerApp::getSystemInfo() return false; } - if (kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName, m_stRunAppInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName, m_stRunAppInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -240,7 +240,7 @@ bool kbd_app::CPaServerApp::getSystemInfo() } /* @brief 向进程管理注册 */ -bool kbd_app::CPaServerApp::registToProcMng() +bool iot_app::CPaServerApp::registToProcMng() { SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stRunAppInfo.nDomainId; @@ -256,7 +256,7 @@ bool kbd_app::CPaServerApp::registToProcMng() return false; } - if (kbdSuccess != m_ptrProcMng->setCallback(this)) + if (iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -265,13 +265,13 @@ bool kbd_app::CPaServerApp::registToProcMng() return true; } -bool kbd_app::CPaServerApp::initialize() +bool iot_app::CPaServerApp::initialize() { /* @brief 初始化消息总线 */ if (!initMsgBus(CN_ProcName_PaServer.c_str(), "")) { LOGERROR("初始化消息总线失败"); - return kbdFailed; + return iotFailed; } /* @brief 创建广播服务管理类 */ @@ -282,7 +282,7 @@ bool kbd_app::CPaServerApp::initialize() return false; } - if (kbdSuccess != m_ptrPaSrvMng->initialize()) + if (iotSuccess != m_ptrPaSrvMng->initialize()) { LOGERROR("初始化广播服务管理类失败"); return false; @@ -292,7 +292,7 @@ bool kbd_app::CPaServerApp::initialize() } /* @brief 清理业务资源 */ -bool kbd_app::CPaServerApp::clean() +bool iot_app::CPaServerApp::clean() { if (m_ptrPaSrvMng != NULL) { diff --git a/product/src/application/app_pa_server/PaServerApp.h b/product/src/application/app_pa_server/PaServerApp.h index 469a220d..76556c0c 100644 --- a/product/src/application/app_pa_server/PaServerApp.h +++ b/product/src/application/app_pa_server/PaServerApp.h @@ -10,7 +10,7 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "PaServerMng.h" -namespace kbd_app +namespace iot_app { class CPaServerApp : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { @@ -99,4 +99,4 @@ namespace kbd_app CPaServerMngPtr m_ptrPaSrvMng; //< 广播服务管理类 }; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_pa_server/PaServerCommon.h b/product/src/application/app_pa_server/PaServerCommon.h index 05a3989d..acfbbf1e 100644 --- a/product/src/application/app_pa_server/PaServerCommon.h +++ b/product/src/application/app_pa_server/PaServerCommon.h @@ -10,7 +10,7 @@ #include "pub_utility_api/TimeUtil.h" #include "pub_sysinfo_api/SysInfoApi.h" #include "operate_server_api/JsonOptCommand.h" -namespace kbd_app +namespace iot_app { const std::string CN_ProcName_PaServer = "app_pa_server"; //< 当前进程名 const std::string DOMAIN_SHOW= "pa"; //标识host or domain diff --git a/product/src/application/app_pa_server/PaServerMng.cpp b/product/src/application/app_pa_server/PaServerMng.cpp index 1ff82843..7199343a 100644 --- a/product/src/application/app_pa_server/PaServerMng.cpp +++ b/product/src/application/app_pa_server/PaServerMng.cpp @@ -6,7 +6,7 @@ #include "PaServerMng.h" #include "pub_logger_api/logger.h" -kbd_app::CPaServerMng::CPaServerMng(const iot_public::SRunAppInfo &stRunAppInfo, +iot_app::CPaServerMng::CPaServerMng(const iot_public::SRunAppInfo &stRunAppInfo, const iot_sys::CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProcMng), @@ -14,7 +14,7 @@ kbd_app::CPaServerMng::CPaServerMng(const iot_public::SRunAppInfo &stRunAppInfo, { } -kbd_app::CPaServerMng::~CPaServerMng() +iot_app::CPaServerMng::~CPaServerMng() { if (m_ptrTimedAudioThread != NULL) { @@ -26,9 +26,9 @@ kbd_app::CPaServerMng::~CPaServerMng() } /* @brief 冗余切换 */ -int kbd_app::CPaServerMng::redundantSwitch(bool bMaster, bool bSlave) +int iot_app::CPaServerMng::redundantSwitch(bool bMaster, bool bSlave) { - int nRet = kbdSuccess; + int nRet = iotSuccess; LOGWARN("接收到冗余切换指令.Master=[%d],Slave=[%d]", bMaster, bSlave); if (bMaster && !bSlave) //< 为主 { @@ -42,29 +42,29 @@ int kbd_app::CPaServerMng::redundantSwitch(bool bMaster, bool bSlave) m_ptrTimedAudioThread->suspend(); m_ptrTimedAudioThread->setSlave(); } - if (nRet == kbdSuccess) + if (nRet == iotSuccess) { m_ptrProcMng->updateProcessInfo(true, bMaster, bSlave); } - return kbdSuccess; + return iotSuccess; } /* @brief 初始化 */ -int kbd_app::CPaServerMng::initialize() +int iot_app::CPaServerMng::initialize() { m_ptrTimedAudioThread = boost::make_shared(m_stRunAppInfo); if (m_ptrTimedAudioThread == NULL) { LOGERROR("创建定时广播线程失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrTimedAudioThread->initialize()) + if (iotSuccess != m_ptrTimedAudioThread->initialize()) { LOGERROR("初始化定时广播线程失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/app_pa_server/PaServerMng.h b/product/src/application/app_pa_server/PaServerMng.h index 3ccb88c5..28d99a16 100644 --- a/product/src/application/app_pa_server/PaServerMng.h +++ b/product/src/application/app_pa_server/PaServerMng.h @@ -8,7 +8,7 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "PaTimedAudioThread.h" -namespace kbd_app +namespace iot_app { class CPaServerMng : public iot_sys::CRedundantSwitchInterface { @@ -22,12 +22,12 @@ namespace kbd_app 在进程切换过程中，可能会被调用多次切换，业务进程需要保证幂等，无副作用 @param bool bMaster 是否为主 @param bool bSlave 是否为备 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int redundantSwitch(bool bMaster, bool bSlave); /* @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); diff --git a/product/src/application/app_pa_server/PaTimedAudioTable.h b/product/src/application/app_pa_server/PaTimedAudioTable.h index cf99ae77..3aaf7220 100644 --- a/product/src/application/app_pa_server/PaTimedAudioTable.h +++ b/product/src/application/app_pa_server/PaTimedAudioTable.h @@ -5,7 +5,7 @@ */ #pragma once -namespace kbd_app +namespace iot_app { const std::string CN_TN_PaTimedAudio = "pa_timed_audio"; @@ -58,4 +58,4 @@ namespace kbd_app } }STableTimedAudio, *PSTableTimedAudio; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_pa_server/PaTimedAudioThread.cpp b/product/src/application/app_pa_server/PaTimedAudioThread.cpp index c2739dd8..078a5695 100644 --- a/product/src/application/app_pa_server/PaTimedAudioThread.cpp +++ b/product/src/application/app_pa_server/PaTimedAudioThread.cpp @@ -16,13 +16,13 @@ using namespace std; using namespace iot_public; -using namespace kbd_app; +using namespace iot_app; using namespace iot_dbms; using namespace iot_net; using namespace iot_service; using namespace iot_idl; -kbd_app::CPaTimedAudioThread::CPaTimedAudioThread(const iot_public::SRunAppInfo &stRunAppInfo) +iot_app::CPaTimedAudioThread::CPaTimedAudioThread(const iot_public::SRunAppInfo &stRunAppInfo) :iot_public::CTimerThreadBase("CPaTimedAudioThread", 100), m_stRunAppInfo(stRunAppInfo), m_ptrPaTableOpt(NULL), @@ -34,45 +34,45 @@ kbd_app::CPaTimedAudioThread::CPaTimedAudioThread(const iot_public::SRunAppInfo { } -kbd_app::CPaTimedAudioThread::~CPaTimedAudioThread() +iot_app::CPaTimedAudioThread::~CPaTimedAudioThread() { m_ptrMsgbusMng.reset(); m_ptrBasicOpt.reset(); m_ptrPaTableOpt.reset(); } -void kbd_app::CPaTimedAudioThread::execute() +void iot_app::CPaTimedAudioThread::execute() { recject(); check(); } /* @brief 初始化 */ -int kbd_app::CPaTimedAudioThread::initialize() +int iot_app::CPaTimedAudioThread::initialize() { //3.初始化内存表操作类 m_ptrPaTableOpt = boost::make_shared(m_stRunAppInfo); if(m_ptrPaTableOpt== NULL) { LOGERROR("创建内存表操作类失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrPaTableOpt->initialize()) + if(iotSuccess != m_ptrPaTableOpt->initialize()) { LOGERROR("内存表初始化失败"); - return kbdFailed; + return iotFailed; } //2.初始化基础操作类 m_ptrBasicOpt = boost::make_shared(m_stRunAppInfo); if (m_ptrBasicOpt == NULL) { LOGERROR("创建基础操作类失败"); - return kbdFailed; + return iotFailed; } if (m_ptrBasicOpt->initialize()) { LOGERROR("初始化基础操作类失败"); - return kbdFailed; + return iotFailed; } @@ -81,17 +81,17 @@ int kbd_app::CPaTimedAudioThread::initialize() if (m_ptrMsgbusMng == NULL) { LOGERROR("创建消息总线管理类失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrMsgbusMng->initialize()) + if (iotSuccess != m_ptrMsgbusMng->initialize()) { LOGERROR("初始化消息总线管理类失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* 接收消息*/ -int kbd_app::CPaTimedAudioThread::recject() +int iot_app::CPaTimedAudioThread::recject() { CMbMessage objRecvMsg; objRecvMsg.getDataPtr(); @@ -122,7 +122,7 @@ int kbd_app::CPaTimedAudioThread::recject() } //紧急广播添加到反馈区 -bool kbd_app::CPaTimedAudioThread::addCustomAlarmRepMsg(const SPaCmdKey &sPaCmdKey, const SOptCustCtrlRequest &stOptCustCtrlRequest) +bool iot_app::CPaTimedAudioThread::addCustomAlarmRepMsg(const SPaCmdKey &sPaCmdKey, const SOptCustCtrlRequest &stOptCustCtrlRequest) { map::iterator posCustAlarm; posCustAlarm=sCustomRepMAP.find(sPaCmdKey); @@ -137,7 +137,7 @@ bool kbd_app::CPaTimedAudioThread::addCustomAlarmRepMsg(const SPaCmdKey &sPaCmdK return true; } //定时广播添加到反馈区 -bool kbd_app::CPaTimedAudioThread::addConstCustomAlarmRepMsg(const int &constPaAudioId,const SConstPaCmdValue& sConstPaCmdValue) +bool iot_app::CPaTimedAudioThread::addConstCustomAlarmRepMsg(const int &constPaAudioId,const SConstPaCmdValue& sConstPaCmdValue) { map< int ,SConstPaCmdValue>::iterator posConstCustAlarm; posConstCustAlarm=sConstCustomRepMAP.find(constPaAudioId); @@ -154,7 +154,7 @@ bool kbd_app::CPaTimedAudioThread::addConstCustomAlarmRepMsg(const int &constPaA return true; } //表示此广播开始或者结束状态位 -bool kbd_app::CPaTimedAudioThread::addTimedMapStatus(const int &id,bool boolstatus) +bool iot_app::CPaTimedAudioThread::addTimedMapStatus(const int &id,bool boolstatus) { map::iterator pos; pos=timedMAP.find(id); @@ -166,7 +166,7 @@ bool kbd_app::CPaTimedAudioThread::addTimedMapStatus(const int &id,bool boolstat return true; } //增加紧急广播报警 -int kbd_app::CPaTimedAudioThread::addCustCtrlAlarm(const SPaCmdKey &sPaCmdKey,const string& resultStr) +int iot_app::CPaTimedAudioThread::addCustCtrlAlarm(const SPaCmdKey &sPaCmdKey,const string& resultStr) { map::iterator pos ; @@ -187,7 +187,7 @@ int kbd_app::CPaTimedAudioThread::addCustCtrlAlarm(const SPaCmdKey &sPaCmdKey,co return 1; } //增加定时广播报警 -int kbd_app::CPaTimedAudioThread::addCustCtrlAlarm(const int64 &nOptTime,const string &resultStr,const int &isSuccess) +int iot_app::CPaTimedAudioThread::addCustCtrlAlarm(const int64 &nOptTime,const string &resultStr,const int &isSuccess) { map::iterator pos_id ; pos_id=sConstTimeCmdAudioIdMAP.find(nOptTime); @@ -228,7 +228,7 @@ int kbd_app::CPaTimedAudioThread::addCustCtrlAlarm(const int64 &nOptTime,const s } //处理从hmi过来的消息 -void kbd_app::CPaTimedAudioThread::processHmiMessage(const iot_net::CMbMessage &objMsg) +void iot_app::CPaTimedAudioThread::processHmiMessage(const iot_net::CMbMessage &objMsg) { int nMessageType=objMsg.getMsgType(); string strMessage((char*)objMsg.getDataPtr(),objMsg.getDataSize()); @@ -267,7 +267,7 @@ void kbd_app::CPaTimedAudioThread::processHmiMessage(const iot_net::CMbMessage & } } //处理从opt过来的消息 -void kbd_app::CPaTimedAudioThread::processOptMessage(const iot_net::CMbMessage &objMsg) +void iot_app::CPaTimedAudioThread::processOptMessage(const iot_net::CMbMessage &objMsg) { int nMessageType=objMsg.getMsgType(); string strMessage((char*)objMsg.getDataPtr(),objMsg.getDataSize()); @@ -311,12 +311,12 @@ void kbd_app::CPaTimedAudioThread::processOptMessage(const iot_net::CMbMessage & } /* @brief 检测是否有语音需要播放 */ -int kbd_app::CPaTimedAudioThread::check() +int iot_app::CPaTimedAudioThread::check() { vector vecTimedAudio; - if (kbdSuccess != m_ptrPaTableOpt->getTimedAudioAllRecord(vecTimedAudio)) //< 获取所有的定时广播记录 + if (iotSuccess != m_ptrPaTableOpt->getTimedAudioAllRecord(vecTimedAudio)) //< 获取所有的定时广播记录 { - return kbdFailed; + return iotFailed; } for (size_t i = 0; i < vecTimedAudio.size(); ++i) @@ -362,11 +362,11 @@ int kbd_app::CPaTimedAudioThread::check() } } - return kbdSuccess; + return iotSuccess; } //TODO:需要考虑冗余切换后，index索引，opt_time，计算出是否需要广播 -bool kbd_app::CPaTimedAudioThread::needBroadcast(const STableTimedAudio &stTimedAudio, bool &bOutOfTime) +bool iot_app::CPaTimedAudioThread::needBroadcast(const STableTimedAudio &stTimedAudio, bool &bOutOfTime) { bOutOfTime = true; @@ -446,7 +446,7 @@ bool kbd_app::CPaTimedAudioThread::needBroadcast(const STableTimedAudio &stTimed return false; } -bool kbd_app::CPaTimedAudioThread::getAlarmInfo(SOptAlarmInfo &sOptAlarmInfo,const string &name) +bool iot_app::CPaTimedAudioThread::getAlarmInfo(SOptAlarmInfo &sOptAlarmInfo,const string &name) { sOptAlarmInfo.nAlarmType= ALM_TYPE_OPERATE; sOptAlarmInfo.nAlarmStatus= ALM_STAT_OPT_PA_TIMED_AUDIO; @@ -463,7 +463,7 @@ bool kbd_app::CPaTimedAudioThread::getAlarmInfo(SOptAlarmInfo &sOptAlarmInfo,con } //设置为主 -int kbd_app::CPaTimedAudioThread::setMaster() +int iot_app::CPaTimedAudioThread::setMaster() { m_ptrBasicOpt->startAlarmSvr(); return m_ptrMsgbusMng->subscribeMessage(); @@ -471,13 +471,13 @@ int kbd_app::CPaTimedAudioThread::setMaster() } //设置为备 -int kbd_app::CPaTimedAudioThread::setSlave() +int iot_app::CPaTimedAudioThread::setSlave() { m_ptrBasicOpt->stopAlarmSvr(); return m_ptrMsgbusMng->unsubscribeMessage(); } /* @brief 广播当前记录 */ -int kbd_app::CPaTimedAudioThread::broadcast(const STableTimedAudio &stTimedAudio) +int iot_app::CPaTimedAudioThread::broadcast(const STableTimedAudio &stTimedAudio) { string strIdList = stTimedAudio.szAudioIdList; vector vecAudioId; @@ -485,16 +485,16 @@ int kbd_app::CPaTimedAudioThread::broadcast(const STableTimedAudio &stTimedAudio if (vecAudioId.empty()) //< 为空不执行任何操作 { - return kbdSuccess; + return iotSuccess; } int nAudioIdIndex = stTimedAudio.nNextIdIndex; int nAudioId = boost::lexical_cast(vecAudioId[nAudioIdIndex]); //< 获取要播放的语音ID STableAudioInfo stAudioInfo; - if (kbdSuccess != m_ptrPaTableOpt->getAudioInfoById(nAudioId, stAudioInfo)) //< 获取要播放的语音信息 + if (iotSuccess != m_ptrPaTableOpt->getAudioInfoById(nAudioId, stAudioInfo)) //< 获取要播放的语音信息 { - return kbdFailed; + return iotFailed; } /* @brief 发送控制命令 */ @@ -514,11 +514,11 @@ int kbd_app::CPaTimedAudioThread::broadcast(const STableTimedAudio &stTimedAudio // m_uLastTimeMsec = getMonotonicMsec(); // m_uDurationMsec = (stAudioInfo.nDuration + stTimedAudio.nIntervalTime) * MSEC_PER_SEC; - return kbdSuccess; + return iotSuccess; } /* @brief 发送控制命令 */ -int kbd_app::CPaTimedAudioThread::sendCmdMsg(const STableTimedAudio &stTimedAudio, const STableAudioInfo &stAudioInfo) +int iot_app::CPaTimedAudioThread::sendCmdMsg(const STableTimedAudio &stTimedAudio, const STableAudioInfo &stAudioInfo) { LOGDEBUG("开始播放TimedAudio=[%d],Audio=[%d]", stTimedAudio.stKey.nId, stAudioInfo.stKey.nId); SOptCustCtrlRequest stCustomCmd; @@ -534,16 +534,16 @@ int kbd_app::CPaTimedAudioThread::sendCmdMsg(const STableTimedAudio &stTimedAudi stCustomCmd.stHead.nOptTime = getUTCTimeMsec(); /* @brief 获取该车站的控制测点名 */ - if (kbdSuccess != m_ptrPaTableOpt->getCtrlTag(stTimedAudio.stKey.nLocationId, stCustomCmd.strKeyIdTag)) + if (iotSuccess != m_ptrPaTableOpt->getCtrlTag(stTimedAudio.stKey.nLocationId, stCustomCmd.strKeyIdTag)) { - return kbdFailed; + return iotFailed; } /* @brief 获取PA操作员ID */ int nPaOperatorId = 0; - if (kbdSuccess != m_ptrPaTableOpt->getPaOperatorId(stTimedAudio.nUserGrpId, nPaOperatorId)) + if (iotSuccess != m_ptrPaTableOpt->getPaOperatorId(stTimedAudio.nUserGrpId, nPaOperatorId)) { - return kbdFailed; + return iotFailed; } CPaServerApi::makePlayAudioCmd(1, @@ -559,7 +559,7 @@ int kbd_app::CPaTimedAudioThread::sendCmdMsg(const STableTimedAudio &stTimedAudi if (strMsg.empty()) { LOGERROR("生成控制命令失败"); - return kbdFailed; + return iotFailed; } LOGINFO("PA自己发送给OPT消息：\n%s",strMsg.c_str()); SOptAlarmInfo sOptAlarmInfo; @@ -573,14 +573,14 @@ int kbd_app::CPaTimedAudioThread::sendCmdMsg(const STableTimedAudio &stTimedAudi if(!m_ptrMsgbusMng->sendMsgToMsgBus(strMsg,CH_HMI_TO_OPT_OPTCMD_DOWN,MT_OPT_COMMON_DOWN,m_stRunAppInfo.nDomainId)) { LOGERROR("发送消息失败.AppId=[%d],CH=[%d],MT=[%d]", m_stRunAppInfo.nAppId, CH_HMI_TO_OPT_OPTCMD_DOWN, MT_OPT_COMMON_DOWN); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @brief 更新指定的定时广播记录 */ -int kbd_app::CPaTimedAudioThread::updateTimedAudio(const STableTimedAudio &stTimedAudio, +int iot_app::CPaTimedAudioThread::updateTimedAudio(const STableTimedAudio &stTimedAudio, int64 lOptTimeSec, int nDurationSec, int nNextAudioIndex) @@ -590,13 +590,13 @@ int kbd_app::CPaTimedAudioThread::updateTimedAudio(const STableTimedAudio &stTim stTimedAudio.nDurationTime == nDurationSec && stTimedAudio.nNextIdIndex == nNextAudioIndex) { - return kbdSuccess; + return iotSuccess; } - if (kbdSuccess != m_ptrPaTableOpt->updateTimedAudioByKey(stTimedAudio.stKey, lOptTimeSec, nDurationSec, nNextAudioIndex)) + if (iotSuccess != m_ptrPaTableOpt->updateTimedAudioByKey(stTimedAudio.stKey, lOptTimeSec, nDurationSec, nNextAudioIndex)) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/app_pa_server/PaTimedAudioThread.h b/product/src/application/app_pa_server/PaTimedAudioThread.h index d8b21f14..8fd02cd8 100644 --- a/product/src/application/app_pa_server/PaTimedAudioThread.h +++ b/product/src/application/app_pa_server/PaTimedAudioThread.h @@ -12,7 +12,7 @@ #include "PaRtdbTableOperate.h" #include "PaMsgBusMng.h" #include "BasicOperation.h" -namespace kbd_app +namespace iot_app { class CPaTimedAudioThread : public iot_public::CTimerThreadBase { @@ -27,7 +27,7 @@ namespace kbd_app /* @brief 初始化 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int initialize(); /** @@ -73,7 +73,7 @@ namespace kbd_app bool addConstCustomAlarmRepMsg(const int &constPaAudioId,const SConstPaCmdValue& sConstPaCmdValue); /* @brief 检测是否有语音需要播放 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int check(); @@ -88,7 +88,7 @@ namespace kbd_app /* @brief 广播当前记录 @param const STableTimedAudio & stTimedAudio 当前定时广播记录 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int broadcast(const STableTimedAudio &stTimedAudio); @@ -96,7 +96,7 @@ namespace kbd_app @brief 发送控制命令 @param const STableTimedAudio & stTimedAudio 当前定时广播记录 @param const STableAudioInfo & stAudioInfo 当前要广播的语音记录 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int sendCmdMsg(const STableTimedAudio &stTimedAudio, const STableAudioInfo &stAudioInfo); /** @@ -128,7 +128,7 @@ namespace kbd_app @param int64 lOptTimeSec 操作时间 @param int nDurationSec 当前语音持续时间 @param int nNextAudioIndex 下次要播放的语音ID的索引 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int updateTimedAudio(const STableTimedAudio &stTimedAudio, int64 lOptTimeSec, int nDurationSec, int nNextAudioIndex); /** diff --git a/product/src/application/app_pa_server/main.cpp b/product/src/application/app_pa_server/main.cpp index 0433ea5f..cd0faec0 100644 --- a/product/src/application/app_pa_server/main.cpp +++ b/product/src/application/app_pa_server/main.cpp @@ -7,6 +7,6 @@ int main(int argc, char *argv[]) { - kbd_app::CPaServerApp objApp; + iot_app::CPaServerApp objApp; return objApp.main(argc, argv); } \ No newline at end of file diff --git a/product/src/application/app_safety_day/SafetyDayApp.cpp b/product/src/application/app_safety_day/SafetyDayApp.cpp index 26dcf796..5a402dc0 100644 --- a/product/src/application/app_safety_day/SafetyDayApp.cpp +++ b/product/src/application/app_safety_day/SafetyDayApp.cpp @@ -12,13 +12,13 @@ using namespace std; using namespace iot_public; using namespace iot_sys; -using namespace kbd_app; +using namespace iot_app; using namespace iot_net; #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" -kbd_app::CSafetyDayApp::CSafetyDayApp() +iot_app::CSafetyDayApp::CSafetyDayApp() :m_ptrSysInfo(NULL), m_ptrProcMng(NULL), m_ptrRedundancyMng(NULL), @@ -26,12 +26,12 @@ kbd_app::CSafetyDayApp::CSafetyDayApp() { } -kbd_app::CSafetyDayApp::~CSafetyDayApp() +iot_app::CSafetyDayApp::~CSafetyDayApp() { CSafetyDayApp::stop(); } -bool kbd_app::CSafetyDayApp::start(int argc, char *argv[], int &/*nStatus*/) +bool iot_app::CSafetyDayApp::start(int argc, char *argv[], int &/*nStatus*/) { //1.解析启动参数 if (!parseCmdLine(argc, argv)) @@ -83,14 +83,14 @@ bool kbd_app::CSafetyDayApp::start(int argc, char *argv[], int &/*nStatus*/) } //8.设置冗余通知回调 - if (kbdSuccess != m_ptrRedundancyMng->setCallback(m_ptrSafetyDayMng)) + if (iotSuccess != m_ptrRedundancyMng->setCallback(m_ptrSafetyDayMng)) { LOGERROR("设置冗余回调接口失败"); return false; } //9.更新当前进程冗余状态 - if (kbdSuccess != m_ptrProcMng->updateProcessInfo(true, false, false)) + if (iotSuccess != m_ptrProcMng->updateProcessInfo(true, false, false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -99,7 +99,7 @@ bool kbd_app::CSafetyDayApp::start(int argc, char *argv[], int &/*nStatus*/) return true; } -bool kbd_app::CSafetyDayApp::stop() +bool iot_app::CSafetyDayApp::stop() { //9.更新当前进程冗余状态 if (m_ptrProcMng != NULL) @@ -132,7 +132,7 @@ bool kbd_app::CSafetyDayApp::stop() return true; } -int kbd_app::CSafetyDayApp::toQuit() +int iot_app::CSafetyDayApp::toQuit() { if (m_ptrProcMng != NULL) { @@ -140,10 +140,10 @@ int kbd_app::CSafetyDayApp::toQuit() } shutdown(); - return kbdSuccess; + return iotSuccess; } -bool kbd_app::CSafetyDayApp::parseCmdLine(int argc, char *argv[]) +bool iot_app::CSafetyDayApp::parseCmdLine(int argc, char *argv[]) { /* @brief 拼接启动参数，用于向进程管理注册 */ for (int i = 1; i < argc; ++i) @@ -205,26 +205,26 @@ bool kbd_app::CSafetyDayApp::parseCmdLine(int argc, char *argv[]) return true; } -void kbd_app::CSafetyDayApp::showHelp(const boost::program_options::options_description &objDesc) +void iot_app::CSafetyDayApp::showHelp(const boost::program_options::options_description &objDesc) { std::cout << CN_ProcName_SafetyDay << " [-h] | [-a app]" << std::endl; std::cout << objDesc << std::endl; } -bool kbd_app::CSafetyDayApp::isAlreadyRunning() +bool iot_app::CSafetyDayApp::isAlreadyRunning() { string strUniqueName = CN_ProcName_SafetyDay; strUniqueName += m_strStartArgs; return CSingleProcInstance::hasInstanceRunning(strUniqueName); } -bool kbd_app::CSafetyDayApp::initLog() +bool iot_app::CSafetyDayApp::initLog() { StartLogSystem(m_strAppName.c_str(), CN_ProcName_SafetyDay.c_str()); return true; } -bool kbd_app::CSafetyDayApp::getSystemInfo() +bool iot_app::CSafetyDayApp::getSystemInfo() { if (!createSysInfoInstance(m_ptrSysInfo)) { @@ -232,7 +232,7 @@ bool kbd_app::CSafetyDayApp::getSystemInfo() return false; } - if (kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName, m_stRunAppInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName, m_stRunAppInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -242,7 +242,7 @@ bool kbd_app::CSafetyDayApp::getSystemInfo() } /* @brief 向进程管理注册 */ -bool kbd_app::CSafetyDayApp::registToProcMng() +bool iot_app::CSafetyDayApp::registToProcMng() { SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stRunAppInfo.nDomainId; @@ -258,7 +258,7 @@ bool kbd_app::CSafetyDayApp::registToProcMng() return false; } - if (kbdSuccess != m_ptrProcMng->setCallback(this)) + if (iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -267,14 +267,14 @@ bool kbd_app::CSafetyDayApp::registToProcMng() return true; } -bool kbd_app::CSafetyDayApp::initialize() +bool iot_app::CSafetyDayApp::initialize() { //TODO:暂时不需要消息总线，如果要使用db_model_server_api则需要初始化 /* @brief 初始化消息总线 */ // if (!initMsgBus(CN_ProcName_SafetyDay.c_str(), "")) // { // LOGERROR("初始化消息总线失败"); -// return kbdFailed; +// return iotFailed; // } /* @brief 创建安全天数服务管理类 */ @@ -285,7 +285,7 @@ bool kbd_app::CSafetyDayApp::initialize() return false; } - if (kbdSuccess != m_ptrSafetyDayMng->initialize()) + if (iotSuccess != m_ptrSafetyDayMng->initialize()) { LOGERROR("初始化安全天数服务管理类失败"); return false; @@ -295,7 +295,7 @@ bool kbd_app::CSafetyDayApp::initialize() } /* @brief 清理业务资源 */ -bool kbd_app::CSafetyDayApp::clean() +bool iot_app::CSafetyDayApp::clean() { if (m_ptrSafetyDayMng != NULL) { diff --git a/product/src/application/app_safety_day/SafetyDayApp.h b/product/src/application/app_safety_day/SafetyDayApp.h index 6b2006d3..da44899d 100644 --- a/product/src/application/app_safety_day/SafetyDayApp.h +++ b/product/src/application/app_safety_day/SafetyDayApp.h @@ -10,7 +10,7 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "SafetyDayMng.h" -namespace kbd_app +namespace iot_app { class CSafetyDayApp : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { @@ -99,4 +99,4 @@ namespace kbd_app CSafetyDayMngPtr m_ptrSafetyDayMng; //< 安全天数服务管理类 }; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/app_safety_day/SafetyDayCommon.h b/product/src/application/app_safety_day/SafetyDayCommon.h index 9c7b693e..6fc96c46 100644 --- a/product/src/application/app_safety_day/SafetyDayCommon.h +++ b/product/src/application/app_safety_day/SafetyDayCommon.h @@ -10,7 +10,7 @@ #include "pub_utility_api/TimeUtil.h" #include "pub_sysinfo_api/SysInfoApi.h" -namespace kbd_app +namespace iot_app { const std::string CN_ProcName_SafetyDay = "app_safety_day"; //< 当前进程名 const std::string CN_TN_SafetyDay = "safety_day"; //< 安全天数表名 diff --git a/product/src/application/app_safety_day/SafetyDayMng.cpp b/product/src/application/app_safety_day/SafetyDayMng.cpp index 86d3ba5c..bcce213c 100644 --- a/product/src/application/app_safety_day/SafetyDayMng.cpp +++ b/product/src/application/app_safety_day/SafetyDayMng.cpp @@ -6,7 +6,7 @@ #include "SafetyDayMng.h" #include "pub_logger_api/logger.h" -kbd_app::CSafetyDayMng::CSafetyDayMng(const iot_public::SRunAppInfo &stRunAppInfo, +iot_app::CSafetyDayMng::CSafetyDayMng(const iot_public::SRunAppInfo &stRunAppInfo, const iot_sys::CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProcMng), @@ -14,7 +14,7 @@ kbd_app::CSafetyDayMng::CSafetyDayMng(const iot_public::SRunAppInfo &stRunAppInf { } -kbd_app::CSafetyDayMng::~CSafetyDayMng() +iot_app::CSafetyDayMng::~CSafetyDayMng() { if (m_ptrSafetyDayThread != NULL) { @@ -26,7 +26,7 @@ kbd_app::CSafetyDayMng::~CSafetyDayMng() } /* @brief 冗余切换 */ -int kbd_app::CSafetyDayMng::redundantSwitch(bool bMaster, bool bSlave) +int iot_app::CSafetyDayMng::redundantSwitch(bool bMaster, bool bSlave) { LOGWARN("接收到冗余切换指令.Master=[%d],Slave=[%d]", bMaster, bSlave); if (bMaster && !bSlave) //< 为主 @@ -40,24 +40,24 @@ int kbd_app::CSafetyDayMng::redundantSwitch(bool bMaster, bool bSlave) m_ptrProcMng->updateProcessInfo(true, bMaster, bSlave); - return kbdSuccess; + return iotSuccess; } /* @brief 初始化 */ -int kbd_app::CSafetyDayMng::initialize() +int iot_app::CSafetyDayMng::initialize() { m_ptrSafetyDayThread = boost::make_shared(m_stRunAppInfo); if (m_ptrSafetyDayThread == NULL) { LOGERROR("创建安全天数线程失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrSafetyDayThread->initialize()) + if (iotSuccess != m_ptrSafetyDayThread->initialize()) { LOGERROR("初始化安全天数线程失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/app_safety_day/SafetyDayMng.h b/product/src/application/app_safety_day/SafetyDayMng.h index dd0adb11..cef3b78a 100644 --- a/product/src/application/app_safety_day/SafetyDayMng.h +++ b/product/src/application/app_safety_day/SafetyDayMng.h @@ -8,7 +8,7 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "SafetyDayThread.h" -namespace kbd_app +namespace iot_app { class CSafetyDayMng : public iot_sys::CRedundantSwitchInterface { @@ -22,12 +22,12 @@ namespace kbd_app 在进程切换过程中，可能会被调用多次切换，业务进程需要保证幂等，无副作用 @param bool bMaster 是否为主 @param bool bSlave 是否为备 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int redundantSwitch(bool bMaster, bool bSlave); /* @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); diff --git a/product/src/application/app_safety_day/SafetyDayThread.cpp b/product/src/application/app_safety_day/SafetyDayThread.cpp index eb7b4a82..d79d6149 100644 --- a/product/src/application/app_safety_day/SafetyDayThread.cpp +++ b/product/src/application/app_safety_day/SafetyDayThread.cpp @@ -17,17 +17,17 @@ using namespace std; using namespace iot_public; -using namespace kbd_app; +using namespace iot_app; using namespace iot_dbms; using namespace iot_net; -kbd_app::CSafetyDayThread::CSafetyDayThread(const iot_public::SRunAppInfo &stRunAppInfo) +iot_app::CSafetyDayThread::CSafetyDayThread(const iot_public::SRunAppInfo &stRunAppInfo) :iot_public::CTimerThreadBase("CSafetyDayThread", 2000), m_stRunAppInfo(stRunAppInfo) { } -kbd_app::CSafetyDayThread::~CSafetyDayThread() +iot_app::CSafetyDayThread::~CSafetyDayThread() { if (m_objSafetyDayTable.isOpen()) { @@ -35,12 +35,12 @@ kbd_app::CSafetyDayThread::~CSafetyDayThread() } } -void kbd_app::CSafetyDayThread::execute() +void iot_app::CSafetyDayThread::execute() { updateSafetyDay(); } -void kbd_app::CSafetyDayThread::updateSafetyDay() +void iot_app::CSafetyDayThread::updateSafetyDay() { vector vecSafetyDay; @@ -119,13 +119,13 @@ void kbd_app::CSafetyDayThread::updateSafetyDay() } /* @brief 初始化 */ -int kbd_app::CSafetyDayThread::initialize() +int iot_app::CSafetyDayThread::initialize() { if (!m_objSafetyDayTable.open(m_stRunAppInfo.nAppId, CN_TN_SafetyDay.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]", m_stRunAppInfo.nAppId, CN_TN_SafetyDay.c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/app_safety_day/SafetyDayThread.h b/product/src/application/app_safety_day/SafetyDayThread.h index c8131b40..305ed356 100644 --- a/product/src/application/app_safety_day/SafetyDayThread.h +++ b/product/src/application/app_safety_day/SafetyDayThread.h @@ -9,7 +9,7 @@ #include "net_msg_bus_api/CMbCommunicator.h" #include "rdb_api/CRdbAccessEx.h" -namespace kbd_app +namespace iot_app { class CSafetyDayThread : public iot_public::CTimerThreadBase { @@ -24,7 +24,7 @@ namespace kbd_app /* @brief 初始化 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int initialize(); diff --git a/product/src/application/app_safety_day/main.cpp b/product/src/application/app_safety_day/main.cpp index 7d4194ce..be5ce171 100644 --- a/product/src/application/app_safety_day/main.cpp +++ b/product/src/application/app_safety_day/main.cpp @@ -7,6 +7,6 @@ int main(int argc, char *argv[]) { - kbd_app::CSafetyDayApp objApp; + iot_app::CSafetyDayApp objApp; return objApp.main(argc, argv); } \ No newline at end of file diff --git a/product/src/application/app_topo_server/CTopoServer.cpp b/product/src/application/app_topo_server/CTopoServer.cpp index 50222864..0831dfe9 100644 --- a/product/src/application/app_topo_server/CTopoServer.cpp +++ b/product/src/application/app_topo_server/CTopoServer.cpp @@ -11,7 +11,7 @@ #define OPT_DESC_HELP "help" using namespace std; -using namespace kbd_app; +using namespace iot_app; using namespace iot_net; using namespace iot_sys; using namespace iot_public; @@ -285,6 +285,6 @@ bool CTopoServer::stop() int CTopoServer::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/app_topo_server/CTopoServer.h b/product/src/application/app_topo_server/CTopoServer.h index add24ee1..a1c295df 100644 --- a/product/src/application/app_topo_server/CTopoServer.h +++ b/product/src/application/app_topo_server/CTopoServer.h @@ -9,7 +9,7 @@ #include "RedundantSwitch.h" #include "CTopoThread.h" -namespace kbd_app +namespace iot_app { class CTopoServer : public iot_public::CBaseService,iot_sys::CProcessQuitInterface { @@ -34,7 +34,7 @@ private: std::string m_strStartArgs; iot_sys::CProcMngInterfacePtr m_ptrProcManage; iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; - kbd_app::CRedundantSwitchPtr m_ptrRedundantSwitch; + iot_app::CRedundantSwitchPtr m_ptrRedundantSwitch; std::string m_strAppName; diff --git a/product/src/application/app_topo_server/CTopoThread.cpp b/product/src/application/app_topo_server/CTopoThread.cpp index c3b19cf5..a194ffbe 100644 --- a/product/src/application/app_topo_server/CTopoThread.cpp +++ b/product/src/application/app_topo_server/CTopoThread.cpp @@ -6,7 +6,7 @@ using namespace iot_dbms; using namespace iot_public; -using namespace kbd_app; +using namespace iot_app; using namespace iot_idl; using namespace std; diff --git a/product/src/application/app_topo_server/CTopoThread.h b/product/src/application/app_topo_server/CTopoThread.h index 52ec9354..add941ed 100644 --- a/product/src/application/app_topo_server/CTopoThread.h +++ b/product/src/application/app_topo_server/CTopoThread.h @@ -9,7 +9,7 @@ #include "rdbStructDef.h" #include "CDevice.h" -namespace kbd_app +namespace iot_app { class CTopoThread : public iot_public::CTimerThreadBase { diff --git a/product/src/application/app_topo_server/RedundantSwitch.cpp b/product/src/application/app_topo_server/RedundantSwitch.cpp index 0e283d15..59752470 100644 --- a/product/src/application/app_topo_server/RedundantSwitch.cpp +++ b/product/src/application/app_topo_server/RedundantSwitch.cpp @@ -5,7 +5,7 @@ */ #include "RedundantSwitch.h" -using namespace kbd_app; +using namespace iot_app; using namespace iot_sys; CRedundantSwitch::CRedundantSwitch(iot_sys::CProcMngInterfacePtr ptrProc) @@ -39,7 +39,7 @@ int CRedundantSwitch::redundantSwitch(bool bMaster, bool bSlave) { m_ptrProcManage->updateProcessInfo(true,bMaster,bSlave) ; } - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/application/app_topo_server/RedundantSwitch.h b/product/src/application/app_topo_server/RedundantSwitch.h index eed2ac89..2e5b5151 100644 --- a/product/src/application/app_topo_server/RedundantSwitch.h +++ b/product/src/application/app_topo_server/RedundantSwitch.h @@ -10,7 +10,7 @@ #include "CTopoThread.h" -namespace kbd_app +namespace iot_app { class CRedundantSwitch : public ::iot_sys::CRedundantSwitchInterface diff --git a/product/src/application/app_topo_server/main.cpp b/product/src/application/app_topo_server/main.cpp index a4a1677e..b60019be 100644 --- a/product/src/application/app_topo_server/main.cpp +++ b/product/src/application/app_topo_server/main.cpp @@ -1,7 +1,7 @@ //#include "CTopo.h" #include "CTopoServer.h" -using namespace kbd_app; +using namespace iot_app; int main(int argc, char *argv[]) { diff --git a/product/src/application/fault_recall_srv/CFaultRecallRedunSw.cpp b/product/src/application/fault_recall_srv/CFaultRecallRedunSw.cpp index b0127af6..4bfe973e 100644 --- a/product/src/application/fault_recall_srv/CFaultRecallRedunSw.cpp +++ b/product/src/application/fault_recall_srv/CFaultRecallRedunSw.cpp @@ -11,7 +11,7 @@ #include "CFaultRecallRedunSw.h" -namespace kbd_application +namespace iot_application { CFaultRecallRedunSw::CFaultRecallRedunSw() @@ -52,8 +52,8 @@ int CFaultRecallRedunSw::redundantSwitch(bool bMaster, bool bSlave) CFaultRecallSrv::getInstance().updateProcInfo(true, bMasterRunning, bSlave); - return kbdSuccess; + return iotSuccess; } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/fault_recall_srv/CFaultRecallRedunSw.h b/product/src/application/fault_recall_srv/CFaultRecallRedunSw.h index 7641fff6..7c60d5c4 100644 --- a/product/src/application/fault_recall_srv/CFaultRecallRedunSw.h +++ b/product/src/application/fault_recall_srv/CFaultRecallRedunSw.h @@ -14,7 +14,7 @@ #include "CTriggerThread.h" #include "CListenThread.h" -namespace kbd_application +namespace iot_application { class CFaultRecallRedunSw : public ::iot_sys::CRedundantSwitchInterface @@ -36,5 +36,5 @@ private: typedef boost::shared_ptr CFaultRecallRedunSwPtr; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/fault_recall_srv/CFaultRecallSrv.cpp b/product/src/application/fault_recall_srv/CFaultRecallSrv.cpp index 6f0814bd..eef98ef0 100644 --- a/product/src/application/fault_recall_srv/CFaultRecallSrv.cpp +++ b/product/src/application/fault_recall_srv/CFaultRecallSrv.cpp @@ -21,7 +21,7 @@ bool g_bVerboseLog = false; -namespace kbd_application +namespace iot_application { static const char *g_pSzProcName = "fault_recall_srv"; @@ -187,7 +187,7 @@ bool CFaultRecallSrv::start(int argc, char *argv[], int& /*nStatus*/) break; case RM_NO_PROC_MNG_MASTER: { - if (kbdSuccess != m_ptrRedunSw->redundantSwitch(true, false)) + if (iotSuccess != m_ptrRedunSw->redundantSwitch(true, false)) { LOGFATAL("以主机模式启动失败！"); return false; @@ -196,7 +196,7 @@ bool CFaultRecallSrv::start(int argc, char *argv[], int& /*nStatus*/) break; case RM_NO_PROC_MNG_SLAVE: { - if (kbdSuccess != m_ptrRedunSw->redundantSwitch(false, true)) + if (iotSuccess != m_ptrRedunSw->redundantSwitch(false, true)) { LOGFATAL("以备机模式启动失败！"); return false; @@ -279,7 +279,7 @@ bool CFaultRecallSrv::stop() int CFaultRecallSrv::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } @@ -290,7 +290,7 @@ int CFaultRecallSrv::updateProcInfo(bool bActive, bool bMaster, bool bSlave) return m_ptrProcMng->updateProcessInfo(bActive, bMaster, bSlave); } - return kbdFailed; + return iotFailed; } @@ -393,7 +393,7 @@ bool CFaultRecallSrv::loadSysInfo() iot_public::SRunAppInfo objRunAppInfo; int nRc = sysInfoPtr->getLocalRunAppInfoById(CN_AppId_COMAPP, objRunAppInfo); - if (kbdSuccess != nRc) + if (iotSuccess != nRc) { LOGERROR("getLocalRunAppInfoByName failed !"); return false; @@ -405,5 +405,5 @@ bool CFaultRecallSrv::loadSysInfo() return true; } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/fault_recall_srv/CFaultRecallSrv.h b/product/src/application/fault_recall_srv/CFaultRecallSrv.h index e2e806b5..f6c37d94 100644 --- a/product/src/application/fault_recall_srv/CFaultRecallSrv.h +++ b/product/src/application/fault_recall_srv/CFaultRecallSrv.h @@ -14,7 +14,7 @@ #include "CFaultRecallRedunSw.h" -namespace kbd_application +namespace iot_application { class CFaultRecallSrv : @@ -78,5 +78,5 @@ private: iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/fault_recall_srv/CHisDataMng.cpp b/product/src/application/fault_recall_srv/CHisDataMng.cpp index 9330a75f..8ecf37fe 100644 --- a/product/src/application/fault_recall_srv/CHisDataMng.cpp +++ b/product/src/application/fault_recall_srv/CHisDataMng.cpp @@ -22,7 +22,7 @@ extern bool g_bVerboseLog; -namespace kbd_application +namespace iot_application { CHisDataMng::CHisDataMng(boost::int64_t nTimeBegin, boost::int64_t nTimeEnd) : @@ -824,5 +824,5 @@ bool CHisDataMng::loadSampleFromTsdb() return true; } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/fault_recall_srv/CHisDataMng.h b/product/src/application/fault_recall_srv/CHisDataMng.h index 9199019e..c1caf98c 100644 --- a/product/src/application/fault_recall_srv/CHisDataMng.h +++ b/product/src/application/fault_recall_srv/CHisDataMng.h @@ -41,7 +41,7 @@ #include "dp_chg_data_api/CDpcdaForDp.h" #include "db_his_query_api/DbHisQueryApi.h" -namespace kbd_application +namespace iot_application { class CHisDataMng @@ -205,4 +205,4 @@ private: MeasPointMap m_mapAcc; }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/fault_recall_srv/CListenThread.cpp b/product/src/application/fault_recall_srv/CListenThread.cpp index 608cc630..5496b310 100644 --- a/product/src/application/fault_recall_srv/CListenThread.cpp +++ b/product/src/application/fault_recall_srv/CListenThread.cpp @@ -16,7 +16,7 @@ #include "CFaultRecallSrv.h" #include "CListenThread.h" -namespace kbd_application +namespace iot_application { //< 1ms一次，靠通讯器超时时间休息 @@ -321,5 +321,5 @@ void CListenThread::sendSessStateReject(const char *pszSess) m_pMbComm->sendMsgToDomain(objMbMsgSend, -1); } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/fault_recall_srv/CListenThread.h b/product/src/application/fault_recall_srv/CListenThread.h index eed13aaf..ffee0516 100644 --- a/product/src/application/fault_recall_srv/CListenThread.h +++ b/product/src/application/fault_recall_srv/CListenThread.h @@ -21,7 +21,7 @@ #include "fault_recall_srv/JsonMsgClass.h" #include "CSessionThread.h" -namespace kbd_application +namespace iot_application { class CListenThread @@ -63,5 +63,5 @@ private: CSessionThread *m_pSessThread; //< 会话线程 }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/fault_recall_srv/CSessionThread.cpp b/product/src/application/fault_recall_srv/CSessionThread.cpp index 2284c5c1..4c38a121 100644 --- a/product/src/application/fault_recall_srv/CSessionThread.cpp +++ b/product/src/application/fault_recall_srv/CSessionThread.cpp @@ -17,7 +17,7 @@ #include "CFaultRecallSrv.h" #include "CSessionThread.h" -namespace kbd_application +namespace iot_application { static const unsigned int g_nEventQueueMaxSize = 10000; @@ -187,7 +187,7 @@ void CSessionThread::setTime(boost::int64_t nTime) int CSessionThread::beforeExecute() { - int nRc = kbdFailed; + int nRc = iotFailed; assert(EN_FR_SS_LOADING == m_enState); assert(EN_FR_SS_PAUSE == m_enStateBackup); @@ -203,7 +203,7 @@ int CSessionThread::beforeExecute() //< 由 sendFullFrame() 设置状态并发送 sendFullFrame(m_nTimeBegin); - nRc = kbdSuccess; + nRc = iotSuccess; } else { @@ -457,5 +457,5 @@ void CSessionThread::sendFullFrame(boost::int64_t nTime) LOGDEBUG("sendFullFrame() : end\n"); } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/fault_recall_srv/CSessionThread.h b/product/src/application/fault_recall_srv/CSessionThread.h index 854796a6..1f68fceb 100644 --- a/product/src/application/fault_recall_srv/CSessionThread.h +++ b/product/src/application/fault_recall_srv/CSessionThread.h @@ -20,7 +20,7 @@ #include "fault_recall_srv/JsonMsgClass.h" #include "CHisDataMng.h" -namespace kbd_application +namespace iot_application { class CSessionThread @@ -118,5 +118,5 @@ private: }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/fault_recall_srv/CTriggerThread.cpp b/product/src/application/fault_recall_srv/CTriggerThread.cpp index 2421b9c9..3ba3bfde 100644 --- a/product/src/application/fault_recall_srv/CTriggerThread.cpp +++ b/product/src/application/fault_recall_srv/CTriggerThread.cpp @@ -18,7 +18,7 @@ #include "CTriggerThread.h" -namespace kbd_application +namespace iot_application { //< 500ms运行一次 @@ -106,7 +106,7 @@ bool CTriggerThread::suspendThread() //< 删除触发器 { - std::vector vecTriggerPara; + std::vector vecTriggerPara; if (!getTriggerList(vecTriggerPara)) { LOGERROR("suspendThread(): 获取已添加的触发器失败！"); @@ -151,7 +151,7 @@ void CTriggerThread::execute() } -bool CTriggerThread::triggered(const kbd_application::CTriggerPara *param, uint64 triggerTime) +bool CTriggerThread::triggered(const iot_application::CTriggerPara *param, uint64 triggerTime) { STriggerEvent stEvent; stEvent.m_pPara = param; @@ -178,10 +178,10 @@ void CTriggerThread::refreshCfg() //< 已添加的触发器map，便于查询 boost::unordered::unordered_map - + mapAddedTrigger; { - std::vector vecTriggerPara; + std::vector vecTriggerPara; if (!getTriggerList(vecTriggerPara)) { LOGERROR("suspendThread(): 获取已添加的触发器失败！"); @@ -190,8 +190,8 @@ void CTriggerThread::refreshCfg() for (size_t i = 0; i < vecTriggerPara.size(); ++i) { - const kbd_application::CTriggerPara *pPara = vecTriggerPara[i]; - if (kbd_application::CTriggerPara::TRIGGER_TYPE_CONDITION + const iot_application::CTriggerPara *pPara = vecTriggerPara[i]; + if (iot_application::CTriggerPara::TRIGGER_TYPE_CONDITION != pPara->getTriggerType()) { //< 只允许条件触发器 @@ -231,9 +231,9 @@ void CTriggerThread::refreshCfg() if (mapAddedTrigger.end() == itAdded) { //< 没找到，则添加 - const kbd_application::CTriggerPara *pTrigPrar = - new kbd_application::CTriggerPara( - kbd_application::CTriggerPara::TRIGGER_TYPE_CONDITION, + const iot_application::CTriggerPara *pTrigPrar = + new iot_application::CTriggerPara( + iot_application::CTriggerPara::TRIGGER_TYPE_CONDITION, strTrigName); if (addTrigger(pTrigPrar)) @@ -478,5 +478,5 @@ void CTriggerThread::handleTriggerEvent() iot_dbms::saveHisData(objDbInsert); } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/fault_recall_srv/CTriggerThread.h b/product/src/application/fault_recall_srv/CTriggerThread.h index 54e8db69..b2d888d1 100644 --- a/product/src/application/fault_recall_srv/CTriggerThread.h +++ b/product/src/application/fault_recall_srv/CTriggerThread.h @@ -19,12 +19,12 @@ #include "rdb_api/CRdbAccess.h" #include "trigger_api/CTriggerApi.h" -namespace kbd_application +namespace iot_application { class CTriggerThread : private iot_public::CTimerThreadBase, - kbd_application::CTriggerApi + iot_application::CTriggerApi { public: CTriggerThread(); @@ -42,7 +42,7 @@ public: private: void execute()override; - bool triggered(const kbd_application::CTriggerPara *param, uint64 triggerTime)override; + bool triggered(const iot_application::CTriggerPara *param, uint64 triggerTime)override; //< 从实时库刷新触发条件，以支持在线修改 void refreshCfg(); @@ -53,7 +53,7 @@ private: //< 触发器事件结构 struct STriggerEvent { - const kbd_application::CTriggerPara *m_pPara; + const iot_application::CTriggerPara *m_pPara; uint64 m_nTime; }; @@ -74,5 +74,5 @@ private: }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/fault_recall_srv/Main.cpp b/product/src/application/fault_recall_srv/Main.cpp index f429ac9f..a7ff38db 100644 --- a/product/src/application/fault_recall_srv/Main.cpp +++ b/product/src/application/fault_recall_srv/Main.cpp @@ -12,8 +12,8 @@ int main(int argc, char *argv[]) { //< 控制单例生命周期 - kbd_application::CFaultRecallSrv::GC objSrvGc; + iot_application::CFaultRecallSrv::GC objSrvGc; - return kbd_application::CFaultRecallSrv::getInstance().main(argc, argv); + return iot_application::CFaultRecallSrv::getInstance().main(argc, argv); } diff --git a/product/src/application/fault_recall_srv/test/FrTest_JsonMsgClass/main.cpp b/product/src/application/fault_recall_srv/test/FrTest_JsonMsgClass/main.cpp index 51a52172..47430d9a 100644 --- a/product/src/application/fault_recall_srv/test/FrTest_JsonMsgClass/main.cpp +++ b/product/src/application/fault_recall_srv/test/FrTest_JsonMsgClass/main.cpp @@ -34,7 +34,7 @@ int main(/*int argc, char *argv[]*/) LOGINFO("Log system OK !"); { - kbd_application::CFrMsgNewSess objSrc, objDst; + iot_application::CFrMsgNewSess objSrc, objDst; objSrc.m_nDomainID = 11; objSrc.m_nTimeBegin = 12; objSrc.m_nTimeEnd = 13; @@ -50,9 +50,9 @@ int main(/*int argc, char *argv[]*/) } { - kbd_application::CFrMsgSessState objSrc, objDst; + iot_application::CFrMsgSessState objSrc, objDst; objSrc.m_nDomainID = 21; - objSrc.m_enState = kbd_application::EN_FR_SS_PLAY; + objSrc.m_enState = iot_application::EN_FR_SS_PLAY; objSrc.m_strSess = "Test23"; const std::string strJson = objSrc.toJsonStr(); @@ -65,7 +65,7 @@ int main(/*int argc, char *argv[]*/) } { - kbd_application::CFrMsgGetSessState objSrc, objDst; + iot_application::CFrMsgGetSessState objSrc, objDst; objSrc.m_nDomainID = 31; objSrc.m_strSess = "Test32"; @@ -79,9 +79,9 @@ int main(/*int argc, char *argv[]*/) } { - kbd_application::CFrMsgSetSessState objSrc, objDst; + iot_application::CFrMsgSetSessState objSrc, objDst; objSrc.m_nDomainID = 41; - objSrc.m_enState = kbd_application::EN_FR_SS_PLAY; + objSrc.m_enState = iot_application::EN_FR_SS_PLAY; objSrc.m_strSess = "Test43"; const std::string strJson = objSrc.toJsonStr(); @@ -94,7 +94,7 @@ int main(/*int argc, char *argv[]*/) } { - kbd_application::CFrMsgSetTime objSrc, objDst; + iot_application::CFrMsgSetTime objSrc, objDst; objSrc.m_nDomainID = 51; objSrc.m_nTime = 52; objSrc.m_strSess = "Test53"; diff --git a/product/src/application/his_amend/his_amend_srv/CCfgParser.cpp b/product/src/application/his_amend/his_amend_srv/CCfgParser.cpp index 0396b2f5..053c8f9d 100644 --- a/product/src/application/his_amend/his_amend_srv/CCfgParser.cpp +++ b/product/src/application/his_amend/his_amend_srv/CCfgParser.cpp @@ -54,19 +54,19 @@ bool CCfgParser::g_isValid=false; bool CCfgParser::loadGlobal(iot_public::CCommonConfigParse &cfg) { - if( cfg.getBoolValue(CN_GLOBAL,CN_IS_ENABLED, g_global_cfg.is_enabled ) == kbdFailed){ LOGERROR( " is_enabled option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL,CN_IS_AUTO_ENABLED, g_global_cfg.is_auto_enabled ) == kbdFailed){ LOGERROR( " is_auto_enabled option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL,CN_IS_CACHE_ENABLED, g_global_cfg.is_cache_enabled ) == kbdFailed){ LOGERROR( " is_cache_enabled option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL,CN_IS_RANGE_CONSTRAINE, g_global_cfg.is_range_constrained ) == kbdFailed){ LOGERROR( " is_range_constrain option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL,CN_IS_AMEND_FEAT_ADDED, g_global_cfg.is_amend_feat_added ) == kbdFailed){ LOGERROR( " is_amend_feat_added option parser err"); return false;} - if( cfg.getIntValue(CN_GLOBAL,CN_CHECK_INTERVAL, g_global_cfg.check_interval ) == kbdFailed){ LOGERROR( " check_interval option parser err"); return false;} - if( cfg.getIntValue(CN_GLOBAL,CN_WORK_INTERRVAL, g_global_cfg.work_interval ) == kbdFailed){ LOGERROR( " work_interrval option parser err"); return false;} - if( cfg.getIntValue(CN_GLOBAL,CN_DELAY_INTERVAL, g_global_cfg.delay_interrval ) == kbdFailed){ LOGERROR( " delay_interrval option parser err"); return false;} - if( cfg.getIntValue(CN_GLOBAL,CN_EXPIRED_INTERRVAL, g_global_cfg.expired_interrval ) == kbdFailed){ LOGERROR( " expired_interrval option parser err"); return false;} - if( cfg.getIntValue(CN_GLOBAL,CN_RETRY_CNT, g_global_cfg.retry_cnt ) == kbdFailed){ LOGERROR( " retry_cnt option parser err"); return false;} - if( cfg.getIntValue(CN_GLOBAL,CN_FTP_TIMEOUT, g_global_cfg.ftp_timeout ) == kbdFailed){ LOGERROR( " ftp_timeout option parser err"); return false;} - if( cfg.getIntValue(CN_GLOBAL,CN_CHAN_INTERRUPT_PREFIX, g_global_cfg.chan_interrupt_prefix ) == kbdFailed){ LOGERROR( " chan_interrupt_prefix option parser err"); return false;} - if( cfg.getIntValue(CN_GLOBAL,CN_CHAN_JITTER, g_global_cfg.chan_jitter ) == kbdFailed){ LOGERROR( " chan_jitter option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL,CN_IS_ENABLED, g_global_cfg.is_enabled ) == iotFailed){ LOGERROR( " is_enabled option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL,CN_IS_AUTO_ENABLED, g_global_cfg.is_auto_enabled ) == iotFailed){ LOGERROR( " is_auto_enabled option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL,CN_IS_CACHE_ENABLED, g_global_cfg.is_cache_enabled ) == iotFailed){ LOGERROR( " is_cache_enabled option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL,CN_IS_RANGE_CONSTRAINE, g_global_cfg.is_range_constrained ) == iotFailed){ LOGERROR( " is_range_constrain option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL,CN_IS_AMEND_FEAT_ADDED, g_global_cfg.is_amend_feat_added ) == iotFailed){ LOGERROR( " is_amend_feat_added option parser err"); return false;} + if( cfg.getIntValue(CN_GLOBAL,CN_CHECK_INTERVAL, g_global_cfg.check_interval ) == iotFailed){ LOGERROR( " check_interval option parser err"); return false;} + if( cfg.getIntValue(CN_GLOBAL,CN_WORK_INTERRVAL, g_global_cfg.work_interval ) == iotFailed){ LOGERROR( " work_interrval option parser err"); return false;} + if( cfg.getIntValue(CN_GLOBAL,CN_DELAY_INTERVAL, g_global_cfg.delay_interrval ) == iotFailed){ LOGERROR( " delay_interrval option parser err"); return false;} + if( cfg.getIntValue(CN_GLOBAL,CN_EXPIRED_INTERRVAL, g_global_cfg.expired_interrval ) == iotFailed){ LOGERROR( " expired_interrval option parser err"); return false;} + if( cfg.getIntValue(CN_GLOBAL,CN_RETRY_CNT, g_global_cfg.retry_cnt ) == iotFailed){ LOGERROR( " retry_cnt option parser err"); return false;} + if( cfg.getIntValue(CN_GLOBAL,CN_FTP_TIMEOUT, g_global_cfg.ftp_timeout ) == iotFailed){ LOGERROR( " ftp_timeout option parser err"); return false;} + if( cfg.getIntValue(CN_GLOBAL,CN_CHAN_INTERRUPT_PREFIX, g_global_cfg.chan_interrupt_prefix ) == iotFailed){ LOGERROR( " chan_interrupt_prefix option parser err"); return false;} + if( cfg.getIntValue(CN_GLOBAL,CN_CHAN_JITTER, g_global_cfg.chan_jitter ) == iotFailed){ LOGERROR( " chan_jitter option parser err"); return false;} @@ -83,21 +83,21 @@ bool CCfgParser::loadGlobal(iot_public::CCommonConfigParse &cfg) } bool CCfgParser::loadComMng(iot_public::CCommonConfigParse &cfg) { - if( cfg.getIntValue( CN_COM_MNG,CN_COM_MNG_FTP_PORT, g_com_mng_cfg.com_mng_ftp_port ) == kbdFailed) {LOGERROR( " com_mng_ftp_port option parser err"); return false;} - if( cfg.getStringValue( CN_COM_MNG,CN_COM_MNG_FTP_USER, g_com_mng_cfg.com_mng_ftp_user ) == kbdFailed) {LOGERROR( " com_mng_ftp_user option parser err"); return false;} - if( cfg.getStringValue( CN_COM_MNG,CN_COM_MNG_FTP_PASSWD, g_com_mng_cfg.com_mng_ftp_passwd ) == kbdFailed) {LOGERROR( " com_mng_ftp_passwd option parser err"); return false;} + if( cfg.getIntValue( CN_COM_MNG,CN_COM_MNG_FTP_PORT, g_com_mng_cfg.com_mng_ftp_port ) == iotFailed) {LOGERROR( " com_mng_ftp_port option parser err"); return false;} + if( cfg.getStringValue( CN_COM_MNG,CN_COM_MNG_FTP_USER, g_com_mng_cfg.com_mng_ftp_user ) == iotFailed) {LOGERROR( " com_mng_ftp_user option parser err"); return false;} + if( cfg.getStringValue( CN_COM_MNG,CN_COM_MNG_FTP_PASSWD, g_com_mng_cfg.com_mng_ftp_passwd ) == iotFailed) {LOGERROR( " com_mng_ftp_passwd option parser err"); return false;} - if( cfg.getStringValue( CN_COM_MNG,CN_COM_CFG_PATH1, g_com_mng_cfg.com_cfg_path1 ) == kbdFailed) {LOGERROR( " com_cfg_path1 option parser err"); return false;} - if( cfg.getStringValue( CN_COM_MNG,CN_COM_CFG_PATH2, g_com_mng_cfg.com_cfg_path2 ) == kbdFailed) {LOGERROR( " com_cfg_path2 option parser err"); return false;} - if( cfg.getStringValue( CN_COM_MNG,CN_COM_CFG_PATH3, g_com_mng_cfg.com_cfg_path3 ) == kbdFailed) {LOGERROR( " com_cfg_path3 option parser err"); return false;} - if( cfg.getStringValue( CN_COM_MNG,CN_COM_CFG_PATH4, g_com_mng_cfg.com_cfg_path4 ) == kbdFailed) {LOGERROR( " com_cfg_path4 option parser err"); return false;} - if( cfg.getStringValue( CN_COM_MNG,CN_COM_CFG_PATH5, g_com_mng_cfg.com_cfg_path5 ) == kbdFailed) {LOGERROR( " com_cfg_path5 option parser err"); return false;} + if( cfg.getStringValue( CN_COM_MNG,CN_COM_CFG_PATH1, g_com_mng_cfg.com_cfg_path1 ) == iotFailed) {LOGERROR( " com_cfg_path1 option parser err"); return false;} + if( cfg.getStringValue( CN_COM_MNG,CN_COM_CFG_PATH2, g_com_mng_cfg.com_cfg_path2 ) == iotFailed) {LOGERROR( " com_cfg_path2 option parser err"); return false;} + if( cfg.getStringValue( CN_COM_MNG,CN_COM_CFG_PATH3, g_com_mng_cfg.com_cfg_path3 ) == iotFailed) {LOGERROR( " com_cfg_path3 option parser err"); return false;} + if( cfg.getStringValue( CN_COM_MNG,CN_COM_CFG_PATH4, g_com_mng_cfg.com_cfg_path4 ) == iotFailed) {LOGERROR( " com_cfg_path4 option parser err"); return false;} + if( cfg.getStringValue( CN_COM_MNG,CN_COM_CFG_PATH5, g_com_mng_cfg.com_cfg_path5 ) == iotFailed) {LOGERROR( " com_cfg_path5 option parser err"); return false;} - if( cfg.getStringValue( CN_COM_MNG,CN_COM_HIS_PATH1, g_com_mng_cfg.com_his_path1 ) == kbdFailed) {LOGERROR( " com_his_path1 option parser err"); return false;} - if( cfg.getStringValue( CN_COM_MNG,CN_COM_HIS_PATH2, g_com_mng_cfg.com_his_path2 ) == kbdFailed) {LOGERROR( " com_his_path2 option parser err"); return false;} - if( cfg.getStringValue( CN_COM_MNG,CN_COM_HIS_PATH3, g_com_mng_cfg.com_his_path3 ) == kbdFailed) {LOGERROR( " com_his_path3 option parser err"); return false;} - if( cfg.getStringValue( CN_COM_MNG,CN_COM_HIS_PATH4, g_com_mng_cfg.com_his_path4 ) == kbdFailed) {LOGERROR( " com_his_path4 option parser err"); return false;} - if( cfg.getStringValue( CN_COM_MNG,CN_COM_HIS_PATH5, g_com_mng_cfg.com_his_path5 ) == kbdFailed) {LOGERROR( " com_his_path5 option parser err"); return false;} + if( cfg.getStringValue( CN_COM_MNG,CN_COM_HIS_PATH1, g_com_mng_cfg.com_his_path1 ) == iotFailed) {LOGERROR( " com_his_path1 option parser err"); return false;} + if( cfg.getStringValue( CN_COM_MNG,CN_COM_HIS_PATH2, g_com_mng_cfg.com_his_path2 ) == iotFailed) {LOGERROR( " com_his_path2 option parser err"); return false;} + if( cfg.getStringValue( CN_COM_MNG,CN_COM_HIS_PATH3, g_com_mng_cfg.com_his_path3 ) == iotFailed) {LOGERROR( " com_his_path3 option parser err"); return false;} + if( cfg.getStringValue( CN_COM_MNG,CN_COM_HIS_PATH4, g_com_mng_cfg.com_his_path4 ) == iotFailed) {LOGERROR( " com_his_path4 option parser err"); return false;} + if( cfg.getStringValue( CN_COM_MNG,CN_COM_HIS_PATH5, g_com_mng_cfg.com_his_path5 ) == iotFailed) {LOGERROR( " com_his_path5 option parser err"); return false;} if(g_com_mng_cfg.com_cfg_path1.compare(g_com_mng_cfg.com_cfg_path1.size() - 1, 1,"/") != 0) g_com_mng_cfg.com_cfg_path1 += "/"; if(g_com_mng_cfg.com_cfg_path2.compare(g_com_mng_cfg.com_cfg_path2.size() - 1, 1,"/") != 0) g_com_mng_cfg.com_cfg_path2 += "/"; @@ -126,7 +126,7 @@ bool CCfgParser::isValid() bool CCfgParser::loadCfg(const std::string &cfgPath) { iot_public::CCommonConfigParse cfgP; - if( cfgP.load(cfgPath) == kbdFailed) + if( cfgP.load(cfgPath) == iotFailed) { LOGERROR("config failed to load, please check config syntax!"); g_isValid = false; diff --git a/product/src/application/his_amend/his_amend_srv/HisAmendRdbUtility.cpp b/product/src/application/his_amend/his_amend_srv/HisAmendRdbUtility.cpp index 975c7006..d5ac3484 100644 --- a/product/src/application/his_amend/his_amend_srv/HisAmendRdbUtility.cpp +++ b/product/src/application/his_amend/his_amend_srv/HisAmendRdbUtility.cpp @@ -6,52 +6,52 @@ #include "pub_utility_api/TimeUtil.h" #include "CCfgParser.h" -kbd_app::CHisAmendRdbUtility::CHisAmendRdbUtility(const iot_public::SRunAppInfo &stRunAppInfo) +iot_app::CHisAmendRdbUtility::CHisAmendRdbUtility(const iot_public::SRunAppInfo &stRunAppInfo) : m_stRunAppInfo(stRunAppInfo) { } -kbd_app::CHisAmendRdbUtility::~CHisAmendRdbUtility() +iot_app::CHisAmendRdbUtility::~CHisAmendRdbUtility() { clean(); } -int kbd_app::CHisAmendRdbUtility::initialize() +int iot_app::CHisAmendRdbUtility::initialize() { - if(kbdFailed == openRdbTable()){ + if(iotFailed == openRdbTable()){ LOGERROR("cannot open rdb table"); - return kbdFailed; + return iotFailed; } - if(kbdFailed == loadRdb()) + if(iotFailed == loadRdb()) { LOGERROR("cannot laod rdb table"); - return kbdFailed; + return iotFailed; } LOGINFO("CHisAmendRdbUtility::initialize() completed, [%d] rtu",getRtuSize()); - return kbdSuccess; + return iotSuccess; } -kbd_app::vecSRuPtr kbd_app::CHisAmendRdbUtility::getAllRtu() const +iot_app::vecSRuPtr iot_app::CHisAmendRdbUtility::getAllRtu() const { return m_ptrVecRtu; } -kbd_app::vecSRuMapYcPtr kbd_app::CHisAmendRdbUtility::getAllRtuYc() const +iot_app::vecSRuMapYcPtr iot_app::CHisAmendRdbUtility::getAllRtuYc() const { return m_ptrVecMapRtuYc; } -kbd_app::vecSRuMapYmPtr kbd_app::CHisAmendRdbUtility::getAllRtuYm() const +iot_app::vecSRuMapYmPtr iot_app::CHisAmendRdbUtility::getAllRtuYm() const { return m_ptrVecMapRtuYm; } -bool kbd_app::CHisAmendRdbUtility::setRtuState(int rtuIdx, int nLastState) +bool iot_app::CHisAmendRdbUtility::setRtuState(int rtuIdx, int nLastState) { if(rtuIdx <0 || rtuIdx >= (int)m_ptrVecRtu->size()) return false; @@ -61,7 +61,7 @@ bool kbd_app::CHisAmendRdbUtility::setRtuState(int rtuIdx, int nLastState) return true; } -bool kbd_app::CHisAmendRdbUtility::setRtuTime(int rtuIdx, int64 nLastTime) +bool iot_app::CHisAmendRdbUtility::setRtuTime(int rtuIdx, int64 nLastTime) { if(rtuIdx <0 || rtuIdx >= (int)m_ptrVecRtu->size()) return false; @@ -71,7 +71,7 @@ bool kbd_app::CHisAmendRdbUtility::setRtuTime(int rtuIdx, int64 nLastTime) return true; } -bool kbd_app::CHisAmendRdbUtility::setRtuInit(int rtuIdx, bool bIsInit) +bool iot_app::CHisAmendRdbUtility::setRtuInit(int rtuIdx, bool bIsInit) { if(rtuIdx <0 || rtuIdx >= (int)m_ptrVecRtu->size()) return false; @@ -81,7 +81,7 @@ bool kbd_app::CHisAmendRdbUtility::setRtuInit(int rtuIdx, bool bIsInit) return true; } -std::string kbd_app::CHisAmendRdbUtility::getRtuTag(int rtuIdx) +std::string iot_app::CHisAmendRdbUtility::getRtuTag(int rtuIdx) { if(rtuIdx <0 || rtuIdx >= (int)m_ptrVecRtu->size()) return ""; @@ -90,7 +90,7 @@ std::string kbd_app::CHisAmendRdbUtility::getRtuTag(int rtuIdx) return (*m_ptrVecRtu)[rtuIdx].sTagName; } -std::string kbd_app::CHisAmendRdbUtility::getChanTag(int rtuIdx) +std::string iot_app::CHisAmendRdbUtility::getChanTag(int rtuIdx) { if(rtuIdx <0 || rtuIdx >= (int)m_ptrVecRtu->size()) return ""; @@ -99,7 +99,7 @@ std::string kbd_app::CHisAmendRdbUtility::getChanTag(int rtuIdx) return (*m_ptrVecRtu)[rtuIdx].sChanTag; } -int kbd_app::CHisAmendRdbUtility::getRtuNo(int rtuIdx) +int iot_app::CHisAmendRdbUtility::getRtuNo(int rtuIdx) { if(rtuIdx <0 || rtuIdx >= (int)m_ptrVecRtu->size()) return -1; @@ -108,7 +108,7 @@ int kbd_app::CHisAmendRdbUtility::getRtuNo(int rtuIdx) return (*m_ptrVecRtu)[rtuIdx].nRtuNo; } -std::vector kbd_app::CHisAmendRdbUtility::getRtuAddr(int rtuIdx) +std::vector iot_app::CHisAmendRdbUtility::getRtuAddr(int rtuIdx) { std::vector result; if(rtuIdx <0 || rtuIdx >= (int)m_ptrVecRtu->size()) @@ -118,7 +118,7 @@ std::vector kbd_app::CHisAmendRdbUtility::getRtuAddr(int rtuIdx) return (*m_ptrVecRtu)[rtuIdx].vecChannelIP; } -bool kbd_app::CHisAmendRdbUtility::getRtuState(int rtuIdx, int &nLastState, int64 &nLastTime) +bool iot_app::CHisAmendRdbUtility::getRtuState(int rtuIdx, int &nLastState, int64 &nLastTime) { if(rtuIdx <0 || rtuIdx >= (int)m_ptrVecRtu->size()) return false; @@ -130,7 +130,7 @@ bool kbd_app::CHisAmendRdbUtility::getRtuState(int rtuIdx, int &nLastState, int6 } -bool kbd_app::CHisAmendRdbUtility::isRtuInit(int rtuIdx) +bool iot_app::CHisAmendRdbUtility::isRtuInit(int rtuIdx) { if(rtuIdx <0 || rtuIdx >= (int)m_ptrVecRtu->size()) return false; @@ -139,7 +139,7 @@ bool kbd_app::CHisAmendRdbUtility::isRtuInit(int rtuIdx) return m_ptrVecRtu->at(rtuIdx).bIsInit; } -bool kbd_app::CHisAmendRdbUtility::isRtuValid(int rtuIdx) +bool iot_app::CHisAmendRdbUtility::isRtuValid(int rtuIdx) { if(rtuIdx <0 || rtuIdx >= (int)m_ptrVecRtu->size()) return false; @@ -148,7 +148,7 @@ bool kbd_app::CHisAmendRdbUtility::isRtuValid(int rtuIdx) return (*m_ptrVecRtu)[rtuIdx].bIsValid; } -int kbd_app::CHisAmendRdbUtility::getRtuRdbStatus(int rtuIdx) +int iot_app::CHisAmendRdbUtility::getRtuRdbStatus(int rtuIdx) { if( rtuIdx < 0 || rtuIdx >= (int)m_ptrVecRtu->size()) { @@ -167,12 +167,12 @@ int kbd_app::CHisAmendRdbUtility::getRtuRdbStatus(int rtuIdx) return status; } -int kbd_app::CHisAmendRdbUtility::getRtuSize() +int iot_app::CHisAmendRdbUtility::getRtuSize() { return (int)m_ptrVecRtu->size(); } -std::vector kbd_app::CHisAmendRdbUtility::getValidRtu() +std::vector iot_app::CHisAmendRdbUtility::getValidRtu() { std::vector result; for(size_t i = 0; i < m_ptrVecRtu->size(); i++) @@ -184,7 +184,7 @@ std::vector kbd_app::CHisAmendRdbUtility::getValidRtu() return result; } -void kbd_app::CHisAmendRdbUtility::addTask(const kbd_app::STaskUnit &objTask) +void iot_app::CHisAmendRdbUtility::addTask(const iot_app::STaskUnit &objTask) { boost::mutex::scoped_lock lock( m_objVecTaskLock ); @@ -192,7 +192,7 @@ void kbd_app::CHisAmendRdbUtility::addTask(const kbd_app::STaskUnit &objTask) } -void kbd_app::CHisAmendRdbUtility::addTask(int nRtuIdx, int64 nStartTime, int64 nEndTime) +void iot_app::CHisAmendRdbUtility::addTask(int nRtuIdx, int64 nStartTime, int64 nEndTime) { STaskUnit tsk; tsk.nRtuIdx = nRtuIdx; @@ -203,7 +203,7 @@ void kbd_app::CHisAmendRdbUtility::addTask(int nRtuIdx, int64 nStartTime, int64 addTask(tsk); } -void kbd_app::CHisAmendRdbUtility::addBatchTask(const std::vector &vecTask) +void iot_app::CHisAmendRdbUtility::addBatchTask(const std::vector &vecTask) { if(vecTask.size() == 0) return; @@ -216,7 +216,7 @@ void kbd_app::CHisAmendRdbUtility::addBatchTask(const std::vector>(); if(m_ptrVecRtu == nullptr) { LOGERROR("cannot create m_ptrVecRtu"); - return kbdFailed; + return iotFailed; } - if(kbdFailed == loadAllRtu()) + if(iotFailed == loadAllRtu()) { LOGERROR("cannot loadAllRtu"); - return kbdFailed; + return iotFailed; } - if(kbdFailed == fillAllRtuChan()) + if(iotFailed == fillAllRtuChan()) { LOGERROR("cannot fillAllRtuChan"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } -int kbd_app::CHisAmendRdbUtility::loadYc() +int iot_app::CHisAmendRdbUtility::loadYc() { m_ptrVecMapRtuYc = boost::make_shared>>(); if(m_ptrVecMapRtuYc == nullptr) { LOGERROR("cannot create m_ptrVecMapRtuYc"); - return kbdFailed; + return iotFailed; } for(size_t rtuIdx = 0; rtuIdx < m_ptrVecRtu->size(); rtuIdx++){ @@ -360,7 +360,7 @@ int kbd_app::CHisAmendRdbUtility::loadYc() if(!m_tblFesAnalog.selectAllVec(vecCond,vecRecord,vecYcColumn,COL_PARAM1,1)){ // COL_RTU_NO 列为升序查询 LOGERROR("cannot query m_tblFesAnalog rdb table"); - return kbdFailed; + return iotFailed; } if(vecRecord.size() == 0) @@ -390,16 +390,16 @@ int kbd_app::CHisAmendRdbUtility::loadYc() } - return kbdSuccess; + return iotSuccess; } -int kbd_app::CHisAmendRdbUtility::loadYm() +int iot_app::CHisAmendRdbUtility::loadYm() { m_ptrVecMapRtuYm = boost::make_shared>>(); if(m_ptrVecMapRtuYm == nullptr) { LOGERROR("cannot create m_ptrVecMapRtuYm"); - return kbdFailed; + return iotFailed; } @@ -432,7 +432,7 @@ int kbd_app::CHisAmendRdbUtility::loadYm() if(!m_tblFesAccuml.selectAllVec(vecCond,vecRecord,vecYcColumn,COL_PARAM1,1)){ // COL_RTU_NO 列为升序查询 LOGERROR("cannot query m_tblFesAccuml rdb table"); - return kbdFailed; + return iotFailed; } if(vecRecord.size() == 0) @@ -461,11 +461,11 @@ int kbd_app::CHisAmendRdbUtility::loadYm() } - return kbdSuccess; + return iotSuccess; } -int kbd_app::CHisAmendRdbUtility::loadAllRtu() +int iot_app::CHisAmendRdbUtility::loadAllRtu() { std::vector vecRtuColumn; vecRtuColumn.push_back("rtu_no"); @@ -487,7 +487,7 @@ int kbd_app::CHisAmendRdbUtility::loadAllRtu() if(!m_tblFesRtuPara.selectAllVec(vecCond,vecRecord,vecRtuColumn,COL_RTU_NO,1)){ // COL_RTU_NO 列为升序查询 LOGERROR("cannot query fes_rtu_para rdb table"); - return kbdFailed; + return iotFailed; } for(size_t i = 0; i < (size_t)(vecRecord.size()); i++){ @@ -499,10 +499,10 @@ int kbd_app::CHisAmendRdbUtility::loadAllRtu() objRtu.sChanTag = vecRecord[i].ChanTag; m_ptrVecRtu->push_back(objRtu); } - return kbdSuccess; + return iotSuccess; } -int kbd_app::CHisAmendRdbUtility::fillAllRtuChan() +int iot_app::CHisAmendRdbUtility::fillAllRtuChan() { std::vector vecChanColumn; vecChanColumn.push_back("chan_no"); @@ -535,7 +535,7 @@ int kbd_app::CHisAmendRdbUtility::fillAllRtuChan() std::vector vecRecord; //< 查询结果 if(!m_tblFesChanPara.selectAllVec(vecCond,vecRecord,vecChanColumn,COL_CHAN_NO,1)){ // COL_CHAN_NO 列为升序查询 LOGERROR("cannot query fest_chan_para rdb table"); - return kbdFailed; + return iotFailed; } if(vecRecord.size() != 1) { @@ -571,7 +571,7 @@ int kbd_app::CHisAmendRdbUtility::fillAllRtuChan() // std::vector vecRecord; //< 查询结果 // if(!m_tblFesChanPara.selectAllVec(vecCond,vecRecord,vecChanColumn,COL_CHAN_NO,1)){ // COL_CHAN_NO 列为升序查询 // LOGERROR("cannot query fest_chan_para rdb table"); -// return kbdFailed; +// return iotFailed; // } // if(vecRecord.size() != 1) // { @@ -593,10 +593,10 @@ int kbd_app::CHisAmendRdbUtility::fillAllRtuChan() } - return kbdSuccess; + return iotSuccess; } -void kbd_app::CHisAmendRdbUtility::clean() +void iot_app::CHisAmendRdbUtility::clean() { if(m_ptrVecRtu == nullptr) {m_ptrVecRtu.reset();} if(m_ptrVecMapRtuYc == nullptr) {m_ptrVecMapRtuYc.reset();} diff --git a/product/src/application/his_amend/his_amend_srv/HisAmendRdbUtility.h b/product/src/application/his_amend/his_amend_srv/HisAmendRdbUtility.h index a188a1cb..ebe6abb9 100644 --- a/product/src/application/his_amend/his_amend_srv/HisAmendRdbUtility.h +++ b/product/src/application/his_amend/his_amend_srv/HisAmendRdbUtility.h @@ -8,7 +8,7 @@ #include "boost/thread/mutex.hpp" #include "HisCommon.h" -namespace kbd_app { +namespace iot_app { typedef struct Rtu { @@ -173,5 +173,5 @@ private: typedef boost::shared_ptr CHisAmendRdbUtilityPtr; -} //namespace kbd_app +} //namespace iot_app #endif // HISAMENDRDBUTILITY_H diff --git a/product/src/application/his_amend/his_amend_srv/HisAmendSrvApp.cpp b/product/src/application/his_amend/his_amend_srv/HisAmendSrvApp.cpp index 14d9b2d8..3d623126 100644 --- a/product/src/application/his_amend/his_amend_srv/HisAmendSrvApp.cpp +++ b/product/src/application/his_amend/his_amend_srv/HisAmendSrvApp.cpp @@ -8,30 +8,30 @@ #include -kbd_app::CHisAmendSrvApp::CHisAmendSrvApp() +iot_app::CHisAmendSrvApp::CHisAmendSrvApp() { } -kbd_app::CHisAmendSrvApp::~CHisAmendSrvApp() +iot_app::CHisAmendSrvApp::~CHisAmendSrvApp() { } -bool kbd_app::CHisAmendSrvApp::start(int argc, char *argv[], int &nStatus) +bool iot_app::CHisAmendSrvApp::start(int argc, char *argv[], int &nStatus) { //< 1.解析启动参数 if(!parseCmdLine(argc, argv)) { std::cerr<<"cannot parse command line" <setCallback(m_ptrSrvMng)) + if(iotSuccess !=m_ptrRedundancyMng->setCallback(m_ptrSrvMng)) { LOGERROR("设置冗余回调接口失败"); - nStatus = kbdFailed; + nStatus = iotFailed; return false; } //< 10.更新当前进程冗余状态 - if(kbdSuccess !=m_ptrProcMng->updateProcessInfo(true,false,false)) + if(iotSuccess !=m_ptrProcMng->updateProcessInfo(true,false,false)) { LOGERROR("更新本进程的进程信息失败"); - nStatus = kbdFailed; + nStatus = iotFailed; return false; } return true; } -bool kbd_app::CHisAmendSrvApp:: stop() +bool iot_app::CHisAmendSrvApp:: stop() { //< 更新当前进程冗余状态 if(m_ptrProcMng !=NULL) @@ -138,17 +138,17 @@ bool kbd_app::CHisAmendSrvApp:: stop() return true; } -int kbd_app::CHisAmendSrvApp::toQuit() +int iot_app::CHisAmendSrvApp::toQuit() { if(m_ptrProcMng != NULL) { m_ptrProcMng->unsetCallback(); } shutdown(); - return kbdSuccess; + return iotSuccess; } -bool kbd_app::CHisAmendSrvApp::parseCmdLine(int argc, char *argv[]) +bool iot_app::CHisAmendSrvApp::parseCmdLine(int argc, char *argv[]) { //拼接启动参数，用于向进程管理注册 for(int i=1;igetLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) + if(iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -241,7 +241,7 @@ bool kbd_app::CHisAmendSrvApp::getSystemInfo() return true; } -bool kbd_app::CHisAmendSrvApp::registToProcMng() +bool iot_app::CHisAmendSrvApp::registToProcMng() { iot_sys::SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stRunAppInfo.nDomainId; @@ -256,7 +256,7 @@ bool kbd_app::CHisAmendSrvApp::registToProcMng() LOGERROR("创建进程管理访问库失败"); return false; } - if(kbdSuccess != m_ptrProcMng->setCallback(this)) + if(iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -264,7 +264,7 @@ bool kbd_app::CHisAmendSrvApp::registToProcMng() return true; } -bool kbd_app::CHisAmendSrvApp::initialize() +bool iot_app::CHisAmendSrvApp::initialize() { // 初始化管理类 m_ptrSrvMng = boost::make_shared(m_stRunAppInfo,m_ptrProcMng); @@ -274,7 +274,7 @@ bool kbd_app::CHisAmendSrvApp::initialize() return false; } - if(kbdSuccess != m_ptrSrvMng->initialize()) + if(iotSuccess != m_ptrSrvMng->initialize()) { LOGERROR("服务管理类初始化失败"); return false; @@ -282,7 +282,7 @@ bool kbd_app::CHisAmendSrvApp::initialize() return true; } -bool kbd_app::CHisAmendSrvApp::clean() +bool iot_app::CHisAmendSrvApp::clean() { return true; } diff --git a/product/src/application/his_amend/his_amend_srv/HisAmendSrvApp.h b/product/src/application/his_amend/his_amend_srv/HisAmendSrvApp.h index 3f38369a..c3d217f4 100644 --- a/product/src/application/his_amend/his_amend_srv/HisAmendSrvApp.h +++ b/product/src/application/his_amend/his_amend_srv/HisAmendSrvApp.h @@ -11,7 +11,7 @@ -namespace kbd_app{ +namespace iot_app{ class CHisAmendSrvApp: public iot_public::CBaseService, @@ -97,11 +97,11 @@ private: std::string m_strStartArgs; //保存进程启动参数 iot_sys::CProcMngInterfacePtr m_ptrProcMng; //创建进程管理访问智能库指针 iot_sys::CRedundantMngInterfacePtr m_ptrRedundancyMng; //冗余管理类 - kbd_app::CSrvMngPtr m_ptrSrvMng; //统计服务管理类 + iot_app::CSrvMngPtr m_ptrSrvMng; //统计服务管理类 }; -} //namespace kbd_app +} //namespace iot_app #endif // CHISAMENDSRVAPP_H diff --git a/product/src/application/his_amend/his_amend_srv/HisAmendSrvMng.cpp b/product/src/application/his_amend/his_amend_srv/HisAmendSrvMng.cpp index 938350e0..3ebe4f62 100644 --- a/product/src/application/his_amend/his_amend_srv/HisAmendSrvMng.cpp +++ b/product/src/application/his_amend/his_amend_srv/HisAmendSrvMng.cpp @@ -3,13 +3,13 @@ #include "CCfgParser.h" -kbd_app::CHisAmendSrvMng::CHisAmendSrvMng(iot_public::SRunAppInfo &stRunAppInfo, const iot_sys::CProcMngInterfacePtr &ptrProcMng): +iot_app::CHisAmendSrvMng::CHisAmendSrvMng(iot_public::SRunAppInfo &stRunAppInfo, const iot_sys::CProcMngInterfacePtr &ptrProcMng): m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProcMng) { } -kbd_app::CHisAmendSrvMng::~CHisAmendSrvMng() +iot_app::CHisAmendSrvMng::~CHisAmendSrvMng() { if ( m_ptrRecvMsgThd != nullptr ) { @@ -32,9 +32,9 @@ kbd_app::CHisAmendSrvMng::~CHisAmendSrvMng() } -int kbd_app::CHisAmendSrvMng::redundantSwitch(bool bMaster, bool bSlave) +int iot_app::CHisAmendSrvMng::redundantSwitch(bool bMaster, bool bSlave) { - int nWrkRet = kbdSuccess,nRtuMntRet = kbdSuccess; + int nWrkRet = iotSuccess,nRtuMntRet = iotSuccess; if ( m_ptrRecvMsgThd != nullptr ) { @@ -53,7 +53,7 @@ int kbd_app::CHisAmendSrvMng::redundantSwitch(bool bMaster, bool bSlave) } // 切换失败， 报告为非主非备 - if(kbdSuccess == nWrkRet && kbdSuccess == nRtuMntRet) + if(iotSuccess == nWrkRet && iotSuccess == nRtuMntRet) { m_ptrProcMng->updateProcessInfo(true, bMaster, bSlave); } @@ -61,67 +61,67 @@ int kbd_app::CHisAmendSrvMng::redundantSwitch(bool bMaster, bool bSlave) m_ptrProcMng->updateProcessInfo(true, false, false); } - return kbdSuccess; + return iotSuccess; } -int kbd_app::CHisAmendSrvMng::initialize() +int iot_app::CHisAmendSrvMng::initialize() { - if(!CCfgParser::loadCfg()) { LOGERROR("config parse error"); return kbdFailed;} + if(!CCfgParser::loadCfg()) { LOGERROR("config parse error"); return iotFailed;} - if(!CCfgParser::g_global_cfg.is_enabled) return kbdSuccess; + if(!CCfgParser::g_global_cfg.is_enabled) return iotSuccess; m_ptrHisAmendRdbUtility = boost::make_shared(m_stRunAppInfo); if ( m_ptrHisAmendRdbUtility == nullptr ) { LOGERROR( "cannot create CHisAmendRdbUtility class" ); - return kbdFailed; + return iotFailed; } - if(!CCfgParser::g_global_cfg.is_auto_enabled) return kbdSuccess; - if ( kbdSuccess != m_ptrHisAmendRdbUtility->initialize()) + if(!CCfgParser::g_global_cfg.is_auto_enabled) return iotSuccess; + if ( iotSuccess != m_ptrHisAmendRdbUtility->initialize()) { LOGERROR( "cannot initialize m_ptrHisAmendRdbUtility" ); - return kbdFailed; + return iotFailed; } m_ptrHisAmendWrkThd = boost::make_shared(m_ptrHisAmendRdbUtility,m_stRunAppInfo); if ( m_ptrHisAmendWrkThd == nullptr ) { LOGERROR( "cannot create CHisAmendWrkThd class" ); - return kbdFailed; + return iotFailed; } m_ptrRtuStatMontThd = boost::make_shared(m_ptrHisAmendRdbUtility); if ( m_ptrRtuStatMontThd == nullptr ) { LOGERROR( "cannot create CRtuStatMontThd class" ); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrRtuStatMontThd->initialize()) + if ( iotSuccess != m_ptrRtuStatMontThd->initialize()) { LOGERROR( "cannot initialize m_ptrRtuStatMontThd" ); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrHisAmendWrkThd->initialize()) + if ( iotSuccess != m_ptrHisAmendWrkThd->initialize()) { LOGERROR( "cannot initialize m_ptrHisAmendWrkThd" ); - return kbdFailed; + return iotFailed; } m_ptrRecvMsgThd = boost::make_shared(m_ptrHisAmendRdbUtility); if ( m_ptrRecvMsgThd == nullptr ) { LOGERROR( "cannot create m_ptrRecvMsgThd class" ); - return kbdFailed; + return iotFailed; } - if ( kbdSuccess != m_ptrRecvMsgThd->initialize()) + if ( iotSuccess != m_ptrRecvMsgThd->initialize()) { LOGERROR( "cannot initialize m_ptrRecvMsgThd" ); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/his_amend/his_amend_srv/HisAmendSrvMng.h b/product/src/application/his_amend/his_amend_srv/HisAmendSrvMng.h index 4962b7d1..3bb9a7c9 100644 --- a/product/src/application/his_amend/his_amend_srv/HisAmendSrvMng.h +++ b/product/src/application/his_amend/his_amend_srv/HisAmendSrvMng.h @@ -12,7 +12,7 @@ #include "RtuStatMontThd.h" #include "RecvMsgThread.h" -namespace kbd_app { +namespace iot_app { class CHisAmendSrvMng: public iot_sys::CRedundantSwitchInterface @@ -26,13 +26,13 @@ public: * 在进程切换过程中，可能会被调用多次切换，业务进程需要保证幂等，无副作用 * @param bMaster 是否为主 * @param bSlave 是否为备 - * @return 成功返回kbdSuccess,失败返回错误码 + * @return 成功返回iotSuccess,失败返回错误码 */ virtual int redundantSwitch(bool bMaster, bool bSlave); /** * @brief 初始化 - * @return 成功返回kbdSuccess,失败返回kbdFailed + * @return 成功返回iotSuccess,失败返回iotFailed */ int initialize(); @@ -49,5 +49,5 @@ private: typedef boost::shared_ptr CSrvMngPtr; -} //getOneTask(aTask)) @@ -65,23 +65,23 @@ void kbd_app::CHisAmendWrkThd::execute() -int kbd_app::CHisAmendWrkThd::initialize() +int iot_app::CHisAmendWrkThd::initialize() { if(m_ptrRdbUtil == nullptr){ LOGERROR("m_ptrHisAmendRdbUtility is nullptr"); - return kbdFailed; + return iotFailed; } m_ptrRtu2SYc = m_ptrRdbUtil->getAllRtuYc(); if(m_ptrRtu2SYc == nullptr){ LOGERROR("m_ptrRtu2SYc is nullptr"); - return kbdFailed; + return iotFailed; } m_ptrRtu2SYm = m_ptrRdbUtil->getAllRtuYm(); if(m_ptrRtu2SYm == nullptr){ LOGERROR("m_ptrRtu2SYm is nullptr"); - return kbdFailed; + return iotFailed; } m_ptrTsdbSaveApi = boost::make_shared(m_stRunAppInfo.nDomainId,m_stRunAppInfo.nAppId); @@ -92,10 +92,10 @@ int kbd_app::CHisAmendWrkThd::initialize() } m_ptrTsdbSaveApi->resumeThread(); - return kbdSuccess; + return iotSuccess; } -int kbd_app::CHisAmendWrkThd::redundantSwitch(bool bMaster, bool bSlave) +int iot_app::CHisAmendWrkThd::redundantSwitch(bool bMaster, bool bSlave) { LOGINFO( "CHisAmendWrkThd接收到切换指令,bMaster=[%d],bSlave=[%d]", bMaster, bSlave ); if ( bMaster ) //< 为主 @@ -107,10 +107,10 @@ int kbd_app::CHisAmendWrkThd::redundantSwitch(bool bMaster, bool bSlave) CTimerThreadBase::suspend(); } - return kbdSuccess; + return iotSuccess; } -bool kbd_app::CHisAmendWrkThd::execTask(const kbd_app::STaskUnit &task) +bool iot_app::CHisAmendWrkThd::execTask(const iot_app::STaskUnit &task) { LOGINFO("execTask,RTU: [%s],start:[%s],end:[%s]",m_ptrRdbUtil->getRtuTag(task.nRtuIdx).c_str(), UTCMSectoString(task.nStartTime).c_str(), @@ -219,7 +219,7 @@ bool kbd_app::CHisAmendWrkThd::execTask(const kbd_app::STaskUnit &task) return true; } -void kbd_app::CHisAmendWrkThd::sendTaskMsg(const kbd_app::STaskUnit &task, bool result) +void iot_app::CHisAmendWrkThd::sendTaskMsg(const iot_app::STaskUnit &task, bool result) { iot_idl::TASK_FINISH task_fi; task_fi.set_rtu_idx(task.nRtuIdx); @@ -240,7 +240,7 @@ void kbd_app::CHisAmendWrkThd::sendTaskMsg(const kbd_app::STaskUnit &task, bool } -bool kbd_app::CHisAmendWrkThd::getFirstValidAddr(int rtuIdx,std::string &addr) +bool iot_app::CHisAmendWrkThd::getFirstValidAddr(int rtuIdx,std::string &addr) { std::vector addrs = m_ptrRdbUtil->getRtuAddr(rtuIdx); for(size_t i = 0; i < addrs.size(); i++) @@ -259,7 +259,7 @@ bool kbd_app::CHisAmendWrkThd::getFirstValidAddr(int rtuIdx,std::string &addr) return false; } -bool kbd_app::CHisAmendWrkThd::getFirstValidCfgPath(CFtpStreamReader &ftpStrmReader, std::string &path) +bool iot_app::CHisAmendWrkThd::getFirstValidCfgPath(CFtpStreamReader &ftpStrmReader, std::string &path) { std::vector dstPath; dstPath.push_back( CCfgParser::g_com_mng_cfg.com_cfg_path1 ); @@ -280,7 +280,7 @@ bool kbd_app::CHisAmendWrkThd::getFirstValidCfgPath(CFtpStreamReader &ftpStrmRea return false; } -bool kbd_app::CHisAmendWrkThd::getFirstValidHisPath(CFtpStreamReader &ftpStrmReader, std::string &path) +bool iot_app::CHisAmendWrkThd::getFirstValidHisPath(CFtpStreamReader &ftpStrmReader, std::string &path) { std::vector dstPath; dstPath.push_back( CCfgParser::g_com_mng_cfg.com_his_path1 ); @@ -307,7 +307,7 @@ bool isKthBitSet(int n, int k) } -bool kbd_app::CHisAmendWrkThd::getProtocals(CFtpStreamReader &ftpStrmReader,const std::string &path, std::unordered_set &setUpProto) +bool iot_app::CHisAmendWrkThd::getProtocals(CFtpStreamReader &ftpStrmReader,const std::string &path, std::unordered_set &setUpProto) { std::stringstream protocolStream; if(!ftpStrmReader.download(path + PROTOCOL_FILENAME,protocolStream)) @@ -351,7 +351,7 @@ bool kbd_app::CHisAmendWrkThd::getProtocals(CFtpStreamReader &ftpStrmReader,cons return true; } -bool kbd_app::CHisAmendWrkThd::getFirstValidPortId(CFtpStreamReader &ftpStrmReader, const std::string &path, const std::unordered_set &/*setUpProto*/, int &nPortId) +bool iot_app::CHisAmendWrkThd::getFirstValidPortId(CFtpStreamReader &ftpStrmReader, const std::string &path, const std::unordered_set &/*setUpProto*/, int &nPortId) { std::stringstream portFilelStream; if(!ftpStrmReader.download(path + PORT_FILENAME,portFilelStream)) @@ -425,7 +425,7 @@ bool kbd_app::CHisAmendWrkThd::getFirstValidPortId(CFtpStreamReader &ftpStrmRead return false; } -bool kbd_app::CHisAmendWrkThd::getFirstValidDeviceId(CFtpStreamReader &ftpStrmReader, const std::string &path,int &nDeviceId) +bool iot_app::CHisAmendWrkThd::getFirstValidDeviceId(CFtpStreamReader &ftpStrmReader, const std::string &path,int &nDeviceId) { std::unordered_set setUpProto; // 上传协议集合 protocol.txt 读取内容 @@ -450,7 +450,7 @@ bool kbd_app::CHisAmendWrkThd::getFirstValidDeviceId(CFtpStreamReader &ftpStrmRe } -bool kbd_app::CHisAmendWrkThd::getFirstValidDeviceIdImpl(CFtpStreamReader &ftpStrmReader, const std::string &path, const int &nPortId, int &nDeviceId) +bool iot_app::CHisAmendWrkThd::getFirstValidDeviceIdImpl(CFtpStreamReader &ftpStrmReader, const std::string &path, const int &nPortId, int &nDeviceId) { std::stringstream deviceFilelStream; if(!ftpStrmReader.download(path + DEVICE_FILENAME,deviceFilelStream)) @@ -493,7 +493,7 @@ bool kbd_app::CHisAmendWrkThd::getFirstValidDeviceIdImpl(CFtpStreamReader &ftpSt return false; } -bool kbd_app::CHisAmendWrkThd::getMapYc(CFtpStreamReader &ftpStrmReader, const std::string &path, const int &nDeviceId, std::map &mapYc) +bool iot_app::CHisAmendWrkThd::getMapYc(CFtpStreamReader &ftpStrmReader, const std::string &path, const int &nDeviceId, std::map &mapYc) { std::stringstream ycStream; if(!ftpStrmReader.download(path + TRNYC_FILENAME,ycStream)) @@ -545,7 +545,7 @@ bool kbd_app::CHisAmendWrkThd::getMapYc(CFtpStreamReader &ftpStrmReader, const s } } -bool kbd_app::CHisAmendWrkThd::getMapYm(CFtpStreamReader &ftpStrmReader, const std::string &path, const int &nDeviceId, std::map &mapYm) +bool iot_app::CHisAmendWrkThd::getMapYm(CFtpStreamReader &ftpStrmReader, const std::string &path, const int &nDeviceId, std::map &mapYm) { std::stringstream ymStream; if(!ftpStrmReader.download(path + TRNYM_FILENAME,ymStream)) @@ -598,7 +598,7 @@ bool kbd_app::CHisAmendWrkThd::getMapYm(CFtpStreamReader &ftpStrmReader, const s return true; } -bool kbd_app::CHisAmendWrkThd::getLocalIp(std::set &setLocalIp) +bool iot_app::CHisAmendWrkThd::getLocalIp(std::set &setLocalIp) { QList listLocalIp = QNetworkInterface::allAddresses(); for ( int i = 0; i < listLocalIp.size(); i++ ) @@ -611,7 +611,7 @@ bool kbd_app::CHisAmendWrkThd::getLocalIp(std::set &setLocalIp) return true; } -bool kbd_app::CHisAmendWrkThd::parseHisData(CFtpStreamReader &ftpStrmReader, const std::string &path, const kbd_app::STaskUnit &task, const std::map &mapPointInfo, iot_idl::STssInsert &stYcTssToInsert, EnPointType pointType) +bool iot_app::CHisAmendWrkThd::parseHisData(CFtpStreamReader &ftpStrmReader, const std::string &path, const iot_app::STaskUnit &task, const std::map &mapPointInfo, iot_idl::STssInsert &stYcTssToInsert, EnPointType pointType) { int64 curStart,curEnd; @@ -677,7 +677,7 @@ bool kbd_app::CHisAmendWrkThd::parseHisData(CFtpStreamReader &ftpStrmReader, con return true; } -bool kbd_app::CHisAmendWrkThd::parseYcFile(int64 startTime, int64 endTime, int nRtuIdx, std::stringstream &fileStream, const std::map &mapYc, iot_idl::STssInsert &stYcTssToInsert) +bool iot_app::CHisAmendWrkThd::parseYcFile(int64 startTime, int64 endTime, int nRtuIdx, std::stringstream &fileStream, const std::map &mapYc, iot_idl::STssInsert &stYcTssToInsert) { std::string filetext = fileStream.str(); @@ -749,7 +749,7 @@ bool kbd_app::CHisAmendWrkThd::parseYcFile(int64 startTime, int64 endTime, int n return true; } -bool kbd_app::CHisAmendWrkThd::parseYmFile(int64 startTime, int64 endTime, int nRtuIdx, std::stringstream &fileStream, const std::map &mapYm, iot_idl::STssInsert &stTssToInsert) +bool iot_app::CHisAmendWrkThd::parseYmFile(int64 startTime, int64 endTime, int nRtuIdx, std::stringstream &fileStream, const std::map &mapYm, iot_idl::STssInsert &stTssToInsert) { std::string filetext = fileStream.str(); @@ -817,7 +817,7 @@ bool kbd_app::CHisAmendWrkThd::parseYmFile(int64 startTime, int64 endTime, int n return true; } -bool kbd_app::CHisAmendWrkThd::writeToTsdb(const kbd_app::STaskUnit &/*task*/, const iot_idl::STssInsert &stTssToInsert) +bool iot_app::CHisAmendWrkThd::writeToTsdb(const iot_app::STaskUnit &/*task*/, const iot_idl::STssInsert &stTssToInsert) { // TODO 删除区间的值 diff --git a/product/src/application/his_amend/his_amend_srv/HisAmendWrkThd.h b/product/src/application/his_amend/his_amend_srv/HisAmendWrkThd.h index 8acd794e..94c28918 100644 --- a/product/src/application/his_amend/his_amend_srv/HisAmendWrkThd.h +++ b/product/src/application/his_amend/his_amend_srv/HisAmendWrkThd.h @@ -47,7 +47,7 @@ char PtType; char RecordTime[4]; }SDataPoint; -namespace kbd_app { +namespace iot_app { class CHisAmendWrkThd final : public iot_public::CTimerThreadBase { @@ -115,6 +115,6 @@ private: }; typedef boost::shared_ptr CHisAmendWrkThdPtr; -}// namespace kbd_app +}// namespace iot_app #endif // HISAMENDWRKTHD_H diff --git a/product/src/application/his_amend/his_amend_srv/HisCommon.h b/product/src/application/his_amend/his_amend_srv/HisCommon.h index a3d57709..a0afb3c1 100644 --- a/product/src/application/his_amend/his_amend_srv/HisCommon.h +++ b/product/src/application/his_amend/his_amend_srv/HisCommon.h @@ -49,7 +49,7 @@ const int COL_VALUE_USED = 1; #define COL_STATUS "status" // 返回值 -#define kbdFailedRdb 2 // 内存库错误 +#define iotFailedRdb 2 // 内存库错误 #define valid_value 0 #define invalid_value 1 diff --git a/product/src/application/his_amend/his_amend_srv/RecvMsgThread.cpp b/product/src/application/his_amend/his_amend_srv/RecvMsgThread.cpp index 1331c30a..977dbee4 100644 --- a/product/src/application/his_amend/his_amend_srv/RecvMsgThread.cpp +++ b/product/src/application/his_amend/his_amend_srv/RecvMsgThread.cpp @@ -5,21 +5,21 @@ #include -kbd_app::CRecvMsgThread::CRecvMsgThread(const kbd_app::CHisAmendRdbUtilityPtr &ptrHisAmendRdbUtility): +iot_app::CRecvMsgThread::CRecvMsgThread(const iot_app::CHisAmendRdbUtilityPtr &ptrHisAmendRdbUtility): iot_public::CTimerThreadBase( "CRtuStatMontThd", CCfgParser::g_global_cfg.check_interval ), m_ptrRdbUtil(ptrHisAmendRdbUtility) { } -kbd_app::CRecvMsgThread::~CRecvMsgThread() +iot_app::CRecvMsgThread::~CRecvMsgThread() { CTimerThreadBase::quit(); //< 先停止线程 unsubscribeMessage(); //< 取消消息订阅 } -void kbd_app::CRecvMsgThread::execute() +void iot_app::CRecvMsgThread::execute() { iot_net::CMbMessage msg; while( m_objCommunicator.recvMsg( msg ) ) @@ -48,31 +48,31 @@ void kbd_app::CRecvMsgThread::execute() } /* @brief 初始化 */ -int kbd_app::CRecvMsgThread::initialize() +int iot_app::CRecvMsgThread::initialize() { /* @brief 订阅数据发布通道 */ return subscribeMessage(); } /* @brief 订阅消息通道 */ -int kbd_app::CRecvMsgThread::subscribeMessage() +int iot_app::CRecvMsgThread::subscribeMessage() { /* @brief 订阅数据发布通道 */ if ( !m_objCommunicator.addSub( 4, CH_AMEND_APP_TO_SRV_PRTBF ) ) { LOGERROR( "订阅通道[CH_AMEND_APP_TO_SRV_PRTBF]失败" ); - return kbdFailed; + return iotFailed; } else { LOGINFO( "订阅通道[CH_AMEND_APP_TO_SRV_PRTBF]成功" ); } - return kbdSuccess; + return iotSuccess; } -int kbd_app::CRecvMsgThread::unsubscribeMessage() +int iot_app::CRecvMsgThread::unsubscribeMessage() { std::vector vecSub = m_objCommunicator.getMySub(); for ( size_t i = 0; i < vecSub.size(); ++i ) @@ -80,7 +80,7 @@ int kbd_app::CRecvMsgThread::unsubscribeMessage() if ( !m_objCommunicator.delSub( vecSub[i].getAppID(), vecSub[i].getChannelID())) { LOGERROR( "取消通道[%d-%d]订阅失败.", vecSub[i].getAppID(), vecSub[i].getChannelID()); - return kbdFailed; + return iotFailed; } } @@ -90,14 +90,14 @@ int kbd_app::CRecvMsgThread::unsubscribeMessage() { } - return kbdSuccess; + return iotSuccess; } /* @brief 冗余切换 */ -int kbd_app::CRecvMsgThread::redundantSwitch( bool bMaster, bool /*bSlave*/ ) +int iot_app::CRecvMsgThread::redundantSwitch( bool bMaster, bool /*bSlave*/ ) { - int nRet = kbdFailed; + int nRet = iotFailed; if ( bMaster ) { CTimerThreadBase::resume(); diff --git a/product/src/application/his_amend/his_amend_srv/RecvMsgThread.h b/product/src/application/his_amend/his_amend_srv/RecvMsgThread.h index 4b0bf184..ede9b7f5 100644 --- a/product/src/application/his_amend/his_amend_srv/RecvMsgThread.h +++ b/product/src/application/his_amend/his_amend_srv/RecvMsgThread.h @@ -6,7 +6,7 @@ #include "net_msg_bus_api/CMbCommunicator.h" -namespace kbd_app { +namespace iot_app { class CRecvMsgThread final : public iot_public::CTimerThreadBase { @@ -23,13 +23,13 @@ public: private: /* @brief 订阅消息 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int subscribeMessage(); /* @brief 取消订阅 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int unsubscribeMessage(); @@ -41,6 +41,6 @@ private: typedef boost::shared_ptr CRecvMsgThreadPtr; -}// namespace kbd_app +}// namespace iot_app #endif // RECVMSGTHREAD_H diff --git a/product/src/application/his_amend/his_amend_srv/RtuStatMontThd.cpp b/product/src/application/his_amend/his_amend_srv/RtuStatMontThd.cpp index 461eaf7d..d2c511d4 100644 --- a/product/src/application/his_amend/his_amend_srv/RtuStatMontThd.cpp +++ b/product/src/application/his_amend/his_amend_srv/RtuStatMontThd.cpp @@ -14,7 +14,7 @@ const std::string g_cache_tmp_path = g_curdir + "../../data/cache/his_amend_srv/ using namespace std; -kbd_app::CRtuStatMontThd::CRtuStatMontThd(const kbd_app::CHisAmendRdbUtilityPtr &ptrHisAmendRdbUtility): +iot_app::CRtuStatMontThd::CRtuStatMontThd(const iot_app::CHisAmendRdbUtilityPtr &ptrHisAmendRdbUtility): iot_public::CTimerThreadBase( "CRtuStatMontThd", CCfgParser::g_global_cfg.check_interval ), m_ptrRdbUtil(ptrHisAmendRdbUtility) { @@ -25,12 +25,12 @@ kbd_app::CRtuStatMontThd::CRtuStatMontThd(const kbd_app::CHisAmendRdbUtilityPtr } -kbd_app::CRtuStatMontThd::~CRtuStatMontThd() +iot_app::CRtuStatMontThd::~CRtuStatMontThd() { } -void kbd_app::CRtuStatMontThd::execute() +void iot_app::CRtuStatMontThd::execute() { ////测试代码 // { @@ -139,11 +139,11 @@ void kbd_app::CRtuStatMontThd::execute() } } -int kbd_app::CRtuStatMontThd::initialize() +int iot_app::CRtuStatMontThd::initialize() { if(m_ptrRdbUtil == nullptr){ LOGERROR("m_ptrHisAmendRdbUtility is nullptr"); - return kbdFailed; + return iotFailed; } m_vecRtu = m_ptrRdbUtil->getValidRtu(); LOGINFO("get valid rtu size:[%d]",(int)m_vecRtu.size()); @@ -153,10 +153,10 @@ int kbd_app::CRtuStatMontThd::initialize() if( !loadCache()) { LOGERROR("loadCache failed!");} else{ LOGINFO("cache loaded");} } - return kbdSuccess; + return iotSuccess; } -int kbd_app::CRtuStatMontThd::redundantSwitch(bool bMaster, bool bSlave) +int iot_app::CRtuStatMontThd::redundantSwitch(bool bMaster, bool bSlave) { LOGINFO( "CRtuStatMontThd接收到切换指令,bMaster=[%d],bSlave=[%d]", bMaster, bSlave ); if ( bMaster ) //< 为主 @@ -168,11 +168,11 @@ int kbd_app::CRtuStatMontThd::redundantSwitch(bool bMaster, bool bSlave) CTimerThreadBase::suspend(); } - return kbdSuccess; + return iotSuccess; } -bool kbd_app::CRtuStatMontThd::loadCache() +bool iot_app::CRtuStatMontThd::loadCache() { /** @brief 从文件中读取rtu的状态，与当前rtu进行比对，一旦有rtu信息不匹配则抛弃缓存 @@ -273,7 +273,7 @@ bool kbd_app::CRtuStatMontThd::loadCache() return true; } -bool kbd_app::CRtuStatMontThd::saveCache() +bool iot_app::CRtuStatMontThd::saveCache() { /** @brief 记录rtu的状态机，一行一个rtu记录,空格分隔 | diff --git a/product/src/application/his_amend/his_amend_srv/RtuStatMontThd.h b/product/src/application/his_amend/his_amend_srv/RtuStatMontThd.h index 07575a5e..7dd48791 100644 --- a/product/src/application/his_amend/his_amend_srv/RtuStatMontThd.h +++ b/product/src/application/his_amend/his_amend_srv/RtuStatMontThd.h @@ -10,7 +10,7 @@ #include "HisAmendRdbUtility.h" -namespace kbd_app { +namespace iot_app { class CRtuStatMontThd final : public iot_public::CTimerThreadBase { @@ -39,5 +39,5 @@ private: typedef boost::shared_ptr CRtuStatMontThdPtr; -}//namespace kbd_app end +}//namespace iot_app end #endif // RTUSTATMONTTHD_H diff --git a/product/src/application/his_amend/his_amend_srv/main.cpp b/product/src/application/his_amend/his_amend_srv/main.cpp index 1f4231ba..a98a6e65 100644 --- a/product/src/application/his_amend/his_amend_srv/main.cpp +++ b/product/src/application/his_amend/his_amend_srv/main.cpp @@ -2,7 +2,7 @@ int main(int argc, char *argv[]) { - kbd_app::CHisAmendSrvApp app; + iot_app::CHisAmendSrvApp app; int result = app.main(argc,argv); return result; } diff --git a/product/src/application/his_amend/his_amend_studio/main.cpp b/product/src/application/his_amend/his_amend_studio/main.cpp index defe69c4..5397d46a 100644 --- a/product/src/application/his_amend/his_amend_studio/main.cpp +++ b/product/src/application/his_amend/his_amend_studio/main.cpp @@ -6,7 +6,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); iot_net::initMsgBus("his_amend_studio",""); diff --git a/product/src/application/httpClient_ezjc/HTTPClient_ezjcMsgManger.cpp b/product/src/application/httpClient_ezjc/HTTPClient_ezjcMsgManger.cpp index fa9456ab..7cfc56d7 100644 --- a/product/src/application/httpClient_ezjc/HTTPClient_ezjcMsgManger.cpp +++ b/product/src/application/httpClient_ezjc/HTTPClient_ezjcMsgManger.cpp @@ -79,7 +79,7 @@ HTTPClient_ezjcMsgManger::~HTTPClient_ezjcMsgManger() int HTTPClient_ezjcMsgManger::beforeExecute() { - return kbdSuccess; + return iotSuccess; } void HTTPClient_ezjcMsgManger::execute() @@ -103,16 +103,16 @@ void HTTPClient_ezjcMsgManger::execute() if(m_pComm==nullptr) { m_pComm = new iot_net::CMbCommunicator(); - int nRet = kbdSuccess; + int nRet = iotSuccess; if( m_pComm->addSub(0,CH_SCADA_TO_HMI_DATA_CHANGE) ) { LOGINFO( "订阅通道:%d成功", CH_SCADA_TO_HMI_DATA_CHANGE ); - nRet = kbdSuccess; + nRet = iotSuccess; } else { LOGERROR( "订阅通道:%d失败", CH_SCADA_TO_HMI_DATA_CHANGE ); - nRet = kbdFailed; + nRet = iotFailed; } } } @@ -168,19 +168,19 @@ void HTTPClient_ezjcMsgManger::offCommun() void HTTPClient_ezjcMsgManger::onCommun() { - int nRet = kbdSuccess; + int nRet = iotSuccess; if(m_pComm==nullptr) { m_pComm = new iot_net::CMbCommunicator(); if( m_pComm->addSub(0,CH_SCADA_TO_HMI_DATA_CHANGE) ) { LOGINFO( "订阅通道:%d成功", CH_SCADA_TO_HMI_DATA_CHANGE ); - nRet = kbdSuccess; + nRet = iotSuccess; } else { LOGERROR( "订阅通道:%d失败", CH_SCADA_TO_HMI_DATA_CHANGE ); - nRet = kbdFailed; + nRet = iotFailed; } } if(m_pDpSub == nullptr) diff --git a/product/src/application/httpClient_ezjc/HttpClient_ezjc.cpp b/product/src/application/httpClient_ezjc/HttpClient_ezjc.cpp index 73618595..2a4269a0 100644 --- a/product/src/application/httpClient_ezjc/HttpClient_ezjc.cpp +++ b/product/src/application/httpClient_ezjc/HttpClient_ezjc.cpp @@ -31,7 +31,7 @@ bool HttpClient_ezjc::start(int argc, char *argv[], int &nStatus) } //< 获取运行参数 - if ( kbdSuccess != ptrSysInfo->getLocalRunAppInfoByName(strAppName,m_stRunAppInfo)) + if ( iotSuccess != ptrSysInfo->getLocalRunAppInfoByName(strAppName,m_stRunAppInfo)) { LOGFATAL( "getLocalRunAppInfoByName() failed !" ); return false; @@ -116,7 +116,7 @@ bool HttpClient_ezjc::start(int argc, char *argv[], int &nStatus) break; case RM_NO_PROC_MNG_MASTER: { - if ( kbdSuccess != m_ptrRedunSw->redundantSwitch( true, false )) + if ( iotSuccess != m_ptrRedunSw->redundantSwitch( true, false )) { LOGFATAL( "以主机模式启动失败！" ); return false; @@ -125,7 +125,7 @@ bool HttpClient_ezjc::start(int argc, char *argv[], int &nStatus) break; case RM_NO_PROC_MNG_SLAVE: { - if ( kbdSuccess != m_ptrRedunSw->redundantSwitch( false, true )) + if ( iotSuccess != m_ptrRedunSw->redundantSwitch( false, true )) { LOGFATAL( "以备机模式启动失败！" ); return false; @@ -201,7 +201,7 @@ bool HttpClient_ezjc::stop() int HttpClient_ezjc::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } int HttpClient_ezjc::updateProcInfo(bool bActive, bool bMaster, bool bSlave) @@ -211,7 +211,7 @@ int HttpClient_ezjc::updateProcInfo(bool bActive, bool bMaster, bool bSlave) return m_ptrProcMng->updateProcessInfo( bActive, bMaster, bSlave ); } - return kbdFailed; + return iotFailed; } bool HttpClient_ezjc::isAlreadyRunning() diff --git a/product/src/application/httpClient_ezjc/HttpClient_ezjcDataProThread.cpp b/product/src/application/httpClient_ezjc/HttpClient_ezjcDataProThread.cpp index 643c83dd..2c018a50 100644 --- a/product/src/application/httpClient_ezjc/HttpClient_ezjcDataProThread.cpp +++ b/product/src/application/httpClient_ezjc/HttpClient_ezjcDataProThread.cpp @@ -32,7 +32,7 @@ HttpClient_ezjcDataProThread::HttpClient_ezjcDataProThread(QVector de int HttpClient_ezjcDataProThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } void HttpClient_ezjcDataProThread::execute() @@ -379,24 +379,24 @@ return true; int HttpClient_ezjcDataProThread::readConfigForGenerate() { iot_public::CCommonConfigParse objCfgParse; - if(kbdSuccess != objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile("httpClient_ezjc.xml"))) + if(iotSuccess != objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile("httpClient_ezjc.xml"))) { LOGERROR("加载HTTP转发配置文件失败"); - return kbdFailed; + return iotFailed; } int nPort = -1; std::string nip = ""; - if(kbdSuccess != objCfgParse.getStringValue("HTTP_set","ip",nip) || - kbdSuccess != objCfgParse.getIntValue("HTTP_set","port",nPort)) + if(iotSuccess != objCfgParse.getStringValue("HTTP_set","ip",nip) || + iotSuccess != objCfgParse.getIntValue("HTTP_set","port",nPort)) { LOGERROR("获取端口号、IP等信息失败"); - return kbdFailed; + return iotFailed; } url="http://"+nip+":"+QString::number(nPort).toStdString(); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/httpClient_ezjc/WebSrvRedunSw.cpp b/product/src/application/httpClient_ezjc/WebSrvRedunSw.cpp index 1e6f86ac..873e8fdc 100644 --- a/product/src/application/httpClient_ezjc/WebSrvRedunSw.cpp +++ b/product/src/application/httpClient_ezjc/WebSrvRedunSw.cpp @@ -38,7 +38,7 @@ int CWebSrvRedunSw::redundantSwitch( bool bMaster, bool bSlave ) m_pParent->p_manger->resume(); } m_pParent->updateProcInfo(true, bMaster, bSlave ); - return kbdSuccess; + return iotSuccess; } } //< namespace web_server diff --git a/product/src/application/idong_srv_api/CCfgParser.cpp b/product/src/application/idong_srv_api/CCfgParser.cpp index f95ead38..96b951c1 100644 --- a/product/src/application/idong_srv_api/CCfgParser.cpp +++ b/product/src/application/idong_srv_api/CCfgParser.cpp @@ -27,19 +27,19 @@ bool CCfgParser::g_isValid=false; bool CCfgParser::loadGlobal(iot_public::CCommonConfigParse &cfg) { - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_PERM_CHECKED , g_global_cfg.is_perm_checked ) == kbdFailed){ LOGERROR( " is_perm_checked option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_DEFAULT_USER , g_global_cfg.default_user ) == kbdFailed){ LOGERROR( " default_user option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_DEFAULT_PASSWD , g_global_cfg.default_passwd ) == kbdFailed){ LOGERROR( " default_passwd option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_SERVER_ADDRESS , g_global_cfg.server_address ) == kbdFailed){ LOGERROR( " server_address option parser err"); return false;} - if( cfg.getIntValue(CN_GLOBAL, CN_SERVER_PORT , g_global_cfg.server_port ) == kbdFailed){ LOGERROR( " server_port option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_HTTPS , g_global_cfg.is_https ) == kbdFailed){ LOGERROR( " is_https option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_HEADER , g_global_cfg.is_header ) == kbdFailed){ LOGERROR( " is_header option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_TITLE , g_global_cfg.is_title ) == kbdFailed){ LOGERROR( " is_title option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_LEFTBAR , g_global_cfg.is_leftbar ) == kbdFailed){ LOGERROR( " is_leftbar option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_BUTTON , g_global_cfg.is_button ) == kbdFailed){ LOGERROR( " is_button option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_LOCAL_STATICPAGE_PATH , g_global_cfg.local_static_page_path ) == kbdFailed){ LOGERROR( " local_staticpage_path option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_ERR_PAGE , g_global_cfg.err_page ) == kbdFailed){ LOGERROR( " err_page option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_PERM_ERR_PAGE , g_global_cfg.perm_err_page ) == kbdFailed){ LOGERROR( " perm_err_page option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_PERM_CHECKED , g_global_cfg.is_perm_checked ) == iotFailed){ LOGERROR( " is_perm_checked option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_DEFAULT_USER , g_global_cfg.default_user ) == iotFailed){ LOGERROR( " default_user option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_DEFAULT_PASSWD , g_global_cfg.default_passwd ) == iotFailed){ LOGERROR( " default_passwd option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_SERVER_ADDRESS , g_global_cfg.server_address ) == iotFailed){ LOGERROR( " server_address option parser err"); return false;} + if( cfg.getIntValue(CN_GLOBAL, CN_SERVER_PORT , g_global_cfg.server_port ) == iotFailed){ LOGERROR( " server_port option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_HTTPS , g_global_cfg.is_https ) == iotFailed){ LOGERROR( " is_https option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_HEADER , g_global_cfg.is_header ) == iotFailed){ LOGERROR( " is_header option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_TITLE , g_global_cfg.is_title ) == iotFailed){ LOGERROR( " is_title option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_LEFTBAR , g_global_cfg.is_leftbar ) == iotFailed){ LOGERROR( " is_leftbar option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_BUTTON , g_global_cfg.is_button ) == iotFailed){ LOGERROR( " is_button option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_LOCAL_STATICPAGE_PATH , g_global_cfg.local_static_page_path ) == iotFailed){ LOGERROR( " local_staticpage_path option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_ERR_PAGE , g_global_cfg.err_page ) == iotFailed){ LOGERROR( " err_page option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_PERM_ERR_PAGE , g_global_cfg.perm_err_page ) == iotFailed){ LOGERROR( " perm_err_page option parser err"); return false;} return true; } @@ -52,7 +52,7 @@ bool CCfgParser::isValid() bool CCfgParser::loadCfg(const std::string &cfgPath) { iot_public::CCommonConfigParse cfgP; - if( cfgP.load(cfgPath) == kbdFailed) + if( cfgP.load(cfgPath) == iotFailed) { LOGERROR("config failed to load, please check config syntax!"); g_isValid = false; diff --git a/product/src/application/idong_task_link/main.cpp b/product/src/application/idong_task_link/main.cpp index 5d12f948..77c18a99 100644 --- a/product/src/application/idong_task_link/main.cpp +++ b/product/src/application/idong_task_link/main.cpp @@ -9,7 +9,7 @@ static const char *g_pSzProcName = "idong_task_link"; int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); iot_public::StartLogSystem(CN_AppName_PUBLIC.c_str(),g_pSzProcName); QApplication a(argc, argv); diff --git a/product/src/application/linkage_server/CActionNodeAnalysis.cpp b/product/src/application/linkage_server/CActionNodeAnalysis.cpp index 81e8733b..af8da748 100644 --- a/product/src/application/linkage_server/CActionNodeAnalysis.cpp +++ b/product/src/application/linkage_server/CActionNodeAnalysis.cpp @@ -159,13 +159,13 @@ bool CActionNodeAnalysis::ctreatePush( std::string subSystemDesc; std::string locationDesc; iot_public::SSubsystemInfo subInfo; - if( m_sysInfoPtr->getSubsystemInfoById(actionData.subSystemId,subInfo) == kbdSuccess) + if( m_sysInfoPtr->getSubsystemInfoById(actionData.subSystemId,subInfo) == iotSuccess) { subSystemDesc = subInfo.strDesc; } iot_public::SLocationInfo locationInfo; - if(m_sysInfoPtr->getLocationInfoById(actionData.locationId,locationInfo) == kbdSuccess) + if(m_sysInfoPtr->getLocationInfoById(actionData.locationId,locationInfo) == iotSuccess) { locationDesc = locationInfo.strDesc; } @@ -269,13 +269,13 @@ bool CActionNodeAnalysis::ctreateReqHead(SOptReqHead& head, bool CActionNodeAnalysis::loadConfig() { iot_public::CCommonConfigParse configParse; - if (kbdSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) + if (iotSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) { LOGERROR("加载配置文件proc_param_cfg.xml失败"); return false; } - if ((kbdSuccess != configParse.getBoolValue( + if ((iotSuccess != configParse.getBoolValue( LINKAGE_PROCESSNAME, CONFING_IS_CREATE_ALARM, m_bIsCreateAlarm))) @@ -354,7 +354,7 @@ CActionNodeAnalysis::ctreatePaQueue(std::vector& queue, int nplaytype = boost::lexical_cast (actionData.dataList.at(8)); - kbd_app::CPaServerApi::makePlayAudioCmd( + iot_app::CPaServerApi::makePlayAudioCmd( nAudioCount, nAudioId, nOperatorId, diff --git a/product/src/application/linkage_server/CCheckFuncCondition.cpp b/product/src/application/linkage_server/CCheckFuncCondition.cpp index 24e55597..193a7328 100644 --- a/product/src/application/linkage_server/CCheckFuncCondition.cpp +++ b/product/src/application/linkage_server/CCheckFuncCondition.cpp @@ -162,7 +162,7 @@ bool CCheckFuncCondition::analysisInfoOneKey(const std::string &oneStr, info.tableName = boost::trim_copy(strList.at(2)); iot_public::SSubsystemInfo subSysInfo; - if(m_sysInfoPtr->getSubsystemInfoByName(info.subSystem,subSysInfo) == kbdSuccess) + if(m_sysInfoPtr->getSubsystemInfoByName(info.subSystem,subSysInfo) == iotSuccess) { info.appId = subSysInfo.nAppId; } @@ -174,7 +174,7 @@ bool CCheckFuncCondition::analysisInfoOneKey(const std::string &oneStr, } iot_public::SLocationInfo locationInfo; - if(m_sysInfoPtr->getLocationInfoByName(info.location,locationInfo) == kbdSuccess) + if(m_sysInfoPtr->getLocationInfoByName(info.location,locationInfo) == iotSuccess) { info.domainId = locationInfo.nDomainId; } diff --git a/product/src/application/linkage_server/CLinkageServiceThread.cpp b/product/src/application/linkage_server/CLinkageServiceThread.cpp index ebe27cba..468d16ea 100644 --- a/product/src/application/linkage_server/CLinkageServiceThread.cpp +++ b/product/src/application/linkage_server/CLinkageServiceThread.cpp @@ -197,13 +197,13 @@ void CLinkageServiceThread::stopLinkByModify() bool CLinkageServiceThread::loadConfig() { iot_public::CCommonConfigParse configParse; - if (kbdSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) + if (iotSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) { LOGERROR("加载配置文件proc_param_cfg.xml失败"); return false; } - if ((kbdSuccess != configParse.getIntValue( + if ((iotSuccess != configParse.getIntValue( LINKAGE_PROCESSNAME, CONFING_TRIGGER_LINK_TIMER_TO_SEND_SECONDS, m_nTriggerLinkTimerToSendSeconds))) @@ -212,7 +212,7 @@ bool CLinkageServiceThread::loadConfig() return false; } - if ((kbdSuccess != configParse.getIntValue( + if ((iotSuccess != configParse.getIntValue( LINKAGE_PROCESSNAME, CONFING_DEFAULTUSERID, defaultUserId))) @@ -221,7 +221,7 @@ bool CLinkageServiceThread::loadConfig() return false; } - if ((kbdSuccess != configParse.getIntValue( + if ((iotSuccess != configParse.getIntValue( LINKAGE_PROCESSNAME, CONFING_DEFAULTGROUPID, defaultGroupId))) diff --git a/product/src/application/linkage_server/CMethodFailedAction.cpp b/product/src/application/linkage_server/CMethodFailedAction.cpp index d6fb4d61..e21be1ab 100644 --- a/product/src/application/linkage_server/CMethodFailedAction.cpp +++ b/product/src/application/linkage_server/CMethodFailedAction.cpp @@ -318,14 +318,14 @@ std::string CMethodFailedAction::failStrageStr(ACTION_FAILED_STRAGE type) bool CMethodFailedAction::loadConfig() { iot_public::CCommonConfigParse configParse; - if (kbdSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) + if (iotSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) { LOGERROR("加载配置文件proc_param_cfg.xml失败"); return false; } - if ((kbdSuccess != configParse.getIntValue( + if ((iotSuccess != configParse.getIntValue( LINKAGE_PROCESSNAME, CONFING_UI_TIMER_TO_SEND_SECONDS, m_nUiTimerToSendSeconds))) diff --git a/product/src/application/linkage_server/CModuleMbComm.cpp b/product/src/application/linkage_server/CModuleMbComm.cpp index 865b2ba1..60f49b9d 100644 --- a/product/src/application/linkage_server/CModuleMbComm.cpp +++ b/product/src/application/linkage_server/CModuleMbComm.cpp @@ -11,7 +11,7 @@ CModuleMbComm::CModuleMbComm( const iot_public::SRunAppInfo& appInfo) - :kbd_application::CLinkageForServerApi(appInfo.nAppId), + :iot_application::CLinkageForServerApi(appInfo.nAppId), m_objActionAnalysis(appInfo, *this), m_objHmiMsgAnalysis(appInfo), m_nDomain(appInfo.nDomainId) @@ -38,7 +38,7 @@ bool CModuleMbComm::sendStartHmiRequest(const CNodeLink& link) return false; } - if (!kbd_application::CLinkageForServerApi::linkStartRequest(*msg)) + if (!iot_application::CLinkageForServerApi::linkStartRequest(*msg)) { LOGINFO("发送半自动联动开始请求,失败, 联动[%s] 联动状态[%s]!", link.description().c_str(), @@ -78,7 +78,7 @@ bool CModuleMbComm::nodeStatusToHmi( return false; } - if (!kbd_application::CLinkageForServerApi::linkStateChange(*msg)) + if (!iot_application::CLinkageForServerApi::linkStateChange(*msg)) { LOGERROR("发送状态变化,失败,%s!", log.c_str()); return false; @@ -106,7 +106,7 @@ bool CModuleMbComm::nodeStatusToHmi(const CNodeLink& link) return false; } - if (!kbd_application::CLinkageForServerApi::linkStateChange(*msg)) + if (!iot_application::CLinkageForServerApi::linkStateChange(*msg)) { LOGERROR("发送状态变化,失败,%s!", log.c_str()); return false; @@ -136,7 +136,7 @@ bool CModuleMbComm::nodeStatusToHmi(const CNodeFunc& fuc) return false; } - if (!kbd_application::CLinkageForServerApi::linkStateChange(*msg)) + if (!iot_application::CLinkageForServerApi::linkStateChange(*msg)) { LOGERROR("发送状态变化,失败,%s!", log.c_str()); return false; @@ -168,7 +168,7 @@ bool CModuleMbComm::nodeStatusToHmi(const CNodeAction& action) return false; } - if (!kbd_application::CLinkageForServerApi::linkStateChange(*msg)) + if (!iot_application::CLinkageForServerApi::linkStateChange(*msg)) { LOGERROR("发送状态变化,失败,%s!", log.c_str()); return false; @@ -199,7 +199,7 @@ bool CModuleMbComm::nodeAbnormalEndStatusToHmi( return false; } - if (!kbd_application::CLinkageForServerApi::linkStateChange(*msg)) + if (!iot_application::CLinkageForServerApi::linkStateChange(*msg)) { LOGERROR("发送状态变化,失败,%s!", log.c_str()); return false; @@ -230,7 +230,7 @@ bool CModuleMbComm::sendUiRequest( isSendToHost = false; } - if (!kbd_application::CLinkageForServerApi:: + if (!iot_application::CLinkageForServerApi:: userInterveneRequest(*msg, isSendToHost)) { LOGERROR("向HMI 发送 人工干预请求 动作: [%s]-[%s]-[%s] 失败!", @@ -262,7 +262,7 @@ bool CModuleMbComm::linkOperateResponse( return false; } - if (!kbd_application::CLinkageForServerApi::linkOperateResponse(*responseMsg)) + if (!iot_application::CLinkageForServerApi::linkOperateResponse(*responseMsg)) { LOGERROR("向HMI 发送 操作应答失败!"); return false; diff --git a/product/src/application/linkage_server/CModuleMbComm.h b/product/src/application/linkage_server/CModuleMbComm.h index 53229f19..19bbfe2f 100644 --- a/product/src/application/linkage_server/CModuleMbComm.h +++ b/product/src/application/linkage_server/CModuleMbComm.h @@ -20,7 +20,7 @@ class CRecoverNode; using namespace iot_idl::linkage; class CModuleMbComm : - public kbd_application::CLinkageForServerApi + public iot_application::CLinkageForServerApi { public: CModuleMbComm(const iot_public::SRunAppInfo& appInfo); diff --git a/product/src/application/linkage_server/CModuleNodeMngr.cpp b/product/src/application/linkage_server/CModuleNodeMngr.cpp index 970813db..92b25329 100644 --- a/product/src/application/linkage_server/CModuleNodeMngr.cpp +++ b/product/src/application/linkage_server/CModuleNodeMngr.cpp @@ -143,7 +143,7 @@ void CModuleNodeMngr::createLinkNodeModel() while (linkDefineIter.hasNext()) { const SLinkDefineInfo& pInfo = linkDefineIter.getNext(); - if (kbdSuccess + if (iotSuccess != m_objSysinf->getLocationInfoById( pInfo.location_id, locationInfo)) @@ -201,7 +201,7 @@ void CModuleNodeMngr::createActionNodeModel(CNodeFunc& parent, const std::string if (actionInfoIter.hasNext()) { const SActionInfo& actionInfo = actionInfoIter.getNext(); - if (kbdSuccess + if (iotSuccess != m_objSysinf->getLocationInfoById( actionInfo.location_id, locationInfo)) @@ -212,7 +212,7 @@ void CModuleNodeMngr::createActionNodeModel(CNodeFunc& parent, const std::string continue; } - if (kbdSuccess + if (iotSuccess != m_objSysinf->getAppInfoBySubsystemId( actionInfo.sub_system, diff --git a/product/src/application/linkage_server/CModuleTrigger.cpp b/product/src/application/linkage_server/CModuleTrigger.cpp index bf25bd3d..9d757a00 100644 --- a/product/src/application/linkage_server/CModuleTrigger.cpp +++ b/product/src/application/linkage_server/CModuleTrigger.cpp @@ -7,14 +7,14 @@ #include "CModuleAlarmCreater.h" CModuleTrigger::CModuleTrigger(int appid) - : kbd_application::CTriggerApi(appid) + : iot_application::CTriggerApi(appid) { - kbd_application::CTriggerApi::start(); + iot_application::CTriggerApi::start(); } CModuleTrigger::~CModuleTrigger() { - kbd_application::CTriggerApi::stop(); + iot_application::CTriggerApi::stop(); clearAll(); } @@ -31,7 +31,7 @@ void CModuleTrigger::addLinkTrigger(const CNodeLink& link) void CModuleTrigger::delLinkTrigger(const CNodeLink& link) { - using namespace kbd_application; + using namespace iot_application; TriggerMap::iterator iter = m_mapTriggerParam.find(&link); if (iter != m_mapTriggerParam.end()) @@ -45,7 +45,7 @@ void CModuleTrigger::delLinkTrigger(const CNodeLink& link) void CModuleTrigger::clearAll() { - using namespace kbd_application; + using namespace iot_application; TriggerMap::iterator iter = m_mapTriggerParam.begin(); for (; iter != m_mapTriggerParam.end(); ++iter) @@ -61,7 +61,7 @@ void CModuleTrigger::clearAll() CModuleTrigger::TriggerParaType* CModuleTrigger::findParam(const CNodeLink& link) { - using namespace kbd_application; + using namespace iot_application; TriggerMap::iterator iter = m_mapTriggerParam.find(&link); if (iter != m_mapTriggerParam.end()) @@ -77,7 +77,7 @@ CModuleTrigger::createParam(const CNodeLink& link) //不触发的应该过滤掉 BOOST_ASSERT(link.getTriggerExeType() != 0); - using namespace kbd_application; + using namespace iot_application; std::string triggerName = link.getTriggerName(); CTriggerPara::TRIGGER_TYPE type = (CTriggerPara::TRIGGER_TYPE)(link.getTriggerExeType() - 1); @@ -99,7 +99,7 @@ CModuleTrigger::createParam(const CNodeLink& link) bool CModuleTrigger::isTrigged(const CNodeLink& link, uint64& triggerTime) { - kbd_application::CTriggerPara* pParam + iot_application::CTriggerPara* pParam = findParam(link); if (!pParam) @@ -107,14 +107,14 @@ bool CModuleTrigger::isTrigged(const CNodeLink& link, uint64& triggerTime) return false; } - return kbd_application::CTriggerApi::isTrigged( + return iot_application::CTriggerApi::isTrigged( pParam, triggerTime); } bool CModuleTrigger::isTrigged() { - using namespace kbd_application; + using namespace iot_application; TriggerMap::iterator iter = m_mapTriggerParam.begin(); for (; iter!=m_mapTriggerParam.end(); ++iter) @@ -176,11 +176,11 @@ void CModuleTrigger::ignoreBeforeTime( const CNodeLink& link, uint64 nTime) { - kbd_application::CTriggerPara* pParam + iot_application::CTriggerPara* pParam = findParam(link); if (pParam) { - kbd_application::CTriggerApi::ignoreBeforeTime( + iot_application::CTriggerApi::ignoreBeforeTime( pParam, nTime); } } diff --git a/product/src/application/linkage_server/CModuleTrigger.h b/product/src/application/linkage_server/CModuleTrigger.h index 470e99e6..97de8fe3 100644 --- a/product/src/application/linkage_server/CModuleTrigger.h +++ b/product/src/application/linkage_server/CModuleTrigger.h @@ -10,12 +10,12 @@ class CNodeLink; class CModuleAlarmCreater; -class CModuleTrigger : kbd_application::CTriggerApi +class CModuleTrigger : iot_application::CTriggerApi { public: - typedef kbd_application::CTriggerPara TriggerParaType; + typedef iot_application::CTriggerPara TriggerParaType; typedef std::map TriggerMap; + iot_application::CTriggerPara*> TriggerMap; CModuleTrigger(int appid); ~CModuleTrigger(); diff --git a/product/src/application/linkage_server/CRdbLinkSettingAccess.cpp b/product/src/application/linkage_server/CRdbLinkSettingAccess.cpp index 5a143b45..27163437 100644 --- a/product/src/application/linkage_server/CRdbLinkSettingAccess.cpp +++ b/product/src/application/linkage_server/CRdbLinkSettingAccess.cpp @@ -68,7 +68,7 @@ bool CRdbLinkSettingAccess::readSettingTable(int domain, std::vector< SRdbLinkageSetting >::iterator iter = vecResult.begin(); for(; iter!=vecResult.end(); ++iter) { - if (kbdSuccess + if (iotSuccess != m_objSysinf->getLocationInfoById( iter->location_id, locationInfo)) diff --git a/product/src/application/linkage_server_api/CLinkageForHmiApi.cpp b/product/src/application/linkage_server_api/CLinkageForHmiApi.cpp index 68168338..ca66335a 100644 --- a/product/src/application/linkage_server_api/CLinkageForHmiApi.cpp +++ b/product/src/application/linkage_server_api/CLinkageForHmiApi.cpp @@ -1,7 +1,7 @@ #include "application/linkage_server_api/CLinkageForHmiApi.h" #include "CLinkageForHmiApiImpl.h" -using namespace kbd_application; +using namespace iot_application; CLinkageForHmiApi::CLinkageForHmiApi(int appid) { diff --git a/product/src/application/linkage_server_api/CLinkageForHmiApiImpl.cpp b/product/src/application/linkage_server_api/CLinkageForHmiApiImpl.cpp index 0ec487c0..7a7f0e04 100644 --- a/product/src/application/linkage_server_api/CLinkageForHmiApiImpl.cpp +++ b/product/src/application/linkage_server_api/CLinkageForHmiApiImpl.cpp @@ -4,10 +4,10 @@ #include "CLinkageForHmiApiImpl.h" -using namespace kbd_application; +using namespace iot_application; using namespace iot_idl::linkage; -kbd_application::CLinkageForHmiApiImpl::CLinkageForHmiApiImpl( +iot_application::CLinkageForHmiApiImpl::CLinkageForHmiApiImpl( int appid, CLinkageForHmiApi* api) : CTimerThreadBase("CLinkageForHmiApiImpl thread", 50), diff --git a/product/src/application/linkage_server_api/CLinkageForHmiApiImpl.h b/product/src/application/linkage_server_api/CLinkageForHmiApiImpl.h index 9480d9e1..4a0e64a0 100644 --- a/product/src/application/linkage_server_api/CLinkageForHmiApiImpl.h +++ b/product/src/application/linkage_server_api/CLinkageForHmiApiImpl.h @@ -6,7 +6,7 @@ #include "net/net_msg_bus_api/CMbCommunicator.h" #include "application/linkage_server_api/CLinkageForHmiApi.h" -namespace kbd_application { +namespace iot_application { using namespace iot_idl::linkage; class CLinkageForHmiApiImpl diff --git a/product/src/application/linkage_server_api/CLinkageForServerApi.cpp b/product/src/application/linkage_server_api/CLinkageForServerApi.cpp index 06116f4d..e0018f81 100644 --- a/product/src/application/linkage_server_api/CLinkageForServerApi.cpp +++ b/product/src/application/linkage_server_api/CLinkageForServerApi.cpp @@ -2,7 +2,7 @@ #include "CLinkageForServerApiImpl.h" -using namespace kbd_application; +using namespace iot_application; using namespace iot_idl::linkage; CLinkageForServerApi::CLinkageForServerApi(int appid) diff --git a/product/src/application/linkage_server_api/CLinkageForServerApiImpl.cpp b/product/src/application/linkage_server_api/CLinkageForServerApiImpl.cpp index bf3a1d09..a047c595 100644 --- a/product/src/application/linkage_server_api/CLinkageForServerApiImpl.cpp +++ b/product/src/application/linkage_server_api/CLinkageForServerApiImpl.cpp @@ -5,7 +5,7 @@ #include "CLinkageForServerApiImpl.h" -using namespace kbd_application; +using namespace iot_application; using namespace iot_idl::linkage; CLinkageForServerApiImpl::CLinkageForServerApiImpl( diff --git a/product/src/application/linkage_server_api/CLinkageForServerApiImpl.h b/product/src/application/linkage_server_api/CLinkageForServerApiImpl.h index 47e02128..0d89d3d5 100644 --- a/product/src/application/linkage_server_api/CLinkageForServerApiImpl.h +++ b/product/src/application/linkage_server_api/CLinkageForServerApiImpl.h @@ -7,7 +7,7 @@ #include "application/linkage_server_api/CLinkageForServerApi.h" -namespace kbd_application +namespace iot_application { using namespace iot_idl::linkage; class CLinkageForServerApiImpl diff --git a/product/src/application/opc_server/opc_server/OpcMsgBusMng.cpp b/product/src/application/opc_server/opc_server/OpcMsgBusMng.cpp index 4f9a62ef..d5e1dd5c 100644 --- a/product/src/application/opc_server/opc_server/OpcMsgBusMng.cpp +++ b/product/src/application/opc_server/opc_server/OpcMsgBusMng.cpp @@ -28,7 +28,7 @@ iot_service::OpcMsgBusMng::~OpcMsgBusMng() int iot_service::OpcMsgBusMng::initialize() { - return kbdSuccess; + return iotSuccess; } int iot_service::OpcMsgBusMng::sub(int nChanNo) @@ -36,13 +36,13 @@ int iot_service::OpcMsgBusMng::sub(int nChanNo) if(!m_common.addSub(m_stRunAppInfo.nAppId,nChanNo)) { LOGERROR("通道[%d]订阅失败.",nChanNo); - return kbdFailed; + return iotFailed; } else { LOGINFO("通道[%d]订阅成功.",nChanNo); } - return kbdSuccess; + return iotSuccess; } int iot_service::OpcMsgBusMng::unsub(int nChanNo) @@ -50,14 +50,14 @@ int iot_service::OpcMsgBusMng::unsub(int nChanNo) if(!m_common.delSub(m_stRunAppInfo.nAppId,nChanNo)) { LOGERROR("取消通道[%d]订阅失败.",nChanNo); - return kbdFailed; + return iotFailed; } //清空消息总线中的数据 CMbMessage objMsg; while(m_common.recvMsg(objMsg,0)) { } - return kbdSuccess; + return iotSuccess; } bool iot_service::OpcMsgBusMng::recvMsg(iot_net::CMbMessage &objMsg, int nTimeoutMsec) diff --git a/product/src/application/opc_server/opc_server/OpcRtdbTableOperate.cpp b/product/src/application/opc_server/opc_server/OpcRtdbTableOperate.cpp index 3b482ebb..8a799307 100644 --- a/product/src/application/opc_server/opc_server/OpcRtdbTableOperate.cpp +++ b/product/src/application/opc_server/opc_server/OpcRtdbTableOperate.cpp @@ -55,39 +55,39 @@ int iot_service::OpcRtdbTableOperate::initialize() if(!m_objAnalogTable.open(m_stRunAppInfo.nAppId,CN_TN_AI.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,CN_TN_AI.c_str()); - return kbdFailed; + return iotFailed; } if(!m_objDigitalTable.open(m_stRunAppInfo.nAppId,CN_TN_DI.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,CN_TN_DI.c_str()); - return kbdFailed; + return iotFailed; } if(!m_objAccumlTable.open(m_stRunAppInfo.nAppId,CN_TN_PI.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,CN_TN_PI.c_str()); - return kbdFailed; + return iotFailed; } if(!m_objMixTable.open(m_stRunAppInfo.nAppId,CN_TN_MI.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,CN_TN_MI.c_str()); - return kbdFailed; + return iotFailed; } if(!m_objGroupTable.open(CN_AppId_BASE,CN_TN_GROUP.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",CN_AppId_BASE,CN_TN_GROUP.c_str()); - return kbdFailed; + return iotFailed; } if(!m_objOpcVersionTable.open(m_stRunAppInfo.nAppId,CN_TN_OPC_CONFIG_VERSION.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,CN_TN_OPC_CONFIG_VERSION.c_str()); - return kbdFailed; + return iotFailed; } if(!m_objOpcInfoTable.open(m_stRunAppInfo.nAppId,CN_TN_OPC_CONFIG_DEFINE.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,CN_TN_OPC_CONFIG_DEFINE.c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int OpcRtdbTableOperate::getAi(std::vector &aiInfoVec) @@ -97,14 +97,14 @@ int OpcRtdbTableOperate::getAi(std::vector &aiInfoVec) CTableLockGuard tableLock(m_objAnalogTable);//加锁 if (m_objAnalogTable.getRecordCount() <= 0) { - return kbdSuccess; + return iotSuccess; } if(m_objAnalogTable.selectNoCondition(aiInfoVec,vecColumn)) { - return kbdSuccess; + return iotSuccess; }else { LOGERROR("获取内存表[%s]记录失败.Error=[%s]",CN_TN_AI.c_str()); - return kbdFailed; + return iotFailed; } } @@ -115,14 +115,14 @@ int OpcRtdbTableOperate::getDi(std::vector &diInfoVec) CTableLockGuard tableLock(m_objDigitalTable);//加锁 if (m_objDigitalTable.getRecordCount() <= 0) { - return kbdSuccess; + return iotSuccess; } if(m_objDigitalTable.selectNoCondition(diInfoVec,vecColumn)) { - return kbdSuccess; + return iotSuccess; }else { LOGERROR("获取内存表[%s]记录失败.Error=[%s]",CN_TN_DI.c_str()); - return kbdFailed; + return iotFailed; } } @@ -133,15 +133,15 @@ int OpcRtdbTableOperate::getPi(std::vector &piInfoVec) CTableLockGuard tableLock(m_objAccumlTable);//加锁 if (m_objAccumlTable.getRecordCount() <= 0) { - return kbdSuccess; + return iotSuccess; } if(m_objAccumlTable.selectNoCondition(piInfoVec,vecColumn)) { - return kbdSuccess; + return iotSuccess; }else { LOGERROR("获取内存表[%s]记录失败.Error=[%s]",CN_TN_PI.c_str()); - return kbdFailed; + return iotFailed; } } @@ -153,15 +153,15 @@ int OpcRtdbTableOperate::getMi(std::vector &miInfoVec) if (m_objMixTable.getRecordCount() <= 0) { - return kbdSuccess; + return iotSuccess; } if(m_objMixTable.selectNoCondition(miInfoVec,vecColumn)) { - return kbdSuccess; + return iotSuccess; }else { LOGERROR("获取内存表[%s]记录失败.Error=[%s]",CN_TN_MI.c_str()); - return kbdFailed; + return iotFailed; } } @@ -184,7 +184,7 @@ int OpcRtdbTableOperate::getAiByKey(std::vector &infoVec,cons LOGERROR("获取内存表[%s],key:[%s]记录失败.Error=[%s]",CN_TN_AI.c_str(),keyVec.at(index).c_str()); } } - return kbdSuccess; + return iotSuccess; } int OpcRtdbTableOperate::getDiByKey(std::vector &infoVec, const vector &keyVec) @@ -206,7 +206,7 @@ int OpcRtdbTableOperate::getDiByKey(std::vector &infoVec, con LOGERROR("获取内存表[%s],key:[%s]记录失败.Error=[%s]",CN_TN_DI.c_str(),keyVec.at(index).c_str()); } } - return kbdSuccess; + return iotSuccess; } int OpcRtdbTableOperate::getPiByKey(std::vector &infoVec, const vector &keyVec) @@ -228,7 +228,7 @@ int OpcRtdbTableOperate::getPiByKey(std::vector &infoVec, con LOGERROR("获取内存表[%s],key:[%s]记录失败.Error=[%s]",CN_TN_PI.c_str(),keyVec.at(index).c_str()); } } - return kbdSuccess; + return iotSuccess; } int OpcRtdbTableOperate::getMiByKey(std::vector &infoVec, const vector &keyVec) @@ -250,7 +250,7 @@ int OpcRtdbTableOperate::getMiByKey(std::vector &infoVec, con LOGERROR("获取内存表[%s],key:[%s]记录失败.Error=[%s]",CN_TN_MI.c_str(),keyVec.at(index).c_str()); } } - return kbdSuccess; + return iotSuccess; } int OpcRtdbTableOperate::getGroup(std::vector &groupInfoVec) @@ -260,14 +260,14 @@ int OpcRtdbTableOperate::getGroup(std::vector &groupInfoVec) CTableLockGuard tableLock(m_objGroupTable);//加锁 if (m_objGroupTable.getRecordCount() <= 0) { - return kbdSuccess; + return iotSuccess; } if(m_objGroupTable.selectNoCondition(groupInfoVec,vecColumn)) { - return kbdSuccess; + return iotSuccess; }else { LOGERROR("获取内存表[%s]记录失败.Error=[%s]",CN_TN_GROUP.c_str()); - return kbdFailed; + return iotFailed; } } @@ -297,11 +297,11 @@ int OpcRtdbTableOperate::getOptPoint(std::vector &opcInfo CTableLockGuard tableLock(m_objOpcInfoTable); //< 加锁保护表 if (m_objOpcInfoTable.selectJustAll(opcInfoVec)) { - return kbdSuccess; + return iotSuccess; } else { LOGERROR("获取内存表[%s]记录失败.Error=[%s]", CN_TN_OPC_CONFIG_DEFINE.c_str()); - return kbdFailed; + return iotFailed; } } diff --git a/product/src/application/opc_server/opc_server/OpcRtdbTableOperate.h b/product/src/application/opc_server/opc_server/OpcRtdbTableOperate.h index be89a2a5..1a99b66b 100644 --- a/product/src/application/opc_server/opc_server/OpcRtdbTableOperate.h +++ b/product/src/application/opc_server/opc_server/OpcRtdbTableOperate.h @@ -18,7 +18,7 @@ public: virtual ~OpcRtdbTableOperate(); /** * @brief initialize 初始化 - * @return 成功返回kbdSuccess，失败返回失败码 + * @return 成功返回iotSuccess，失败返回失败码 */ int initialize(); int getAi(std::vector &aiInfoVec); diff --git a/product/src/application/opc_server/opc_server/OpcServerApp.cpp b/product/src/application/opc_server/opc_server/OpcServerApp.cpp index 9ba76ff1..e11a35f8 100644 --- a/product/src/application/opc_server/opc_server/OpcServerApp.cpp +++ b/product/src/application/opc_server/opc_server/OpcServerApp.cpp @@ -78,13 +78,13 @@ bool iot_service::OpcServerApp::start(int argc, char *argv[], int &/*nStatus*/) return false; } //8.设置冗余通知回调 - if(kbdSuccess != m_ptrRedundancyMng->setCallback(m_ptrOpcSrvMng)) + if(iotSuccess != m_ptrRedundancyMng->setCallback(m_ptrOpcSrvMng)) { LOGERROR("设置冗余回调接口失败"); return false; } //9.更新当前进程冗余状态 - if(kbdSuccess != m_ptrProcMng->updateProcessInfo(true,false,false)) + if(iotSuccess != m_ptrProcMng->updateProcessInfo(true,false,false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -127,7 +127,7 @@ int iot_service::OpcServerApp::toQuit() m_ptrProcMng->unsetCallback(); } shutdown(); - return kbdSuccess; + return iotSuccess; } bool iot_service::OpcServerApp::parseCmdLine(int argc, char *argv[]) @@ -213,7 +213,7 @@ bool iot_service::OpcServerApp::getSystemInfo() LOGERROR("创建系统信息访问库失败"); return false; } - if(kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) + if(iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -236,7 +236,7 @@ bool iot_service::OpcServerApp::registToProcMng() LOGERROR("创建进程管理访问库失败"); return false; } - if(kbdSuccess != m_ptrProcMng->setCallback(this)) + if(iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -251,7 +251,7 @@ bool iot_service::OpcServerApp::initialize() if(!initMsgBus(CN_ProcName_OpcServer.c_str(),strUniqueName.c_str())) { LOGERROR("初始化消息总线失败"); - return kbdFailed; + return iotFailed; } //创建opc服务管理类 m_ptrOpcSrvMng = boost::make_shared(m_stRunAppInfo,m_ptrProcMng); @@ -260,7 +260,7 @@ bool iot_service::OpcServerApp::initialize() LOGERROR("创建opc服务管理类失败"); return false; } - if(kbdSuccess != m_ptrOpcSrvMng->initialize()) + if(iotSuccess != m_ptrOpcSrvMng->initialize()) { LOGERROR("初始化opc服务管理类失败"); return false; diff --git a/product/src/application/opc_server/opc_server/OpcServerMng.cpp b/product/src/application/opc_server/opc_server/OpcServerMng.cpp index 13db4e4c..a357e676 100644 --- a/product/src/application/opc_server/opc_server/OpcServerMng.cpp +++ b/product/src/application/opc_server/opc_server/OpcServerMng.cpp @@ -45,7 +45,7 @@ int iot_service::OpcServerMng::redundantSwitch(bool bMaster, bool bSlave) m_ptrProcMng->updateProcessInfo(true,bMaster,bSlave); - return kbdSuccess; + return iotSuccess; } int iot_service::OpcServerMng::initialize() @@ -54,27 +54,27 @@ int iot_service::OpcServerMng::initialize() if(m_ptrOpcServerThread == NULL) { LOGERROR("创建opc线程失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrOpcServerThread->initialize()) + if(iotSuccess != m_ptrOpcServerThread->initialize()) { LOGERROR("初始化opc线程失败"); - return kbdFailed; + return iotFailed; } m_ptrOpcToolsThread = boost::make_shared(m_stRunAppInfo,m_ptrOpcServerThread); if(m_ptrOpcToolsThread == NULL) { LOGERROR("创建消息交互线程失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrOpcToolsThread->initialize()) + if(iotSuccess != m_ptrOpcToolsThread->initialize()) { LOGERROR("初始化消息交互线程失败"); - return kbdFailed; + return iotFailed; } m_ptrOpcServerThread->setMaster(); m_ptrOpcServerThread->resume(); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/opc_server/opc_server/OpcServerMng.h b/product/src/application/opc_server/opc_server/OpcServerMng.h index 75a2d709..e0ff4ae6 100644 --- a/product/src/application/opc_server/opc_server/OpcServerMng.h +++ b/product/src/application/opc_server/opc_server/OpcServerMng.h @@ -24,12 +24,12 @@ public: * @brief redundantSwitch 冗余切换，应用需要继承并重写，实现自身的冗余切换逻辑,在进程切换过程中，可能会被调用多次切换，业务进程需要保证幂等，无副作用 * @param bMaster 是否为主 * @param bSlave 是否为备 - * @return 成功返回kbdSuccess,失败返回错误码 + * @return 成功返回iotSuccess,失败返回错误码 */ virtual int redundantSwitch(bool bMaster, bool bSlave); /** * @brief initialize 初始化 - * @return 成功返回kbdSuccess,失败返回错误码 + * @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); private: diff --git a/product/src/application/opc_server/opc_server/OpcServerThread.cpp b/product/src/application/opc_server/opc_server/OpcServerThread.cpp index 50fffc5f..4315c347 100644 --- a/product/src/application/opc_server/opc_server/OpcServerThread.cpp +++ b/product/src/application/opc_server/opc_server/OpcServerThread.cpp @@ -53,29 +53,29 @@ int iot_service::OpcServerThread::initialize() if (m_ptrOpcTableOpt == NULL) { LOGERROR("创建内存表操作失败"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrOpcTableOpt->initialize()) + if (iotSuccess != m_ptrOpcTableOpt->initialize()) { LOGERROR("内存表初始化失败"); - return kbdFailed; + return iotFailed; } //2.data_process_api 实例 m_ptrDataProcApi = getDataProcInstance(m_stRunAppInfo.strAppName); if (m_ptrDataProcApi == NULL) { LOGERROR("CMainWorkThread::init(), getDataProcInstance error"); - return kbdFailed; + return iotFailed; } if (m_ptrDataProcApi->initialize() < 0) { LOGERROR("CMainWorkThread::init(), data_process_api initialize() error"); - return kbdFailed; + return iotFailed; } if (m_ptrDataProcApi->getMenuMacToValMap("数字量状态", m_mapDiState) < 0) { - return kbdFailed; + return iotFailed; } MENU_STATE_DI_INVALID = m_mapDiState["MENU_STATE_DI_INVALID"]; m_nMenuStateDiSetData = m_mapDiState["MENU_STATE_DI_SET_DATA"]; @@ -83,7 +83,7 @@ int iot_service::OpcServerThread::initialize() MENU_STATE_DI_NORMAL = m_mapDiState["MENU_STATE_DI_NORMAL"]; if (m_ptrDataProcApi->getMenuMacToValMap("模拟量状态", m_mapAiState) < 0) { - return kbdFailed; + return iotFailed; } MENU_STATE_AI_INVALID = m_mapAiState["MENU_STATE_AI_INVALID"]; m_nMenuStateAiSetData = m_mapAiState["MENU_STATE_AI_SET_DATA"]; @@ -94,13 +94,13 @@ int iot_service::OpcServerThread::initialize() if (!m_opt.regServer(m_stRunAppInfo.strAppName,m_stRunAppInfo.nAppId)) { LOGERROR("opc注册失败"); - return kbdFailed; + return iotFailed; }else { LOGINFO("opc注册成功"); } - return kbdSuccess; + return iotSuccess; } int OpcServerThread::beforeExecute() @@ -115,19 +115,19 @@ int OpcServerThread::beforeExecute() readRtdbData(); //初始化opc服务器 initOpcServer(); - return kbdSuccess; + return iotSuccess; } int iot_service::OpcServerThread::setMaster() { - return kbdSuccess; + return iotSuccess; } int iot_service::OpcServerThread::setSlave() { - return kbdSuccess; + return iotSuccess; } void iot_service::OpcServerThread::execute() @@ -208,16 +208,16 @@ bool iot_service::OpcServerThread::initOpcServer() int OpcServerThread::loadTimeConfig() { CCommonConfigParse configParse; - if (kbdSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile(CN_Config_Opc))) + if (iotSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile(CN_Config_Opc))) { LOGERROR("加载配置文件:%s失败", CN_Config_Opc.c_str()); - return kbdFailed; + return iotFailed; }else { configParse.getIntValue("opcConfig","AiPeriod",m_nAiPeriod); configParse.getIntValue("opcConfig","PiPeriod",m_nPiPeriod); configParse.getIntValue("opcConfig","MiPeriod",m_nMiPeriod); - return kbdSuccess; + return iotSuccess; } } @@ -225,10 +225,10 @@ int OpcServerThread::loadVersion() { if(m_ptrOpcTableOpt->getOpcVersion(m_stRunAppInfo.nDomainId,m_stRunAppInfo.nAppId,m_nVersion)) { - return kbdSuccess; + return iotSuccess; }else { - return kbdFailed; + return iotFailed; } } @@ -237,17 +237,17 @@ int OpcServerThread::loadOpcData() vector opcInfoVec; readOpcPoint(opcInfoVec); addToCache(opcInfoVec); - return kbdSuccess; + return iotSuccess; } int OpcServerThread::readOpcPoint(vector& opcInfoVec) { - if(kbdSuccess != m_ptrOpcTableOpt->getOptPoint(opcInfoVec)) + if(iotSuccess != m_ptrOpcTableOpt->getOptPoint(opcInfoVec)) { - return kbdFailed; + return iotFailed; }else { - return kbdSuccess; + return iotSuccess; } } @@ -317,7 +317,7 @@ int OpcServerThread::addToCache(vector &opcInfoVec) } it++; } - return kbdSuccess; + return iotSuccess; } int OpcServerThread::readRtdbData() @@ -326,7 +326,7 @@ int OpcServerThread::readRtdbData() readDiData(); readPiData(); readMiData(); - return kbdSuccess; + return iotSuccess; } void OpcServerThread::readAiData() @@ -411,7 +411,7 @@ void OpcServerThread::readAndUpdateAi(vector &keyVec) vector infoVec; infoVec.clear(); - if (kbdSuccess != m_ptrOpcTableOpt->getAiByKey(infoVec,keyVec)) + if (iotSuccess != m_ptrOpcTableOpt->getAiByKey(infoVec,keyVec)) { return ; } @@ -441,7 +441,7 @@ void OpcServerThread::readAndUpdateDi(vector &keyVec) vector infoVec; infoVec.clear(); - if (kbdSuccess != m_ptrOpcTableOpt->getDiByKey(infoVec,keyVec)) + if (iotSuccess != m_ptrOpcTableOpt->getDiByKey(infoVec,keyVec)) { return ; } @@ -472,7 +472,7 @@ void OpcServerThread::readAndUpdatePi(vector &keyVec) vector infoVec; infoVec.clear(); - if (kbdSuccess != m_ptrOpcTableOpt->getPiByKey(infoVec,keyVec)) + if (iotSuccess != m_ptrOpcTableOpt->getPiByKey(infoVec,keyVec)) { return ; } @@ -503,7 +503,7 @@ void OpcServerThread::readAndUpdateMi(vector &keyVec) vector infoVec; infoVec.clear(); - if (kbdSuccess != m_ptrOpcTableOpt->getMiByKey(infoVec,keyVec)) + if (iotSuccess != m_ptrOpcTableOpt->getMiByKey(infoVec,keyVec)) { return ; } @@ -812,7 +812,7 @@ CacheInfoPtr OpcServerThread::updateData( break; } - if (checkStatus(status,type) != kbdSuccess) + if (checkStatus(status,type) != iotSuccess) { tvState.tsQuality = OPC_QUALITY_BAD; ptr->nStatus = 1; @@ -836,22 +836,22 @@ int OpcServerThread::checkStatus(const int status, const int table) { if(((status>>MENU_STATE_DI_INVALID) & 0X01 )>0) { - return kbdFailed; + return iotFailed; } else { - return kbdSuccess; + return iotSuccess; } } else { if(((status>>MENU_STATE_AI_INVALID) & 0X01 )>0) { - return kbdFailed; + return iotFailed; } else { - return kbdSuccess; + return iotSuccess; } } } diff --git a/product/src/application/opc_server/opc_server/OpcServerThread.h b/product/src/application/opc_server/opc_server/OpcServerThread.h index abf09efb..d1ab86b0 100644 --- a/product/src/application/opc_server/opc_server/OpcServerThread.h +++ b/product/src/application/opc_server/opc_server/OpcServerThread.h @@ -32,7 +32,7 @@ public: virtual ~OpcServerThread(); /** * @brief initialize 初始化 - * @return 成功返回kbdSuccess,失败返回失败码 + * @return 成功返回iotSuccess,失败返回失败码 */ int initialize(); diff --git a/product/src/application/opc_server/opc_server/OpcToolsThread.cpp b/product/src/application/opc_server/opc_server/OpcToolsThread.cpp index d90f2c73..3b2ce1a4 100644 --- a/product/src/application/opc_server/opc_server/OpcToolsThread.cpp +++ b/product/src/application/opc_server/opc_server/OpcToolsThread.cpp @@ -39,26 +39,26 @@ int iot_service::OpcToolsThread::initialize() if(m_ptrMsgbusMng == NULL) { LOGERROR("创建消息总线管理类失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrMsgbusMng->initialize()) + if(iotSuccess != m_ptrMsgbusMng->initialize()) { LOGERROR("初始化消息总线管理类失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::OpcToolsThread::setMaster() { m_ptrMsgbusMng->sub(CH_OPCTOOLS_TO_OPC_REQUEST); - return kbdSuccess; + return iotSuccess; } int iot_service::OpcToolsThread::setSlave() { m_ptrMsgbusMng->unsub(CH_OPCTOOLS_TO_OPC_REQUEST); - return kbdSuccess; + return iotSuccess; } void iot_service::OpcToolsThread::execute() diff --git a/product/src/application/opc_server/opc_server/OpcToolsThread.h b/product/src/application/opc_server/opc_server/OpcToolsThread.h index 50e3b240..e65813ee 100644 --- a/product/src/application/opc_server/opc_server/OpcToolsThread.h +++ b/product/src/application/opc_server/opc_server/OpcToolsThread.h @@ -22,7 +22,7 @@ public: virtual ~OpcToolsThread(); /** * @brief initialize 初始化 - * @return 成功返回kbdSuccess,失败返回失败码 + * @return 成功返回iotSuccess,失败返回失败码 */ int initialize(); /** diff --git a/product/src/application/qtts_kbd_iflytek/QTtsEngineIflytek.cpp b/product/src/application/qtts_kbd_iflytek/QTtsEngineIflytek.cpp index 96db7bbf..b5f5fc56 100644 --- a/product/src/application/qtts_kbd_iflytek/QTtsEngineIflytek.cpp +++ b/product/src/application/qtts_kbd_iflytek/QTtsEngineIflytek.cpp @@ -9,7 +9,7 @@ #include "QTtsEngineIflytek.h" -namespace kbd_application +namespace iot_application { QTtsEngineIflytek::QTtsEngineIflytek( const QVariantMap &mapPara, QObject *pParent ) : @@ -193,4 +193,4 @@ void QTtsEngineIflytek::onNotSpeaking( int nStatusCode ) } } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/qtts_kbd_iflytek/QTtsEngineIflytek.h b/product/src/application/qtts_kbd_iflytek/QTtsEngineIflytek.h index f7e40716..dcf9c87c 100644 --- a/product/src/application/qtts_kbd_iflytek/QTtsEngineIflytek.h +++ b/product/src/application/qtts_kbd_iflytek/QTtsEngineIflytek.h @@ -18,7 +18,7 @@ #include "QTtsProcessorIflytek.h" -namespace kbd_application +namespace iot_application { class QTtsEngineIflytek : public QTextToSpeechEngine @@ -64,4 +64,4 @@ private: QMultiMap m_mapVoices; }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/qtts_kbd_iflytek/QTtsPluginIflytek.cpp b/product/src/application/qtts_kbd_iflytek/QTtsPluginIflytek.cpp index 6524d68d..767caddf 100644 --- a/product/src/application/qtts_kbd_iflytek/QTtsPluginIflytek.cpp +++ b/product/src/application/qtts_kbd_iflytek/QTtsPluginIflytek.cpp @@ -10,7 +10,7 @@ #include "QTtsPluginIflytek.h" #include "QTtsEngineIflytek.h" -namespace kbd_application +namespace iot_application { QTextToSpeechEngine *QTtsPluginIflytek::createTextToSpeechEngine( @@ -25,4 +25,4 @@ QTextToSpeechEngine *QTtsPluginIflytek::createTextToSpeechEngine( return nullptr; } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/qtts_kbd_iflytek/QTtsPluginIflytek.h b/product/src/application/qtts_kbd_iflytek/QTtsPluginIflytek.h index a0c7e2d6..ba65cf99 100644 --- a/product/src/application/qtts_kbd_iflytek/QTtsPluginIflytek.h +++ b/product/src/application/qtts_kbd_iflytek/QTtsPluginIflytek.h @@ -15,7 +15,7 @@ #include "qtexttospeechplugin.h" #include "qtexttospeechengine.h" -namespace kbd_application +namespace iot_application { class QTtsPluginIflytek : public QObject, public QTextToSpeechPlugin @@ -30,4 +30,4 @@ public: QObject *pParent, QString *pStrError ) const override; }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/qtts_kbd_iflytek/QTtsProcessor.cpp b/product/src/application/qtts_kbd_iflytek/QTtsProcessor.cpp index efc87b80..66d74997 100644 --- a/product/src/application/qtts_kbd_iflytek/QTtsProcessor.cpp +++ b/product/src/application/qtts_kbd_iflytek/QTtsProcessor.cpp @@ -12,7 +12,7 @@ #include "QTtsProcessor.h" -namespace kbd_application +namespace iot_application { QTtsProcessor::QTtsProcessor() : @@ -275,4 +275,4 @@ void QTtsProcessor::audioStop( bool bAbort ) } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/qtts_kbd_iflytek/QTtsProcessor.h b/product/src/application/qtts_kbd_iflytek/QTtsProcessor.h index 711a262f..a7d955a7 100644 --- a/product/src/application/qtts_kbd_iflytek/QTtsProcessor.h +++ b/product/src/application/qtts_kbd_iflytek/QTtsProcessor.h @@ -19,7 +19,7 @@ #include "qvoice.h" -namespace kbd_application +namespace iot_application { class QTtsProcessor : public QThread @@ -92,4 +92,4 @@ private: QIODevice *m_pAudioBuffer; }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/qtts_kbd_iflytek/QTtsProcessorIflytek.cpp b/product/src/application/qtts_kbd_iflytek/QTtsProcessorIflytek.cpp index 6780f5d3..fef0894f 100644 --- a/product/src/application/qtts_kbd_iflytek/QTtsProcessorIflytek.cpp +++ b/product/src/application/qtts_kbd_iflytek/QTtsProcessorIflytek.cpp @@ -35,7 +35,7 @@ #endif -namespace kbd_application +namespace iot_application { QWeakPointer QTtsProcessorIflytek::m_ptrInstance; @@ -295,4 +295,4 @@ void QTtsProcessorIflytek::deinit() m_vecVoices.clear(); } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/qtts_kbd_iflytek/QTtsProcessorIflytek.h b/product/src/application/qtts_kbd_iflytek/QTtsProcessorIflytek.h index c87b6b48..944d6ea5 100644 --- a/product/src/application/qtts_kbd_iflytek/QTtsProcessorIflytek.h +++ b/product/src/application/qtts_kbd_iflytek/QTtsProcessorIflytek.h @@ -19,7 +19,7 @@ #include "QTtsProcessor.h" -namespace kbd_application +namespace iot_application { class QTtsProcessorIflytek : public QTtsProcessor @@ -50,4 +50,4 @@ private: QVector m_vecSessParas; }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/qtts_kbd_iflytek/RegFunc.cpp b/product/src/application/qtts_kbd_iflytek/RegFunc.cpp index 76268d81..a6924cf0 100644 --- a/product/src/application/qtts_kbd_iflytek/RegFunc.cpp +++ b/product/src/application/qtts_kbd_iflytek/RegFunc.cpp @@ -19,7 +19,7 @@ #include "RegFunc.h" -namespace kbd_application +namespace iot_application { //< 注意：私钥不能写在发布出去的代码中，不排除通过分析编译后的二进制文件可以获得 @@ -345,4 +345,4 @@ bool checkRegistration( const QString &strAppDirPath, QString &strAppId ) return true; } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/qtts_kbd_iflytek/RegFunc.h b/product/src/application/qtts_kbd_iflytek/RegFunc.h index bb4986db..bc5729ff 100644 --- a/product/src/application/qtts_kbd_iflytek/RegFunc.h +++ b/product/src/application/qtts_kbd_iflytek/RegFunc.h @@ -11,7 +11,7 @@ #include -namespace kbd_application +namespace iot_application { /********************************************************************************** @@ -24,4 +24,4 @@ namespace kbd_application **********************************************************************************/ bool checkRegistration( const QString &strAppDirPath, QString &strAppId ); -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/application/sequence_server/CActionNodeAnalysis.cpp b/product/src/application/sequence_server/CActionNodeAnalysis.cpp index 6d16ed85..d91f2b5f 100644 --- a/product/src/application/sequence_server/CActionNodeAnalysis.cpp +++ b/product/src/application/sequence_server/CActionNodeAnalysis.cpp @@ -86,13 +86,13 @@ void CActionNodeAnalysis::ctreateReqQueue( bool CActionNodeAnalysis::loadConfig() { iot_public::CCommonConfigParse configParse; - if (kbdSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) + if (iotSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) { LOGERROR("加载配置文件proc_param_cfg.xml失败"); return false; } - if ((kbdSuccess != configParse.getBoolValue( + if ((iotSuccess != configParse.getBoolValue( SEQUENCE_PROCESSNAME, CONFING_IS_CREATE_ALARM, m_bIsCreateAlarm))) diff --git a/product/src/application/sequence_server/CMbCommunicateInfo.cpp b/product/src/application/sequence_server/CMbCommunicateInfo.cpp index 75caf239..3ba7d72f 100644 --- a/product/src/application/sequence_server/CMbCommunicateInfo.cpp +++ b/product/src/application/sequence_server/CMbCommunicateInfo.cpp @@ -9,7 +9,7 @@ CMbCommunicateInfo::CMbCommunicateInfo( const iot_public::SRunAppInfo& appInfo) - :kbd_application::CSeqForServerApi(appInfo.nAppId), + :iot_application::CSeqForServerApi(appInfo.nAppId), m_objActionAnalysis(appInfo), m_objHmiMsgAnalysis(appInfo), m_nDomain(appInfo.nDomainId) @@ -28,7 +28,7 @@ bool CMbCommunicateInfo::sendActionToOpt(const CNodeAction& action) SOptCtrlRequest request; m_objActionAnalysis.ctreateSendMsg(request, action); - if (!kbd_application::CSeqForServerApi::optCtrlRequest(request)) + if (!iot_application::CSeqForServerApi::optCtrlRequest(request)) { LOGERROR("发送OPT动作执行消息,失败!"); return false; @@ -52,7 +52,7 @@ bool CMbCommunicateInfo::nodeStatusToHmi(const CNodeSeq& seq) StatusChangeMessage msg = m_objHmiMsgAnalysis.ctreateStatusChangeMessage(seq); - if (!kbd_application::CSeqForServerApi::seqStateChange(msg)) + if (!iot_application::CSeqForServerApi::seqStateChange(msg)) { LOGERROR("发送状态变化,失败,%s!", log.c_str()); return false; @@ -78,7 +78,7 @@ bool CMbCommunicateInfo::nodeStatusToHmi(const CNodeFunc& func) StatusChangeMessage msg = m_objHmiMsgAnalysis.ctreateStatusChangeMessage(func); - if (!kbd_application::CSeqForServerApi::seqStateChange(msg)) + if (!iot_application::CSeqForServerApi::seqStateChange(msg)) { LOGERROR("发送状态变化,失败,%s!", log.c_str()); return false; @@ -106,7 +106,7 @@ bool CMbCommunicateInfo::nodeStatusToHmi(const CNodeAction& action) StatusChangeMessage msg = m_objHmiMsgAnalysis.ctreateStatusChangeMessage(action); - if (!kbd_application::CSeqForServerApi::seqStateChange(msg)) + if (!iot_application::CSeqForServerApi::seqStateChange(msg)) { LOGERROR("发送状态变化,失败,%s!", log.c_str()); return false; @@ -138,7 +138,7 @@ bool CMbCommunicateInfo::nodeStatusToHmi( action, erroInfo); - if (!kbd_application::CSeqForServerApi::seqStateChange(msg)) + if (!iot_application::CSeqForServerApi::seqStateChange(msg)) { LOGERROR("发送状态变化,失败,%s!", log.c_str()); return false; @@ -164,7 +164,7 @@ bool CMbCommunicateInfo::nodeAbnormalEndStatusToHmi( StatusChangeMessage msg = m_objHmiMsgAnalysis.ctreateFailedStatusChangeMessage(seq, erroInfo); - if (!kbd_application::CSeqForServerApi::seqStateChange(msg)) + if (!iot_application::CSeqForServerApi::seqStateChange(msg)) { LOGERROR("发送状态变化,失败,%s!", log.c_str()); return false; @@ -182,7 +182,7 @@ bool CMbCommunicateInfo::sendUiRequest( = m_objHmiMsgAnalysis.ctreateUiRequestMessage( action, erroInfo); - if (!kbd_application::CSeqForServerApi::userInterveneRequest(msg)) + if (!iot_application::CSeqForServerApi::userInterveneRequest(msg)) { LOGERROR("向HMI 发送 人工干预请求 动作: [%s]-[%s]-[%s] 失败!", action.getNodeSeq().description().c_str(), @@ -208,7 +208,7 @@ bool CMbCommunicateInfo::seqOperateResponse( = m_objHmiMsgAnalysis.ctreateSeqOperateResponseMessage( pMsg, seq, erroInfo); - if (!kbd_application::CSeqForServerApi::seqOperateResponse(responseMsg)) + if (!iot_application::CSeqForServerApi::seqOperateResponse(responseMsg)) { LOGERROR("向HMI 发送 操作应答失败!"); return false; diff --git a/product/src/application/sequence_server/CMbCommunicateInfo.h b/product/src/application/sequence_server/CMbCommunicateInfo.h index c0a0f968..7665315a 100644 --- a/product/src/application/sequence_server/CMbCommunicateInfo.h +++ b/product/src/application/sequence_server/CMbCommunicateInfo.h @@ -20,7 +20,7 @@ class CRecoverNode; using namespace iot_idl::sequence; class CMbCommunicateInfo : - public kbd_application::CSeqForServerApi + public iot_application::CSeqForServerApi { public: CMbCommunicateInfo(const iot_public::SRunAppInfo& appInfo); diff --git a/product/src/application/sequence_server/CMethodFailedAction.cpp b/product/src/application/sequence_server/CMethodFailedAction.cpp index e96715ed..38820494 100644 --- a/product/src/application/sequence_server/CMethodFailedAction.cpp +++ b/product/src/application/sequence_server/CMethodFailedAction.cpp @@ -312,14 +312,14 @@ std::string CMethodFailedAction::failStrageStr(ACTION_FAILED_STRAGE type) bool CMethodFailedAction::loadConfig() { iot_public::CCommonConfigParse configParse; - if (kbdSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) + if (iotSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) { LOGERROR("加载配置文件proc_param_cfg.xml失败"); return false; } - if ((kbdSuccess != configParse.getIntValue( + if ((iotSuccess != configParse.getIntValue( SEQUENCE_PROCESSNAME, CONFING_UI_TIMER_TO_SEND_SECONDS, m_nUiTimerToSendSeconds))) diff --git a/product/src/application/sequence_server/CModuleNodeMngr.cpp b/product/src/application/sequence_server/CModuleNodeMngr.cpp index 2def741c..19241abd 100644 --- a/product/src/application/sequence_server/CModuleNodeMngr.cpp +++ b/product/src/application/sequence_server/CModuleNodeMngr.cpp @@ -106,7 +106,7 @@ void CModuleNodeMngr::createSeqNodeModel() { const SSeqDefineInfo* pInfo = seqDefineIter.getNext(); - if (kbdSuccess + if (iotSuccess != m_ptrSysInfoInterface->getLocationInfoById( pInfo->location_id, locationInfo)) @@ -157,7 +157,7 @@ void CModuleNodeMngr::createActionNodeModel(CNodeFunc* pParent, const std::strin if (actionInfoIter.hasNext()) { const SActionInfo* actionInfo = actionInfoIter.getNext(); - if (kbdSuccess + if (iotSuccess != m_ptrSysInfoInterface->getLocationInfoById( actionInfo->location_id, locationInfo)) @@ -167,7 +167,7 @@ void CModuleNodeMngr::createActionNodeModel(CNodeFunc* pParent, const std::strin actionInfo->location_id); continue; } - if (kbdSuccess + if (iotSuccess != m_ptrSysInfoInterface->getAppInfoBySubsystemId( actionInfo->sub_system, diff --git a/product/src/application/sequence_server/CRdbSeqSettingAccess.cpp b/product/src/application/sequence_server/CRdbSeqSettingAccess.cpp index 4d208bf6..aec56100 100644 --- a/product/src/application/sequence_server/CRdbSeqSettingAccess.cpp +++ b/product/src/application/sequence_server/CRdbSeqSettingAccess.cpp @@ -61,7 +61,7 @@ bool CRdbSeqSettingAccess::readSettingTable(int domain, std::vector< SRdbSequenceSetting >::iterator iter = vecResult.begin(); for(; iter!=vecResult.end(); ++iter) { - if (kbdSuccess != m_ptrSysInfoInterface->getLocationInfoById( + if (iotSuccess != m_ptrSysInfoInterface->getLocationInfoById( iter->location_id, locationInfo)) { diff --git a/product/src/application/sequence_server_api/CSeqForHmiApi.cpp b/product/src/application/sequence_server_api/CSeqForHmiApi.cpp index b415d555..18b91c78 100644 --- a/product/src/application/sequence_server_api/CSeqForHmiApi.cpp +++ b/product/src/application/sequence_server_api/CSeqForHmiApi.cpp @@ -1,7 +1,7 @@ #include "application/sequence_server_api/CSeqForHmiApi.h" #include "CSeqForHmiApiImpl.h" -using namespace kbd_application; +using namespace iot_application; using namespace iot_idl::sequence; CSeqForHmiApi::CSeqForHmiApi(int appid) { diff --git a/product/src/application/sequence_server_api/CSeqForHmiApiImpl.cpp b/product/src/application/sequence_server_api/CSeqForHmiApiImpl.cpp index a1bf619e..d3753513 100644 --- a/product/src/application/sequence_server_api/CSeqForHmiApiImpl.cpp +++ b/product/src/application/sequence_server_api/CSeqForHmiApiImpl.cpp @@ -4,9 +4,9 @@ #include "CSeqForHmiApiImpl.h" -using namespace kbd_application; +using namespace iot_application; using namespace iot_idl::sequence; -kbd_application::CSeqForHmiApiImpl::CSeqForHmiApiImpl( +iot_application::CSeqForHmiApiImpl::CSeqForHmiApiImpl( int appid, CSeqForHmiApi* api) : CTimerThreadBase("CSeqForHmiApiImpl thread", 50), diff --git a/product/src/application/sequence_server_api/CSeqForHmiApiImpl.h b/product/src/application/sequence_server_api/CSeqForHmiApiImpl.h index 54148288..25a549c0 100644 --- a/product/src/application/sequence_server_api/CSeqForHmiApiImpl.h +++ b/product/src/application/sequence_server_api/CSeqForHmiApiImpl.h @@ -6,7 +6,7 @@ #include "net/net_msg_bus_api/CMbCommunicator.h" #include "application/sequence_server_api/CSeqForHmiApi.h" -namespace kbd_application { +namespace iot_application { using namespace iot_idl::sequence; class CSeqForHmiApiImpl : public iot_public::CTimerThreadBase diff --git a/product/src/application/sequence_server_api/CSeqForServerApi.cpp b/product/src/application/sequence_server_api/CSeqForServerApi.cpp index 27cee765..65f22a85 100644 --- a/product/src/application/sequence_server_api/CSeqForServerApi.cpp +++ b/product/src/application/sequence_server_api/CSeqForServerApi.cpp @@ -2,7 +2,7 @@ #include "CSeqForServerApiImpl.h" -using namespace kbd_application; +using namespace iot_application; using namespace iot_idl::sequence; CSeqForServerApi::CSeqForServerApi(int appid) diff --git a/product/src/application/sequence_server_api/CSeqForServerApiImpl.cpp b/product/src/application/sequence_server_api/CSeqForServerApiImpl.cpp index d319d57d..2992ca65 100644 --- a/product/src/application/sequence_server_api/CSeqForServerApiImpl.cpp +++ b/product/src/application/sequence_server_api/CSeqForServerApiImpl.cpp @@ -4,7 +4,7 @@ #include "service/operate_server_api/JsonOptCommand.h" #include "CSeqForServerApiImpl.h" -using namespace kbd_application; +using namespace iot_application; using namespace iot_idl::sequence; CSeqForServerApiImpl::CSeqForServerApiImpl( diff --git a/product/src/application/sequence_server_api/CSeqForServerApiImpl.h b/product/src/application/sequence_server_api/CSeqForServerApiImpl.h index 1340f397..875b29d1 100644 --- a/product/src/application/sequence_server_api/CSeqForServerApiImpl.h +++ b/product/src/application/sequence_server_api/CSeqForServerApiImpl.h @@ -7,7 +7,7 @@ #include "application/sequence_server_api/CSeqForServerApi.h" -namespace kbd_application { +namespace iot_application { using namespace iot_idl::sequence; class CSeqForServerApiImpl diff --git a/product/src/application/trigger_api/CDotNode.cpp b/product/src/application/trigger_api/CDotNode.cpp index 1f9c3268..b14f3ebb 100644 --- a/product/src/application/trigger_api/CDotNode.cpp +++ b/product/src/application/trigger_api/CDotNode.cpp @@ -8,7 +8,7 @@ #include "CDotNode.h" -using namespace kbd_application; +using namespace iot_application; using namespace iot_service; CDotNode::CDotNode(const STableInfo& tableInfo) @@ -93,7 +93,7 @@ void CDotNode::setValueEnable(bool isEnable) m_objDotInfo.dotValue.setValueEnable(isEnable); } -bool kbd_application::CDotNode::getValueEnable() +bool iot_application::CDotNode::getValueEnable() { return m_objDotInfo.dotValue.getValueEnable(); } diff --git a/product/src/application/trigger_api/CDotNode.h b/product/src/application/trigger_api/CDotNode.h index fc5de271..9293ba76 100644 --- a/product/src/application/trigger_api/CDotNode.h +++ b/product/src/application/trigger_api/CDotNode.h @@ -10,7 +10,7 @@ #include "CDotValue.h" #include "CQueryCtrl.h" -namespace kbd_application { +namespace iot_application { class CDotNode :public CQueryCtrl { diff --git a/product/src/application/trigger_api/CDotTableMngr.cpp b/product/src/application/trigger_api/CDotTableMngr.cpp index 3e8007f8..f0c292b1 100644 --- a/product/src/application/trigger_api/CDotTableMngr.cpp +++ b/product/src/application/trigger_api/CDotTableMngr.cpp @@ -3,7 +3,7 @@ #include "CDotTableMngr.h" #include "CTriggerNodeCondition.h" -using namespace kbd_application; +using namespace iot_application; CDotTableMngr::CDotTableMngr() { @@ -18,7 +18,7 @@ CDotTableMngr::~CDotTableMngr() } } -CDotNode* kbd_application::CDotTableMngr::findNode(const std::string& tag) +CDotNode* iot_application::CDotTableMngr::findNode(const std::string& tag) { std::map < std::string, CDotNode* >::iterator iter = m_mapDotTable.find(tag); if (iter != m_mapDotTable.end()) @@ -47,7 +47,7 @@ void CDotTableMngr::registerDot(DotValueMap& paramList) } } -bool kbd_application::CDotTableMngr::getDotValueList( +bool iot_application::CDotTableMngr::getDotValueList( DotValueMap& paramList) { bool bRet = true; @@ -80,7 +80,7 @@ bool kbd_application::CDotTableMngr::getDotValueList( return bRet; } -void kbd_application::CDotTableMngr::resetDotTable() +void iot_application::CDotTableMngr::resetDotTable() { boost::mutex::scoped_lock lock(m_muDot); @@ -102,7 +102,7 @@ void kbd_application::CDotTableMngr::resetDotTable() } } -void kbd_application::CDotTableMngr::resetDotTableLowToGeneral() +void iot_application::CDotTableMngr::resetDotTableLowToGeneral() { boost::mutex::scoped_lock lock(m_muDot); @@ -119,7 +119,7 @@ void kbd_application::CDotTableMngr::resetDotTableLowToGeneral() } } -void kbd_application::CDotTableMngr::clearNode() +void iot_application::CDotTableMngr::clearNode() { CDotNode* pNode; DotTableMap::iterator iter = m_mapDotTable.begin(); diff --git a/product/src/application/trigger_api/CDotTableMngr.h b/product/src/application/trigger_api/CDotTableMngr.h index 96d2c08a..0fbed903 100644 --- a/product/src/application/trigger_api/CDotTableMngr.h +++ b/product/src/application/trigger_api/CDotTableMngr.h @@ -16,7 +16,7 @@ #include "CTagAnalysiser.h" -namespace kbd_application { +namespace iot_application { typedef std::map DotTableMap; diff --git a/product/src/application/trigger_api/CDotValue.cpp b/product/src/application/trigger_api/CDotValue.cpp index 5c973dd4..f7ba0155 100644 --- a/product/src/application/trigger_api/CDotValue.cpp +++ b/product/src/application/trigger_api/CDotValue.cpp @@ -1,6 +1,6 @@ #include "CDotValue.h" -using namespace kbd_application; +using namespace iot_application; CDotValue::CDotValue() : m_bIsInit(true),m_nPntType(0),m_isEnable(false) @@ -34,18 +34,18 @@ CDotValue::~CDotValue() { } -kbd_application::CDotValue::CDotValue(int type) +iot_application::CDotValue::CDotValue(int type) : m_bIsInit(true),m_nPntType(type),m_isEnable(false) { this->m_objValue = 0; } -bool kbd_application::CDotValue::isInitValue() const +bool iot_application::CDotValue::isInitValue() const { return m_bIsInit; } -bool kbd_application::CDotValue::getValue(DotValueType& value) +bool iot_application::CDotValue::getValue(DotValueType& value) { if (m_bIsInit && !m_isEnable) { @@ -55,7 +55,7 @@ bool kbd_application::CDotValue::getValue(DotValueType& value) return true; } -void kbd_application::CDotValue::setValue( +void iot_application::CDotValue::setValue( const DotValueType& value, bool isEnable) { m_objValue = value; @@ -63,27 +63,27 @@ void kbd_application::CDotValue::setValue( m_isEnable = isEnable; } -void kbd_application::CDotValue::setValueEnable(bool isEnable) +void iot_application::CDotValue::setValueEnable(bool isEnable) { m_bIsInit = !isEnable; } -bool kbd_application::CDotValue::getValueEnable() +bool iot_application::CDotValue::getValueEnable() { return m_isEnable; } -void kbd_application::CDotValue::setDotType(int type) +void iot_application::CDotValue::setDotType(int type) { m_nPntType = type; } -int kbd_application::CDotValue::getDotType() +int iot_application::CDotValue::getDotType() { return m_nPntType; } -const DotValueType& kbd_application::CDotValue::getValue() +const DotValueType& iot_application::CDotValue::getValue() { return m_objValue; } diff --git a/product/src/application/trigger_api/CDotValue.h b/product/src/application/trigger_api/CDotValue.h index 0464aea5..eb762df5 100644 --- a/product/src/application/trigger_api/CDotValue.h +++ b/product/src/application/trigger_api/CDotValue.h @@ -9,7 +9,7 @@ #include "DataType.h" #include "pub_lua_engine_api/LuaEngineInterface.h" -namespace kbd_application { +namespace iot_application { typedef iot_public::LuaVariantType DotValueType; diff --git a/product/src/application/trigger_api/CQueryCtrl.cpp b/product/src/application/trigger_api/CQueryCtrl.cpp index f6045117..211a4748 100644 --- a/product/src/application/trigger_api/CQueryCtrl.cpp +++ b/product/src/application/trigger_api/CQueryCtrl.cpp @@ -1,6 +1,6 @@ #include "CQueryCtrl.h" -using namespace kbd_application; +using namespace iot_application; CQueryCtrl::CQueryCtrl() : m_nTally(0),m_ePriority(QUERY_PRIORITY_HIGHT) diff --git a/product/src/application/trigger_api/CQueryCtrl.h b/product/src/application/trigger_api/CQueryCtrl.h index f8e99f07..4e3e96b5 100644 --- a/product/src/application/trigger_api/CQueryCtrl.h +++ b/product/src/application/trigger_api/CQueryCtrl.h @@ -4,7 +4,7 @@ //查询控制 #include "TriggerCommonDefine.h" -namespace kbd_application { +namespace iot_application { //查询优先级 diff --git a/product/src/application/trigger_api/CRdbAccessMngr.cpp b/product/src/application/trigger_api/CRdbAccessMngr.cpp index f4507836..69398c1a 100644 --- a/product/src/application/trigger_api/CRdbAccessMngr.cpp +++ b/product/src/application/trigger_api/CRdbAccessMngr.cpp @@ -3,7 +3,7 @@ #include "CTriggerNodePeriod.h" #include "CTriggerNodeTimer.h" -using namespace kbd_application; +using namespace iot_application; CRdbAccessMngr::CRdbAccessMngr() { diff --git a/product/src/application/trigger_api/CRdbAccessMngr.h b/product/src/application/trigger_api/CRdbAccessMngr.h index 27de2cf3..69cca811 100644 --- a/product/src/application/trigger_api/CRdbAccessMngr.h +++ b/product/src/application/trigger_api/CRdbAccessMngr.h @@ -13,7 +13,7 @@ #include "CTriggerNode.h" -namespace kbd_application { +namespace iot_application { using namespace std; using namespace iot_dbms; diff --git a/product/src/application/trigger_api/CRdbAccessMngrInterface.cpp b/product/src/application/trigger_api/CRdbAccessMngrInterface.cpp index b993b3fd..678558b8 100644 --- a/product/src/application/trigger_api/CRdbAccessMngrInterface.cpp +++ b/product/src/application/trigger_api/CRdbAccessMngrInterface.cpp @@ -3,7 +3,7 @@ #include "CTriggerNodePeriod.h" #include "CTriggerNodeTimer.h" -using namespace kbd_application; +using namespace iot_application; CRdbAccessMngrInterface::CRdbAccessMngrInterface() { diff --git a/product/src/application/trigger_api/CRdbAccessMngrInterface.h b/product/src/application/trigger_api/CRdbAccessMngrInterface.h index 1e7753e9..e428b91e 100644 --- a/product/src/application/trigger_api/CRdbAccessMngrInterface.h +++ b/product/src/application/trigger_api/CRdbAccessMngrInterface.h @@ -8,7 +8,7 @@ #include "CTriggerNode.h" -namespace kbd_application { +namespace iot_application { using namespace std; using namespace iot_dbms; diff --git a/product/src/application/trigger_api/CRdbNetBase.cpp b/product/src/application/trigger_api/CRdbNetBase.cpp index 47651b27..65c729be 100644 --- a/product/src/application/trigger_api/CRdbNetBase.cpp +++ b/product/src/application/trigger_api/CRdbNetBase.cpp @@ -1,6 +1,6 @@ #include "CRdbNetBase.h" -using namespace kbd_application; +using namespace iot_application; CRdbNetBase::CRdbNetBase() { diff --git a/product/src/application/trigger_api/CRdbNetBase.h b/product/src/application/trigger_api/CRdbNetBase.h index b7971c00..c53ccc00 100644 --- a/product/src/application/trigger_api/CRdbNetBase.h +++ b/product/src/application/trigger_api/CRdbNetBase.h @@ -3,7 +3,7 @@ #include "rdb_net_api/CRdbNetApi.h" -namespace kbd_application { +namespace iot_application { using namespace iot_dbms; class CRdbNetBase diff --git a/product/src/application/trigger_api/CRdbNetInterface.cpp b/product/src/application/trigger_api/CRdbNetInterface.cpp index bcc979fb..3179cac3 100644 --- a/product/src/application/trigger_api/CRdbNetInterface.cpp +++ b/product/src/application/trigger_api/CRdbNetInterface.cpp @@ -1,5 +1,5 @@ #include "CRdbNetInterface.h" -using namespace kbd_application; +using namespace iot_application; CRdbNetInterface::CRdbNetInterface() { diff --git a/product/src/application/trigger_api/CRdbNetInterface.h b/product/src/application/trigger_api/CRdbNetInterface.h index 55f58d9c..b95b916c 100644 --- a/product/src/application/trigger_api/CRdbNetInterface.h +++ b/product/src/application/trigger_api/CRdbNetInterface.h @@ -1,7 +1,7 @@ #ifndef CRDBNETINTERFACE_H #define CRDBNETINTERFACE_H #include "CRdbNetBase.h" -namespace kbd_application { +namespace iot_application { class CRdbNetInterface : public CRdbNetBase { public: diff --git a/product/src/application/trigger_api/CRdbNetMutex.cpp b/product/src/application/trigger_api/CRdbNetMutex.cpp index 2d8c3dcb..52b2da5c 100644 --- a/product/src/application/trigger_api/CRdbNetMutex.cpp +++ b/product/src/application/trigger_api/CRdbNetMutex.cpp @@ -1,6 +1,6 @@ #include "CRdbNetMutex.h" -using namespace kbd_application; +using namespace iot_application; CRdbNetMutex::CRdbNetMutex( CRdbNetBase* api, const std::string& tablename) diff --git a/product/src/application/trigger_api/CRdbNetMutex.h b/product/src/application/trigger_api/CRdbNetMutex.h index 8942f4c0..cc13dbee 100644 --- a/product/src/application/trigger_api/CRdbNetMutex.h +++ b/product/src/application/trigger_api/CRdbNetMutex.h @@ -3,7 +3,7 @@ #include #include "CRdbNetBase.h" -namespace kbd_application { +namespace iot_application { //远程查询接口锁 class CRdbNetMutex { diff --git a/product/src/application/trigger_api/CRdbNetThread.cpp b/product/src/application/trigger_api/CRdbNetThread.cpp index 746291dc..0d5cecb4 100644 --- a/product/src/application/trigger_api/CRdbNetThread.cpp +++ b/product/src/application/trigger_api/CRdbNetThread.cpp @@ -4,7 +4,7 @@ #include "CRdbNetInterface.h" #include "pub_utility_api/TimeUtil.h" -using namespace kbd_application; +using namespace iot_application; CRdbNetThread::CRdbNetThread( CDotTableMngr& dotTable, diff --git a/product/src/application/trigger_api/CRdbNetThread.h b/product/src/application/trigger_api/CRdbNetThread.h index b440ad56..1bdc5a1c 100644 --- a/product/src/application/trigger_api/CRdbNetThread.h +++ b/product/src/application/trigger_api/CRdbNetThread.h @@ -8,7 +8,7 @@ #include "CDotTableMngr.h" #include "service/data_process_api/DataProcessApi.h" -namespace kbd_application { +namespace iot_application { using namespace iot_dbms; using namespace iot_service; diff --git a/product/src/application/trigger_api/CTagAnalysiser.cpp b/product/src/application/trigger_api/CTagAnalysiser.cpp index 082aaa8d..779aa29c 100644 --- a/product/src/application/trigger_api/CTagAnalysiser.cpp +++ b/product/src/application/trigger_api/CTagAnalysiser.cpp @@ -5,7 +5,7 @@ #include "CTagAnalysiser.h" #include "service/data_process_api/DataProcessApi.h" -using namespace kbd_application; +using namespace iot_application; using namespace iot_service; CTagAnalysiser::CTagAnalysiser() @@ -46,7 +46,7 @@ STableInfo* CTagAnalysiser::analysisTagName(const std::string& tagName) SLocationInfo locationInfo; SAppInfo stAppInfo; - if (kbdSuccess + if (iotSuccess != m_objSysinf->getLocationInfoByName( vecStr.at(0), locationInfo)) @@ -57,7 +57,7 @@ STableInfo* CTagAnalysiser::analysisTagName(const std::string& tagName) return NULL; } - if (kbdSuccess + if (iotSuccess != m_objSysinf->getAppInfoBySubsystemName( vecStr.at(1), stAppInfo)) diff --git a/product/src/application/trigger_api/CTagAnalysiser.h b/product/src/application/trigger_api/CTagAnalysiser.h index d197441d..05ef9d93 100644 --- a/product/src/application/trigger_api/CTagAnalysiser.h +++ b/product/src/application/trigger_api/CTagAnalysiser.h @@ -6,7 +6,7 @@ #include "TriggerCommonDefine.h" #include "pub_sysinfo_api/SysInfoApi.h" -namespace kbd_application { +namespace iot_application { class CTagAnalysiser { public: diff --git a/product/src/application/trigger_api/CTestRdbAccessMngr.cpp b/product/src/application/trigger_api/CTestRdbAccessMngr.cpp index ddc650cd..2805a630 100644 --- a/product/src/application/trigger_api/CTestRdbAccessMngr.cpp +++ b/product/src/application/trigger_api/CTestRdbAccessMngr.cpp @@ -1,7 +1,7 @@ #include "boost/core/ignore_unused.hpp" #include "CTestRdbAccessMngr.h" -using namespace kbd_application; +using namespace iot_application; CTestRdbAccessMngr::CTestRdbAccessMngr() { diff --git a/product/src/application/trigger_api/CTestRdbAccessMngr.h b/product/src/application/trigger_api/CTestRdbAccessMngr.h index a4d61dd5..0e4a3aab 100644 --- a/product/src/application/trigger_api/CTestRdbAccessMngr.h +++ b/product/src/application/trigger_api/CTestRdbAccessMngr.h @@ -5,7 +5,7 @@ #include "CRdbAccessMngr.h" -namespace kbd_application { +namespace iot_application { using namespace std; diff --git a/product/src/application/trigger_api/CTestRdbNet.cpp b/product/src/application/trigger_api/CTestRdbNet.cpp index 38b9dc33..fe90fbd7 100644 --- a/product/src/application/trigger_api/CTestRdbNet.cpp +++ b/product/src/application/trigger_api/CTestRdbNet.cpp @@ -1,7 +1,7 @@ #include "boost/core/ignore_unused.hpp" #include "CTestRdbNet.h" -using namespace kbd_application; +using namespace iot_application; CTestRdbNet::CTestRdbNet() { diff --git a/product/src/application/trigger_api/CTestRdbNet.h b/product/src/application/trigger_api/CTestRdbNet.h index 5768a2bb..b1d4c882 100644 --- a/product/src/application/trigger_api/CTestRdbNet.h +++ b/product/src/application/trigger_api/CTestRdbNet.h @@ -3,7 +3,7 @@ #include "CRdbNetBase.h" -namespace kbd_application { +namespace iot_application { class CTestRdbNet : public CRdbNetBase { public: diff --git a/product/src/application/trigger_api/CTriggerApi.cpp b/product/src/application/trigger_api/CTriggerApi.cpp index f84c00c9..f4ac7744 100644 --- a/product/src/application/trigger_api/CTriggerApi.cpp +++ b/product/src/application/trigger_api/CTriggerApi.cpp @@ -5,7 +5,7 @@ #include "CTestRdbAccessMngr.h" #include "CTestRdbNet.h" -using namespace kbd_application; +using namespace iot_application; CTriggerApi::CTriggerApi(int appid) { diff --git a/product/src/application/trigger_api/CTriggerApiImpl.cpp b/product/src/application/trigger_api/CTriggerApiImpl.cpp index 9ceb0d30..2e97c038 100644 --- a/product/src/application/trigger_api/CTriggerApiImpl.cpp +++ b/product/src/application/trigger_api/CTriggerApiImpl.cpp @@ -5,7 +5,7 @@ #include "CTriggerNodeFactory.h" #include "CRdbAccessMngrInterface.h" -using namespace kbd_application; +using namespace iot_application; CTriggerApiImpl::CTriggerApiImpl(const STriggerInitParam& param) :CTimerThreadBase("CTriggerApiImpl thread", 500), diff --git a/product/src/application/trigger_api/CTriggerApiImpl.h b/product/src/application/trigger_api/CTriggerApiImpl.h index aa09f2bc..0a447487 100644 --- a/product/src/application/trigger_api/CTriggerApiImpl.h +++ b/product/src/application/trigger_api/CTriggerApiImpl.h @@ -15,7 +15,7 @@ #include "CDotTableMngr.h" #include "CRdbNetThread.h" -namespace kbd_application { +namespace iot_application { struct STriggerInitParam { diff --git a/product/src/application/trigger_api/CTriggerNode.cpp b/product/src/application/trigger_api/CTriggerNode.cpp index 4d483deb..57c92d11 100644 --- a/product/src/application/trigger_api/CTriggerNode.cpp +++ b/product/src/application/trigger_api/CTriggerNode.cpp @@ -3,7 +3,7 @@ #include "CTriggerNode.h" #include "CRdbAccessMngr.h" -using namespace kbd_application; +using namespace iot_application; CTriggerNode::CTriggerNode(const CTriggerPara* param) :m_ptrParam(param), @@ -31,7 +31,7 @@ uint64 CTriggerNode::getLastTgRealExeTime(uint64 curExeTime, uint64 curElapseTim return curExeTime - (curElapseTime - m_nLastTgElapseTime); } -uint64 kbd_application::CTriggerNode::getLastTgExeTime() +uint64 iot_application::CTriggerNode::getLastTgExeTime() { return m_nLastExeTime; } diff --git a/product/src/application/trigger_api/CTriggerNode.h b/product/src/application/trigger_api/CTriggerNode.h index 37b21974..019b425e 100644 --- a/product/src/application/trigger_api/CTriggerNode.h +++ b/product/src/application/trigger_api/CTriggerNode.h @@ -9,7 +9,7 @@ #include "application/trigger_api/CTriggerPara.h" -namespace kbd_application +namespace iot_application { class CRdbAccessMngr; class CTriggerNode diff --git a/product/src/application/trigger_api/CTriggerNodeCondition.cpp b/product/src/application/trigger_api/CTriggerNodeCondition.cpp index 126d212e..ed930468 100644 --- a/product/src/application/trigger_api/CTriggerNodeCondition.cpp +++ b/product/src/application/trigger_api/CTriggerNodeCondition.cpp @@ -5,7 +5,7 @@ #include "CRdbAccessMngr.h" #include "CDotTableMngr.h" -using namespace kbd_application; +using namespace iot_application; CTriggerNodeCondition::CTriggerNodeCondition( const CTriggerPara* param, @@ -36,7 +36,7 @@ bool CTriggerNodeCondition::initConfig(CRdbAccessMngr* access) return true; } -bool kbd_application::CTriggerNodeCondition::checkTrigger(uint64 exeTime) +bool iot_application::CTriggerNodeCondition::checkTrigger(uint64 exeTime) { //值如果没有完全赋值,则不触发 BOOST_ASSERT(m_ptrDotTable); @@ -231,7 +231,7 @@ CTriggerNodeCondition::NODE_STATE CTriggerNodeCondition::getCurNodeState() bool bRet = false; if (objLua.execFunction(m_objFuncDefine.func_name, funcstr, vecArgs, bRet) - == kbdSuccess) + == iotSuccess) { return bRet ? NODE_STATE_TRUE : NODE_STATE_FALSE; } diff --git a/product/src/application/trigger_api/CTriggerNodeCondition.h b/product/src/application/trigger_api/CTriggerNodeCondition.h index c4d935af..75ab7d16 100644 --- a/product/src/application/trigger_api/CTriggerNodeCondition.h +++ b/product/src/application/trigger_api/CTriggerNodeCondition.h @@ -12,7 +12,7 @@ #include "CDotValue.h" #include "CDotTableMngr.h" -namespace kbd_application +namespace iot_application { class CRdbAccessMngr; class CDotTableMngr; diff --git a/product/src/application/trigger_api/CTriggerNodeFactory.cpp b/product/src/application/trigger_api/CTriggerNodeFactory.cpp index e5b337ad..e379b360 100644 --- a/product/src/application/trigger_api/CTriggerNodeFactory.cpp +++ b/product/src/application/trigger_api/CTriggerNodeFactory.cpp @@ -5,7 +5,7 @@ #include "CTriggerNodePeriod.h" #include "CTriggerNodeCondition.h" -using namespace kbd_application; +using namespace iot_application; CTriggerNodeFactory::CTriggerNodeFactory() { diff --git a/product/src/application/trigger_api/CTriggerNodeFactory.h b/product/src/application/trigger_api/CTriggerNodeFactory.h index 41a661c9..fd1584f6 100644 --- a/product/src/application/trigger_api/CTriggerNodeFactory.h +++ b/product/src/application/trigger_api/CTriggerNodeFactory.h @@ -7,7 +7,7 @@ #include "CTriggerNode.h" #include "application/trigger_api/CTriggerPara.h" -namespace kbd_application { +namespace iot_application { class CDotTableMngr; class CTriggerNodeFactory { diff --git a/product/src/application/trigger_api/CTriggerNodePeriod.cpp b/product/src/application/trigger_api/CTriggerNodePeriod.cpp index 8e426059..1639fa9c 100644 --- a/product/src/application/trigger_api/CTriggerNodePeriod.cpp +++ b/product/src/application/trigger_api/CTriggerNodePeriod.cpp @@ -6,7 +6,7 @@ #include "CTriggerNodePeriod.h" #include "CRdbAccessMngr.h" -using namespace kbd_application; +using namespace iot_application; CTriggerNodePeriod::CTriggerNodePeriod(const CTriggerPara* param) :CTriggerNode(param) @@ -17,7 +17,7 @@ CTriggerNodePeriod::~CTriggerNodePeriod() { } -bool kbd_application::CTriggerNodePeriod::initConfig(CRdbAccessMngr* access) +bool iot_application::CTriggerNodePeriod::initConfig(CRdbAccessMngr* access) { if (!access->queryPeriodConfig( m_objDefine, @@ -45,7 +45,7 @@ bool kbd_application::CTriggerNodePeriod::initConfig(CRdbAccessMngr* access) return true; } -bool kbd_application::CTriggerNodePeriod::checkTrigger(uint64 exeTime) +bool iot_application::CTriggerNodePeriod::checkTrigger(uint64 exeTime) { if (!timeLimit(exeTime)) { diff --git a/product/src/application/trigger_api/CTriggerNodePeriod.h b/product/src/application/trigger_api/CTriggerNodePeriod.h index 251ce133..ef069c94 100644 --- a/product/src/application/trigger_api/CTriggerNodePeriod.h +++ b/product/src/application/trigger_api/CTriggerNodePeriod.h @@ -8,7 +8,7 @@ #include "CTriggerNode.h" -namespace kbd_application { +namespace iot_application { class CRdbAccessMngr; class CTriggerNodePeriod : public CTriggerNode diff --git a/product/src/application/trigger_api/CTriggerNodeTimer.cpp b/product/src/application/trigger_api/CTriggerNodeTimer.cpp index befca760..ad0cf80d 100644 --- a/product/src/application/trigger_api/CTriggerNodeTimer.cpp +++ b/product/src/application/trigger_api/CTriggerNodeTimer.cpp @@ -1,9 +1,9 @@ #include "CTriggerNodeTimer.h" #include "CRdbAccessMngr.h" -using namespace kbd_application; +using namespace iot_application; -CTriggerNodeTimer::CTriggerNodeTimer(const kbd_application::CTriggerPara* param) +CTriggerNodeTimer::CTriggerNodeTimer(const iot_application::CTriggerPara* param) :CTriggerNode(param) { } @@ -19,7 +19,7 @@ bool CTriggerNodeTimer::initConfig(CRdbAccessMngr* access) getTriggerName()); } -bool kbd_application::CTriggerNodeTimer::checkTrigger(uint64 exeTime) +bool iot_application::CTriggerNodeTimer::checkTrigger(uint64 exeTime) { if (exeTime == m_objDefine.trigger_time) { diff --git a/product/src/application/trigger_api/CTriggerNodeTimer.h b/product/src/application/trigger_api/CTriggerNodeTimer.h index 51fdb497..87daba64 100644 --- a/product/src/application/trigger_api/CTriggerNodeTimer.h +++ b/product/src/application/trigger_api/CTriggerNodeTimer.h @@ -7,7 +7,7 @@ #include "TriggerCommonDefine.h" #include "CTriggerNode.h" -namespace kbd_application { +namespace iot_application { class CRdbAccessMngr; class CTriggerNodeTimer :public CTriggerNode { diff --git a/product/src/application/trigger_api/CTriggerPara.cpp b/product/src/application/trigger_api/CTriggerPara.cpp index e586bf5c..f791a2be 100644 --- a/product/src/application/trigger_api/CTriggerPara.cpp +++ b/product/src/application/trigger_api/CTriggerPara.cpp @@ -1,6 +1,6 @@ #include "application/trigger_api/CTriggerPara.h" -using namespace kbd_application; +using namespace iot_application; using namespace std; CTriggerPara::CTriggerPara( diff --git a/product/src/application/trigger_api/TriggerCommonDefine.h b/product/src/application/trigger_api/TriggerCommonDefine.h index 6fe0bcb5..24f5b6b4 100644 --- a/product/src/application/trigger_api/TriggerCommonDefine.h +++ b/product/src/application/trigger_api/TriggerCommonDefine.h @@ -6,7 +6,7 @@ #include "DataType.h" -namespace kbd_application { +namespace iot_application { using namespace std; diff --git a/product/src/application/video_server/VideoCameraTable.h b/product/src/application/video_server/VideoCameraTable.h index 075bc93b..5eb0867f 100644 --- a/product/src/application/video_server/VideoCameraTable.h +++ b/product/src/application/video_server/VideoCameraTable.h @@ -3,7 +3,7 @@ #include #include "string.h" -namespace kbd_application +namespace iot_application { const std::string CN_TN_CCTVCameraInfo = "cctv_camera_info"; const std::string CAMERA_TAG_NAME = "tag_name"; @@ -44,5 +44,5 @@ namespace kbd_application nCameraPort = -1; } }STableCameraInfo,*PSTableCameraInfo; -} //namespace kbd_application +} //namespace iot_application #endif // VIDEOCAMERATABLE_H diff --git a/product/src/application/video_server/VideoCommon.h b/product/src/application/video_server/VideoCommon.h index 224390e8..5287e5ad 100644 --- a/product/src/application/video_server/VideoCommon.h +++ b/product/src/application/video_server/VideoCommon.h @@ -3,7 +3,7 @@ #include "common/DataType.h" #include "string" -namespace kbd_application +namespace iot_application { const std::string CN_ProcName_VideoServer="video_server";//当前进程名 const std::string Rtu_Name = "##$$video_server$$##"; diff --git a/product/src/application/video_server/VideoMsgBusMng.cpp b/product/src/application/video_server/VideoMsgBusMng.cpp index 2c52a3a7..b0040b50 100644 --- a/product/src/application/video_server/VideoMsgBusMng.cpp +++ b/product/src/application/video_server/VideoMsgBusMng.cpp @@ -6,7 +6,7 @@ using namespace std; using namespace iot_public; using namespace iot_net; -using namespace kbd_application; +using namespace iot_application; VideoMsgBusMng::VideoMsgBusMng(const iot_public::SRunAppInfo &stRunAppInfo) :m_stRunAppInfo(stRunAppInfo) @@ -21,7 +21,7 @@ VideoMsgBusMng::~VideoMsgBusMng() int VideoMsgBusMng::initialize() { - return kbdSuccess; + return iotSuccess; } int VideoMsgBusMng::sub() @@ -29,13 +29,13 @@ int VideoMsgBusMng::sub() if (!m_objCommon.addSub(0, CH_APP_TO_VIDEO_CTRL_DOWN)) { LOGERROR("通道[CH_APP_TO_VIDEO_CTRL_DOWN]订阅失败."); - return kbdFailed; + return iotFailed; } else { LOGINFO("订阅通道[CH_APP_TO_VIDEO_CTRL_DOWN]成功"); } - return kbdSuccess; + return iotSuccess; } int VideoMsgBusMng::unsub() @@ -46,7 +46,7 @@ int VideoMsgBusMng::unsub() if(!m_objCommon.delSub(vecSub[i].getAppID(),vecSub[i].getChannelID())) { LOGERROR("取消通道[%d,%d]订阅失败.",vecSub[i].getAppID(),vecSub[i].getChannelID()); - return kbdFailed; + return iotFailed; } } //清空消息总线中的数据 @@ -55,7 +55,7 @@ int VideoMsgBusMng::unsub() { } - return kbdSuccess; + return iotSuccess; } bool VideoMsgBusMng::recvMsg(iot_net::CMbMessage &objMsg, int nTimeoutMsec) diff --git a/product/src/application/video_server/VideoMsgBusMng.h b/product/src/application/video_server/VideoMsgBusMng.h index 094b2051..663f242c 100644 --- a/product/src/application/video_server/VideoMsgBusMng.h +++ b/product/src/application/video_server/VideoMsgBusMng.h @@ -5,7 +5,7 @@ #include "net_msg_bus_api/CMbCommunicator.h" #include "common/MessageChannel.h" -namespace kbd_application +namespace iot_application { class VideoMsgBusMng { diff --git a/product/src/application/video_server/VideoMsgRecvThread.cpp b/product/src/application/video_server/VideoMsgRecvThread.cpp index 383a1dbd..51be3c9f 100644 --- a/product/src/application/video_server/VideoMsgRecvThread.cpp +++ b/product/src/application/video_server/VideoMsgRecvThread.cpp @@ -1,7 +1,7 @@ #include "VideoMsgRecvThread.h" #include "VideoCommon.h" #include "pub_logger_api/logger.h" -using namespace kbd_application; +using namespace iot_application; using namespace iot_net; using namespace iot_idl; using namespace iot_public; @@ -26,14 +26,14 @@ int VideoMsgRecvThread::initialize() if(m_ptrVAMsgbusMng ==NULL) { LOGERROR("创建消息总线管理类失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess!=m_ptrVAMsgbusMng->initialize()) + if(iotSuccess!=m_ptrVAMsgbusMng->initialize()) { LOGERROR("初始化消息总线管理类失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } void VideoMsgRecvThread::afterSuspend() diff --git a/product/src/application/video_server/VideoMsgRecvThread.h b/product/src/application/video_server/VideoMsgRecvThread.h index 5fa28239..de55bfdb 100644 --- a/product/src/application/video_server/VideoMsgRecvThread.h +++ b/product/src/application/video_server/VideoMsgRecvThread.h @@ -8,7 +8,7 @@ #include "VideoMsgBusMng.h" #include "operate_server_api/JsonOptCommand.h" #include "VideoControlMessage.pb.h" -namespace kbd_application { +namespace iot_application { class VideoMsgRecvThread : public iot_public::CTimerThreadBase { @@ -17,7 +17,7 @@ public: virtual ~VideoMsgRecvThread(); private: iot_public::SRunAppInfo m_stRunAppInfo; - kbd_application::VAMsgBusMngPtr m_ptrVAMsgbusMng; + iot_application::VAMsgBusMngPtr m_ptrVAMsgbusMng; VideoPacketQueuePtr m_ptrPacketQueue; //消息缓存类 public: int initialize(); diff --git a/product/src/application/video_server/VideoOnvifDataThread.cpp b/product/src/application/video_server/VideoOnvifDataThread.cpp index 524992a1..8e2705b6 100644 --- a/product/src/application/video_server/VideoOnvifDataThread.cpp +++ b/product/src/application/video_server/VideoOnvifDataThread.cpp @@ -3,9 +3,9 @@ #include "pub_logger_api/logger.h" #include "VideoCommon.h" #include "../include/application/OnvifLibs/onvif.h" -using namespace kbd_application; +using namespace iot_application; using namespace iot_public; -kbd_application::VideoOnvifDataThread::VideoOnvifDataThread(SRunAppInfo stRunAppInfo, VideoPacketQueuePtr ptrPacketQueue): +iot_application::VideoOnvifDataThread::VideoOnvifDataThread(SRunAppInfo stRunAppInfo, VideoPacketQueuePtr ptrPacketQueue): CTimerThreadBase("VideoMsgRecvThread",2000) { m_ptrPacketQueue = ptrPacketQueue ; @@ -24,14 +24,14 @@ int VideoOnvifDataThread::initialize() if(m_ptrRtdbOpt == NULL) { LOGERROR("创建内存表操作类失败!"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrRtdbOpt->initialize()) + if(iotSuccess != m_ptrRtdbOpt->initialize()) { LOGERROR("内存表初始化失败!"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } void VideoOnvifDataThread::afterSuspend() @@ -58,7 +58,7 @@ void VideoOnvifDataThread::execute() void VideoOnvifDataThread::loadCameraInfo() { m_nTime64 = iot_public::getUTCTimeSec(); - if(kbdSuccess != m_ptrRtdbOpt->getVideoCameraInfoAllRecord(m_vecCameraInfo)) + if(iotSuccess != m_ptrRtdbOpt->getVideoCameraInfoAllRecord(m_vecCameraInfo)) { LOGERROR("获取内存库摄像机信息失败!"); } @@ -74,8 +74,8 @@ void VideoOnvifDataThread::reject() devServiceURL += it->szCameraPtzIp; devServiceURL += "/onvif/device_service"; XAddr addr; - if(Onvif::getCapabilities(devServiceURL,addr) == kbdSuccess && - Onvif::getProfileTokens(addr.MediaXAddr,CAMERA_PTZ_CHANNEL,it->szUserName,it->szPassword,ProfileToken) == kbdSuccess) + if(Onvif::getCapabilities(devServiceURL,addr) == iotSuccess && + Onvif::getProfileTokens(addr.MediaXAddr,CAMERA_PTZ_CHANNEL,it->szUserName,it->szPassword,ProfileToken) == iotSuccess) { m_ptrPacketQueue->addOnvifParam((*it),addr,ProfileToken); }else diff --git a/product/src/application/video_server/VideoOnvifDataThread.h b/product/src/application/video_server/VideoOnvifDataThread.h index ef031334..89e44d06 100644 --- a/product/src/application/video_server/VideoOnvifDataThread.h +++ b/product/src/application/video_server/VideoOnvifDataThread.h @@ -6,7 +6,7 @@ #include "VideoPacketQueue.h" #include "VideoRtdbTableOpt.h" -namespace kbd_application { +namespace iot_application { class VideoOnvifDataThread : public iot_public::CTimerThreadBase { public: diff --git a/product/src/application/video_server/VideoOrientationTable.h b/product/src/application/video_server/VideoOrientationTable.h index 5594d469..a87538a9 100644 --- a/product/src/application/video_server/VideoOrientationTable.h +++ b/product/src/application/video_server/VideoOrientationTable.h @@ -1,7 +1,7 @@ #ifndef VIDEOORIENTATIONTABLE_H #define VIDEOORIENTATIONTABLE_H #include -namespace kbd_application +namespace iot_application { const std::string CN_TN_CCTVOrientation = "cctv_orientation"; const std::string ORIENTATION_TAG_NAME = "tag_name"; diff --git a/product/src/application/video_server/VideoPacketQueue.cpp b/product/src/application/video_server/VideoPacketQueue.cpp index b5d243dc..261de32e 100644 --- a/product/src/application/video_server/VideoPacketQueue.cpp +++ b/product/src/application/video_server/VideoPacketQueue.cpp @@ -1,7 +1,7 @@ #include "VideoPacketQueue.h" #include "pub_logger_api/logger.h" #include "VideoCommon.h" -using namespace kbd_application; +using namespace iot_application; using namespace iot_public; VideoPacketQueue::VideoPacketQueue() { diff --git a/product/src/application/video_server/VideoPacketQueue.h b/product/src/application/video_server/VideoPacketQueue.h index 86916b12..6ae5ebb2 100644 --- a/product/src/application/video_server/VideoPacketQueue.h +++ b/product/src/application/video_server/VideoPacketQueue.h @@ -7,7 +7,7 @@ #include "VideoCameraTable.h" #include "../include/application/OnvifLibs/onvif.h" #include "net_msg_bus_api/CMbCommunicator.h" -namespace kbd_application +namespace iot_application { class VideoPacketQueue { diff --git a/product/src/application/video_server/VideoRtdbTableOpt.cpp b/product/src/application/video_server/VideoRtdbTableOpt.cpp index 1d5ba628..4df74a2c 100644 --- a/product/src/application/video_server/VideoRtdbTableOpt.cpp +++ b/product/src/application/video_server/VideoRtdbTableOpt.cpp @@ -4,13 +4,13 @@ using namespace std; using namespace iot_public; using namespace iot_dbms; -kbd_application::VideoRtdbTableOpt::VideoRtdbTableOpt(const SRunAppInfo &stRunAppInfo): +iot_application::VideoRtdbTableOpt::VideoRtdbTableOpt(const SRunAppInfo &stRunAppInfo): m_stRunAppInfo(stRunAppInfo) { } -kbd_application::VideoRtdbTableOpt::~VideoRtdbTableOpt() +iot_application::VideoRtdbTableOpt::~VideoRtdbTableOpt() { if(m_objCameraTable.isOpen()) { @@ -22,22 +22,22 @@ kbd_application::VideoRtdbTableOpt::~VideoRtdbTableOpt() } } -int kbd_application::VideoRtdbTableOpt::initialize() +int iot_application::VideoRtdbTableOpt::initialize() { if(!m_objCameraTable.open(m_stRunAppInfo.nAppId,CN_TN_CCTVCameraInfo.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]", m_stRunAppInfo.nAppId, CN_TN_CCTVCameraInfo.c_str()); - return kbdFailed; + return iotFailed; } if(!m_objOrientationTable.open(m_stRunAppInfo.nAppId,CN_TN_CCTVOrientation.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]", m_stRunAppInfo.nAppId, CN_TN_CCTVOrientation.c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } -int kbd_application::VideoRtdbTableOpt::getCameraInfoByTag(STableCameraInfo &vecCameraInfo, string strCameraTag) +int iot_application::VideoRtdbTableOpt::getCameraInfoByTag(STableCameraInfo &vecCameraInfo, string strCameraTag) { vector vecCol; vector vecCond; @@ -49,36 +49,36 @@ int kbd_application::VideoRtdbTableOpt::getCameraInfoByTag(STableCameraInfo &vec if (!m_objCameraTable.selectAllVec(vecCond, vecRecord, vecCol)) { LOGERROR("查询表[%s]记录[%s=%s]失败.", CN_TN_CCTVCameraInfo.c_str(), CAMERA_TAG_NAME.c_str(), strCameraTag.c_str()); - return kbdFailed; + return iotFailed; } if (vecRecord.size() != 1) //< 查询正确的话，只会返回一条信息 { LOGERROR("查询表[%s]记录[%s=%s]失败,预期记录数[1],实际[%d].", CN_TN_CCTVCameraInfo.c_str(), CAMERA_TAG_NAME.c_str(), strCameraTag.c_str(), (int)vecRecord.size()); - return kbdFailed; + return iotFailed; } vecCameraInfo = vecRecord[0]; - return kbdSuccess; + return iotSuccess; } -int kbd_application::VideoRtdbTableOpt::getVideoCameraInfoAllRecord(std::vector &vecCameraInfo) +int iot_application::VideoRtdbTableOpt::getVideoCameraInfoAllRecord(std::vector &vecCameraInfo) { CTableLockGuard tableLock(m_objCameraTable); //< 加锁保护表 if (m_objCameraTable.selectJustAll(vecCameraInfo)) { - return kbdSuccess; + return iotSuccess; } else { LOGERROR("获取内存表[%s]记录失败.Error=[%s]", CN_TN_CCTVCameraInfo.c_str(), m_objCameraTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } } -int kbd_application::VideoRtdbTableOpt::getOrientationByTag(kbd_application::STableOrientation &vecOrientation, string strOrientationTag) +int iot_application::VideoRtdbTableOpt::getOrientationByTag(iot_application::STableOrientation &vecOrientation, string strOrientationTag) { vector vecCol; vector vecCond; @@ -90,29 +90,29 @@ int kbd_application::VideoRtdbTableOpt::getOrientationByTag(kbd_application::STa if (!m_objOrientationTable.selectAllVec(vecCond, vecRecord, vecCol)) { LOGERROR("查询表[%s]记录[%s=%s]失败.", CN_TN_CCTVOrientation.c_str(), ORIENTATION_TAG_NAME.c_str(), strOrientationTag.c_str()); - return kbdFailed; + return iotFailed; } if (vecRecord.size() != 1) //< 查询正确的话，只会返回一条信息 { LOGERROR("查询表[%s]记录[%s=%s]失败,预期记录数[1],实际[%d].", CN_TN_CCTVOrientation.c_str(), ORIENTATION_TAG_NAME.c_str(), strOrientationTag.c_str(), (int)vecRecord.size()); - return kbdFailed; + return iotFailed; } vecOrientation = vecRecord[0]; - return kbdSuccess; + return iotSuccess; } -int kbd_application::VideoRtdbTableOpt::getVideoOrientationAllRecord(std::vector &vecOrientation) +int iot_application::VideoRtdbTableOpt::getVideoOrientationAllRecord(std::vector &vecOrientation) { CTableLockGuard tableLock(m_objOrientationTable); //< 加锁保护表 if (m_objOrientationTable.selectJustAll(vecOrientation)) { - return kbdSuccess; + return iotSuccess; } else { LOGERROR("获取内存表[%s]记录失败.Error=[%s]", CN_TN_CCTVOrientation.c_str(), m_objOrientationTable.getErrorMsg().c_str()); - return kbdFailed; + return iotFailed; } } diff --git a/product/src/application/video_server/VideoRtdbTableOpt.h b/product/src/application/video_server/VideoRtdbTableOpt.h index 9c6eabc3..10059a39 100644 --- a/product/src/application/video_server/VideoRtdbTableOpt.h +++ b/product/src/application/video_server/VideoRtdbTableOpt.h @@ -5,7 +5,7 @@ #include "VideoOrientationTable.h" #include "pub_sysinfo_api/SysInfoApi.h" #include "rdb_api/CRdbAccessEx.h" -namespace kbd_application { +namespace iot_application { class VideoRtdbTableOpt { public: diff --git a/product/src/application/video_server/VideoServerApp.cpp b/product/src/application/video_server/VideoServerApp.cpp index c7edb846..3d19cfaf 100644 --- a/product/src/application/video_server/VideoServerApp.cpp +++ b/product/src/application/video_server/VideoServerApp.cpp @@ -7,7 +7,7 @@ using namespace std; using namespace iot_public; using namespace iot_sys; -using namespace kbd_application; +using namespace iot_application; using namespace iot_net; #define OPT_DESC_APP "app" @@ -70,13 +70,13 @@ bool VideoServerApp::start(int argc, char *argv[], int &) return false; } //8.设置冗余通知回调 - if(kbdSuccess !=m_ptrRedundancyMng->setCallback(m_ptrVSMng)) + if(iotSuccess !=m_ptrRedundancyMng->setCallback(m_ptrVSMng)) { LOGERROR("设置冗余回调接口失败"); return false; } //9.更新当前进程冗余状态 - if(kbdSuccess !=m_ptrProcMng->updateProcessInfo(true,false,false)) + if(iotSuccess !=m_ptrProcMng->updateProcessInfo(true,false,false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -121,7 +121,7 @@ int VideoServerApp::toQuit() m_ptrProcMng->unsetCallback(); } shutdown(); - return kbdSuccess; + return iotSuccess; } bool VideoServerApp::parseCmdLine(int argc, char *argv[]) @@ -206,7 +206,7 @@ bool VideoServerApp::getSystemInfo() LOGERROR("创建系统信息访问库失败"); return false; } - if(kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) + if(iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -229,7 +229,7 @@ bool VideoServerApp::registToProcMng() LOGERROR("创建进程管理访问库失败"); return false; } - if(kbdSuccess != m_ptrProcMng->setCallback(this)) + if(iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -242,7 +242,7 @@ bool VideoServerApp::initialize() if(!initMsgBus(CN_ProcName_VideoServer.c_str(),m_strUniqueName.c_str())) { LOGERROR("初始化消息总线失败"); - return kbdFailed; + return iotFailed; } //创建视频报警服务管理类 m_ptrVSMng =boost::make_shared(m_stRunAppInfo,m_ptrProcMng); @@ -251,7 +251,7 @@ bool VideoServerApp::initialize() LOGERROR("创建视频报警服务管理类失败"); return false; } - if(kbdSuccess !=m_ptrVSMng->initialize()) + if(iotSuccess !=m_ptrVSMng->initialize()) { LOGERROR("初始化视频报警服务管理类失败"); return false; diff --git a/product/src/application/video_server/VideoServerApp.h b/product/src/application/video_server/VideoServerApp.h index d6444272..97898b95 100644 --- a/product/src/application/video_server/VideoServerApp.h +++ b/product/src/application/video_server/VideoServerApp.h @@ -6,7 +6,7 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "sys_proc_mng_api/ProcMngInterface.h" #include "VideoServerMng.h" -namespace kbd_application +namespace iot_application { class VideoServerApp : public iot_public::CBaseService,public iot_sys::CProcessQuitInterface { diff --git a/product/src/application/video_server/VideoServerMng.cpp b/product/src/application/video_server/VideoServerMng.cpp index 8050ae72..9efd3536 100644 --- a/product/src/application/video_server/VideoServerMng.cpp +++ b/product/src/application/video_server/VideoServerMng.cpp @@ -1,6 +1,6 @@ #include "VideoServerMng.h" -using namespace kbd_application; +using namespace iot_application; VideoServerMng::VideoServerMng(const iot_public::SRunAppInfo &stRunAppInfo, const iot_sys::CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), @@ -31,7 +31,7 @@ VideoServerMng::~VideoServerMng() int VideoServerMng::redundantSwitch(bool bMaster, bool bSlave) { - int nRet = kbdSuccess; + int nRet = iotSuccess; LOGWARN("接收到冗余切换指令.Master=[%d],Slave=[%d]", bMaster, bSlave); if (bMaster && !bSlave) //< 为主 { @@ -48,12 +48,12 @@ int VideoServerMng::redundantSwitch(bool bMaster, bool bSlave) m_ptrVAServerThread->suspend(); m_ptrOnvifDataThread->suspend(); } - if (nRet == kbdSuccess) + if (nRet == iotSuccess) { m_ptrProcMng->updateProcessInfo(true, bMaster, bSlave); } - return kbdSuccess; + return iotSuccess; } int VideoServerMng::initialize() @@ -63,40 +63,40 @@ int VideoServerMng::initialize() if(m_ptrMsgQueue == NULL) { LOGERROR("VideoServerMng::initialize(), make_shared fail!\n"); - return kbdFailed; + return iotFailed; } m_ptrMsgThread = boost::make_shared(m_stRunAppInfo,m_ptrMsgQueue); if(m_ptrMsgThread == NULL) { LOGERROR("VideoServerMng::initialize(),创建数据接收线程失败!"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrMsgThread->initialize()) + if (iotSuccess != m_ptrMsgThread->initialize()) { LOGERROR("VideoServerMng::initialize(),初始化数据接收线程失败!"); - return kbdFailed; + return iotFailed; } m_ptrOnvifDataThread = boost::make_shared(m_stRunAppInfo,m_ptrMsgQueue); if(m_ptrOnvifDataThread == NULL) { LOGERROR("VideoServerMng::initialize(),创建Onvif数据处理线程失败!"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrOnvifDataThread->initialize()) + if (iotSuccess != m_ptrOnvifDataThread->initialize()) { LOGERROR("VideoServerMng::initialize(),初始化Onvif数据处理线程失败!"); - return kbdFailed; + return iotFailed; } m_ptrVAServerThread =boost::make_shared(m_stRunAppInfo,m_ptrMsgQueue); if(m_ptrVAServerThread == NULL) { LOGERROR("创建视频报警线程失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess !=m_ptrVAServerThread->initialize()) + if(iotSuccess !=m_ptrVAServerThread->initialize()) { LOGERROR("初始化视频报警线程失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/video_server/VideoServerMng.h b/product/src/application/video_server/VideoServerMng.h index 86e4607a..e39c4c32 100644 --- a/product/src/application/video_server/VideoServerMng.h +++ b/product/src/application/video_server/VideoServerMng.h @@ -9,7 +9,7 @@ #include "VideoMsgRecvThread.h" #include "VideoPacketQueue.h" #include "VideoOnvifDataThread.h" -namespace kbd_application +namespace iot_application { class VideoServerMng : public iot_sys::CRedundantSwitchInterface { diff --git a/product/src/application/video_server/VideoServerThread.cpp b/product/src/application/video_server/VideoServerThread.cpp index 485f65cb..ea07bcdc 100644 --- a/product/src/application/video_server/VideoServerThread.cpp +++ b/product/src/application/video_server/VideoServerThread.cpp @@ -10,7 +10,7 @@ using namespace iot_net; using namespace iot_public; using namespace iot_idl; -using namespace kbd_application; +using namespace iot_application; VideoServerThread::VideoServerThread(const iot_public::SRunAppInfo &stRunAppInfo, VideoPacketQueuePtr ptrPacketQueue) :iot_public::CTimerThreadBase("VideoServerThread",20), @@ -32,26 +32,26 @@ int VideoServerThread::initialize() if(m_ptrRtdbOpt == NULL) { LOGERROR("创建内存表操作类失败!"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrRtdbOpt->initialize()) + if(iotSuccess != m_ptrRtdbOpt->initialize()) { LOGERROR("内存表初始化失败!"); - return kbdFailed; + return iotFailed; } //2.初始化消息总线管理类 m_ptrVAMsgbusMng =boost::make_shared(m_stRunAppInfo); if(m_ptrVAMsgbusMng ==NULL) { LOGERROR("创建消息总线管理类失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess!=m_ptrVAMsgbusMng->initialize()) + if(iotSuccess!=m_ptrVAMsgbusMng->initialize()) { LOGERROR("初始化消息总线管理类失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } void VideoServerThread::afterSuspend() @@ -104,7 +104,7 @@ void VideoServerThread::deal(const SVideoControlRequest &pkg, const CMbMessage & LOGERROR("无此类型消息"); return ; } - if(kbdSuccess == m_ptrRtdbOpt->getCameraInfoByTag(m_cameraInfo,pkg.seqcmddata(1).strkeyvalue())) + if(iotSuccess == m_ptrRtdbOpt->getCameraInfoByTag(m_cameraInfo,pkg.seqcmddata(1).strkeyvalue())) { if(pkg.seqcmddata(0).strkeyvalue() == CCTV_ONVIF_MOVE) { @@ -154,7 +154,7 @@ void VideoServerThread::dealMove(const SVideoControlRequest &cmdPkg, const CMbMe { XAddr addr = pos->second; std::string ProfileToken = itor->second; - if(onvif.continuousMove(addr.PTZXAddr,ProfileToken,m_cameraInfo.szUserName,m_cameraInfo.szPassword,nDirection,speed) == kbdSuccess) + if(onvif.continuousMove(addr.PTZXAddr,ProfileToken,m_cameraInfo.szUserName,m_cameraInfo.szPassword,nDirection,speed) == iotSuccess) { nresult = 1; strretresult ="控制成功!"; @@ -209,7 +209,7 @@ void VideoServerThread::dealStop(const ::iot_idl::SVideoControlRequest &cmdPkg, { XAddr addr = pos->second; std::string ProfileToken =itor->second; - if(onvif.stopMove(addr.PTZXAddr,ProfileToken,m_cameraInfo.szUserName,m_cameraInfo.szPassword) == kbdSuccess) + if(onvif.stopMove(addr.PTZXAddr,ProfileToken,m_cameraInfo.szUserName,m_cameraInfo.szPassword) == iotSuccess) { nresult = 1; strretresult ="控制成功!"; @@ -257,7 +257,7 @@ void VideoServerThread::dealGotoPreset(const SVideoControlRequest &cmdPkg, const std::string stPresetTag = cmdPkg.seqcmddata(2).strkeyvalue(); std::string stPresetToken; - if(kbdSuccess == m_ptrRtdbOpt->getOrientationByTag(m_orientationInfo,stPresetTag)) + if(iotSuccess == m_ptrRtdbOpt->getOrientationByTag(m_orientationInfo,stPresetTag)) { stPresetToken = m_orientationInfo.szPresetToken; if(stPresetToken == "") @@ -280,7 +280,7 @@ void VideoServerThread::dealGotoPreset(const SVideoControlRequest &cmdPkg, const { XAddr addr = pos->second; std::string ProfileToken = itor->second; - if(onvif.gotoPreset(addr.PTZXAddr,ProfileToken,stPresetToken,m_cameraInfo.szUserName,m_cameraInfo.szPassword) == kbdSuccess) + if(onvif.gotoPreset(addr.PTZXAddr,ProfileToken,stPresetToken,m_cameraInfo.szUserName,m_cameraInfo.szPassword) == iotSuccess) { nresult = 1; strretresult ="控制成功!"; diff --git a/product/src/application/video_server/VideoServerThread.h b/product/src/application/video_server/VideoServerThread.h index 9988e206..2b3cf00e 100644 --- a/product/src/application/video_server/VideoServerThread.h +++ b/product/src/application/video_server/VideoServerThread.h @@ -9,7 +9,7 @@ #include "VideoRtdbTableOpt.h" #include "VideoControlMessage.pb.h" #include "VideoPacketQueue.h" -namespace kbd_application +namespace iot_application { class VideoServerThread : public iot_public::CTimerThreadBase { diff --git a/product/src/application/video_server/main.cpp b/product/src/application/video_server/main.cpp index ed1bd367..2415cc18 100644 --- a/product/src/application/video_server/main.cpp +++ b/product/src/application/video_server/main.cpp @@ -2,7 +2,7 @@ #include "VideoServerApp.h" using namespace std; -using namespace kbd_application; +using namespace iot_application; int main(int argc, char *argv[]) { diff --git a/product/src/application/wave_record_server/main.cpp b/product/src/application/wave_record_server/main.cpp index a2a7d085..a13193cc 100644 --- a/product/src/application/wave_record_server/main.cpp +++ b/product/src/application/wave_record_server/main.cpp @@ -7,6 +7,6 @@ int main(int argc, char *argv[]) { - kbd_app::CWave_recordApp objApp; + iot_app::CWave_recordApp objApp; return objApp.main(argc, argv); } diff --git a/product/src/application/wave_record_server/wave_recordApp.cpp b/product/src/application/wave_record_server/wave_recordApp.cpp index 1f2736e7..21f8a3f4 100644 --- a/product/src/application/wave_record_server/wave_recordApp.cpp +++ b/product/src/application/wave_record_server/wave_recordApp.cpp @@ -12,13 +12,13 @@ using namespace std; using namespace iot_public; using namespace iot_sys; -using namespace kbd_app; +using namespace iot_app; using namespace iot_net; #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" -kbd_app::CWave_recordApp::CWave_recordApp() +iot_app::CWave_recordApp::CWave_recordApp() :m_ptrSysInfo(NULL), m_ptrProcMng(NULL), m_ptrRedundancyMng(NULL), @@ -26,12 +26,12 @@ kbd_app::CWave_recordApp::CWave_recordApp() { } -kbd_app::CWave_recordApp::~CWave_recordApp() +iot_app::CWave_recordApp::~CWave_recordApp() { CWave_recordApp::stop(); } -bool kbd_app::CWave_recordApp::start(int argc, char *argv[], int &/*nStatus*/) +bool iot_app::CWave_recordApp::start(int argc, char *argv[], int &/*nStatus*/) { //1.解析启动参数 if (!parseCmdLine(argc, argv)) @@ -83,14 +83,14 @@ bool kbd_app::CWave_recordApp::start(int argc, char *argv[], int &/*nStatus*/) } //8.设置冗余通知回调 - if (kbdSuccess != m_ptrRedundancyMng->setCallback(m_ptrSafetyDayMng)) + if (iotSuccess != m_ptrRedundancyMng->setCallback(m_ptrSafetyDayMng)) { LOGERROR("设置冗余回调接口失败"); return false; } //9.更新当前进程冗余状态 - if (kbdSuccess != m_ptrProcMng->updateProcessInfo(true, false, false)) + if (iotSuccess != m_ptrProcMng->updateProcessInfo(true, false, false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -99,7 +99,7 @@ bool kbd_app::CWave_recordApp::start(int argc, char *argv[], int &/*nStatus*/) return true; } -bool kbd_app::CWave_recordApp::stop() +bool iot_app::CWave_recordApp::stop() { //9.更新当前进程冗余状态 if (m_ptrProcMng != NULL) @@ -132,7 +132,7 @@ bool kbd_app::CWave_recordApp::stop() return true; } -int kbd_app::CWave_recordApp::toQuit() +int iot_app::CWave_recordApp::toQuit() { if (m_ptrProcMng != NULL) { @@ -140,10 +140,10 @@ int kbd_app::CWave_recordApp::toQuit() } shutdown(); - return kbdSuccess; + return iotSuccess; } -bool kbd_app::CWave_recordApp::parseCmdLine(int argc, char *argv[]) +bool iot_app::CWave_recordApp::parseCmdLine(int argc, char *argv[]) { /* @brief 拼接启动参数，用于向进程管理注册 */ for (int i = 1; i < argc; ++i) @@ -205,26 +205,26 @@ bool kbd_app::CWave_recordApp::parseCmdLine(int argc, char *argv[]) return true; } -void kbd_app::CWave_recordApp::showHelp(const boost::program_options::options_description &objDesc) +void iot_app::CWave_recordApp::showHelp(const boost::program_options::options_description &objDesc) { std::cout << CN_ProcName_Ware << " [-h] | [-a app]" << std::endl; std::cout << objDesc << std::endl; } -bool kbd_app::CWave_recordApp::isAlreadyRunning() +bool iot_app::CWave_recordApp::isAlreadyRunning() { string strUniqueName = CN_ProcName_Ware; strUniqueName += m_strStartArgs; return CSingleProcInstance::hasInstanceRunning(strUniqueName); } -bool kbd_app::CWave_recordApp::initLog() +bool iot_app::CWave_recordApp::initLog() { StartLogSystem(m_strAppName.c_str(), CN_ProcName_Ware.c_str()); return true; } -bool kbd_app::CWave_recordApp::getSystemInfo() +bool iot_app::CWave_recordApp::getSystemInfo() { if (!createSysInfoInstance(m_ptrSysInfo)) { @@ -232,7 +232,7 @@ bool kbd_app::CWave_recordApp::getSystemInfo() return false; } - if (kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName, m_stRunAppInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName, m_stRunAppInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -242,7 +242,7 @@ bool kbd_app::CWave_recordApp::getSystemInfo() } /* @brief 向进程管理注册 */ -bool kbd_app::CWave_recordApp::registToProcMng() +bool iot_app::CWave_recordApp::registToProcMng() { SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stRunAppInfo.nDomainId; @@ -258,7 +258,7 @@ bool kbd_app::CWave_recordApp::registToProcMng() return false; } - if (kbdSuccess != m_ptrProcMng->setCallback(this)) + if (iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -267,14 +267,14 @@ bool kbd_app::CWave_recordApp::registToProcMng() return true; } -bool kbd_app::CWave_recordApp::initialize() +bool iot_app::CWave_recordApp::initialize() { //TODO:暂时不需要消息总线，如果要使用db_model_server_api则需要初始化 /* @brief 初始化消息总线 */ // if (!initMsgBus(CN_ProcName_SafetyDay.c_str(), "")) // { // LOGERROR("初始化消息总线失败"); -// return kbdFailed; +// return iotFailed; // } /* @brief 创建安全天数服务管理类 */ @@ -285,7 +285,7 @@ bool kbd_app::CWave_recordApp::initialize() return false; } - if (kbdSuccess != m_ptrSafetyDayMng->initialize()) + if (iotSuccess != m_ptrSafetyDayMng->initialize()) { LOGERROR("初始化安全天数服务管理类失败"); return false; @@ -295,7 +295,7 @@ bool kbd_app::CWave_recordApp::initialize() } /* @brief 清理业务资源 */ -bool kbd_app::CWave_recordApp::clean() +bool iot_app::CWave_recordApp::clean() { if (m_ptrSafetyDayMng != NULL) { diff --git a/product/src/application/wave_record_server/wave_recordApp.h b/product/src/application/wave_record_server/wave_recordApp.h index 38317f56..012093da 100644 --- a/product/src/application/wave_record_server/wave_recordApp.h +++ b/product/src/application/wave_record_server/wave_recordApp.h @@ -10,7 +10,7 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "wave_recordMng.h" -namespace kbd_app +namespace iot_app { class CWave_recordApp : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { @@ -99,4 +99,4 @@ namespace kbd_app CWareRecordPtr m_ptrSafetyDayMng; //< 安全天数服务管理类 }; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/application/wave_record_server/wave_recordCommon.h b/product/src/application/wave_record_server/wave_recordCommon.h index 6535bf63..5452336e 100644 --- a/product/src/application/wave_record_server/wave_recordCommon.h +++ b/product/src/application/wave_record_server/wave_recordCommon.h @@ -10,7 +10,7 @@ #include "pub_utility_api/TimeUtil.h" #include "pub_sysinfo_api/SysInfoApi.h" -namespace kbd_app +namespace iot_app { const std::string CN_ProcName_Ware = "wave_record_server"; //< 当前进程名 diff --git a/product/src/application/wave_record_server/wave_recordMng.cpp b/product/src/application/wave_record_server/wave_recordMng.cpp index 6a2cfc21..53bd8533 100644 --- a/product/src/application/wave_record_server/wave_recordMng.cpp +++ b/product/src/application/wave_record_server/wave_recordMng.cpp @@ -6,7 +6,7 @@ #include "wave_recordMng.h" #include "pub_logger_api/logger.h" -kbd_app::CWareRecprdMng::CWareRecprdMng(const iot_public::SRunAppInfo &stRunAppInfo, +iot_app::CWareRecprdMng::CWareRecprdMng(const iot_public::SRunAppInfo &stRunAppInfo, const iot_sys::CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProcMng), @@ -14,7 +14,7 @@ kbd_app::CWareRecprdMng::CWareRecprdMng(const iot_public::SRunAppInfo &stRunAppI { } -kbd_app::CWareRecprdMng::~CWareRecprdMng() +iot_app::CWareRecprdMng::~CWareRecprdMng() { if (m_ptrThread != NULL) { @@ -26,7 +26,7 @@ kbd_app::CWareRecprdMng::~CWareRecprdMng() } /* @brief 冗余切换 */ -int kbd_app::CWareRecprdMng::redundantSwitch(bool bMaster, bool bSlave) +int iot_app::CWareRecprdMng::redundantSwitch(bool bMaster, bool bSlave) { LOGWARN("接收到冗余切换指令.Master=[%d],Slave=[%d]", bMaster, bSlave); if (bMaster && !bSlave) //< 为主 @@ -40,24 +40,24 @@ int kbd_app::CWareRecprdMng::redundantSwitch(bool bMaster, bool bSlave) m_ptrProcMng->updateProcessInfo(true, bMaster, bSlave); - return kbdSuccess; + return iotSuccess; } /* @brief 初始化 */ -int kbd_app::CWareRecprdMng::initialize() +int iot_app::CWareRecprdMng::initialize() { m_ptrThread = boost::make_shared(m_stRunAppInfo); if (m_ptrThread == NULL) { LOGERROR("创建线程"); - return kbdFailed; + return iotFailed; } - if (kbdSuccess != m_ptrThread->initialize()) + if (iotSuccess != m_ptrThread->initialize()) { LOGERROR("初始化线程失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/wave_record_server/wave_recordMng.h b/product/src/application/wave_record_server/wave_recordMng.h index dce37a99..22c5c58e 100644 --- a/product/src/application/wave_record_server/wave_recordMng.h +++ b/product/src/application/wave_record_server/wave_recordMng.h @@ -8,7 +8,7 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "wave_recordThread.h" -namespace kbd_app +namespace iot_app { class CWareRecprdMng : public iot_sys::CRedundantSwitchInterface { @@ -22,12 +22,12 @@ namespace kbd_app 在进程切换过程中，可能会被调用多次切换，业务进程需要保证幂等，无副作用 @param bool bMaster 是否为主 @param bool bSlave 是否为备 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ virtual int redundantSwitch(bool bMaster, bool bSlave); /* @brief 初始化 - @return 成功返回kbdSuccess,失败返回错误码 + @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); diff --git a/product/src/application/wave_record_server/wave_recordThread.cpp b/product/src/application/wave_record_server/wave_recordThread.cpp index 705c3d09..eab2469c 100644 --- a/product/src/application/wave_record_server/wave_recordThread.cpp +++ b/product/src/application/wave_record_server/wave_recordThread.cpp @@ -27,19 +27,19 @@ using namespace iot_sys; using namespace std; using namespace iot_public; -using namespace kbd_app; +using namespace iot_app; using namespace iot_dbms; using namespace iot_net; using namespace iot_public; -kbd_app::CWareThread::CWareThread(const iot_public::SRunAppInfo &stRunAppInfo) +iot_app::CWareThread::CWareThread(const iot_public::SRunAppInfo &stRunAppInfo) :iot_public::CTimerThreadBase("CWareThread", 2000), m_stRunAppInfo(stRunAppInfo) //m_ptrModelCommit(NULL) { } -kbd_app::CWareThread::~CWareThread() +iot_app::CWareThread::~CWareThread() { //m_ptrModelCommit.reset(); @@ -49,12 +49,12 @@ kbd_app::CWareThread::~CWareThread() }*/ } -void kbd_app::CWareThread::execute() +void iot_app::CWareThread::execute() { updateWare(); } -void kbd_app::CWareThread::updateWare() +void iot_app::CWareThread::updateWare() { // path = "/../../data/rec/"; QString path = QString::fromStdString(CFileUtil::getCurModuleDir()) +"/../../data/rec/"; @@ -132,23 +132,23 @@ void kbd_app::CWareThread::updateWare() /* @brief 初始化 */ -int kbd_app::CWareThread::initialize() +int iot_app::CWareThread::initialize() { //TODO:暂时不持久化到关系库 // m_ptrModelCommit = getRdbModelUpdateInstance(); // if (m_ptrModelCommit == NULL) // { // LOGERROR("getRdbModelUpdateInstance失败"); -// return kbdFailed; +// return iotFailed; // } /* if (!m_objSafetyDayTable.open(m_stRunAppInfo.nAppId, CN_TN_SafetyDay.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]", m_stRunAppInfo.nAppId, CN_TN_SafetyDay.c_str()); - return kbdFailed; + return iotFailed; }*/ - return kbdSuccess; + return iotSuccess; } QFileInfoList CWareThread::getFileList(const QString &path) diff --git a/product/src/application/wave_record_server/wave_recordThread.h b/product/src/application/wave_record_server/wave_recordThread.h index 0cbd3ca5..61657961 100644 --- a/product/src/application/wave_record_server/wave_recordThread.h +++ b/product/src/application/wave_record_server/wave_recordThread.h @@ -11,7 +11,7 @@ //#include "db_model_api/CDbModelApi.h" #include -namespace kbd_app +namespace iot_app { class CWareThread : public iot_public::CTimerThreadBase { @@ -26,7 +26,7 @@ namespace kbd_app /* @brief 初始化 - @return 成功返回kbdSuccess，失败返回错误码 + @return 成功返回iotSuccess，失败返回错误码 */ int initialize(); diff --git a/product/src/application/xm_alarm_send_server/CXmAlmConfigThread.cpp b/product/src/application/xm_alarm_send_server/CXmAlmConfigThread.cpp index 96fc1b64..38fbcdad 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmConfigThread.cpp +++ b/product/src/application/xm_alarm_send_server/CXmAlmConfigThread.cpp @@ -24,12 +24,12 @@ CXmAlmConfigThread::~CXmAlmConfigThread() int iot_service::CXmAlmConfigThread::initialize() { - if(readConfig() == kbdFailed) + if(readConfig() == iotFailed) { LOGERROR("CXmAlmConfigThread配置读取失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /** @@ -41,10 +41,10 @@ int iot_service::CXmAlmConfigThread::readConfig() { iot_public::CCommonConfigParse objCfgParse; - if(kbdSuccess != objCfgParse.load(CN_Alm_Send_Path,CN_Alm_Send_Config_File)) + if(iotSuccess != objCfgParse.load(CN_Alm_Send_Path,CN_Alm_Send_Config_File)) { LOGERROR("加载URL配置文件失败"); - return kbdFailed; + return iotFailed; } /********************************我是骄傲的分割线******************************************/ @@ -71,7 +71,7 @@ int iot_service::CXmAlmConfigThread::readConfig() /********************************我是骄傲的分割线******************************************/ std::vector vecIp; - if (kbdSuccess != objCfgParse.getStringSeqValue("xm_alarm_filter", "ip", vecIp)) + if (iotSuccess != objCfgParse.getStringSeqValue("xm_alarm_filter", "ip", vecIp)) { //未能成功读取到报警过滤配置文件， //未读取到报警过滤文件，将不对报警进行过滤 @@ -87,7 +87,7 @@ int iot_service::CXmAlmConfigThread::readConfig() } std::vector vecTagName; - if (kbdSuccess != objCfgParse.getStringSeqValue("xm_alarm_filter", "tag_name", vecTagName)) + if (iotSuccess != objCfgParse.getStringSeqValue("xm_alarm_filter", "tag_name", vecTagName)) { //未能成功读取到报警过滤配置文件， //未读取到报警过滤文件，将不对报警进行过滤 @@ -101,7 +101,7 @@ int iot_service::CXmAlmConfigThread::readConfig() m_vecFileterTag.push_back(vecTagName[i]); } } - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/application/xm_alarm_send_server/CXmAlmRcvThread.cpp b/product/src/application/xm_alarm_send_server/CXmAlmRcvThread.cpp index 5aa6188b..b33730ce 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmRcvThread.cpp +++ b/product/src/application/xm_alarm_send_server/CXmAlmRcvThread.cpp @@ -23,7 +23,7 @@ iot_service::CXmAlmRcvThread::~CXmAlmRcvThread() int iot_service::CXmAlmRcvThread::initialize() { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/xm_alarm_send_server/CXmAlmSendApp.cpp b/product/src/application/xm_alarm_send_server/CXmAlmSendApp.cpp index b437c3f0..d3546a4d 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmSendApp.cpp +++ b/product/src/application/xm_alarm_send_server/CXmAlmSendApp.cpp @@ -75,14 +75,14 @@ bool iot_service::CXmAlmSendApp::start(int argc, char *argv[], int &nStatus) return false; } //8.设置冗余回调 - if(kbdSuccess != m_ptrRedundantMng->setCallback(m_ptrAlmSendMng)) + if(iotSuccess != m_ptrRedundantMng->setCallback(m_ptrAlmSendMng)) { LOGERROR("设置冗余回调接口失败"); return false; } //9.更新进程状态 - if(kbdSuccess != m_ptrProcMng->updateProcessInfo(true,false,false)) + if(iotSuccess != m_ptrProcMng->updateProcessInfo(true,false,false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -139,7 +139,7 @@ int iot_service::CXmAlmSendApp::toQuit() } shutdown(); - return kbdSuccess; + return iotSuccess; } bool iot_service::CXmAlmSendApp::parseCmdLine(int argc, char *argv[]) @@ -217,7 +217,7 @@ bool iot_service::CXmAlmSendApp::getSystemInfo() LOGERROR("创建系统信息访问库失败"); return false; } - if(kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) + if(iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) { LOGERROR("获取系统访问信息失败"); return false; @@ -240,7 +240,7 @@ bool iot_service::CXmAlmSendApp::registerToProcMng() LOGERROR("创建进程管理访问库失败"); return false; } - if(kbdSuccess != m_ptrProcMng->setCallback(this)) + if(iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回掉函数失败"); return false; @@ -262,7 +262,7 @@ bool iot_service::CXmAlmSendApp::initialize() LOGERROR("创建线程管理类智能指针失败"); return false; } - if(kbdSuccess != m_ptrAlmSendMng->initialize()) + if(iotSuccess != m_ptrAlmSendMng->initialize()) { LOGERROR("初始化线程管理类失败"); return false; diff --git a/product/src/application/xm_alarm_send_server/CXmAlmSendMng.cpp b/product/src/application/xm_alarm_send_server/CXmAlmSendMng.cpp index 21b431f7..21a94d46 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmSendMng.cpp +++ b/product/src/application/xm_alarm_send_server/CXmAlmSendMng.cpp @@ -58,7 +58,7 @@ int iot_service::CXmAlmSendMng::redundantSwitch(bool bMaster, bool bSlave) m_ptrProcMng->updateProcessInfo(true, bMaster, bSlave); } - return kbdSuccess; + return iotSuccess; } int iot_service::CXmAlmSendMng::initialize() @@ -67,27 +67,27 @@ int iot_service::CXmAlmSendMng::initialize() if(NULL == m_ptrAlmConfigThread) { LOGERROR("创建配置对象失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrAlmConfigThread->initialize()) + if(iotSuccess != m_ptrAlmConfigThread->initialize()) { LOGERROR("初始化配置线程失败"); - return kbdFailed; + return iotFailed; } m_ptrAlmRcvThread = boost::make_shared(m_ptrAlmConfigThread,&m_vecAlmSendThreadPtr); if(NULL == m_ptrAlmRcvThread) { LOGERROR("创建报警接收线程失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrAlmRcvThread->initialize()) + if(iotSuccess != m_ptrAlmRcvThread->initialize()) { LOGERROR("初始化报警接受线程失败"); - return kbdFailed; + return iotFailed; } - //return kbdSuccess; + //return iotSuccess; /********************************socket线程*******************************************/ @@ -95,13 +95,13 @@ int iot_service::CXmAlmSendMng::initialize() if(NULL == m_ptrAlmSocketThread) { LOGERROR("创建socket线程失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrAlmSocketThread->initialize()) + if(iotSuccess != m_ptrAlmSocketThread->initialize()) { LOGERROR("socket线程初始化失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/application/xm_alarm_send_server/CXmAlmSendMng.h b/product/src/application/xm_alarm_send_server/CXmAlmSendMng.h index c1aa6b75..b138d5a8 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmSendMng.h +++ b/product/src/application/xm_alarm_send_server/CXmAlmSendMng.h @@ -21,7 +21,7 @@ namespace iot_service { virtual int redundantSwitch(bool bMaster, bool bSlave); /* * brief initialize 初始化 - * return 成功返回kbdSuccess,失败返回错误码 + * return 成功返回iotSuccess,失败返回错误码 */ int initialize(); diff --git a/product/src/application/xm_alarm_send_server/CXmAlmSendThread.cpp b/product/src/application/xm_alarm_send_server/CXmAlmSendThread.cpp index 8dc40095..abff1451 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmSendThread.cpp +++ b/product/src/application/xm_alarm_send_server/CXmAlmSendThread.cpp @@ -24,7 +24,7 @@ iot_service::CXmAlmSendThread::CXmAlmSendThread(CXmAlmConfigThreadPtr ptrAlmConf m_currentSendAlmNo = -1; m_askStatus = 0; - if(kbdSuccess != initialize()) + if(iotSuccess != initialize()) { LOGERROR("报警发送线程初始化失败"); } @@ -54,7 +54,7 @@ void iot_service::CXmAlmSendThread::execute() int iot_service::CXmAlmSendThread::initialize() { - return kbdSuccess; + return iotSuccess; } void iot_service::CXmAlmSendThread::socketProcess() diff --git a/product/src/application/xm_alarm_send_server/CXmAlmSocketThread.cpp b/product/src/application/xm_alarm_send_server/CXmAlmSocketThread.cpp index 65345e75..c0659923 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmSocketThread.cpp +++ b/product/src/application/xm_alarm_send_server/CXmAlmSocketThread.cpp @@ -54,11 +54,11 @@ int iot_service::CXmAlmSocketThread::initialize() if(initWinsock() == false) { LOGERROR("Windows系统下网络库初始化失败"); - return kbdFailed; + return iotFailed; } initServerSock(); - return kbdSuccess; + return iotSuccess; } /** @@ -217,7 +217,7 @@ int iot_service::CXmAlmSocketThread::ServerAccept() } } - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/dbms/db_save_cloud_platform/CDbSaveService.cpp b/product/src/dbms/db_save_cloud_platform/CDbSaveService.cpp index 2223e20b..6fce7f2c 100644 --- a/product/src/dbms/db_save_cloud_platform/CDbSaveService.cpp +++ b/product/src/dbms/db_save_cloud_platform/CDbSaveService.cpp @@ -55,7 +55,7 @@ bool CDbSaveService::start( int argc, char *argv[], int &nStatus ) return false; } int nRet = sysInfoPtr->getLocalRunAppInfoByName( CN_AppName_PUBLIC, stRunAppInfo ); - if ( kbdSuccess != nRet ) + if ( iotSuccess != nRet ) { LOGFATAL( "getLocalRunAppInfoByName() failed, exit!" ); return false; diff --git a/product/src/dbms/db_save_cloud_platform/CDbSaveServiceThread.cpp b/product/src/dbms/db_save_cloud_platform/CDbSaveServiceThread.cpp index f30d391a..8e51ebe0 100644 --- a/product/src/dbms/db_save_cloud_platform/CDbSaveServiceThread.cpp +++ b/product/src/dbms/db_save_cloud_platform/CDbSaveServiceThread.cpp @@ -369,7 +369,7 @@ int CDbSaveServiceThread::redundantSwitch( bool bMaster, bool bSlave ) m_oMbComm.delSub( 0, 0 ); //suspend(); } - return kbdSuccess; + return iotSuccess; } } //< namespace iot_dbms diff --git a/product/src/dbms/tsdb_save_cloud_platform/CNodeMng.cpp b/product/src/dbms/tsdb_save_cloud_platform/CNodeMng.cpp index 72cbd084..5447a2ea 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/CNodeMng.cpp +++ b/product/src/dbms/tsdb_save_cloud_platform/CNodeMng.cpp @@ -82,7 +82,7 @@ bool CNodeMng::init() //< 获取本机域ID和主机名 { iot_public::SNodeInfo stLocalNodeInfo; - if (kbdSuccess != ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) + if (iotSuccess != ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) { LOGERROR("getLocalNodeInfo() failed !"); return false; diff --git a/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveRedunSw.cpp b/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveRedunSw.cpp index 6938beb8..e1b3fdc3 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveRedunSw.cpp +++ b/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveRedunSw.cpp @@ -41,7 +41,7 @@ int CTsdbSaveRedunSw::redundantSwitch(bool bMaster, bool bSlave) m_pParent->updateProcInfo(true, m_objFrontThread.isThreadRunning(), bSlave); - return kbdSuccess; + return iotSuccess; } } //< namespace iot_dbms diff --git a/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveSrv.cpp b/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveSrv.cpp index e2773d16..05b943c2 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveSrv.cpp +++ b/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveSrv.cpp @@ -142,7 +142,7 @@ bool CTsdbSaveSrv::start(int argc, char *argv[], int& /*nStatus*/) break; case RM_NO_PROC_MNG_MASTER: { - if (kbdSuccess != m_ptrRedunSw->redundantSwitch(true, false)) + if (iotSuccess != m_ptrRedunSw->redundantSwitch(true, false)) { LOGFATAL("以主机模式启动失败！"); return false; @@ -151,7 +151,7 @@ bool CTsdbSaveSrv::start(int argc, char *argv[], int& /*nStatus*/) break; case RM_NO_PROC_MNG_SLAVE: { - if (kbdSuccess != m_ptrRedunSw->redundantSwitch(false, true)) + if (iotSuccess != m_ptrRedunSw->redundantSwitch(false, true)) { LOGFATAL("以备机模式启动失败！"); return false; @@ -242,7 +242,7 @@ bool CTsdbSaveSrv::stop() int CTsdbSaveSrv::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } @@ -253,7 +253,7 @@ int CTsdbSaveSrv::updateProcInfo(bool bActive, bool bMaster, bool bSlave) return m_ptrProcMng->updateProcessInfo(bActive, bMaster, bSlave); } - return kbdFailed; + return iotFailed; } diff --git a/product/src/example/daemon_debug_helper/AppMng.cpp b/product/src/example/daemon_debug_helper/AppMng.cpp index 4a91246f..3085f497 100644 --- a/product/src/example/daemon_debug_helper/AppMng.cpp +++ b/product/src/example/daemon_debug_helper/AppMng.cpp @@ -35,7 +35,7 @@ bool AppMng::init() } - if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) + if (iotSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) { std::cerr<< "fail to get local node info"<< std::endl; return false; @@ -261,7 +261,7 @@ bool AppMng::getLocalInfo(int &nDomainId, std::string &strNodeName) else { SNodeInfo stLocalNodeInfo; - if (kbdSuccess == m_ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) + if (iotSuccess == m_ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) { nDomainId = stLocalNodeInfo.nDomainId; strNodeName = stLocalNodeInfo.strName; diff --git a/product/src/example/frame_example/data_process/DataProcess.cpp b/product/src/example/frame_example/data_process/DataProcess.cpp index 68f9a9ea..c8277ea4 100644 --- a/product/src/example/frame_example/data_process/DataProcess.cpp +++ b/product/src/example/frame_example/data_process/DataProcess.cpp @@ -285,5 +285,5 @@ bool CDataProcess::stop() int CDataProcess::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } 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 c1d73348..cd0595da 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 kbd_application::CLinkageForHmiApi + : public iot_application::CLinkageForHmiApi { public: CLinkageForHmiApiInterface(MainWindow* mainWindow); 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 b304b1de..9e592b47 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 kbd_application::CSeqForHmiApi + : public iot_application::CSeqForHmiApi { public: CSequenceForHmiApiInterface(MainWindow* mainWindow); 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 7ad7366a..cb1df000 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(kbd_application::CTriggerPara::TRIGGER_TYPE type) +QString CDbContainer::getTriggerTypeStr(iot_application::CTriggerPara::TRIGGER_TYPE type) { QString retStr; - using namespace kbd_application; + using namespace iot_application; 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 9fffb63b..7edb117c 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(kbd_application::CTriggerPara::TRIGGER_TYPE type); + static QString getTriggerTypeStr(iot_application::CTriggerPara::TRIGGER_TYPE type); protected: friend class CIterator; friend class STimerIterator; 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 58a047b8..13448581 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 kbd_application::CTriggerPara* param, uint64 triggerTime) + const iot_application::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 82c9a8e4..0549b4f5 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 kbd_application::CTriggerApi +class CTriggerInterface : public iot_application::CTriggerApi { public: CTriggerInterface(CTriggerMngr* ptr); @@ -10,7 +10,7 @@ public: protected: bool triggered( - const kbd_application::CTriggerPara* param, + const iot_application::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 c4ceef6f..a3b23695 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 kbd_application; + using namespace iot_application; uint64 nTriggerTime; std::vector::iterator iter @@ -52,7 +52,7 @@ void CTriggerMngr::queryTrigged() } bool CTriggerMngr::triggered( - const kbd_application::CTriggerPara* param, + const iot_application::CTriggerPara* param, uint64 triggerTime) { emit signal_triggered(param, triggerTime); @@ -61,7 +61,7 @@ bool CTriggerMngr::triggered( void CTriggerMngr::clear() { - using namespace kbd_application; + using namespace iot_application; std::vector::iterator iter = m_vecTriggerParam.begin(); @@ -75,11 +75,11 @@ void CTriggerMngr::clear() m_vecTriggerParam.clear(); } -kbd_application::CTriggerPara* CTriggerMngr::addParam( - kbd_application::CTriggerPara::TRIGGER_TYPE type, +iot_application::CTriggerPara* CTriggerMngr::addParam( + iot_application::CTriggerPara::TRIGGER_TYPE type, const std::string& triggerName) { - using namespace kbd_application; + using namespace iot_application; CTriggerPara* pParam = new CTriggerPara(type, triggerName); @@ -97,9 +97,9 @@ kbd_application::CTriggerPara* CTriggerMngr::addParam( } bool CTriggerMngr::delParam( - kbd_application::CTriggerPara* _pPara) + iot_application::CTriggerPara* _pPara) { - using namespace kbd_application; + using namespace iot_application; CTriggerPara* pPara = _pPara; std::vector::iterator iter = m_vecTriggerParam.begin(); @@ -124,7 +124,7 @@ bool CTriggerMngr::delParam( } -void CTriggerMngr::ignoreCurTime(kbd_application::CTriggerPara *pPram, uint64 time) +void CTriggerMngr::ignoreCurTime(iot_application::CTriggerPara *pPram, uint64 time) { if (pPram) { @@ -132,11 +132,11 @@ void CTriggerMngr::ignoreCurTime(kbd_application::CTriggerPara *pPram, uint64 ti } } -kbd_application::CTriggerPara *CTriggerMngr::findPara( - kbd_application::CTriggerPara::TRIGGER_TYPE type, +iot_application::CTriggerPara *CTriggerMngr::findPara( + iot_application::CTriggerPara::TRIGGER_TYPE type, const std::string &triggerName) { - using namespace kbd_application; + using namespace iot_application; 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 19047f9d..d8874cf2 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(); - kbd_application::CTriggerPara * addParam( - kbd_application::CTriggerPara::TRIGGER_TYPE type, + iot_application::CTriggerPara * addParam( + iot_application::CTriggerPara::TRIGGER_TYPE type, const std::string& triggerName); - bool delParam(kbd_application::CTriggerPara*); + bool delParam(iot_application::CTriggerPara*); void ignoreCurTime( - kbd_application::CTriggerPara *pPram, + iot_application::CTriggerPara *pPram, uint64 time); - kbd_application::CTriggerPara* findPara( - kbd_application::CTriggerPara::TRIGGER_TYPE type, + iot_application::CTriggerPara* findPara( + iot_application::CTriggerPara::TRIGGER_TYPE type, const std::string& triggerName); bool triggered( - const kbd_application::CTriggerPara* param, + const iot_application::CTriggerPara* param, uint64 triggerTime); signals: void showMsg(const QString& msgStr); void signal_triggered( - const kbd_application::CTriggerPara*, + const iot_application::CTriggerPara*, uint64); void signal_isTriggered( - const kbd_application::CTriggerPara*, + const iot_application::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 4e017f1f..bc7b8c64 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 kbd_application::CTriggerPara*, uint64)), - // this, SLOT(slot_triggered(const kbd_application::CTriggerPara*, uint64)),Qt::QueuedConnection); + //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, &CTriggerMngr::signal_triggered, this, &MainWindow::slot_triggered, Qt::BlockingQueuedConnection); - connect(m_ptrTriggerMngr, SIGNAL(signal_isTriggered(const kbd_application::CTriggerPara*,bool, uint64)), - this, SLOT(slot_isTriggered(const kbd_application::CTriggerPara*,bool, uint64))); + connect(m_ptrTriggerMngr, SIGNAL(signal_isTriggered(const iot_application::CTriggerPara*,bool, uint64)), + this, SLOT(slot_isTriggered(const iot_application::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; } -kbd_application::CTriggerPara::TRIGGER_TYPE +iot_application::CTriggerPara::TRIGGER_TYPE MainWindow::trTriggerType(TriggerType type) { - using namespace kbd_application; + using namespace iot_application; switch (type) { case TRIGGERTYPE_ALL: @@ -251,9 +251,9 @@ MainWindow::trTriggerType(TriggerType type) TriggerType MainWindow::trTriggerType( - kbd_application::CTriggerPara::TRIGGER_TYPE type) + iot_application::CTriggerPara::TRIGGER_TYPE type) { - using namespace kbd_application; + using namespace iot_application; switch (type) { case CTriggerPara::TRIGGER_TYPE_CONDITION: @@ -293,9 +293,9 @@ void MainWindow::inserCacheMsg(const QString& msg) void MainWindow::showRegistered( SBaseDefine* info, - kbd_application::CTriggerPara * para) + iot_application::CTriggerPara * para) { - using namespace kbd_application; + using namespace iot_application; QTreeWidgetItem* item = new QTreeWidgetItem(); @@ -322,7 +322,7 @@ bool MainWindow::regeditItem(QTreeWidgetItem* item) return false; } - kbd_application::CTriggerPara *pParam = NULL; + iot_application::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) { - kbd_application::CTriggerPara * para = - (kbd_application::CTriggerPara *)item->data(0, Qt::UserRole + 1).value(); + iot_application::CTriggerPara * para = + (iot_application::CTriggerPara *)item->data(0, Qt::UserRole + 1).value(); if (!para) { @@ -387,8 +387,8 @@ bool MainWindow::unRegeditItem(QTreeWidgetItem* item) bool MainWindow::ignoreItem(QTreeWidgetItem* item) { - kbd_application::CTriggerPara * para = - (kbd_application::CTriggerPara *)item->data(0, Qt::UserRole + 1).value(); + iot_application::CTriggerPara * para = + (iot_application::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 kbd_application::CTriggerPara * para) +MainWindow::findRegeditItem(const iot_application::CTriggerPara * para) { QTreeWidgetItemIterator it(m_ptrRegeditList); QVariant data; while (*it) { data = (*it)->data(0, Qt::UserRole + 1); - if (para == (kbd_application::CTriggerPara*)data.value()) + if (para == (iot_application::CTriggerPara*)data.value()) { return *it; } @@ -433,7 +433,7 @@ QString MainWindow::getTriggeredDesc(bool isTrigged) } void MainWindow::slot_triggered( - const kbd_application::CTriggerPara *pParam, + const iot_application::CTriggerPara *pParam, uint64 time) { QString strTime = @@ -466,7 +466,7 @@ void MainWindow::slot_triggered( } void MainWindow::slot_isTriggered( - const kbd_application::CTriggerPara* pParam, + const iot_application::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 1be80bb0..e16b7c7b 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 kbd_application::CTriggerPara*, + const iot_application::CTriggerPara*, uint64 time); void slot_isTriggered( - const kbd_application::CTriggerPara*, + const iot_application::CTriggerPara*, bool isTrigger, uint64 time); @@ -50,22 +50,22 @@ private slots: void slot_recreateBtn(); private: bool recreateModel(); - kbd_application::CTriggerPara::TRIGGER_TYPE + iot_application::CTriggerPara::TRIGGER_TYPE trTriggerType(TriggerType type); TriggerType - trTriggerType(kbd_application::CTriggerPara::TRIGGER_TYPE type); + trTriggerType(iot_application::CTriggerPara::TRIGGER_TYPE type); void showCacheMsg(); void inserCacheMsg(const QString& msg); void showRegistered(SBaseDefine* info, - kbd_application::CTriggerPara * para); + iot_application::CTriggerPara * para); bool regeditItem(QTreeWidgetItem* item); bool unRegeditItem(QTreeWidgetItem* item); bool ignoreItem(QTreeWidgetItem* item); - QTreeWidgetItem* findRegeditItem(const kbd_application::CTriggerPara * para); + QTreeWidgetItem* findRegeditItem(const iot_application::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 29af9165..9793cddc 100644 --- a/product/src/example/luabridge_test/incomeTest.hpp +++ b/product/src/example/luabridge_test/incomeTest.hpp @@ -20,7 +20,7 @@ int splitTagName(const std::string &inTag,iot_dbms::SMeasPointKey &outPoint,std: std::size_t firstDotindex = inTag.find_first_of('.'); if(firstDotindex == std::string::npos) { - return kbdFailed; + return iotFailed; } // 赋值表名; @@ -37,11 +37,11 @@ int splitTagName(const std::string &inTag,iot_dbms::SMeasPointKey &outPoint,std: else if(inTag.substr(0,firstDotindex) == std::string("mix")){ outPoint.m_enType = iot_dbms::MPT_MIX; }else{ - return kbdFailed; + return iotFailed; } outTagName = inTag.substr(firstDotindex+1,inTag.size()); - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/example/thread_test/App.cpp b/product/src/example/thread_test/App.cpp index f90be489..8a6f131e 100644 --- a/product/src/example/thread_test/App.cpp +++ b/product/src/example/thread_test/App.cpp @@ -59,6 +59,6 @@ bool CApp::stop() int CApp::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/example/thread_test/AppThread.cpp b/product/src/example/thread_test/AppThread.cpp index fd84bf3b..91fb66b7 100644 --- a/product/src/example/thread_test/AppThread.cpp +++ b/product/src/example/thread_test/AppThread.cpp @@ -18,7 +18,7 @@ CAppThread::~CAppThread() int CAppThread::init() { - return kbdSuccess; + return iotSuccess; } void CAppThread::execute() diff --git a/product/src/fes/R80Info/R80Info.cpp b/product/src/fes/R80Info/R80Info.cpp index 36c2f6cf..e93d7b4b 100644 --- a/product/src/fes/R80Info/R80Info.cpp +++ b/product/src/fes/R80Info/R80Info.cpp @@ -251,7 +251,7 @@ bool CR80Info::stop() int CR80Info::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } /** @@ -315,10 +315,10 @@ bool CR80Info::InitWinsock() /** * @brief CR80Info::ReadConfigParam * 读取FESSYS配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CR80Info::ReadConfigParam() { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/R80Info/R80InfoDataThread.cpp b/product/src/fes/R80Info/R80InfoDataThread.cpp index 4f37fd70..3a527548 100644 --- a/product/src/fes/R80Info/R80InfoDataThread.cpp +++ b/product/src/fes/R80Info/R80InfoDataThread.cpp @@ -46,7 +46,7 @@ int CR80InfoDataThread::beforeExecute() ReadInfo(); SocketInit(); - return kbdSuccess; + return iotSuccess; } /* @@ -428,7 +428,7 @@ int CR80InfoDataThread::SocketInit() #else LOGERROR("unable to create socket, errno:%d <%s>\n", errno, strerror(errno)); #endif - return kbdFailed; + return iotFailed; } // struct sockaddr_in local; @@ -447,7 +447,7 @@ int CR80InfoDataThread::SocketInit() LOGERROR("UDP bind(%d) failed, errno:%d <%s>", m_Socket, errno, strerror(errno)); #endif SocketClose(); - return kbdFailed; + return iotFailed; } #ifdef WIN32 @@ -466,7 +466,7 @@ int CR80InfoDataThread::SocketInit() #endif { LOGERROR("Usetsockopt m_Socket IP_ADD_MEMBERSHIP\n"); - return kbdFailed; + return iotFailed; } //设置套接字为非阻塞模式 @@ -485,9 +485,9 @@ int CR80InfoDataThread::SocketInit() #else LOGERROR("fcntl(sock:%d) set O_NONBLOCK error, errno:%d <%s>\n", m_Socket, errno, strerror(errno)); #endif - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/R80Info/R80InfoRedundantManage.cpp b/product/src/fes/R80Info/R80InfoRedundantManage.cpp index 63ad9306..e45d7805 100644 --- a/product/src/fes/R80Info/R80InfoRedundantManage.cpp +++ b/product/src/fes/R80Info/R80InfoRedundantManage.cpp @@ -66,7 +66,7 @@ int CR80InfoRedundantManage::redundantSwitch(bool bMaster, bool bSlave) m_bSlave = bSlave; m_ptrProcManage->updateProcessInfo(true,m_bMaster,m_bSlave); - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/fes/FesApp.cpp b/product/src/fes/fes/FesApp.cpp index d5f8fc9d..bf2577ad 100644 --- a/product/src/fes/fes/FesApp.cpp +++ b/product/src/fes/fes/FesApp.cpp @@ -202,7 +202,7 @@ bool CFesApp::start(int argc, char *argv[], int &/*nStatus*/) //读取系统配置文件 ReadConfigParam(); //6、FES 基本数据初始 - if (m_CFesBase.InitBaseData(1) == kbdFailed) + if (m_CFesBase.InitBaseData(1) == iotFailed) { LOGERROR("InitBaseData()基本数据初始有错，FES退出!"); return false; @@ -341,7 +341,7 @@ bool CFesApp::stop() int CFesApp::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } /** @@ -526,7 +526,7 @@ bool CFesApp::InitThread() LOGERROR("m_ptrFesRxDPDataThread 创建失败"); return false; } - if (m_ptrFesRxDPDataThread->initialize() == kbdFailed) + if (m_ptrFesRxDPDataThread->initialize() == iotFailed) { LOGERROR("m_ptrFesRxDPDataThread ::initialize() fail!\n"); return false; @@ -688,7 +688,7 @@ std::string CFesApp::getDllPath(const std::string &strDllName) 根据规约参数，加载规约动态库 @param 无 - @return 失败返回kbdFailed\成功返回kbdSuccess + @return 失败返回iotFailed\成功返回iotSuccess @retval */ int CFesApp::LoadProtocolDll() @@ -701,14 +701,14 @@ int CFesApp::LoadProtocolDll() if(m_CFesBase.m_ptrProtocolBaseDll == NULL) { LOGERROR("Create m_ptrProtocolBaseDll failed."); - return kbdFailed; + return iotFailed; } dllpath = getDllPath("protocolbase"); ret = m_CFesBase.m_ptrProtocolBaseDll->load(dllpath); if(ret == false) { LOGERROR("Load protocol %s failed.", dllpath.c_str()); - return kbdFailed; + return iotFailed; } else { @@ -716,7 +716,7 @@ int CFesApp::LoadProtocolDll() LPFUN1 setAddrFun; setAddrFun = (LPFUN1)m_CFesBase.m_ptrProtocolBaseDll->findFunction ("SetBaseAddr"); if(setAddrFun==NULL) - return kbdFailed; + return iotFailed; setAddrFun((void*)&m_CFesBase); } std::set setProtocol; //< 记录工程中使用的协议ID @@ -798,7 +798,7 @@ int CFesApp::LoadProtocolDll() } } - return kbdSuccess; + return iotSuccess; } @@ -852,7 +852,7 @@ bool CFesApp::InitWinsock() /** * @brief CFesApp::ReadConfigParam * 读取FESSYS配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CFesApp::ReadConfigParam() { @@ -866,13 +866,13 @@ int CFesApp::ReadConfigParam() m_CFesBase.m_gPollWaveTimeReset = 120 * 1000; m_CFesBase.m_gOfflineCountReset = 0;//2020-05-21 thxiao 串口重新打开次数判断 - if(config.load("../../data/fes/","fesConfig.xml")==kbdFailed) + if(config.load("../../data/fes/","fesConfig.xml")==iotFailed) { - return kbdFailed; + return iotFailed; } sprintf(strName,"FESSYS"); - if(config.getIntValue(strName,"scada_sync_data_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strName,"scada_sync_data_interval",ivalue) == iotSuccess) { g_FesScadaSyncDataInterval = ivalue; } @@ -881,7 +881,7 @@ int CFesApp::ReadConfigParam() g_FesScadaSyncDataInterval = 60; } - if(config.getIntValue(strName,"rtu_sync_data_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strName,"rtu_sync_data_interval",ivalue) == iotSuccess) { g_FesRtuSyncDataInterval = ivalue; } @@ -891,7 +891,7 @@ int CFesApp::ReadConfigParam() } //---Dig - if(config.getIntValue(strName,"chang_dig_send_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strName,"chang_dig_send_interval",ivalue) == iotSuccess) { g_FesChgDigSendCyc = ivalue; } @@ -901,7 +901,7 @@ int CFesApp::ReadConfigParam() } //---Ana - if(config.getIntValue(strName,"chang_ana_send_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strName,"chang_ana_send_interval",ivalue) == iotSuccess) { g_FesChgAnaSendCyc = ivalue; } @@ -911,7 +911,7 @@ int CFesApp::ReadConfigParam() } //---mix - if(config.getIntValue(strName,"chang_mix_send_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strName,"chang_mix_send_interval",ivalue) == iotSuccess) { g_FesChgMixSendCyc = ivalue; } @@ -921,7 +921,7 @@ int CFesApp::ReadConfigParam() } //---acc - if(config.getIntValue(strName,"chang_acc_send_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strName,"chang_acc_send_interval",ivalue) == iotSuccess) { g_FesChgAccSendCyc = ivalue; } @@ -931,7 +931,7 @@ int CFesApp::ReadConfigParam() } //---event - if(config.getIntValue(strName,"chan_event_send_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strName,"chan_event_send_interval",ivalue) == iotSuccess) { g_FesEventSendCyc = ivalue; } @@ -942,26 +942,26 @@ int CFesApp::ReadConfigParam() sprintf(strName, "FESCOMDEV"); - if (config.getIntValue(strName, "dev_offline_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strName, "dev_offline_interval", ivalue) == iotSuccess) { m_CFesBase.m_gOfflineTimeReset = ivalue*1000; } - if (config.getIntValue(strName, "set_time_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strName, "set_time_interval", ivalue) == iotSuccess) { m_CFesBase.m_gSetTimeReset = ivalue * 1000; } - if (config.getIntValue(strName, "poll_wave_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strName, "poll_wave_interval", ivalue) == iotSuccess) { m_CFesBase.m_gPollWaveTimeReset = ivalue * 1000; } - if (config.getIntValue(strName, "dev_offline_max_count", ivalue) == kbdSuccess) + if (config.getIntValue(strName, "dev_offline_max_count", ivalue) == iotSuccess) { m_CFesBase.m_gOfflineCountReset = ivalue; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/fes/FesBase.cpp b/product/src/fes/fes/FesBase.cpp index 807f6844..d82cd45d 100644 --- a/product/src/fes/fes/FesBase.cpp +++ b/product/src/fes/fes/FesBase.cpp @@ -143,7 +143,7 @@ void CFesBase::ClearBaseData() 从实时库中读取系统配置，初始化m_FesBase的内容。 @param int flag 清除m_FesBase标志， 1：清除 0：不清除 - @return kbdSuccess,kbdFailed + @return iotSuccess,iotFailed @retval @history 2020-01-16 thxiao 前置点增加点描述 @@ -194,9 +194,9 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,Table[dict_text_define]::Open error"); - return kbdFailed; + return iotFailed; } - //return kbdFailed;//for test + //return iotFailed;//for test std::vector condInfo; std::vector VecFaultCode; std::vector vecFaultColumn; @@ -211,7 +211,7 @@ int CFesBase::InitBaseData(int flag) { RdbFaultCodeTable.close(); LOGERROR("CFesBase::InitBaseData, dict_text_define.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } for(i=0;i<(int)VecFaultCode.size();i++) { @@ -224,7 +224,7 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbocationTable::Open error"); - return kbdFailed; + return iotFailed; } std::vector VecLocationParam; std::vector vecLocationColumn; @@ -234,7 +234,7 @@ int CFesBase::InitBaseData(int flag) if (ret==false) { LOGERROR("CFesBase::InitBaseData, RdbLocationTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } m_LocationNum = VecLocationParam.size(); if(m_LocationNum>0) @@ -255,7 +255,7 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbRtuTable::Open error"); - return kbdFailed; + return iotFailed; } std::vector VecRtuParam; std::vector vecColumn; @@ -282,7 +282,7 @@ int CFesBase::InitBaseData(int flag) if (ret==false) { LOGERROR("CFesBase::InitBaseData, RdbRtuTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } m_RtuNum = VecRtuParam.size(); if(m_RtuNum>0) @@ -337,13 +337,13 @@ int CFesBase::InitBaseData(int flag) if (ret == false) { LOGERROR("CFesBase::InitBaseData,RdbDevInfoTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbDevInfoTable.selectOneOrder(con, VecDevInfo, vecDevInfoColumn, "rtu_no");//默认顺序 if (ret == false) { LOGERROR("CFesBase::InitBaseData, RdbDevInfoTable.selectOneCondition error!"); - return kbdFailed; + return iotFailed; } RtuPtr->m_DevInfo.RtuNo = RtuPtr->m_Param.RtuNo; if (VecDevInfo.size() > 0) @@ -390,7 +390,7 @@ int CFesBase::InitBaseData(int flag) if (ret == false) { LOGERROR("CFesBase::InitBaseData,RdbDevInfoTable::close error"); - return kbdFailed; + return iotFailed; } @@ -428,14 +428,14 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbAiTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbAiTable.selectOneOrder(con,VecAiParam,vecAiColumn,"dot_no");//默认顺序 //LOGDEBUG("vecAiColumn.size:%d %d",vecAiColumn.size(),ret); if (ret==false) { LOGERROR("CFesBase::InitBaseData, RdbAiTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } RtuPtr->m_MaxAiPoints = 0; count = VecAiParam.size(); @@ -534,7 +534,7 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbAiTable::close error"); - return kbdFailed; + return iotFailed; } //READ DI TABLE @@ -566,13 +566,13 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbDiTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbDiTable.selectOneOrder(con,VecDiParam, vecDiColumn, "dot_no");//默认顺序 if (ret==false) { LOGERROR("CFesBase::InitBaseData, RdbDiTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } RtuPtr->m_MaxDiPoints = 0; count = VecDiParam.size(); @@ -633,7 +633,7 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbDiTable::Open error"); - return kbdFailed; + return iotFailed; } @@ -662,13 +662,13 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbAccTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbAccTable.selectOneOrder(con,VecAccParam, vecAccColumn, "dot_no");//默认顺序 if (ret==false) { LOGERROR("CFesBase::InitBaseData, RdbAccTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } RtuPtr->m_MaxAccPoints = 0; count = VecAccParam.size(); @@ -724,7 +724,7 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbAccTable::close error"); - return kbdFailed; + return iotFailed; } @@ -755,13 +755,13 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbMiTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbMiTable.selectOneOrder(con,VecMiParam, vecMiColumn, "dot_no");//默认顺序 if (ret==false) { LOGERROR("CFesBase::InitBaseData, RdbMiTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } RtuPtr->m_MaxMiPoints = 0; count = VecMiParam.size(); @@ -819,7 +819,7 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbMiTable::close error"); - return kbdFailed; + return iotFailed; } //READ DO TABLE @@ -847,13 +847,13 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbDoTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbDoTable.selectOneOrder(con,VecDoParam, vecDoColumn, "dot_no");//默认顺序 if (ret==false) { LOGERROR("CFesBase::InitBaseData, RdbDoTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } RtuPtr->m_MaxDoPoints = 0; count = VecDoParam.size(); @@ -906,7 +906,7 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbDoTable::close error"); - return kbdFailed; + return iotFailed; } @@ -934,13 +934,13 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbAoTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbAoTable.selectOneOrder(con,VecAoParam, vecAoColumn, "dot_no");//默认顺序 if (ret==false) { LOGERROR("CFesBase::InitBaseData, RdbAoTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } RtuPtr->m_MaxAoPoints = 0; count = VecAoParam.size(); @@ -994,7 +994,7 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbAoTable::close error"); - return kbdFailed; + return iotFailed; } //READ MO TABLE std::vector VecMoParam; @@ -1020,13 +1020,13 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbMoTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbMoTable.selectOneOrder(con,VecMoParam, vecMoColumn, "dot_no");//默认顺序 if (ret==false) { LOGERROR("CFesBase::InitBaseData, RdbMoTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } RtuPtr->m_MaxMoPoints = 0; count = VecMoParam.size(); @@ -1080,7 +1080,7 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbMoTable::close error"); - return kbdFailed; + return iotFailed; } //READ DZ TABLE @@ -1111,13 +1111,13 @@ int CFesBase::InitBaseData(int flag) if (ret == false) { LOGERROR("CFesBase::InitBaseData,RdbDzTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbDzTable.selectOneOrder(con, VecDzParam, vecDzColumn, "dot_no");//默认顺序 if (ret == false) { LOGERROR("CFesBase::InitBaseData, RdbDzTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } RtuPtr->m_MaxDzPoints = 0; count = VecDzParam.size(); @@ -1176,7 +1176,7 @@ int CFesBase::InitBaseData(int flag) if (ret == false) { LOGERROR("CFesBase::InitBaseData,RdbMoTable::close error"); - return kbdFailed; + return iotFailed; } //READ DATA BLOCK @@ -1206,13 +1206,13 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbDataBlockTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbDataBlockTable.selectOneOrder(con,VecDataBlock, vecBlockColumn, "block_id");//默认顺序 if (ret==false) { LOGERROR("CFesBase::InitBaseData, RdbDataBlockTable.selectOneCondition error!"); - return kbdFailed; + return iotFailed; } RtuPtr->m_Param.ModbusCmdBuf.num = VecDataBlock.size(); BlockSeqNo = 0; @@ -1258,7 +1258,7 @@ int CFesBase::InitBaseData(int flag) if(RtuPtr->pTxCmdBuf == NULL) { LOGDEBUG(" fesbase.cpp RtuNo:%d malloc pTxCmdBuf error!",RtuPtr->m_Param.RtuNo); - return kbdFailed; + return iotFailed; } else memset(RtuPtr->pTxCmdBuf,0,sizeof(SModbuTxCmdBuf)); @@ -1269,7 +1269,7 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbDataBlockTable::close error"); - return kbdFailed; + return iotFailed; } @@ -1327,7 +1327,7 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbRtuTable::close error"); - return kbdFailed; + return iotFailed; } //读取实时库CHAN配置 @@ -1381,13 +1381,13 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbChanTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbChanTable.selectNoCondition(VecChanParam, vecChanColumn, "chan_no");//默认顺序 if (ret==false) { LOGERROR("CFesBase::InitBaseData, RdbChanTable.selectOneCondition error!"); - return kbdFailed; + return iotFailed; } m_ChanNum = VecChanParam.size(); if(m_ChanNum>0) @@ -1533,7 +1533,7 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbChanTable::close error"); - return kbdFailed; + return iotFailed; } //设置RTU的采集或转发属性 @@ -1549,13 +1549,13 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbProtocolTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbProtocolTable.selectNoCondition(VecProtocolParam, vecProtocolColumn, "protocol_id");//默认顺序 if (ret==false) { LOGERROR("CFesBase::InitBaseData, RdbProtocolTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } count = VecProtocolParam.size(); @@ -1588,7 +1588,7 @@ int CFesBase::InitBaseData(int flag) if(ret==false) { LOGERROR("CFesBase::InitBaseData,RdbProtocolTable::close error"); - return kbdFailed; + return iotFailed; } FwRtuInit(); @@ -1598,7 +1598,7 @@ int CFesBase::InitBaseData(int flag) LOGDEBUG("FES 初始化配置结束。"); - return kbdSuccess; + return iotSuccess; } /* @@ -1819,7 +1819,7 @@ void CFesBase::FesSimServerWriteChanMon(int num,SFesChanFrame *buffer) * 通过Chan号 读取通道统计数据 * @param ChanNo CHAN号 * @param retStatistics 返回统计数据 - * @return kbdSuccess,kbdFailed + * @return iotSuccess,iotFailed */ int CFesBase::GetChanStatisticsByChanNo(int ChanNo,SFesChanStatistics *retStatistics) { @@ -1832,13 +1832,13 @@ int CFesBase::GetChanStatisticsByChanNo(int ChanNo,SFesChanStatistics *retStatis retStatistics->TxNum = -1; retStatistics->RxNum = -1; retStatistics->ErrNum = -1; - return kbdFailed; + return iotFailed; } pChan = (CFesChanPtr)it->second; retStatistics->TxNum = pChan->m_TxNum; retStatistics->RxNum = pChan->m_RxNum; retStatistics->ErrNum = pChan->m_ErrNum; - return kbdSuccess; + return iotSuccess; } @@ -1846,7 +1846,7 @@ int CFesBase::GetChanStatisticsByChanNo(int ChanNo,SFesChanStatistics *retStatis * @brief CFesBase::ResetChanStatisticsByChanNo * 通过Chan号 清除通道统计数据 * @param ChanNo CHAN号 - * @return kbdSuccess,kbdFailed + * @return iotSuccess,iotFailed */ int CFesBase::ResetChanStatisticsByChanNo(int ChanNo) { @@ -1855,11 +1855,11 @@ int CFesBase::ResetChanStatisticsByChanNo(int ChanNo) it = m_mapChan.find(ChanNo); if(it == m_mapChan.end()) - return kbdFailed; + return iotFailed; pChan = (CFesChanPtr)it->second; pChan->ResetStatisticsNum(); - return kbdSuccess; + return iotSuccess; } @@ -2085,19 +2085,19 @@ bool CFesBase::InitProtocolPointMapping(CFesRtuPtr RtuPtr) if(ret==false) { LOGERROR("RdbAiTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbAiTable.selectOneOrder(con,VecAiParam,vecAiColumn,"res_para_int1");//默认顺序 if (ret==false) { LOGERROR("RdbAiTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } ret = RdbAiTable.close(); if(ret==false) { LOGERROR("RdbAiTable::close error"); - return kbdFailed; + return iotFailed; } count = VecAiParam.size(); if(count>0) @@ -2165,19 +2165,19 @@ bool CFesBase::InitProtocolPointMapping(CFesRtuPtr RtuPtr) if(ret==false) { LOGERROR("RdbDiTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbDiTable.selectOneOrder(con,VecDiParam,vecDiColumn,"res_para_int1");//默认顺序 if (ret==false) { LOGERROR("RdbDiTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } ret = RdbDiTable.close(); if(ret==false) { LOGERROR("RdbDiTable::close error"); - return kbdFailed; + return iotFailed; } count = VecDiParam.size(); if(count>0) @@ -2243,19 +2243,19 @@ bool CFesBase::InitProtocolPointMapping(CFesRtuPtr RtuPtr) if(ret==false) { LOGERROR("RdbAccTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbAccTable.selectOneOrder(con,VecAccParam,vecAccColumn,"res_para_int1");//默认顺序 if (ret==false) { LOGERROR("RdbAccTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } ret = RdbAccTable.close(); if(ret==false) { LOGERROR("RdbAccTable::close error"); - return kbdFailed; + return iotFailed; } count = VecAccParam.size(); @@ -2322,19 +2322,19 @@ bool CFesBase::InitProtocolPointMapping(CFesRtuPtr RtuPtr) if(ret==false) { LOGERROR("RdbMiTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbMiTable.selectOneOrder(con,VecMiParam,vecMiColumn,"res_para_int1");//默认顺序 if (ret==false) { LOGERROR("RdbMiTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } ret = RdbMiTable.close(); if(ret==false) { LOGERROR("RdbMiTable::close error"); - return kbdFailed; + return iotFailed; } count = VecMiParam.size(); if(count>0) @@ -2401,19 +2401,19 @@ bool CFesBase::InitProtocolPointMapping(CFesRtuPtr RtuPtr) if(ret==false) { LOGERROR("RdbDoTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbDoTable.selectOneOrder(con,VecDoParam,vecDoColumn,"res_para_int1");//默认顺序 if (ret==false) { LOGERROR("RdbDoTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } ret = RdbDoTable.close(); if(ret==false) { LOGERROR("RdbDoTable::close error"); - return kbdFailed; + return iotFailed; } count = VecDoParam.size(); if(count>0) @@ -2479,19 +2479,19 @@ bool CFesBase::InitProtocolPointMapping(CFesRtuPtr RtuPtr) if(ret==false) { LOGERROR("RdbAoTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbAoTable.selectOneOrder(con,VecAoParam,vecAoColumn,"res_para_int1");//默认顺序 if (ret==false) { LOGERROR("RdbAoTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } ret = RdbAoTable.close(); if(ret==false) { LOGERROR("RdbAoTable::close error"); - return kbdFailed; + return iotFailed; } count = VecAoParam.size(); if(count>0) @@ -2557,19 +2557,19 @@ bool CFesBase::InitProtocolPointMapping(CFesRtuPtr RtuPtr) if(ret==false) { LOGERROR("RdbMoTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbMoTable.selectOneOrder(con,VecMoParam,vecMoColumn,"res_para_int1");//默认顺序 if (ret==false) { LOGERROR("RdbMoTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } ret = RdbMoTable.close(); if(ret==false) { LOGERROR("RdbMoTable::close error"); - return kbdFailed; + return iotFailed; } count = VecMoParam.size(); if(count>0) @@ -2620,7 +2620,7 @@ bool CFesBase::InitProtocolPointMapping(CFesRtuPtr RtuPtr) } } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/fes/FesChanManageThread.cpp b/product/src/fes/fes/FesChanManageThread.cpp index cc341579..1ebea5e6 100644 --- a/product/src/fes/fes/FesChanManageThread.cpp +++ b/product/src/fes/fes/FesChanManageThread.cpp @@ -89,7 +89,7 @@ CFesChanManageThread::~CFesChanManageThread() int CFesChanManageThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -822,13 +822,13 @@ int CFesChanManageThread::ReadConfigParam() //管理机全局参数默认配置 m_BreakDownFlag = 0; - if(config.load("../../data/fes/","fesConfig.xml")==kbdFailed) + if(config.load("../../data/fes/","fesConfig.xml")==iotFailed) { - return kbdFailed; + return iotFailed; } sprintf(strName,"FESSYS"); - if(config.getIntValue(strName,"chan_controlCom",ivalue) == kbdSuccess) + if(config.getIntValue(strName,"chan_controlCom",ivalue) == iotSuccess) { m_BreakDownFlag = ivalue; } @@ -837,6 +837,6 @@ int CFesChanManageThread::ReadConfigParam() m_BreakDownFlag = 0; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/fes/FesDataSyncThread.cpp b/product/src/fes/fes/FesDataSyncThread.cpp index 5860a4d5..eb074a6b 100644 --- a/product/src/fes/fes/FesDataSyncThread.cpp +++ b/product/src/fes/fes/FesDataSyncThread.cpp @@ -86,7 +86,7 @@ CFesDataSyncThread::~CFesDataSyncThread() int CFesDataSyncThread::beforeExecute() { if(m_ptrCommunicator==NULL) - return kbdFailed; + return iotFailed; //获取通讯器名称（可选） @@ -94,7 +94,7 @@ int CFesDataSyncThread::beforeExecute() m_ptrCommunicator->addSub(m_iAppID, m_iChannelID); // m_ptrCommunicator->addSub(0,CH_MODEL_TO_PUB_NOTICE_DOWN) ;//MODEL - return kbdSuccess; + return iotSuccess; } /* @@ -232,14 +232,14 @@ int CFesDataSyncThread::RtuDataAllResp() m_SendDataFlag=-1; break; } - return kbdSuccess; + return iotSuccess; } /** * @brief CFesDataSyncThread::RtuDiAllResp * 响应读取RTU DI全数据数据请求 * @param RtuNo RTU号 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CFesDataSyncThread::RtuDiAllResp() { @@ -247,7 +247,7 @@ int CFesDataSyncThread::RtuDiAllResp() CFesRtuPtr ptrCFesRtu; if(m_ptrCFesBase==NULL) - return kbdFailed; + return iotFailed; count = m_ptrCFesBase->m_vectCFesRtuPtr.size(); for(i=0;im_vectCFesRtuPtr.size(); for (i = 0; im_vectCFesRtuPtr.size(); for(i=0;im_vectCFesRtuPtr.size(); for(i=0;im_vectCFesRtuPtr.size(); for(i=0;iGetRtuDataByRtuNo(RtuNo))==NULL) - return kbdFailed; + return iotFailed; count = respPkg.stdivalue_size(); @@ -655,7 +655,7 @@ int CFesDataSyncThread::RtuDiResp(const std::string &RecvStr) m_pDiValue = (SFesRtuDiValue*)realloc(m_pDiValue, count * sizeof(SFesRtuDiValue)); if (m_pDiValue == NULL) - return kbdFailed; + return iotFailed; for (i = 0; i < count; i++) { @@ -669,14 +669,14 @@ int CFesDataSyncThread::RtuDiResp(const std::string &RecvStr) if (count > 0) ptrCFesRtu->WriteRtuDiValue(count, m_pDiValue); } - return kbdSuccess; + return iotSuccess; } /** * @brief CFesDataSyncThread::RtuDDiAllResp * 接收部分RTU DDI全数据数据请求，数据更新到对应的点上。 * @param RecvStr 接收数据 -* @return 成功返回kbdSuccess，失败返回kbdFailed +* @return 成功返回iotSuccess，失败返回iotFailed */ int CFesDataSyncThread::RtuDDiResp(const std::string &RecvStr) { @@ -685,12 +685,12 @@ int CFesDataSyncThread::RtuDDiResp(const std::string &RecvStr) SFesDiValueRespPkg respPkg; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; respPkg.ParseFromString(RecvStr); RtuNo = respPkg.nrtuno(); if ((ptrCFesRtu = m_ptrCFesBase->GetRtuDataByRtuNo(RtuNo)) == NULL) - return kbdFailed; + return iotFailed; count = respPkg.stdivalue_size(); if (ptrCFesRtu->m_RtuProperty == CN_Fes_RTU_Forward)//2020-01-10 thxiao 增加转发数据同步 @@ -706,7 +706,7 @@ int CFesDataSyncThread::RtuDDiResp(const std::string &RecvStr) ptrCFesRtu->UpdataFwDDiValue(RtuDiValue); } } - return kbdSuccess; + return iotSuccess; } /** @@ -717,7 +717,7 @@ int CFesDataSyncThread::RtuDDiResp(const std::string &RecvStr) * @param RtuNo RTU号 * @param num 数值个数 * @param buffer 数值缓冲区 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CFesDataSyncThread::RtuAiResp(const std::string &RecvStr) { @@ -727,12 +727,12 @@ int CFesDataSyncThread::RtuAiResp(const std::string &RecvStr) SFesRtuAiValue *pRtuAiValue; if(m_ptrCFesBase==NULL) - return kbdFailed; + return iotFailed; respPkg.ParseFromString(RecvStr); RtuNo = respPkg.nrtuno(); if((ptrCFesRtu = m_ptrCFesBase->GetRtuDataByRtuNo(RtuNo))==NULL) - return kbdFailed; + return iotFailed; count = respPkg.staivalue_size(); @@ -757,7 +757,7 @@ int CFesDataSyncThread::RtuAiResp(const std::string &RecvStr) m_pAiValue = (SFesRtuAiValue*)realloc(m_pAiValue, count * sizeof(SFesRtuAiValue)); if (m_pAiValue == NULL) - return kbdFailed; + return iotFailed; for (i = 0; i < count; i++) { @@ -772,7 +772,7 @@ int CFesDataSyncThread::RtuAiResp(const std::string &RecvStr) ptrCFesRtu->WriteRtuAiValue(count, m_pAiValue); } - return kbdSuccess; + return iotSuccess; } /** @@ -783,7 +783,7 @@ int CFesDataSyncThread::RtuAiResp(const std::string &RecvStr) * @param RtuNo RTU号 * @param num 数值个数 * @param buffer 数值缓冲区 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CFesDataSyncThread::RtuAccResp(const std::string &RecvStr) { @@ -793,12 +793,12 @@ int CFesDataSyncThread::RtuAccResp(const std::string &RecvStr) SFesRtuAccValue *pRtuAccValue; if(m_ptrCFesBase==NULL) - return kbdFailed; + return iotFailed; respPkg.ParseFromString(RecvStr); RtuNo = respPkg.nrtuno(); if((ptrCFesRtu = m_ptrCFesBase->GetRtuDataByRtuNo(RtuNo))==NULL) - return kbdFailed; + return iotFailed; count = respPkg.stpivalue_size(); @@ -823,7 +823,7 @@ int CFesDataSyncThread::RtuAccResp(const std::string &RecvStr) m_pAccValue = (SFesRtuAccValue*)realloc(m_pAccValue, count * sizeof(SFesRtuAccValue)); if (m_pAccValue == NULL) - return kbdFailed; + return iotFailed; for (i = 0; i < count; i++) { @@ -837,14 +837,14 @@ int CFesDataSyncThread::RtuAccResp(const std::string &RecvStr) if (count > 0) ptrCFesRtu->WriteRtuAccValue(count, m_pAccValue); } - return kbdSuccess; + return iotSuccess; } /** * @brief CFesDataSyncThread::RtuMiResp * 接收部分RTU DI全数据数据请求，数据更新到对应的点上。 * @param RecvStr 接收数据 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CFesDataSyncThread::RtuMiResp(const std::string &RecvStr) { @@ -854,12 +854,12 @@ int CFesDataSyncThread::RtuMiResp(const std::string &RecvStr) SFesRtuMiValue *pRtuMiValue; if(m_ptrCFesBase==NULL) - return kbdFailed; + return iotFailed; respPkg.ParseFromString(RecvStr); RtuNo = respPkg.nrtuno(); if((ptrCFesRtu = m_ptrCFesBase->GetRtuDataByRtuNo(RtuNo))==NULL) - return kbdFailed; + return iotFailed; count = respPkg.stmivalue_size(); @@ -884,7 +884,7 @@ int CFesDataSyncThread::RtuMiResp(const std::string &RecvStr) m_pMiValue = (SFesRtuMiValue*)realloc(m_pMiValue, count * sizeof(SFesRtuMiValue)); if (m_pMiValue == NULL) - return kbdFailed; + return iotFailed; for (i = 0; i < count; i++) { @@ -898,7 +898,7 @@ int CFesDataSyncThread::RtuMiResp(const std::string &RecvStr) if (count > 0) ptrCFesRtu->WriteRtuMiValue(count, m_pMiValue); } - return kbdSuccess; + return iotSuccess; } /** * @brief CFesDataSyncThread::SendRtuDataReq diff --git a/product/src/fes/fes/FesFwRxControlCmdThread.cpp b/product/src/fes/fes/FesFwRxControlCmdThread.cpp index 818c2d39..6ee6b2e7 100644 --- a/product/src/fes/fes/FesFwRxControlCmdThread.cpp +++ b/product/src/fes/fes/FesFwRxControlCmdThread.cpp @@ -36,11 +36,11 @@ CFesFwRxControlCmdThread::~CFesFwRxControlCmdThread() int CFesFwRxControlCmdThread::beforeExecute() { if(m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if(m_ptrRxCommunicator==NULL) - return kbdFailed; + return iotFailed; - return kbdSuccess; + return iotSuccess; } /* @@ -121,13 +121,13 @@ int CFesFwRxControlCmdThread::subMessage() if (!m_ptrRxCommunicator->addSub(m_iAppID, CH_FES_TO_FES_CTRL)) { LOGERROR("所有FES之间控制通道订阅失败."); - return kbdFailed; + return iotFailed; } else { LOGINFO("所有FES之间控制通道订阅成功."); } - return kbdSuccess; + return iotSuccess; } //取消消息订阅 @@ -136,7 +136,7 @@ int CFesFwRxControlCmdThread::unsubMessage() if (!m_ptrRxCommunicator->delSub(m_iAppID, CH_FES_TO_FES_CTRL)) { LOGERROR("取消FES之间控制通道订阅失败."); - return kbdFailed; + return iotFailed; } //清空消息总线中的数据 CMbMessage objMsg; @@ -144,7 +144,7 @@ int CFesFwRxControlCmdThread::unsubMessage() { } - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/fes/fes/FesFwTxControlCmdThread.cpp b/product/src/fes/fes/FesFwTxControlCmdThread.cpp index 17fac0f0..50be6b37 100644 --- a/product/src/fes/fes/FesFwTxControlCmdThread.cpp +++ b/product/src/fes/fes/FesFwTxControlCmdThread.cpp @@ -39,11 +39,11 @@ CFesFwTxControlCmdThread::~CFesFwTxControlCmdThread() int CFesFwTxControlCmdThread::beforeExecute() { if(m_ptrTxCommunicator==NULL) - return kbdFailed; + return iotFailed; //获取通讯器名称（可选） - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/fes/FesRedundantManage.cpp b/product/src/fes/fes/FesRedundantManage.cpp index d8bc8530..661d5316 100644 --- a/product/src/fes/fes/FesRedundantManage.cpp +++ b/product/src/fes/fes/FesRedundantManage.cpp @@ -70,7 +70,7 @@ int CFesRedundantManage::redundantSwitch(bool bMaster, bool bSlave) m_bSlave = bSlave; m_ptrProcManage->updateProcessInfo(true,m_bMaster,m_bSlave); - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/fes/FesRxControlCmdThread.cpp b/product/src/fes/fes/FesRxControlCmdThread.cpp index 4724b5c4..3087f402 100644 --- a/product/src/fes/fes/FesRxControlCmdThread.cpp +++ b/product/src/fes/fes/FesRxControlCmdThread.cpp @@ -45,16 +45,16 @@ CFesRxControlCmdThread::~CFesRxControlCmdThread() int CFesRxControlCmdThread::beforeExecute() { if(m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if(m_ptrRxCommunicator==NULL) - return kbdFailed; + return iotFailed; //获取通讯器名称（可选） //添加订阅 //m_ptrRxCommunicator->addSub(m_iAppID, CH_OPT_TO_FES_CTRL_DOWN); - return kbdSuccess; + return iotSuccess; } /* @@ -456,13 +456,13 @@ int CFesRxControlCmdThread::subMessage() if (!m_ptrRxCommunicator->addSub(m_iAppID, CH_OPT_TO_FES_CTRL_DOWN)) { LOGERROR("所有控制下发通道订阅失败."); - return kbdFailed; + return iotFailed; } else { LOGINFO("所有控制下发通道订阅成功."); } - return kbdSuccess; + return iotSuccess; } //取消消息订阅 @@ -471,7 +471,7 @@ int CFesRxControlCmdThread::unsubMessage() if (!m_ptrRxCommunicator->delSub(m_iAppID, CH_OPT_TO_FES_CTRL_DOWN)) { LOGERROR("取消控制下发通道订阅失败."); - return kbdFailed; + return iotFailed; } //清空消息总线中的数据 CMbMessage objMsg; @@ -479,5 +479,5 @@ int CFesRxControlCmdThread::unsubMessage() { } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/fes/FesRxDPDataThread.cpp b/product/src/fes/fes/FesRxDPDataThread.cpp index a1cf3ebf..f98fffd4 100644 --- a/product/src/fes/fes/FesRxDPDataThread.cpp +++ b/product/src/fes/fes/FesRxDPDataThread.cpp @@ -42,11 +42,11 @@ CFesRxDPDataThread::~CFesRxDPDataThread() int CFesRxDPDataThread::beforeExecute() { if(m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if(m_ptrRxCommunicator==NULL) - return kbdFailed; + return iotFailed; - return kbdSuccess; + return iotSuccess; } /* @@ -97,7 +97,7 @@ int CFesRxDPDataThread::subMessage() LOGINFO("变化数据通道订阅成功."); } - return kbdSuccess; + return iotSuccess; } //取消消息订阅 @@ -121,13 +121,13 @@ int CFesRxDPDataThread::unsubMessage() { } - return kbdSuccess; + return iotSuccess; } /* @param recvMessage @brief 从消息总线接收一条消息,没有消息返回FALSE -@return kbdFailed/kbdSuccess +@return iotFailed/iotSuccess @retval */ int CFesRxDPDataThread::readFromBus() @@ -136,7 +136,7 @@ int CFesRxDPDataThread::readFromBus() CMbMessage msgRcv; if (m_ptrRxCommunicator == NULL) - return kbdFailed; + return iotFailed; //1.从消息总线接收消息，没有消息返回FALSE //==================================================================================== @@ -149,34 +149,34 @@ int CFesRxDPDataThread::readFromBus() SRealTimeDataPkg ChangeDataPkg; if (true == ChangeDataPkg.ParseFromArray(msgRcv.getDataPtr(), msgRcv.getDataSize())) { - if (kbdFailed == RxDiChangeData(ChangeDataPkg)) + if (iotFailed == RxDiChangeData(ChangeDataPkg)) { - return kbdFailed; + return iotFailed; } - if (kbdFailed == RxAiChangeData(ChangeDataPkg)) + if (iotFailed == RxAiChangeData(ChangeDataPkg)) { - return kbdFailed; + return iotFailed; } - if (kbdFailed == RxAccChangeData(ChangeDataPkg)) + if (iotFailed == RxAccChangeData(ChangeDataPkg)) { - return kbdFailed; + return iotFailed; } - if (kbdFailed == RxMiChangeData(ChangeDataPkg)) + if (iotFailed == RxMiChangeData(ChangeDataPkg)) { - return kbdFailed; + return iotFailed; } } else { LOGERROR("CFesRxDPDataThread nMessageType=MT_DP_CHANGE_DATA 解析失败"); - return kbdFailed; + return iotFailed; } } } - return kbdSuccess; + return iotSuccess; } /** @@ -264,13 +264,13 @@ int CFesRxDPDataThread::RxDiChangeData(const SRealTimeDataPkg & ChangeDataPkg) catch (std::exception &ex) { LOGERROR("RxDiChangeData Fail,errNo=%s",ex.what()); - return kbdFailed; + return iotFailed; } catch (...) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /** @@ -326,13 +326,13 @@ int CFesRxDPDataThread::RxAiChangeData(const SRealTimeDataPkg & ChangeDataPkg) catch (std::exception &ex) { LOGERROR("RxAiChangeData Fail,errNo=%s",ex.what()); - return kbdFailed; + return iotFailed; } catch (...) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /** @@ -388,13 +388,13 @@ int CFesRxDPDataThread::RxAccChangeData(const SRealTimeDataPkg & ChangeDataPkg) catch (std::exception &ex) { LOGERROR("RxAccChangeData Fail,errNo=%s",ex.what()); - return kbdFailed; + return iotFailed; } catch (...) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -450,13 +450,13 @@ int CFesRxDPDataThread::RxMiChangeData(const SRealTimeDataPkg & ChangeDataPkg) catch (std::exception &ex) { LOGERROR("RxMiChangeData Fail,errNo=%s",ex.what()); - return kbdFailed; + return iotFailed; } catch (...) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -465,7 +465,7 @@ int CFesRxDPDataThread::initialize() if (!CDpcdaForApp::initGlobalThread()) { LOGERROR("初始化订阅点失败"); - return kbdFailed; + return iotFailed; } //初始化订阅点 @@ -473,9 +473,9 @@ int CFesRxDPDataThread::initialize() if (m_ptrCdpcda == NULL) { LOGERROR("创建订阅点失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } //设置为主 @@ -483,7 +483,7 @@ int CFesRxDPDataThread::setMaster() { subMessage(); subScribe(); - return kbdSuccess; + return iotSuccess; } //设置为备 @@ -491,7 +491,7 @@ int CFesRxDPDataThread::setSlave() { m_ptrCdpcda->unsubscribeAll(); unsubMessage(); - return kbdSuccess; + return iotSuccess; } //订阅点DP数据 diff --git a/product/src/fes/fes/FesRxDataUpDateThread.cpp b/product/src/fes/fes/FesRxDataUpDateThread.cpp index 0cb1aab3..92f080b0 100644 --- a/product/src/fes/fes/FesRxDataUpDateThread.cpp +++ b/product/src/fes/fes/FesRxDataUpDateThread.cpp @@ -89,7 +89,7 @@ CFesRxDataUpDateThread::~CFesRxDataUpDateThread() int CFesRxDataUpDateThread::beforeExecute() { //if(m_ptrRxCommunicator==NULL) - // return kbdFailed; + // return iotFailed; //获取通讯器名称（可选） @@ -100,7 +100,7 @@ int CFesRxDataUpDateThread::beforeExecute() LOGINFO("CFesRxDataUpDateThread::beforeExecute() "); - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/fes/FesRxFesDataThread.cpp b/product/src/fes/fes/FesRxFesDataThread.cpp index 5aeb06cb..988d7e60 100644 --- a/product/src/fes/fes/FesRxFesDataThread.cpp +++ b/product/src/fes/fes/FesRxFesDataThread.cpp @@ -40,11 +40,11 @@ CFesRxFesDataThread::~CFesRxFesDataThread() int CFesRxFesDataThread::beforeExecute() { if(m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if(m_ptrRxCommunicator==NULL) - return kbdFailed; + return iotFailed; - return kbdSuccess; + return iotSuccess; } /* @@ -94,7 +94,7 @@ int CFesRxFesDataThread::subMessage() } - return kbdSuccess; + return iotSuccess; } //取消消息订阅 @@ -118,7 +118,7 @@ int CFesRxFesDataThread::unsubMessage() { } - return kbdSuccess; + return iotSuccess; } @@ -275,14 +275,14 @@ bool CFesRxFesDataThread::readFromBus() int CFesRxFesDataThread::setMaster() { subMessage(); - return kbdSuccess; + return iotSuccess; } //设置为备 int CFesRxFesDataThread::setSlave() { unsubMessage(); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/fes/FesSimServerThread.cpp b/product/src/fes/fes/FesSimServerThread.cpp index de4e2f4d..9f7033d8 100644 --- a/product/src/fes/fes/FesSimServerThread.cpp +++ b/product/src/fes/fes/FesSimServerThread.cpp @@ -67,9 +67,9 @@ CFesSimServerThread::~CFesSimServerThread() int CFesSimServerThread::beforeExecute() { if(m_ptrCFesBase==NULL) - return kbdFailed; + return iotFailed; - return kbdSuccess; + return iotSuccess; } /* @@ -202,7 +202,7 @@ int CFesSimServerThread::Init(int PortNo,int ListenNum) { m_NetPort = PortNo; m_ListenNum = ListenNum; - return kbdSuccess; + return iotSuccess; } int CFesSimServerThread::InitServerSock(int PortNo, int AcceptNum) diff --git a/product/src/fes/fes/FesTxControlCmdThread.cpp b/product/src/fes/fes/FesTxControlCmdThread.cpp index 7f134262..d01e72c8 100644 --- a/product/src/fes/fes/FesTxControlCmdThread.cpp +++ b/product/src/fes/fes/FesTxControlCmdThread.cpp @@ -42,11 +42,11 @@ CFesTxControlCmdThread::~CFesTxControlCmdThread() int CFesTxControlCmdThread::beforeExecute() { if(m_ptrTxCommunicator==NULL) - return kbdFailed; + return iotFailed; //获取通讯器名称（可选） - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/fes/FesTxDataChangeThread.cpp b/product/src/fes/fes/FesTxDataChangeThread.cpp index 627c0a9c..28607e07 100644 --- a/product/src/fes/fes/FesTxDataChangeThread.cpp +++ b/product/src/fes/fes/FesTxDataChangeThread.cpp @@ -135,13 +135,13 @@ CFesTxDataChangeThread::~CFesTxDataChangeThread() int CFesTxDataChangeThread::beforeExecute() { if(m_ptrTxCommunicator==NULL) - return kbdFailed; + return iotFailed; //添加订阅 // m_ptrTxCommunicator->addSub(m_iDomainID, m_iSpecialtyID, m_iChannelID); - return kbdSuccess; + return iotSuccess; } /* @@ -235,7 +235,7 @@ void CFesTxDataChangeThread::afterExecute() * @brief CFesTxDataChangeThread::DiChangeResp * * 读取所有DI变化数据 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ #if 0 int CFesTxDataChangeThread::DiChangeResp() @@ -248,7 +248,7 @@ int CFesTxDataChangeThread::DiChangeResp() SFesChgDi *pChgDi; if(m_ptrCFesBase==NULL) - return kbdFailed; + return iotFailed; size_t i = 0; count = 0; @@ -323,7 +323,7 @@ int CFesTxDataChangeThread::DiChangeResp() else m_ptrCFesBase->m_LastRtuIndx.iDiChgRtu=i; - return kbdSuccess; + return iotSuccess; } #endif @@ -343,7 +343,7 @@ int CFesTxDataChangeThread::DiChangeResp() //uint64 mSec; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; //mSec = getUTCTimeMsec(); size_t i = 0; @@ -466,7 +466,7 @@ int CFesTxDataChangeThread::DiChangeResp() else m_ptrCFesBase->m_LastRtuIndx.iDiChgRtu = i; - return kbdSuccess; + return iotSuccess; } #endif @@ -474,7 +474,7 @@ int CFesTxDataChangeThread::DiChangeResp() * @brief CFesTxDataChangeThread::AiChangeResp * * 读取所有AI变化数据 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CFesTxDataChangeThread::AiChangeResp() { @@ -486,7 +486,7 @@ int CFesTxDataChangeThread::AiChangeResp() SFesChgAi *pChgAi; if(m_ptrCFesBase==NULL) - return kbdFailed; + return iotFailed; size_t i = 0; count = 0; @@ -564,14 +564,14 @@ int CFesTxDataChangeThread::AiChangeResp() //LOGINFO("AiChangeResp end %lld",mSec); - return kbdSuccess; + return iotSuccess; } /** * @brief CFesTxDataChangeThread::AccChangeResp * * 读取所有MI变化数据 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CFesTxDataChangeThread::AccChangeResp() { @@ -583,7 +583,7 @@ int CFesTxDataChangeThread::AccChangeResp() SFesChgAcc *pChgAcc; if(m_ptrCFesBase==NULL) - return kbdFailed; + return iotFailed; size_t i = 0; startIndex = m_ptrCFesBase->m_LastRtuIndx.iAccChgRtu; @@ -654,7 +654,7 @@ int CFesTxDataChangeThread::AccChangeResp() m_ptrCFesBase->m_LastRtuIndx.iAccChgRtu=0; else m_ptrCFesBase->m_LastRtuIndx.iAccChgRtu=i; - return kbdSuccess; + return iotSuccess; } @@ -663,7 +663,7 @@ int CFesTxDataChangeThread::AccChangeResp() * @brief CFesTxDataChangeThread::MiChangeResp * * 读取所有Mi变化数据 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CFesTxDataChangeThread::MiChangeResp() { @@ -675,7 +675,7 @@ int CFesTxDataChangeThread::MiChangeResp() SFesChgMi *pChgMi; if(m_ptrCFesBase==NULL) - return kbdFailed; + return iotFailed; size_t i = 0; count = 0; @@ -749,14 +749,14 @@ int CFesTxDataChangeThread::MiChangeResp() else m_ptrCFesBase->m_LastRtuIndx.iMiChgRtu=i; - return kbdSuccess; + return iotSuccess; } /** * @brief CFesTxDataChangeThread::SoeEventResp * * 读取所有SOE EVENT数据 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CFesTxDataChangeThread::SoeEventResp() { @@ -769,7 +769,7 @@ int CFesTxDataChangeThread::SoeEventResp() size_t i = 0; if(m_ptrCFesBase==NULL) - return kbdFailed; + return iotFailed; count = 0; startIndex = m_ptrCFesBase->m_LastRtuIndx.iSoeEventRtu; @@ -854,7 +854,7 @@ int CFesTxDataChangeThread::SoeEventResp() else m_ptrCFesBase->m_LastRtuIndx.iSoeEventRtu=i; - return kbdSuccess; + return iotSuccess; } /** @@ -895,7 +895,7 @@ bool CFesTxDataChangeThread::getSoeFaultStr(const SFesSoeEvent*pEvent,string &st * @brief CFesTxDataChangeThread::ChanEventResp * * 读取所有Chan EVENT数据 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CFesTxDataChangeThread::ChanEventResp() { @@ -904,7 +904,7 @@ int CFesTxDataChangeThread::ChanEventResp() if (m_ptrCFesBase == NULL) { LOGERROR("ChanEventResp:: m_ptrCFesBase == NULL ,Error return !!!"); - return kbdFailed; + return iotFailed; } while (m_ptrCFesBase->ReadChanEvent(1, &stFesChanEvent) > 0)//2021-06-04 thxiao 从base结构m_ChanEventBuf发出 @@ -913,14 +913,14 @@ int CFesTxDataChangeThread::ChanEventResp() } m_ptrDataPublish->sendAlarm(); - return kbdSuccess; + return iotSuccess; } /** * @brief CFesTxDataChangeThread::RtuEventResp * * 读取所有Rtu EVENT数据 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CFesTxDataChangeThread::RtuEventResp() { @@ -929,7 +929,7 @@ int CFesTxDataChangeThread::RtuEventResp() if(m_ptrCFesBase==NULL) { LOGERROR("RtuEventResp:: m_ptrCFesBase == NULL ,Error return !!!"); - return kbdFailed; + return iotFailed; } for (size_t i = 0; i < m_ptrCFesBase->m_vectCFesRtuPtr.size(); i++) @@ -947,12 +947,12 @@ int CFesTxDataChangeThread::RtuEventResp() else { LOGERROR("RtuEventResp:: ptrCFesRtu == NULL ,Error return !!!"); - return kbdFailed; + return iotFailed; } } m_ptrDataPublish->sendAlarm(); - return kbdSuccess; + return iotSuccess; } @@ -1058,7 +1058,7 @@ int CFesTxDataChangeThread::SoeStrEventResp() SFesSoeStrEvent Event; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; count = 0; startIndex = m_ptrCFesBase->m_LastRtuIndx.iSoeEventRtu; @@ -1134,5 +1134,5 @@ int CFesTxDataChangeThread::SoeStrEventResp() else m_ptrCFesBase->m_LastRtuIndx.iSoeStrEventRtu = i; - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/fes/FesTxEventThread.cpp b/product/src/fes/fes/FesTxEventThread.cpp index 99f05a1d..620ba568 100644 --- a/product/src/fes/fes/FesTxEventThread.cpp +++ b/product/src/fes/fes/FesTxEventThread.cpp @@ -56,14 +56,14 @@ CFesTxEventThread::~CFesTxEventThread() int CFesTxEventThread::beforeExecute() { if(m_ptrTxCommunicator==NULL) - return kbdFailed; + return iotFailed; //获取通讯器名称（可选） //添加订阅 //m_ptrTxCommunicator->addSub(m_iAppID, m_iChannelID); - return kbdSuccess; + return iotSuccess; } /* @@ -101,7 +101,7 @@ void CFesTxEventThread::afterExecute() * @brief CFesTxEventThread::SoeEventReport * * 读取所有SOE EVENT数据 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CFesTxEventThread::SoeEventReport() { @@ -110,7 +110,7 @@ int CFesTxEventThread::SoeEventReport() CFesRtuPtr ptrCFesRtu; if(m_ptrCFesBase==NULL) - return kbdFailed; + return iotFailed; for(i=0;im_vectCFesRtuPtr.size();i++) { @@ -135,10 +135,10 @@ int CFesTxEventThread::SoeEventReport() if(ret==false) { PrintError("CFesTxEventThread Soe Event sendMsgToPeer failed.\n"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -146,7 +146,7 @@ int CFesTxEventThread::SoeEventReport() * @brief CFesTxEventThread::ChanEventReport * * 读取所有Chan EVENT数据 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CFesTxEventThread::ChanEventReport() { @@ -155,7 +155,7 @@ int CFesTxEventThread::ChanEventReport() CFesRtuPtr ptrCFesRtu; if(m_ptrCFesBase==NULL) - return kbdFailed; + return iotFailed; for(i=0;im_vectCFesRtuPtr.size();i++) { @@ -180,10 +180,10 @@ int CFesTxEventThread::ChanEventReport() if(ret==false) { PrintError("CFesTxEventThread Chan Event sendMsgToPeer failed.\n"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -192,7 +192,7 @@ int CFesTxEventThread::ChanEventReport() * @brief CFesTxEventThread::RtuEventReport * * 读取所有Rtu EVENT数据 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CFesTxEventThread::RtuEventReport() { @@ -201,7 +201,7 @@ int CFesTxEventThread::RtuEventReport() CFesRtuPtr ptrCFesRtu; if(m_ptrCFesBase==NULL) - return kbdFailed; + return iotFailed; for(i=0;im_vectCFesRtuPtr.size();i++) { @@ -237,10 +237,10 @@ int CFesTxEventThread::RtuEventReport() if(ret==false) { PrintError("CFesTxEventThread Chan Event sendMsgToPeer failed.\n"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/fes/FesWaveFormThread.cpp b/product/src/fes/fes/FesWaveFormThread.cpp index 19b98ada..671addd9 100644 --- a/product/src/fes/fes/FesWaveFormThread.cpp +++ b/product/src/fes/fes/FesWaveFormThread.cpp @@ -47,7 +47,7 @@ CFesWaveFormThread::~CFesWaveFormThread() int CFesWaveFormThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } void CFesWaveFormThread::execute() @@ -65,7 +65,7 @@ void CFesWaveFormThread::afterExecute() int CFesWaveFormThread::SendWaveData() { if(m_ptrCFesBase==NULL) - return kbdFailed; + return iotFailed; int num = 0; while((num = m_ptrCFesBase->GetWaveFormNum())>0) { @@ -85,7 +85,7 @@ int CFesWaveFormThread::SendWaveData() } } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/fesSim/CascoAtsSim/main.cpp b/product/src/fes/fesSim/CascoAtsSim/main.cpp index c0a6bcac..e30256ab 100644 --- a/product/src/fes/fesSim/CascoAtsSim/main.cpp +++ b/product/src/fes/fesSim/CascoAtsSim/main.cpp @@ -5,7 +5,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); MainWindow w; diff --git a/product/src/fes/fesSim/FesSim/TcpClient.cpp b/product/src/fes/fesSim/FesSim/TcpClient.cpp index db26eba7..c9e99f74 100644 --- a/product/src/fes/fesSim/FesSim/TcpClient.cpp +++ b/product/src/fes/fesSim/FesSim/TcpClient.cpp @@ -74,7 +74,7 @@ int CTcpClient::TcpConnect() m_Socket = socket(AF_INET, SOCK_STREAM, 0); if (m_Socket == INVALID_SOCKET) { - return kbdFailed; + return iotFailed; } int port; @@ -86,7 +86,7 @@ int CTcpClient::TcpConnect() if ((int)sin.sin_addr.s_addr == (-1)) { closesocket(m_Socket); - return kbdFailed; + return iotFailed; } sin.sin_family = AF_INET; sin.sin_port = htons(port); @@ -103,7 +103,7 @@ int CTcpClient::TcpConnect() printf("TcpClient.cpp unable to connect to %s:%d, ret_code = %d", host, port, ret_code); TcpClose(); - return kbdFailed; + return iotFailed; } printf("TcpClient.cpp Succeed in connect to RTU < %s:%d > ...", inet_ntoa(sin.sin_addr),sin.sin_port); time(&m_RecvTime); @@ -111,7 +111,7 @@ int CTcpClient::TcpConnect() m_HeartBeatCount = 0; m_LinkStatus = 1; emit NetConnected(); //发送连接成功信号 - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/fesSim/FesSim/main.cpp b/product/src/fes/fesSim/FesSim/main.cpp index 5686cc77..e6af8791 100644 --- a/product/src/fes/fesSim/FesSim/main.cpp +++ b/product/src/fes/fesSim/FesSim/main.cpp @@ -6,7 +6,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); MainWindow w; diff --git a/product/src/fes/fesSim/FesSim/selectappdlg.cpp b/product/src/fes/fesSim/FesSim/selectappdlg.cpp index 107bd0b9..76997456 100644 --- a/product/src/fes/fesSim/FesSim/selectappdlg.cpp +++ b/product/src/fes/fesSim/FesSim/selectappdlg.cpp @@ -109,7 +109,7 @@ void SelectAppDlg::OnConnect() strcpy(m_IpAddr,ba.data()); m_TcpClient.Init(m_IpAddr,m_NetPortNo); - if(m_TcpClient.TcpConnect()==kbdSuccess) + if(m_TcpClient.TcpConnect()==iotSuccess) { } else diff --git a/product/src/fes/fesSim/PisSim/main.cpp b/product/src/fes/fesSim/PisSim/main.cpp index c0a6bcac..e30256ab 100644 --- a/product/src/fes/fesSim/PisSim/main.cpp +++ b/product/src/fes/fesSim/PisSim/main.cpp @@ -5,7 +5,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); MainWindow w; diff --git a/product/src/fes/iec61850/clientScout/main.cpp b/product/src/fes/iec61850/clientScout/main.cpp index 8d202b35..1efb1086 100644 --- a/product/src/fes/iec61850/clientScout/main.cpp +++ b/product/src/fes/iec61850/clientScout/main.cpp @@ -7,7 +7,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); IEC850C::loadSysModelAppInfoForClientScout(); diff --git a/product/src/fes/iec61850/clientScout/main/main.cpp b/product/src/fes/iec61850/clientScout/main/main.cpp index a5d1a344..3ff320da 100644 --- a/product/src/fes/iec61850/clientScout/main/main.cpp +++ b/product/src/fes/iec61850/clientScout/main/main.cpp @@ -16,7 +16,7 @@ #include "../widgets/mainwindow.h" int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); diff --git a/product/src/fes/iec61850/communication/IEC850C_FESClient.cpp b/product/src/fes/iec61850/communication/IEC850C_FESClient.cpp index c64d65f8..835f3d16 100644 --- a/product/src/fes/iec61850/communication/IEC850C_FESClient.cpp +++ b/product/src/fes/iec61850/communication/IEC850C_FESClient.cpp @@ -896,7 +896,7 @@ void get_ctrl_return(const SIEC61850CtrlReq *pCmd, SIEC61850CtrlResp &ControlRe int FES_Control(const int ChanNo, const int Timeout,const std::vector& CtrlReq,std::vector& CtrlResp) { - int kbdSuccess = EN_ARE_SUCCESS; + int iotSuccess = EN_ARE_SUCCESS; mvl_net_info *conn = GetMvlNetInfobyChanNo(ChanNo); if(conn == NULL) { @@ -958,10 +958,10 @@ int FES_Control(const int ChanNo, const int Timeout,const std::vectorm_ComThreadRun, ptrMainFesChan->m_DataThreadRun); if ((CloseFlag == CN_FesChanThread_Flag) || (CloseFlag == CN_FesChanAndDataThread_Flag)) @@ -236,7 +236,7 @@ int CHttpServer_szdt::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -257,7 +257,7 @@ int CHttpServer_szdt::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /* @@ -286,7 +286,7 @@ void CHttpServer_szdt::ClearDataProcThreadByChanNo(int ChanNo) int CHttpServer_szdt::ExitSystem(int flag) { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/Testexample/httpServer_szdt/HttpServer_szdtDataProcThread.cpp b/product/src/fes/protocol/Testexample/httpServer_szdt/HttpServer_szdtDataProcThread.cpp index a0cf66c8..98e2e7df 100644 --- a/product/src/fes/protocol/Testexample/httpServer_szdt/HttpServer_szdtDataProcThread.cpp +++ b/product/src/fes/protocol/Testexample/httpServer_szdt/HttpServer_szdtDataProcThread.cpp @@ -139,7 +139,7 @@ void subPowerRealTime() int CHttpServer_szdtDataProcThread::beforeExecute() { subPowerRealTime(); - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjc.cpp b/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjc.cpp index 4c3d9ca8..9441ea14 100644 --- a/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjc.cpp +++ b/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjc.cpp @@ -13,31 +13,31 @@ mg_mgr mgr; //用于管理连接、事件等的Manager int EX_SetBaseAddr(void *address) { HttpsSer_bjjc.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { HttpsSer_bjjc.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo, int ChanNo, int OpenFlag) { HttpsSer_bjjc.OpenChan(MainChanNo, ChanNo, OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo, int ChanNo, int CloseFlag) { HttpsSer_bjjc.CloseChan(MainChanNo, ChanNo, CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { HttpsSer_bjjc.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) @@ -46,7 +46,7 @@ int EX_ExitSystem(int flag) g_HttpsSer_bjjcChanelRun = false;//使所有的线程退出。 HttpsSer_bjjc.ExitSystem(flag); LOGDEBUG("HttpsSer_bjjc ExitSystem() end"); - return kbdSuccess; + return iotSuccess; } CHttpsSer_bjjc::CHttpsSer_bjjc() @@ -77,14 +77,14 @@ int CHttpsSer_bjjc::SetBaseAddr(void *address) m_ptrCFesBase = (CFesBase *)address; } //ReadConfigParam(); - return kbdSuccess; + return iotSuccess; } int CHttpsSer_bjjc::SetProperty(int IsMainFes) { g_HttpsSer_bjjcIsMainFes = IsMainFes; LOGDEBUG("CHttpsSer_bjjc::SetProperty g_HttpsSer_bjjcIsMainFes:%d", IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -93,7 +93,7 @@ int CHttpsSer_bjjc::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CHttpsSer_bjjc::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) { @@ -101,12 +101,12 @@ int CHttpsSer_bjjc::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if ((ptrMainFesChan = GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((ptrFesChan = GetChanDataByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; if (m_HttpHttpsServerListenThreadFlag) { @@ -133,7 +133,7 @@ int CHttpsSer_bjjc::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) nc = mg_bind_opt(&mgr, s_http_port, ev_handler,bind_opts); if (nc == NULL) { LOGERROR("创建https端口%s监听失败", s_http_port); - return kbdFailed; + return iotFailed; } } @@ -147,7 +147,7 @@ int CHttpsSer_bjjc::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -170,7 +170,7 @@ int CHttpsSer_bjjc::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -179,7 +179,7 @@ int CHttpsSer_bjjc::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CHttpsSer_bjjc::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) { @@ -187,12 +187,12 @@ int CHttpsSer_bjjc::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if ((ptrMainFesChan = GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((ptrFesChan = GetChanDataByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CHttpsSer_bjjc::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d", MainChanNo, ChanNo, ptrFesChan->m_ComThreadRun, ptrMainFesChan->m_DataThreadRun); if ((CloseFlag == CN_FesChanThread_Flag) || (CloseFlag == CN_FesChanAndDataThread_Flag)) @@ -208,7 +208,7 @@ int CHttpsSer_bjjc::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -228,7 +228,7 @@ int CHttpsSer_bjjc::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /* @@ -266,12 +266,12 @@ int CHttpsSer_bjjc::ChanTimer(int MainChanNo) if ((s_received_signal == 0) && (runflag == true)) { mg_mgr_poll(&mgr, 200); } - return kbdSuccess; + return iotSuccess; } int CHttpsSer_bjjc::ExitSystem(int flag) { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjcDataProcThread.cpp b/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjcDataProcThread.cpp index 905cdb0f..c1d7b155 100644 --- a/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjcDataProcThread.cpp +++ b/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjcDataProcThread.cpp @@ -138,7 +138,7 @@ void subPowerRealTime() int CHttpsSer_bjjcDataProcThread::beforeExecute() { subPowerRealTime(); - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/protocol/Testexample/iec61850client2/IEC61850c.cpp b/product/src/fes/protocol/Testexample/iec61850client2/IEC61850c.cpp index 4886283d..eb4cbd2d 100644 --- a/product/src/fes/protocol/Testexample/iec61850client2/IEC61850c.cpp +++ b/product/src/fes/protocol/Testexample/iec61850client2/IEC61850c.cpp @@ -30,43 +30,43 @@ int EX_SetBaseAddr(void *address) IEC61850c.LoadProtocolDllFlag = 1; IEC61850c.InitRTUData(); appid = IEC61850c.GetAppId(); - if (InitLibrary(appid) == kbdFailed) + if (InitLibrary(appid) == iotFailed) { LOGERROR("InitLibrary 失败！"); } } - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { IEC61850c.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { IEC61850c.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { IEC61850c.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { IEC61850c.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_IEC61850cChanelRun=false;//使所有的线程退出。 - return kbdSuccess; + return iotSuccess; } CIEC61850c::CIEC61850c() @@ -104,7 +104,7 @@ int CIEC61850c::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*)"iec61850client2"); } - return kbdSuccess; + return iotSuccess; } int CIEC61850c::SetProperty(int IsMainFes) @@ -131,7 +131,7 @@ int CIEC61850c::SetProperty(int IsMainFes) g_IEC61850cIsMainFes = IsMainFes; LOGINFO("g_IEC61850cIsMainFes=%d", IsMainFes); } - return kbdSuccess; + return iotSuccess; } /** @@ -140,7 +140,7 @@ int CIEC61850c::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC61850c::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -150,19 +150,19 @@ int CIEC61850c::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) int appid; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; /* if (!LoadProtocolDllFlag) { LoadProtocolDllFlag = 1; InitRTUData(); appid = GetAppId(); - if (InitLibrary(appid) == kbdFailed) + if (InitLibrary(appid) == iotFailed) { LOGERROR("InitLibrary 失败！"); } @@ -170,7 +170,7 @@ int CIEC61850c::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) */ if ((RTUPtr = GetRtuPtrByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -187,7 +187,7 @@ int CIEC61850c::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CIEC61850c EX_OpenChan() ChanNo:%d create CIEC61850cDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); m_DataProcThreadMap[ptrFesChan->m_Param.ChanNo] = ptrCDataProc; @@ -199,7 +199,7 @@ int CIEC61850c::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) } } } - return kbdSuccess; + return iotSuccess; } @@ -209,7 +209,7 @@ int CIEC61850c::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC61850c::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -217,12 +217,12 @@ int CIEC61850c::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) { @@ -238,7 +238,7 @@ int CIEC61850c::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -249,7 +249,7 @@ int CIEC61850c::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int CIEC61850c::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } void CIEC61850c::ClearDataProcThreadByChanNo(int ChanNo) @@ -405,25 +405,25 @@ void CIEC61850c::InformDataProcThreadIsMainFes(int IsMainFes) /** * @brief CIEC104::ReadConfigParam * 读取IEC104配置文件 -* @return 成功返回kbdSuccess，失败返回kbdFailed +* @return 成功返回iotSuccess，失败返回iotFailed */ int CIEC61850c::ReadConfigParam() { CCommonConfigParse config; int ivalue; - if (config.load("../../data/fes/", "iec61850client2.xml") == kbdFailed) + if (config.load("../../data/fes/", "iec61850client2.xml") == iotFailed) { LOGDEBUG("iec61850client2 load iec61850client2.xml error"); - return kbdSuccess; + return iotSuccess; } LOGDEBUG("iec61850client2 load iec61850client2.xml ok"); m_logEnable = 0; - if (config.getIntValue("config", "clientlogEx_enable", ivalue) == kbdSuccess) + if (config.getIntValue("config", "clientlogEx_enable", ivalue) == iotSuccess) { m_logEnable = ivalue; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/Testexample/iec61850client2/IEC61850cDataProcThread.cpp b/product/src/fes/protocol/Testexample/iec61850client2/IEC61850cDataProcThread.cpp index 4c8bd083..6828c033 100644 --- a/product/src/fes/protocol/Testexample/iec61850client2/IEC61850cDataProcThread.cpp +++ b/product/src/fes/protocol/Testexample/iec61850client2/IEC61850cDataProcThread.cpp @@ -78,7 +78,7 @@ CIEC61850cDataProcThread::~CIEC61850cDataProcThread() */ int CIEC61850cDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/protocol/Testexample/iec61850client2/KBD_dll.cpp b/product/src/fes/protocol/Testexample/iec61850client2/KBD_dll.cpp index 27653941..380fdd5e 100644 --- a/product/src/fes/protocol/Testexample/iec61850client2/KBD_dll.cpp +++ b/product/src/fes/protocol/Testexample/iec61850client2/KBD_dll.cpp @@ -103,7 +103,7 @@ int InitLibrary() if (g_IEC61850Dll == NULL) { LOGERROR("Create g_IEC61850Dll failed."); - return kbdFailed; + return iotFailed; } #ifdef WIN32 ret = g_IEC61850Dll->load("libiec61850c.dll"); @@ -117,7 +117,7 @@ int InitLibrary() #else LOGERROR("Load protocol libiec61850c.so failed."); #endif - return kbdFailed; + return iotFailed; } else { @@ -130,21 +130,21 @@ int InitLibrary() if (Fes_Connect == NULL) { LOGERROR("findFunction FES_Connect error"); - return kbdFailed; + return iotFailed; } Fes_Disconnect = (FES_DISCONNECT)g_IEC61850Dll->findFunction("FES_Disconnect"); if (Fes_Disconnect == NULL) { LOGERROR("findFunction FES_Disconnect error"); - return kbdFailed; + return iotFailed; } Fes_RegConnectStatusCallback = (FES_REG_CONNECTSTATUSCALLBACK)g_IEC61850Dll->findFunction("FES_RegConnentStatusCallback"); if (Fes_RegConnectStatusCallback == NULL) { LOGERROR("findFunction Fes_RegConnentStatus error"); - return kbdFailed; + return iotFailed; } Fes_RegConnectStatusCallback(FES_ConnectStatusCallback); @@ -152,7 +152,7 @@ int InitLibrary() if (Fes_RegRptStatusCallback == NULL) { LOGERROR("findFunction FES_RegRptStatusCallback error"); - return kbdFailed; + return iotFailed; } Fes_RegRptStatusCallback(FES_RptStatusCallback); @@ -160,7 +160,7 @@ int InitLibrary() if (Fes_RegReportCallback == NULL) { LOGERROR("findFunction FES_RegReportCallback error"); - return kbdFailed; + return iotFailed; } Fes_RegReportCallback(FES_ReportCallback); @@ -168,14 +168,14 @@ int InitLibrary() if (Fes_Control == NULL) { LOGERROR("findFunction FES_Control error"); - return kbdFailed; + return iotFailed; } Fes_RegControlCallback = (FES_REG_CONTROLCALLBACK)g_IEC61850Dll->findFunction("FES_RegControlCallback"); if (Fes_RegControlCallback == NULL) { LOGERROR("findFunction Fes_RegConnentStatus error"); - return kbdFailed; + return iotFailed; } Fes_RegControlCallback(FES_ControlCallback); @@ -183,45 +183,45 @@ int InitLibrary() if (Fes_ReadSGValue == NULL) { LOGERROR("findFunction FES_ReadSGValue error"); - return kbdFailed; + return iotFailed; } Fes_WriteSEValue = (FES_WRITESEVALUE)g_IEC61850Dll->findFunction("FES_WriteSEValue"); if (Fes_WriteSEValue == NULL) { LOGERROR("findFunction FES_WriteSEValue error"); - return kbdFailed; + return iotFailed; } Fes_ConfirmEditSGValue = (FES_CONFIRMEDITSGVALUE)g_IEC61850Dll->findFunction("FES_ConfirmEditSGValue"); if (Fes_ConfirmEditSGValue == NULL) { LOGERROR("findFunction FES_ConfirmEditSGValue error"); - return kbdFailed; + return iotFailed; } Fes_SelectActiveSG = (FES_SELECTACTIVESG)g_IEC61850Dll->findFunction("FES_SelectActiveSG"); if (Fes_SelectActiveSG == NULL) { LOGERROR("findFunction FES_SelectActiveSG error"); - return kbdFailed; + return iotFailed; } Fes_ReadParameterValue = (FES_READPARAMETERVALUE)g_IEC61850Dll->findFunction("FES_ReadParameterValue"); if (Fes_ReadParameterValue == NULL) { LOGERROR("findFunction FES_ReadParameterValue error"); - return kbdFailed; + return iotFailed; } Fes_WriteParameterValue = (FES_WRITEPARAMETERVALUE)g_IEC61850Dll->findFunction("FES_WriteParameterValue"); if (Fes_WriteParameterValue == NULL) { LOGERROR("findFunction FES_WriteParameterValue error"); - return kbdFailed; + return iotFailed; } } - return kbdSuccess; + return iotSuccess; } #endif @@ -242,7 +242,7 @@ int FreeLibrary() } LOGDEBUG("FreeLibrary() 结束"); - return kbdSuccess; + return iotSuccess; } @@ -271,7 +271,7 @@ int InitLibrary(int AppId) iec61850dll.FES_RegRptStatusCallback(FES_RptStatusCallback); iec61850dll.FES_RegReportCallback(FES_ReportCallback); iec61850dll.FES_RegControlCallback(FES_ControlCallback); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/Testexample/iec61850dll2/IEC61850dll.cpp b/product/src/fes/protocol/Testexample/iec61850dll2/IEC61850dll.cpp index b1e8247b..4b9ea357 100644 --- a/product/src/fes/protocol/Testexample/iec61850dll2/IEC61850dll.cpp +++ b/product/src/fes/protocol/Testexample/iec61850dll2/IEC61850dll.cpp @@ -71,19 +71,19 @@ void WriteParamResp(); int FES_Connect(const int ChanNo, const int EnableReport) { IEC61850dll.FES_Connect(ChanNo, EnableReport); - return kbdSuccess; + return iotSuccess; } int FES_Disconnect(const int ChanNo) { IEC61850dll.FES_Disconnect(ChanNo); - return kbdSuccess; + return iotSuccess; } int FES_Control(const int ChanNo, const int Timeout, const std::vector& Req, std::vector& Resp) { IEC61850dll.FES_Control(ChanNo, Timeout, Req, Resp); - return kbdSuccess; + return iotSuccess; } @@ -140,7 +140,7 @@ int FES_ReadSGValue(const int ChanNo, const int Timeout, const int GroupNo, std: respValue.push_back(Value[i]); } LOGDEBUG("FES_ReadSGValue chanNo=%d GroupNo=%d Timeout=%d成功！", ChanNo, GroupNo, Timeout); - return kbdSuccess; + return iotSuccess; } int FES_WriteSEValue(const int ChanNo, const int Timeout, const int GroupNo, const std::vector& setValue, std::vector& RespValue) @@ -161,21 +161,21 @@ int FES_WriteSEValue(const int ChanNo, const int Timeout, const int GroupNo, con RespValue.push_back(resp); } LOGDEBUG("FES_WriteSGValue chanNo=%d GroupNo=%d Timeout=%d成功！", ChanNo, GroupNo, Timeout); - return kbdSuccess; + return iotSuccess; } int FES_ConfirmEditSGValue(const int ChanNo, const int Timeout, const int GroupNo) { LOGDEBUG("FES_ConfirmEditSGValue chanNo=%d GroupNo=%d Timeout=%d成功！", ChanNo, GroupNo, Timeout); - return kbdSuccess; + return iotSuccess; } int FES_SelectActiveSG(const int ChanNo, const int Timeout, const int GroupNo) { LOGDEBUG("FES_SelectActiveSG chanNo=%d GroupNo=%d Timeout=%d成功！", ChanNo, GroupNo, Timeout); - return kbdSuccess; + return iotSuccess; } //装置参数读取 @@ -195,7 +195,7 @@ int FES_ReadParameterValue(const int ChanNo, const int Timeout, const std::vecto LOGDEBUG("%d DZCode=%d value=%d", i + 1, respValue[i].DZCode, respValue[i].Value.iValue); } LOGDEBUG("FES_ReadParameterValue chanNo=%d Timeout=%d成功！", ChanNo, Timeout); - return kbdSuccess; + return iotSuccess; } @@ -211,7 +211,7 @@ int FES_WriteParameterValue(const int ChanNo, const int Timeout, const std::vect RespValue.push_back(resp); } LOGDEBUG("FES_WriteParameterValue chanNo=%d Timeout=%d成功！", ChanNo, Timeout); - return kbdSuccess; + return iotSuccess; } @@ -335,7 +335,7 @@ int CIEC61850dll::FES_Connect(int ChanNo,int EnableReport) testdll.m_ChanNum++; } - return kbdSuccess; + return iotSuccess; } int CIEC61850dll::GetChannelNo(int ChanNo) @@ -352,7 +352,7 @@ int CIEC61850dll::GetChannelNo(int ChanNo) int CIEC61850dll::FES_Disconnect(int ChanNo) { LOGDEBUG(" FesDisconnect ChanNo=%d ", ChanNo); - return kbdSuccess; + return iotSuccess; } @@ -436,7 +436,7 @@ int CIEC61850dll::FES_Control(const int ChanNo, const int Timeout, const std::ve } Resp.push_back(temp); testdll.m_state = DLL_K_STATE_DOCONTROL; - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/ad104s/AD104S.cpp b/product/src/fes/protocol/ad104s/AD104S.cpp index bd0e3250..5df4de96 100644 --- a/product/src/fes/protocol/ad104s/AD104S.cpp +++ b/product/src/fes/protocol/ad104s/AD104S.cpp @@ -24,31 +24,31 @@ bool g_AD104SChanelRun=true; int EX_SetBaseAddr(void *address) { AD104S.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { AD104S.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { AD104S.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { AD104S.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { AD104S.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) @@ -57,7 +57,7 @@ int EX_ExitSystem(int flag) g_AD104SChanelRun = false;//使所有的线程退出。 AD104S.ExitSystem(flag); LOGDEBUG("AD104S ExitSystem() end"); - return kbdSuccess; + return iotSuccess; } CAD104S::CAD104S() @@ -95,14 +95,14 @@ int CAD104S::SetBaseAddr(void *address) } ReadConfigParam(); - return kbdSuccess; + return iotSuccess; } int CAD104S::SetProperty(int IsMainFes) { g_AD104SIsMainFes = IsMainFes; LOGDEBUG("CAD104S::SetProperty g_AD104SIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -111,7 +111,7 @@ int CAD104S::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CAD104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -119,12 +119,12 @@ int CAD104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; //ADTcpServerListenThread create only once time if(m_ADTcpServerListenThreadFlag) { @@ -132,7 +132,7 @@ int CAD104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (m_CADTcpServerListenThread == NULL) { LOGERROR("CAD104S EX_OpenChan() ChanNo:%d create CADTcpServerListenThread error!"); - return kbdFailed; + return iotFailed; } Get104SProtocolInfo((char*) "ad104s"); m_CADTcpServerListenThread->resume(); //start TCP ServerListen THREAD @@ -149,7 +149,7 @@ int CAD104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCADTcpServerRxTx == NULL) { LOGERROR("CAD104S EX_OpenChan() ChanNo:%d create CADTcpServerRxTxThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CADTcpServerRxTxQueue.push_back(ptrCADTcpServerRxTx); ptrCADTcpServerRxTx->resume(); //start TCP Server THREAD @@ -166,13 +166,13 @@ int CAD104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CAD104S EX_OpenChan() ChanNo:%d create CAD104SDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } /** @@ -181,7 +181,7 @@ int CAD104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CAD104S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -189,12 +189,12 @@ int CAD104S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; /*if (m_CADTcpServerListenThread != NULL) @@ -226,7 +226,7 @@ int CAD104S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -237,13 +237,13 @@ int CAD104S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int CAD104S::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } int CAD104S::ExitSystem(int flag) { InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } void CAD104S::ClearADTcpServerRxTxThreadByChanNo(int ChanNo) @@ -290,7 +290,7 @@ void CAD104S::ClearDataProcThreadByChanNo(int ChanNo) /** * @brief CAD104S::ReadConfigParam * 读取AD104S配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CAD104S::ReadConfigParam() { @@ -305,18 +305,18 @@ int CAD104S::ReadConfigParam() memset(¶m,0,sizeof(SAD104SAppConfigParam)); if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"ad104s"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam ProtoclID error"); - return kbdFailed; + return iotFailed; } - //if(config.load("C:/ISCS6000_HOME/data/fes/","AD104S.xml")==kbdFailed) - if(config.load("../../data/fes/","ad104s.xml")==kbdFailed) - return kbdFailed; + //if(config.load("C:/ISCS6000_HOME/data/fes/","AD104S.xml")==iotFailed) + if(config.load("../../data/fes/","ad104s.xml")==iotFailed) + return iotFailed; uint64 msec=getUTCTimeMsec(); LOGDEBUG("CAD104S::ReadConfigParam start %lld",msec); @@ -337,7 +337,7 @@ int CAD104S::ReadConfigParam() memset(¶m, 0, sizeof(param)); param.RtuNo = ptrRTU->m_Param.RtuNo; items = 0; - if (config.getIntValue(strRtuNo, "t1", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t1", ivalue) == iotSuccess) { param.t1Reset = ivalue * 1000; items++; @@ -345,7 +345,7 @@ int CAD104S::ReadConfigParam() else param.t1Reset = 15 * 1000; - if (config.getIntValue(strRtuNo, "t2", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t2", ivalue) == iotSuccess) { param.t2Reset = ivalue * 1000; items++; @@ -353,7 +353,7 @@ int CAD104S::ReadConfigParam() else param.t2Reset = 10 * 1000; - if (config.getIntValue(strRtuNo, "t3", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t3", ivalue) == iotSuccess) { param.t3Reset = ivalue * 1000; items++; @@ -361,7 +361,7 @@ int CAD104S::ReadConfigParam() else param.t3Reset = 20 * 1000; - if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == iotSuccess) { param.controlTimeoutReset = ivalue * 1000; items++; @@ -369,7 +369,7 @@ int CAD104S::ReadConfigParam() else param.controlTimeoutReset = 10 * 1000; - if (config.getIntValue(strRtuNo, "n", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "n", ivalue) == iotSuccess) { param.n = ivalue; items++; @@ -377,7 +377,7 @@ int CAD104S::ReadConfigParam() else param.n = 32768; - if (config.getIntValue(strRtuNo, "k", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "k", ivalue) == iotSuccess) { param.k = ivalue; items++; @@ -385,7 +385,7 @@ int CAD104S::ReadConfigParam() else param.k = 30; - if (config.getIntValue(strRtuNo, "w", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "w", ivalue) == iotSuccess) { param.w = ivalue; items++; @@ -393,7 +393,7 @@ int CAD104S::ReadConfigParam() else param.w = 15; - if (config.getIntValue(strRtuNo, "reason_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "reason_size", ivalue) == iotSuccess) { param.trReasonSize = ivalue; items++; @@ -401,7 +401,7 @@ int CAD104S::ReadConfigParam() else param.trReasonSize = 2; - if (config.getIntValue(strRtuNo, "public_address_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "public_address_size", ivalue) == iotSuccess) { param.publicAddrSize = ivalue; items++; @@ -409,7 +409,7 @@ int CAD104S::ReadConfigParam() else param.publicAddrSize = 2; - if (config.getIntValue(strRtuNo, "info_address_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "info_address_size", ivalue) == iotSuccess) { param.infoAddrSize = ivalue; items++; @@ -417,7 +417,7 @@ int CAD104S::ReadConfigParam() else param.infoAddrSize = 3; - if (config.getIntValue(strRtuNo, "strict_com_mode", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "strict_com_mode", ivalue) == iotSuccess) { param.strictComMode = ivalue; items++; @@ -425,7 +425,7 @@ int CAD104S::ReadConfigParam() else param.strictComMode = 0; - if (config.getIntValue(strRtuNo, "singal_di_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "singal_di_start_info_address", ivalue) == iotSuccess) { param.SingaldiStartAddress = ivalue; items++; @@ -433,21 +433,21 @@ int CAD104S::ReadConfigParam() else param.SingaldiStartAddress = 0x0001; - if (config.getIntValue(strRtuNo, "double_di_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "double_di_start_info_address", ivalue) == iotSuccess) { param.DoublediStartAddress = ivalue; items++; } else param.DoublediStartAddress = 0x2001; - if (config.getIntValue(strRtuNo, "ai_type", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ai_type", ivalue) == iotSuccess) { param.aiUploadType = ivalue; items++; } else param.aiUploadType = 13; - if (config.getIntValue(strRtuNo, "ai_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ai_start_info_address", ivalue) == iotSuccess) { param.aiStartAddress = ivalue; items++; @@ -455,7 +455,7 @@ int CAD104S::ReadConfigParam() else param.aiStartAddress = 0x3001; - if (config.getIntValue(strRtuNo, "acc_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "acc_start_info_address", ivalue) == iotSuccess) { param.accStartAddress = ivalue; items++; @@ -463,7 +463,7 @@ int CAD104S::ReadConfigParam() else param.accStartAddress = 0x5001; - if (config.getIntValue(strRtuNo, "do_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "do_start_info_address", ivalue) == iotSuccess) { param.doStartAddress = ivalue; items++; @@ -471,7 +471,7 @@ int CAD104S::ReadConfigParam() else param.doStartAddress = 0x6001; - if (config.getIntValue(strRtuNo, "ao_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ao_start_info_address", ivalue) == iotSuccess) { param.aoStartAddress = ivalue; items++; @@ -479,7 +479,7 @@ int CAD104S::ReadConfigParam() else param.aoStartAddress = 0x7001; - if (config.getIntValue(strRtuNo, "qds_enable", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "qds_enable", ivalue) == iotSuccess) { param.qdsEnable = ivalue; items++; @@ -487,7 +487,7 @@ int CAD104S::ReadConfigParam() else param.qdsEnable = 1; - if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == iotSuccess) { param.maxUpdateCount = ivalue; items++; @@ -495,7 +495,7 @@ int CAD104S::ReadConfigParam() else param.maxUpdateCount = 18; //3MIN - if (config.getIntValue(strRtuNo, "start_delay", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "start_delay", ivalue) == iotSuccess) { param.startDelay = ivalue*1000; items++; @@ -503,7 +503,7 @@ int CAD104S::ReadConfigParam() else param.startDelay = 30000; //30s - if (config.getIntValue(strRtuNo, "set_time_enable", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "set_time_enable", ivalue) == iotSuccess) { param.setTimeFlag = ivalue; items++; @@ -511,7 +511,7 @@ int CAD104S::ReadConfigParam() else param.setTimeFlag = 0; - if (config.getIntValue(strRtuNo, "send_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "send_interval", ivalue) == iotSuccess) { param.sendInterval = ivalue; items++; @@ -520,7 +520,7 @@ int CAD104S::ReadConfigParam() param.sendInterval = 50; //50ms - if (config.getIntValue(strRtuNo, "disable_start_cmd", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "disable_start_cmd", ivalue) == iotSuccess) { param.disableStartCmd = ivalue; items++; @@ -539,7 +539,7 @@ int CAD104S::ReadConfigParam() msec=getUTCTimeMsec(); LOGDEBUG("CAD104S::ReadConfigParam end %lld",msec); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/ad104s/AD104SDataProcThread.cpp b/product/src/fes/protocol/ad104s/AD104SDataProcThread.cpp index bbb01a44..c7292ed0 100644 --- a/product/src/fes/protocol/ad104s/AD104SDataProcThread.cpp +++ b/product/src/fes/protocol/ad104s/AD104SDataProcThread.cpp @@ -154,7 +154,7 @@ CAD104SDataProcThread::~CAD104SDataProcThread() */ int CAD104SDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -268,12 +268,12 @@ void CAD104SDataProcThread::beforeQuit() /** * @brief CAD104SDataProcThread::InitConfigParam * AD104S 初始化配置参数 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CAD104SDataProcThread::InitConfigParam() { if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; memset(&m_AppData,0,sizeof(SAD104SAppData)); @@ -327,7 +327,7 @@ int CAD104SDataProcThread::InitConfigParam() m_AppData.sendInterval = 0; m_AppData.startDelay = 0; - return kbdSuccess; + return iotSuccess; } @@ -1682,7 +1682,7 @@ void CAD104SDataProcThread::SendsyncTimeAckFrame() /** * @brief CAD104SDataProcThread::ProcessDoFrame * @describe 处理单点遥控，给主站反校 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ void CAD104SDataProcThread::ProcessDoFrame(int infoType) { @@ -1871,7 +1871,7 @@ void CAD104SDataProcThread::ProcessDoFrame(int infoType) /** * @brief CAD104SDataProcThread::ProcessNorScaleDzFrame * @describe 处理归一化定值\标度化定值，给主站反校 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ void CAD104SDataProcThread::ProcessAoFrame(int infoType) { @@ -2093,7 +2093,7 @@ void CAD104SDataProcThread::ProcessAoFrame(int infoType) } /** * @brief CAD104SDataProcThread::RecvDataProcess - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CAD104SDataProcThread::RecvDataProcess() { @@ -2102,10 +2102,10 @@ int CAD104SDataProcThread::RecvDataProcess() if (m_AppData.startDelay) - return kbdFailed; + return iotFailed; if(m_AppData.recvBufSize<6) - return kbdFailed; + return iotFailed; if(((m_AppData.recvBuf[2]&0x01)==0x00)&&((m_AppData.recvBuf[4]&0x01)==0x00))//I格式报文 { @@ -2220,7 +2220,7 @@ int CAD104SDataProcThread::RecvDataProcess() } } - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/fes/protocol/ad104s/ADTcpServerListenThread.cpp b/product/src/fes/protocol/ad104s/ADTcpServerListenThread.cpp index c55616fa..415903e2 100644 --- a/product/src/fes/protocol/ad104s/ADTcpServerListenThread.cpp +++ b/product/src/fes/protocol/ad104s/ADTcpServerListenThread.cpp @@ -63,7 +63,7 @@ CADTcpServerListenThread::~CADTcpServerListenThread() int CADTcpServerListenThread::beforeExecute() { InitListenPort(); - return kbdSuccess; + return iotSuccess; } /* @@ -251,7 +251,7 @@ int CADTcpServerListenThread::Accept() } } - return kbdSuccess; + return iotSuccess; } void CADTcpServerListenThread::TcpClose(int Socket) diff --git a/product/src/fes/protocol/ad104s/ADTcpServerRxTxThread.cpp b/product/src/fes/protocol/ad104s/ADTcpServerRxTxThread.cpp index 1b4dc12b..f46d5ffd 100644 --- a/product/src/fes/protocol/ad104s/ADTcpServerRxTxThread.cpp +++ b/product/src/fes/protocol/ad104s/ADTcpServerRxTxThread.cpp @@ -60,7 +60,7 @@ CADTcpServerRxTxThread::~CADTcpServerRxTxThread() int CADTcpServerRxTxThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/protocol/ats_casco/CascoAts.cpp b/product/src/fes/protocol/ats_casco/CascoAts.cpp index ee9034ab..28120178 100644 --- a/product/src/fes/protocol/ats_casco/CascoAts.cpp +++ b/product/src/fes/protocol/ats_casco/CascoAts.cpp @@ -16,31 +16,31 @@ bool g_CascoAtsIsMainFes=false; int EX_SetBaseAddr(void *address) { CascoAts.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { CascoAts.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { CascoAts.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { CascoAts.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { CascoAts.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } @@ -67,13 +67,13 @@ int CCascoAts::SetBaseAddr(void *address) m_ptrCFesBase = (CFesBase *)address; } - return kbdSuccess; + return iotSuccess; } int CCascoAts::SetProperty(int IsMainFes) { g_CascoAtsIsMainFes = IsMainFes; - return kbdSuccess; + return iotSuccess; } /** @@ -82,7 +82,7 @@ int CCascoAts::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CCascoAts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -90,12 +90,12 @@ int CCascoAts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -110,14 +110,14 @@ int CCascoAts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpClient == NULL) { LOGERROR("CCascoAts EX_OpenChan() ChanNo:%d create CTcpClientThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpClientQueue.push_back(ptrCTcpClient); ptrCTcpClient->resume(); //start TCP CLIENT THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -131,14 +131,14 @@ int CCascoAts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CCascoAts EX_OpenChan() ChanNo:%d create CModbusDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } ptrCDataProc->Init(); m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -148,7 +148,7 @@ int CCascoAts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CCascoAts::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -156,12 +156,12 @@ int CCascoAts::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) { @@ -175,7 +175,7 @@ int CCascoAts::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -188,7 +188,7 @@ int CCascoAts::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -199,7 +199,7 @@ int CCascoAts::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int CCascoAts::ChanTimer(int /*MainChanNo*/) { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/ats_casco/CascoAtsDataProcThread.cpp b/product/src/fes/protocol/ats_casco/CascoAtsDataProcThread.cpp index eed0cb4d..8b36a2ba 100644 --- a/product/src/fes/protocol/ats_casco/CascoAtsDataProcThread.cpp +++ b/product/src/fes/protocol/ats_casco/CascoAtsDataProcThread.cpp @@ -54,11 +54,11 @@ int CCascoAtsDataProcThread::beforeExecute() m_ptrCFesRtu = GetRtuDataByChanData(m_ptrCFesChan); if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) { - return kbdFailed; + return iotFailed; } m_ptrCFesChan->SetDataThreadRunFlag(CN_FesRunFlag); m_ptrCFesRtu->WriteRtuSatus(CN_FesRtuComDown); - return kbdSuccess; + return iotSuccess; } /* @@ -125,14 +125,14 @@ void CCascoAtsDataProcThread::Init() /** * @brief CCascoAtsDataProcThread::ReadConfigParam * 读取配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CCascoAtsDataProcThread::ReadConfigParam() { CCommonConfigParse config; int ivalue; char strData[48]; - if(config.load("../../data/fes/","cascoats.xml")==kbdFailed) + if(config.load("../../data/fes/","cascoats.xml")==iotFailed) { m_AppData.maxPackage = 100; m_AppData.msgPollReset = 5000;//5s @@ -140,14 +140,14 @@ int CCascoAtsDataProcThread::ReadConfigParam() else { sprintf(strData,"ATS"); - if(config.getIntValue(strData,"max_recv_packages",ivalue) == kbdSuccess) + if(config.getIntValue(strData,"max_recv_packages",ivalue) == iotSuccess) { m_AppData.maxPackage = ivalue; } else m_AppData.maxPackage = 100; - if(config.getIntValue(strData,"msg_polling_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strData,"msg_polling_interval",ivalue) == iotSuccess) { m_AppData.msgPollReset = ivalue; } @@ -155,7 +155,7 @@ int CCascoAtsDataProcThread::ReadConfigParam() m_AppData.msgPollReset = 5000; - if(config.getIntValue(strData,"save_records_days",ivalue) == kbdSuccess) + if(config.getIntValue(strData,"save_records_days",ivalue) == iotSuccess) { m_AppData.saveDays = ivalue; } @@ -177,7 +177,7 @@ int CCascoAtsDataProcThread::ReadConfigParam() //Read Location info if(m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; iot_dbms::CRdbAccessEx RdbAtsTable; int ret ; @@ -186,7 +186,7 @@ int CCascoAtsDataProcThread::ReadConfigParam() if(ret==false) { LOGERROR("RdbAtsTable.Open error"); - return kbdFailed; + return iotFailed; } std::vector VecParam; @@ -197,7 +197,7 @@ int CCascoAtsDataProcThread::ReadConfigParam() if (ret==false) { LOGERROR("RdbAtsTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } m_vectLocationId = VecParam; //建立MAP表 @@ -205,14 +205,14 @@ int CCascoAtsDataProcThread::ReadConfigParam() { m_mapLocationId[m_vectLocationId[i].stationId]=m_vectLocationId[i].locationId; } - return kbdSuccess; + return iotSuccess; } /** * @brief CCascoAtsDataProcThread::RecvNetData * MODBUS TCP 接收处理 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CCascoAtsDataProcThread::RecvNetData() { @@ -221,7 +221,7 @@ int CCascoAtsDataProcThread::RecvNetData() byte MultiFlag; if(m_ptrCurrentChan==NULL) - return kbdFailed; + return iotFailed; recvLen = m_ptrCurrentChan->GetRxBufSize(); while(recvLen > 0) @@ -357,7 +357,7 @@ void CCascoAtsDataProcThread::SendDataToPort(byte *Data, int Size) /** * @brief CCascoAtsDataProcThread::RecvDataProcess * 一个数据包中可以包含多个message,所以解析时要把所有数据解析完成。 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CCascoAtsDataProcThread::RecvDataProcess() { @@ -403,7 +403,7 @@ int CCascoAtsDataProcThread::RecvDataProcess() index += msg_len-2; } m_AppData.recvBufSize = 0; - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/fes/protocol/cdt/Cdt.cpp b/product/src/fes/protocol/cdt/Cdt.cpp index 1708baaa..842a450f 100644 --- a/product/src/fes/protocol/cdt/Cdt.cpp +++ b/product/src/fes/protocol/cdt/Cdt.cpp @@ -17,38 +17,38 @@ bool g_CdtChanelRun=true; int EX_SetBaseAddr(void *address) { Cdt.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { Cdt.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { Cdt.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { Cdt.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { Cdt.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_CdtChanelRun =false;//使所有的线程退出。 Cdt.InformComThreadExit(); - return kbdSuccess; + return iotSuccess; } CCdt::CCdt() { @@ -81,14 +81,14 @@ int CCdt::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*)"cdt"); } - return kbdSuccess; + return iotSuccess; } int CCdt::SetProperty(int IsMainFes) { g_CdtIsMainFes = IsMainFes; LOGDEBUG("CCdt::SetProperty g_CdtIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -97,7 +97,7 @@ int CCdt::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CCdt::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -105,12 +105,12 @@ int CCdt::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -124,7 +124,7 @@ int CCdt::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCSerialPort == NULL) { LOGERROR("CCdt EX_OpenChan() ChanNo:%d create CSerialPortThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } else { @@ -134,7 +134,7 @@ int CCdt::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -150,13 +150,13 @@ int CCdt::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CCdt EX_OpenChan() ChanNo:%d create CCdtDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -166,7 +166,7 @@ int CCdt::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CCdt::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -174,12 +174,12 @@ int CCdt::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CCdt::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -195,7 +195,7 @@ int CCdt::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -208,7 +208,7 @@ int CCdt::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -226,7 +226,7 @@ int CCdt::ChanTimer(int MainChanNo) int i, j, RtuNo; if ((ptrFesChan = m_ptrCFesBase->GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; SModbusCmd *pCmd; for (i = 0; im_RtuNum; i++) @@ -255,7 +255,7 @@ int CCdt::ChanTimer(int MainChanNo) } } } - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/protocol/cdt/CdtDataProcThread.cpp b/product/src/fes/protocol/cdt/CdtDataProcThread.cpp index e5d01b9c..eef8d283 100644 --- a/product/src/fes/protocol/cdt/CdtDataProcThread.cpp +++ b/product/src/fes/protocol/cdt/CdtDataProcThread.cpp @@ -100,7 +100,7 @@ CCdtDataProcThread::~CCdtDataProcThread() */ int CCdtDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -191,7 +191,7 @@ int CCdtDataProcThread::SendProcess() { int retLen = 0; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; //luojunjun 等待打开串口 if (m_ptrCurrentChan->m_LinkStatus == CN_FesChanDisconnect) @@ -496,7 +496,7 @@ int CCdtDataProcThread::RecvComData() int recvLen, Len, i, j; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; DevAddr = m_AppData.lastCmdData[0]; FunCode = m_AppData.lastCmdData[1]; @@ -540,7 +540,7 @@ int CCdtDataProcThread::RecvComData() m_ptrCFesBase->SetOfflineFlag(m_ptrCFesRtu,CN_FesRtuComDown); } NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } for (i = 0; im_Param.ChanNo); - return kbdFailed; + return iotFailed; } else { @@ -137,7 +137,7 @@ int CCdts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -153,13 +153,13 @@ int CCdts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CCdts EX_OpenChan() ChanNo:%d create CCdtsDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -169,7 +169,7 @@ int CCdts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CCdts::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -177,12 +177,12 @@ int CCdts::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CCdts::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -198,7 +198,7 @@ int CCdts::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -211,13 +211,13 @@ int CCdts::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** * @brief CCdts::ReadConfigParam * 读取Cdts配置文件 -* @return 成功返回kbdSuccess，失败返回kbdFailed +* @return 成功返回iotSuccess，失败返回iotFailed */ int CCdts::ReadConfigParam() { @@ -233,16 +233,16 @@ int CCdts::ReadConfigParam() memset(¶m, 0, sizeof(SCdtsAppConfigParam)); if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"cdts"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam ProtoclID error"); - return kbdFailed; + return iotFailed; } - if (config.load("../../data/fes/", "cdts.xml") == kbdFailed) - return kbdSuccess; + if (config.load("../../data/fes/", "cdts.xml") == iotFailed) + return iotSuccess; for (i = 0; i < m_ptrCFesBase->m_vectCFesChanPtr.size(); i++) { @@ -262,7 +262,7 @@ int CCdts::ReadConfigParam() param.RtuNo = ptrRTU->m_Param.RtuNo; items = 0; - if (config.getIntValue(strRtuNo, "start_delay", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "start_delay", ivalue) == iotSuccess) { param.startDelay = ivalue * 1000; items++; @@ -270,7 +270,7 @@ int CCdts::ReadConfigParam() else param.startDelay = 30 * 1000; - if (config.getIntValue(strRtuNo, "set_time_enable", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "set_time_enable", ivalue) == iotSuccess) { param.setTimeFlag = ivalue; items++; @@ -278,7 +278,7 @@ int CCdts::ReadConfigParam() else param.setTimeFlag = 0; - if (config.getIntValue(strRtuNo, "send_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "send_interval", ivalue) == iotSuccess) { param.sendInterval = ivalue; items++; @@ -286,7 +286,7 @@ int CCdts::ReadConfigParam() else param.sendInterval = 200; - if (config.getIntValue(strRtuNo, "D1_frame_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "D1_frame_interval", ivalue) == iotSuccess) { param.D1FrameInterval = ivalue * 1000; items++; @@ -294,7 +294,7 @@ int CCdts::ReadConfigParam() else param.D1FrameInterval = 10 * 1000; - if (config.getIntValue(strRtuNo, "D2_frame_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "D2_frame_interval", ivalue) == iotSuccess) { param.D2FrameInterval = ivalue * 1000; items++; @@ -302,7 +302,7 @@ int CCdts::ReadConfigParam() else param.D2FrameInterval = 60 * 1000; - if (config.getIntValue(strRtuNo, "sync_header", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "sync_header", ivalue) == iotSuccess) { param.syncHeader = ivalue; items++; @@ -310,7 +310,7 @@ int CCdts::ReadConfigParam() else param.syncHeader = 0; - if (config.getIntValue(strRtuNo, "dest_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "dest_address", ivalue) == iotSuccess) { param.destAddr = ivalue; items++; @@ -318,7 +318,7 @@ int CCdts::ReadConfigParam() else param.destAddr = 0; - if (config.getIntValue(strRtuNo, "ignore_crc", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ignore_crc", ivalue) == iotSuccess) { param.crcIgnore = ivalue; items++; @@ -326,7 +326,7 @@ int CCdts::ReadConfigParam() else param.crcIgnore = 0; - if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == iotSuccess) { param.maxUpdateCount = ivalue; items++; @@ -344,7 +344,7 @@ int CCdts::ReadConfigParam() } } LOGDEBUG("CCdts::ReadConfigParam end"); - return kbdSuccess; + return iotSuccess; } @@ -364,7 +364,7 @@ int CCdts::ChanTimer(int MainChanNo) int i, j, RtuNo; if ((ptrFesChan = m_ptrCFesBase->GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; SModbusCmd *pCmd; for (i = 0; im_RtuNum; i++) @@ -393,7 +393,7 @@ int CCdts::ChanTimer(int MainChanNo) } } } - return kbdSuccess; + return iotSuccess; } /* @@ -466,5 +466,5 @@ int CCdts::ExitSystem(int flag) { InformComThreadExit(); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/cdts/CdtsDataProcThread.cpp b/product/src/fes/protocol/cdts/CdtsDataProcThread.cpp index 0988620c..414efad6 100644 --- a/product/src/fes/protocol/cdts/CdtsDataProcThread.cpp +++ b/product/src/fes/protocol/cdts/CdtsDataProcThread.cpp @@ -72,7 +72,7 @@ CCdtsDataProcThread::~CCdtsDataProcThread() */ int CCdtsDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -270,7 +270,7 @@ void CCdtsDataProcThread::SendDataToPort(byte *Data, int Size) int CCdtsDataProcThread::InitConfigParam() { if ((m_ptrCFesChan == NULL) || (m_ptrCFesRtu == NULL)) - return kbdFailed; + return iotFailed; LOGDEBUG("配置文件读取失败，取默认配置"); memset(&m_AppData, 0, sizeof(SCdtsAppData)); @@ -284,7 +284,7 @@ int CCdtsDataProcThread::InitConfigParam() m_AppData.syc1 = 0xeb; m_AppData.syc2 = 0x90; m_AppData.crcIgnore = 0;//crc enbale - return kbdSuccess; + return iotSuccess; } void CCdtsDataProcThread::TimerProcess() diff --git a/product/src/fes/protocol/combase/ComTcpClient.cpp b/product/src/fes/protocol/combase/ComTcpClient.cpp index 48df58de..dc282bb5 100644 --- a/product/src/fes/protocol/combase/ComTcpClient.cpp +++ b/product/src/fes/protocol/combase/ComTcpClient.cpp @@ -44,7 +44,7 @@ int CComTcpClient::TcpConnect(CFesChanPtr ptrCFesChan) //在等待通道管理判断切换过程中，不重新链接链路 if (ptrCFesChan->GetChangeFlag() == CN_FesChanChange) - return kbdFailed; + return iotFailed; m_lConnectTime = getMonotonicMsec(); if (m_lLastConnectTime == 0)//链接周期第一链接,不判断链接等待时间 @@ -54,7 +54,7 @@ int CComTcpClient::TcpConnect(CFesChanPtr ptrCFesChan) else { if (m_lConnectTime - m_lLastConnectTime < m_ConnectTimeout) - return kbdFailed; + return iotFailed; } m_Socket = socket(AF_INET, SOCK_STREAM, 0); @@ -65,7 +65,7 @@ int CComTcpClient::TcpConnect(CFesChanPtr ptrCFesChan) #else LOGERROR("ChanNo=%d unable to create socket, errno:%d <%s>\n", ptrCFesChan->m_Param.ChanNo, errno, strerror(errno)); #endif - return kbdFailed; + return iotFailed; } int port; @@ -82,7 +82,7 @@ int CComTcpClient::TcpConnect(CFesChanPtr ptrCFesChan) { LOGDEBUG("rtu hostname %s not found \n", host); closesocket(m_Socket); - return kbdFailed; + return iotFailed; } sin.sin_family = AF_INET; sin.sin_port = htons(port); @@ -102,7 +102,7 @@ int CComTcpClient::TcpConnect(CFesChanPtr ptrCFesChan) m_RetryCount = 0; } m_lLastConnectTime = m_lConnectTime;//下次进入链接等待时间 - return kbdFailed; + return iotFailed; } m_NetStatus = CN_FesChanConnect; @@ -112,7 +112,7 @@ int CComTcpClient::TcpConnect(CFesChanPtr ptrCFesChan) ptrCFesChan->ClearDataBuf(); ptrCFesChan->SetLinkStatus(CN_FesChanConnect); LOGDEBUG("ChanNo=%d Succeed in connect to < %s:%d > ...", ptrCFesChan->m_Param.ChanNo, inet_ntoa(sin.sin_addr), port); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/combase/SerialPortThread.cpp b/product/src/fes/protocol/combase/SerialPortThread.cpp index 6cdcc0c2..68bf4ae0 100644 --- a/product/src/fes/protocol/combase/SerialPortThread.cpp +++ b/product/src/fes/protocol/combase/SerialPortThread.cpp @@ -676,7 +676,7 @@ void CSerialPortThread::SetChan() int CSerialPortThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/combase/SnmpUdpClientThread.cpp b/product/src/fes/protocol/combase/SnmpUdpClientThread.cpp index b5ae76d1..3c2c1306 100644 --- a/product/src/fes/protocol/combase/SnmpUdpClientThread.cpp +++ b/product/src/fes/protocol/combase/SnmpUdpClientThread.cpp @@ -64,7 +64,7 @@ CUdpClientThread::~CUdpClientThread() int CUdpClientThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -83,7 +83,7 @@ void CUdpClientThread::execute() switch (m_Status) { case CN_FesChanDisconnect: - if (UdpInit() == kbdSuccess) + if (UdpInit() == iotSuccess) { m_ptrCFesChan->ClearDataBuf(); m_lRecvTime = getMonotonicMsec(); @@ -137,7 +137,7 @@ int CUdpClientThread::UdpInit() #else LOGERROR("UdpClientThread.cpp unable to create socket, errno:%d <%s>\n", errno, strerror(errno)); #endif - return kbdFailed; + return iotFailed; } LocalPortNo = m_ptrCFesChan->m_Param.LocalPortNo; if (LocalPortNo>0) @@ -167,7 +167,7 @@ int CUdpClientThread::UdpInit() LOGERROR("UDP bind(%d) failed, errno:%d <%s>", m_Socket, errno, strerror(errno)); #endif UdpClose(); - return kbdFailed; + return iotFailed; } } @@ -201,7 +201,7 @@ int CUdpClientThread::UdpInit() if ((int)m_dest.sin_addr.s_addr == (-1)) { LOGDEBUG("dest hostname %s not found \n", dest); - return kbdFailed; + return iotFailed; } m_dest.sin_family = AF_INET; m_dest.sin_port = htons(port); @@ -215,7 +215,7 @@ int CUdpClientThread::UdpInit() netEvent.EventType = CN_FesNetEvent_Connect; m_ptrCFesChan->WriteNetEvent(1,&netEvent); m_Status = CN_FesChanConnect; - return kbdSuccess; + return iotSuccess; } @@ -279,7 +279,7 @@ bool CUdpClientThread::SelectNextRoute() if ((int)m_dest.sin_addr.s_addr == (-1)) { LOGDEBUG("dest hostname %s not found \n", dest); - return kbdFailed; + return iotFailed; } m_dest.sin_family = AF_INET; m_dest.sin_port = htons(port); diff --git a/product/src/fes/protocol/combase/TcpClientNotChangeThread.cpp b/product/src/fes/protocol/combase/TcpClientNotChangeThread.cpp index 9276d222..c6753d06 100644 --- a/product/src/fes/protocol/combase/TcpClientNotChangeThread.cpp +++ b/product/src/fes/protocol/combase/TcpClientNotChangeThread.cpp @@ -67,7 +67,7 @@ CTcpClientNotChangeThread::~CTcpClientNotChangeThread() int CTcpClientNotChangeThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -89,7 +89,7 @@ void CTcpClientNotChangeThread::execute() case CN_FesChanConnecting: if(m_timerCount == 0) { - if(TcpConnect()==kbdSuccess) + if(TcpConnect()==iotSuccess) { m_Status = CN_FesChanConnect; m_ptrCFesChan->ClearDataBuf(); @@ -144,7 +144,7 @@ int CTcpClientNotChangeThread::TcpConnect() //在等待通道管理判断切换过程中，不重新链接链路 if(m_ptrCFesChan->GetChangeFlag()==CN_FesChanChange) - return kbdFailed; + return iotFailed; m_lConnectTime = getMonotonicMsec(); if (m_lLastConnectTime == 0)//链接周期第一链接,不判断链接等待时间 @@ -154,7 +154,7 @@ int CTcpClientNotChangeThread::TcpConnect() else { if (m_lConnectTime - m_lLastConnectTime < m_ConnectTimeout) - return kbdFailed; + return iotFailed; } m_Socket = socket(AF_INET, SOCK_STREAM, 0); @@ -165,7 +165,7 @@ int CTcpClientNotChangeThread::TcpConnect() #else LOGERROR("TcpClientNotChangeThread.cpp unable to create socket, errno:%d <%s>\n", errno, strerror(errno)); #endif - return kbdFailed; + return iotFailed; } @@ -183,7 +183,7 @@ int CTcpClientNotChangeThread::TcpConnect() { LOGDEBUG("TcpClientNotChangeThread.cpp rtu hostname %s not found \n", host); closesocket(m_Socket); - return kbdFailed; + return iotFailed; } sin.sin_family = AF_INET; sin.sin_port = htons(port); @@ -206,7 +206,7 @@ int CTcpClientNotChangeThread::TcpConnect() m_RetryCount = 0; } m_lLastConnectTime = m_lConnectTime;//下次进入链接等待时间 - return kbdFailed; + return iotFailed; } LOGDEBUG("TcpClientNotChangeThread.cpp Succeed in connect to RTU < %s:%d > ...", inet_ntoa(sin.sin_addr),port); m_ptrCFesChan->SetLinkStatus(CN_FesChanConnect); @@ -219,7 +219,7 @@ int CTcpClientNotChangeThread::TcpConnect() netEvent.EventType = CN_FesNetEvent_Connect; m_ptrCFesChan->WriteNetEvent(1,&netEvent); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/combase/TcpClientThread.cpp b/product/src/fes/protocol/combase/TcpClientThread.cpp index 6f789135..332005cc 100644 --- a/product/src/fes/protocol/combase/TcpClientThread.cpp +++ b/product/src/fes/protocol/combase/TcpClientThread.cpp @@ -69,7 +69,7 @@ CTcpClientThread::~CTcpClientThread() int CTcpClientThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -91,7 +91,7 @@ void CTcpClientThread::execute() case CN_FesChanConnecting: if(m_timerCount == 0) { - if(TcpConnect()==kbdSuccess) + if(TcpConnect()==iotSuccess) { m_Status = CN_FesChanConnect; m_ptrCFesChan->ClearDataBuf(); @@ -148,7 +148,7 @@ int CTcpClientThread::TcpConnect() //在等待通道管理判断切换过程中，不重新链接链路 if(m_ptrCFesChan->GetChangeFlag()==CN_FesChanChange) - return kbdFailed; + return iotFailed; m_lConnectTime = getMonotonicMsec(); if (m_lLastConnectTime == 0)//链接周期第一链接,不判断链接等待时间 @@ -158,7 +158,7 @@ int CTcpClientThread::TcpConnect() else { if (m_lConnectTime - m_lLastConnectTime < m_ConnectTimeout) - return kbdFailed; + return iotFailed; } m_Socket = socket(AF_INET, SOCK_STREAM, 0); @@ -169,7 +169,7 @@ int CTcpClientThread::TcpConnect() #else LOGERROR("ChanNo=%d unable to create socket, errno:%d <%s>\n", m_ptrCFesChan->m_Param.ChanNo,errno, strerror(errno)); #endif - return kbdFailed; + return iotFailed; } int port; @@ -186,7 +186,7 @@ int CTcpClientThread::TcpConnect() { LOGDEBUG("rtu hostname %s not found \n", host); closesocket(m_Socket); - return kbdFailed; + return iotFailed; } sin.sin_family = AF_INET; sin.sin_port = htons(port); @@ -207,7 +207,7 @@ int CTcpClientThread::TcpConnect() m_RetryCount = 0; } m_lLastConnectTime = m_lConnectTime;//下次进入链接等待时间 - return kbdFailed; + return iotFailed; } LOGDEBUG("ChanNo=%d Succeed in connect to < %s:%d > ...", m_ptrCFesChan->m_Param.ChanNo,inet_ntoa(sin.sin_addr),port); m_ptrCFesChan->SetLinkStatus(CN_FesChanConnect); @@ -220,7 +220,7 @@ int CTcpClientThread::TcpConnect() netEvent.EventType = CN_FesNetEvent_Connect; m_ptrCFesChan->WriteNetEvent(1,&netEvent); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/combase/TcpServerListenThread.cpp b/product/src/fes/protocol/combase/TcpServerListenThread.cpp index 6348a559..bd0069bb 100644 --- a/product/src/fes/protocol/combase/TcpServerListenThread.cpp +++ b/product/src/fes/protocol/combase/TcpServerListenThread.cpp @@ -63,7 +63,7 @@ CTcpServerListenThread::~CTcpServerListenThread() int CTcpServerListenThread::beforeExecute() { InitListenPort(); - return kbdSuccess; + return iotSuccess; } /* @@ -251,7 +251,7 @@ int CTcpServerListenThread::Accept() } } - return kbdSuccess; + return iotSuccess; } void CTcpServerListenThread::TcpClose(int Socket) diff --git a/product/src/fes/protocol/combase/TcpServerRxTxThread.cpp b/product/src/fes/protocol/combase/TcpServerRxTxThread.cpp index a2280e4d..77a43ba6 100644 --- a/product/src/fes/protocol/combase/TcpServerRxTxThread.cpp +++ b/product/src/fes/protocol/combase/TcpServerRxTxThread.cpp @@ -60,7 +60,7 @@ CTcpServerRxTxThread::~CTcpServerRxTxThread() int CTcpServerRxTxThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/protocol/combase/TcpServerThread.cpp b/product/src/fes/protocol/combase/TcpServerThread.cpp index 18169ad0..6e621728 100644 --- a/product/src/fes/protocol/combase/TcpServerThread.cpp +++ b/product/src/fes/protocol/combase/TcpServerThread.cpp @@ -48,10 +48,10 @@ CTcpServerThread::~CTcpServerThread() int CTcpServerThread::beforeExecute() { if(m_ptrCFesChan==NULL) - return kbdFailed; + return iotFailed; m_ptrCFesChan->SetComThreadRunFlag(CN_FesRunFlag); m_ptrCFesChan->SetChangeFlag(CN_FesChanUnChange); - return kbdSuccess; + return iotSuccess; } /* @@ -271,7 +271,7 @@ int CTcpServerThread::Accept() } } } - return kbdSuccess; + return iotSuccess; } void CTcpServerThread::TcpClose(int Socket) diff --git a/product/src/fes/protocol/combase/UdpClientThread.cpp b/product/src/fes/protocol/combase/UdpClientThread.cpp index 7fb65cf4..9707eea0 100644 --- a/product/src/fes/protocol/combase/UdpClientThread.cpp +++ b/product/src/fes/protocol/combase/UdpClientThread.cpp @@ -64,7 +64,7 @@ CUdpClientThread::~CUdpClientThread() int CUdpClientThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -83,7 +83,7 @@ void CUdpClientThread::execute() switch (m_Status) { case CN_FesChanDisconnect: - if (UdpInit() == kbdSuccess) + if (UdpInit() == iotSuccess) { m_ptrCFesChan->ClearDataBuf(); m_lRecvTime = getMonotonicMsec(); @@ -137,7 +137,7 @@ int CUdpClientThread::UdpInit() #else LOGERROR("UdpClientThread.cpp unable to create socket, errno:%d <%s>\n", errno, strerror(errno)); #endif - return kbdFailed; + return iotFailed; } LocalPortNo = m_ptrCFesChan->m_Param.LocalPortNo; if (LocalPortNo>0) @@ -167,7 +167,7 @@ int CUdpClientThread::UdpInit() LOGERROR("UDP bind(%d) failed, errno:%d <%s>", m_Socket, errno, strerror(errno)); #endif UdpClose(); - return kbdFailed; + return iotFailed; } } @@ -201,7 +201,7 @@ int CUdpClientThread::UdpInit() if ((int)m_dest.sin_addr.s_addr == (-1)) { LOGDEBUG("dest hostname %s not found \n", dest); - return kbdFailed; + return iotFailed; } m_dest.sin_family = AF_INET; m_dest.sin_port = htons(port); @@ -215,7 +215,7 @@ int CUdpClientThread::UdpInit() netEvent.EventType = CN_FesNetEvent_Connect; m_ptrCFesChan->WriteNetEvent(1,&netEvent); m_Status = CN_FesChanConnect; - return kbdSuccess; + return iotSuccess; } @@ -279,7 +279,7 @@ bool CUdpClientThread::SelectNextRoute() if ((int)m_dest.sin_addr.s_addr == (-1)) { LOGDEBUG("dest hostname %s not found \n", dest); - return kbdFailed; + return iotFailed; } m_dest.sin_family = AF_INET; m_dest.sin_port = htons(port); diff --git a/product/src/fes/protocol/dlt645/DLT645.cpp b/product/src/fes/protocol/dlt645/DLT645.cpp index 5f7388af..a1034a9b 100644 --- a/product/src/fes/protocol/dlt645/DLT645.cpp +++ b/product/src/fes/protocol/dlt645/DLT645.cpp @@ -17,7 +17,7 @@ #include using namespace std; -#define kbdFailed 1 +#define iotFailed 1 using boost::property_tree::ptree; using namespace iot_public; @@ -30,37 +30,37 @@ bool g_DLT645ChanelRun=true; int EX_SetBaseAddr(void *address) { DLT645.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { DLT645.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { DLT645.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { DLT645.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { DLT645.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_DLT645ChanelRun=false;//使所有的线程退出。 DLT645.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CDLT645::CDLT645() @@ -91,14 +91,14 @@ int CDLT645::SetBaseAddr(void *address) { m_ptrCFesBase->ProtocolRtuInitByParam1((char*) "dlt645"); } - return kbdSuccess; + return iotSuccess; } int CDLT645::SetProperty(int IsMainFes) { g_DLT645IsMainFes = IsMainFes; LOGDEBUG("CDLT645::SetProperty g_DLT645IsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -107,7 +107,7 @@ int CDLT645::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CDLT645::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -115,12 +115,12 @@ int CDLT645::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -135,14 +135,14 @@ int CDLT645::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCSerialPort == NULL) { LOGERROR("CDLT645 EX_OpenChan() ChanNo:%d create CTcpClientThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CSerialPortQueue.push_back(ptrCSerialPort); ptrCSerialPort->resume(); //start SerialPort THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -156,13 +156,13 @@ int CDLT645::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CDLT645 EX_OpenChan() ChanNo:%d create CDLT645DataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -172,7 +172,7 @@ int CDLT645::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CDLT645::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -180,12 +180,12 @@ int CDLT645::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; //LOGDEBUG("CDLT645::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun) @@ -204,7 +204,7 @@ int CDLT645::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -217,7 +217,7 @@ int CDLT645::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -229,7 +229,7 @@ int CDLT645::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) int CDLT645::ChanTimer(int /*MainChanNo*/) { //把命令缓冲时间间隔到的命放到发送命令缓冲区 - return kbdSuccess; + return iotSuccess; } void CDLT645::ClearSerialPortThreadByChanNo(int ChanNo) diff --git a/product/src/fes/protocol/dlt645/DLT645DataProcThread.cpp b/product/src/fes/protocol/dlt645/DLT645DataProcThread.cpp index a78690c7..71557270 100644 --- a/product/src/fes/protocol/dlt645/DLT645DataProcThread.cpp +++ b/product/src/fes/protocol/dlt645/DLT645DataProcThread.cpp @@ -100,7 +100,7 @@ CDLT645DataProcThread::~CDLT645DataProcThread() */ int CDLT645DataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -150,7 +150,7 @@ void CDLT645DataProcThread::beforeQuit() /** * @brief CDLT645DataProcThread::InitConfigParam * DLT645 初始化配置参数 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CDLT645DataProcThread::InitConfigParam() { @@ -163,7 +163,7 @@ int CDLT645DataProcThread::InitConfigParam() RtuNo = m_ptrCFesChan->m_RtuNo[i]; ptrCFesRtu = m_ptrCFesBase->GetRtuDataByRtuNo(RtuNo); if(ptrCFesRtu==NULL) - return kbdFailed; + return iotFailed; m_AppData.m_RtuData[i].A0 = 0; m_AppData.m_RtuData[i].A1 = 0; m_AppData.m_RtuData[i].A2 = 0; @@ -190,7 +190,7 @@ int CDLT645DataProcThread::InitConfigParam() } } m_AppData.setTimeTimeoutReset = m_ptrCFesBase->m_gSetTimeReset; - return kbdSuccess; + return iotSuccess; } /** * @brief CDLT645DataProcThread::GetPollingCmd @@ -205,7 +205,7 @@ int CDLT645DataProcThread::GetPollingCmd(SModbusCmd *pCmd) if (m_ptrCFesRtu == NULL) - return kbdFailed; + return iotFailed; while (count < m_ptrCFesRtu->m_Param.ModbusCmdBuf.num) { @@ -222,10 +222,10 @@ int CDLT645DataProcThread::GetPollingCmd(SModbusCmd *pCmd) m_ptrCFesRtu->m_Param.ModbusCmdBuf.readx = 0; count++; if (ComFlag) - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } /** @@ -278,7 +278,7 @@ int CDLT645DataProcThread::PollingCmdProcess() return 0; } - if (GetPollingCmd(&cmd) == kbdFailed) + if (GetPollingCmd(&cmd) == iotFailed) return 0; memcpy(&m_AppData.m_RtuData[RtuIndex].lastCmd, &cmd, sizeof(SModbusCmd)); @@ -404,7 +404,7 @@ int CDLT645DataProcThread::RecvComData() frameError = 0; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; //int ChanNo = m_ptrCurrentChan->m_Param.ChanNo; Len = 0; @@ -463,7 +463,7 @@ int CDLT645DataProcThread::RecvComData() } NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } else//长度、A0-A5 都正确则认为数据正确。 if ((Len == ExpectLen) && @@ -888,7 +888,7 @@ void CDLT645DataProcThread::TimerProcess() /** * @brief CDLT645DataProcThread::RecvDataProcess - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CDLT645DataProcThread::RecvDataProcess97(byte *recvBuff,int recvLen) { @@ -901,19 +901,19 @@ int CDLT645DataProcThread::RecvDataProcess97(byte *recvBuff,int recvLen) //< 主从发送方向检查,PRM为0表示主->从报文，1表示从->主报文 PRM = recvBuff[8]&0x80; if(PRM==0) - return kbdFailed; + return iotFailed; //< 功能码类型，不是读数据的不解析 funType = recvBuff[8]&0x0f; if(funType!=1) - return kbdFailed; + return iotFailed; //< 和校验检查 sum = (byte)CheckSum(&recvBuff[0],recvLen-2); if(sum!=recvBuff[recvLen-2]) - return kbdFailed; + return iotFailed; //< 结束符检查 if(recvBuff[recvLen-1]!=0x16) - return kbdFailed; + return iotFailed; funCode = m_AppData.m_RtuData[RtuIndex].lastCmd.FunCode; blockType = m_AppData.m_RtuData[RtuIndex].lastCmd.Type; @@ -929,13 +929,13 @@ int CDLT645DataProcThread::RecvDataProcess97(byte *recvBuff,int recvLen) RecvDiWithoutTimeProcess97(recvBuff); break; } - return kbdSuccess; + return iotSuccess; } /** * @brief CDLT645DataProcThread::RecvDataProcess07 * @param recvLen - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CDLT645DataProcThread::RecvDataProcess07(byte *recvBuff,int recvLen) { @@ -948,21 +948,21 @@ int CDLT645DataProcThread::RecvDataProcess07(byte *recvBuff,int recvLen) //< 主从发送方向检查,PRM为0表示主->从报文，1表示从->主报文 PRM = recvBuff[8]&0x80; if(PRM==0) - return kbdFailed; + return iotFailed; //< 功能码类型，不是读数据的不解析 funType = recvBuff[8]&0x0f; if(funType!=1) - return kbdFailed; + return iotFailed; //< 和校验检查 sum = (byte)CheckSum(&recvBuff[0],recvLen-2); if(sum!=recvBuff[recvLen-2]) - return kbdFailed; + return iotFailed; //< 结束符检查 if(recvBuff[recvLen-1]!=0x16) - return kbdFailed; + return iotFailed; funCode = m_AppData.m_RtuData[RtuIndex].lastCmd.FunCode; blockType = m_AppData.m_RtuData[RtuIndex].lastCmd.Type; @@ -984,7 +984,7 @@ int CDLT645DataProcThread::RecvDataProcess07(byte *recvBuff,int recvLen) break; } } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/fesdatarecv/fesdatarecv.cpp b/product/src/fes/protocol/fesdatarecv/fesdatarecv.cpp index 4e6d7b6d..42fad38d 100644 --- a/product/src/fes/protocol/fesdatarecv/fesdatarecv.cpp +++ b/product/src/fes/protocol/fesdatarecv/fesdatarecv.cpp @@ -20,31 +20,31 @@ bool g_fesdatarecvChanelRun=true; int EX_SetBaseAddr(void *address) { fesdatarecv.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { fesdatarecv.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { fesdatarecv.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { fesdatarecv.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { fesdatarecv.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) @@ -81,14 +81,14 @@ int CFesdatarecv::SetBaseAddr(void *address) { m_ptrCFesBase = (CFesBase *)address; } - return kbdSuccess; + return iotSuccess; } int CFesdatarecv::SetProperty(int IsMainFes) { g_fesdatarecvIsMainFes = IsMainFes; LOGDEBUG("CFesdatarecv::SetProperty g_fesdatarecvIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -97,7 +97,7 @@ int CFesdatarecv::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CFesdatarecv::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -105,12 +105,12 @@ int CFesdatarecv::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if(m_TcpServerListenThreadFlag) { @@ -118,7 +118,7 @@ int CFesdatarecv::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (m_CTcpServerListenThread == NULL) { LOGERROR("CFesdatarecv EX_OpenChan() ChanNo:%d create CTcpServerListenThread error!"); - return kbdFailed; + return iotFailed; } GetFesdatarecvProtocolInfo((char*) "fesdatarecv"); m_CTcpServerListenThread->resume(); //start TCP ServerListen THREAD @@ -138,7 +138,7 @@ int CFesdatarecv::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrUdpClient == NULL) { LOGERROR("CFesdatarecv EX_OpenChan() ChanNo:%d create CTcpServerRxTxThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_UdpClientThreadQueue.push_back(ptrUdpClient); ptrUdpClient->resume(); //start THREAD @@ -154,14 +154,14 @@ int CFesdatarecv::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpServerRxTx == NULL) { LOGERROR("CFesdatarecv EX_OpenChan() ChanNo:%d create CTcpServerRxTxThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpServerRxTxQueue.push_back(ptrCTcpServerRxTx); ptrCTcpServerRxTx->resume(); //start TCP Server THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -175,13 +175,13 @@ int CFesdatarecv::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrDataProc == NULL) { LOGERROR("CFesdatarecv EX_OpenChan() ChanNo:%d create CfesdatarecvDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_DataProcThreadQueue.push_back(ptrDataProc); ptrDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } /** @@ -190,7 +190,7 @@ int CFesdatarecv::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CFesdatarecv::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -198,12 +198,12 @@ int CFesdatarecv::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CFesdatarecv::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -225,7 +225,7 @@ int CFesdatarecv::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -236,14 +236,14 @@ int CFesdatarecv::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int CFesdatarecv::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } int CFesdatarecv::ExitSystem(int flag) { InformComThreadExit(); - return kbdSuccess; + return iotSuccess; } void CFesdatarecv::ClearUdpClientThreadByChanNo(int ChanNo) diff --git a/product/src/fes/protocol/fesdatarecv/fesdatarecvDataProcThread.cpp b/product/src/fes/protocol/fesdatarecv/fesdatarecvDataProcThread.cpp index 96ccb178..3d26b515 100644 --- a/product/src/fes/protocol/fesdatarecv/fesdatarecvDataProcThread.cpp +++ b/product/src/fes/protocol/fesdatarecv/fesdatarecvDataProcThread.cpp @@ -53,7 +53,7 @@ CFesdatarecvDataProcThread::~CFesdatarecvDataProcThread() */ int CFesdatarecvDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -190,7 +190,7 @@ int CFesdatarecvDataProcThread::RecvDataProcess() FrameType = m_AppData.recvBuf[1]; if (m_AppData.recvBufSize<7) - return kbdFailed; + return iotFailed; switch (FrameType) { case 0xC1://遥测 diff --git a/product/src/fes/protocol/fesdatazf/fesdatazf.cpp b/product/src/fes/protocol/fesdatazf/fesdatazf.cpp index dea6a84a..4294f02a 100644 --- a/product/src/fes/protocol/fesdatazf/fesdatazf.cpp +++ b/product/src/fes/protocol/fesdatazf/fesdatazf.cpp @@ -20,31 +20,31 @@ bool g_fesdatazfChanelRun=true; int EX_SetBaseAddr(void *address) { fesdatazf.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { fesdatazf.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { fesdatazf.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { fesdatazf.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { fesdatazf.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) @@ -80,14 +80,14 @@ int CFesdatazf::SetBaseAddr(void *address) m_ptrCFesBase = (CFesBase *)address; ReadConfigParam(); } - return kbdSuccess; + return iotSuccess; } int CFesdatazf::SetProperty(int IsMainFes) { g_fesdatazfIsMainFes = IsMainFes; LOGDEBUG("CFesdatazf::SetProperty g_fesdatazfIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -96,7 +96,7 @@ int CFesdatazf::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CFesdatazf::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -104,12 +104,12 @@ int CFesdatazf::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -124,7 +124,7 @@ int CFesdatazf::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrUdpClient == NULL) { LOGERROR("CFesdatazf EX_OpenChan() ChanNo:%d create CTcpServerRxTxThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_UdpClientThreadQueue.push_back(ptrUdpClient); ptrUdpClient->resume(); //start THREAD @@ -140,14 +140,14 @@ int CFesdatazf::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpClient == NULL) { LOGERROR("CFesdatazf EX_OpenChan() ChanNo:%d create CTcpClientThread error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpClientQueue.push_back(ptrCTcpClient); ptrCTcpClient->resume(); //start TCP CLIENT THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -161,13 +161,13 @@ int CFesdatazf::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrDataProc == NULL) { LOGERROR("CFesdatazf EX_OpenChan() ChanNo:%d create CfesdatazfDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_DataProcThreadQueue.push_back(ptrDataProc); ptrDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } /** @@ -176,7 +176,7 @@ int CFesdatazf::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CFesdatazf::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -184,12 +184,12 @@ int CFesdatazf::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CFesdatazf::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -211,7 +211,7 @@ int CFesdatazf::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -222,14 +222,14 @@ int CFesdatazf::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int CFesdatazf::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } int CFesdatazf::ExitSystem(int flag) { InformComThreadExit(); - return kbdSuccess; + return iotSuccess; } void CFesdatazf::ClearUdpClientThreadByChanNo(int ChanNo) @@ -296,7 +296,7 @@ void CFesdatazf::ClearDataProcThreadByChanNo(int ChanNo) /** * @brief CFesdatazf::ReadConfigParam * 读取fesdatazf配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CFesdatazf::ReadConfigParam() { @@ -312,16 +312,16 @@ int CFesdatazf::ReadConfigParam() memset(¶m,0,sizeof(SFesdatazfAppConfigParam)); if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"fesdatazf"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam ProtoclID error"); - return kbdFailed; + return iotFailed; } - if(config.load("../../data/fes/","fesdatazf.xml")==kbdFailed) - return kbdSuccess; + if(config.load("../../data/fes/","fesdatazf.xml")==iotFailed) + return iotSuccess; for (i = 0; i < m_ptrCFesBase->m_vectCFesChanPtr.size(); i++) { @@ -339,7 +339,7 @@ int CFesdatazf::ReadConfigParam() memset(¶m, 0, sizeof(param)); param.RtuNo = ptrRTU->m_Param.RtuNo; items = 0; - if (config.getIntValue(strRtuNo, "start_delay", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "start_delay", ivalue) == iotSuccess) { param.startDelay = ivalue * 1000; items++; @@ -347,7 +347,7 @@ int CFesdatazf::ReadConfigParam() else param.startDelay = 30 * 1000; - if (config.getIntValue(strRtuNo, "DiFrame_Interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "DiFrame_Interval", ivalue) == iotSuccess) { param.DiFrameIntervalReset = ivalue*1000; items++; @@ -355,7 +355,7 @@ int CFesdatazf::ReadConfigParam() else param.DiFrameIntervalReset = 1*1000; - if (config.getIntValue(strRtuNo, "AiFrame_Interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "AiFrame_Interval", ivalue) == iotSuccess) { param.AiFrameIntervalReset = ivalue * 1000; items++; @@ -363,7 +363,7 @@ int CFesdatazf::ReadConfigParam() else param.AiFrameIntervalReset = 5 * 1000; - if (config.getIntValue(strRtuNo, "AccFrame_Interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "AccFrame_Interval", ivalue) == iotSuccess) { param.AccFrameIntervalReset = ivalue * 1000; items++; @@ -371,7 +371,7 @@ int CFesdatazf::ReadConfigParam() else param.AccFrameIntervalReset = 300 * 1000; - if (config.getIntValue(strRtuNo, "MiFrame_Interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "MiFrame_Interval", ivalue) == iotSuccess) { param.MiFrameIntervalReset = ivalue * 1000; items++; @@ -379,7 +379,7 @@ int CFesdatazf::ReadConfigParam() else param.MiFrameIntervalReset = 120 * 1000; - if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == iotSuccess) { param.maxUpdateCount = ivalue; items++; @@ -387,7 +387,7 @@ int CFesdatazf::ReadConfigParam() else param.maxUpdateCount = 18; - if (config.getIntValue(strRtuNo, "send_Interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "send_Interval", ivalue) == iotSuccess) { param.sendIntervalReset = ivalue; items++; @@ -396,7 +396,7 @@ int CFesdatazf::ReadConfigParam() param.sendIntervalReset = 100; //起始通道号 - if (config.getIntValue(strRtuNo, "StartChNo", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "StartChNo", ivalue) == iotSuccess) { param.StartChNo = ivalue; items++; @@ -405,7 +405,7 @@ int CFesdatazf::ReadConfigParam() param.StartChNo = 0; //结束通道号 - if (config.getIntValue(strRtuNo, "EndChNo", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "EndChNo", ivalue) == iotSuccess) { param.EndChNo = ivalue; items++; @@ -422,7 +422,7 @@ int CFesdatazf::ReadConfigParam() } } LOGDEBUG("CFesdatazf::ReadConfigParam end"); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/fesdatazf/fesdatazfDataProcThread.cpp b/product/src/fes/protocol/fesdatazf/fesdatazfDataProcThread.cpp index f30b91c5..9c43aa18 100644 --- a/product/src/fes/protocol/fesdatazf/fesdatazfDataProcThread.cpp +++ b/product/src/fes/protocol/fesdatazf/fesdatazfDataProcThread.cpp @@ -74,7 +74,7 @@ CFesdatazfDataProcThread::~CFesdatazfDataProcThread() */ int CFesdatazfDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -135,12 +135,12 @@ void CFesdatazfDataProcThread::beforeQuit() /** * @brief CFesdatazfDataProcThread::InitConfigParam * fesdatazf 初始化配置参数 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CFesdatazfDataProcThread::InitConfigParam() { if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; memset(&m_AppData,0,sizeof(SFesdatazfAppData)); m_AppData.sendIntervalReset = 100;//100ms @@ -157,7 +157,7 @@ int CFesdatazfDataProcThread::InitConfigParam() m_AppData.state = CN_FesdatazfAppState_init; else m_AppData.state = CN_FesdatazfAppState_idle; - return kbdSuccess; + return iotSuccess; } void CFesdatazfDataProcThread::AppDataInit(vector vecAppParam) diff --git a/product/src/fes/protocol/gf104/GF104.cpp b/product/src/fes/protocol/gf104/GF104.cpp index c7115293..323753e2 100644 --- a/product/src/fes/protocol/gf104/GF104.cpp +++ b/product/src/fes/protocol/gf104/GF104.cpp @@ -19,37 +19,37 @@ bool g_GF104ChanelRun=true; int EX_SetBaseAddr(void *address) { gf104.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { gf104.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { gf104.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { gf104.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { gf104.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_GF104ChanelRun=false;//使所有的线程退出。 gf104.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CGF104::CGF104() @@ -82,14 +82,14 @@ int CGF104::SetBaseAddr(void *address) //2020-02-13 thxiao ReadConfigParam()需要使用m_ptrCFesBase，所以改为SetBaseAddr()处调用 ReadConfigParam(); } - return kbdSuccess; + return iotSuccess; } int CGF104::SetProperty(int IsMainFes) { g_GF104IsMainFes = IsMainFes; LOGDEBUG("CGF104::SetProperty g_GF104IsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -98,7 +98,7 @@ int CGF104::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CGF104::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -106,12 +106,12 @@ int CGF104::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if (m_TcpServerListenThreadFlag) { @@ -119,7 +119,7 @@ int CGF104::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (m_CTcpServerListenThread == NULL) { LOGERROR("CIEC104S EX_OpenChan() ChanNo:%d create CGFTcpServerListenThread error!"); - return kbdFailed; + return iotFailed; } GetGf104ProtocolInfo();//收集所有的端口号 m_CTcpServerListenThread->resume(); //start TCP ServerListen THREAD @@ -139,14 +139,14 @@ int CGF104::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpServerRxTx == NULL) { LOGERROR("CGF104 EX_OpenChan() ChanNo:%d create CGFTcpServerRxTxThread error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpServerRxTxQueue.push_back(ptrCTcpServerRxTx); ptrCTcpServerRxTx->resume(); //start TCP Server THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -160,13 +160,13 @@ int CGF104::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CGF104 EX_OpenChan() ChanNo:%d create CIEC104SDataProcThreadPtr error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -176,7 +176,7 @@ int CGF104::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CGF104::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -184,12 +184,12 @@ int CGF104::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; //LOGDEBUG("CGF104::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun) if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -210,7 +210,7 @@ int CGF104::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -222,7 +222,7 @@ int CGF104::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) int CGF104::ChanTimer(int /*MainChanNo*/) { //把命令缓冲时间间隔到的命放到发送命令缓冲区 - return kbdSuccess; + return iotSuccess; } @@ -270,7 +270,7 @@ void CGF104::ClearDataProcThreadByChanNo(int ChanNo) /** * @brief CGF104::ReadConfigParam * 读取GF104配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CGF104::ReadConfigParam() { @@ -284,20 +284,20 @@ int CGF104::ReadConfigParam() memset(¶m,0,sizeof(SGF104AppConfigParam)); if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"gf104"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam() ProtoclID error"); - return kbdFailed; + return iotFailed; } LOGDEBUG("gf104 ProtoclID=%d", m_ProtocolId); - if (config.load("../../data/fes/", "gf104.xml") == kbdFailed) + if (config.load("../../data/fes/", "gf104.xml") == iotFailed) { LOGDEBUG("gf104 load gf104.xml error"); - return kbdSuccess; + return iotSuccess; } LOGDEBUG("gf104 load gf104.xml ok"); @@ -317,7 +317,7 @@ int CGF104::ReadConfigParam() memset(¶m, 0, sizeof(param)); param.RtuNo = ptrRTU->m_Param.RtuNo; items = 0; - if (config.getIntValue(strRtuNo, "alldata_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "alldata_interval", ivalue) == iotSuccess) { param.dataPollTimeoutReset = ivalue * 1000; items++; @@ -325,7 +325,7 @@ int CGF104::ReadConfigParam() else param.dataPollTimeoutReset = 120 * 1000; - if (config.getIntValue(strRtuNo, "accdata_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "accdata_interval", ivalue) == iotSuccess) { param.accPollTimeoutReset = ivalue * 1000; items++; @@ -333,7 +333,7 @@ int CGF104::ReadConfigParam() else param.accPollTimeoutReset = 300 * 1000; - if (config.getIntValue(strRtuNo, "settime_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "settime_interval", ivalue) == iotSuccess) { param.setTimeTimeoutReset = ivalue * 1000; items++; @@ -342,7 +342,7 @@ int CGF104::ReadConfigParam() param.setTimeTimeoutReset = 180 * 1000; // LOGDEBUG("settime_interval %d",param.setTimeTimeoutReset); - if (config.getIntValue(strRtuNo, "t1", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t1", ivalue) == iotSuccess) { param.t1Reset = ivalue * 1000; items++; @@ -350,7 +350,7 @@ int CGF104::ReadConfigParam() else param.t1Reset = 15 * 1000; - if (config.getIntValue(strRtuNo, "t2", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t2", ivalue) == iotSuccess) { param.t2Reset = ivalue * 1000; items++; @@ -358,7 +358,7 @@ int CGF104::ReadConfigParam() else param.t2Reset = 10 * 1000; - if (config.getIntValue(strRtuNo, "t3", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t3", ivalue) == iotSuccess) { param.t3Reset = ivalue * 1000; items++; @@ -366,7 +366,7 @@ int CGF104::ReadConfigParam() else param.t3Reset = 20 * 1000; - if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == iotSuccess) { param.controlTimeoutReset = ivalue * 1000; items++; @@ -374,7 +374,7 @@ int CGF104::ReadConfigParam() else param.controlTimeoutReset = 10 * 1000; - if (config.getIntValue(strRtuNo, "n", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "n", ivalue) == iotSuccess) { param.n = ivalue; items++; @@ -382,7 +382,7 @@ int CGF104::ReadConfigParam() else param.n = 32768; - if (config.getIntValue(strRtuNo, "k", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "k", ivalue) == iotSuccess) { param.k = ivalue; items++; @@ -390,7 +390,7 @@ int CGF104::ReadConfigParam() else param.k = 30; - if (config.getIntValue(strRtuNo, "w", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "w", ivalue) == iotSuccess) { param.w = ivalue; items++; @@ -398,7 +398,7 @@ int CGF104::ReadConfigParam() else param.w = 15; - if (config.getIntValue(strRtuNo, "reason_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "reason_size", ivalue) == iotSuccess) { param.trReasonSize = ivalue; items++; @@ -406,7 +406,7 @@ int CGF104::ReadConfigParam() else param.trReasonSize = 2; - if (config.getIntValue(strRtuNo, "public_address_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "public_address_size", ivalue) == iotSuccess) { param.publicAddrSize = ivalue; items++; @@ -414,7 +414,7 @@ int CGF104::ReadConfigParam() else param.publicAddrSize = 2; - if (config.getIntValue(strRtuNo, "info_address_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "info_address_size", ivalue) == iotSuccess) { param.infoAddrSize = ivalue; items++; @@ -422,7 +422,7 @@ int CGF104::ReadConfigParam() else param.infoAddrSize = 3; - if (config.getIntValue(strRtuNo, "strict_com_mode", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "strict_com_mode", ivalue) == iotSuccess) { param.strictComMode = ivalue; items++; @@ -430,7 +430,7 @@ int CGF104::ReadConfigParam() else param.strictComMode = 0; - if (config.getIntValue(strRtuNo, "create_soe", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "create_soe", ivalue) == iotSuccess) { param.createSoe = ivalue; items++; @@ -438,7 +438,7 @@ int CGF104::ReadConfigParam() else param.createSoe = 0; - if (config.getIntValue(strRtuNo, "di_change_once", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "di_change_once", ivalue) == iotSuccess) { param.soeOnce = ivalue; items++; @@ -446,7 +446,7 @@ int CGF104::ReadConfigParam() else param.soeOnce = 0; - if (config.getIntValue(strRtuNo, "ignore_invalid_data", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ignore_invalid_data", ivalue) == iotSuccess) { param.ignoreInvalid = ivalue; items++; @@ -455,7 +455,7 @@ int CGF104::ReadConfigParam() param.ignoreInvalid = 0; //2019-08-07 thxiao AO控制模式; 0:允许发送单AO命令处理 1:允许同时发送多AO命令处理 - if (config.getIntValue(strRtuNo, "ao_control_mode", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ao_control_mode", ivalue) == iotSuccess) { param.aoCmdMode = ivalue; items++; @@ -464,7 +464,7 @@ int CGF104::ReadConfigParam() param.aoCmdMode = 0; //对于允许同时发送多AO命令处理，所有的AO命令使用同一种类型 - if (config.getIntValue(strRtuNo, "ao_control_type", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ao_control_type", ivalue) == iotSuccess) { param.aoCmdType = ivalue; items++; @@ -472,7 +472,7 @@ int CGF104::ReadConfigParam() else param.aoCmdType = 50; - if (config.getIntValue(strRtuNo, "di_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "di_start_info_address", ivalue) == iotSuccess) { param.diStartAddress = ivalue; items++; @@ -480,7 +480,7 @@ int CGF104::ReadConfigParam() else param.diStartAddress = 0x0001; - if (config.getIntValue(strRtuNo, "ai_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ai_start_info_address", ivalue) == iotSuccess) { param.aiStartAddress = ivalue; items++; @@ -488,7 +488,7 @@ int CGF104::ReadConfigParam() else param.aiStartAddress = 0x0701; - if (config.getIntValue(strRtuNo, "acc_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "acc_start_info_address", ivalue) == iotSuccess) { param.accStartAddress = ivalue; items++; @@ -496,7 +496,7 @@ int CGF104::ReadConfigParam() else param.accStartAddress = 0x0C01; - if (config.getIntValue(strRtuNo, "do_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "do_start_info_address", ivalue) == iotSuccess) { param.doStartAddress = ivalue; items++; @@ -504,7 +504,7 @@ int CGF104::ReadConfigParam() else param.doStartAddress = 0x0B01; - if (config.getIntValue(strRtuNo, "ao_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ao_start_info_address", ivalue) == iotSuccess) { param.aoStartAddress = ivalue; items++; @@ -525,7 +525,7 @@ int CGF104::ReadConfigParam() } } } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/gf104/GF104DataProcThread.cpp b/product/src/fes/protocol/gf104/GF104DataProcThread.cpp index 8c63ecd5..9422296b 100644 --- a/product/src/fes/protocol/gf104/GF104DataProcThread.cpp +++ b/product/src/fes/protocol/gf104/GF104DataProcThread.cpp @@ -114,7 +114,7 @@ CGF104DataProcThread::~CGF104DataProcThread() */ int CGF104DataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -224,12 +224,12 @@ void CGF104DataProcThread::beforeQuit() /** * @brief CGF104DataProcThread::InitConfigParam * GF104 初始化配置参数 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CGF104DataProcThread::InitConfigParam() { if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; memset(&m_AppData,0,sizeof(SGF104AppData)); @@ -261,13 +261,13 @@ int CGF104DataProcThread::InitConfigParam() m_AppData.aoStartAddress = 0x0B81; m_AppData.state = CN_GF104AppState_init; - return kbdSuccess; + return iotSuccess; } /** * @brief CGF104DataProcThread::ReadConfigParam * 读取GF104配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CGF104DataProcThread::ReadConfigParam() { @@ -276,23 +276,23 @@ int CGF104DataProcThread::ReadConfigParam() char strRtuNo[48]; //LOGINFO("gf104 读取配置文件gf104.xml\n"); if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; memset(&m_AppData,0,sizeof(SGF104AppData)); m_AppData.address = m_ptrCFesRtu->m_Param.RtuAddr; //默认配置 m_AppData.respTimeoutReset = m_ptrCFesChan->m_Param.RespTimeout; - if(config.load("../../data/fes/","gf104.xml")==kbdFailed) + if(config.load("../../data/fes/","gf104.xml")==iotFailed) { LOGERROR("gf104 读取配置文件gf104.xml失败\n"); - return kbdFailed; + return iotFailed; } LOGINFO("gf104 读取配置文件gf104.xml成功\n"); sprintf(strRtuNo,"RTU%d",m_ptrCFesRtu->m_Param.RtuNo); - if(config.getIntValue(strRtuNo,"alldata_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"alldata_interval",ivalue) == iotSuccess) { m_AppData.dataPollTimeoutReset = ivalue*1000; } @@ -301,126 +301,126 @@ int CGF104DataProcThread::ReadConfigParam() //LOGDEBUG("gf104 总召唤时间：%d\n",m_AppData.dataPollTimeoutReset); - if(config.getIntValue(strRtuNo,"accdata_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"accdata_interval",ivalue) == iotSuccess) { m_AppData.accPollTimeoutReset = ivalue*1000; } else m_AppData.accPollTimeoutReset = 300*1000; - if(config.getIntValue(strRtuNo,"settime_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"settime_interval",ivalue) == iotSuccess) { m_AppData.setTimeTimeoutReset = ivalue*1000; } else m_AppData.setTimeTimeoutReset = 180*1000; //默认180秒 - if(config.getIntValue(strRtuNo,"t1",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"t1",ivalue) == iotSuccess) { m_AppData.t1Reset = ivalue*1000; } else m_AppData.t1Reset = 15*1000; - if(config.getIntValue(strRtuNo,"t2",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"t2",ivalue) == iotSuccess) { m_AppData.t2Reset = ivalue*1000; } else m_AppData.t2Reset = 10*1000; - if(config.getIntValue(strRtuNo,"t3",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"t3",ivalue) == iotSuccess) { m_AppData.t3Reset = ivalue*1000; } else m_AppData.t3Reset = 20*1000; - if(config.getIntValue(strRtuNo,"control_timeout",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"control_timeout",ivalue) == iotSuccess) { m_AppData.controlTimeoutReset = ivalue*1000; } else m_AppData.controlTimeoutReset = 10*1000; - if(config.getIntValue(strRtuNo,"n",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"n",ivalue) == iotSuccess) { m_AppData.n = ivalue; } else m_AppData.n = 32768; - if(config.getIntValue(strRtuNo,"k",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"k",ivalue) == iotSuccess) { m_AppData.k = ivalue; } else m_AppData.k = 30; - if(config.getIntValue(strRtuNo,"w",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"w",ivalue) == iotSuccess) { m_AppData.w = ivalue; } else m_AppData.w = 15; - if(config.getIntValue(strRtuNo,"reason_size",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"reason_size",ivalue) == iotSuccess) { m_AppData.trReasonSize = ivalue; } else m_AppData.trReasonSize = 2; - if(config.getIntValue(strRtuNo,"public_address_size",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"public_address_size",ivalue) == iotSuccess) { m_AppData.publicAddrSize = ivalue; } else m_AppData.publicAddrSize = 2; - if(config.getIntValue(strRtuNo,"info_address_size",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"info_address_size",ivalue) == iotSuccess) { m_AppData.infoAddrSize = ivalue; } else m_AppData.infoAddrSize = 3; - if(config.getIntValue(strRtuNo,"strict_com_mode",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"strict_com_mode",ivalue) == iotSuccess) { m_AppData.strictComMode = ivalue; } else m_AppData.strictComMode = 0; - if(config.getIntValue(strRtuNo,"create_soe",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"create_soe",ivalue) == iotSuccess) { m_AppData.createSoe = ivalue; } else m_AppData.createSoe = 0; - if(config.getIntValue(strRtuNo,"di_change_once",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"di_change_once",ivalue) == iotSuccess) { m_AppData.soeOnce = ivalue; } else m_AppData.soeOnce = 0; - if(config.getIntValue(strRtuNo,"ignore_invalid_data",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"ignore_invalid_data",ivalue) == iotSuccess) { m_AppData.ignoreInvalid = ivalue; } else m_AppData.ignoreInvalid = 0; - if(config.getIntValue(strRtuNo,"di_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"di_start_info_address",ivalue) == iotSuccess) { m_AppData.diStartAddress = ivalue; } else m_AppData.diStartAddress = 0x0001; - if(config.getIntValue(strRtuNo,"ai_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"ai_start_info_address",ivalue) == iotSuccess) { m_AppData.aiStartAddress = ivalue; } @@ -428,21 +428,21 @@ int CGF104DataProcThread::ReadConfigParam() m_AppData.aiStartAddress = 0x0701; - if(config.getIntValue(strRtuNo,"acc_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"acc_start_info_address",ivalue) == iotSuccess) { m_AppData.accStartAddress = ivalue; } else m_AppData.accStartAddress = 0x0C01; - if(config.getIntValue(strRtuNo,"do_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"do_start_info_address",ivalue) == iotSuccess) { m_AppData.doStartAddress = ivalue; } else m_AppData.doStartAddress = 0x0B01; - if(config.getIntValue(strRtuNo,"ao_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"ao_start_info_address",ivalue) == iotSuccess) { m_AppData.aoStartAddress = ivalue; } @@ -450,7 +450,7 @@ int CGF104DataProcThread::ReadConfigParam() m_AppData.aoStartAddress = 0x0D01; - return kbdSuccess; + return iotSuccess; } @@ -957,7 +957,7 @@ void CGF104DataProcThread::SendSetTimeFrame() /** * @brief CGF104DataProcThread::RecvDataProcess - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CGF104DataProcThread::RecvDataProcess() { @@ -966,7 +966,7 @@ int CGF104DataProcThread::RecvDataProcess() uint64 recvMs; if(m_AppData.recvBufSize<6) - return kbdFailed; + return iotFailed; //test /* @@ -1133,7 +1133,7 @@ int CGF104DataProcThread::RecvDataProcess() } } - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/fes/protocol/gf104/GFTcpServerListenThread.cpp b/product/src/fes/protocol/gf104/GFTcpServerListenThread.cpp index b4bbb43d..8eceecb1 100644 --- a/product/src/fes/protocol/gf104/GFTcpServerListenThread.cpp +++ b/product/src/fes/protocol/gf104/GFTcpServerListenThread.cpp @@ -62,7 +62,7 @@ CGFTcpServerListenThread::~CGFTcpServerListenThread() int CGFTcpServerListenThread::beforeExecute() { InitListenPort(); - return kbdSuccess; + return iotSuccess; } /* @@ -256,9 +256,9 @@ int CGFTcpServerListenThread::Accept() } if(RecvInitInfo(clientIp,connfd)==true) - return kbdSuccess; + return iotSuccess; else - return kbdFailed; + return iotFailed; } else { @@ -272,7 +272,7 @@ int CGFTcpServerListenThread::Accept() } } - return kbdSuccess; + return iotSuccess; } void CGFTcpServerListenThread::TcpClose(int Socket) diff --git a/product/src/fes/protocol/gf104/GFTcpServerRxTxThread.cpp b/product/src/fes/protocol/gf104/GFTcpServerRxTxThread.cpp index 43e0e9bf..15b352da 100644 --- a/product/src/fes/protocol/gf104/GFTcpServerRxTxThread.cpp +++ b/product/src/fes/protocol/gf104/GFTcpServerRxTxThread.cpp @@ -60,7 +60,7 @@ CGFTcpServerRxTxThread::~CGFTcpServerRxTxThread() int CGFTcpServerRxTxThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/protocol/gf104s/GF104S.cpp b/product/src/fes/protocol/gf104s/GF104S.cpp index d64d60da..06c16214 100644 --- a/product/src/fes/protocol/gf104s/GF104S.cpp +++ b/product/src/fes/protocol/gf104s/GF104S.cpp @@ -23,31 +23,31 @@ bool g_GF104SChanelRun=true; int EX_SetBaseAddr(void *address) { GF104S.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { GF104S.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { GF104S.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { GF104S.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { GF104S.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) @@ -56,7 +56,7 @@ int EX_ExitSystem(int flag) g_GF104SChanelRun = false;//使所有的线程退出。 GF104S.ExitSystem(flag); LOGDEBUG("gf104s ExitSystem() end"); - return kbdSuccess; + return iotSuccess; } CGF104S::CGF104S() @@ -95,14 +95,14 @@ int CGF104S::SetBaseAddr(void *address) ReadConfigParam(); } - return kbdSuccess; + return iotSuccess; } int CGF104S::SetProperty(int IsMainFes) { g_GF104SIsMainFes = IsMainFes; LOGDEBUG("CGF104S::SetProperty g_GF104SIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -111,7 +111,7 @@ int CGF104S::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CGF104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -119,12 +119,12 @@ int CGF104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -139,14 +139,14 @@ int CGF104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpClient == NULL) { LOGERROR("CGF104S EX_OpenChan() ChanNo:%d create CTcpClientThread error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpClientQueue.push_back(ptrCTcpClient); ptrCTcpClient->resume(); //start TCP CLIENT THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -160,13 +160,13 @@ int CGF104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CGF104S EX_OpenChan() ChanNo:%d create CGF104SDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } /** @@ -175,7 +175,7 @@ int CGF104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CGF104S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -183,12 +183,12 @@ int CGF104S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CGF104S::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if ((CloseFlag == CN_FesChanThread_Flag) || (CloseFlag == CN_FesChanAndDataThread_Flag)) @@ -210,7 +210,7 @@ int CGF104S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -221,13 +221,13 @@ int CGF104S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int CGF104S::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } int CGF104S::ExitSystem(int flag) { InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } void CGF104S::ClearTcpClientThreadByChanNo(int ChanNo) @@ -274,7 +274,7 @@ void CGF104S::ClearDataProcThreadByChanNo(int ChanNo) /** * @brief CGF104S::ReadConfigParam * 读取GF104S配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CGF104S::ReadConfigParam() { @@ -289,18 +289,18 @@ int CGF104S::ReadConfigParam() memset(¶m,0,sizeof(SGF104SAppConfigParam)); if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"gf104s"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam ProtoclID error"); - return kbdFailed; + return iotFailed; } - //if(config.load("C:/ISCS6000_HOME/data/fes/","gf104s.xml")==kbdFailed) - if(config.load("../../data/fes/","gf104s.xml")==kbdFailed) - return kbdFailed; + //if(config.load("C:/ISCS6000_HOME/data/fes/","gf104s.xml")==iotFailed) + if(config.load("../../data/fes/","gf104s.xml")==iotFailed) + return iotFailed; uint64 msec=getUTCTimeMsec(); LOGDEBUG("CGF104S::ReadConfigParam start %lld",msec); @@ -321,7 +321,7 @@ int CGF104S::ReadConfigParam() memset(¶m, 0, sizeof(param)); param.RtuNo = ptrRTU->m_Param.RtuNo; items = 0; - if (config.getIntValue(strRtuNo, "t1", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t1", ivalue) == iotSuccess) { param.t1Reset = ivalue * 1000; items++; @@ -329,7 +329,7 @@ int CGF104S::ReadConfigParam() else param.t1Reset = 15 * 1000; - if (config.getIntValue(strRtuNo, "t2", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t2", ivalue) == iotSuccess) { param.t2Reset = ivalue * 1000; items++; @@ -337,7 +337,7 @@ int CGF104S::ReadConfigParam() else param.t2Reset = 10 * 1000; - if (config.getIntValue(strRtuNo, "t3", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t3", ivalue) == iotSuccess) { param.t3Reset = ivalue * 1000; items++; @@ -345,7 +345,7 @@ int CGF104S::ReadConfigParam() else param.t3Reset = 20 * 1000; - if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == iotSuccess) { param.controlTimeoutReset = ivalue * 1000; items++; @@ -353,7 +353,7 @@ int CGF104S::ReadConfigParam() else param.controlTimeoutReset = 10 * 1000; - if (config.getIntValue(strRtuNo, "n", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "n", ivalue) == iotSuccess) { param.n = ivalue; items++; @@ -361,7 +361,7 @@ int CGF104S::ReadConfigParam() else param.n = 32768; - if (config.getIntValue(strRtuNo, "k", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "k", ivalue) == iotSuccess) { param.k = ivalue; items++; @@ -369,7 +369,7 @@ int CGF104S::ReadConfigParam() else param.k = 30; - if (config.getIntValue(strRtuNo, "w", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "w", ivalue) == iotSuccess) { param.w = ivalue; items++; @@ -377,7 +377,7 @@ int CGF104S::ReadConfigParam() else param.w = 15; - if (config.getIntValue(strRtuNo, "reason_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "reason_size", ivalue) == iotSuccess) { param.trReasonSize = ivalue; items++; @@ -385,7 +385,7 @@ int CGF104S::ReadConfigParam() else param.trReasonSize = 2; - if (config.getIntValue(strRtuNo, "public_address_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "public_address_size", ivalue) == iotSuccess) { param.publicAddrSize = ivalue; items++; @@ -393,7 +393,7 @@ int CGF104S::ReadConfigParam() else param.publicAddrSize = 2; - if (config.getIntValue(strRtuNo, "info_address_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "info_address_size", ivalue) == iotSuccess) { param.infoAddrSize = ivalue; items++; @@ -401,7 +401,7 @@ int CGF104S::ReadConfigParam() else param.infoAddrSize = 3; - if (config.getIntValue(strRtuNo, "strict_com_mode", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "strict_com_mode", ivalue) == iotSuccess) { param.strictComMode = ivalue; items++; @@ -409,7 +409,7 @@ int CGF104S::ReadConfigParam() else param.strictComMode = 0; - if (config.getIntValue(strRtuNo, "singal_di_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "singal_di_start_info_address", ivalue) == iotSuccess) { param.SingaldiStartAddress = ivalue; items++; @@ -417,21 +417,21 @@ int CGF104S::ReadConfigParam() else param.SingaldiStartAddress = 0x0001; - if (config.getIntValue(strRtuNo, "double_di_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "double_di_start_info_address", ivalue) == iotSuccess) { param.DoublediStartAddress = ivalue; items++; } else param.DoublediStartAddress = 0x0001; - if (config.getIntValue(strRtuNo, "ai_type", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ai_type", ivalue) == iotSuccess) { param.aiUploadType = ivalue; items++; } else param.aiUploadType = 13; - if (config.getIntValue(strRtuNo, "ai_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ai_start_info_address", ivalue) == iotSuccess) { param.aiStartAddress = ivalue; items++; @@ -439,7 +439,7 @@ int CGF104S::ReadConfigParam() else param.aiStartAddress = 0x4001; - if (config.getIntValue(strRtuNo, "acc_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "acc_start_info_address", ivalue) == iotSuccess) { param.accStartAddress = ivalue; items++; @@ -447,7 +447,7 @@ int CGF104S::ReadConfigParam() else param.accStartAddress = 0x6401; - if (config.getIntValue(strRtuNo, "do_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "do_start_info_address", ivalue) == iotSuccess) { param.doStartAddress = ivalue; items++; @@ -455,7 +455,7 @@ int CGF104S::ReadConfigParam() else param.doStartAddress = 0x6001; - if (config.getIntValue(strRtuNo, "ao_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ao_start_info_address", ivalue) == iotSuccess) { param.aoStartAddress = ivalue; items++; @@ -463,7 +463,7 @@ int CGF104S::ReadConfigParam() else param.aoStartAddress = 0x6201; - if (config.getIntValue(strRtuNo, "qds_enable", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "qds_enable", ivalue) == iotSuccess) { param.qdsEnable = ivalue; items++; @@ -471,7 +471,7 @@ int CGF104S::ReadConfigParam() else param.qdsEnable = 1; - if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == iotSuccess) { param.maxUpdateCount = ivalue; items++; @@ -479,7 +479,7 @@ int CGF104S::ReadConfigParam() else param.maxUpdateCount = 18; //3MIN - if (config.getIntValue(strRtuNo, "start_delay", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "start_delay", ivalue) == iotSuccess) { param.startDelay = ivalue*1000; items++; @@ -487,7 +487,7 @@ int CGF104S::ReadConfigParam() else param.startDelay = 30000; //30s - if (config.getIntValue(strRtuNo, "set_time_enable", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "set_time_enable", ivalue) == iotSuccess) { param.setTimeFlag = ivalue; items++; @@ -495,7 +495,7 @@ int CGF104S::ReadConfigParam() else param.setTimeFlag = 0; - if (config.getIntValue(strRtuNo, "send_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "send_interval", ivalue) == iotSuccess) { param.sendInterval = ivalue; items++; @@ -504,7 +504,7 @@ int CGF104S::ReadConfigParam() param.sendInterval = 50; //50ms - if (config.getIntValue(strRtuNo, "disable_start_cmd", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "disable_start_cmd", ivalue) == iotSuccess) { param.disableStartCmd = ivalue; items++; @@ -523,7 +523,7 @@ int CGF104S::ReadConfigParam() msec=getUTCTimeMsec(); LOGDEBUG("CGF104S::ReadConfigParam end %lld",msec); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/gf104s/GF104SDataProcThread.cpp b/product/src/fes/protocol/gf104s/GF104SDataProcThread.cpp index 226129c3..b4188ecb 100644 --- a/product/src/fes/protocol/gf104s/GF104SDataProcThread.cpp +++ b/product/src/fes/protocol/gf104s/GF104SDataProcThread.cpp @@ -147,7 +147,7 @@ CGF104SDataProcThread::~CGF104SDataProcThread() */ int CGF104SDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -255,7 +255,7 @@ void CGF104SDataProcThread::execute() retLen = RecvNetData(); while ((count < 20) && (retLen > 0)) { - if (RecvDataProcess() == kbdSuccess) + if (RecvDataProcess() == iotSuccess) { m_AppData.InitTcpFlag = false; m_AppData.recvErrNum = 0; @@ -267,7 +267,7 @@ void CGF104SDataProcThread::execute() /*//接收数据 if(RecvNetData()>0) { - if (RecvDataProcess() == kbdSuccess) + if (RecvDataProcess() == iotSuccess) { m_AppData.InitTcpFlag = false; m_AppData.recvErrNum = 0; @@ -293,12 +293,12 @@ void CGF104SDataProcThread::beforeQuit() /** * @brief CGF104SDataProcThread::InitConfigParam * GF104S 初始化配置参数 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CGF104SDataProcThread::InitConfigParam() { if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; memset(&m_AppData,0,sizeof(SGF104SAppData)); @@ -352,7 +352,7 @@ int CGF104SDataProcThread::InitConfigParam() m_AppData.sendInterval = 0; m_AppData.startDelay = 0; - return kbdSuccess; + return iotSuccess; } @@ -1759,7 +1759,7 @@ void CGF104SDataProcThread::SendsyncTimeAckFrame() /** * @brief CGF104SDataProcThread::ProcessDoFrame * @describe 处理单点遥控，给主站反校 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ void CGF104SDataProcThread::ProcessDoFrame(int infoType) { @@ -1947,7 +1947,7 @@ void CGF104SDataProcThread::ProcessDoFrame(int infoType) /** * @brief CGF104SDataProcThread::ProcessNorScaleDzFrame * @describe 处理归一化定值\标度化定值，给主站反校 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ void CGF104SDataProcThread::ProcessAoFrame(int infoType) { @@ -2169,7 +2169,7 @@ void CGF104SDataProcThread::ProcessAoFrame(int infoType) } /** * @brief CGF104SDataProcThread::RecvDataProcess - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CGF104SDataProcThread::RecvDataProcess() { @@ -2179,12 +2179,12 @@ int CGF104SDataProcThread::RecvDataProcess() if (m_AppData.startDelay) { LOGDEBUG("CGF104SDataProcThread::RecvDataProcess startDelay."); - return kbdFailed; + return iotFailed; } if(m_AppData.recvBufSize<6) - return kbdFailed; + return iotFailed; if(((m_AppData.recvBuf[2]&0x01)==0x00)&&((m_AppData.recvBuf[4]&0x01)==0x00))//I格式报文 { @@ -2297,7 +2297,7 @@ int CGF104SDataProcThread::RecvDataProcess() } } - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/fes/protocol/httpClient_szdt/HttpClient_szdt.cpp b/product/src/fes/protocol/httpClient_szdt/HttpClient_szdt.cpp index caa13a0f..2f8271a4 100644 --- a/product/src/fes/protocol/httpClient_szdt/HttpClient_szdt.cpp +++ b/product/src/fes/protocol/httpClient_szdt/HttpClient_szdt.cpp @@ -17,38 +17,38 @@ bool g_HttpClient_szdtChanelRun = true; int EX_SetBaseAddr(void *address) { HttpClient_szdt.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { HttpClient_szdt.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo, int ChanNo, int OpenFlag) { HttpClient_szdt.OpenChan(MainChanNo, ChanNo, OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo, int ChanNo, int CloseFlag) { HttpClient_szdt.CloseChan(MainChanNo, ChanNo, CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { HttpClient_szdt.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_HttpClient_szdtChanelRun = false;//使所有的线程退出。 HttpClient_szdt.ExitSystem(flag); - return kbdSuccess; + return iotSuccess; } CHttpClient_szdt::CHttpClient_szdt() @@ -89,7 +89,7 @@ int CHttpClient_szdt::ReadConfigParam() if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam ProtoclID error"); - return kbdFailed; + return iotFailed; } buf = ReadFile("../../data/fes/httpClient_szdt.xml"); TiXmlDocument* xml = new TiXmlDocument(); @@ -99,7 +99,7 @@ int CHttpClient_szdt::ReadConfigParam() if (rootElement == NULL || strcmp(rootElement->Value(), CN_HttpClient_szdt_Node_Root) != 0) { LOGDEBUG("CHttpClient_szdt:ReadConfigParam:xml数据的根节点不为%s，xml格式错误！", CN_HttpClient_szdt_Node_Root); - return kbdFailed; + return iotFailed; } //rtu TiXmlNode* rtu = NULL; @@ -163,7 +163,7 @@ int CHttpClient_szdt::ReadConfigParam() } configRtuCount = i; i = 0; - return kbdSuccess; + return iotSuccess; } @@ -181,14 +181,14 @@ int CHttpClient_szdt::SetBaseAddr(void *address) //2020-02-13 thxiao ReadConfigParam()需要使用m_ptrCFesBase，所以改为SetBaseAddr()处调用 ReadConfigParam(); } - return kbdSuccess; + return iotSuccess; } int CHttpClient_szdt::SetProperty(int IsMainFes) { g_HttpClient_szdtIsMainFes = IsMainFes; LOGDEBUG("CHttpClient_szdt::SetProperty g_HttpClient_szdtIsMainFes:%d", IsMainFes); - return kbdSuccess; + return iotSuccess; } @@ -219,12 +219,12 @@ int CHttpClient_szdt::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if ((ptrMainFesChan = GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((ptrFesChan = GetChanDataByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((OpenFlag == CN_FesChanThread_Flag) || (OpenFlag == CN_FesChanAndDataThread_Flag)) { @@ -238,7 +238,7 @@ int CHttpClient_szdt::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -258,7 +258,7 @@ int CHttpClient_szdt::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CHttpClient_szdt EX_OpenChan() ChanNo:%d create CHttpClient_szdtDataProcThreadPtr error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD @@ -271,7 +271,7 @@ int CHttpClient_szdt::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) } } - return kbdSuccess; + return iotSuccess; } int CHttpClient_szdt::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) @@ -280,12 +280,12 @@ int CHttpClient_szdt::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if ((ptrMainFesChan = GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((ptrFesChan = GetChanDataByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CHttpClien::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d", MainChanNo, ChanNo, ptrFesChan->m_ComThreadRun, ptrMainFesChan->m_DataThreadRun); if ((CloseFlag == CN_FesChanThread_Flag) || (CloseFlag == CN_FesChanAndDataThread_Flag)) @@ -300,7 +300,7 @@ int CHttpClient_szdt::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -313,7 +313,7 @@ int CHttpClient_szdt::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } void CHttpClient_szdt::ClearDataProcThreadByChanNo(int ChanNo) @@ -338,10 +338,10 @@ void CHttpClient_szdt::ClearDataProcThreadByChanNo(int ChanNo) int CHttpClient_szdt::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } int CHttpClient_szdt::ExitSystem(int flag) { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/httpClient_szdt/HttpClient_szdtDataProcThread.cpp b/product/src/fes/protocol/httpClient_szdt/HttpClient_szdtDataProcThread.cpp index b5dc8137..21efcfa4 100644 --- a/product/src/fes/protocol/httpClient_szdt/HttpClient_szdtDataProcThread.cpp +++ b/product/src/fes/protocol/httpClient_szdt/HttpClient_szdtDataProcThread.cpp @@ -87,7 +87,7 @@ CHttpClient_szdtDataProcThread::~CHttpClient_szdtDataProcThread() int CHttpClient_szdtDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } void CHttpClient_szdtDataProcThread::execute() diff --git a/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjc.cpp b/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjc.cpp index 6288a9c0..324495b1 100644 --- a/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjc.cpp +++ b/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjc.cpp @@ -12,31 +12,31 @@ bool g_HttpsClient_bjjcChanelRun = true; int EX_SetBaseAddr(void *address) { HttpsClient_bjjc.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { HttpsClient_bjjc.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo, int ChanNo, int OpenFlag) { HttpsClient_bjjc.OpenChan(MainChanNo, ChanNo, OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo, int ChanNo, int CloseFlag) { HttpsClient_bjjc.CloseChan(MainChanNo, ChanNo, CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { HttpsClient_bjjc.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) @@ -45,7 +45,7 @@ int EX_ExitSystem(int flag) g_HttpsClient_bjjcChanelRun = false;//使所有的线程退出。 HttpsClient_bjjc.ExitSystem(flag); LOGDEBUG("HttpsClient_bjjc ExitSystem() end"); - return kbdSuccess; + return iotSuccess; } CHttpsClient_bjjc::CHttpsClient_bjjc() @@ -69,14 +69,14 @@ int CHttpsClient_bjjc::SetBaseAddr(void *address) } LOGDEBUG("SetBaseAddr"); ReadConfigParam(); - return kbdSuccess; + return iotSuccess; } int CHttpsClient_bjjc::SetProperty(int IsMainFes) { g_HttpsClient_bjjcIsMainFes = IsMainFes; LOGDEBUG("CHttpsClient_bjjc::SetProperty g_HttpHttpsSer_bjjcIsMainFes:%d", IsMainFes); - return kbdSuccess; + return iotSuccess; } @@ -99,7 +99,7 @@ void CHttpsClient_bjjc::ReadConfigParam() return; } - if (config.load("../../data/fes/", "httpsClient_bjjc.xml") == kbdFailed) + if (config.load("../../data/fes/", "httpsClient_bjjc.xml") == iotFailed) return; @@ -119,16 +119,16 @@ void CHttpsClient_bjjc::ReadConfigParam() DataIndex = 1; while (DataIndex != 0) { - if (config.getStringValue("httpsClient_bjjc", to_string(DataIndex), sValue) == kbdSuccess) + if (config.getStringValue("httpsClient_bjjc", to_string(DataIndex), sValue) == iotSuccess) { cmd_str[DataIndex - 1].UrlPath = sValue; string dataFrequency = ""; - if (config.getStringValue("dataFrequency", sValue, dataFrequency) == kbdSuccess) + if (config.getStringValue("dataFrequency", sValue, dataFrequency) == iotSuccess) { cmd_str[DataIndex - 1].SendFrequency = atoi(dataFrequency.c_str()); } string dataOverTime; - if (config.getStringValue("dataOverTime", sValue, dataOverTime) == kbdSuccess) + if (config.getStringValue("dataOverTime", sValue, dataOverTime) == iotSuccess) { cmd_str[DataIndex - 1].SendFrequency = atoi(dataOverTime.c_str()); } @@ -157,7 +157,7 @@ void CHttpsClient_bjjc::ReadConfigParam() { vector temp; - if (config.getStringValue(rtuUrl, to_string(DataIndex), sValue) == kbdSuccess) + if (config.getStringValue(rtuUrl, to_string(DataIndex), sValue) == iotSuccess) { vector x1 = HttpsClient_bjjcSplit(sValue, ":"); if (x1.size() == 2) //带远动点 @@ -178,7 +178,7 @@ void CHttpsClient_bjjc::ReadConfigParam() DataIndex2 = 1; while (DataIndex2 != 0) { - if (config.getStringValue(x3[a], to_string(DataIndex2), sValue) == kbdSuccess) + if (config.getStringValue(x3[a], to_string(DataIndex2), sValue) == iotSuccess) { vector x2 = HttpsClient_bjjcSplit(sValue, ":"); temp.push_back(sValue); @@ -199,7 +199,7 @@ void CHttpsClient_bjjc::ReadConfigParam() } else { - if (config.getStringValue(cmd_str[k].UrlPath, "PowerData", sValue) == kbdSuccess) + if (config.getStringValue(cmd_str[k].UrlPath, "PowerData", sValue) == iotSuccess) { PowerDataIndex = atoi(sValue.c_str()); } @@ -221,7 +221,7 @@ void CHttpsClient_bjjc::ReadConfigParam() * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CHttpsClient_bjjc::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) { @@ -229,12 +229,12 @@ int CHttpsClient_bjjc::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if ((ptrMainFesChan = GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((ptrFesChan = GetChanDataByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((OpenFlag == CN_FesChanThread_Flag) || (OpenFlag == CN_FesChanAndDataThread_Flag)) { @@ -249,7 +249,7 @@ int CHttpsClient_bjjc::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) } break; default: - return kbdFailed; + return iotFailed; */ if (ptrFesChan->m_ComThreadRun == CN_FesStopFlag) { @@ -267,14 +267,14 @@ int CHttpsClient_bjjc::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CHttpsClient_bjjc EX_OpenChan() ChanNo:%d create CHttpsClient_bjjcDataProcThreadPtr error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD curl_global_init(CURL_GLOBAL_DEFAULT); } } - return kbdSuccess; + return iotSuccess; } /** @@ -283,7 +283,7 @@ int CHttpsClient_bjjc::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CHttpsClient_bjjc::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) { @@ -291,12 +291,12 @@ int CHttpsClient_bjjc::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if ((ptrMainFesChan = GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((ptrFesChan = GetChanDataByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CHttpsClient_bjjc::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d", MainChanNo, ChanNo, ptrFesChan->m_ComThreadRun, ptrMainFesChan->m_DataThreadRun); if ((CloseFlag == CN_FesChanThread_Flag) || (CloseFlag == CN_FesChanAndDataThread_Flag)) @@ -311,7 +311,7 @@ int CHttpsClient_bjjc::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -324,7 +324,7 @@ int CHttpsClient_bjjc::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /* @@ -358,12 +358,12 @@ void CHttpsClient_bjjc::ClearDataProcThreadByChanNo(int ChanNo) */ int CHttpsClient_bjjc::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } int CHttpsClient_bjjc::ExitSystem(int flag) { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjcDataProcThread.cpp b/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjcDataProcThread.cpp index b68aff07..bf8668ed 100644 --- a/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjcDataProcThread.cpp +++ b/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjcDataProcThread.cpp @@ -295,7 +295,7 @@ CHttpsClient_bjjcDataProcThread::~CHttpsClient_bjjcDataProcThread() */ int CHttpsClient_bjjcDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } void CHttpsClient_bjjcDataProcThread::SetSendCmdFlag() @@ -964,9 +964,9 @@ static int HttpsClient_bjjcOnWriteData(void* buffer, size_t size, size_t nmemb, if (NULL == str) { LOGDEBUG("返回数据为null"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; /* rapidjson::Document document; document.Parse(str->c_str()); @@ -985,15 +985,15 @@ static int HttpsClient_bjjcOnWriteData(void* buffer, size_t size, size_t nmemb, if (strcmp(result, "Success") == 0) { LOGDEBUG("return:Success"); - return kbdSuccess; + return iotSuccess; } else { - return kbdFailed; + return iotFailed; } } - return kbdFailed; + return iotFailed; */ } @@ -1004,7 +1004,7 @@ static int HttpsClient_bjjcOnWriteData(void* buffer, size_t size, size_t nmemb, static int HttpsClient_bjjcOnWriteData_powerRealTime(void* buffer, size_t size, size_t nmemb, void* lpVoid) { LOGDEBUG("OnWriteData_powerRealTime"); int result = HttpsClient_bjjcOnWriteData(buffer, size, nmemb, lpVoid); - if (result == kbdSuccess) + if (result == iotSuccess) { LOGDEBUG("receive HttpsClient_bjjcOnWriteData_powerRealTime() success"); } @@ -1021,7 +1021,7 @@ static int HttpsClient_bjjcOnWriteData_powerRealTime(void* buffer, size_t size, /************************************************************************/ static int HttpsClient_bjjcOnWriteData_checkTime(void* buffer, size_t size, size_t nmemb, void* lpVoid) { int result = HttpsClient_bjjcOnWriteData(buffer, size, nmemb, lpVoid); - if (result == kbdSuccess) + if (result == iotSuccess) { g_HttpsClient_bjjcRecvFlagCheckTime = true; LOGDEBUG("receive HttpsClient_bjjcOnWriteData_checkTime() success"); @@ -1040,7 +1040,7 @@ static int HttpsClient_bjjcOnWriteData_uploadPowerFile(void* buffer, size_t size LOGDEBUG("OnWriteData_uploadPowerFile"); /* int result = HttpsClient_bjjcOnWriteData(buffer, size, nmemb, lpVoid); - if (result == kbdSuccess) + if (result == iotSuccess) { g_HttpsClient_bjjcRecvFlagUploadPowerFile = true; LOGDEBUG("receive HttpsClient_bjjcOnWriteData_uploadPowerFile() success"); @@ -1050,7 +1050,7 @@ static int HttpsClient_bjjcOnWriteData_uploadPowerFile(void* buffer, size_t size LOGDEBUG("receive HttpsClient_bjjcOnWriteData_uploadPowerFile() fail"); } */ - int result = kbdSuccess; + int result = iotSuccess; g_HttpsClient_bjjcRecvFlagUploadPowerFile = true; return result; } diff --git a/product/src/fes/protocol/iec101s/IEC101S.cpp b/product/src/fes/protocol/iec101s/IEC101S.cpp index c4a11d09..bcfeb1a1 100644 --- a/product/src/fes/protocol/iec101s/IEC101S.cpp +++ b/product/src/fes/protocol/iec101s/IEC101S.cpp @@ -20,38 +20,38 @@ bool g_IEC101SChanelRun=true; int EX_SetBaseAddr(void *address) { IEC101S.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { IEC101S.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { IEC101S.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { IEC101S.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { IEC101S.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_IEC101SChanelRun=false;//使所有的线程退出。 IEC101S.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CIEC101S::CIEC101S() { @@ -77,14 +77,14 @@ int CIEC101S::SetBaseAddr(void *address) m_ptrCFesBase = (CFesBase *)address; } - return kbdSuccess; + return iotSuccess; } int CIEC101S::SetProperty(int IsMainFes) { g_IEC101SIsMainFes = IsMainFes; LOGDEBUG("CIEC101S::SetProperty g_IEC101SIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -93,7 +93,7 @@ int CIEC101S::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC101S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -101,12 +101,12 @@ int CIEC101S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -120,7 +120,7 @@ int CIEC101S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCSerialPort == NULL) { LOGERROR("CIEC101S EX_OpenChan() ChanNo:%d create CSerialPortThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } else { @@ -131,7 +131,7 @@ int CIEC101S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -145,13 +145,13 @@ int CIEC101S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CIEC101S EX_OpenChan() ChanNo:%d create CIEC101SDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } /** @@ -160,7 +160,7 @@ int CIEC101S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC101S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -168,12 +168,12 @@ int CIEC101S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGERROR("CIEC101S::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -189,7 +189,7 @@ int CIEC101S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -202,7 +202,7 @@ int CIEC101S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -220,9 +220,9 @@ int CIEC101S::ChanTimer(int MainChanNo) int i,RtuNo; SFesCollectRtu* ptr = m_ptrCFesBase->getFesConllectRtu(); //获取转发表采集RTU号结构 if((ptrFesChan = m_ptrCFesBase->GetChanDataByChanNo(MainChanNo))==NULL) //获取当前主通道号 - return kbdFailed; + return iotFailed; if(ptr->CollectRtuNum > CN_FesFwMaxCollectRtuNum) - return kbdFailed; + return iotFailed; ptrFesCurrentRtu = GetRtuDataByChanData(ptrFesChan); //获取当前的RTU数据区 @@ -238,7 +238,7 @@ int CIEC101S::ChanTimer(int MainChanNo) */ - return kbdSuccess; + return iotSuccess; } /** * @brief CIEC101S::FwAiBuffUpdate @@ -409,7 +409,7 @@ void CIEC101S::ClearDataProcThreadByChanNo(int ChanNo) /** * @brief CIEC101S::ReadConfigParam * 读取IEC101S配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CIEC101S::ReadConfigParam() { @@ -420,8 +420,8 @@ int CIEC101S::ReadConfigParam() int items,i; memset(¶m,0,sizeof(SIEC101SAppConfigParam)); - if(config.load("../../data/fes/","iec101s.xml")==kbdFailed) - return kbdFailed; + if(config.load("../../data/fes/","iec101s.xml")==iotFailed) + return iotFailed; uint64 msec=getUTCTimeMsec(); LOGDEBUG("CIEC101S::ReadConfigParam start %lld",msec); @@ -433,7 +433,7 @@ int CIEC101S::ReadConfigParam() param.RtuNo = i; items = 0; - if(config.getIntValue(strRtuNo,"max_initialize_time",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"max_initialize_time",ivalue) == iotSuccess) { param.MaxIniTimeout = ivalue*1000; items++; @@ -441,7 +441,7 @@ int CIEC101S::ReadConfigParam() else param.MaxIniTimeout = 60*1000; - if(config.getIntValue(strRtuNo,"device_address_size",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"device_address_size",ivalue) == iotSuccess) { param.deviceAddrSize = ivalue; items++; @@ -449,7 +449,7 @@ int CIEC101S::ReadConfigParam() else param.deviceAddrSize = 1; - if(config.getIntValue(strRtuNo,"reason_size",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"reason_size",ivalue) == iotSuccess) { param.trReasonSize = ivalue; items++; @@ -457,7 +457,7 @@ int CIEC101S::ReadConfigParam() else param.trReasonSize = 1; - if(config.getIntValue(strRtuNo,"public_address_size",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"public_address_size",ivalue) == iotSuccess) { param.publicAddrSize = ivalue; items++; @@ -465,7 +465,7 @@ int CIEC101S::ReadConfigParam() else param.publicAddrSize = 1; - if(config.getIntValue(strRtuNo,"info_address_size",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"info_address_size",ivalue) == iotSuccess) { param.infoAddrSize = ivalue; items++; @@ -473,7 +473,7 @@ int CIEC101S::ReadConfigParam() else param.infoAddrSize = 2; - /* if(config.getIntValue(strRtuNo,"strict_com_mode",ivalue) == kbdSuccess) + /* if(config.getIntValue(strRtuNo,"strict_com_mode",ivalue) == iotSuccess) { param.strictComMode = ivalue; items++; @@ -481,7 +481,7 @@ int CIEC101S::ReadConfigParam() else param.strictComMode = 0; - if(config.getIntValue(strRtuNo,"create_soe",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"create_soe",ivalue) == iotSuccess) { param.createSoe = ivalue; items++; @@ -489,7 +489,7 @@ int CIEC101S::ReadConfigParam() else param.createSoe = 0; - if(config.getIntValue(strRtuNo,"di_change_once",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"di_change_once",ivalue) == iotSuccess) { param.soeOnce = ivalue; items++; @@ -497,7 +497,7 @@ int CIEC101S::ReadConfigParam() else param.soeOnce = 0; - if(config.getIntValue(strRtuNo,"ignore_invalid_data",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"ignore_invalid_data",ivalue) == iotSuccess) { param.ignoreInvalid = ivalue; items++; @@ -505,7 +505,7 @@ int CIEC101S::ReadConfigParam() else param.ignoreInvalid = 0;*/ - if(config.getIntValue(strRtuNo,"di_upload_yxtype",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"di_upload_yxtype",ivalue) == iotSuccess) { param.diUploadType = ivalue; items++; @@ -513,7 +513,7 @@ int CIEC101S::ReadConfigParam() else param.diUploadType = 1; - if(config.getIntValue(strRtuNo,"singal_di_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"singal_di_start_info_address",ivalue) == iotSuccess) { param.SingaldiStartAddress = ivalue; items++; @@ -521,21 +521,21 @@ int CIEC101S::ReadConfigParam() else param.SingaldiStartAddress = 0x0001; - if(config.getIntValue(strRtuNo,"double_di_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"double_di_start_info_address",ivalue) == iotSuccess) { param.DoublediStartAddress = ivalue; items++; } else param.DoublediStartAddress = 0x0001; - if(config.getIntValue(strRtuNo,"ai_type",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"ai_type",ivalue) == iotSuccess) { param.aiUploadType = ivalue; items++; } else param.aiUploadType = 13; - if(config.getIntValue(strRtuNo,"ai_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"ai_start_info_address",ivalue) == iotSuccess) { param.aiStartAddress = ivalue; items++; @@ -543,7 +543,7 @@ int CIEC101S::ReadConfigParam() else param.aiStartAddress = 0x0701; - if(config.getIntValue(strRtuNo,"acc_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"acc_start_info_address",ivalue) == iotSuccess) { param.accStartAddress = ivalue; items++; @@ -551,7 +551,7 @@ int CIEC101S::ReadConfigParam() else param.accStartAddress = 0x0C01; - if(config.getIntValue(strRtuNo,"do_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"do_start_info_address",ivalue) == iotSuccess) { param.doStartAddress = ivalue; items++; @@ -559,7 +559,7 @@ int CIEC101S::ReadConfigParam() else param.doStartAddress = 0x0B01; - if(config.getIntValue(strRtuNo,"ao_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"ao_start_info_address",ivalue) == iotSuccess) { param.aoStartAddress = ivalue; items++; @@ -567,7 +567,7 @@ int CIEC101S::ReadConfigParam() else param.aoStartAddress = 0x0D01; - if(config.getIntValue(strRtuNo,"qds_enable",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"qds_enable",ivalue) == iotSuccess) { param.aidiQdsFlag = ivalue; items++; @@ -575,7 +575,7 @@ int CIEC101S::ReadConfigParam() else param.aidiQdsFlag = 1; - if (config.getIntValue(strRtuNo, "start_delay", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "start_delay", ivalue) == iotSuccess) { param.startDelay = ivalue * 1000; items++; @@ -583,7 +583,7 @@ int CIEC101S::ReadConfigParam() else param.startDelay = 30000; //30s - if (config.getIntValue(strRtuNo, "set_time_enable", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "set_time_enable", ivalue) == iotSuccess) { param.setTimeFlag = ivalue; items++; @@ -591,7 +591,7 @@ int CIEC101S::ReadConfigParam() else param.setTimeFlag = 0; - if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == iotSuccess) { param.maxUpdateCount = ivalue; items++; @@ -612,7 +612,7 @@ int CIEC101S::ReadConfigParam() msec=getUTCTimeMsec(); LOGDEBUG("CIEC101S::ReadConfigParam end %lld",msec); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/iec101s/IEC101SDataProcThread.cpp b/product/src/fes/protocol/iec101s/IEC101SDataProcThread.cpp index 3a3a6131..73518c94 100644 --- a/product/src/fes/protocol/iec101s/IEC101SDataProcThread.cpp +++ b/product/src/fes/protocol/iec101s/IEC101SDataProcThread.cpp @@ -150,7 +150,7 @@ CIEC101SDataProcThread::~CIEC101SDataProcThread() */ int CIEC101SDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -232,12 +232,12 @@ void CIEC101SDataProcThread::beforeQuit() /** * @brief CIEC101SDataProcThread::InitConfigParam * IEC101S 初始化配置参数 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CIEC101SDataProcThread::InitConfigParam() { if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; memset(&m_AppData,0,sizeof(SIEC101SAppData)); memset(&m_AppData.OldrData,0,sizeof(m_AppData.OldrData)); @@ -314,7 +314,7 @@ int CIEC101SDataProcThread::InitConfigParam() m_AppData.updateCount = 0; m_AppData.state = CN_IEC101SAppState_init; - return kbdSuccess; + return iotSuccess; } /** @@ -2241,7 +2241,7 @@ void CIEC101SDataProcThread::SendRepeatFrame() /** * @brief CIEC101SDataProcThread::ProcessDoFrame * @describe 处理单点遥控，给主站反校 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ void CIEC101SDataProcThread::ProcessDoFrame(int DOType) { @@ -2518,7 +2518,7 @@ void CIEC101SDataProcThread::ProcessDoFrame(int DOType) /** * @brief CIEC101SDataProcThread::ProcessAoFrame * @describe 处理归一化定值，处理标度化定值，给主站反校 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ void CIEC101SDataProcThread::ProcessAoFrame(int AOType) { @@ -2807,7 +2807,7 @@ void CIEC101SDataProcThread::SendAoFrame() /** * @brief CIEC101SDataProcThread::RecvDataProcess - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC101SDataProcThread::RecvDataProcess() { @@ -2820,7 +2820,7 @@ int CIEC101SDataProcThread::RecvDataProcess() Addr = 0; Type = 0; COT = 0; Temp = 0; YkContrl=0; if(m_AppData.recvBufSize<5) - return kbdFailed; + return iotFailed; //==================短帧报文解析=======================// if((m_AppData.recvBuf[0]==0x10)&&(m_AppData.recvBuf[3+m_AppData.deviceAddrSize]==0x16)) { @@ -2906,25 +2906,25 @@ int CIEC101SDataProcThread::RecvDataProcess() { Sum = (byte)CheckSum(m_AppData.recvBuf+4,m_AppData.recvBufSize-6); if( Sum!=m_AppData.recvBuf[m_AppData.recvBufSize-2]) - return kbdFailed;//校验错误 + return iotFailed;//校验错误 for(i=0;i11) { //功能码错误 m_AppData.FrameType=0xffff; - return kbdFailed; + return iotFailed; } //结束符错误 if(m_AppData.recvBuf[ m_AppData.recvBufSize-1] !=0x16) { m_AppData.FrameType=0xffff; - return kbdFailed;//结束符错误 + return iotFailed;//结束符错误 } //当FCV有效，但FCB没翻转，应回上次的报文 if( (FUN ==9) && (FUN==0) ) @@ -2940,18 +2940,18 @@ int CIEC101SDataProcThread::RecvDataProcess() if( m_AppData.FCB == (m_AppData.recvBuf[4] & 0x20) ) { if( m_AppData.XOR_FCB_NUM>=2 ) //FCB不翻转的次数超过就不响应 - return kbdFailed; + return iotFailed; SendRepeatFrame(); m_AppData.FrameType=0xffff; m_AppData.XOR_FCB_NUM++; //FCV有效，FCB不翻转次数加1 - return kbdFailed; + return iotFailed; } else if( m_AppData.XOR_FCB_NUM<2) m_AppData.XOR_FCB_NUM=0; //FCV有效，FCB正确翻转 else - return kbdFailed; + return iotFailed; } else { @@ -2960,13 +2960,13 @@ int CIEC101SDataProcThread::RecvDataProcess() } } else - return kbdFailed; + return iotFailed; //判断FRM启动报文位是否为下行报文 if( (m_AppData.recvBuf[4] & 0x40) != 0x40) { m_AppData.FrameType=0xffff; - return kbdFailed; + return iotFailed; } m_AppData.FCB= m_AppData.recvBuf[4] & 0x20;//帧计数位 m_AppData.FCV= m_AppData.recvBuf[4] & 0x10;//帧计数有效位 @@ -3141,7 +3141,7 @@ int CIEC101SDataProcThread::RecvDataProcess() // if(m_AppData.FrameType==IEC101S_I_TYPE) // SendShortErrorFrame(); - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/fes/protocol/iec103/IEC103.cpp b/product/src/fes/protocol/iec103/IEC103.cpp index 13784549..38781cb3 100644 --- a/product/src/fes/protocol/iec103/IEC103.cpp +++ b/product/src/fes/protocol/iec103/IEC103.cpp @@ -20,7 +20,7 @@ #include using namespace std; -#define kbdFailed 1 +#define iotFailed 1 using boost::property_tree::ptree; using namespace iot_public; @@ -33,37 +33,37 @@ bool g_IEC103ChanelRun=true; int EX_SetBaseAddr(void *address) { IEC103.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { IEC103.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { IEC103.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { IEC103.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { IEC103.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_IEC103ChanelRun=false;//使所有的线程退出。 IEC103.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CIEC103::CIEC103() @@ -97,14 +97,14 @@ int CIEC103::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*) "iec103"); ReadConfigParam(); } - return kbdSuccess; + return iotSuccess; } int CIEC103::SetProperty(int IsMainFes) { g_IEC103IsMainFes = IsMainFes; LOGDEBUG("CIEC103::SetProperty g_IEC103IsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -113,7 +113,7 @@ int CIEC103::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC103::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -121,12 +121,12 @@ int CIEC103::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -141,14 +141,14 @@ int CIEC103::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCSerialPort == NULL) { LOGERROR("CIEC103 EX_OpenChan() ChanNo:%d create CTcpClientThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CSerialPortQueue.push_back(ptrCSerialPort); ptrCSerialPort->resume(); //start SerialPort THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -162,7 +162,7 @@ int CIEC103::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CIEC103 EX_OpenChan() ChanNo:%d create CIEC103DataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD @@ -174,14 +174,14 @@ int CIEC103::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) // if (ptrCLbProc == NULL) // { // LOGERROR("CIEC103 EX_OpenChan() ChanNo:%d create CIEC103LbProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); -// return kbdFailed; +// return iotFailed; // } // m_CLbProcQueue.push_back(ptrCLbProc); // ptrCLbProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -191,7 +191,7 @@ int CIEC103::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC103::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -199,12 +199,12 @@ int CIEC103::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; //LOGDEBUG("CIEC103::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun) @@ -223,7 +223,7 @@ int CIEC103::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -238,7 +238,7 @@ int CIEC103::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -250,7 +250,7 @@ int CIEC103::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) int CIEC103::ChanTimer(int /*MainChanNo*/) { //把命令缓冲时间间隔到的命放到发送命令缓冲区 - return kbdSuccess; + return iotSuccess; } void CIEC103::ClearSerialPortThreadByChanNo(int ChanNo) @@ -320,7 +320,7 @@ void CIEC103::ClearDataProcThreadByChanNo(int ChanNo) * 读取iec103配置文件 * CHAN模块的配置表示的是只要配置一个通道，其通道下的所有RTU的参数都是同一套。 * 同时增加RTU的模块配置功能，一个RTU就配置一个模块配置，RTU的优先级高于CHAN。 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CIEC103::ReadConfigParam() { @@ -340,18 +340,18 @@ int CIEC103::ReadConfigParam() //memset(&chanParam,0,sizeof(SIEC103AppChanConfigParam));//lww todo if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"iec103"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam ProtoclID error"); - return kbdFailed; + return iotFailed; } LOGINFO("iec103 ProtoclID=%d", m_ProtocolId); - if(config.load("../../data/fes/","iec103.xml")==kbdFailed) - return kbdSuccess; + if(config.load("../../data/fes/","iec103.xml")==iotFailed) + return iotSuccess; //< 初始化CHAN配置参数 @@ -368,7 +368,7 @@ int CIEC103::ReadConfigParam() items = 0; //>总召唤时间周期(单位:秒) - if (config.getIntValue(strChanNo, "alldata_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strChanNo, "alldata_interval", ivalue) == iotSuccess) { chanParam.dataPollTimeoutReset = ivalue * 1000; items++; @@ -377,7 +377,7 @@ int CIEC103::ReadConfigParam() chanParam.dataPollTimeoutReset = 900 * 1000; //总召默认15分钟 //>电度量总召唤时间周期(单位:秒) - if (config.getIntValue(strChanNo, "accdata_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strChanNo, "accdata_interval", ivalue) == iotSuccess) { chanParam.accPollTimeoutReset = ivalue * 1000; items++; @@ -386,7 +386,7 @@ int CIEC103::ReadConfigParam() chanParam.accPollTimeoutReset = 600 * 1000;//电度默认10分钟 //>控制命令超时时间(单位:秒) - if (config.getIntValue(strChanNo, "control_timeout", ivalue) == kbdSuccess) + if (config.getIntValue(strChanNo, "control_timeout", ivalue) == iotSuccess) { chanParam.controlTimeoutReset = ivalue * 1000; items++; @@ -397,7 +397,7 @@ int CIEC103::ReadConfigParam() //< 录波配置文件结构参数 //> 数字量通道个数 - if (config.getIntValue(strRtuNo, "LbDiChanNum", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "LbDiChanNum", ivalue) == iotSuccess) { chanParam.diChanNum = ivalue; items++; @@ -418,7 +418,7 @@ int CIEC103::ReadConfigParam() memset(strTemp, 0, sizeof(strTemp)); sprintf(strTemp, "LbDigitalName%d", k); digitalName = strTemp; - if (config.getStringValue(strChanNo, digitalName, strvalue) == kbdSuccess) + if (config.getStringValue(strChanNo, digitalName, strvalue) == iotSuccess) { strcpy(distr.DigitalName, strvalue.c_str());; ditems++; @@ -429,7 +429,7 @@ int CIEC103::ReadConfigParam() memset(strTemp, 0, sizeof(strTemp)); sprintf(strTemp, "Lbfun_infostr%d", k); fun_infostr = strTemp; - if (config.getStringValue(strChanNo, fun_infostr, strvalue) == kbdSuccess) + if (config.getStringValue(strChanNo, fun_infostr, strvalue) == iotSuccess) { strcpy(distr.fun_info_str,strvalue.c_str()); ditems++; @@ -440,7 +440,7 @@ int CIEC103::ReadConfigParam() memset(strTemp, 0, sizeof(strTemp)); sprintf(strTemp, "LbOrigCirNo%d", k); origCirNo = strTemp; - if (config.getIntValue(strChanNo, origCirNo, ivalue) == kbdSuccess) + if (config.getIntValue(strChanNo, origCirNo, ivalue) == iotSuccess) { distr.OrigCirNo = ivalue; ditems++; @@ -452,7 +452,7 @@ int CIEC103::ReadConfigParam() memset(strTemp, 0, sizeof(strTemp)); sprintf(strTemp, "LbEffChanStatus%d", k); effChanStatus = strTemp; - if (config.getIntValue(strChanNo, effChanStatus, ivalue) == kbdSuccess) + if (config.getIntValue(strChanNo, effChanStatus, ivalue) == iotSuccess) { distr.EffChanStatus = ivalue; ditems++; @@ -490,7 +490,7 @@ int CIEC103::ReadConfigParam() items = 0; //>总召唤时间周期(单位:秒) - if (config.getIntValue(strRtuNo, "alldata_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "alldata_interval", ivalue) == iotSuccess) { param.dataPollTimeoutReset = ivalue * 1000; items++; @@ -499,7 +499,7 @@ int CIEC103::ReadConfigParam() param.dataPollTimeoutReset = 900 * 1000; //总召默认15分钟 //>电度量总召唤时间周期(单位:秒) - if (config.getIntValue(strRtuNo, "accdata_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "accdata_interval", ivalue) == iotSuccess) { param.accPollTimeoutReset = ivalue * 1000; items++; @@ -510,7 +510,7 @@ int CIEC103::ReadConfigParam() //< 录波配置文件结构参数 //> 数字量通道个数 - if (config.getIntValue(strRtuNo, "LbDiChanNum", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "LbDiChanNum", ivalue) == iotSuccess) { param.diChanNum = ivalue; items++; @@ -531,7 +531,7 @@ int CIEC103::ReadConfigParam() memset(strTemp, 0, sizeof(strTemp)); sprintf(strTemp, "LbDigitalName%d", k); digitalName = strTemp; - if (config.getStringValue(strRtuNo, digitalName, strvalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, digitalName, strvalue) == iotSuccess) { strcpy(distr.DigitalName, strvalue.c_str());; ditems++; @@ -542,7 +542,7 @@ int CIEC103::ReadConfigParam() memset(strTemp, 0, sizeof(strTemp)); sprintf(strTemp, "Lbfun_infostr%d", k); fun_infostr = strTemp; - if (config.getStringValue(strRtuNo, fun_infostr, strvalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, fun_infostr, strvalue) == iotSuccess) { strcpy(distr.fun_info_str, strvalue.c_str()); ditems++; @@ -553,7 +553,7 @@ int CIEC103::ReadConfigParam() memset(strTemp, 0, sizeof(strTemp)); sprintf(strTemp, "LbOrigCirNo%d", k); origCirNo = strTemp; - if (config.getIntValue(strRtuNo, origCirNo, ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, origCirNo, ivalue) == iotSuccess) { distr.OrigCirNo = ivalue; ditems++; @@ -564,7 +564,7 @@ int CIEC103::ReadConfigParam() memset(strTemp, 0, sizeof(strTemp)); sprintf(strTemp, "LbEffChanStatus%d", k); effChanStatus = strTemp; - if (config.getIntValue(strRtuNo, effChanStatus, ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, effChanStatus, ivalue) == iotSuccess) { distr.EffChanStatus = ivalue; ditems++; @@ -585,7 +585,7 @@ int CIEC103::ReadConfigParam() } } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/iec103/IEC103DataProcThread.cpp b/product/src/fes/protocol/iec103/IEC103DataProcThread.cpp index 08b6d763..a9cbc3bb 100644 --- a/product/src/fes/protocol/iec103/IEC103DataProcThread.cpp +++ b/product/src/fes/protocol/iec103/IEC103DataProcThread.cpp @@ -331,7 +331,7 @@ CIEC103DataProcThread::~CIEC103DataProcThread() */ int CIEC103DataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -386,7 +386,7 @@ void CIEC103DataProcThread::beforeQuit() /** * @brief CIEC103DataProcThread::InitDefaultConfigParam * IEC103 初始化配置参数 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CIEC103DataProcThread::InitDefaultConfigParam() { @@ -399,7 +399,7 @@ int CIEC103DataProcThread::InitDefaultConfigParam() RtuNo = m_ptrCFesChan->m_RtuNo[i]; ptrCFesRtu = m_ptrCFesBase->GetRtuDataByRtuNo(RtuNo); if(ptrCFesRtu==NULL) - return kbdFailed; + return iotFailed; m_AppData.m_RtuData[i].RtuNo = RtuNo; m_AppData.m_RtuData[i].fcb = 0; m_AppData.m_RtuData[i].sendType = 0; @@ -471,7 +471,7 @@ int CIEC103DataProcThread::InitDefaultConfigParam() InitLbConfigPara(RtuNo,i); } m_AppData.controlTimeoutReset = 5 * 1000; - return kbdSuccess; + return iotSuccess; } @@ -1740,7 +1740,7 @@ void CIEC103DataProcThread::FillIFrameHeader(uint8 *data,int framLen,int ctrlAre /** * @brief CIEC103DataProcThread::RecvDataProcess - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC103DataProcThread::RecvDataProcess(int recvLen) { @@ -1757,20 +1757,20 @@ int CIEC103DataProcThread::RecvDataProcess(int recvLen) //< 和校验检查 sum = (uint8)CheckSum(&m_AppData.recvBuf[1],2); if(sum!=m_AppData.recvBuf[3]) - return kbdFailed; + return iotFailed; //< 结束符检查 if(m_AppData.recvBuf[recvLen-1]!=0x16) - return kbdFailed; + return iotFailed; //< 链路地址检查 if(m_AppData.recvBuf[2]!= m_ptrCFesRtu->m_Param.RtuAddr) - return kbdFailed; + return iotFailed; //< 主从发送方向检查 PRM = m_AppData.recvBuf[1]; if(PRM & 0x40) - return kbdFailed; + return iotFailed; //< 一级数据判断 ACD = m_AppData.recvBuf[1] & 0x20; @@ -1845,20 +1845,20 @@ int CIEC103DataProcThread::RecvDataProcess(int recvLen) //< 和校验检查 sum = (uint8)CheckSum(&m_AppData.recvBuf[4],recvLen-6); if(sum!=m_AppData.recvBuf[recvLen-2]) - return kbdFailed; + return iotFailed; //< 结束符检查 if(m_AppData.recvBuf[recvLen-1]!=0x16) - return kbdFailed; + return iotFailed; //< 链路地址检查 if(m_AppData.recvBuf[5]!=m_AppData.m_RtuData[RtuIndex].address) - return kbdFailed; + return iotFailed; //< 主从发送方向检查 PRM = m_AppData.recvBuf[4]; if(PRM & 0x40) - return kbdFailed; + return iotFailed; //< 一级数据判断 ACD = m_AppData.recvBuf[4] & 0x20; @@ -1937,7 +1937,7 @@ int CIEC103DataProcThread::RecvDataProcess(int recvLen) break; } } - return kbdSuccess; + return iotSuccess; } @@ -4105,7 +4105,7 @@ CIEC103RtuLbStructPtr CIEC103DataProcThread::GetRtuPtrByRtuNo(int RtuNo) /** * @brief CIEC103DataProcThread::CreateLbPath * 创建录波文件路径 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CIEC103DataProcThread::CreateLbPath() { @@ -4269,5 +4269,5 @@ int CIEC103DataProcThread::CreateLbPath() } } #endif - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/iec104/IEC104.cpp b/product/src/fes/protocol/iec104/IEC104.cpp index 3d310c5f..bb174683 100644 --- a/product/src/fes/protocol/iec104/IEC104.cpp +++ b/product/src/fes/protocol/iec104/IEC104.cpp @@ -25,37 +25,37 @@ bool g_IEC104ChanelRun=true; int EX_SetBaseAddr(void *address) { Iec104.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { Iec104.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { Iec104.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { Iec104.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { Iec104.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_IEC104ChanelRun=false;//使所有的线程退出。 Iec104.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CIEC104::CIEC104() @@ -89,14 +89,14 @@ int CIEC104::SetBaseAddr(void *address) //2020-02-13 thxiao ReadConfigParam()需要使用m_ptrCFesBase，所以改为SetBaseAddr()处调用 ReadConfigParam(); } - return kbdSuccess; + return iotSuccess; } int CIEC104::SetProperty(int IsMainFes) { g_IEC104IsMainFes = IsMainFes; LOGDEBUG("CIEC104::SetProperty g_IEC104IsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -105,7 +105,7 @@ int CIEC104::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC104::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -113,12 +113,12 @@ int CIEC104::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -133,14 +133,14 @@ int CIEC104::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpClient == NULL) { LOGERROR("CIEC104 EX_OpenChan() ChanNo:%d create CTcpClientThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpClientQueue.push_back(ptrCTcpClient); ptrCTcpClient->resume(); //start TCP CLIENT THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -154,13 +154,13 @@ int CIEC104::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CIEC104 EX_OpenChan() ChanNo:%d create CIEC104DataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -170,7 +170,7 @@ int CIEC104::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC104::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -178,12 +178,12 @@ int CIEC104::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; //LOGDEBUG("CIEC104::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun) if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -205,7 +205,7 @@ int CIEC104::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -217,7 +217,7 @@ int CIEC104::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) int CIEC104::ChanTimer(int /*MainChanNo*/) { //把命令缓冲时间间隔到的命放到发送命令缓冲区 - return kbdSuccess; + return iotSuccess; } void CIEC104::ClearTcpClientThreadByChanNo(int ChanNo) @@ -264,7 +264,7 @@ void CIEC104::ClearDataProcThreadByChanNo(int ChanNo) /** * @brief CIEC104::ReadConfigParam * 读取IEC104配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CIEC104::ReadConfigParam() { @@ -278,20 +278,20 @@ int CIEC104::ReadConfigParam() memset(¶m,0,sizeof(SIEC104AppConfigParam)); if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"iec104"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam() ProtoclID error"); - return kbdFailed; + return iotFailed; } LOGDEBUG("iec104 ProtoclID=%d", m_ProtocolId); - if (config.load("../../data/fes/", "iec104.xml") == kbdFailed) + if (config.load("../../data/fes/", "iec104.xml") == iotFailed) { LOGDEBUG("iec104 load iec104.xml error"); - return kbdSuccess; + return iotSuccess; } LOGDEBUG("iec104 load iec104.xml ok"); @@ -311,7 +311,7 @@ int CIEC104::ReadConfigParam() memset(¶m, 0, sizeof(param)); param.RtuNo = ptrRTU->m_Param.RtuNo; items = 0; - if (config.getIntValue(strRtuNo, "alldata_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "alldata_interval", ivalue) == iotSuccess) { param.dataPollTimeoutReset = ivalue * 1000; items++; @@ -319,7 +319,7 @@ int CIEC104::ReadConfigParam() else param.dataPollTimeoutReset = 120 * 1000; - if (config.getIntValue(strRtuNo, "accdata_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "accdata_interval", ivalue) == iotSuccess) { param.accPollTimeoutReset = ivalue * 1000; items++; @@ -327,7 +327,7 @@ int CIEC104::ReadConfigParam() else param.accPollTimeoutReset = 300 * 1000; - if (config.getIntValue(strRtuNo, "settime_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "settime_interval", ivalue) == iotSuccess) { param.setTimeTimeoutReset = ivalue * 1000; items++; @@ -336,7 +336,7 @@ int CIEC104::ReadConfigParam() param.setTimeTimeoutReset = 180 * 1000; // LOGDEBUG("settime_interval %d",param.setTimeTimeoutReset); - if (config.getIntValue(strRtuNo, "t1", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t1", ivalue) == iotSuccess) { param.t1Reset = ivalue * 1000; items++; @@ -344,7 +344,7 @@ int CIEC104::ReadConfigParam() else param.t1Reset = 15 * 1000; - if (config.getIntValue(strRtuNo, "t2", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t2", ivalue) == iotSuccess) { param.t2Reset = ivalue * 1000; items++; @@ -352,7 +352,7 @@ int CIEC104::ReadConfigParam() else param.t2Reset = 10 * 1000; - if (config.getIntValue(strRtuNo, "t3", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t3", ivalue) == iotSuccess) { param.t3Reset = ivalue * 1000; items++; @@ -360,7 +360,7 @@ int CIEC104::ReadConfigParam() else param.t3Reset = 20 * 1000; - if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == iotSuccess) { param.controlTimeoutReset = ivalue * 1000; items++; @@ -368,7 +368,7 @@ int CIEC104::ReadConfigParam() else param.controlTimeoutReset = 10 * 1000; - if (config.getIntValue(strRtuNo, "n", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "n", ivalue) == iotSuccess) { param.n = ivalue; items++; @@ -376,7 +376,7 @@ int CIEC104::ReadConfigParam() else param.n = 32768; - if (config.getIntValue(strRtuNo, "k", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "k", ivalue) == iotSuccess) { param.k = ivalue; items++; @@ -384,7 +384,7 @@ int CIEC104::ReadConfigParam() else param.k = 30; - if (config.getIntValue(strRtuNo, "w", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "w", ivalue) == iotSuccess) { param.w = ivalue; items++; @@ -392,7 +392,7 @@ int CIEC104::ReadConfigParam() else param.w = 15; - if (config.getIntValue(strRtuNo, "reason_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "reason_size", ivalue) == iotSuccess) { param.trReasonSize = ivalue; items++; @@ -400,7 +400,7 @@ int CIEC104::ReadConfigParam() else param.trReasonSize = 2; - if (config.getIntValue(strRtuNo, "public_address_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "public_address_size", ivalue) == iotSuccess) { param.publicAddrSize = ivalue; items++; @@ -408,7 +408,7 @@ int CIEC104::ReadConfigParam() else param.publicAddrSize = 2; - if (config.getIntValue(strRtuNo, "info_address_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "info_address_size", ivalue) == iotSuccess) { param.infoAddrSize = ivalue; items++; @@ -416,7 +416,7 @@ int CIEC104::ReadConfigParam() else param.infoAddrSize = 3; - if (config.getIntValue(strRtuNo, "strict_com_mode", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "strict_com_mode", ivalue) == iotSuccess) { param.strictComMode = ivalue; items++; @@ -424,7 +424,7 @@ int CIEC104::ReadConfigParam() else param.strictComMode = 0; - if (config.getIntValue(strRtuNo, "create_soe", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "create_soe", ivalue) == iotSuccess) { param.createSoe = ivalue; items++; @@ -432,7 +432,7 @@ int CIEC104::ReadConfigParam() else param.createSoe = 0; - if (config.getIntValue(strRtuNo, "di_change_once", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "di_change_once", ivalue) == iotSuccess) { param.soeOnce = ivalue; items++; @@ -440,7 +440,7 @@ int CIEC104::ReadConfigParam() else param.soeOnce = 0; - if (config.getIntValue(strRtuNo, "soe_check_di", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "soe_check_di", ivalue) == iotSuccess) { param.soeCheckDi = ivalue; items++; @@ -448,7 +448,7 @@ int CIEC104::ReadConfigParam() else param.soeCheckDi = 0; - if (config.getIntValue(strRtuNo, "ignore_invalid_data", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ignore_invalid_data", ivalue) == iotSuccess) { param.ignoreInvalid = ivalue; items++; @@ -457,7 +457,7 @@ int CIEC104::ReadConfigParam() param.ignoreInvalid = 0; //2019-08-07 thxiao AO控制模式; 0:允许发送单AO命令处理 1:允许同时发送多AO命令处理 - if (config.getIntValue(strRtuNo, "ao_control_mode", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ao_control_mode", ivalue) == iotSuccess) { param.aoCmdMode = ivalue; items++; @@ -466,7 +466,7 @@ int CIEC104::ReadConfigParam() param.aoCmdMode = 0; //对于允许同时发送多AO命令处理，所有的AO命令使用同一种类型 - if (config.getIntValue(strRtuNo, "ao_control_type", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ao_control_type", ivalue) == iotSuccess) { param.aoCmdType = ivalue; items++; @@ -474,7 +474,7 @@ int CIEC104::ReadConfigParam() else param.aoCmdType = 50; - if (config.getIntValue(strRtuNo, "di_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "di_start_info_address", ivalue) == iotSuccess) { param.diStartAddress = ivalue; items++; @@ -482,7 +482,7 @@ int CIEC104::ReadConfigParam() else param.diStartAddress = 0x0001; - if (config.getIntValue(strRtuNo, "ai_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ai_start_info_address", ivalue) == iotSuccess) { param.aiStartAddress = ivalue; items++; @@ -490,7 +490,7 @@ int CIEC104::ReadConfigParam() else param.aiStartAddress = 0x0701; - if (config.getIntValue(strRtuNo, "acc_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "acc_start_info_address", ivalue) == iotSuccess) { param.accStartAddress = ivalue; items++; @@ -498,7 +498,7 @@ int CIEC104::ReadConfigParam() else param.accStartAddress = 0x0C01; - if (config.getIntValue(strRtuNo, "do_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "do_start_info_address", ivalue) == iotSuccess) { param.doStartAddress = ivalue; items++; @@ -506,7 +506,7 @@ int CIEC104::ReadConfigParam() else param.doStartAddress = 0x0B01; - if (config.getIntValue(strRtuNo, "ao_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ao_start_info_address", ivalue) == iotSuccess) { param.aoStartAddress = ivalue; items++; @@ -527,7 +527,7 @@ int CIEC104::ReadConfigParam() } } } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/iec104/IEC104DataProcThread.cpp b/product/src/fes/protocol/iec104/IEC104DataProcThread.cpp index 5c96dbb8..b5596908 100644 --- a/product/src/fes/protocol/iec104/IEC104DataProcThread.cpp +++ b/product/src/fes/protocol/iec104/IEC104DataProcThread.cpp @@ -133,7 +133,7 @@ CIEC104DataProcThread::~CIEC104DataProcThread() */ int CIEC104DataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -243,12 +243,12 @@ void CIEC104DataProcThread::beforeQuit() /** * @brief CIEC104DataProcThread::InitConfigParam * IEC104 初始化配置参数 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CIEC104DataProcThread::InitConfigParam() { if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; memset(&m_AppData,0,sizeof(SIEC104AppData)); @@ -281,13 +281,13 @@ int CIEC104DataProcThread::InitConfigParam() m_AppData.aoStartAddress = 0x0B81; m_AppData.state = CN_IEC104AppState_init; - return kbdSuccess; + return iotSuccess; } /** * @brief CIEC104DataProcThread::ReadConfigParam * 读取IEC104配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CIEC104DataProcThread::ReadConfigParam() { @@ -296,23 +296,23 @@ int CIEC104DataProcThread::ReadConfigParam() char strRtuNo[48]; //LOGINFO("iec104 读取配置文件iec104.xml\n"); if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; memset(&m_AppData,0,sizeof(SIEC104AppData)); m_AppData.address = m_ptrCFesRtu->m_Param.RtuAddr; //默认配置 m_AppData.respTimeoutReset = m_ptrCFesChan->m_Param.RespTimeout; - if(config.load("../../data/fes/","iec104.xml")==kbdFailed) + if(config.load("../../data/fes/","iec104.xml")==iotFailed) { LOGERROR("iec104 读取配置文件iec104.xml失败\n"); - return kbdFailed; + return iotFailed; } LOGINFO("iec104 读取配置文件iec104.xml成功\n"); sprintf(strRtuNo,"RTU%d",m_ptrCFesRtu->m_Param.RtuNo); - if(config.getIntValue(strRtuNo,"alldata_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"alldata_interval",ivalue) == iotSuccess) { m_AppData.dataPollTimeoutReset = ivalue*1000; } @@ -321,133 +321,133 @@ int CIEC104DataProcThread::ReadConfigParam() //LOGDEBUG("iec104 总召唤时间：%d\n",m_AppData.dataPollTimeoutReset); - if(config.getIntValue(strRtuNo,"accdata_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"accdata_interval",ivalue) == iotSuccess) { m_AppData.accPollTimeoutReset = ivalue*1000; } else m_AppData.accPollTimeoutReset = 300*1000; - if(config.getIntValue(strRtuNo,"settime_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"settime_interval",ivalue) == iotSuccess) { m_AppData.setTimeTimeoutReset = ivalue*1000; } else m_AppData.setTimeTimeoutReset = 180*1000; //默认180秒 - if(config.getIntValue(strRtuNo,"t1",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"t1",ivalue) == iotSuccess) { m_AppData.t1Reset = ivalue*1000; } else m_AppData.t1Reset = 15*1000; - if(config.getIntValue(strRtuNo,"t2",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"t2",ivalue) == iotSuccess) { m_AppData.t2Reset = ivalue*1000; } else m_AppData.t2Reset = 10*1000; - if(config.getIntValue(strRtuNo,"t3",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"t3",ivalue) == iotSuccess) { m_AppData.t3Reset = ivalue*1000; } else m_AppData.t3Reset = 20*1000; - if(config.getIntValue(strRtuNo,"control_timeout",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"control_timeout",ivalue) == iotSuccess) { m_AppData.controlTimeoutReset = ivalue*1000; } else m_AppData.controlTimeoutReset = 10*1000; - if(config.getIntValue(strRtuNo,"n",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"n",ivalue) == iotSuccess) { m_AppData.n = ivalue; } else m_AppData.n = 32768; - if(config.getIntValue(strRtuNo,"k",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"k",ivalue) == iotSuccess) { m_AppData.k = ivalue; } else m_AppData.k = 30; - if(config.getIntValue(strRtuNo,"w",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"w",ivalue) == iotSuccess) { m_AppData.w = ivalue; } else m_AppData.w = 15; - if(config.getIntValue(strRtuNo,"reason_size",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"reason_size",ivalue) == iotSuccess) { m_AppData.trReasonSize = ivalue; } else m_AppData.trReasonSize = 2; - if(config.getIntValue(strRtuNo,"public_address_size",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"public_address_size",ivalue) == iotSuccess) { m_AppData.publicAddrSize = ivalue; } else m_AppData.publicAddrSize = 2; - if(config.getIntValue(strRtuNo,"info_address_size",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"info_address_size",ivalue) == iotSuccess) { m_AppData.infoAddrSize = ivalue; } else m_AppData.infoAddrSize = 3; - if(config.getIntValue(strRtuNo,"strict_com_mode",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"strict_com_mode",ivalue) == iotSuccess) { m_AppData.strictComMode = ivalue; } else m_AppData.strictComMode = 0; - if(config.getIntValue(strRtuNo,"create_soe",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"create_soe",ivalue) == iotSuccess) { m_AppData.createSoe = ivalue; } else m_AppData.createSoe = 0; - if(config.getIntValue(strRtuNo,"di_change_once",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"di_change_once",ivalue) == iotSuccess) { m_AppData.soeOnce = ivalue; } else m_AppData.soeOnce = 0; - if (config.getIntValue(strRtuNo, "soe_check_di", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "soe_check_di", ivalue) == iotSuccess) { m_AppData.soeCheckDi = ivalue; } else m_AppData.soeCheckDi = 0; - if(config.getIntValue(strRtuNo,"ignore_invalid_data",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"ignore_invalid_data",ivalue) == iotSuccess) { m_AppData.ignoreInvalid = ivalue; } else m_AppData.ignoreInvalid = 0; - if(config.getIntValue(strRtuNo,"di_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"di_start_info_address",ivalue) == iotSuccess) { m_AppData.diStartAddress = ivalue; } else m_AppData.diStartAddress = 0x0001; - if(config.getIntValue(strRtuNo,"ai_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"ai_start_info_address",ivalue) == iotSuccess) { m_AppData.aiStartAddress = ivalue; } @@ -455,21 +455,21 @@ int CIEC104DataProcThread::ReadConfigParam() m_AppData.aiStartAddress = 0x0701; - if(config.getIntValue(strRtuNo,"acc_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"acc_start_info_address",ivalue) == iotSuccess) { m_AppData.accStartAddress = ivalue; } else m_AppData.accStartAddress = 0x0C01; - if(config.getIntValue(strRtuNo,"do_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"do_start_info_address",ivalue) == iotSuccess) { m_AppData.doStartAddress = ivalue; } else m_AppData.doStartAddress = 0x0B01; - if(config.getIntValue(strRtuNo,"ao_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"ao_start_info_address",ivalue) == iotSuccess) { m_AppData.aoStartAddress = ivalue; } @@ -477,7 +477,7 @@ int CIEC104DataProcThread::ReadConfigParam() m_AppData.aoStartAddress = 0x0D01; - return kbdSuccess; + return iotSuccess; } @@ -984,7 +984,7 @@ void CIEC104DataProcThread::SendSetTimeFrame() /** * @brief CIEC104DataProcThread::RecvDataProcess - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC104DataProcThread::RecvDataProcess() { @@ -993,7 +993,7 @@ int CIEC104DataProcThread::RecvDataProcess() uint64 recvMs; if(m_AppData.recvBufSize<6) - return kbdFailed; + return iotFailed; //test /* @@ -1160,7 +1160,7 @@ int CIEC104DataProcThread::RecvDataProcess() } } - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/fes/protocol/iec104V2/IEC104V2.cpp b/product/src/fes/protocol/iec104V2/IEC104V2.cpp index 369a28d1..1c77977d 100644 --- a/product/src/fes/protocol/iec104V2/IEC104V2.cpp +++ b/product/src/fes/protocol/iec104V2/IEC104V2.cpp @@ -25,37 +25,37 @@ bool g_IEC104V2ChanelRun=true; int EX_SetBaseAddr(void *address) { Iec104.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { Iec104.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { Iec104.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { Iec104.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { Iec104.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_IEC104V2ChanelRun=false;//使所有的线程退出。 Iec104.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CIEC104V2::CIEC104V2() @@ -89,14 +89,14 @@ int CIEC104V2::SetBaseAddr(void *address) //2020-02-13 thxiao ReadConfigParam()需要使用m_ptrCFesBase，所以改为SetBaseAddr()处调用 ReadConfigParam(); } - return kbdSuccess; + return iotSuccess; } int CIEC104V2::SetProperty(int IsMainFes) { g_IEC104V2IsMainFes = IsMainFes; LOGDEBUG("CIEC104V2::SetProperty g_IEC104V2IsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -105,7 +105,7 @@ int CIEC104V2::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC104V2::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -113,12 +113,12 @@ int CIEC104V2::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -133,14 +133,14 @@ int CIEC104V2::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpClient == NULL) { LOGERROR("CIEC104V2 EX_OpenChan() ChanNo:%d create CTcpClientThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpClientQueue.push_back(ptrCTcpClient); ptrCTcpClient->resume(); //start TCP CLIENT THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -154,13 +154,13 @@ int CIEC104V2::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CIEC104V2 EX_OpenChan() ChanNo:%d create CIEC104V2DataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -170,7 +170,7 @@ int CIEC104V2::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC104V2::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -178,12 +178,12 @@ int CIEC104V2::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; //LOGDEBUG("CIEC104V2::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun) if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -205,7 +205,7 @@ int CIEC104V2::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -217,7 +217,7 @@ int CIEC104V2::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) int CIEC104V2::ChanTimer(int /*MainChanNo*/) { //把命令缓冲时间间隔到的命放到发送命令缓冲区 - return kbdSuccess; + return iotSuccess; } void CIEC104V2::ClearTcpClientThreadByChanNo(int ChanNo) @@ -264,7 +264,7 @@ void CIEC104V2::ClearDataProcThreadByChanNo(int ChanNo) /** * @brief CIEC104V2::ReadConfigParam * 读取IEC104V2配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CIEC104V2::ReadConfigParam() { @@ -278,20 +278,20 @@ int CIEC104V2::ReadConfigParam() memset(¶m,0,sizeof(SIEC104V2AppConfigParam)); if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"iec104V2"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam() ProtoclID error"); - return kbdFailed; + return iotFailed; } LOGDEBUG("iec104V2 ProtoclID=%d", m_ProtocolId); - if (config.load("../../data/fes/", "iec104V2.xml") == kbdFailed) + if (config.load("../../data/fes/", "iec104V2.xml") == iotFailed) { LOGDEBUG("iec104V2 load iec104V2.xml error"); - return kbdSuccess; + return iotSuccess; } LOGDEBUG("iec104V2 load iec104V2.xml ok"); @@ -311,7 +311,7 @@ int CIEC104V2::ReadConfigParam() memset(¶m, 0, sizeof(param)); param.RtuNo = ptrRTU->m_Param.RtuNo; items = 0; - if (config.getIntValue(strRtuNo, "alldata_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "alldata_interval", ivalue) == iotSuccess) { param.dataPollTimeoutReset = ivalue * 1000; items++; @@ -319,7 +319,7 @@ int CIEC104V2::ReadConfigParam() else param.dataPollTimeoutReset = 120 * 1000; - if (config.getIntValue(strRtuNo, "accdata_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "accdata_interval", ivalue) == iotSuccess) { param.accPollTimeoutReset = ivalue * 1000; items++; @@ -327,7 +327,7 @@ int CIEC104V2::ReadConfigParam() else param.accPollTimeoutReset = 300 * 1000; - if (config.getIntValue(strRtuNo, "settime_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "settime_interval", ivalue) == iotSuccess) { param.setTimeTimeoutReset = ivalue * 1000; items++; @@ -336,7 +336,7 @@ int CIEC104V2::ReadConfigParam() param.setTimeTimeoutReset = 180 * 1000; // LOGDEBUG("settime_interval %d",param.setTimeTimeoutReset); - if (config.getIntValue(strRtuNo, "t1", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t1", ivalue) == iotSuccess) { param.t1Reset = ivalue * 1000; items++; @@ -344,7 +344,7 @@ int CIEC104V2::ReadConfigParam() else param.t1Reset = 15 * 1000; - if (config.getIntValue(strRtuNo, "t2", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t2", ivalue) == iotSuccess) { param.t2Reset = ivalue * 1000; items++; @@ -352,7 +352,7 @@ int CIEC104V2::ReadConfigParam() else param.t2Reset = 10 * 1000; - if (config.getIntValue(strRtuNo, "t3", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t3", ivalue) == iotSuccess) { param.t3Reset = ivalue * 1000; items++; @@ -360,7 +360,7 @@ int CIEC104V2::ReadConfigParam() else param.t3Reset = 20 * 1000; - if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == iotSuccess) { param.controlTimeoutReset = ivalue * 1000; items++; @@ -368,7 +368,7 @@ int CIEC104V2::ReadConfigParam() else param.controlTimeoutReset = 10 * 1000; - if (config.getIntValue(strRtuNo, "n", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "n", ivalue) == iotSuccess) { param.n = ivalue; items++; @@ -376,7 +376,7 @@ int CIEC104V2::ReadConfigParam() else param.n = 32768; - if (config.getIntValue(strRtuNo, "k", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "k", ivalue) == iotSuccess) { param.k = ivalue; items++; @@ -384,7 +384,7 @@ int CIEC104V2::ReadConfigParam() else param.k = 30; - if (config.getIntValue(strRtuNo, "w", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "w", ivalue) == iotSuccess) { param.w = ivalue; items++; @@ -392,7 +392,7 @@ int CIEC104V2::ReadConfigParam() else param.w = 15; - if (config.getIntValue(strRtuNo, "reason_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "reason_size", ivalue) == iotSuccess) { param.trReasonSize = ivalue; items++; @@ -400,7 +400,7 @@ int CIEC104V2::ReadConfigParam() else param.trReasonSize = 2; - if (config.getIntValue(strRtuNo, "public_address_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "public_address_size", ivalue) == iotSuccess) { param.publicAddrSize = ivalue; items++; @@ -408,7 +408,7 @@ int CIEC104V2::ReadConfigParam() else param.publicAddrSize = 2; - if (config.getIntValue(strRtuNo, "info_address_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "info_address_size", ivalue) == iotSuccess) { param.infoAddrSize = ivalue; items++; @@ -416,7 +416,7 @@ int CIEC104V2::ReadConfigParam() else param.infoAddrSize = 3; - if (config.getIntValue(strRtuNo, "strict_com_mode", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "strict_com_mode", ivalue) == iotSuccess) { param.strictComMode = ivalue; items++; @@ -424,7 +424,7 @@ int CIEC104V2::ReadConfigParam() else param.strictComMode = 0; - if (config.getIntValue(strRtuNo, "create_soe", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "create_soe", ivalue) == iotSuccess) { param.createSoe = ivalue; items++; @@ -432,7 +432,7 @@ int CIEC104V2::ReadConfigParam() else param.createSoe = 0; - if (config.getIntValue(strRtuNo, "di_change_once", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "di_change_once", ivalue) == iotSuccess) { param.soeOnce = ivalue; items++; @@ -440,7 +440,7 @@ int CIEC104V2::ReadConfigParam() else param.soeOnce = 0; - if (config.getIntValue(strRtuNo, "soe_check_di", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "soe_check_di", ivalue) == iotSuccess) { param.soeCheckDi = ivalue; items++; @@ -448,7 +448,7 @@ int CIEC104V2::ReadConfigParam() else param.soeCheckDi = 0; - if (config.getIntValue(strRtuNo, "ignore_invalid_data", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ignore_invalid_data", ivalue) == iotSuccess) { param.ignoreInvalid = ivalue; items++; @@ -457,7 +457,7 @@ int CIEC104V2::ReadConfigParam() param.ignoreInvalid = 0; //2019-08-07 thxiao AO控制模式; 0:允许发送单AO命令处理 1:允许同时发送多AO命令处理 - if (config.getIntValue(strRtuNo, "ao_control_mode", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ao_control_mode", ivalue) == iotSuccess) { param.aoCmdMode = ivalue; items++; @@ -466,7 +466,7 @@ int CIEC104V2::ReadConfigParam() param.aoCmdMode = 0; //对于允许同时发送多AO命令处理，所有的AO命令使用同一种类型 - if (config.getIntValue(strRtuNo, "ao_control_type", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ao_control_type", ivalue) == iotSuccess) { param.aoCmdType = ivalue; items++; @@ -474,7 +474,7 @@ int CIEC104V2::ReadConfigParam() else param.aoCmdType = 50; - if (config.getIntValue(strRtuNo, "di_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "di_start_info_address", ivalue) == iotSuccess) { param.diStartAddress = ivalue; items++; @@ -482,7 +482,7 @@ int CIEC104V2::ReadConfigParam() else param.diStartAddress = 0x0001; - if (config.getIntValue(strRtuNo, "ai_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ai_start_info_address", ivalue) == iotSuccess) { param.aiStartAddress = ivalue; items++; @@ -490,7 +490,7 @@ int CIEC104V2::ReadConfigParam() else param.aiStartAddress = 0x0701; - if (config.getIntValue(strRtuNo, "acc_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "acc_start_info_address", ivalue) == iotSuccess) { param.accStartAddress = ivalue; items++; @@ -498,7 +498,7 @@ int CIEC104V2::ReadConfigParam() else param.accStartAddress = 0x0C01; - if (config.getIntValue(strRtuNo, "do_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "do_start_info_address", ivalue) == iotSuccess) { param.doStartAddress = ivalue; items++; @@ -506,7 +506,7 @@ int CIEC104V2::ReadConfigParam() else param.doStartAddress = 0x0B01; - if (config.getIntValue(strRtuNo, "ao_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ao_start_info_address", ivalue) == iotSuccess) { param.aoStartAddress = ivalue; items++; @@ -527,7 +527,7 @@ int CIEC104V2::ReadConfigParam() } } } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/iec104V2/IEC104V2DataProcThread.cpp b/product/src/fes/protocol/iec104V2/IEC104V2DataProcThread.cpp index 714bb3e9..5c03c353 100644 --- a/product/src/fes/protocol/iec104V2/IEC104V2DataProcThread.cpp +++ b/product/src/fes/protocol/iec104V2/IEC104V2DataProcThread.cpp @@ -114,7 +114,7 @@ CIEC104V2DataProcThread::~CIEC104V2DataProcThread() */ int CIEC104V2DataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -225,12 +225,12 @@ void CIEC104V2DataProcThread::beforeQuit() /** * @brief CIEC104V2DataProcThread::InitConfigParam * IEC104V2 初始化配置参数 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CIEC104V2DataProcThread::InitConfigParam() { if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; memset(&m_AppData,0,sizeof(SIEC104V2AppData)); @@ -263,13 +263,13 @@ int CIEC104V2DataProcThread::InitConfigParam() m_AppData.aoStartAddress = 0x0B81; m_AppData.state = CN_IEC104V2AppState_init; - return kbdSuccess; + return iotSuccess; } /** * @brief CIEC104V2DataProcThread::ReadConfigParam * 读取IEC104V2配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CIEC104V2DataProcThread::ReadConfigParam() { @@ -278,23 +278,23 @@ int CIEC104V2DataProcThread::ReadConfigParam() char strRtuNo[48]; //LOGINFO("iec104 读取配置文件iec104V2.xml\n"); if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; memset(&m_AppData,0,sizeof(SIEC104V2AppData)); m_AppData.address = m_ptrCFesRtu->m_Param.RtuAddr; //默认配置 m_AppData.respTimeoutReset = m_ptrCFesChan->m_Param.RespTimeout; - if(config.load("../../data/fes/","iec104V2.xml")==kbdFailed) + if(config.load("../../data/fes/","iec104V2.xml")==iotFailed) { LOGERROR("iec104V2 读取配置文件iec104V2.xml失败\n"); - return kbdFailed; + return iotFailed; } LOGINFO("iec104V2 读取配置文件iec104V2.xml成功\n"); sprintf(strRtuNo,"RTU%d",m_ptrCFesRtu->m_Param.RtuNo); - if(config.getIntValue(strRtuNo,"alldata_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"alldata_interval",ivalue) == iotSuccess) { m_AppData.dataPollTimeoutReset = ivalue*1000; } @@ -303,133 +303,133 @@ int CIEC104V2DataProcThread::ReadConfigParam() //LOGDEBUG("iec104 总召唤时间：%d\n",m_AppData.dataPollTimeoutReset); - if(config.getIntValue(strRtuNo,"accdata_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"accdata_interval",ivalue) == iotSuccess) { m_AppData.accPollTimeoutReset = ivalue*1000; } else m_AppData.accPollTimeoutReset = 300*1000; - if(config.getIntValue(strRtuNo,"settime_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"settime_interval",ivalue) == iotSuccess) { m_AppData.setTimeTimeoutReset = ivalue*1000; } else m_AppData.setTimeTimeoutReset = 180*1000; //默认180秒 - if(config.getIntValue(strRtuNo,"t1",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"t1",ivalue) == iotSuccess) { m_AppData.t1Reset = ivalue*1000; } else m_AppData.t1Reset = 15*1000; - if(config.getIntValue(strRtuNo,"t2",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"t2",ivalue) == iotSuccess) { m_AppData.t2Reset = ivalue*1000; } else m_AppData.t2Reset = 10*1000; - if(config.getIntValue(strRtuNo,"t3",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"t3",ivalue) == iotSuccess) { m_AppData.t3Reset = ivalue*1000; } else m_AppData.t3Reset = 20*1000; - if(config.getIntValue(strRtuNo,"control_timeout",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"control_timeout",ivalue) == iotSuccess) { m_AppData.controlTimeoutReset = ivalue*1000; } else m_AppData.controlTimeoutReset = 10*1000; - if(config.getIntValue(strRtuNo,"n",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"n",ivalue) == iotSuccess) { m_AppData.n = ivalue; } else m_AppData.n = 32768; - if(config.getIntValue(strRtuNo,"k",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"k",ivalue) == iotSuccess) { m_AppData.k = ivalue; } else m_AppData.k = 30; - if(config.getIntValue(strRtuNo,"w",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"w",ivalue) == iotSuccess) { m_AppData.w = ivalue; } else m_AppData.w = 15; - if(config.getIntValue(strRtuNo,"reason_size",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"reason_size",ivalue) == iotSuccess) { m_AppData.trReasonSize = ivalue; } else m_AppData.trReasonSize = 2; - if(config.getIntValue(strRtuNo,"public_address_size",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"public_address_size",ivalue) == iotSuccess) { m_AppData.publicAddrSize = ivalue; } else m_AppData.publicAddrSize = 2; - if(config.getIntValue(strRtuNo,"info_address_size",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"info_address_size",ivalue) == iotSuccess) { m_AppData.infoAddrSize = ivalue; } else m_AppData.infoAddrSize = 3; - if(config.getIntValue(strRtuNo,"strict_com_mode",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"strict_com_mode",ivalue) == iotSuccess) { m_AppData.strictComMode = ivalue; } else m_AppData.strictComMode = 0; - if(config.getIntValue(strRtuNo,"create_soe",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"create_soe",ivalue) == iotSuccess) { m_AppData.createSoe = ivalue; } else m_AppData.createSoe = 0; - if(config.getIntValue(strRtuNo,"di_change_once",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"di_change_once",ivalue) == iotSuccess) { m_AppData.soeOnce = ivalue; } else m_AppData.soeOnce = 0; - if (config.getIntValue(strRtuNo, "soe_check_di", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "soe_check_di", ivalue) == iotSuccess) { m_AppData.soeCheckDi = ivalue; } else m_AppData.soeCheckDi = 0; - if(config.getIntValue(strRtuNo,"ignore_invalid_data",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"ignore_invalid_data",ivalue) == iotSuccess) { m_AppData.ignoreInvalid = ivalue; } else m_AppData.ignoreInvalid = 0; - if(config.getIntValue(strRtuNo,"di_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"di_start_info_address",ivalue) == iotSuccess) { m_AppData.diStartAddress = ivalue; } else m_AppData.diStartAddress = 0x0001; - if(config.getIntValue(strRtuNo,"ai_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"ai_start_info_address",ivalue) == iotSuccess) { m_AppData.aiStartAddress = ivalue; } @@ -437,21 +437,21 @@ int CIEC104V2DataProcThread::ReadConfigParam() m_AppData.aiStartAddress = 0x0701; - if(config.getIntValue(strRtuNo,"acc_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"acc_start_info_address",ivalue) == iotSuccess) { m_AppData.accStartAddress = ivalue; } else m_AppData.accStartAddress = 0x0C01; - if(config.getIntValue(strRtuNo,"do_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"do_start_info_address",ivalue) == iotSuccess) { m_AppData.doStartAddress = ivalue; } else m_AppData.doStartAddress = 0x0B01; - if(config.getIntValue(strRtuNo,"ao_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"ao_start_info_address",ivalue) == iotSuccess) { m_AppData.aoStartAddress = ivalue; } @@ -459,7 +459,7 @@ int CIEC104V2DataProcThread::ReadConfigParam() m_AppData.aoStartAddress = 0x0D01; - return kbdSuccess; + return iotSuccess; } @@ -966,7 +966,7 @@ void CIEC104V2DataProcThread::SendSetTimeFrame() /** * @brief CIEC104V2DataProcThread::RecvDataProcess - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC104V2DataProcThread::RecvDataProcess() { @@ -975,7 +975,7 @@ int CIEC104V2DataProcThread::RecvDataProcess() uint64 recvMs; if(m_AppData.recvBufSize<6) - return kbdFailed; + return iotFailed; //test /* @@ -1142,7 +1142,7 @@ int CIEC104V2DataProcThread::RecvDataProcess() } } - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/fes/protocol/iec104s/IEC104S.cpp b/product/src/fes/protocol/iec104s/IEC104S.cpp index db0405e6..c5c05169 100644 --- a/product/src/fes/protocol/iec104s/IEC104S.cpp +++ b/product/src/fes/protocol/iec104s/IEC104S.cpp @@ -24,31 +24,31 @@ bool g_IEC104SChanelRun=true; int EX_SetBaseAddr(void *address) { IEC104S.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { IEC104S.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { IEC104S.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { IEC104S.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { IEC104S.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) @@ -57,7 +57,7 @@ int EX_ExitSystem(int flag) g_IEC104SChanelRun = false;//使所有的线程退出。 IEC104S.ExitSystem(flag); LOGDEBUG("iec104s ExitSystem() end"); - return kbdSuccess; + return iotSuccess; } CIEC104S::CIEC104S() @@ -95,14 +95,14 @@ int CIEC104S::SetBaseAddr(void *address) } ReadConfigParam(); - return kbdSuccess; + return iotSuccess; } int CIEC104S::SetProperty(int IsMainFes) { g_IEC104SIsMainFes = IsMainFes; LOGDEBUG("CIEC104S::SetProperty g_IEC104SIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -111,7 +111,7 @@ int CIEC104S::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -119,12 +119,12 @@ int CIEC104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; //TcpServerListenThread create only once time if(m_TcpServerListenThreadFlag) { @@ -132,7 +132,7 @@ int CIEC104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (m_CTcpServerListenThread == NULL) { LOGERROR("CIEC104S EX_OpenChan() ChanNo:%d create CTcpServerListenThread error!"); - return kbdFailed; + return iotFailed; } Get104SProtocolInfo((char*) "iec104s"); m_CTcpServerListenThread->resume(); //start TCP ServerListen THREAD @@ -152,14 +152,14 @@ int CIEC104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpServerRxTx == NULL) { LOGERROR("CIEC104S EX_OpenChan() ChanNo:%d create CTcpServerRxTxThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpServerRxTxQueue.push_back(ptrCTcpServerRxTx); ptrCTcpServerRxTx->resume(); //start TCP Server THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -173,13 +173,13 @@ int CIEC104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CIEC104S EX_OpenChan() ChanNo:%d create CIEC104SDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } /** @@ -188,7 +188,7 @@ int CIEC104S::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC104S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -196,12 +196,12 @@ int CIEC104S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; /*if (m_CTcpServerListenThread != NULL) @@ -227,7 +227,7 @@ int CIEC104S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -240,7 +240,7 @@ int CIEC104S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -251,13 +251,13 @@ int CIEC104S::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int CIEC104S::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } int CIEC104S::ExitSystem(int flag) { InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } void CIEC104S::ClearTcpServerRxTxThreadByChanNo(int ChanNo) @@ -304,7 +304,7 @@ void CIEC104S::ClearDataProcThreadByChanNo(int ChanNo) /** * @brief CIEC104S::ReadConfigParam * 读取IEC104S配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CIEC104S::ReadConfigParam() { @@ -319,18 +319,18 @@ int CIEC104S::ReadConfigParam() memset(¶m,0,sizeof(SIEC104SAppConfigParam)); if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"iec104s"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam ProtoclID error"); - return kbdFailed; + return iotFailed; } - //if(config.load("C:/ISCS6000_HOME/data/fes/","iec104s.xml")==kbdFailed) - if(config.load("../../data/fes/","iec104s.xml")==kbdFailed) - return kbdFailed; + //if(config.load("C:/ISCS6000_HOME/data/fes/","iec104s.xml")==iotFailed) + if(config.load("../../data/fes/","iec104s.xml")==iotFailed) + return iotFailed; uint64 msec=getUTCTimeMsec(); LOGDEBUG("CIEC104S::ReadConfigParam start %lld",msec); @@ -351,7 +351,7 @@ int CIEC104S::ReadConfigParam() memset(¶m, 0, sizeof(param)); param.RtuNo = ptrRTU->m_Param.RtuNo; items = 0; - if (config.getIntValue(strRtuNo, "t1", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t1", ivalue) == iotSuccess) { param.t1Reset = ivalue * 1000; items++; @@ -359,7 +359,7 @@ int CIEC104S::ReadConfigParam() else param.t1Reset = 15 * 1000; - if (config.getIntValue(strRtuNo, "t2", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t2", ivalue) == iotSuccess) { param.t2Reset = ivalue * 1000; items++; @@ -367,7 +367,7 @@ int CIEC104S::ReadConfigParam() else param.t2Reset = 10 * 1000; - if (config.getIntValue(strRtuNo, "t3", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t3", ivalue) == iotSuccess) { param.t3Reset = ivalue * 1000; items++; @@ -375,7 +375,7 @@ int CIEC104S::ReadConfigParam() else param.t3Reset = 20 * 1000; - if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == iotSuccess) { param.controlTimeoutReset = ivalue * 1000; items++; @@ -383,7 +383,7 @@ int CIEC104S::ReadConfigParam() else param.controlTimeoutReset = 10 * 1000; - if (config.getIntValue(strRtuNo, "n", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "n", ivalue) == iotSuccess) { param.n = ivalue; items++; @@ -391,7 +391,7 @@ int CIEC104S::ReadConfigParam() else param.n = 32768; - if (config.getIntValue(strRtuNo, "k", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "k", ivalue) == iotSuccess) { param.k = ivalue; items++; @@ -399,7 +399,7 @@ int CIEC104S::ReadConfigParam() else param.k = 30; - if (config.getIntValue(strRtuNo, "w", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "w", ivalue) == iotSuccess) { param.w = ivalue; items++; @@ -407,7 +407,7 @@ int CIEC104S::ReadConfigParam() else param.w = 15; - if (config.getIntValue(strRtuNo, "reason_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "reason_size", ivalue) == iotSuccess) { param.trReasonSize = ivalue; items++; @@ -415,7 +415,7 @@ int CIEC104S::ReadConfigParam() else param.trReasonSize = 2; - if (config.getIntValue(strRtuNo, "public_address_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "public_address_size", ivalue) == iotSuccess) { param.publicAddrSize = ivalue; items++; @@ -423,7 +423,7 @@ int CIEC104S::ReadConfigParam() else param.publicAddrSize = 2; - if (config.getIntValue(strRtuNo, "info_address_size", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "info_address_size", ivalue) == iotSuccess) { param.infoAddrSize = ivalue; items++; @@ -431,7 +431,7 @@ int CIEC104S::ReadConfigParam() else param.infoAddrSize = 3; - if (config.getIntValue(strRtuNo, "strict_com_mode", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "strict_com_mode", ivalue) == iotSuccess) { param.strictComMode = ivalue; items++; @@ -439,7 +439,7 @@ int CIEC104S::ReadConfigParam() else param.strictComMode = 0; - if (config.getIntValue(strRtuNo, "singal_di_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "singal_di_start_info_address", ivalue) == iotSuccess) { param.SingaldiStartAddress = ivalue; items++; @@ -447,21 +447,21 @@ int CIEC104S::ReadConfigParam() else param.SingaldiStartAddress = 0x0001; - if (config.getIntValue(strRtuNo, "double_di_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "double_di_start_info_address", ivalue) == iotSuccess) { param.DoublediStartAddress = ivalue; items++; } else param.DoublediStartAddress = 0x2001; - if (config.getIntValue(strRtuNo, "ai_type", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ai_type", ivalue) == iotSuccess) { param.aiUploadType = ivalue; items++; } else param.aiUploadType = 13; - if (config.getIntValue(strRtuNo, "ai_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ai_start_info_address", ivalue) == iotSuccess) { param.aiStartAddress = ivalue; items++; @@ -469,7 +469,7 @@ int CIEC104S::ReadConfigParam() else param.aiStartAddress = 0x3001; - if (config.getIntValue(strRtuNo, "acc_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "acc_start_info_address", ivalue) == iotSuccess) { param.accStartAddress = ivalue; items++; @@ -477,7 +477,7 @@ int CIEC104S::ReadConfigParam() else param.accStartAddress = 0x5001; - if (config.getIntValue(strRtuNo, "do_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "do_start_info_address", ivalue) == iotSuccess) { param.doStartAddress = ivalue; items++; @@ -485,7 +485,7 @@ int CIEC104S::ReadConfigParam() else param.doStartAddress = 0x6001; - if (config.getIntValue(strRtuNo, "ao_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ao_start_info_address", ivalue) == iotSuccess) { param.aoStartAddress = ivalue; items++; @@ -493,7 +493,7 @@ int CIEC104S::ReadConfigParam() else param.aoStartAddress = 0x7001; - if (config.getIntValue(strRtuNo, "qds_enable", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "qds_enable", ivalue) == iotSuccess) { param.qdsEnable = ivalue; items++; @@ -501,7 +501,7 @@ int CIEC104S::ReadConfigParam() else param.qdsEnable = 1; - if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == iotSuccess) { param.maxUpdateCount = ivalue; items++; @@ -509,7 +509,7 @@ int CIEC104S::ReadConfigParam() else param.maxUpdateCount = 18; //3MIN - if (config.getIntValue(strRtuNo, "start_delay", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "start_delay", ivalue) == iotSuccess) { param.startDelay = ivalue*1000; items++; @@ -517,7 +517,7 @@ int CIEC104S::ReadConfigParam() else param.startDelay = 30000; //30s - if (config.getIntValue(strRtuNo, "set_time_enable", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "set_time_enable", ivalue) == iotSuccess) { param.setTimeFlag = ivalue; items++; @@ -525,7 +525,7 @@ int CIEC104S::ReadConfigParam() else param.setTimeFlag = 0; - if (config.getIntValue(strRtuNo, "send_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "send_interval", ivalue) == iotSuccess) { param.sendInterval = ivalue; items++; @@ -534,7 +534,7 @@ int CIEC104S::ReadConfigParam() param.sendInterval = 50; //50ms - if (config.getIntValue(strRtuNo, "disable_start_cmd", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "disable_start_cmd", ivalue) == iotSuccess) { param.disableStartCmd = ivalue; items++; @@ -553,7 +553,7 @@ int CIEC104S::ReadConfigParam() msec=getUTCTimeMsec(); LOGDEBUG("CIEC104S::ReadConfigParam end %lld",msec); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/iec104s/IEC104SDataProcThread.cpp b/product/src/fes/protocol/iec104s/IEC104SDataProcThread.cpp index bc44b56d..70ea371d 100644 --- a/product/src/fes/protocol/iec104s/IEC104SDataProcThread.cpp +++ b/product/src/fes/protocol/iec104s/IEC104SDataProcThread.cpp @@ -154,7 +154,7 @@ CIEC104SDataProcThread::~CIEC104SDataProcThread() */ int CIEC104SDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -268,12 +268,12 @@ void CIEC104SDataProcThread::beforeQuit() /** * @brief CIEC104SDataProcThread::InitConfigParam * IEC104S 初始化配置参数 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CIEC104SDataProcThread::InitConfigParam() { if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; memset(&m_AppData,0,sizeof(SIEC104SAppData)); @@ -327,7 +327,7 @@ int CIEC104SDataProcThread::InitConfigParam() m_AppData.sendInterval = 0; m_AppData.startDelay = 0; - return kbdSuccess; + return iotSuccess; } @@ -1682,7 +1682,7 @@ void CIEC104SDataProcThread::SendsyncTimeAckFrame() /** * @brief CIEC104SDataProcThread::ProcessDoFrame * @describe 处理单点遥控，给主站反校 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ void CIEC104SDataProcThread::ProcessDoFrame(int infoType) { @@ -1871,7 +1871,7 @@ void CIEC104SDataProcThread::ProcessDoFrame(int infoType) /** * @brief CIEC104SDataProcThread::ProcessNorScaleDzFrame * @describe 处理归一化定值\标度化定值，给主站反校 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ void CIEC104SDataProcThread::ProcessAoFrame(int infoType) { @@ -2093,7 +2093,7 @@ void CIEC104SDataProcThread::ProcessAoFrame(int infoType) } /** * @brief CIEC104SDataProcThread::RecvDataProcess - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CIEC104SDataProcThread::RecvDataProcess() { @@ -2102,10 +2102,10 @@ int CIEC104SDataProcThread::RecvDataProcess() if (m_AppData.startDelay) - return kbdFailed; + return iotFailed; if(m_AppData.recvBufSize<6) - return kbdFailed; + return iotFailed; if(((m_AppData.recvBuf[2]&0x01)==0x00)&&((m_AppData.recvBuf[4]&0x01)==0x00))//I格式报文 { @@ -2220,7 +2220,7 @@ int CIEC104SDataProcThread::RecvDataProcess() } } - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/fes/protocol/iec61850client2/IEC61850c.cpp b/product/src/fes/protocol/iec61850client2/IEC61850c.cpp index ff31043e..c15d4c5b 100644 --- a/product/src/fes/protocol/iec61850client2/IEC61850c.cpp +++ b/product/src/fes/protocol/iec61850client2/IEC61850c.cpp @@ -27,25 +27,25 @@ int EX_SetBaseAddr(void *address) { IEC61850c.LoadProtocolDllFlag = 1; appid = IEC61850c.GetAppId(); - if (InitLibrary(appid) == kbdFailed) + if (InitLibrary(appid) == iotFailed) { LOGERROR("InitLibrary 失败！"); } } - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { IEC61850c.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { IEC61850c.OpenAllChan(OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) @@ -53,19 +53,19 @@ int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) LOGDEBUG("EX_CloseChan MainChanNo=%d Start", MainChanNo); IEC61850c.CloseAllChan(CloseFlag); LOGDEBUG("EX_CloseChan MainChanNo=%d End", MainChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { IEC61850c.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_IEC61850cChanelRun=false;//使所有的线程退出。 - return kbdSuccess; + return iotSuccess; } CIEC61850c::CIEC61850c() @@ -95,7 +95,7 @@ int CIEC61850c::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*)"iec61850client2"); } - return kbdSuccess; + return iotSuccess; } int CIEC61850c::SetProperty(int IsMainFes) @@ -124,7 +124,7 @@ int CIEC61850c::SetProperty(int IsMainFes) g_IEC61850cIsMainFes = (bool)IsMainFes; LOGINFO("g_IEC61850cIsMainFes=%d", IsMainFes); } - return kbdSuccess; + return iotSuccess; } /** @@ -135,7 +135,7 @@ int CIEC61850c::SetProperty(int IsMainFes) */ int CIEC61850c::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } /** @@ -144,7 +144,7 @@ int CIEC61850c::ChanTimer(int MainChanNo) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CIEC61850c::OpenAllChan(int OpenFlag) { @@ -165,7 +165,7 @@ int CIEC61850c::OpenAllChan(int OpenFlag) m_ptrThread->resume(); } } - return kbdSuccess; + return iotSuccess; } @@ -175,14 +175,14 @@ int CIEC61850c::OpenAllChan(int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CIEC61850c::CloseAllChan(int CloseFlag) { if (m_ptrThread == NULL) { LOGERROR("m_ptrThread is NULL can not CloseAllChan()"); - return kbdSuccess; + return iotSuccess; } if (g_IEC61850OpenFlag == 1) @@ -208,6 +208,6 @@ int CIEC61850c::CloseAllChan(int CloseFlag) } } } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/iec61850client2/IEC61850cThread.cpp b/product/src/fes/protocol/iec61850client2/IEC61850cThread.cpp index 815d5dc0..93d43a0f 100644 --- a/product/src/fes/protocol/iec61850client2/IEC61850cThread.cpp +++ b/product/src/fes/protocol/iec61850client2/IEC61850cThread.cpp @@ -51,7 +51,7 @@ CIEC61850cThread::~CIEC61850cThread() int CIEC61850cThread::beforeExecute() { LOGDEBUG("CIEC61850cThread::beforeExecute()......"); - return kbdSuccess; + return iotSuccess; } /* @@ -310,7 +310,7 @@ void CIEC61850cThread::InitRTUData() iSoeSec = 0; - if (config.load("../../data/fes/", "iec61850client2.xml") == kbdFailed) + if (config.load("../../data/fes/", "iec61850client2.xml") == iotFailed) { LOGDEBUG("iec61850client2 load iec61850client2.xml error"); } @@ -319,7 +319,7 @@ void CIEC61850cThread::InitRTUData() LOGDEBUG("iec61850client2 load iec61850client2.xml ok"); sprintf(str1, "SYS"); - if (config.getIntValue(str1, "SOE_valid_Sec", iValue) == kbdSuccess) + if (config.getIntValue(str1, "SOE_valid_Sec", iValue) == iotSuccess) { iSoeSec = iValue; } @@ -429,7 +429,7 @@ void CIEC61850cThread::InitChan() * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CIEC61850cThread::OpenAllChan(int OpenFlag) { @@ -440,7 +440,7 @@ int CIEC61850cThread::OpenAllChan(int OpenFlag) LOGDEBUG("CIEC61850cThread::OpenAllChan() 开始"); if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; for (i = 0; i < m_VecChan.size(); i++) { @@ -450,7 +450,7 @@ int CIEC61850cThread::OpenAllChan(int OpenFlag) continue; if ((RTUPtr = GetRtuPtrByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((OpenFlag == CN_FesChanThread_Flag) || (OpenFlag == CN_FesChanAndDataThread_Flag)) { @@ -467,7 +467,7 @@ int CIEC61850cThread::OpenAllChan(int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CIEC61850c EX_OpenChan() ChanNo:%d create CIEC61850cDataProcThreadPtr error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); m_DataProcThreadMap[ptrFesChan->m_Param.ChanNo] = ptrCDataProc; @@ -475,7 +475,7 @@ int CIEC61850cThread::OpenAllChan(int OpenFlag) } } LOGDEBUG("CIEC61850cThread::OpenAllChan() 结束"); - return kbdSuccess; + return iotSuccess; } @@ -485,7 +485,7 @@ int CIEC61850cThread::OpenAllChan(int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CIEC61850cThread::CloseAllChan(int CloseFlag) { @@ -494,7 +494,7 @@ int CIEC61850cThread::CloseAllChan(int CloseFlag) int i, ChanNo; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CIEC61850cThread::CloseAllChan() 开始"); LOGDEBUG("CIEC61850cThread::FES_Disconnect() 开始"); @@ -521,6 +521,6 @@ int CIEC61850cThread::CloseAllChan(int CloseFlag) } LOGDEBUG("CIEC61850cThread::CloseAllChan() 结束"); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/iec61850client2/KBD_dll.cpp b/product/src/fes/protocol/iec61850client2/KBD_dll.cpp index 23bff660..a3e09924 100644 --- a/product/src/fes/protocol/iec61850client2/KBD_dll.cpp +++ b/product/src/fes/protocol/iec61850client2/KBD_dll.cpp @@ -120,7 +120,7 @@ int FreeLibrary() LOGERROR("iec61850dll.release() 失败!"); } - return kbdSuccess; + return iotSuccess; } @@ -150,7 +150,7 @@ int InitLibrary(int AppId) iec61850dll.FES_RegReportCallback(FES_ReportCallback); iec61850dll.FES_RegControlCallback(FES_ControlCallback); iec61850dll.FES_RegWaveFileCallback(FES_WaveFileCallback); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/kbd104/KBD104.cpp b/product/src/fes/protocol/kbd104/KBD104.cpp index 9aa00143..5422c675 100644 --- a/product/src/fes/protocol/kbd104/KBD104.cpp +++ b/product/src/fes/protocol/kbd104/KBD104.cpp @@ -35,38 +35,38 @@ bool g_KBD104ChanelRun = true; int EX_SetBaseAddr(void *address) { Kbd104.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { Kbd104.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { Kbd104.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { Kbd104.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { Kbd104.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_KBD104ChanelRun=false;//使所有的线程退出。 Kbd104.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CKBD104::CKBD104() @@ -101,7 +101,7 @@ int CKBD104::SetBaseAddr(void *address) //2020-02-13 thxiao ReadConfigParam()需要使用m_ptrCFesBase，所以改为SetBaseAddr()处调用 ReadConfigParam(); } - return kbdSuccess; + return iotSuccess; } int CKBD104::SetProperty(int IsMainFes) @@ -114,7 +114,7 @@ int CKBD104::SetProperty(int IsMainFes) CKBD104DataProcThreadPtr ptrTcp; if ((tempNum = (int)m_CDataProcQueue.size()) <= 0) - return kbdSuccess; + return iotSuccess; vector::iterator it; for (it = m_CDataProcQueue.begin(); it != m_CDataProcQueue.end(); it++) { @@ -122,7 +122,7 @@ int CKBD104::SetProperty(int IsMainFes) ptrTcp->m_AppData.dataPollFlag = 1; } } - return kbdSuccess; + return iotSuccess; } /** @@ -131,7 +131,7 @@ int CKBD104::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CKBD104::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -139,12 +139,12 @@ int CKBD104::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -159,14 +159,14 @@ int CKBD104::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpClient == NULL) { LOGERROR("CKBD104 EX_OpenChan() ChanNo:%d create CTcpClientThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpClientQueue.push_back(ptrCTcpClient); ptrCTcpClient->resume(); //start TCP CLIENT THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -180,13 +180,13 @@ int CKBD104::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CKBD104 EX_OpenChan() ChanNo:%d create CKBD104DataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -196,7 +196,7 @@ int CKBD104::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CKBD104::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -204,12 +204,12 @@ int CKBD104::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CKBD104::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -231,7 +231,7 @@ int CKBD104::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -242,7 +242,7 @@ int CKBD104::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int CKBD104::ChanTimer(int /*MainChanNo*/) { - return kbdSuccess; + return iotSuccess; } @@ -290,7 +290,7 @@ void CKBD104::ClearDataProcThreadByChanNo(int ChanNo) /** * @brief CKBD104::ReadConfigParam * 读取KBD104配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CKBD104::ReadConfigParam() { @@ -307,26 +307,26 @@ int CKBD104::ReadConfigParam() if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"kbd104"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam ProtoclID error"); - return kbdFailed; + return iotFailed; } LOGINFO("kbd104 ProtoclID=%d", m_ProtocolId); - if (config.load("../../data/fes/", "kbd104.xml") == kbdFailed) + if (config.load("../../data/fes/", "kbd104.xml") == iotFailed) { LOGDEBUG("kbd104 load iec104.xml error"); - return kbdSuccess; + return iotSuccess; } LOGDEBUG("kbd104 load iec104.xml ok"); sprintf(strRtuNo,"SYS"); std::string strValue; - if(config.getIntValue(strRtuNo,"transmit_portno",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"transmit_portno",ivalue) == iotSuccess) { g_KBD104TransmitPortNo = ivalue; } @@ -349,7 +349,7 @@ int CKBD104::ReadConfigParam() memset(¶m, 0, sizeof(param)); param.RtuNo = ptrRTU->m_Param.RtuNo; items = 0; - if (config.getIntValue(strRtuNo, "alldata_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "alldata_interval", ivalue) == iotSuccess) { param.dataPollTimeoutReset = ivalue * 1000; items++; @@ -357,7 +357,7 @@ int CKBD104::ReadConfigParam() else param.dataPollTimeoutReset = 120 * 1000; - if (config.getIntValue(strRtuNo, "accdata_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "accdata_interval", ivalue) == iotSuccess) { param.accPollTimeoutReset = ivalue * 1000; items++; @@ -365,7 +365,7 @@ int CKBD104::ReadConfigParam() else param.accPollTimeoutReset = 300 * 1000; - if (config.getIntValue(strRtuNo, "settime_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "settime_interval", ivalue) == iotSuccess) { param.setTimeTimeoutReset = ivalue * 1000; items++; @@ -373,7 +373,7 @@ int CKBD104::ReadConfigParam() else param.setTimeTimeoutReset = 180 * 1000; - if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == iotSuccess) { param.controlTimeoutReset = ivalue * 1000; items++; @@ -381,13 +381,13 @@ int CKBD104::ReadConfigParam() else param.controlTimeoutReset = 10 * 1000; - if (config.getIntValue(strRtuNo, "t1", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t1", ivalue) == iotSuccess) { param.t1Reset = ivalue * 1000; items++; } - if (config.getIntValue(strRtuNo, "t2", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t2", ivalue) == iotSuccess) { param.t2Reset = ivalue * 1000; items++; @@ -395,7 +395,7 @@ int CKBD104::ReadConfigParam() else param.t2Reset = 10 * 1000; - if (config.getIntValue(strRtuNo, "t3", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "t3", ivalue) == iotSuccess) { param.t3Reset = ivalue * 1000; items++; @@ -403,7 +403,7 @@ int CKBD104::ReadConfigParam() else param.t3Reset = 20 * 1000; - if (config.getIntValue(strRtuNo, "di_change_once", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "di_change_once", ivalue) == iotSuccess) { param.soeOnce = ivalue; items++; @@ -412,7 +412,7 @@ int CKBD104::ReadConfigParam() param.soeOnce = 0; param.n = 32768; - if (config.getIntValue(strRtuNo, "ignore_invalid_data", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ignore_invalid_data", ivalue) == iotSuccess) { param.ignoreInvalid = ivalue; items++; @@ -420,7 +420,7 @@ int CKBD104::ReadConfigParam() else param.ignoreInvalid = 0; - if (config.getIntValue(strRtuNo, "recv_time_form_rtu", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "recv_time_form_rtu", ivalue) == iotSuccess) { param.recvTimeFormRTU = ivalue; items++; @@ -429,7 +429,7 @@ int CKBD104::ReadConfigParam() param.recvTimeFormRTU = 0; //2020-04-09 thxiao R80 的非标104地址是固定的，不可修改 - /*if (config.getIntValue(strRtuNo, "di_start_info_address", ivalue) == kbdSuccess) + /*if (config.getIntValue(strRtuNo, "di_start_info_address", ivalue) == iotSuccess) { param.diStartAddress = ivalue; items++; @@ -437,7 +437,7 @@ int CKBD104::ReadConfigParam() else*/ param.diStartAddress = 0x0001; - /*if (config.getIntValue(strRtuNo, "ai_start_info_address", ivalue) == kbdSuccess) + /*if (config.getIntValue(strRtuNo, "ai_start_info_address", ivalue) == iotSuccess) { param.aiStartAddress = ivalue; items++; @@ -445,7 +445,7 @@ int CKBD104::ReadConfigParam() else*/ param.aiStartAddress = 0x1001; - /*if (config.getIntValue(strRtuNo, "acc_start_info_address", ivalue) == kbdSuccess) + /*if (config.getIntValue(strRtuNo, "acc_start_info_address", ivalue) == iotSuccess) { param.accStartAddress = ivalue; items++; @@ -453,7 +453,7 @@ int CKBD104::ReadConfigParam() else*/ param.accStartAddress = 0x3001; - /*if (config.getIntValue(strRtuNo, "do_start_info_address", ivalue) == kbdSuccess) + /*if (config.getIntValue(strRtuNo, "do_start_info_address", ivalue) == iotSuccess) { param.doStartAddress = ivalue; items++; @@ -461,7 +461,7 @@ int CKBD104::ReadConfigParam() else*/ param.doStartAddress = 0x4001; - if (config.getIntValue(strRtuNo, "ao_start_info_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ao_start_info_address", ivalue) == iotSuccess) { param.aoStartAddress = ivalue; items++; @@ -483,7 +483,7 @@ int CKBD104::ReadConfigParam() } } - return kbdSuccess; + return iotSuccess; } @@ -509,7 +509,7 @@ void CKBD104::InformTcpThreadExit() /** * @brief CKBD104::CreateWFPath * 创建录波文件路径 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CKBD104::CreateWFPath() { @@ -589,7 +589,7 @@ int CKBD104::CreateWFPath() } } #endif - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/kbd104/KBD104DataProcThread.cpp b/product/src/fes/protocol/kbd104/KBD104DataProcThread.cpp index 6459e778..25c4e4f4 100644 --- a/product/src/fes/protocol/kbd104/KBD104DataProcThread.cpp +++ b/product/src/fes/protocol/kbd104/KBD104DataProcThread.cpp @@ -253,7 +253,7 @@ CKBD104DataProcThread::~CKBD104DataProcThread() */ int CKBD104DataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -364,12 +364,12 @@ void CKBD104DataProcThread::beforeQuit() /** * @brief CKBD104DataProcThread::InitConfigParam * KBD104 初始化配置参数 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CKBD104DataProcThread::InitConfigParam() { if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; //memset(&m_AppData,0,sizeof(SKBD104AppData));//lww todo 声明结构进行初始化 @@ -397,13 +397,13 @@ int CKBD104DataProcThread::InitConfigParam() m_AppData.deviceId = 0; m_AppData.CmdNum = 0; - return kbdSuccess; + return iotSuccess; } /** * @brief CKBD104DataProcThread::ReadConfigParam * 读取KBD104配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CKBD104DataProcThread::ReadConfigParam() { @@ -412,43 +412,43 @@ int CKBD104DataProcThread::ReadConfigParam() char strRtuNo[48]; if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; //memset(&m_AppData,0,sizeof(SKBD104AppData));//lww todo 声明结构进行初始化 m_AppData.address = m_ptrCFesRtu->m_Param.RtuAddr; //默认配置 m_AppData.respTimeoutReset = m_ptrCFesChan->m_Param.RespTimeout; - //if(config.load("C:/ISCS6000_HOME/data/","kbd104.xml")==kbdFailed) - if(config.load("../../data/fes/","kbd104.xml")==kbdFailed) + //if(config.load("C:/ISCS6000_HOME/data/","kbd104.xml")==iotFailed) + if(config.load("../../data/fes/","kbd104.xml")==iotFailed) { LOGERROR("kbd104 读取配置文件kbd104.xml失败\n"); - return kbdFailed; + return iotFailed; } LOGINFO("kbd104 读取配置文件kbd104.xml成功\n"); sprintf(strRtuNo,"RTU%d",m_ptrCFesRtu->m_Param.RtuNo); - if(config.getIntValue(strRtuNo,"alldata_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"alldata_interval",ivalue) == iotSuccess) { m_AppData.dataPollTimeoutReset = ivalue*1000; } else m_AppData.dataPollTimeoutReset = 120*1000; - if(config.getIntValue(strRtuNo,"accdata_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"accdata_interval",ivalue) == iotSuccess) { m_AppData.accPollTimeoutReset = ivalue*1000; } else m_AppData.accPollTimeoutReset = 300*1000; - if(config.getIntValue(strRtuNo,"settime_interval",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"settime_interval",ivalue) == iotSuccess) { m_AppData.setTimeTimeoutReset = ivalue*1000; } else m_AppData.setTimeTimeoutReset = 180*1000; - if(config.getIntValue(strRtuNo,"t3",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"t3",ivalue) == iotSuccess) { m_AppData.t3Reset = ivalue*1000; } @@ -456,7 +456,7 @@ int CKBD104DataProcThread::ReadConfigParam() m_AppData.t3Reset = 20*1000; - if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == iotSuccess) { m_AppData.controlTimeoutReset = ivalue*1000; } @@ -466,42 +466,42 @@ int CKBD104DataProcThread::ReadConfigParam() m_AppData.n = 32768; - if(config.getIntValue(strRtuNo,"ignore_invalid_data",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"ignore_invalid_data",ivalue) == iotSuccess) { m_AppData.ignoreInvalid = ivalue; } else m_AppData.ignoreInvalid = 0; - if(config.getIntValue(strRtuNo,"di_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"di_start_info_address",ivalue) == iotSuccess) { m_AppData.diStartAddress = ivalue; } else m_AppData.diStartAddress = 0x0001; - if(config.getIntValue(strRtuNo,"ai_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"ai_start_info_address",ivalue) == iotSuccess) { m_AppData.aiStartAddress = ivalue; } else m_AppData.aiStartAddress = 0x0701; - if(config.getIntValue(strRtuNo,"acc_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"acc_start_info_address",ivalue) == iotSuccess) { m_AppData.accStartAddress = ivalue; } else m_AppData.accStartAddress = 0x0C01; - if(config.getIntValue(strRtuNo,"do_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"do_start_info_address",ivalue) == iotSuccess) { m_AppData.doStartAddress = ivalue; } else m_AppData.doStartAddress = 0x0B01; - if(config.getIntValue(strRtuNo,"ao_start_info_address",ivalue) == kbdSuccess) + if(config.getIntValue(strRtuNo,"ao_start_info_address",ivalue) == iotSuccess) { m_AppData.aoStartAddress = ivalue; } @@ -509,7 +509,7 @@ int CKBD104DataProcThread::ReadConfigParam() m_AppData.aoStartAddress = 0x0D01; - return kbdSuccess; + return iotSuccess; } @@ -950,14 +950,14 @@ void CKBD104DataProcThread::SendSetTimeFrame() /** * @brief CKBD104DataProcThread::RecvDataProcess - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CKBD104DataProcThread::RecvDataProcess() { byte infoType; if(m_AppData.recvBufSize<6) - return kbdFailed; + return iotFailed; //2019-12-11 thiao 通道通信中断后，缓冲区还有数据，就会造成通信恢复的假像，所以当通道中断时不能判断通信恢复。 if (m_AppData.state != CN_KBD104AppState_init) @@ -986,7 +986,7 @@ int CKBD104DataProcThread::RecvDataProcess() { if(m_AppData.recvBuf[2]==0x83) m_AppData.t1 = 0; - return kbdSuccess; + return iotSuccess; } m_AppData.recvNo = (m_AppData.recvNo+1)%m_AppData.n; @@ -1062,7 +1062,7 @@ int CKBD104DataProcThread::RecvDataProcess() break; } - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/fes/protocol/kbd61850m/IEC61850DataParseThread.cpp b/product/src/fes/protocol/kbd61850m/IEC61850DataParseThread.cpp index cca376f1..78ed4ac8 100644 --- a/product/src/fes/protocol/kbd61850m/IEC61850DataParseThread.cpp +++ b/product/src/fes/protocol/kbd61850m/IEC61850DataParseThread.cpp @@ -37,12 +37,12 @@ int CIEC61850DataParseThread::beforeExecute() SOCKET my_sock=m_ptrSvr->m_CSocket;//监视客户端的Socket if (my_sock<0) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } else - return kbdFailed; + return iotFailed; } diff --git a/product/src/fes/protocol/kbd61850m/IEC61850DataRecvThread.cpp b/product/src/fes/protocol/kbd61850m/IEC61850DataRecvThread.cpp index 33a9cb18..608f4f78 100644 --- a/product/src/fes/protocol/kbd61850m/IEC61850DataRecvThread.cpp +++ b/product/src/fes/protocol/kbd61850m/IEC61850DataRecvThread.cpp @@ -36,12 +36,12 @@ int CIEC61850DataRecvThread::beforeExecute() SOCKET my_sock=m_ptrSvr->m_CSocket;//监视客户端的Socket if (my_sock<0) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } else - return kbdFailed; + return iotFailed; } diff --git a/product/src/fes/protocol/kbd61850m/IEC61850TCPThread.cpp b/product/src/fes/protocol/kbd61850m/IEC61850TCPThread.cpp index 96072cf8..32a25a52 100644 --- a/product/src/fes/protocol/kbd61850m/IEC61850TCPThread.cpp +++ b/product/src/fes/protocol/kbd61850m/IEC61850TCPThread.cpp @@ -32,10 +32,10 @@ int CIEC61850TCPThread::beforeExecute() if(m_ptrSvr!= NULL) { LOGDEBUG("beforeExecute() serverIP=%d ",m_ptrSvr->m_serverIP); - return kbdSuccess; + return iotSuccess; } else - return kbdFailed; + return iotFailed; } diff --git a/product/src/fes/protocol/kbd61850m/KBD61850m.cpp b/product/src/fes/protocol/kbd61850m/KBD61850m.cpp index 227d2e41..b17778e8 100644 --- a/product/src/fes/protocol/kbd61850m/KBD61850m.cpp +++ b/product/src/fes/protocol/kbd61850m/KBD61850m.cpp @@ -40,31 +40,31 @@ extern bool g_IsAllChanelRun; int EX_SetBaseAddr(void *address) { Kbd61850m.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { Kbd61850m.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { Kbd61850m.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { Kbd61850m.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { Kbd61850m.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) @@ -105,7 +105,7 @@ int CKBD61850m::SetBaseAddr(void *address) //InitRTUData();//不可在此调用，否则系统会报莫名的系统错误。 } - return kbdSuccess; + return iotSuccess; } int CKBD61850m::SetProperty(int IsMainFes) @@ -113,7 +113,7 @@ int CKBD61850m::SetProperty(int IsMainFes) g_Kbd61850mIsMainFes = (bool)IsMainFes; g_Kbd61850mChangeSetIsMainFes =true; LOGDEBUG("CKBD61850m::SetProperty g_Kbd61850mIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -122,7 +122,7 @@ int CKBD61850m::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CKBD61850m::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -131,12 +131,12 @@ int CKBD61850m::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) IEC61850RTUPtr RTUPtr; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if(m_initRtuFlag == 0) { InitRTUData(); @@ -144,7 +144,7 @@ int CKBD61850m::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) m_initRtuFlag = 1; } if((RTUPtr = GetRtuPtrByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; #if 1 if((OpenFlag==CN_FesDataThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) @@ -157,7 +157,7 @@ int CKBD61850m::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CKBD61850m EX_OpenChan() ChanNo:%d create CKBD61850mDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); m_mapDataProc[ptrCDataProc->m_svrName] = ptrCDataProc;//???? @@ -171,7 +171,7 @@ int CKBD61850m::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) ptrMainFesChan->SetComThreadRunFlag(CN_FesRunFlag); ptrMainFesChan->SetDataThreadRunFlag(CN_FesRunFlag); - return kbdSuccess; + return iotSuccess; } @@ -182,7 +182,7 @@ int CKBD61850m::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CKBD61850m::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -190,12 +190,12 @@ int CKBD61850m::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; #if 0 @@ -212,7 +212,7 @@ int CKBD61850m::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } #endif @@ -229,7 +229,7 @@ int CKBD61850m::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) ptrMainFesChan->SetComThreadRunFlag(CN_FesStopFlag); ptrMainFesChan->SetDataThreadRunFlag(CN_FesStopFlag); - return kbdSuccess; + return iotSuccess; } /** @@ -241,7 +241,7 @@ int CKBD61850m::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) int CKBD61850m::ChanTimer(int /*MainChanNo*/) { //把命令缓冲时间间隔到的命放到发送命令缓冲区 - return kbdSuccess; + return iotSuccess; } void CKBD61850m::ClearTcpClientThreadByChanNo(int ChanNo) @@ -934,7 +934,7 @@ bool CKBD61850m::UTF8ToUnicode(const char* UTF8, wchar_t* strUnicode) /** * @brief CKBD61850m::CreateWFPath * 创建录波文件路径 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CKBD61850m::CreateWFPath() { @@ -1101,5 +1101,5 @@ int CKBD61850m::CreateWFPath() } #endif - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/kbd61850m/KBD61850mDataProcThread.cpp b/product/src/fes/protocol/kbd61850m/KBD61850mDataProcThread.cpp index aa3e37ae..f118c3d8 100644 --- a/product/src/fes/protocol/kbd61850m/KBD61850mDataProcThread.cpp +++ b/product/src/fes/protocol/kbd61850m/KBD61850mDataProcThread.cpp @@ -232,7 +232,7 @@ CKBD61850mDataProcThread::~CKBD61850mDataProcThread() int CKBD61850mDataProcThread::beforeExecute() { GetLuboData(); - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/protocol/khbas/Khbas.cpp b/product/src/fes/protocol/khbas/Khbas.cpp index bea551ad..1171ff65 100644 --- a/product/src/fes/protocol/khbas/Khbas.cpp +++ b/product/src/fes/protocol/khbas/Khbas.cpp @@ -19,38 +19,38 @@ bool g_KhbasChanelRun=true; int EX_SetBaseAddr(void *address) { Khbas.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { Khbas.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { Khbas.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { Khbas.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { Khbas.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_KhbasChanelRun=false;//使所有的线程退出。 Khbas.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CKhbas::CKhbas() @@ -84,13 +84,13 @@ int CKhbas::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*)"khbas"); } - return kbdSuccess; + return iotSuccess; } int CKhbas::SetProperty(int IsMainFes) { g_KhbasIsMainFes = IsMainFes; - return kbdSuccess; + return iotSuccess; } /** @@ -99,7 +99,7 @@ int CKhbas::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CKhbas::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -108,12 +108,12 @@ int CKhbas::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CTcpClientThreadPtr ptrCTcpClient=NULL; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -127,7 +127,7 @@ int CKhbas::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpClient == NULL) { LOGERROR("CKhbas EX_OpenChan() ChanNo:%d create CTcpClientThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } ptrCTcpClient->SetThreadRunMode(1);//2021-02-22 thxiao 使用人工干预读取数据。 DataProcSetTcpThreadByChanNo(ptrMainFesChan->m_Param.ChanNo,ptrCTcpClient); @@ -137,7 +137,7 @@ int CKhbas::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) break; default: LOGERROR("CKhbas EX_OpenChan() ChanNo:%d CommType=%d error!",ptrFesChan->m_Param.ChanNo,ptrFesChan->m_Param.CommType); - return kbdFailed; + return iotFailed; } } @@ -151,14 +151,14 @@ int CKhbas::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CKhbas EX_OpenChan() ChanNo:%d create CKhbasDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } ptrCDataProc->SetClientThread(ptrCTcpClient); m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -168,7 +168,7 @@ int CKhbas::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CKhbas::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -176,12 +176,12 @@ int CKhbas::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; //2021-02-23 thxiao CKhbasDataProcThread使用了CTcpClientThread,所以先析构CKhbasDataProcThread再析构CTcpClientThread. if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -203,7 +203,7 @@ int CKhbas::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } - return kbdSuccess; + return iotSuccess; } /** @@ -215,7 +215,7 @@ int CKhbas::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) int CKhbas::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/khbas/KhbasDataProcThread.cpp b/product/src/fes/protocol/khbas/KhbasDataProcThread.cpp index 870b292c..b659813c 100644 --- a/product/src/fes/protocol/khbas/KhbasDataProcThread.cpp +++ b/product/src/fes/protocol/khbas/KhbasDataProcThread.cpp @@ -87,7 +87,7 @@ CKhbasDataProcThread::~CKhbasDataProcThread() */ int CKhbasDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -146,7 +146,7 @@ int CKhbasDataProcThread::SendProcess() int retLen = 0; if(m_ptrCurrentChan==NULL) - return kbdFailed; + return iotFailed; //有多个RTU时，才需要获取当前最新的RTU结构，否则m_ptrCFesRtu在构造函数初始化。 if(m_ptrCFesChan->m_RtuNum >1) @@ -179,7 +179,7 @@ int CKhbasDataProcThread::SendProcess() /** * @brief CKhbasDataProcThread::RecvNetData * MODBUS TCP 接收处理 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CKhbasDataProcThread::RecvNetData() { @@ -189,7 +189,7 @@ int CKhbasDataProcThread::RecvNetData() int recvLen,Len,i; if(m_ptrCurrentChan==NULL) - return kbdFailed; + return iotFailed; DevAddr = m_AppData.lastCmdData[6]; FunCode = m_AppData.lastCmdData[7]; @@ -271,7 +271,7 @@ int CKhbasDataProcThread::RecvNetData() } CmdControlRespProcess(NULL,0,0); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } else//长度、地址、功能码 都正确则认为数据正确。 if((Len == ExpectLen)&&(DevAddr == Data[6])&&(FunCode==(Data[7]&0x7f))) @@ -309,7 +309,7 @@ int CKhbasDataProcThread::RecvNetData() } //next RTU NextRtuIndex(m_ptrCFesChan); - return kbdSuccess; + return iotSuccess; } else { @@ -317,7 +317,7 @@ int CKhbasDataProcThread::RecvNetData() //next RTU CmdControlRespProcess(NULL,0,0); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } } @@ -387,7 +387,7 @@ int CKhbasDataProcThread::PollingCmdProcess() SModbusCmd cmd; int writex,len; - if(GetPollingCmd(&cmd)==kbdFailed) + if(GetPollingCmd(&cmd)==iotFailed) { //LOGERROR("CKhbasDataProcThread::PollingCmdProcess() return 0"); return 0; @@ -1234,7 +1234,7 @@ CONTROL: * @brief CKhbasDataProcThread::GetPollingCmd * 获取读取数据命令 * @param pCmd 返回读取数据命令 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CKhbasDataProcThread::GetPollingCmd(SModbusCmd *pCmd) { @@ -1245,11 +1245,11 @@ int CKhbasDataProcThread::GetPollingCmd(SModbusCmd *pCmd) if(m_ptrCFesRtu==NULL) { - return kbdFailed; + return iotFailed; } if(m_ptrCFesRtu->m_Param.ModbusCmdBuf.pCmd==NULL) { - return kbdFailed; + return iotFailed; } while(countm_Param.ModbusCmdBuf.num) @@ -1267,17 +1267,17 @@ int CKhbasDataProcThread::GetPollingCmd(SModbusCmd *pCmd) m_ptrCFesRtu->m_Param.ModbusCmdBuf.readx = 0; count++; if (ComFlag) - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } /** * @brief CKhbasDataProcThread::RecvDataProcess * @param Data * @param DataSize - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CKhbasDataProcThread::RecvDataProcess(uint8 *Data,int DataSize) { @@ -1287,7 +1287,7 @@ int CKhbasDataProcThread::RecvDataProcess(uint8 *Data,int DataSize) if(FunCode&0x80) { CmdControlRespProcess(NULL,0,0); - return kbdSuccess; + return iotSuccess; } switch(FunCode) @@ -1328,10 +1328,10 @@ int CKhbasDataProcThread::RecvDataProcess(uint8 *Data,int DataSize) Cmd10RespProcess(Data,DataSize); break; default: - return kbdFailed; + return iotFailed; break; } - return kbdSuccess; + return iotSuccess; } /** @@ -2860,7 +2860,7 @@ bool CKhbasDataProcThread::ReadTimeTableResp(uint8 *Data, int DataSize) /** * @brief CKhbasDataProcThread::ReadConfigParam * 读取配置文件 -* @return 成功返回kbdSuccess，失败返回kbdFailed +* @return 成功返回iotSuccess，失败返回iotFailed */ int CKhbasDataProcThread::ReadConfigParam() { @@ -2868,22 +2868,22 @@ int CKhbasDataProcThread::ReadConfigParam() int ivalue; char strRtuNo[48]; - if (config.load("../../data/fes/", "khbas.xml") == kbdFailed) - return kbdSuccess; + if (config.load("../../data/fes/", "khbas.xml") == iotFailed) + return iotSuccess; LOGDEBUG("hkbas load hkbas.xml ok"); memset(&strRtuNo[0], 0, sizeof(strRtuNo)); sprintf(strRtuNo, "RTU%d", m_ptrCFesRtu->m_Param.RtuNo); - if (config.getIntValue(strRtuNo, "settime_startaddress", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "settime_startaddress", ivalue) == iotSuccess) { m_AppData.settimeStartAddr = ivalue; } else m_AppData.settimeStartAddr = 40866; - if (config.getIntValue(strRtuNo, "read_timetable_startaddress", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "read_timetable_startaddress", ivalue) == iotSuccess) { m_AppData.ReadTimeTableStartAddr = ivalue; } @@ -2891,14 +2891,14 @@ int CKhbasDataProcThread::ReadConfigParam() m_AppData.ReadTimeTableStartAddr = 40580; - if (config.getIntValue(strRtuNo, "write_timetable_startaddress", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "write_timetable_startaddress", ivalue) == iotSuccess) { m_AppData.WriteTimeTableStartAddr = ivalue; } else m_AppData.WriteTimeTableStartAddr = 40872; - if (config.getIntValue(strRtuNo, "timetable_datalen", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "timetable_datalen", ivalue) == iotSuccess) { m_AppData.timeTableDataLen = ivalue; } @@ -2908,7 +2908,7 @@ int CKhbasDataProcThread::ReadConfigParam() m_AppData.timeTableModeNum = (m_AppData.timeTableDataLen - 2) / 2; - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_c30/ModbusRtuC30.cpp b/product/src/fes/protocol/modbus_c30/ModbusRtuC30.cpp index 6b509578..172b410c 100644 --- a/product/src/fes/protocol/modbus_c30/ModbusRtuC30.cpp +++ b/product/src/fes/protocol/modbus_c30/ModbusRtuC30.cpp @@ -19,38 +19,38 @@ bool g_ModbusRtuC30ChanelRun=true; int EX_SetBaseAddr(void *address) { ModbusRtuC30.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { ModbusRtuC30.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { ModbusRtuC30.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { ModbusRtuC30.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { ModbusRtuC30.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_ModbusRtuC30ChanelRun =false;//使所有的线程退出。 ModbusRtuC30.InformComThreadExit(); - return kbdSuccess; + return iotSuccess; } CModbusRtuC30::CModbusRtuC30() { @@ -81,14 +81,14 @@ int CModbusRtuC30::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*)"modbus_c30"); } - return kbdSuccess; + return iotSuccess; } int CModbusRtuC30::SetProperty(int IsMainFes) { g_ModbusRtuC30IsMainFes = IsMainFes; LOGDEBUG("CModbusRtuC30::SetProperty g_ModbusRtuC30IsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -97,7 +97,7 @@ int CModbusRtuC30::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtuC30::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -105,12 +105,12 @@ int CModbusRtuC30::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -124,7 +124,7 @@ int CModbusRtuC30::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCSerialPort == NULL) { LOGERROR("CModbusRtuC30 EX_OpenChan() ChanNo:%d create CSerialPortThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } else { @@ -134,7 +134,7 @@ int CModbusRtuC30::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -150,13 +150,13 @@ int CModbusRtuC30::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CModbusRtuC30 EX_OpenChan() ChanNo:%d create CModbusRtuC30DataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -166,7 +166,7 @@ int CModbusRtuC30::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtuC30::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -174,12 +174,12 @@ int CModbusRtuC30::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CModbusRtuC30::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -195,7 +195,7 @@ int CModbusRtuC30::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -208,7 +208,7 @@ int CModbusRtuC30::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -219,7 +219,7 @@ int CModbusRtuC30::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int CModbusRtuC30::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/protocol/modbus_c30/ModbusRtuC30DataProcThread.cpp b/product/src/fes/protocol/modbus_c30/ModbusRtuC30DataProcThread.cpp index fd54823e..bbdbb2dd 100644 --- a/product/src/fes/protocol/modbus_c30/ModbusRtuC30DataProcThread.cpp +++ b/product/src/fes/protocol/modbus_c30/ModbusRtuC30DataProcThread.cpp @@ -121,7 +121,7 @@ CModbusRtuC30DataProcThread::~CModbusRtuC30DataProcThread() */ int CModbusRtuC30DataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -214,7 +214,7 @@ int CModbusRtuC30DataProcThread::SendProcess() { int retLen = 0; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; //有多个RTU时，才需要获取当前最新的RTU结构，否则m_ptrCFesRtu在构造函数初始化。 /*2019-9-10 在 sendSetCmdFlag()中已设置当前RTU结构 @@ -885,7 +885,7 @@ int CModbusRtuC30DataProcThread::PollingCmdProcess() return 0; } - if (GetPollingCmd(&cmd) == kbdFailed) + if (GetPollingCmd(&cmd) == iotFailed) { //LOGERROR("CModbusRtuDataProcThread::PollingCmdProcess() return 0"); return 0; @@ -914,7 +914,7 @@ int CModbusRtuC30DataProcThread::PollingCmdProcess() * @brief CModbusRtuC30DataProcThread::GetPollingCmd * 获取读取数据命令 * @param pCmd 返回读取数据命令 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtuC30DataProcThread::GetPollingCmd(SModbusCmd *pCmd) { @@ -924,7 +924,7 @@ int CModbusRtuC30DataProcThread::GetPollingCmd(SModbusCmd *pCmd) if (m_ptrCFesRtu == NULL) { - return kbdFailed; + return iotFailed; } //2020-05-14 thxiao 如果没有配置块，则轮训下一个设备。 if (m_ptrCFesRtu->m_Param.ModbusCmdBuf.num == 0) @@ -945,10 +945,10 @@ int CModbusRtuC30DataProcThread::GetPollingCmd(SModbusCmd *pCmd) m_ptrCFesRtu->m_Param.ModbusCmdBuf.readx = 0; count++; if (ComFlag) - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } /* @@ -962,7 +962,7 @@ int CModbusRtuC30DataProcThread::RecvComData() int recvLen, Len, i,crc, recvcrc; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; DevAddr = m_AppData.lastCmdData[0]; FunCode = m_AppData.lastCmdData[1]; @@ -1048,7 +1048,7 @@ int CModbusRtuC30DataProcThread::RecvComData() } //SetTxStatus(0);//改变通信状态 - return kbdFailed; + return iotFailed; } else//长度、地址、功能码 都正确则认为数据正确。 || (Data[1] == 0x05) if (((Len == ExpectLen) && (DevAddr == Data[0]) && (FunCode == (Data[1] & 0x7f)))) @@ -1096,7 +1096,7 @@ int CModbusRtuC30DataProcThread::RecvComData() } NextRtuIndex(m_ptrCFesChan); } - return kbdFailed; + return iotFailed; } else { @@ -1128,7 +1128,7 @@ int CModbusRtuC30DataProcThread::RecvComData() NextRtuIndex(m_ptrCFesChan); } } - return kbdSuccess; + return iotSuccess; } else { @@ -1148,7 +1148,7 @@ int CModbusRtuC30DataProcThread::RecvComData() m_ptrCFesRtu->SetErrNum(1); NextRtuIndex(m_ptrCFesChan); } - return kbdFailed; + return iotFailed; } } @@ -1156,7 +1156,7 @@ int CModbusRtuC30DataProcThread::RecvComData() * @brief CModbusRtuC30DataProcThread::RecvDataProcess * @param Data * @param DataSize -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtuC30DataProcThread::RecvDataProcess(byte *Data, int DataSize) { @@ -1166,12 +1166,12 @@ int CModbusRtuC30DataProcThread::RecvDataProcess(byte *Data, int DataSize) if (FunCode & 0x80) { CmdControlRespProcess(NULL, 0, 0); - return kbdSuccess; + return iotSuccess; } #if 1 if (CmdControlRespProcess(Data, DataSize, 1) == true) { - return kbdSuccess; + return iotSuccess; } #endif switch (FunCode) @@ -1194,10 +1194,10 @@ int CModbusRtuC30DataProcThread::RecvDataProcess(byte *Data, int DataSize) Cmd10RespProcess(Data, DataSize); break; default: - return kbdFailed; + return iotFailed; break; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_micomP/ModbusMicomP.cpp b/product/src/fes/protocol/modbus_micomP/ModbusMicomP.cpp index 128c30dd..a072e379 100644 --- a/product/src/fes/protocol/modbus_micomP/ModbusMicomP.cpp +++ b/product/src/fes/protocol/modbus_micomP/ModbusMicomP.cpp @@ -19,38 +19,38 @@ char g_ModbusMicomPPathWaveForm[CN_FesMaxWaveFileNameSize]; int EX_SetBaseAddr(void *address) { ModbusMicomP.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { ModbusMicomP.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { ModbusMicomP.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { ModbusMicomP.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { ModbusMicomP.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_ModbusMicomPChanelRun =false;//使所有的线程退出。 ModbusMicomP.InformComThreadExit(); - return kbdSuccess; + return iotSuccess; } CModbusMicomP::CModbusMicomP() { @@ -84,7 +84,7 @@ int CModbusMicomP::SetBaseAddr(void *address) ReadConfigParam(); } - return kbdSuccess; + return iotSuccess; } void CModbusMicomP::ReadConfigParam() @@ -111,7 +111,7 @@ void CModbusMicomP::ReadConfigParam() LOGINFO("modbus_micomP ProtoclID=%d", m_ProtocolId); - if (config.load("../../data/fes/", "modbus_micomP.xml") == kbdFailed) + if (config.load("../../data/fes/", "modbus_micomP.xml") == iotFailed) return; for (i = 0; i < m_ptrCFesBase->m_vectCFesChanPtr.size(); i++) @@ -132,27 +132,27 @@ void CModbusMicomP::ReadConfigParam() Px2x系列录波配置 */ //是否有PT值标志 - if (config.getIntValue(devType, "PtFlag", ivalue) == kbdSuccess) + if (config.getIntValue(devType, "PtFlag", ivalue) == iotSuccess) waveCfgStrP2x2.PtFalg = ivalue; else waveCfgStrP2x2.PtFalg = 1; //默认有PT值 //通道起始地址 - if (config.getIntValue(devType, "ChanStartAddr", ivalue) == kbdSuccess) + if (config.getIntValue(devType, "ChanStartAddr", ivalue) == iotSuccess) waveCfgStrP2x2.ChanStartAddr = ivalue; else waveCfgStrP2x2.ChanStartAddr = 0x3800; //默认通道起始地址=0x3800 //数据起始地址 - if (config.getIntValue(devType, "DataStartAddr", ivalue) == kbdSuccess) + if (config.getIntValue(devType, "DataStartAddr", ivalue) == iotSuccess) waveCfgStrP2x2.DataStartAddr = ivalue; else waveCfgStrP2x2.DataStartAddr = 0x0900; //默认数据起始地址=0x0900 //模拟量通道数 - if (config.getIntValue(devType, "AnalogChanNum", ivalue) == kbdSuccess) + if (config.getIntValue(devType, "AnalogChanNum", ivalue) == iotSuccess) waveCfgStrP2x2.AnalogChanNum = ivalue; else waveCfgStrP2x2.AnalogChanNum = 8; //默认模拟量通道数=8 //单个模拟量通道内模拟量类型个数 - if (config.getIntValue(devType, "AnalogTypeNumInChan", ivalue) == kbdSuccess) + if (config.getIntValue(devType, "AnalogTypeNumInChan", ivalue) == iotSuccess) waveCfgStrP2x2.AnalogTypeNumInChan = ivalue; else waveCfgStrP2x2.AnalogTypeNumInChan = 1; //默认单个模拟量通道内模拟量类型个数=1 @@ -164,7 +164,7 @@ void CModbusMicomP::ReadConfigParam() { sprintf(typeName, "AnalogType%d_%d", n, m); - if (config.getStringValue(devType, typeName, strValue) == kbdSuccess) + if (config.getStringValue(devType, typeName, strValue) == iotSuccess) waveCfgStrP2x2.AnalogTypeNames.push_back(strValue); else waveCfgStrP2x2.AnalogTypeNames.push_back(typeName);//默认模拟量类型=Analog n_m @@ -172,12 +172,12 @@ void CModbusMicomP::ReadConfigParam() } //数字量通道数 - if (config.getIntValue(devType, "DigitChanNum", ivalue) == kbdSuccess) + if (config.getIntValue(devType, "DigitChanNum", ivalue) == iotSuccess) waveCfgStrP2x2.DigitChanNum = ivalue; else waveCfgStrP2x2.DigitChanNum = 1; //默认数字量通道数=1 //单个数字量通道内数字量类型个数 - if (config.getIntValue(devType, "DigitTypeNumInChan", ivalue) == kbdSuccess) + if (config.getIntValue(devType, "DigitTypeNumInChan", ivalue) == iotSuccess) waveCfgStrP2x2.DigitTypeNumInChan = ivalue; else waveCfgStrP2x2.DigitTypeNumInChan = 16; //默认单个数字量通道内数字量类型个数=16 @@ -189,7 +189,7 @@ void CModbusMicomP::ReadConfigParam() { sprintf(typeName, "DigitType%d_%d", n, m); - if (config.getStringValue(devType, typeName, strValue) == kbdSuccess) + if (config.getStringValue(devType, typeName, strValue) == iotSuccess) waveCfgStrP2x2.DigitTypeNames.push_back(strValue); else waveCfgStrP2x2.DigitTypeNames.push_back(typeName);//默认数字量类型=Digit n_m @@ -208,7 +208,7 @@ int CModbusMicomP::SetProperty(int IsMainFes) { g_ModbusMicomPIsMainFes = IsMainFes; LOGDEBUG("CModbusMicomP::SetProperty g_ModbusMicomPIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -217,7 +217,7 @@ int CModbusMicomP::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusMicomP::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -225,12 +225,12 @@ int CModbusMicomP::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -244,7 +244,7 @@ int CModbusMicomP::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCSerialPort == NULL) { LOGERROR("CModbusMicomP EX_OpenChan() ChanNo:%d create CSerialPortThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } else { @@ -254,7 +254,7 @@ int CModbusMicomP::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -270,13 +270,13 @@ int CModbusMicomP::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CModbusMicomP EX_OpenChan() ChanNo:%d create CModbusMicomPDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -286,7 +286,7 @@ int CModbusMicomP::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusMicomP::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -294,12 +294,12 @@ int CModbusMicomP::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CModbusMicomP::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -315,7 +315,7 @@ int CModbusMicomP::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -328,7 +328,7 @@ int CModbusMicomP::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -346,7 +346,7 @@ int CModbusMicomP::ChanTimer(int MainChanNo) int i, j, RtuNo; if ((ptrFesChan = m_ptrCFesBase->GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; SModbusCmd *pCmd; for (i = 0; im_RtuNum; i++) @@ -375,7 +375,7 @@ int CModbusMicomP::ChanTimer(int MainChanNo) } } } - return kbdSuccess; + return iotSuccess; } /* @@ -451,7 +451,7 @@ void CModbusMicomP::InformComThreadExit() /** * @brief CModbusMicomP::CreateWavePath * 创建录波文件路径 -* @return 成功返回kbdSuccess，失败返回kbdFailed +* @return 成功返回iotSuccess，失败返回iotFailed */ void CModbusMicomP::CreateWavePath() { diff --git a/product/src/fes/protocol/modbus_micomP/ModbusMicomPDataProcThread.cpp b/product/src/fes/protocol/modbus_micomP/ModbusMicomPDataProcThread.cpp index a6723016..f23b3cbd 100644 --- a/product/src/fes/protocol/modbus_micomP/ModbusMicomPDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_micomP/ModbusMicomPDataProcThread.cpp @@ -103,7 +103,7 @@ CModbusMicomPDataProcThread::CModbusMicomPDataProcThread(CFesBase *ptrCFesBase, /** * @brief CModbusMicomPDataProcThread::initParam * 初始化参数 -* @return 成功返回kbdSuccess，失败返回kbdFailed +* @return 成功返回iotSuccess，失败返回iotFailed */ void CModbusMicomPDataProcThread::InitParam() { @@ -240,7 +240,7 @@ void CModbusMicomPDataProcThread::InitParam_Soe_P14x(CFesRtuPtr CFesRtu, int Rtu /** * @brief CModbusMicomPDataProcThread::ReadConfigParam * 读取CModbusMicomP配置文件,如果不配置，则取系统定义的全局参数 -* @return 成功返回kbdSuccess，失败返回kbdFailed +* @return 成功返回iotSuccess，失败返回iotFailed */ int CModbusMicomPDataProcThread::ReadConfigParam(vector m_vecRtuConfigParam) { @@ -270,7 +270,7 @@ int CModbusMicomPDataProcThread::ReadConfigParam(vectorm_Param.RtuDesc); - return kbdFailed; + return iotFailed; } else { LOGDEBUG("%s 事件确认模式设置为自动 10000,成功", m_ptrCFesRtu->m_Param.RtuDesc); - return kbdSuccess; + return iotSuccess; } } else - return kbdFailed; + return iotFailed; } /* @@ -538,7 +538,7 @@ P13x 设置事件自动确认1 int CModbusMicomPDataProcThread::SetAckEventWayProcess_Auto1_Px3x() { SetAckEventWayProcess_Auto1_P12x(); - return kbdSuccess; + return iotSuccess; } /* @@ -557,16 +557,16 @@ int CModbusMicomPDataProcThread::SetAckEventWayProcess_Auto2_P12x() if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data)) { LOGDEBUG("%s 事件确认模式设置为自动 200000,失败", m_ptrCFesRtu->m_Param.RtuDesc); - return kbdFailed; + return iotFailed; } else { LOGDEBUG("%s 事件确认模式设置为自动 200000,成功", m_ptrCFesRtu->m_Param.RtuDesc); - return kbdSuccess; + return iotSuccess; } } else - return kbdFailed; + return iotFailed; } /* @@ -585,16 +585,16 @@ int CModbusMicomPDataProcThread::SetAckEventWayProcess_Mannal_P12x() if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data)) { LOGDEBUG("%s 事件确认模式设置为手动,失败", m_ptrCFesRtu->m_Param.RtuDesc); - return kbdFailed; + return iotFailed; } else { LOGDEBUG("%s 事件确认模式设置为手动,成功", m_ptrCFesRtu->m_Param.RtuDesc); - return kbdSuccess; + return iotSuccess; } } else - return kbdFailed; + return iotFailed; } /* @@ -603,7 +603,7 @@ Px3x 设置事件手动确认 int CModbusMicomPDataProcThread::SetAckEventWayProcess_Mannal_Px3x() { SetAckEventWayProcess_Mannal_P12x(); - return kbdSuccess; + return iotSuccess; } /* @@ -618,7 +618,7 @@ void CModbusMicomPDataProcThread::EventPro_Auto_P12x() int Len = 9; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 23, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 23, Data) == iotFailed) { LOGDEBUG("接收事件失败！ChanNo:%d RtuNo:%d", m_ptrCFesChan->m_Param.ChanNo, m_ptrCFesRtu->m_Param.RtuNo); return; @@ -809,7 +809,7 @@ void CModbusMicomPDataProcThread::EventPro_Mannal_P12x() int FunCode = 7, StartAddr = -1, Len = -1; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 5, Data) == iotFailed) { LOGDEBUG("读取装置状态失败！ChanNo:%d RtuNo:%d", m_ptrCFesChan->m_Param.ChanNo, m_ptrCFesRtu->m_Param.RtuNo); return; @@ -822,7 +822,7 @@ void CModbusMicomPDataProcThread::EventPro_Mannal_P12x() FunCode = 5, StartAddr = 0x400d, Len = 0xff00; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == iotFailed) { LOGDEBUG("确认事件失败！ChanNo:%d RtuNo:%d", m_ptrCFesChan->m_Param.ChanNo, m_ptrCFesRtu->m_Param.RtuNo); return; @@ -850,7 +850,7 @@ void CModbusMicomPDataProcThread::SetTimeProcess_P12x() { if (SendSetTimeFrame(CFesRtu->m_Param.RtuAddr, 0, 0, CFesRtu)) { - if (RecvComData(CFesRtu, 0x10, 8, Data) == kbdFailed) + if (RecvComData(CFesRtu, 0x10, 8, Data) == iotFailed) { LOGDEBUG("对时失败！ChanNo:%d RtuNo:%d", m_ptrCFesChan->m_Param.ChanNo, CFesRtu->m_Param.RtuNo); return; @@ -933,10 +933,10 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P12x(int RtuIndex) int FunCode = 7, StartAddr = -1, Len = -1; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 5, Data) == iotFailed) { LOGDEBUG("读取装置状态失败！ChanNo:%d RtuNo:%d", m_ptrCFesChan->m_Param.ChanNo, m_ptrCFesRtu->m_Param.RtuNo); - return kbdFailed; + return iotFailed; } if ((Data[2] & 0x10) == 0) //没有未被确认的故障录波 @@ -944,11 +944,11 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P12x(int RtuIndex) m_CurrentRtuStr.WaveStr.FirstReadWave = false; m_CurrentRtuStr.WaveStr.NewWaveCount = 0; m_CurrentRtuStr.WaveStr.NewHead = 0; - return kbdFailed; + return iotFailed; } } else - return kbdFailed; + return iotFailed; //读取录波文件数量及时标 @@ -957,10 +957,10 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P12x(int RtuIndex) Len = 0x24; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 77, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 77, Data) == iotFailed) { LOGDEBUG("读取未确认的录波列表失败！ChanNo:%d RtuNo:%d", m_ptrCFesChan->m_Param.ChanNo, m_ptrCFesRtu->m_Param.RtuNo); - return kbdFailed; + return iotFailed; } CurentNewWaveCount = Data[3]; CurentNewWaveCount <<= 8; @@ -995,7 +995,7 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P12x(int RtuIndex) m_CurrentRtuStr.WaveStr.SendWaveDataFlag = false; m_CurrentRtuStr.WaveStr.CurrentWaveChanlNo = 0; memcpy(m_CurrentRtuStr.WaveStr.WaveTime, NewWaveTime, CurentNewWaveCount * sizeof(WAVE_TIME)); - return kbdFailed; + return iotFailed; } else { @@ -1025,7 +1025,7 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P12x(int RtuIndex) else { LOGDEBUG("设备准备录波数据中，暂不处理。"); - return kbdSuccess; + return iotSuccess; } } //LOGDEBUG("i=%d",i); @@ -1084,13 +1084,13 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P12x(int RtuIndex) } if (m_CurrentRtuStr.WaveStr.NewWaveCount == 0) - return kbdFailed; + return iotFailed; else - return kbdSuccess; + return iotSuccess; } } else - return kbdFailed; + return iotFailed; } /* @@ -1110,12 +1110,12 @@ void CModbusMicomPDataProcThread::Wave_StartWave_P14x(int RtuIndex) if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) { SleepmSec(200); if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) { m_CurrentRtuStr.WaveStr.SendWaveDataFlag = false; m_CurrentRtuStr.WaveStr.NewHead++; @@ -1137,12 +1137,12 @@ void CModbusMicomPDataProcThread::Wave_StartWave_P14x(int RtuIndex) StartAddr = 0x03A1; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) { SleepmSec(200); if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) { m_CurrentRtuStr.WaveStr.SendWaveDataFlag = false; m_CurrentRtuStr.WaveStr.NewHead++; @@ -1191,9 +1191,9 @@ void CModbusMicomPDataProcThread::Wave_StartWave_P12x(int RtuIndex) LOGDEBUG("%d %d %d %d %d %d ", WaveTime.Year, WaveTime.Month, WaveTime.Day, WaveTime.Hour, WaveTime.Minute, WaveTime.Millisecond); if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) { - if (SetWaveReReadProcess(RtuIndex) == kbdFailed) + if (SetWaveReReadProcess(RtuIndex) == iotFailed) CurrentWaveChanlNo = 0; return; } @@ -1260,9 +1260,9 @@ void CModbusMicomPDataProcThread::Wave_StartWave_P12x(int RtuIndex) StartAddr = m_CurrentRtuStr.RtuConfigParamStr.WaveCfgStrP2x2.DataStartAddr + (CurrentWaveChanPageNo * 0x100); if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, &Data[0], 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, &Data[0]) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, &Data[0]) == iotFailed) { - if (SetWaveReReadProcess(RtuIndex) == kbdFailed) + if (SetWaveReReadProcess(RtuIndex) == iotFailed) CurrentWaveChanlNo = 0; return; } @@ -1272,9 +1272,9 @@ void CModbusMicomPDataProcThread::Wave_StartWave_P12x(int RtuIndex) StartAddr += 0x7D; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, &Data[0], 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, &Data[0]) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, &Data[0]) == iotFailed) { - if (SetWaveReReadProcess(RtuIndex) == kbdFailed) + if (SetWaveReReadProcess(RtuIndex) == iotFailed) CurrentWaveChanlNo = 0; return; } @@ -1297,9 +1297,9 @@ void CModbusMicomPDataProcThread::Wave_StartWave_P12x(int RtuIndex) StartAddr = m_CurrentRtuStr.RtuConfigParamStr.WaveCfgStrP2x2.DataStartAddr + (CurrentWaveChanPageNo * 0x100); if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, &Data[0], 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, &Data[0]) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, &Data[0]) == iotFailed) { - if (SetWaveReReadProcess(RtuIndex) == kbdFailed) + if (SetWaveReReadProcess(RtuIndex) == iotFailed) CurrentWaveChanlNo = 0; return; } @@ -1313,9 +1313,9 @@ void CModbusMicomPDataProcThread::Wave_StartWave_P12x(int RtuIndex) StartAddr += 0x7D; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, &Data[0], 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, &Data[0]) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, &Data[0]) == iotFailed) { - if (SetWaveReReadProcess(RtuIndex) == kbdFailed) + if (SetWaveReReadProcess(RtuIndex) == iotFailed) CurrentWaveChanlNo = 0; return; } @@ -1330,7 +1330,7 @@ void CModbusMicomPDataProcThread::Wave_StartWave_P12x(int RtuIndex) } } - if (VaildFlag == kbdFailed) + if (VaildFlag == iotFailed) { //LOGINFO("故障序号%d的录波在读取的过程中，被新的录波所覆盖，读取该录波失败", WaveTime.GzNumber); memset(m_CurrentRtuStr.WaveStr.WaveChannelData, 0, sizeof(WAVE_CHANNELDATA_STR)*(m_CurrentRtuStr.WaveStr.WaveChanlCount)); @@ -1371,10 +1371,10 @@ int CModbusMicomPDataProcThread::Wave_JudgeWave_P12x(int RtuIndex, WAVE_TIME Wa int Len = 0x24; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 77, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 77, Data) == iotFailed) { LOGDEBUG("读取未确认的录波列表失败！ChanNo:%d RtuNo:%d", m_ptrCFesChan->m_Param.ChanNo, m_ptrCFesRtu->m_Param.RtuNo); - return kbdFailed; + return iotFailed; } CurentNewWaveCount = Data[3]; CurentNewWaveCount <<= 8; @@ -1409,17 +1409,17 @@ int CModbusMicomPDataProcThread::Wave_JudgeWave_P12x(int RtuIndex, WAVE_TIME Wa (NewWaveTime[i].Hour == WaveTime.Hour) && (NewWaveTime[i].Minute == WaveTime.Minute) && (NewWaveTime[i].Millisecond == WaveTime.Millisecond)) - return kbdSuccess; + return iotSuccess; else { LOGINFO("故障序号：%d %d-%d-%d %d:%d:%d 的录波数据已被覆盖，现丢弃该录波", WaveTime.GzNumber, WaveTime.Year, WaveTime.Month, WaveTime.Day, WaveTime.Hour, WaveTime.Minute, WaveTime.Millisecond); - return kbdFailed; + return iotFailed; } } } } - return kbdSuccess; + return iotSuccess; } @@ -1441,12 +1441,12 @@ void CModbusMicomPDataProcThread::Wave_ReadFile_P14x(int RtuIndex) StartAddr = 0x03A5; FunCode = 0x04; Len = 1; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) { SleepmSec(200); if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) { m_AppData.RtuStr[RtuIndex].WaveStr.ReReadCount++; if (m_AppData.RtuStr[RtuIndex].WaveStr.ReReadCount > WAVE_REREAD_NUM) @@ -1475,12 +1475,12 @@ void CModbusMicomPDataProcThread::Wave_ReadFile_P14x(int RtuIndex) StartAddr = 0x0321; FunCode = 0x04; Len = 1; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) { SleepmSec(200); if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) { m_AppData.RtuStr[RtuIndex].WaveStr.ReReadCount++; if (m_AppData.RtuStr[RtuIndex].WaveStr.ReReadCount > WAVE_REREAD_NUM) @@ -1508,12 +1508,12 @@ void CModbusMicomPDataProcThread::Wave_ReadFile_P14x(int RtuIndex) StartAddr = 0x0322; FunCode = 0x04; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) { SleepmSec(200); if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) { m_AppData.RtuStr[RtuIndex].WaveStr.ReReadCount++; if (m_AppData.RtuStr[RtuIndex].WaveStr.ReReadCount > WAVE_REREAD_NUM) @@ -1576,12 +1576,12 @@ void CModbusMicomPDataProcThread::Wave_ReadFile_P14x(int RtuIndex) if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == iotFailed) { SleepmSec(200); if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == iotFailed) { m_AppData.RtuStr[RtuIndex].WaveStr.ReReadCount++; if (m_AppData.RtuStr[RtuIndex].WaveStr.ReReadCount > WAVE_REREAD_NUM) @@ -1835,7 +1835,7 @@ void CModbusMicomPDataProcThread::SetErrProcess() /* 设置录波重读次数的处理 -当超过最大次数时，返回kbdFailed；否则，返回kbdSuccess +当超过最大次数时，返回iotFailed；否则，返回iotSuccess */ int CModbusMicomPDataProcThread::SetWaveReReadProcess(int RtuIndex) { @@ -1853,9 +1853,9 @@ int CModbusMicomPDataProcThread::SetWaveReReadProcess(int RtuIndex) m_CurrentRtuStr.WaveStr.NewWaveCount = 0; m_CurrentRtuStr.WaveStr.TimeRtuWaveFlag = false; } - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } /* @@ -1932,7 +1932,7 @@ void CModbusMicomPDataProcThread::OtherProcess_Px3x() { if (SetAckEventWayFlag == 0) { - if (SetAckEventWayProcess_Auto1_Px3x() == kbdSuccess) + if (SetAckEventWayProcess_Auto1_Px3x() == iotSuccess) { m_CurrentRtu.SetAckEventWayFlag = 1; } @@ -1943,7 +1943,7 @@ void CModbusMicomPDataProcThread::OtherProcess_Px3x() { if (SetAckEventWayFlag == 0) { - if (SetAckEventWayProcess_Mannal_Px3x() == kbdSuccess) + if (SetAckEventWayProcess_Mannal_Px3x() == iotSuccess) { m_CurrentRtu.SetAckEventWayFlag = 1; } @@ -1974,7 +1974,7 @@ void CModbusMicomPDataProcThread::OtherProcess_Px3x() return; } - if (Wave_GetNewWave_P63x(CurrentRtuIndex) == kbdFailed) //判断是否传输录波数据 + if (Wave_GetNewWave_P63x(CurrentRtuIndex) == iotFailed) //判断是否传输录波数据 { m_CurrentRtu.WaveStr.TimeRtuWaveFlag = false; m_CurrentRtu.WaveStr.SendWaveDataFlag = false; @@ -2004,8 +2004,8 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P63x(int RtuIndex) Data[writex++] = CrcCount & 0x00ff; Data[writex++] = (CrcCount >> 8) & 0x00ff; SendDataToPort(Data, writex, m_ptrCFesRtu); - if (RecvComData(m_ptrCFesRtu, FunCode, 5, Data) == kbdFailed) - return kbdFailed; + if (RecvComData(m_ptrCFesRtu, FunCode, 5, Data) == iotFailed) + return iotFailed; if ((Data[2] & 0x10) == 0) { @@ -2014,7 +2014,7 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P63x(int RtuIndex) m_CurrentRtuStr.WaveStr.NewWaveCount = 0; m_CurrentRtuStr.WaveStr.TimeRtuWaveFlag = false; m_CurrentRtuStr.WaveStr.SendWaveDataFlag = false; - return kbdFailed; + return iotFailed; } //读取故障录波信息 @@ -2022,8 +2022,8 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P63x(int RtuIndex) StartAddr = 0x6000; Len = 0x06; SendDataToPort(Data, writex, m_ptrCFesRtu); - if (RecvComData(m_ptrCFesRtu, FunCode, 17, Data) == kbdFailed) - return kbdFailed; + if (RecvComData(m_ptrCFesRtu, FunCode, 17, Data) == iotFailed) + return iotFailed; CurentRecCount = 1; //每次只有一个录波 @@ -2037,8 +2037,8 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P63x(int RtuIndex) StartAddr = 0x6180; Len = 0x09; SendDataToPort(Data, writex, m_ptrCFesRtu); - if (RecvComData(m_ptrCFesRtu, FunCode, 23, Data) == kbdFailed) - return kbdFailed; + if (RecvComData(m_ptrCFesRtu, FunCode, 23, Data) == iotFailed) + return iotFailed; m_CurrentRtuStr.WaveStr.SampFcy = (Data[15] << 8) + Data[16]; //录波记录索引的结构采样频率 @@ -2136,9 +2136,9 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P63x(int RtuIndex) //如果没有新的录波记录需要读取，则将定时读取录波记录的标志清除 if (m_CurrentRtuStr.WaveStr.NewWaveCount == 0) - return kbdFailed; + return iotFailed; else - return kbdSuccess; + return iotSuccess; } @@ -2161,7 +2161,7 @@ void CModbusMicomPDataProcThread::Wave_StartWave_P63x(int RtuIndex) StartAddr = m_CurrentRtuStr.WaveStr.ChannelAddr1 + CurentChanlNo; Len = 14; SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1); - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) { m_CurrentRtuStr.WaveStr.SendWaveDataFlag = false; m_CurrentRtuStr.WaveStr.NewHead++; @@ -2207,7 +2207,7 @@ void CModbusMicomPDataProcThread::Wave_StartWave_P63x(int RtuIndex) Len = m_CurrentRtuStr.WaveStr.WaveP63xChannelInfo[CurentChanlNo].TotalSamples - m_CurrentRtuStr.WaveStr.BlockMaxSamples*(m_CurrentRtuStr.WaveStr.WaveP63xChannelInfo[CurentChanlNo].DataBlockNum - 1); SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1); - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) { m_CurrentRtuStr.WaveStr.CurentChanlNo = 0; return; @@ -2223,7 +2223,7 @@ void CModbusMicomPDataProcThread::Wave_StartWave_P63x(int RtuIndex) StartAddr = m_CurrentRtuStr.WaveStr.WaveP63xChannelInfo[CurentChanlNo].FirstBlockAddr + (m_CurrentRtuStr.WaveStr.WaveP63xChannelInfo[CurentChanlNo].DataBlockIndex * 0x100); SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1); - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) { m_CurrentRtuStr.WaveStr.CurentChanlNo = 0; return; @@ -2248,7 +2248,7 @@ void CModbusMicomPDataProcThread::Wave_StartWave_P63x(int RtuIndex) StartAddr = m_CurrentRtuStr.WaveStr.AckRecordAddr; Len = 0x1000; SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1); - if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == iotFailed) return; } @@ -2367,7 +2367,7 @@ void CModbusMicomPDataProcThread::EventPro_Auto_Px3x() int Len = 9; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 23, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 23, Data) == iotFailed) { LOGDEBUG("接收事件失败！ChanNo:%d RtuNo:%d", m_ptrCFesChan->m_Param.ChanNo, m_ptrCFesRtu->m_Param.RtuNo); return; @@ -2464,7 +2464,7 @@ void CModbusMicomPDataProcThread::EventPro_Mannal_Px3x() int FunCode = 7, StartAddr = -1, Len = -1; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 5, Data) == iotFailed) { LOGDEBUG("读取装置状态失败！ChanNo:%d RtuNo:%d", m_ptrCFesChan->m_Param.ChanNo, m_ptrCFesRtu->m_Param.RtuNo); return; @@ -2478,7 +2478,7 @@ void CModbusMicomPDataProcThread::EventPro_Mannal_Px3x() FunCode = 5, StartAddr = 0x400d, Len = 0xff00; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == iotFailed) { LOGDEBUG("确认事件失败！ChanNo:%d RtuNo:%d", m_ptrCFesChan->m_Param.ChanNo, m_ptrCFesRtu->m_Param.RtuNo); return; @@ -2499,7 +2499,7 @@ void CModbusMicomPDataProcThread::EventPro_P14x() //1.是否有未确认的事件 FunCode = 4; StartAddr = 0; Len = 1; SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1); - if (RecvComData(m_ptrCFesRtu, FunCode, 7, Data) == kbdFailed) return; + if (RecvComData(m_ptrCFesRtu, FunCode, 7, Data) == iotFailed) return; EventCode = Data[3]; EventCode <<= 8; EventCode += Data[4]; EventCode = EventCode & 4; @@ -2508,7 +2508,7 @@ void CModbusMicomPDataProcThread::EventPro_P14x() //2.准备读取事件 FunCode = 6; StartAddr = 0x018f; Len = 1; SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1);//如果有，向地址40400写1读取事件 - if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == kbdFailed) return; + if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == iotFailed) return; //3.读事件 if (strcmp(m_ptrCInsertFesRtu->m_Param.DevType, "746") == 0) @@ -2522,7 +2522,7 @@ void CModbusMicomPDataProcThread::EventPro_P14x() SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1); } - if (RecvComData(m_ptrCFesRtu, FunCode, 25, Data) == kbdFailed) return; + if (RecvComData(m_ptrCFesRtu, FunCode, 25, Data) == iotFailed) return; //4.确认事件 writex = 0; @@ -2538,7 +2538,7 @@ void CModbusMicomPDataProcThread::EventPro_P14x() Mdata[writex++] = (crcCount >> 8) & 0x00ff; SendDataToPort(Data, writex, m_ptrCFesRtu); - if (RecvComData(m_ptrCFesRtu, 6, 8, Mdata) == kbdFailed) return; + if (RecvComData(m_ptrCFesRtu, 6, 8, Mdata) == iotFailed) return; //确认成功 //取出事件类型 @@ -2564,7 +2564,7 @@ void CModbusMicomPDataProcThread::EventPro_P14x() uint64 mSec = getUTCTimeMsec(); int ValueCount = 0, ChgCount = 0, SoeCount = 0; std::map &SoeMap_P14x = ChannelSoeMap_P14xStr[m_ptrCFesChan->m_CurrentRtuIndex]; - bool flag = kbdFailed; + bool flag = iotFailed; //暂时未做，没有找到相关文档 @@ -2693,7 +2693,7 @@ void CModbusMicomPDataProcThread::EventPro_P14x() //开入和告警事件处理 for (i = 0; i < 32; i++) { - flag = kbdFailed; + flag = iotFailed; OldValueX = (OldValue >> i) & 1; ValueX = (Value >> i) & 1; @@ -3038,7 +3038,7 @@ void CModbusMicomPDataProcThread::EventPro_P14x() //开入和告警事件处理 for (i = 0; i < 32; i++) { - flag = kbdFailed; + flag = iotFailed; OldValueX = (OldValue >> i) & 1; ValueX = (Value >> i) & 1; @@ -3161,7 +3161,7 @@ void CModbusMicomPDataProcThread::OtherProcess_P14x() Wave_StartWaveAndWriteFile_P343(CurrentRtuIndex); return; } - if (Wave_GetNewWave_P343(CurrentRtuIndex) == kbdFailed) //判断是否传输录波数据 + if (Wave_GetNewWave_P343(CurrentRtuIndex) == iotFailed) //判断是否传输录波数据 { m_CurrentRtu.WaveStr.TimeRtuWaveFlag = false; m_CurrentRtu.WaveStr.SendWaveDataFlag = false; @@ -3181,7 +3181,7 @@ void CModbusMicomPDataProcThread::OtherProcess_P14x() return; } - if (Wave_GetNewWave_P14x(CurrentRtuIndex) == kbdFailed) //判断是否传输录波数据 + if (Wave_GetNewWave_P14x(CurrentRtuIndex) == iotFailed) //判断是否传输录波数据 { m_CurrentRtu.WaveStr.TimeRtuWaveFlag = false; m_CurrentRtu.WaveStr.SendWaveDataFlag = false; @@ -3206,7 +3206,7 @@ void CModbusMicomPDataProcThread::Wave_StartWaveAndWriteFile_P343(int RtuIndex) if (!SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) return; - if (RecvComData(m_ptrCFesRtu, FunCode, 7, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 7, Data) == iotFailed) return; WaveStatus = Data[3] * 0x100 + Data[4]; @@ -3217,7 +3217,7 @@ void CModbusMicomPDataProcThread::Wave_StartWaveAndWriteFile_P343(int RtuIndex) if (!SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) return; - if (RecvComData(m_ptrCFesRtu, FunCode, 7, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 7, Data) == iotFailed) return; RegisterCount = Data[3] * 0x100 + Data[4]; @@ -3227,7 +3227,7 @@ void CModbusMicomPDataProcThread::Wave_StartWaveAndWriteFile_P343(int RtuIndex) if (!SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) return; - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) return; if (m_CurrentRtu.WaveStr.WaveType == 1) @@ -3260,7 +3260,7 @@ void CModbusMicomPDataProcThread::Wave_StartWaveAndWriteFile_P343(int RtuIndex) if (!SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) return; - if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == iotFailed) return; } else if (WaveStatus == 3) //cfg文件读取结束 @@ -3273,7 +3273,7 @@ void CModbusMicomPDataProcThread::Wave_StartWaveAndWriteFile_P343(int RtuIndex) if (!SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) return; - if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == iotFailed) return; m_CurrentRtu.WaveStr.WaveType = 1; @@ -3290,7 +3290,7 @@ void CModbusMicomPDataProcThread::Wave_StartWaveAndWriteFile_P343(int RtuIndex) if (!SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) return; - if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == iotFailed) return; SModbussMicomPRtuAppData &m_CurrentRtu = m_AppData.RtuStr[RtuIndex]; @@ -3312,10 +3312,10 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P343(int RtuIndex) //1.读取录波状态 FunCode = 4; StartAddr = 0; Len = 1; if (!SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) - return kbdFailed; + return iotFailed; - if (RecvComData(m_ptrCFesRtu, FunCode, 7, Data) == kbdFailed) - return kbdFailed; + if (RecvComData(m_ptrCFesRtu, FunCode, 7, Data) == iotFailed) + return iotFailed; WaveFlag = ((Data[3] * 0x100 + Data[4]) >> 2) & 1; @@ -3325,13 +3325,13 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P343(int RtuIndex) if (!SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { WaveFlag = 0; - return kbdFailed; + return iotFailed; } - if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == iotFailed) { WaveFlag = 0; - return kbdFailed; + return iotFailed; } if (WaveFlag) @@ -3353,13 +3353,13 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P343(int RtuIndex) memset(DataBuf, 0, sizeof(char)*DATA_MAXNUM*DATA_MAXNUM); m_CurrentRtuStr.WaveStr.WaveType = 0; - return kbdSuccess; + return iotSuccess; } else { m_CurrentRtuStr.WaveStr.NewWaveCount = 0; m_AppData.RtuStr[RtuIndex].WaveStr.TimeRtuWaveFlag = false; - return kbdFailed; + return iotFailed; } } @@ -3388,8 +3388,8 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P14x(int RtuIndex) StartAddr = 0x031F; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) - return kbdFailed; + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) + return iotFailed; } m_CurrentRtuStr.WaveStr.TempWaveConut = Data[3]; @@ -3401,19 +3401,19 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P14x(int RtuIndex) m_CurrentRtuStr.WaveStr.NewWaveCount = 0; m_CurrentRtuStr.WaveStr.NewHead = 0; m_CurrentRtuStr.WaveStr.TempWaveConut = 0; - return kbdFailed; + return iotFailed; } StartAddr = 0x0320; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == kbdFailed) - return kbdFailed; + if (RecvComData(m_ptrCFesRtu, FunCode, 2 * Len + 5, Data) == iotFailed) + return iotFailed; } m_CurrentRtuStr.WaveStr.OldID = Data[3] << 8; m_CurrentRtuStr.WaveStr.OldID += Data[4]; - return kbdSuccess; + return iotSuccess; } //3、写入要读的录波ID 此为oldID + n（n >= 0） @@ -3429,7 +3429,7 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P14x(int RtuIndex) StartAddr = 0x00F9; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == kbdSuccess) + if (RecvComData(m_ptrCFesRtu, FunCode, 8, Data) == iotSuccess) { m_CurrentRtuStr.WaveStr.TempWaveTime[TempWaveIndex].Year = Data[9] + (Data[10] << 8); if ((m_CurrentRtuStr.WaveStr.TempWaveTime[TempWaveIndex].Year % 100) > 70) @@ -3450,10 +3450,10 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P14x(int RtuIndex) m_CurrentRtuStr.WaveStr.TempWaveTime[TempWaveIndex].Millisecond % 1000, m_CurrentRtuStr.WaveStr.TempWaveTime[TempWaveIndex].GzNumber, Data[6]); TempWaveIndex++; - result = kbdSuccess; + result = iotSuccess; } else - result = kbdFailed; + result = iotFailed; if (TempWaveIndex >= 5) //不是第一次，则读取5个最新的录波 @@ -3537,9 +3537,9 @@ int CModbusMicomPDataProcThread::Wave_GetNewWave_P14x(int RtuIndex) memcpy(&m_CurrentRtuStr.WaveStr.NewWaveTime, &m_CurrentRtuStr.WaveStr.TempWaveTime, m_CurrentRtuStr.WaveStr.TempWaveConut * sizeof(WAVE_TIME)); if (m_CurrentRtuStr.WaveStr.NewWaveCount == 0) - return kbdFailed; + return iotFailed; else - return kbdSuccess; + return iotSuccess; } @@ -3596,7 +3596,7 @@ int CModbusMicomPDataProcThread::SendProcess() { int retLen = 0; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; //有多个RTU时，才需要获取当前最新的RTU结构，否则m_ptrCFesRtu在构造函数初始化。 /*2019-9-10 在 sendSetCmdFlag()中已设置当前RTU结构 @@ -4292,7 +4292,7 @@ int CModbusMicomPDataProcThread::DefCmdProcessProRead_P12x() StartAddr = Cmd->StartAddr; Len = Cmd->DataLen; SendDataToPort(m_ptrCInsertFesRtu, FunCode, StartAddr, Len, Data, 1); - if (RecvComData(m_ptrCInsertFesRtu, FunCode, Len * 2 + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCInsertFesRtu, FunCode, Len * 2 + 5, Data) == iotFailed) { LOGDEBUG("读取定值失败！ChanNo:%d RtuNo:%d BlockNo:%d", m_ptrCFesChan->m_Param.ChanNo, m_ptrCFesRtu->m_Param.RtuNo, Cmd->Index); return 0; @@ -4395,7 +4395,7 @@ int CModbusMicomPDataProcThread::DefCmdProcessProWrite_P12x() Data[writex++] = (crcCount >> 8) & 0x00ff; SendDataToPort(Data, writex, m_ptrCInsertFesRtu); - if (RecvComData(m_ptrCInsertFesRtu, FunCode, 8, Data) == kbdSuccess) + if (RecvComData(m_ptrCInsertFesRtu, FunCode, 8, Data) == iotSuccess) { WriteDzSuccessNum++; } @@ -4557,7 +4557,7 @@ int CModbusMicomPDataProcThread::PollingCmdProcess() return 0; } - if (GetPollingCmd(&cmd) == kbdFailed) + if (GetPollingCmd(&cmd) == iotFailed) { return 0; } @@ -4586,7 +4586,7 @@ int CModbusMicomPDataProcThread::PollingCmdProcess() * @brief CModbusMicomPDataProcThread::GetPollingCmd * 获取读取数据命令 * @param pCmd 返回读取数据命令 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CModbusMicomPDataProcThread::GetPollingCmd(SModbusCmd *pCmd) { @@ -4595,7 +4595,7 @@ int CModbusMicomPDataProcThread::GetPollingCmd(SModbusCmd *pCmd) int count = 0; if (m_ptrCFesRtu == NULL) - return kbdFailed; + return iotFailed; while (count < m_ptrCFesRtu->m_Param.ModbusCmdBuf.num) { @@ -4612,10 +4612,10 @@ int CModbusMicomPDataProcThread::GetPollingCmd(SModbusCmd *pCmd) m_ptrCFesRtu->m_Param.ModbusCmdBuf.readx = 0; count++; if (ComFlag) - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } /* @@ -4629,7 +4629,7 @@ int CModbusMicomPDataProcThread::RecvComData() int recvLen, Len, i, crc, recvcrc; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; DevAddr = m_AppData.lastCmdData[0]; FunCode = m_AppData.lastCmdData[1]; @@ -4713,7 +4713,7 @@ int CModbusMicomPDataProcThread::RecvComData() NextRtuIndex(m_ptrCFesChan); } - return kbdFailed; + return iotFailed; } else//长度、地址、功能码 都正确则认为数据正确。 if ((Len == ExpectLen) && (DevAddr == Data[0]) && (FunCode == (Data[1] & 0x7f))) @@ -4760,7 +4760,7 @@ int CModbusMicomPDataProcThread::RecvComData() } NextRtuIndex(m_ptrCFesChan); } - return kbdFailed; + return iotFailed; } else { @@ -4789,7 +4789,7 @@ int CModbusMicomPDataProcThread::RecvComData() } NextRtuIndex(m_ptrCFesChan); } - return kbdSuccess; + return iotSuccess; } } else @@ -4806,7 +4806,7 @@ int CModbusMicomPDataProcThread::RecvComData() m_ptrCFesRtu->SetErrNum(1); NextRtuIndex(m_ptrCFesChan); } - return kbdFailed; + return iotFailed; } } @@ -4814,7 +4814,7 @@ int CModbusMicomPDataProcThread::RecvComData() * @brief CModbusMicomPDataProcThread::RecvDataProcess * @param Data * @param DataSize -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CModbusMicomPDataProcThread::RecvDataProcess(byte *Data, int DataSize) { @@ -4824,11 +4824,11 @@ int CModbusMicomPDataProcThread::RecvDataProcess(byte *Data, int DataSize) if (FunCode & 0x80) { CmdControlRespProcess(NULL, 0, 0); - return kbdSuccess; + return iotSuccess; } if (CmdControlRespProcess(Data, DataSize, 1) == true) - return kbdSuccess; + return iotSuccess; switch (FunCode) { @@ -4851,10 +4851,10 @@ int CModbusMicomPDataProcThread::RecvDataProcess(byte *Data, int DataSize) Cmd10RespProcess(Data, DataSize); break; default: - return kbdFailed; + return iotFailed; break; } - return kbdSuccess; + return iotSuccess; } /* @@ -4867,7 +4867,7 @@ int CModbusMicomPDataProcThread::RecvComData(CFesRtuPtr CFesRtu, int FunCode, in int recvLen, Len, i, Addr, crc, recvcrc; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; //int ChanNo = m_ptrCurrentChan->m_Param.ChanNo; Len = 0; @@ -4909,7 +4909,7 @@ int CModbusMicomPDataProcThread::RecvComData(CFesRtuPtr CFesRtu, int FunCode, in } CFesRtu->SetOfflineFlag(CN_FesRtuComDown); } - return kbdFailed; + return iotFailed; } else//长度、地址、功能码 都正确则认为数据正确。 if ((Len == ExpectLen) && (Addr == Data[0]) && (FunCode == (Data[1] & 0x7f))) @@ -4955,7 +4955,7 @@ int CModbusMicomPDataProcThread::RecvComData(CFesRtuPtr CFesRtu, int FunCode, in m_ptrCFesBase->SetOfflineFlag(m_ptrCFesRtu, CN_FesRtuComDown); } } - return kbdFailed; + return iotFailed; } else { @@ -4968,14 +4968,14 @@ int CModbusMicomPDataProcThread::RecvComData(CFesRtuPtr CFesRtu, int FunCode, in CFesRtu->WriteRtuPointsComStatus(CN_FesRtuNormal); m_ptrCFesBase->WriteRtuSatus(CFesRtu, CN_FesRtuNormal); } - return kbdSuccess; + return iotSuccess; } } else { m_ptrCurrentChan->SetErrNum(1); CFesRtu->SetErrNum(1); - return kbdFailed; + return iotFailed; } } @@ -5295,7 +5295,7 @@ void CModbusMicomPDataProcThread::DefCmdSuccessProcess(int ValueCount) Data[writex++] = (crcCount >> 8) & 0x00ff; SendDataToPort(Data, writex, m_ptrCInsertFesRtu); - if (RecvComData(m_ptrCInsertFesRtu, 0x06, 8, Data) == kbdFailed) + if (RecvComData(m_ptrCInsertFesRtu, 0x06, 8, Data) == iotFailed) { m_AppData.RtuStr[m_AppData.curInsertRtuIndex].DzStr.modifyDzSuccessCount = 0; } @@ -6163,7 +6163,7 @@ void CModbusMicomPDataProcThread::Cmd06RespProcess(byte *Data, int DataSize) { if (m_AppData.CtrlActType == CN_SettingAck) { - if (RecvComData(m_ptrCInsertFesRtu, 0x06, 8, Data) == kbdSuccess) + if (RecvComData(m_ptrCInsertFesRtu, 0x06, 8, Data) == iotSuccess) DefCmdSuccessProcess(1); //一次修改一个定值 else { diff --git a/product/src/fes/protocol/modbus_pm/ModbusRtuPm.cpp b/product/src/fes/protocol/modbus_pm/ModbusRtuPm.cpp index f9a6be82..09ab71b9 100644 --- a/product/src/fes/protocol/modbus_pm/ModbusRtuPm.cpp +++ b/product/src/fes/protocol/modbus_pm/ModbusRtuPm.cpp @@ -18,38 +18,38 @@ bool g_ModbusRtuPmChanelRun=true; int EX_SetBaseAddr(void *address) { ModbusRtuPm.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { ModbusRtuPm.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { ModbusRtuPm.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { ModbusRtuPm.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { ModbusRtuPm.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_ModbusRtuPmChanelRun =false;//使所有的线程退出。 ModbusRtuPm.InformComThreadExit(); - return kbdSuccess; + return iotSuccess; } CModbusRtuPm::CModbusRtuPm() { @@ -82,14 +82,14 @@ int CModbusRtuPm::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*)"modbus_rtu_pm"); } - return kbdSuccess; + return iotSuccess; } int CModbusRtuPm::SetProperty(int IsMainFes) { g_ModbusRtuPmIsMainFes = IsMainFes; LOGDEBUG("CModbusRtuPm::SetProperty g_ModbusRtuPmIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -98,7 +98,7 @@ int CModbusRtuPm::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtuPm::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -106,12 +106,12 @@ int CModbusRtuPm::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -125,7 +125,7 @@ int CModbusRtuPm::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCSerialPort == NULL) { LOGERROR("CModbusRtuPm EX_OpenChan() ChanNo:%d create CSerialPortThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } else { @@ -135,7 +135,7 @@ int CModbusRtuPm::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -151,13 +151,13 @@ int CModbusRtuPm::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CModbusRtuPm EX_OpenChan() ChanNo:%d create CModbusRtuPmDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -167,7 +167,7 @@ int CModbusRtuPm::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtuPm::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -175,12 +175,12 @@ int CModbusRtuPm::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CModbusRtuPm::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -196,7 +196,7 @@ int CModbusRtuPm::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -209,7 +209,7 @@ int CModbusRtuPm::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -220,7 +220,7 @@ int CModbusRtuPm::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int CModbusRtuPm::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/protocol/modbus_pm/ModbusRtuPmDataProcThread.cpp b/product/src/fes/protocol/modbus_pm/ModbusRtuPmDataProcThread.cpp index 2d1ba984..c7d5c407 100644 --- a/product/src/fes/protocol/modbus_pm/ModbusRtuPmDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_pm/ModbusRtuPmDataProcThread.cpp @@ -123,7 +123,7 @@ CModbusRtuPmDataProcThread::~CModbusRtuPmDataProcThread() */ int CModbusRtuPmDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -215,7 +215,7 @@ int CModbusRtuPmDataProcThread::SendProcess() { int retLen = 0; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; //有多个RTU时，才需要获取当前最新的RTU结构，否则m_ptrCFesRtu在构造函数初始化。 /*2019-9-10 在 sendSetCmdFlag()中已设置当前RTU结构 @@ -1065,7 +1065,7 @@ int CModbusRtuPmDataProcThread::PollingCmdProcess() return 0; } - if (GetPollingCmd(&cmd) == kbdFailed) + if (GetPollingCmd(&cmd) == iotFailed) { //LOGERROR("CModbusRtuPmDataProcThread::PollingCmdProcess() return 0"); return 0; @@ -1094,7 +1094,7 @@ int CModbusRtuPmDataProcThread::PollingCmdProcess() * @brief CModbusRtuPmDataProcThread::GetPollingCmd * 获取读取数据命令 * @param pCmd 返回读取数据命令 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtuPmDataProcThread::GetPollingCmd(SModbusCmd *pCmd) { @@ -1104,7 +1104,7 @@ int CModbusRtuPmDataProcThread::GetPollingCmd(SModbusCmd *pCmd) if (m_ptrCFesRtu == NULL) { - return kbdFailed; + return iotFailed; } //2020-05-14 thxiao 如果没有配置块，则轮训下一个设备。 @@ -1126,9 +1126,9 @@ int CModbusRtuPmDataProcThread::GetPollingCmd(SModbusCmd *pCmd) m_ptrCFesRtu->m_Param.ModbusCmdBuf.readx = 0; count++; if (ComFlag) - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } /* @@ -1142,7 +1142,7 @@ int CModbusRtuPmDataProcThread::RecvComData() int recvLen, Len, i,crc,recvcrc; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; DevAddr = m_AppData.lastCmdData[0]; FunCode = m_AppData.lastCmdData[1]; @@ -1227,7 +1227,7 @@ int CModbusRtuPmDataProcThread::RecvComData() } //LOGDEBUG("========================2RtuNo:%d", m_ptrCFesRtu->m_Param.RtuNo); - return kbdFailed; + return iotFailed; } else//长度、地址、功能码 都正确则认为数据正确。 if ((Len == ExpectLen) && (DevAddr == Data[0]) && (FunCode == (Data[1] & 0x7f))) @@ -1274,7 +1274,7 @@ int CModbusRtuPmDataProcThread::RecvComData() } NextRtuIndex(m_ptrCFesChan); } - return kbdFailed; + return iotFailed; } else { @@ -1307,7 +1307,7 @@ int CModbusRtuPmDataProcThread::RecvComData() } } - return kbdSuccess; + return iotSuccess; } else { @@ -1325,7 +1325,7 @@ int CModbusRtuPmDataProcThread::RecvComData() m_ptrCFesRtu->SetErrNum(1); NextRtuIndex(m_ptrCFesChan); } - return kbdFailed; + return iotFailed; } } @@ -1333,7 +1333,7 @@ int CModbusRtuPmDataProcThread::RecvComData() * @brief CModbusRtuPmDataProcThread::RecvDataProcess * @param Data * @param DataSize -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtuPmDataProcThread::RecvDataProcess(byte *Data, int DataSize) { @@ -1343,11 +1343,11 @@ int CModbusRtuPmDataProcThread::RecvDataProcess(byte *Data, int DataSize) if (FunCode & 0x80) { CmdControlRespProcess(NULL, 0, 0); - return kbdSuccess; + return iotSuccess; } if (CmdControlRespProcess(Data, DataSize, 1) == true) - return kbdSuccess; + return iotSuccess; switch (FunCode) { @@ -1370,10 +1370,10 @@ int CModbusRtuPmDataProcThread::RecvDataProcess(byte *Data, int DataSize) Cmd10RespProcess(Data, DataSize); break; default: - return kbdFailed; + return iotFailed; break; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_rtu/ModbusRtu.cpp b/product/src/fes/protocol/modbus_rtu/ModbusRtu.cpp index 3b7e6da6..27714f4a 100644 --- a/product/src/fes/protocol/modbus_rtu/ModbusRtu.cpp +++ b/product/src/fes/protocol/modbus_rtu/ModbusRtu.cpp @@ -22,38 +22,38 @@ bool g_ModbusRtuChanelRun=true; int EX_SetBaseAddr(void *address) { ModbusRtu.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { ModbusRtu.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { ModbusRtu.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { ModbusRtu.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { ModbusRtu.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_ModbusRtuChanelRun =false;//使所有的线程退出。 ModbusRtu.InformComThreadExit(); - return kbdSuccess; + return iotSuccess; } CModbusRtu::CModbusRtu() { @@ -93,14 +93,14 @@ int CModbusRtu::SetBaseAddr(void *address) { m_ptrCFesBase = (CFesBase *)address; } - return kbdSuccess; + return iotSuccess; } int CModbusRtu::SetProperty(int IsMainFes) { g_ModbusRtuIsMainFes = IsMainFes; LOGDEBUG("CModbusRtu::SetProperty g_ModbusRtuIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -109,7 +109,7 @@ int CModbusRtu::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -120,12 +120,12 @@ int CModbusRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CTcpServerRxTxThreadPtr ptrCTcpServerRxTx=NULL; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if (m_initRtuFlag == 0) { @@ -145,7 +145,7 @@ int CModbusRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCSerialPort == NULL) { LOGERROR("CModbusRtu EX_OpenChan() ChanNo:%d create CSerialPortThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } ptrCSerialPort->SetThreadRunMode(1);//使用人工干预读取数据。 DataProcSetSerialThreadByChanNo(ptrMainFesChan->m_Param.ChanNo, ptrCSerialPort); @@ -161,7 +161,7 @@ int CModbusRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpClient == NULL) { LOGERROR("CModbusTcp EX_OpenChan() ChanNo:%d create CTcpClientThread error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } ptrCTcpClient->SetThreadRunMode(1);//使用人工干预读取数据。 DataProcSetTcpThreadByChanNo(ptrMainFesChan->m_Param.ChanNo, ptrCTcpClient); @@ -177,7 +177,7 @@ int CModbusRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (m_CTcpServerListenThread == NULL) { LOGERROR("CModbusTcp EX_OpenChan() ChanNo:%d create CTcpServerListenThread error!"); - return kbdFailed; + return iotFailed; } GetModbusRtuProtocolInfo((char*) "modbus_rtu"); m_CTcpServerListenThread->resume(); //start TCP ServerListen THREAD @@ -190,7 +190,7 @@ int CModbusRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpServerRxTx == NULL) { LOGERROR("CModbusTcp EX_OpenChan() ChanNo:%d create CTcpServerRxTxThread error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } ptrCTcpServerRxTx->SetThreadRunMode(1);//使用人工干预读取数据。 DataProcSetServerThreadByChanNo(ptrMainFesChan->m_Param.ChanNo, ptrCTcpServerRxTx); @@ -199,7 +199,7 @@ int CModbusRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -213,7 +213,7 @@ int CModbusRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CModbusRtu EX_OpenChan() ChanNo:%d create CModbusRtuDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } switch (ptrFesChan->m_Param.CommType) { @@ -234,7 +234,7 @@ int CModbusRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -244,7 +244,7 @@ int CModbusRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtu::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -252,12 +252,12 @@ int CModbusRtu::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CModbusRtu::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -294,7 +294,7 @@ int CModbusRtu::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -307,7 +307,7 @@ int CModbusRtu::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -318,7 +318,7 @@ int CModbusRtu::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int CModbusRtu::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } /* @@ -741,19 +741,19 @@ bool CModbusRtu::InitProtocolPointMapping(CFesRtuPtr RtuPtr) if (ret == false) { LOGERROR("RdbAiTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbAiTable.selectOneColumnOneOrder(con, VecAiParam, vecAiColumn, vecAiOrder);//默认顺序 ljj if (ret == false) { LOGERROR("RdbAiTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } ret = RdbAiTable.close(); if (ret == false) { LOGERROR("RdbAiTable::close error"); - return kbdFailed; + return iotFailed; } count = VecAiParam.size(); if (count > 0) @@ -818,19 +818,19 @@ bool CModbusRtu::InitProtocolPointMapping(CFesRtuPtr RtuPtr) if (ret == false) { LOGERROR("RdbDiTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbDiTable.selectOneColumnOneOrder(con, VecDiParam, vecDiColumn, vecDiOrder);//默认顺序 if (ret == false) { LOGERROR("RdbDiTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } ret = RdbDiTable.close(); if (ret == false) { LOGERROR("RdbDiTable::close error"); - return kbdFailed; + return iotFailed; } count = VecDiParam.size(); if (count > 0) @@ -891,19 +891,19 @@ bool CModbusRtu::InitProtocolPointMapping(CFesRtuPtr RtuPtr) if (ret == false) { LOGERROR("RdbAccTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbAccTable.selectOneColumnOneOrder(con, VecAccParam, vecAccColumn, vecAccOrder);//默认顺序 if (ret == false) { LOGERROR("RdbAccTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } ret = RdbAccTable.close(); if (ret == false) { LOGERROR("RdbAccTable::close error"); - return kbdFailed; + return iotFailed; } count = VecAccParam.size(); @@ -973,19 +973,19 @@ bool CModbusRtu::InitProtocolPointMapping(CFesRtuPtr RtuPtr) if (ret == false) { LOGERROR("RdbMiTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbMiTable.selectOneColumnOneOrder(con, VecMiParam, vecMiColumn, vecMiOrder);//默认顺序 if (ret == false) { LOGERROR("RdbMiTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } ret = RdbMiTable.close(); if (ret == false) { LOGERROR("RdbMiTable::close error"); - return kbdFailed; + return iotFailed; } count = VecMiParam.size(); if (count > 0) @@ -1034,5 +1034,5 @@ bool CModbusRtu::InitProtocolPointMapping(CFesRtuPtr RtuPtr) } } } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_rtu/ModbusRtuDataProcThread.cpp b/product/src/fes/protocol/modbus_rtu/ModbusRtuDataProcThread.cpp index c38393df..88086f24 100644 --- a/product/src/fes/protocol/modbus_rtu/ModbusRtuDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_rtu/ModbusRtuDataProcThread.cpp @@ -122,7 +122,7 @@ CModbusRtuDataProcThread::~CModbusRtuDataProcThread() */ int CModbusRtuDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -233,7 +233,7 @@ int CModbusRtuDataProcThread::SendProcess() { int retLen = 0; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; switch (m_ptrCurrentChan->m_Param.CommType) { @@ -934,7 +934,7 @@ int CModbusRtuDataProcThread::PollingCmdProcess() return 0; } - if (GetPollingCmd(&cmd) == kbdFailed) + if (GetPollingCmd(&cmd) == iotFailed) { return 0; } @@ -963,7 +963,7 @@ int CModbusRtuDataProcThread::PollingCmdProcess() * @brief CModbusRtuDataProcThread::GetPollingCmd * 获取读取数据命令 * @param pCmd 返回读取数据命令 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtuDataProcThread::GetPollingCmd(SModbusCmd *pCmd) { @@ -972,7 +972,7 @@ int CModbusRtuDataProcThread::GetPollingCmd(SModbusCmd *pCmd) int count = 0; if(m_ptrCFesRtu==NULL) - return kbdFailed; + return iotFailed; //2020-05-14 thxiao 如果没有配置块，则轮训下一个设备。 if (m_ptrCFesRtu->m_Param.ModbusCmdBuf.num == 0) @@ -993,10 +993,10 @@ int CModbusRtuDataProcThread::GetPollingCmd(SModbusCmd *pCmd) m_ptrCFesRtu->m_Param.ModbusCmdBuf.readx = 0; count++; if (ComFlag) - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } /* @@ -1010,7 +1010,7 @@ int CModbusRtuDataProcThread::RecvComData() int recvLen, Len, i,crc,recvcrc; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; DevAddr = m_AppData.lastCmdData[0]; FunCode = m_AppData.lastCmdData[1]; @@ -1112,7 +1112,7 @@ int CModbusRtuDataProcThread::RecvComData() NextRtuIndex(m_ptrCFesChan); } - return kbdFailed; + return iotFailed; } else//长度、地址、功能码 都正确则认为数据正确。 if ((Len == ExpectLen) && ((DevAddr == Data[0])|| (Data[0]==0xff)) && (FunCode == (Data[1] & 0x7f))) @@ -1158,7 +1158,7 @@ int CModbusRtuDataProcThread::RecvComData() } NextRtuIndex(m_ptrCFesChan); } - return kbdFailed; + return iotFailed; } else { @@ -1190,7 +1190,7 @@ int CModbusRtuDataProcThread::RecvComData() NextRtuIndex(m_ptrCFesChan); } } - return kbdSuccess; + return iotSuccess; } else { @@ -1206,7 +1206,7 @@ int CModbusRtuDataProcThread::RecvComData() m_ptrCFesRtu->SetErrNum(1); NextRtuIndex(m_ptrCFesChan); } - return kbdFailed; + return iotFailed; } } @@ -1214,7 +1214,7 @@ int CModbusRtuDataProcThread::RecvComData() * @brief CModbusRtuDataProcThread::RecvDataProcess * @param Data * @param DataSize -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtuDataProcThread::RecvDataProcess(byte *Data, int DataSize) { @@ -1224,11 +1224,11 @@ int CModbusRtuDataProcThread::RecvDataProcess(byte *Data, int DataSize) if (FunCode & 0x80) { CmdControlRespProcess(NULL, 0, 0); - return kbdSuccess; + return iotSuccess; } if (CmdControlRespProcess(Data, DataSize, 1) == true) - return kbdSuccess; + return iotSuccess; switch (FunCode) { @@ -1262,10 +1262,10 @@ int CModbusRtuDataProcThread::RecvDataProcess(byte *Data, int DataSize) Cmd10RespProcess(Data, DataSize); break; default: - return kbdFailed; + return iotFailed; break; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSer.cpp b/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSer.cpp index faf10954..92f7dbee 100644 --- a/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSer.cpp +++ b/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSer.cpp @@ -18,38 +18,38 @@ bool g_ModbusRtuSerChanelRun=true; int EX_SetBaseAddr(void *address) { ModbusRtuSer.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { ModbusRtuSer.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { ModbusRtuSer.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { ModbusRtuSer.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { ModbusRtuSer.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_ModbusRtuSerChanelRun =false;//使所有的线程退出。 ModbusRtuSer.InformComThreadExit(); - return kbdSuccess; + return iotSuccess; } CModbusRtuSer::CModbusRtuSer() { @@ -85,14 +85,14 @@ int CModbusRtuSer::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*)"modbus_rtu_s"); } - return kbdSuccess; + return iotSuccess; } int CModbusRtuSer::SetProperty(int IsMainFes) { g_ModbusRtuSerIsMainFes = IsMainFes; LOGDEBUG("CModbusRtuSer::SetProperty g_ModbusRtuSerIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -101,7 +101,7 @@ int CModbusRtuSer::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtuSer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -109,12 +109,12 @@ int CModbusRtuSer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -128,7 +128,7 @@ int CModbusRtuSer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCSerialPort == NULL) { LOGERROR("CModbusRtuSer EX_OpenChan() ChanNo:%d create CSerialPortThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } else { @@ -138,7 +138,7 @@ int CModbusRtuSer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -154,13 +154,13 @@ int CModbusRtuSer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CModbusRtuSer EX_OpenChan() ChanNo:%d create CModbusRtuSerDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -170,7 +170,7 @@ int CModbusRtuSer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtuSer::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -178,12 +178,12 @@ int CModbusRtuSer::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CModbusRtuSer::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -199,7 +199,7 @@ int CModbusRtuSer::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -212,7 +212,7 @@ int CModbusRtuSer::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -223,7 +223,7 @@ int CModbusRtuSer::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int CModbusRtuSer::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } /* @@ -294,7 +294,7 @@ void CModbusRtuSer::InformComThreadExit() /** * @brief CMdbTcpSer::ReadConfigParam * 读取MdbTcpSer配置文件 -* @return 成功返回kbdSuccess，失败返回kbdFailed +* @return 成功返回iotSuccess，失败返回iotFailed */ int CModbusRtuSer::ReadConfigParam() { @@ -309,20 +309,20 @@ int CModbusRtuSer::ReadConfigParam() memset(¶m, 0, sizeof(SMdbRtuSerAppConfigParam)); if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"modbus_rtu_s"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam ProtoclID error"); - return kbdFailed; + return iotFailed; } LOGINFO("modbus_rtu_s ProtoclID=%d", m_ProtocolId); - if (config.load("../../data/fes/", "modbusrtus.xml") == kbdFailed) + if (config.load("../../data/fes/", "modbusrtus.xml") == iotFailed) { LOGDEBUG("modbus_tcp_s load modbusrtus.xml error"); - return kbdSuccess; + return iotSuccess; } LOGDEBUG("modbus_tcp_s load modbusrtus.xml ok"); @@ -343,7 +343,7 @@ int CModbusRtuSer::ReadConfigParam() param.RtuNo = ptrRTU->m_Param.RtuNo; items = 0; - if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == iotSuccess) { param.controlTimeoutReset = ivalue * 1000; items++; @@ -351,7 +351,7 @@ int CModbusRtuSer::ReadConfigParam() else param.controlTimeoutReset = 10 * 1000; - if (config.getIntValue(strRtuNo, "di_start_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "di_start_address", ivalue) == iotSuccess) { param.diStartAddress = ivalue; items++; @@ -359,7 +359,7 @@ int CModbusRtuSer::ReadConfigParam() else param.diStartAddress = 0x0000; - if (config.getIntValue(strRtuNo, "ai_start_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ai_start_address", ivalue) == iotSuccess) { param.aiStartAddress = ivalue; items++; @@ -367,7 +367,7 @@ int CModbusRtuSer::ReadConfigParam() else param.aiStartAddress = 0x2000; - if (config.getIntValue(strRtuNo, "acc_start_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "acc_start_address", ivalue) == iotSuccess) { param.accStartAddress = ivalue; items++; @@ -375,7 +375,7 @@ int CModbusRtuSer::ReadConfigParam() else param.accStartAddress = 0x4000; - if (config.getIntValue(strRtuNo, "do_start_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "do_start_address", ivalue) == iotSuccess) { param.doStartAddress = ivalue; items++; @@ -383,7 +383,7 @@ int CModbusRtuSer::ReadConfigParam() else param.doStartAddress = 0x6000; - if (config.getIntValue(strRtuNo, "ao_start_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ao_start_address", ivalue) == iotSuccess) { param.aoStartAddress = ivalue; items++; @@ -391,7 +391,7 @@ int CModbusRtuSer::ReadConfigParam() else param.aoStartAddress = 0x7000; - if (config.getIntValue(strRtuNo, "soe_start_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "soe_start_address", ivalue) == iotSuccess) { param.soeStartAddress = ivalue; items++; @@ -399,7 +399,7 @@ int CModbusRtuSer::ReadConfigParam() else param.soeStartAddress = 0x9000; - if (config.getIntValue(strRtuNo, "ai_register_type", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ai_register_type", ivalue) == iotSuccess) { param.AiRegisterType = ivalue; items++; @@ -407,7 +407,7 @@ int CModbusRtuSer::ReadConfigParam() else param.AiRegisterType = 16; //模拟量上送类型：16字 32双字 48混合 - if (config.getIntValue(strRtuNo, "acc_register_type", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "acc_register_type", ivalue) == iotSuccess) { param.AccRegisterType = ivalue; items++; @@ -415,7 +415,7 @@ int CModbusRtuSer::ReadConfigParam() else param.AccRegisterType = 32; //累积量上送类型：16字 32双字 48混合 - if (config.getIntValue(strRtuNo, "resp_mode", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "resp_mode", ivalue) == iotSuccess) { param.respMode = ivalue; items++; @@ -423,7 +423,7 @@ int CModbusRtuSer::ReadConfigParam() else param.respMode = 0; - if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == iotSuccess) { param.maxUpdateCount = ivalue; items++; @@ -431,7 +431,7 @@ int CModbusRtuSer::ReadConfigParam() else param.maxUpdateCount = 18; //3MIN - if (config.getIntValue(strRtuNo, "start_delay", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "start_delay", ivalue) == iotSuccess) { param.startDelay = ivalue * 1000; items++; @@ -450,6 +450,6 @@ int CModbusRtuSer::ReadConfigParam() } } } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSerDataProcThread.cpp b/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSerDataProcThread.cpp index 8696c17b..ab95c687 100644 --- a/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSerDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSerDataProcThread.cpp @@ -115,7 +115,7 @@ CModbusRtuSerDataProcThread::~CModbusRtuSerDataProcThread() */ int CModbusRtuSerDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -258,7 +258,7 @@ int CModbusRtuSerDataProcThread::RecvComData() int recvLen, Len, i,crc,recvcrc; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; //int ChanNo = m_ptrCurrentChan->m_Param.ChanNo; Len = 0; @@ -309,7 +309,7 @@ int CModbusRtuSerDataProcThread::RecvComData() } NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } else//长度、地址、功能码 都正确则认为数据正确。 if ((m_AppData.address == Data[0]))//(Len == ExpectLen) && @@ -333,7 +333,7 @@ int CModbusRtuSerDataProcThread::RecvComData() m_ptrCFesRtu->SetOfflineFlag(CN_FesRtuComDown); } NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } else { @@ -351,7 +351,7 @@ int CModbusRtuSerDataProcThread::RecvComData() } NextRtuIndex(m_ptrCFesChan); - return kbdSuccess; + return iotSuccess; } } else @@ -360,7 +360,7 @@ int CModbusRtuSerDataProcThread::RecvComData() m_ptrCFesRtu->SetErrNum(1); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } } @@ -407,7 +407,7 @@ int CModbusRtuSerDataProcThread::CrcSum(byte *Data, int Count) int CModbusRtuSerDataProcThread::InitConfigParam() { if ((m_ptrCFesChan == NULL) || (m_ptrCFesRtu == NULL)) - return kbdFailed; + return iotFailed; memset(&m_AppData, 0, sizeof(SMdbRtuSerAppData)); m_AppData.address = m_ptrCFesRtu->m_Param.RtuAddr; @@ -427,7 +427,7 @@ int CModbusRtuSerDataProcThread::InitConfigParam() m_AppData.startDelay = 0; m_AppData.state = CN_MdbRtuSerAppState_init; - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_sepam/ModbusRtuSepam.cpp b/product/src/fes/protocol/modbus_sepam/ModbusRtuSepam.cpp index 72456008..b60b6445 100644 --- a/product/src/fes/protocol/modbus_sepam/ModbusRtuSepam.cpp +++ b/product/src/fes/protocol/modbus_sepam/ModbusRtuSepam.cpp @@ -29,38 +29,38 @@ char g_ModbusRtuSepamPathWaveForm[CN_FesMaxWaveFileNameSize]; int EX_SetBaseAddr(void *address) { ModbusRtuSepam.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { ModbusRtuSepam.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { ModbusRtuSepam.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { ModbusRtuSepam.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { ModbusRtuSepam.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_ModbusRtuSepamChanelRun =false;//使所有的线程退出。 ModbusRtuSepam.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CModbusRtuSepam::CModbusRtuSepam() { @@ -92,14 +92,14 @@ int CModbusRtuSepam::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*)"modbus_sepam"); } - return kbdSuccess; + return iotSuccess; } int CModbusRtuSepam::SetProperty(int IsMainFes) { g_ModbusRtuSepamIsMainFes = IsMainFes; LOGDEBUG("CModbusRtuSepam::SetProperty g_ModbusRtuSepamIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -108,7 +108,7 @@ int CModbusRtuSepam::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtuSepam::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -116,12 +116,12 @@ int CModbusRtuSepam::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -135,7 +135,7 @@ int CModbusRtuSepam::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCSerialPort == NULL) { LOGERROR("CModbusRtuSepam EX_OpenChan() ChanNo:%d create CSerialPortThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } else { @@ -145,7 +145,7 @@ int CModbusRtuSepam::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -159,14 +159,14 @@ int CModbusRtuSepam::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CModbusRtuSepam EX_OpenChan() ChanNo:%d create CModbusRtuSepamDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -176,7 +176,7 @@ int CModbusRtuSepam::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtuSepam::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -184,12 +184,12 @@ int CModbusRtuSepam::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CModbusRtuSepam::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -205,7 +205,7 @@ int CModbusRtuSepam::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -218,7 +218,7 @@ int CModbusRtuSepam::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -229,7 +229,7 @@ int CModbusRtuSepam::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int CModbusRtuSepam::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } /* @@ -305,7 +305,7 @@ void CModbusRtuSepam::InformTcpThreadExit() /** * @brief CModbusRtuSepam::CreateWFPath * 创建录波文件路径 -* @return 成功返回kbdSuccess，失败返回kbdFailed +* @return 成功返回iotSuccess，失败返回iotFailed */ int CModbusRtuSepam::CreateWFPath() { @@ -383,7 +383,7 @@ int CModbusRtuSepam::CreateWFPath() } } #endif - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_sepam/ModbusRtuSepamDataProcThread.cpp b/product/src/fes/protocol/modbus_sepam/ModbusRtuSepamDataProcThread.cpp index e35dc9d4..df18deff 100644 --- a/product/src/fes/protocol/modbus_sepam/ModbusRtuSepamDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_sepam/ModbusRtuSepamDataProcThread.cpp @@ -174,7 +174,7 @@ CModbusRtuSepamDataProcThread::CModbusRtuSepamDataProcThread(CFesBase *ptrCFesB /** * @brief CModbusRtuSepam::ReadConfigParam * 读取CModbusRtuSepam配置文件,如果不配置，则取系统定义的全局参数 -* @return 成功返回kbdSuccess，失败返回kbdFailed +* @return 成功返回iotSuccess，失败返回iotFailed */ int CModbusRtuSepamDataProcThread::ReadConfigParam() { @@ -186,9 +186,9 @@ int CModbusRtuSepamDataProcThread::ReadConfigParam() //使用全局参数，不需要读取配置文件 #if 0 - if (config.load("../../data/fes/", "modbus_sepam.xml") == kbdFailed) + if (config.load("../../data/fes/", "modbus_sepam.xml") == iotFailed) { - return kbdSuccess; + return iotSuccess; } LOGDEBUG("modbus_sepam load modbus_sepam.xml ok"); @@ -196,15 +196,15 @@ int CModbusRtuSepamDataProcThread::ReadConfigParam() sprintf(moduleName, "ChanNo%d", m_ptrCurrentChan->m_Param.ChanNo); //对时间隔 - if (config.getIntValue(moduleName, "settime_interval", ivalue) == kbdSuccess) + if (config.getIntValue(moduleName, "settime_interval", ivalue) == iotSuccess) m_AppData.setTimeTimeoutReset = ivalue * 1000; //录波间隔 - if (config.getIntValue(moduleName, "wave_interval", ivalue) == kbdSuccess) + if (config.getIntValue(moduleName, "wave_interval", ivalue) == iotSuccess) m_AppData.RecWaveTimeoutReset = ivalue * 1000; #endif - return kbdSuccess; + return iotSuccess; } @@ -339,7 +339,7 @@ CModbusRtuSepamDataProcThread::~CModbusRtuSepamDataProcThread() */ int CModbusRtuSepamDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -512,7 +512,7 @@ void CModbusRtuSepamDataProcThread::OtherProcess() return; } - if (GetNewSepamWave(RtuIndex) == kbdFailed) //判断是否传输录波数据 + if (GetNewSepamWave(RtuIndex) == iotFailed) //判断是否传输录波数据 { m_AppData.RtuStr[RtuIndex].WaveStr.RecRtuWaveFlag = false; m_AppData.RtuStr[RtuIndex].WaveStr.SendWaveDataFlag = false; @@ -541,7 +541,7 @@ int CModbusRtuSepamDataProcThread::NewSepamEvent() data[writex++] = (crcCount >> 8) & 0x00ff; SendDataToPort(data, writex); - if (RecvComData(m_ptrCFesRtu, 3, 7, data) == kbdSuccess) + if (RecvComData(m_ptrCFesRtu, 3, 7, data) == iotSuccess) { if (data[4] == 0) return 0; @@ -572,7 +572,7 @@ void CModbusRtuSepamDataProcThread::ReadSepamEvent() SendDataToPort(data, writex); - if (RecvComData(m_ptrCFesRtu, 3, 71, data) == kbdSuccess) + if (RecvComData(m_ptrCFesRtu, 3, 71, data) == iotSuccess) ProSepamEvent(data,3); } @@ -661,7 +661,7 @@ void CModbusRtuSepamDataProcThread::ProSepamEvent(uint8 *Data,int FunCode) bData[writex++] = (crcCount >> 8) & 0x00ff; SendDataToPort(bData, writex); - if (RecvComData(m_ptrCFesRtu, 3, 13, bData) == kbdSuccess) + if (RecvComData(m_ptrCFesRtu, 3, 13, bData) == iotSuccess) { faultNum = 3; @@ -830,8 +830,8 @@ int CModbusRtuSepamDataProcThread::GetNewSepamWave(int RtuIndex) Len = 82; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 169, Data) == kbdFailed) - return kbdFailed; + if (RecvComData(m_ptrCFesRtu, FunCode, 169, Data) == iotFailed) + return iotFailed; } CurentRecCount = Data[13]; CurentRecCount <<= 8; @@ -842,8 +842,8 @@ int CModbusRtuSepamDataProcThread::GetNewSepamWave(int RtuIndex) Len = 82; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 169, Data) == kbdFailed) - return kbdFailed; + if (RecvComData(m_ptrCFesRtu, FunCode, 169, Data) == iotFailed) + return iotFailed; } CurentRecCount = Data[9]; CurentRecCount <<= 8; @@ -855,8 +855,8 @@ int CModbusRtuSepamDataProcThread::GetNewSepamWave(int RtuIndex) Len = 32; if (SendDataToPort(m_ptrCFesRtu, FunCode, StartAddr, Len, Data, 1)) { - if (RecvComData(m_ptrCFesRtu, FunCode, 69, Data) == kbdFailed) - return kbdFailed; + if (RecvComData(m_ptrCFesRtu, FunCode, 69, Data) == iotFailed) + return iotFailed; } CurentRecCount = Data[11]; CurentRecCount <<= 8; @@ -874,7 +874,7 @@ int CModbusRtuSepamDataProcThread::GetNewSepamWave(int RtuIndex) m_AppData.RtuStr[RtuIndex].WaveStr.RecRtuWaveFlag = false; if(CurentRecCount >= MAX_REC) LOGDEBUG("RtuNo:%d RtuName:%s 当前录波个数：%d 超过最大的%d个 读取录波结束\n", m_ptrCFesRtu->m_Param.RtuNo, m_ptrCFesRtu->m_Param.RtuName, CurentRecCount, MAX_REC); - return kbdFailed; + return iotFailed; } switch (m_ptrCFesRtu->m_Param.iDevType) @@ -1060,11 +1060,11 @@ int CModbusRtuSepamDataProcThread::GetNewSepamWave(int RtuIndex) m_AppData.RtuStr[RtuIndex].WaveStr.WaveCount = CurentRecCount; memcpy(&m_AppData.RtuStr[RtuIndex].WaveStr.WaveTime, &NewRecTime, m_AppData.RtuStr[RtuIndex].WaveStr.WaveCount * sizeof(WAVE_TIME)); if(m_AppData.RtuStr[RtuIndex].WaveStr.NewWaveCount==0) - return kbdFailed; + return iotFailed; else - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } /**============================================================== * @brief CModbusRtuSepamDataProcThread::ProSepamWave_StartWave @@ -1109,7 +1109,7 @@ int CModbusRtuSepamDataProcThread::ProSepamWave_StartWave(int RtuIndex) SleepmSec(500); - if (RecvComData(m_ptrCFesRtu, 0x10, 8, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, 0x10, 8, Data) == iotFailed) { SleepmSec(500); @@ -1136,7 +1136,7 @@ int CModbusRtuSepamDataProcThread::ProSepamWave_StartWave(int RtuIndex) SendDataToPort(Data, writex); - if (RecvComData(m_ptrCFesRtu, 0x10, 8, Data) == kbdFailed) + if (RecvComData(m_ptrCFesRtu, 0x10, 8, Data) == iotFailed) { m_AppData.RtuStr[RtuIndex].WaveStr.NewHead++; if (m_AppData.RtuStr[RtuIndex].WaveStr.NewHead >= m_AppData.RtuStr[RtuIndex].WaveStr.NewWaveCount) @@ -1145,12 +1145,12 @@ int CModbusRtuSepamDataProcThread::ProSepamWave_StartWave(int RtuIndex) m_AppData.RtuStr[RtuIndex].WaveStr.NewWaveCount = 0; m_AppData.RtuStr[RtuIndex].WaveStr.RecRtuWaveFlag = false; } - return kbdFailed; + return iotFailed; } } LOGDEBUG("启动录波 %d年%d月%d日%d时%d分%d秒\n", WaveTime.Year, WaveTime.Month, WaveTime.Day, WaveTime.Hour,WaveTime.Minute,WaveTime.Millisecond); m_AppData.RtuStr[RtuIndex].WaveStr.SendWaveDataFlag = true; - return kbdSuccess; + return iotSuccess; } @@ -1187,7 +1187,7 @@ int CModbusRtuSepamDataProcThread::ProSepamWave_ReadFile(int RtuIndex) SleepmSec(500); //Sepam规定：为确保数据传送，必需要求响应时间越为500ms //如果接收不正确，后续的录波都取不到 - if (RecvComData(m_ptrCFesRtu, 0x03, WAVE_READ_COUNT * 2 + 5, Data) == kbdFailed) //接收数据长度不对，录波结束 + if (RecvComData(m_ptrCFesRtu, 0x03, WAVE_READ_COUNT * 2 + 5, Data) == iotFailed) //接收数据长度不对，录波结束 { //LOGDEBUG("接收数据长度不对，录波结束\n"); m_AppData.RtuStr[RtuIndex].WaveStr.ReReadCount++; @@ -1206,7 +1206,7 @@ int CModbusRtuSepamDataProcThread::ProSepamWave_ReadFile(int RtuIndex) m_AppData.RtuStr[RtuIndex].WaveStr.BagNo = 0; m_AppData.RtuStr[RtuIndex].WaveStr.SendWaveDataFlag = false; m_AppData.RtuStr[RtuIndex].WaveStr.SwitchByte = 0; - return kbdFailed; + return iotFailed; } SwitchByte = Data[3]; @@ -1229,7 +1229,7 @@ int CModbusRtuSepamDataProcThread::ProSepamWave_ReadFile(int RtuIndex) m_AppData.RtuStr[RtuIndex].WaveStr.BagNo = 0; m_AppData.RtuStr[RtuIndex].WaveStr.SendWaveDataFlag = false; m_AppData.RtuStr[RtuIndex].WaveStr.SwitchByte = 0; - return kbdFailed; + return iotFailed; } else m_AppData.RtuStr[RtuIndex].WaveStr.SwitchByte = (m_AppData.RtuStr[RtuIndex].WaveStr.SwitchByte + 1) % 256; @@ -1254,7 +1254,7 @@ int CModbusRtuSepamDataProcThread::ProSepamWave_ReadFile(int RtuIndex) m_AppData.RtuStr[RtuIndex].WaveStr.BagNo = 0; m_AppData.RtuStr[RtuIndex].WaveStr.SendWaveDataFlag = false; m_AppData.RtuStr[RtuIndex].WaveStr.SwitchByte = 0; - return kbdFailed; + return iotFailed; } if (CharCount == 248) @@ -1285,7 +1285,7 @@ int CModbusRtuSepamDataProcThread::ProSepamWave_ReadFile(int RtuIndex) SleepmSec(500); - if (RecvComData(m_ptrCFesRtu, 0x10, 8, Data) == kbdSuccess) + if (RecvComData(m_ptrCFesRtu, 0x10, 8, Data) == iotSuccess) { //LOGDEBUG("确认录波数据成功 %d\n", SwitchByte); m_AppData.RtuStr[RtuIndex].WaveStr.FileSize += CharCount; @@ -1307,7 +1307,7 @@ int CModbusRtuSepamDataProcThread::ProSepamWave_ReadFile(int RtuIndex) } } m_AppData.RtuStr[RtuIndex].WaveStr.ReReadCount = 0; - return kbdSuccess; + return iotSuccess; } /**============================================================== @@ -1527,7 +1527,7 @@ int CModbusRtuSepamDataProcThread::SendProcess() int retLen = 0; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; //luojunjun 等待打开串口 if (m_ptrCurrentChan->m_LinkStatus == CN_FesChanConnect) @@ -2068,7 +2068,7 @@ int CModbusRtuSepamDataProcThread::GetSendDefCmd(SFesRxDefCmd rxDefCmd,uint8 *Da Len_Req = Cmd->StartAddr; SendDataToPort(m_ptrCInsertFesRtu, FunCode, StartAddr_Req, Len_Req, Data,1); - if (RecvComData(m_ptrCInsertFesRtu, FunCode, 8, Data) == kbdFailed) + if (RecvComData(m_ptrCInsertFesRtu, FunCode, 8, Data) == iotFailed) return 0; FunCode = 0x03; @@ -2127,14 +2127,14 @@ int CModbusRtuSepamDataProcThread::GetSendDefCmd(SFesRxDefCmd rxDefCmd,uint8 *Da Len_Req = Cmd->StartAddr; SendDataToPort(m_ptrCInsertFesRtu, FunCode, StartAddr_Req, Len_Req, Data, 1); SleepmSec(500); - if (RecvComData(m_ptrCInsertFesRtu, FunCode, 8, Data) == kbdFailed) + if (RecvComData(m_ptrCInsertFesRtu, FunCode, 8, Data) == iotFailed) return 0; FunCode = 0x03; Len_Val = 0x7d; SendDataToPort(m_ptrCInsertFesRtu, FunCode, StartAddr_Val, Len_Val, Data, 1); SleepmSec(500); - if (RecvComData(m_ptrCInsertFesRtu, FunCode, Len_Val * 2 + 5, Data) == kbdFailed) + if (RecvComData(m_ptrCInsertFesRtu, FunCode, Len_Val * 2 + 5, Data) == iotFailed) return 0; //修改定值 @@ -2154,7 +2154,7 @@ int CModbusRtuSepamDataProcThread::GetSendDefCmd(SFesRxDefCmd rxDefCmd,uint8 *Da //发送修改定值报文 SendModifyDzDataToPort(m_ptrCInsertFesRtu, 0x10, Cmd->StartAddr, Cmd->DataLen, Data, 1); SleepmSec(500); - if (RecvComData(m_ptrCInsertFesRtu, 0x10, 8, Data) == kbdFailed) + if (RecvComData(m_ptrCInsertFesRtu, 0x10, 8, Data) == iotFailed) return 0; //发送修改定值确认报文 @@ -2189,7 +2189,7 @@ int CModbusRtuSepamDataProcThread::PollingCmdProcess() return 0; } - if (GetPollingCmd(&cmd) == kbdFailed) + if (GetPollingCmd(&cmd) == iotFailed) { return 0; } @@ -2217,7 +2217,7 @@ int CModbusRtuSepamDataProcThread::PollingCmdProcess() * @brief CModbusRtuSepamDataProcThread::GetPollingCmd * 获取读取数据命令 * @param pCmd 返回读取数据命令 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtuSepamDataProcThread::GetPollingCmd(SModbusCmd *pCmd) { @@ -2226,7 +2226,7 @@ int CModbusRtuSepamDataProcThread::GetPollingCmd(SModbusCmd *pCmd) int count = 0; if(m_ptrCFesRtu==NULL) - return kbdFailed; + return iotFailed; //2020-05-14 thxiao 如果没有配置块，则轮训下一个设备。 if (m_ptrCFesRtu->m_Param.ModbusCmdBuf.num == 0) @@ -2246,10 +2246,10 @@ int CModbusRtuSepamDataProcThread::GetPollingCmd(SModbusCmd *pCmd) m_ptrCFesRtu->m_Param.ModbusCmdBuf.readx = 0; count++; if (ComFlag) - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } /* @@ -2263,7 +2263,7 @@ int CModbusRtuSepamDataProcThread::RecvComData() int recvLen, Len, i,crc, recvcrc; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; DevAddr = m_AppData.lastCmdData[0]; FunCode = m_AppData.lastCmdData[1]; @@ -2349,7 +2349,7 @@ int CModbusRtuSepamDataProcThread::RecvComData() NextRtuIndex(m_ptrCFesChan); } - return kbdFailed; + return iotFailed; } else//长度、地址、功能码 都正确则认为数据正确。 if ((Len == ExpectLen) && (DevAddr == Data[0]) && (FunCode == (Data[1] & 0x7f))) @@ -2395,7 +2395,7 @@ int CModbusRtuSepamDataProcThread::RecvComData() } NextRtuIndex(m_ptrCFesChan); } - return kbdFailed; + return iotFailed; } else { @@ -2424,7 +2424,7 @@ int CModbusRtuSepamDataProcThread::RecvComData() } NextRtuIndex(m_ptrCFesChan); } - return kbdSuccess; + return iotSuccess; } } else @@ -2441,7 +2441,7 @@ int CModbusRtuSepamDataProcThread::RecvComData() m_ptrCFesRtu->SetErrNum(1); NextRtuIndex(m_ptrCFesChan); } - return kbdFailed; + return iotFailed; } } @@ -2455,7 +2455,7 @@ int CModbusRtuSepamDataProcThread::RecvComData(CFesRtuPtr CFesRtu,int FunCode,in int recvLen, Len, i, Addr; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; //int ChanNo = m_ptrCurrentChan->m_Param.ChanNo; Len = 0; @@ -2497,7 +2497,7 @@ int CModbusRtuSepamDataProcThread::RecvComData(CFesRtuPtr CFesRtu,int FunCode,in } CFesRtu->SetOfflineFlag(CN_FesRtuComDown); } - return kbdFailed; + return iotFailed; } else//长度、地址、功能码 都正确则认为数据正确。 if ((Len == ExpectLen) && (Addr == Data[0]) && (FunCode == (Data[1] & 0x7f))) @@ -2511,13 +2511,13 @@ int CModbusRtuSepamDataProcThread::RecvComData(CFesRtuPtr CFesRtu,int FunCode,in CFesRtu->WriteRtuPointsComStatus(CN_FesRtuNormal); m_ptrCFesBase->WriteRtuSatus(CFesRtu,CN_FesRtuNormal); } - return kbdSuccess; + return iotSuccess; } else { m_ptrCurrentChan->SetErrNum(1); CFesRtu->SetErrNum(1); - return kbdFailed; + return iotFailed; } } @@ -2525,7 +2525,7 @@ int CModbusRtuSepamDataProcThread::RecvComData(CFesRtuPtr CFesRtu,int FunCode,in * @brief CModbusRtuSepamDataProcThread::RecvDataProcess * @param Data * @param DataSize -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CModbusRtuSepamDataProcThread::RecvDataProcess(uint8 *Data, int DataSize) { @@ -2535,7 +2535,7 @@ int CModbusRtuSepamDataProcThread::RecvDataProcess(uint8 *Data, int DataSize) if (FunCode & 0x80) { CmdControlRespProcess(NULL, 0, 0); - return kbdSuccess; + return iotSuccess; } switch (FunCode) @@ -2558,10 +2558,10 @@ int CModbusRtuSepamDataProcThread::RecvDataProcess(uint8 *Data, int DataSize) Cmd10RespProcess(Data, DataSize); break; default: - return kbdFailed; + return iotFailed; break; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_tcp/ModbusDataProcThread.cpp b/product/src/fes/protocol/modbus_tcp/ModbusDataProcThread.cpp index 7d34b4ce..bd99798f 100644 --- a/product/src/fes/protocol/modbus_tcp/ModbusDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcp/ModbusDataProcThread.cpp @@ -94,7 +94,7 @@ CModbusDataProcThread::~CModbusDataProcThread() */ int CModbusDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -161,7 +161,7 @@ int CModbusDataProcThread::SendProcess() int retLen = 0; if(m_ptrCurrentChan==NULL) - return kbdFailed; + return iotFailed; //有多个RTU时，才需要获取当前最新的RTU结构，否则m_ptrCFesRtu在构造函数初始化。 if(m_ptrCFesChan->m_RtuNum >1) @@ -191,7 +191,7 @@ int CModbusDataProcThread::SendProcess() /** * @brief CModbusDataProcThread::RecvNetData * MODBUS TCP 接收处理 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusDataProcThread::RecvNetData() { @@ -201,7 +201,7 @@ int CModbusDataProcThread::RecvNetData() int recvLen,Len,i; if(m_ptrCurrentChan==NULL) - return kbdFailed; + return iotFailed; DevAddr = m_AppData.lastCmdData[6]; FunCode = m_AppData.lastCmdData[7]; @@ -279,7 +279,7 @@ int CModbusDataProcThread::RecvNetData() } CmdControlRespProcess(NULL,0,0); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } //长度、地址、功能码 都正确则认为数据正确。 if((Len == ExpectLen)&&(DevAddr == Data[6])&&(FunCode==(Data[7]&0x7f))) @@ -324,7 +324,7 @@ int CModbusDataProcThread::RecvNetData() //next RTU NextRtuIndex(m_ptrCFesChan); } - return kbdSuccess; + return iotSuccess; } else { @@ -332,7 +332,7 @@ int CModbusDataProcThread::RecvNetData() //next RTU CmdControlRespProcess(NULL,0,0); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } } @@ -404,7 +404,7 @@ int CModbusDataProcThread::PollingCmdProcess() int writex; int len=0; - if(GetPollingCmd(&cmd)==kbdFailed) + if(GetPollingCmd(&cmd)==iotFailed) { //LOGERROR("CModbusDataProcThread::PollingCmdProcess() return 0"); return 0; @@ -1084,7 +1084,7 @@ int CModbusDataProcThread::DefCmdProcess(byte *Data, int dataSize) * @brief CModbusDataProcThread::GetPollingCmd * 获取读取数据命令 * @param pCmd 返回读取数据命令 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusDataProcThread::GetPollingCmd(SModbusCmd *pCmd) { @@ -1094,11 +1094,11 @@ int CModbusDataProcThread::GetPollingCmd(SModbusCmd *pCmd) if(m_ptrCFesRtu==NULL) { - return kbdFailed; + return iotFailed; } if(m_ptrCFesRtu->m_Param.ModbusCmdBuf.pCmd==NULL) { - return kbdFailed; + return iotFailed; } //2020-05-14 thxiao 如果没有配置块，则轮训下一个设备。 if (m_ptrCFesRtu->m_Param.ModbusCmdBuf.num == 0) @@ -1119,17 +1119,17 @@ int CModbusDataProcThread::GetPollingCmd(SModbusCmd *pCmd) m_ptrCFesRtu->m_Param.ModbusCmdBuf.readx = 0; count++; if (ComFlag) - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } /** * @brief CModbusDataProcThread::RecvDataProcess * @param Data * @param DataSize - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusDataProcThread::RecvDataProcess(byte *Data,int DataSize) { @@ -1139,7 +1139,7 @@ int CModbusDataProcThread::RecvDataProcess(byte *Data,int DataSize) if(FunCode&0x80) { CmdControlRespProcess(NULL,0,0); - return kbdSuccess; + return iotSuccess; } switch(FunCode) @@ -1174,10 +1174,10 @@ int CModbusDataProcThread::RecvDataProcess(byte *Data,int DataSize) Cmd10RespProcess(Data,DataSize); break; default: - return kbdFailed; + return iotFailed; break; } - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/fes/protocol/modbus_tcp/ModbusTcp.cpp b/product/src/fes/protocol/modbus_tcp/ModbusTcp.cpp index 707b833c..ce971015 100644 --- a/product/src/fes/protocol/modbus_tcp/ModbusTcp.cpp +++ b/product/src/fes/protocol/modbus_tcp/ModbusTcp.cpp @@ -22,38 +22,38 @@ bool g_ModbusChanelRun=true; int EX_SetBaseAddr(void *address) { ModbusTcp.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { ModbusTcp.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { ModbusTcp.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { ModbusTcp.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { ModbusTcp.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_ModbusChanelRun=false;//使所有的线程退出。 ModbusTcp.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CModbusTcp::CModbusTcp() @@ -87,13 +87,13 @@ int CModbusTcp::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*)"modbus_tcp"); } - return kbdSuccess; + return iotSuccess; } int CModbusTcp::SetProperty(int IsMainFes) { g_ModbusIsMainFes = IsMainFes; - return kbdSuccess; + return iotSuccess; } /** @@ -102,7 +102,7 @@ int CModbusTcp::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -111,12 +111,12 @@ int CModbusTcp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CTcpClientThreadPtr ptrCTcpClient=NULL; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -130,7 +130,7 @@ int CModbusTcp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpClient == NULL) { LOGERROR("CModbusTcp EX_OpenChan() ChanNo:%d create CTcpClientThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } ptrCTcpClient->SetThreadRunMode(1);//2021-02-22 thxiao 使用人工干预读取数据。 DataProcSetTcpThreadByChanNo(ptrMainFesChan->m_Param.ChanNo,ptrCTcpClient); @@ -139,7 +139,7 @@ int CModbusTcp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -153,14 +153,14 @@ int CModbusTcp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CModbusTcp EX_OpenChan() ChanNo:%d create CModbusDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } ptrCDataProc->SetClientThread(ptrCTcpClient); m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -170,7 +170,7 @@ int CModbusTcp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -178,12 +178,12 @@ int CModbusTcp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; //2021-02-23 thxiao CModbusDataProcThread使用了CTcpClientThread,所以先析构CModbusDataProcThread再析构CTcpClientThread. if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -204,7 +204,7 @@ int CModbusTcp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -216,7 +216,7 @@ int CModbusTcp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) int CModbusTcp::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3.cpp b/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3.cpp index 7c901c51..bbe1798f 100644 --- a/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3.cpp +++ b/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3.cpp @@ -22,37 +22,37 @@ bool g_ModbusTcpV3ChanelRun=true; int EX_SetBaseAddr(void *address) { ModbusTcpV3.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { ModbusTcpV3.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { ModbusTcpV3.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { ModbusTcpV3.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { ModbusTcpV3.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_ModbusTcpV3ChanelRun=false;//使所有的线程退出。 - return kbdSuccess; + return iotSuccess; } CModbusTcpV3::CModbusTcpV3() @@ -77,13 +77,13 @@ int CModbusTcpV3::SetBaseAddr(void *address) { m_ptrCFesBase = (CFesBase *)address; } - return kbdSuccess; + return iotSuccess; } int CModbusTcpV3::SetProperty(int IsMainFes) { g_ModbusTcpV3IsMainFes = IsMainFes; - return kbdSuccess; + return iotSuccess; } /** @@ -92,7 +92,7 @@ int CModbusTcpV3::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpV3::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -100,12 +100,12 @@ int CModbusTcpV3::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if (m_initRtuFlag == 0) { @@ -130,13 +130,13 @@ int CModbusTcpV3::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CModbusTcpV3 EX_OpenChan() ChanNo:%d create CModbusDataProcThreadPtr error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -146,7 +146,7 @@ int CModbusTcpV3::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpV3::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -154,12 +154,12 @@ int CModbusTcpV3::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if ((CloseFlag == CN_FesChanThread_Flag) || (CloseFlag == CN_FesChanAndDataThread_Flag)) { @@ -176,7 +176,7 @@ int CModbusTcpV3::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) ClearDataProcThreadByChanNo(MainChanNo); } } - return kbdSuccess; + return iotSuccess; } /** @@ -188,7 +188,7 @@ int CModbusTcpV3::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) int CModbusTcpV3::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } @@ -345,19 +345,19 @@ bool CModbusTcpV3::InitPointMapping(CFesRtuPtr RtuPtr) if (ret == false) { LOGERROR("RdbAiTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbAiTable.selectOneColumnOneOrder(con, VecAiParam, vecAiColumn, vecAiOrder);//默认顺序 ljj if (ret == false) { LOGERROR("RdbAiTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } ret = RdbAiTable.close(); if (ret == false) { LOGERROR("RdbAiTable::close error"); - return kbdFailed; + return iotFailed; } count = VecAiParam.size(); if (count > 0) @@ -422,19 +422,19 @@ bool CModbusTcpV3::InitPointMapping(CFesRtuPtr RtuPtr) if (ret == false) { LOGERROR("RdbDiTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbDiTable.selectOneColumnOneOrder(con, VecDiParam, vecDiColumn, vecDiOrder);//默认顺序 if (ret == false) { LOGERROR("RdbDiTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } ret = RdbDiTable.close(); if (ret == false) { LOGERROR("RdbDiTable::close error"); - return kbdFailed; + return iotFailed; } count = VecDiParam.size(); if (count > 0) @@ -495,19 +495,19 @@ bool CModbusTcpV3::InitPointMapping(CFesRtuPtr RtuPtr) if (ret == false) { LOGERROR("RdbAccTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbAccTable.selectOneColumnOneOrder(con, VecAccParam, vecAccColumn, vecAccOrder);//默认顺序 if (ret == false) { LOGERROR("RdbAccTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } ret = RdbAccTable.close(); if (ret == false) { LOGERROR("RdbAccTable::close error"); - return kbdFailed; + return iotFailed; } count = VecAccParam.size(); @@ -570,19 +570,19 @@ bool CModbusTcpV3::InitPointMapping(CFesRtuPtr RtuPtr) if (ret == false) { LOGERROR("RdbMiTable::Open error"); - return kbdFailed; + return iotFailed; } ret = RdbMiTable.selectOneColumnOneOrder(con, VecMiParam, vecMiColumn, vecMiOrder);//默认顺序 if (ret == false) { LOGERROR("RdbMiTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } ret = RdbMiTable.close(); if (ret == false) { LOGERROR("RdbMiTable::close error"); - return kbdFailed; + return iotFailed; } count = VecMiParam.size(); if (count > 0) @@ -624,5 +624,5 @@ bool CModbusTcpV3::InitPointMapping(CFesRtuPtr RtuPtr) } } } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3DataProcThread.cpp b/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3DataProcThread.cpp index e4c8b024..b6e581bc 100644 --- a/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3DataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3DataProcThread.cpp @@ -117,7 +117,7 @@ CModbusTcpV3DataProcThread::~CModbusTcpV3DataProcThread() */ int CModbusTcpV3DataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -177,7 +177,7 @@ int CModbusTcpV3DataProcThread::SendProcess() int retLen = 0; if(m_ptrCurrentChan==NULL) - return kbdFailed; + return iotFailed; //有多个RTU时，才需要获取当前最新的RTU结构，否则m_ptrCFesRtu在构造函数初始化。 if(m_ptrCFesChan->m_RtuNum >1) @@ -207,7 +207,7 @@ int CModbusTcpV3DataProcThread::SendProcess() /** * @brief CModbusTcpV3DataProcThread::RecvNetData * ModbusTcpV3 TCP 接收处理 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpV3DataProcThread::RecvNetData() { @@ -217,7 +217,7 @@ int CModbusTcpV3DataProcThread::RecvNetData() int recvLen,Len,i,recvFailed; if(m_ptrCurrentChan==NULL) - return kbdFailed; + return iotFailed; DevAddr = m_AppData.lastCmdData[6]; FunCode = m_AppData.lastCmdData[7]; @@ -312,7 +312,7 @@ int CModbusTcpV3DataProcThread::RecvNetData() } NextRtuIndex(m_ptrCFesChan); } - return kbdFailed; + return iotFailed; } //长度、地址、功能码 都正确则认为数据正确。 if ((Len == ExpectLen) && (DevAddr == Data[6]) && (FunCode == (Data[7] & 0x7f))) @@ -371,7 +371,7 @@ int CModbusTcpV3DataProcThread::RecvNetData() CmdControlRespProcess(NULL, 0, 0); } m_ptrCInsertFesRtu = NULL; - return kbdFailed; + return iotFailed; } else //PollCmd { @@ -417,7 +417,7 @@ int CModbusTcpV3DataProcThread::RecvNetData() //next RTU NextRtuIndex(m_ptrCFesChan); } - return kbdSuccess; + return iotSuccess; } else { @@ -434,7 +434,7 @@ int CModbusTcpV3DataProcThread::RecvNetData() //next RTU CmdControlRespProcess(NULL, 0, 0); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } } @@ -512,7 +512,7 @@ int CModbusTcpV3DataProcThread::PollingCmdProcess() int writex; int len=0; - if(GetPollingCmd(&cmd)==kbdFailed) + if(GetPollingCmd(&cmd)==iotFailed) { //LOGERROR("CModbusTcpV3DataProcThread::PollingCmdProcess() return 0"); return 0; @@ -1235,7 +1235,7 @@ int CModbusTcpV3DataProcThread::DefCmdProcess(CFesRtuPtr RtuPtr, byte *Data, int * @brief CModbusTcpV3DataProcThread::GetPollingCmd * 获取读取数据命令 * @param pCmd 返回读取数据命令 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpV3DataProcThread::GetPollingCmd(SModbusCmd *pCmd) { @@ -1245,11 +1245,11 @@ int CModbusTcpV3DataProcThread::GetPollingCmd(SModbusCmd *pCmd) if(m_ptrCFesRtu==NULL) { - return kbdFailed; + return iotFailed; } if(m_ptrCFesRtu->m_Param.ModbusCmdBuf.pCmd==NULL) { - return kbdFailed; + return iotFailed; } //2020-05-14 thxiao 如果没有配置块，则轮训下一个设备。 if (m_ptrCFesRtu->m_Param.ModbusCmdBuf.num == 0) @@ -1270,17 +1270,17 @@ int CModbusTcpV3DataProcThread::GetPollingCmd(SModbusCmd *pCmd) m_ptrCFesRtu->m_Param.ModbusCmdBuf.readx = 0; count++; if (ComFlag) - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } /** * @brief CModbusTcpV3DataProcThread::RecvDataProcess * @param Data * @param DataSize - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpV3DataProcThread::RecvDataProcess(byte *Data,int DataSize) { @@ -1290,11 +1290,11 @@ int CModbusTcpV3DataProcThread::RecvDataProcess(byte *Data,int DataSize) if(FunCode&0x80) { CmdControlRespProcess(NULL,0,0); - return kbdSuccess; + return iotSuccess; } if (CmdControlRespProcess(Data, DataSize, 1) == true) - return kbdSuccess; + return iotSuccess; switch(FunCode) { @@ -1317,10 +1317,10 @@ int CModbusTcpV3DataProcThread::RecvDataProcess(byte *Data,int DataSize) Cmd10RespProcess(Data,DataSize); break; default: - return kbdFailed; + return iotFailed; break; } - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200.cpp b/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200.cpp index 3d0e1ccb..befd4fef 100644 --- a/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200.cpp +++ b/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200.cpp @@ -16,38 +16,38 @@ bool g_ModbusChanelRun = true; int EX_SetBaseAddr(void *address) { ModbusTcpEpm9200.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { ModbusTcpEpm9200.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo, int ChanNo, int OpenFlag) { ModbusTcpEpm9200.OpenChan(MainChanNo, ChanNo, OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo, int ChanNo, int CloseFlag) { ModbusTcpEpm9200.CloseChan(MainChanNo, ChanNo, CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { ModbusTcpEpm9200.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_ModbusChanelRun = false;//使所有的线程退出。 ModbusTcpEpm9200.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CModbusTcpEpm9200::CModbusTcpEpm9200() @@ -81,13 +81,13 @@ int CModbusTcpEpm9200::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*)"modbus_tcp_epm9200"); } - return kbdSuccess; + return iotSuccess; } int CModbusTcpEpm9200::SetProperty(int IsMainFes) { g_ModbusIsMainFes = IsMainFes; - return kbdSuccess; + return iotSuccess; } /** @@ -96,7 +96,7 @@ int CModbusTcpEpm9200::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpEpm9200::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) { @@ -105,12 +105,12 @@ int CModbusTcpEpm9200::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) CTcpClientThreadPtr ptrCTcpClient = NULL; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if ((ptrMainFesChan = GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((ptrFesChan = GetChanDataByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((OpenFlag == CN_FesChanThread_Flag) || (OpenFlag == CN_FesChanAndDataThread_Flag)) { @@ -124,7 +124,7 @@ int CModbusTcpEpm9200::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) if (ptrCTcpClient == NULL) { LOGERROR("CModbusTcp EX_OpenChan() ChanNo:%d create CTcpClientThread error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } ptrCTcpClient->SetThreadRunMode(1);//2021-02-22 thxiao 使锟斤拷锟剿癸拷锟斤拷预锟斤拷取锟斤拷锟捷★拷 DataProcSetTcpThreadByChanNo(ptrMainFesChan->m_Param.ChanNo, ptrCTcpClient); @@ -133,7 +133,7 @@ int CModbusTcpEpm9200::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -147,14 +147,14 @@ int CModbusTcpEpm9200::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CModbusTcpEpm9200 EX_OpenChan() ChanNo:%d create CModbusTcpEpm9200DataProcThreadPtr error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } ptrCDataProc->SetClientThread(ptrCTcpClient); m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -164,7 +164,7 @@ int CModbusTcpEpm9200::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpEpm9200::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) { @@ -172,12 +172,12 @@ int CModbusTcpEpm9200::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if ((ptrMainFesChan = GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((ptrFesChan = GetChanDataByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((CloseFlag == CN_FesChanThread_Flag) || (CloseFlag == CN_FesChanAndDataThread_Flag)) { @@ -197,7 +197,7 @@ int CModbusTcpEpm9200::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -209,7 +209,7 @@ int CModbusTcpEpm9200::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) int CModbusTcpEpm9200::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200DataProcThread.cpp b/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200DataProcThread.cpp index 666e8efc..d08e7c4f 100644 --- a/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200DataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200DataProcThread.cpp @@ -98,7 +98,7 @@ CModbusTcpEpm9200DataProcThread::~CModbusTcpEpm9200DataProcThread() */ int CModbusTcpEpm9200DataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -167,7 +167,7 @@ int CModbusTcpEpm9200DataProcThread::SendProcess() int retLen = 0; if(m_ptrCurrentChan==NULL) - return kbdFailed; + return iotFailed; //有多个RTU时，才需要获取当前最新的RTU结构，否则m_ptrCFesRtu在构造函数初始化。 if(m_ptrCFesChan->m_RtuNum >1) @@ -197,7 +197,7 @@ int CModbusTcpEpm9200DataProcThread::SendProcess() /** * @brief CModbusTcpEpm9200DataProcThread::RecvNetData * MODBUS TCP 接收处理 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpEpm9200DataProcThread::RecvNetData() { @@ -207,7 +207,7 @@ int CModbusTcpEpm9200DataProcThread::RecvNetData() int recvLen,Len,i; if(m_ptrCurrentChan==NULL) - return kbdFailed; + return iotFailed; DevAddr = m_AppData.lastCmdData[6]; FunCode = m_AppData.lastCmdData[7]; @@ -285,7 +285,7 @@ int CModbusTcpEpm9200DataProcThread::RecvNetData() } CmdControlRespProcess(NULL,0,0); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } else//长度、地址、功能码 都正确则认为数据正确。 if((Len == ExpectLen)&&(DevAddr == Data[6])&&(FunCode==(Data[7]&0x7f)) && (Data[0] == m_AppData.lastCmdData[0]) && (Data[1] == m_AppData.lastCmdData[1])) @@ -301,7 +301,7 @@ int CModbusTcpEpm9200DataProcThread::RecvNetData() } //next RTU NextRtuIndex(m_ptrCFesChan); - return kbdSuccess; + return iotSuccess; } else { @@ -319,7 +319,7 @@ int CModbusTcpEpm9200DataProcThread::RecvNetData() //next RTU CmdControlRespProcess(NULL,0,0); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } } @@ -327,7 +327,7 @@ int CModbusTcpEpm9200DataProcThread::RecvNetData() /** * @brief CModbusTcpEpm9200DataProcThread::RecvNetData_Other * MODBUS TCP 接收处理,接收后不会指向下一个RTU -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpEpm9200DataProcThread::RecvNetData_Other() { @@ -337,7 +337,7 @@ int CModbusTcpEpm9200DataProcThread::RecvNetData_Other() int recvLen, Len, i; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; DevAddr = m_AppData.lastCmdData[6]; FunCode = m_AppData.lastCmdData[7]; @@ -414,7 +414,7 @@ int CModbusTcpEpm9200DataProcThread::RecvNetData_Other() } } CmdControlRespProcess(NULL, 0, 0); - return kbdFailed; + return iotFailed; } else//长度、地址、功能码 都正确则认为数据正确。 if ((Len == ExpectLen) && (DevAddr == Data[6]) && (FunCode == (Data[7] & 0x7f)) && (Data[0] == m_AppData.lastCmdData[0]) && (Data[1] == m_AppData.lastCmdData[1])) @@ -428,7 +428,7 @@ int CModbusTcpEpm9200DataProcThread::RecvNetData_Other() m_ptrCFesRtu->WriteRtuPointsComStatus(CN_FesRtuNormal); m_ptrCFesBase->WriteRtuSatus(m_ptrCFesRtu, CN_FesRtuNormal); } - return kbdSuccess; + return iotSuccess; } else { @@ -444,7 +444,7 @@ int CModbusTcpEpm9200DataProcThread::RecvNetData_Other() m_ptrCurrentChan->SetErrNum(1); CmdControlRespProcess(NULL, 0, 0); - return kbdFailed; + return iotFailed; } } @@ -516,7 +516,7 @@ int CModbusTcpEpm9200DataProcThread::PollingCmdProcess() int writex; int len=0; - if(GetPollingCmd(&cmd)==kbdFailed) + if(GetPollingCmd(&cmd)==iotFailed) { //LOGERROR("CModbusTcpEpm9200DataProcThread::PollingCmdProcess() return 0"); return 0; @@ -1162,7 +1162,7 @@ int CModbusTcpEpm9200DataProcThread::DefCmdProcess(byte *Data, int dataSize) * @brief CModbusTcpEpm9200DataProcThread::GetPollingCmd * 获取读取数据命令 * @param pCmd 返回读取数据命令 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpEpm9200DataProcThread::GetPollingCmd(SModbusCmd *pCmd) { @@ -1172,11 +1172,11 @@ int CModbusTcpEpm9200DataProcThread::GetPollingCmd(SModbusCmd *pCmd) if(m_ptrCFesRtu==NULL) { - return kbdFailed; + return iotFailed; } if(m_ptrCFesRtu->m_Param.ModbusCmdBuf.pCmd==NULL) { - return kbdFailed; + return iotFailed; } //2020-05-14 thxiao 如果没有配置块，则轮训下一个设备。 if (m_ptrCFesRtu->m_Param.ModbusCmdBuf.num == 0) @@ -1197,17 +1197,17 @@ int CModbusTcpEpm9200DataProcThread::GetPollingCmd(SModbusCmd *pCmd) m_ptrCFesRtu->m_Param.ModbusCmdBuf.readx = 0; count++; if (ComFlag) - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } /** * @brief CModbusTcpEpm9200DataProcThread::RecvDataProcess * @param Data * @param DataSize - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpEpm9200DataProcThread::RecvDataProcess(byte *Data,int DataSize) { @@ -1217,7 +1217,7 @@ int CModbusTcpEpm9200DataProcThread::RecvDataProcess(byte *Data,int DataSize) if(FunCode&0x80) { CmdControlRespProcess(NULL,0,0); - return kbdSuccess; + return iotSuccess; } switch(FunCode) @@ -1248,10 +1248,10 @@ int CModbusTcpEpm9200DataProcThread::RecvDataProcess(byte *Data,int DataSize) Cmd10RespProcess(Data,DataSize); break; default: - return kbdFailed; + return iotFailed; break; } - return kbdSuccess; + return iotSuccess; } int CModbusTcpEpm9200DataProcThread::RecvDataProcess_Other(byte *Data, int DataSize) @@ -1262,7 +1262,7 @@ int CModbusTcpEpm9200DataProcThread::RecvDataProcess_Other(byte *Data, int DataS if (FunCode & 0x80) { CmdControlRespProcess(NULL, 0, 0); - return kbdSuccess; + return iotSuccess; } switch (FunCode) @@ -1289,10 +1289,10 @@ int CModbusTcpEpm9200DataProcThread::RecvDataProcess_Other(byte *Data, int DataS Cmd10RespProcess(Data, DataSize); break; default: - return kbdFailed; + return iotFailed; break; } - return kbdSuccess; + return iotSuccess; } uint64 CModbusTcpEpm9200DataProcThread::GetTimeStamp(int time_year, int time_month, int time_day, int time_hour, int time_min, int time_sec, uint32 time_millsec) diff --git a/product/src/fes/protocol/modbus_tcp_fpd/ModbusDataProcThread.cpp b/product/src/fes/protocol/modbus_tcp_fpd/ModbusDataProcThread.cpp index d5920590..9ee93075 100644 --- a/product/src/fes/protocol/modbus_tcp_fpd/ModbusDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcp_fpd/ModbusDataProcThread.cpp @@ -67,7 +67,7 @@ CModbusDataProcThread::~CModbusDataProcThread() */ int CModbusDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -126,7 +126,7 @@ int CModbusDataProcThread::SendProcess() int retLen = 0; if(m_ptrCurrentChan==NULL) - return kbdFailed; + return iotFailed; //有多个RTU时，才需要获取当前最新的RTU结构，否则m_ptrCFesRtu在构造函数初始化。 if(m_ptrCFesChan->m_RtuNum >1) @@ -156,7 +156,7 @@ int CModbusDataProcThread::SendProcess() /** * @brief CModbusDataProcThread::RecvNetData * MODBUS TCP 接收处理 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusDataProcThread::RecvNetData() { @@ -166,7 +166,7 @@ int CModbusDataProcThread::RecvNetData() int recvLen,Len,i; if(m_ptrCurrentChan==NULL) - return kbdFailed; + return iotFailed; DevAddr = m_AppData.lastCmdData[6]; FunCode = m_AppData.lastCmdData[7]; @@ -232,7 +232,7 @@ int CModbusDataProcThread::RecvNetData() } CmdControlRespProcess(NULL,0,0); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } else//长度、地址、功能码 都正确则认为数据正确。 if((Len == ExpectLen)&&(DevAddr == Data[6])&&(FunCode==(Data[7]&0x7f))) @@ -248,7 +248,7 @@ int CModbusDataProcThread::RecvNetData() } //next RTU NextRtuIndex(m_ptrCFesChan); - return kbdSuccess; + return iotSuccess; } else { @@ -256,7 +256,7 @@ int CModbusDataProcThread::RecvNetData() //next RTU CmdControlRespProcess(NULL,0,0); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } } @@ -326,7 +326,7 @@ int CModbusDataProcThread::PollingCmdProcess() SModbusCmd cmd; int writex; - if(GetPollingCmd(&cmd)==kbdFailed) + if(GetPollingCmd(&cmd)==iotFailed) { //LOGERROR("CModbusDataProcThread::PollingCmdProcess() return 0"); return 0; @@ -950,7 +950,7 @@ int CModbusDataProcThread::DefCmdProcess(byte *Data, int dataSize) * @brief CModbusDataProcThread::GetPollingCmd * 获取读取数据命令 * @param pCmd 返回读取数据命令 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusDataProcThread::GetPollingCmd(SModbusCmd *pCmd) { @@ -960,11 +960,11 @@ int CModbusDataProcThread::GetPollingCmd(SModbusCmd *pCmd) if(m_ptrCFesRtu==NULL) { - return kbdFailed; + return iotFailed; } if(m_ptrCFesRtu->m_Param.ModbusCmdBuf.pCmd==NULL) { - return kbdFailed; + return iotFailed; } //2020-05-14 thxiao 如果没有配置块，则轮训下一个设备。 if (m_ptrCFesRtu->m_Param.ModbusCmdBuf.num == 0) @@ -985,17 +985,17 @@ int CModbusDataProcThread::GetPollingCmd(SModbusCmd *pCmd) m_ptrCFesRtu->m_Param.ModbusCmdBuf.readx = 0; count++; if (ComFlag) - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } /** * @brief CModbusDataProcThread::RecvDataProcess * @param Data * @param DataSize - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusDataProcThread::RecvDataProcess(byte *Data,int DataSize) { @@ -1005,7 +1005,7 @@ int CModbusDataProcThread::RecvDataProcess(byte *Data,int DataSize) if(FunCode&0x80) { CmdControlRespProcess(NULL,0,0); - return kbdSuccess; + return iotSuccess; } switch(FunCode) @@ -1029,10 +1029,10 @@ int CModbusDataProcThread::RecvDataProcess(byte *Data,int DataSize) Cmd10RespProcess(Data,DataSize); break; default: - return kbdFailed; + return iotFailed; break; } - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/fes/protocol/modbus_tcp_fpd/ModbusTcp.cpp b/product/src/fes/protocol/modbus_tcp_fpd/ModbusTcp.cpp index 836d2700..c328cc3f 100644 --- a/product/src/fes/protocol/modbus_tcp_fpd/ModbusTcp.cpp +++ b/product/src/fes/protocol/modbus_tcp_fpd/ModbusTcp.cpp @@ -17,38 +17,38 @@ bool g_ModbusChanelRun=true; int EX_SetBaseAddr(void *address) { ModbusTcp.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { ModbusTcp.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { ModbusTcp.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { ModbusTcp.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { ModbusTcp.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_ModbusChanelRun=false;//使所有的线程退出。 ModbusTcp.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CModbusTcp::CModbusTcp() @@ -82,13 +82,13 @@ int CModbusTcp::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*)"modbus_tcp_fpd"); } - return kbdSuccess; + return iotSuccess; } int CModbusTcp::SetProperty(int IsMainFes) { g_ModbusIsMainFes = IsMainFes; - return kbdSuccess; + return iotSuccess; } /** @@ -97,7 +97,7 @@ int CModbusTcp::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -105,12 +105,12 @@ int CModbusTcp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -125,14 +125,14 @@ int CModbusTcp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpClient == NULL) { LOGERROR("CModbusTcp EX_OpenChan() ChanNo:%d create CTcpClientThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpClientQueue.push_back(ptrCTcpClient); ptrCTcpClient->resume(); //start TCP CLIENT THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -146,13 +146,13 @@ int CModbusTcp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CModbusTcp EX_OpenChan() ChanNo:%d create CModbusDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -162,7 +162,7 @@ int CModbusTcp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -170,12 +170,12 @@ int CModbusTcp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) { @@ -195,7 +195,7 @@ int CModbusTcp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -207,7 +207,7 @@ int CModbusTcp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) int CModbusTcp::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_tcp_nhats/NHAts.cpp b/product/src/fes/protocol/modbus_tcp_nhats/NHAts.cpp index c0390ddb..dac9c4fe 100644 --- a/product/src/fes/protocol/modbus_tcp_nhats/NHAts.cpp +++ b/product/src/fes/protocol/modbus_tcp_nhats/NHAts.cpp @@ -17,38 +17,38 @@ bool g_NHAtsChanelRun=true; int EX_SetBaseAddr(void *address) { NHAts.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { NHAts.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { NHAts.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { NHAts.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { NHAts.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_NHAtsChanelRun=false;//使所有的线程退出。 NHAts.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CNHAts::CNHAts() @@ -76,13 +76,13 @@ int CNHAts::SetBaseAddr(void *address) { m_ptrCFesBase = (CFesBase *)address; } - return kbdSuccess; + return iotSuccess; } int CNHAts::SetProperty(int IsMainFes) { g_NHAtsIsMainFes = IsMainFes; - return kbdSuccess; + return iotSuccess; } /** @@ -91,7 +91,7 @@ int CNHAts::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CNHAts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -100,12 +100,12 @@ int CNHAts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -120,7 +120,7 @@ int CNHAts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpClient == NULL) { LOGERROR("CNHAts EX_OpenChan() ChanNo:%d create CTcpClientNotChangeThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpClientQueue.push_back(ptrCTcpClient); ptrCTcpClient->resume(); //start TCP CLIENT THREAD @@ -130,7 +130,7 @@ int CNHAts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if ((ptrBackupFesChan = GetChanDataByChanNo(ptrFesChan->m_BackupChanNo[1])) == NULL) { LOGERROR("备用通道%d 打开出错！", ptrFesChan->m_BackupChanNo[1]); - return kbdSuccess; //返回成功，只启用主通道。 + return iotSuccess; //返回成功，只启用主通道。 } CTcpClientNotChangeThreadPtr ptrBackupTcpClient; @@ -138,7 +138,7 @@ int CNHAts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrBackupTcpClient == NULL) { LOGERROR("CNHAts EX_OpenChan() ChanNo:%d create CTcpClientNotChangeThread error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpClientQueue.push_back(ptrBackupTcpClient); ptrBackupTcpClient->resume(); //start TCP CLIENT THREAD @@ -147,7 +147,7 @@ int CNHAts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -161,7 +161,7 @@ int CNHAts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CNHAts EX_OpenChan() ChanNo:%d create CNHAtsDataProcThreadPtr main error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD @@ -173,14 +173,14 @@ int CNHAts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProcBackup == NULL) { LOGERROR("CNHAts EX_OpenChan() ChanNo:%d create CNHAtsDataProcThreadPtr backup error!", ptrFesChan->m_BackupChanNo[1]); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProcBackup); ptrCDataProcBackup->resume(); //start Data THREAD } } } - return kbdSuccess; + return iotSuccess; } @@ -190,7 +190,7 @@ int CNHAts::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CNHAts::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -198,12 +198,12 @@ int CNHAts::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) { @@ -233,7 +233,7 @@ int CNHAts::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -245,7 +245,7 @@ int CNHAts::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) int CNHAts::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_tcp_nhats/NHAtsDataProcThread.cpp b/product/src/fes/protocol/modbus_tcp_nhats/NHAtsDataProcThread.cpp index b2474339..25f28d74 100644 --- a/product/src/fes/protocol/modbus_tcp_nhats/NHAtsDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcp_nhats/NHAtsDataProcThread.cpp @@ -90,7 +90,7 @@ CNHAtsDataProcThread::~CNHAtsDataProcThread() */ int CNHAtsDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -152,7 +152,7 @@ int CNHAtsDataProcThread::SendProcess() /** * @brief CNHAtsDataProcThread::RecvComData * MODBUS TCP 接收处理 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CNHAtsDataProcThread::RecvComData() { @@ -162,7 +162,7 @@ int CNHAtsDataProcThread::RecvComData() int recvLen,Len,i,status,tempstatus; if(m_ptrCFesChan==NULL) - return kbdFailed; + return iotFailed; DevAddr = m_AppData.lastCmdData[6]; FunCode = m_AppData.lastCmdData[7]; @@ -252,7 +252,7 @@ int CNHAtsDataProcThread::RecvComData() m_AppData.comState = CN_FesRtuComDown; } } - return kbdFailed; + return iotFailed; } else//长度、功能码 都正确则认为数据正确。 if((Len == ExpectLen)&&(FunCode==(Data[7]&0x7f))) @@ -261,7 +261,7 @@ int CNHAtsDataProcThread::RecvComData() m_ptrCFesChan->SetRxNum(1); if (Data[7] & 0x80)//否定回答 - return kbdSuccess; + return iotSuccess; status = (int)Data[9] << 8; status |= (int)Data[10]; @@ -297,12 +297,12 @@ int CNHAtsDataProcThread::RecvComData() m_ptrCFesBase->WriteRtuSatus(m_ptrCFesRtu, CN_FesRtuNormal); } } - return kbdSuccess; + return iotSuccess; } else { m_ptrCFesChan->SetErrNum(1); - return kbdFailed; + return iotFailed; } } @@ -319,7 +319,7 @@ int CNHAtsDataProcThread::PollingCmdProcess() SModbusCmd cmd; int writex; - if(GetPollingCmd(&cmd)==kbdFailed) + if(GetPollingCmd(&cmd)==iotFailed) return 0; memcpy(&m_AppData.lastCmd,&cmd,sizeof(SModbusCmd)); @@ -406,7 +406,7 @@ void CNHAtsDataProcThread::SendDataToPort(uint8 *Data, int Size) * @brief CNHAtsDataProcThread::GetPollingCmd * 获取读取数据命令 * @param pCmd 返回读取数据命令 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CNHAtsDataProcThread::GetPollingCmd(SModbusCmd *pCmd) { @@ -422,7 +422,7 @@ int CNHAtsDataProcThread::GetPollingCmd(SModbusCmd *pCmd) pCmd->StartAddr = 0x0000; pCmd->DataLen = 0x0001; m_AppData.pollCmd.lastPollTime = lTime; - return kbdSuccess; + return iotSuccess; } } else @@ -432,10 +432,10 @@ int CNHAtsDataProcThread::GetPollingCmd(SModbusCmd *pCmd) m_AppData.pollCmd.CommandSendFlag = true; m_AppData.pollCmd.lastPollTime = lTime; memcpy(pCmd, &m_AppData.pollCmd, sizeof(SModbusCmd)); - return kbdSuccess; + return iotSuccess; } } - return kbdFailed; + return iotFailed; } @@ -453,7 +453,7 @@ int CNHAtsDataProcThread::GetPollingCmd(SModbusCmd *pCmd) * @param Data * @param DataSize - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ /* @@ -500,7 +500,7 @@ int CNHAtsDataProcThread::RecvDataProcess(uint8 *Data,int DataSize) uint64 mSec = getUTCTimeMsec(); if (DataSize < 7) - return kbdSuccess;//没有数据,只有状态 + return iotSuccess;//没有数据,只有状态 num = (int)Data[CN_NumOfOnlineTrains_Offset] << 8; num |= (int)Data[CN_NumOfOnlineTrains_Offset+1]; @@ -652,7 +652,7 @@ int CNHAtsDataProcThread::RecvDataProcess(uint8 *Data,int DataSize) } } - return kbdSuccess; + return iotSuccess; } #endif @@ -673,7 +673,7 @@ int CNHAtsDataProcThread::RecvDataProcess(uint8 *Data, int DataSize) uint64 mSec = getUTCTimeMsec(); if (DataSize < 7) - return kbdSuccess;//没有数据,只有状态 + return iotSuccess;//没有数据,只有状态 //2021-01-29 thxiao 使用PARAM8做为数据更新的标志，所以每次先把标志清零 @@ -694,7 +694,7 @@ int CNHAtsDataProcThread::RecvDataProcess(uint8 *Data, int DataSize) if (tempLen >= DataSize) { LOGDEBUG("DataSize error,Exit RecvDataProcess()"); - return kbdFailed; + return iotFailed; } TackSectionNumber = (int)Data[CN_OnlineTrains_Offset + CN_OnlineTrains_Size*i] << 8; TackSectionNumber |= (int)Data[CN_OnlineTrains_Offset + CN_OnlineTrains_Size*i + 1]; @@ -712,7 +712,7 @@ int CNHAtsDataProcThread::RecvDataProcess(uint8 *Data, int DataSize) if (tempLen >= DataSize) { LOGDEBUG("DataSize error,Exit RecvDataProcess()"); - return kbdFailed; + return iotFailed; } trainWindow.TrainType = (int)Data[CN_OnlineTrains_Offset + CN_OnlineTrains_Size*i + 4] << 8; trainWindow.TrainType |= (int)Data[CN_OnlineTrains_Offset + CN_OnlineTrains_Size*i + 5]; @@ -734,7 +734,7 @@ int CNHAtsDataProcThread::RecvDataProcess(uint8 *Data, int DataSize) if (tempLen >= DataSize) { LOGDEBUG("DataSize error,Exit RecvDataProcess()"); - return kbdFailed; + return iotFailed; } // 以下处理是和运行列车信息一一对应。 trainWindow.BlockFlag = (int)Data[CN_TrainInformation_Offset + CN_TrainInformation_Size*i + 2] << 8; @@ -787,7 +787,7 @@ int CNHAtsDataProcThread::RecvDataProcess(uint8 *Data, int DataSize) if (tempLen >= DataSize) { LOGDEBUG("DataSize error,Exit RecvDataProcess()"); - return kbdFailed; + return iotFailed; } memset(&strServiceID[0], 0, sizeof(strServiceID)); @@ -799,7 +799,7 @@ int CNHAtsDataProcThread::RecvDataProcess(uint8 *Data, int DataSize) if (tempLen >= DataSize) { LOGDEBUG("DataSize error,Exit RecvDataProcess()"); - return kbdFailed; + return iotFailed; } trainServiceNoInfo.ArrivalFlag = (uint8)Data[CN_ArrivalInformation_Offset + CN_ArrivalInformation_Size*i]+1; //2021-04-02 trainServiceNoInfo.EarlyCount = (uint8)Data[CN_ArrivalInformation_Offset + CN_ArrivalInformation_Size*i + 1]; @@ -915,13 +915,13 @@ int CNHAtsDataProcThread::RecvDataProcess(uint8 *Data, int DataSize) } } - return kbdSuccess; + return iotSuccess; } /** * @brief CCascoAtsDataProcThread::InitConfigParam * 读取配置文件 -* @return 成功返回kbdSuccess，失败返回kbdFailed +* @return 成功返回iotSuccess，失败返回iotFailed */ int CNHAtsDataProcThread::InitConfigParam() { @@ -933,7 +933,7 @@ int CNHAtsDataProcThread::InitConfigParam() if (ret == false) { LOGERROR("RdbAtsTable.Open error"); - return kbdFailed; + return iotFailed; } std::vector VecParam; @@ -944,7 +944,7 @@ int CNHAtsDataProcThread::InitConfigParam() if (ret == false) { LOGERROR("RdbAtsTable.selectNoCondition error!"); - return kbdFailed; + return iotFailed; } m_vectLocationId = VecParam; //建立MAP表 @@ -952,7 +952,7 @@ int CNHAtsDataProcThread::InitConfigParam() { m_mapLocationId[m_vectLocationId[i].stationId] = m_vectLocationId[i].locationId; } - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPa.cpp b/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPa.cpp index 6e6e8bb9..dd073e43 100644 --- a/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPa.cpp +++ b/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPa.cpp @@ -17,38 +17,38 @@ bool g_ModbusChanelRun = true; int EX_SetBaseAddr(void *address) { ModbusTcpPa.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { ModbusTcpPa.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo, int ChanNo, int OpenFlag) { ModbusTcpPa.OpenChan(MainChanNo, ChanNo, OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo, int ChanNo, int CloseFlag) { ModbusTcpPa.CloseChan(MainChanNo, ChanNo, CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { ModbusTcpPa.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_ModbusChanelRun = false;//使所有的线程退出。 ModbusTcpPa.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CModbusTcpPa::CModbusTcpPa() @@ -82,13 +82,13 @@ int CModbusTcpPa::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*)"modbus_tcp_pa"); } - return kbdSuccess; + return iotSuccess; } int CModbusTcpPa::SetProperty(int IsMainFes) { g_ModbusIsMainFes = IsMainFes; - return kbdSuccess; + return iotSuccess; } /** @@ -97,7 +97,7 @@ int CModbusTcpPa::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpPa::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) { @@ -105,12 +105,12 @@ int CModbusTcpPa::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if ((ptrMainFesChan = GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((ptrFesChan = GetChanDataByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((OpenFlag == CN_FesChanThread_Flag) || (OpenFlag == CN_FesChanAndDataThread_Flag)) { @@ -125,14 +125,14 @@ int CModbusTcpPa::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) if (ptrCTcpClient == NULL) { LOGERROR("CModbusTcpPa EX_OpenChan() ChanNo:%d create CTcpClientThread error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpClientQueue.push_back(ptrCTcpClient); ptrCTcpClient->resume(); //start TCP CLIENT THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -146,13 +146,13 @@ int CModbusTcpPa::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CModbusTcpPa EX_OpenChan() ChanNo:%d create CModbusDataProcThreadPtr error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -162,7 +162,7 @@ int CModbusTcpPa::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpPa::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) { @@ -170,12 +170,12 @@ int CModbusTcpPa::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if ((ptrMainFesChan = GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((ptrFesChan = GetChanDataByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((CloseFlag == CN_FesChanThread_Flag) || (CloseFlag == CN_FesChanAndDataThread_Flag)) { @@ -195,7 +195,7 @@ int CModbusTcpPa::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -207,7 +207,7 @@ int CModbusTcpPa::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) int CModbusTcpPa::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPaDataProcThread.cpp b/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPaDataProcThread.cpp index 3c9b5072..ae8fc542 100644 --- a/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPaDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPaDataProcThread.cpp @@ -53,7 +53,7 @@ CModbusTcpPaDataProcThread::~CModbusTcpPaDataProcThread() */ int CModbusTcpPaDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -112,7 +112,7 @@ int CModbusTcpPaDataProcThread::SendProcess() int retLen = 0; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; //有多个RTU时，才需要获取当前最新的RTU结构，否则m_ptrCFesRtu在构造函数初始化。 if (m_ptrCFesChan->m_RtuNum > 1) @@ -161,7 +161,7 @@ int CModbusTcpPaDataProcThread::SendProcess() /** * @brief CModbusTcpPaDataProcThread::RecvNetData * MODBUS TCP 接收处理 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpPaDataProcThread::RecvNetData() { @@ -171,7 +171,7 @@ int CModbusTcpPaDataProcThread::RecvNetData() int recvLen, Len, i; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; DevAddr = m_AppData.lastCmdData[6]; FunCode = m_AppData.lastCmdData[7]; @@ -237,7 +237,7 @@ int CModbusTcpPaDataProcThread::RecvNetData() } CmdControlRespProcess(NULL, 0, 0); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } else//长度、地址、功能码 都正确则认为数据正确。 if ((Len == ExpectLen) && (DevAddr == Data[6]) && (FunCode == (Data[7] & 0x7f))) @@ -253,7 +253,7 @@ int CModbusTcpPaDataProcThread::RecvNetData() } //next RTU NextRtuIndex(m_ptrCFesChan); - return kbdSuccess; + return iotSuccess; } else { @@ -261,7 +261,7 @@ int CModbusTcpPaDataProcThread::RecvNetData() //next RTU CmdControlRespProcess(NULL, 0, 0); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } } @@ -314,7 +314,7 @@ int CModbusTcpPaDataProcThread::PollingCmdProcess() SModbusCmd cmd; int writex; - if (GetPollingCmd(&cmd) == kbdFailed) + if (GetPollingCmd(&cmd) == iotFailed) { //LOGERROR("CModbusTcpPaDataProcThread::PollingCmdProcess() return 0"); return 0; @@ -905,7 +905,7 @@ int CModbusTcpPaDataProcThread::CtrlDefCmdProcess(byte *Data, int dataSize) * @brief CModbusTcpPaDataProcThread::GetPollingCmd * 获取读取数据命令 * @param pCmd 返回读取数据命令 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpPaDataProcThread::GetPollingCmd(SModbusCmd *pCmd) { @@ -916,11 +916,11 @@ int CModbusTcpPaDataProcThread::GetPollingCmd(SModbusCmd *pCmd) if (m_ptrCFesRtu == NULL) { - return kbdFailed; + return iotFailed; } if (m_ptrCFesRtu->m_Param.ModbusCmdBuf.pCmd == NULL) { - return kbdFailed; + return iotFailed; } while (count < m_ptrCFesRtu->m_Param.ModbusCmdBuf.num) @@ -938,17 +938,17 @@ int CModbusTcpPaDataProcThread::GetPollingCmd(SModbusCmd *pCmd) m_ptrCFesRtu->m_Param.ModbusCmdBuf.readx = 0; count++; if (ComFlag) - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } /** * @brief CModbusTcpPaDataProcThread::RecvDataProcess * @param Data * @param DataSize - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpPaDataProcThread::RecvDataProcess(byte *Data, int DataSize) { @@ -958,11 +958,11 @@ int CModbusTcpPaDataProcThread::RecvDataProcess(byte *Data, int DataSize) if (FunCode & 0x80) { CmdControlRespProcess(NULL, 0, 0); - return kbdSuccess; + return iotSuccess; } if (CmdControlRespProcess(Data, DataSize, 1) == true) - return kbdSuccess; + return iotSuccess; //LOGDEBUG("1************************") switch (FunCode) { @@ -977,10 +977,10 @@ int CModbusTcpPaDataProcThread::RecvDataProcess(byte *Data, int DataSize) CmdControlRespProcess(Data, DataSize, 1); break; default: - return kbdFailed; + return iotFailed; break; } - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPis.cpp b/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPis.cpp index 9cf38009..dc9e7e00 100644 --- a/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPis.cpp +++ b/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPis.cpp @@ -17,38 +17,38 @@ bool g_ModbusChanelRun = true; int EX_SetBaseAddr(void *address) { ModbusTcpPis.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { ModbusTcpPis.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo, int ChanNo, int OpenFlag) { ModbusTcpPis.OpenChan(MainChanNo, ChanNo, OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo, int ChanNo, int CloseFlag) { ModbusTcpPis.CloseChan(MainChanNo, ChanNo, CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { ModbusTcpPis.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_ModbusChanelRun = false;//使所有的线程退出。 ModbusTcpPis.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CModbusTcpPis::CModbusTcpPis() @@ -82,13 +82,13 @@ int CModbusTcpPis::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*)"modbus_tcp_pis"); } - return kbdSuccess; + return iotSuccess; } int CModbusTcpPis::SetProperty(int IsMainFes) { g_ModbusIsMainFes = IsMainFes; - return kbdSuccess; + return iotSuccess; } /** @@ -97,7 +97,7 @@ int CModbusTcpPis::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpPis::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) { @@ -105,12 +105,12 @@ int CModbusTcpPis::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if ((ptrMainFesChan = GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((ptrFesChan = GetChanDataByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((OpenFlag == CN_FesChanThread_Flag) || (OpenFlag == CN_FesChanAndDataThread_Flag)) { @@ -125,14 +125,14 @@ int CModbusTcpPis::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) if (ptrCTcpClient == NULL) { LOGERROR("CModbusTcpPis EX_OpenChan() ChanNo:%d create CTcpClientThread error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpClientQueue.push_back(ptrCTcpClient); ptrCTcpClient->resume(); //start TCP CLIENT THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -146,13 +146,13 @@ int CModbusTcpPis::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CModbusTcpPis EX_OpenChan() ChanNo:%d create CModbusDataProcThreadPtr error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -162,7 +162,7 @@ int CModbusTcpPis::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpPis::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) { @@ -170,12 +170,12 @@ int CModbusTcpPis::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if ((ptrMainFesChan = GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((ptrFesChan = GetChanDataByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((CloseFlag == CN_FesChanThread_Flag) || (CloseFlag == CN_FesChanAndDataThread_Flag)) { @@ -195,7 +195,7 @@ int CModbusTcpPis::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -207,7 +207,7 @@ int CModbusTcpPis::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) int CModbusTcpPis::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPisDataProcThread.cpp b/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPisDataProcThread.cpp index 4c346a42..0c1528b8 100644 --- a/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPisDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPisDataProcThread.cpp @@ -56,7 +56,7 @@ CModbusTcpPisDataProcThread::~CModbusTcpPisDataProcThread() */ int CModbusTcpPisDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -115,7 +115,7 @@ int CModbusTcpPisDataProcThread::SendProcess() int retLen = 0; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; //有多个RTU时，才需要获取当前最新的RTU结构，否则m_ptrCFesRtu在构造函数初始化。 if (m_ptrCFesChan->m_RtuNum > 1) @@ -152,7 +152,7 @@ int CModbusTcpPisDataProcThread::SendProcess() /** * @brief CModbusTcpPisDataProcThread::RecvNetData * MODBUS TCP 接收处理 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpPisDataProcThread::RecvNetData() { @@ -163,7 +163,7 @@ int CModbusTcpPisDataProcThread::RecvNetData() //LOGERROR("CModbusTcpPisDataProcThread::RecvNetData()"); if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; DevAddr = m_AppData.lastCmdData[6]; FunCode = m_AppData.lastCmdData[7]; @@ -229,7 +229,7 @@ int CModbusTcpPisDataProcThread::RecvNetData() } CmdControlRespProcess(NULL, 0, 0); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } else//长度、地址、功能码 都正确则认为数据正确。 if ((Len == ExpectLen) && (DevAddr == Data[6]) && (FunCode == (Data[7] & 0x7f))) @@ -245,7 +245,7 @@ int CModbusTcpPisDataProcThread::RecvNetData() } //next RTU NextRtuIndex(m_ptrCFesChan); - return kbdSuccess; + return iotSuccess; } else { @@ -253,7 +253,7 @@ int CModbusTcpPisDataProcThread::RecvNetData() //next RTU CmdControlRespProcess(NULL, 0, 0); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } } @@ -305,7 +305,7 @@ int CModbusTcpPisDataProcThread::PollingCmdProcess() SModbusCmd cmd; int writex; //LOGERROR("CModbusTcpPisDataProcThread::PollingCmdProcess()"); - if (GetPollingCmd(&cmd) == kbdFailed) + if (GetPollingCmd(&cmd) == iotFailed) { //LOGERROR("CModbusTcpPisDataProcThread::PollingCmdProcess() return 0"); return 0; @@ -835,7 +835,7 @@ int CModbusTcpPisDataProcThread::DefCmdProcess(byte *Data, int dataSize) * @brief CModbusTcpPisDataProcThread::GetPollingCmd * 获取读取数据命令 * @param pCmd 返回读取数据命令 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpPisDataProcThread::GetPollingCmd(SModbusCmd *pCmd) { @@ -846,11 +846,11 @@ int CModbusTcpPisDataProcThread::GetPollingCmd(SModbusCmd *pCmd) if (m_ptrCFesRtu == NULL) { - return kbdFailed; + return iotFailed; } if (m_ptrCFesRtu->m_Param.ModbusCmdBuf.pCmd == NULL) { - return kbdFailed; + return iotFailed; } while (count < m_ptrCFesRtu->m_Param.ModbusCmdBuf.num) @@ -868,17 +868,17 @@ int CModbusTcpPisDataProcThread::GetPollingCmd(SModbusCmd *pCmd) m_ptrCFesRtu->m_Param.ModbusCmdBuf.readx = 0; count++; if (ComFlag) - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } /** * @brief CModbusTcpPisDataProcThread::RecvDataProcess * @param Data * @param DataSize - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpPisDataProcThread::RecvDataProcess(byte *Data, int DataSize) { @@ -888,11 +888,11 @@ int CModbusTcpPisDataProcThread::RecvDataProcess(byte *Data, int DataSize) if (FunCode & 0x80) { CmdControlRespProcess(NULL, 0, 0); - return kbdSuccess; + return iotSuccess; } if (CmdControlRespProcess(Data, DataSize, 1) == true) - return kbdSuccess; + return iotSuccess; switch (FunCode) { @@ -905,10 +905,10 @@ int CModbusTcpPisDataProcThread::RecvDataProcess(byte *Data, int DataSize) Cmd10RespProcess(Data, DataSize); break; default: - return kbdFailed; + return iotFailed; break; } - return kbdSuccess; + return iotSuccess; } /** * @brief CModbusPisDataProcThread::Cmd04RespProcess diff --git a/product/src/fes/protocol/modbus_tcp_s/MdbTcpSer.cpp b/product/src/fes/protocol/modbus_tcp_s/MdbTcpSer.cpp index 8ea0b82a..f6085c27 100644 --- a/product/src/fes/protocol/modbus_tcp_s/MdbTcpSer.cpp +++ b/product/src/fes/protocol/modbus_tcp_s/MdbTcpSer.cpp @@ -25,31 +25,31 @@ bool g_MdbTcpSerChanelRun=true; int EX_SetBaseAddr(void *address) { MdbTcpSer.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { MdbTcpSer.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { MdbTcpSer.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { MdbTcpSer.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { MdbTcpSer.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) @@ -58,7 +58,7 @@ int EX_ExitSystem(int flag) g_MdbTcpSerChanelRun=false;//使所有的线程退出。 MdbTcpSer.ExitSystem(flag); LOGDEBUG("modbus_tcp_s EX_ExitSystem() end"); - return kbdSuccess; + return iotSuccess; } CMdbTcpSer::CMdbTcpSer() { @@ -88,14 +88,14 @@ int CMdbTcpSer::SetBaseAddr(void *address) m_ptrCFesBase = (CFesBase *)address; ReadConfigParam(); } - return kbdSuccess; + return iotSuccess; } int CMdbTcpSer::SetProperty(int IsMainFes) { g_MdbTcpSerIsMainFes = (bool)IsMainFes; LOGDEBUG("CMdbTcpSer::SetProperty g_MdbTcpSerIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -103,7 +103,7 @@ int CMdbTcpSer::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CMdbTcpSer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -111,12 +111,12 @@ int CMdbTcpSer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; //TcpServerListenThread create only once time if(m_TcpServerListenThreadFlag) { @@ -124,7 +124,7 @@ int CMdbTcpSer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (m_CTcpServerListenThread == NULL) { LOGERROR("CMdbTcpSer EX_OpenChan() ChanNo:%d create CTcpServerListenThread error!"); - return kbdFailed; + return iotFailed; } GetProtocolInfo((char*) "modbus_tcp_s"); m_CTcpServerListenThread->resume(); //start TCP ServerListen THREAD @@ -144,7 +144,7 @@ int CMdbTcpSer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpServerRxTx == NULL) { LOGERROR("CMdbTcpSer EX_OpenChan() ChanNo:%d create CTcpServerRxTxThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpServerRxTxQueue.push_back(ptrCTcpServerRxTx); ptrCTcpServerRxTx->resume(); //start TCP Server THREAD @@ -152,7 +152,7 @@ int CMdbTcpSer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) break; default: LOGERROR("CMdbTcpSer EX_OpenChan() ChanNo:%d CommType=%d is not TCP SERVER!", ptrFesChan->m_Param.ChanNo, ptrFesChan->m_Param.CommType); - return kbdFailed; + return iotFailed; } } @@ -166,13 +166,13 @@ int CMdbTcpSer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CMdbTcpSer EX_OpenChan() ChanNo:%d create CMdbTcpSerDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } /** @@ -180,7 +180,7 @@ int CMdbTcpSer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CMdbTcpSer::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -188,12 +188,12 @@ int CMdbTcpSer::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CMdbTcpSer::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -215,7 +215,7 @@ int CMdbTcpSer::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) ClearDataProcThreadByChanNo(MainChanNo); } } - return kbdSuccess; + return iotSuccess; } /** @@ -227,13 +227,13 @@ int CMdbTcpSer::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) int CMdbTcpSer::ChanTimer(int MainChanNo) { //把命令缓冲时间间隔到的命放到发送命令缓冲区 - return kbdSuccess; + return iotSuccess; } int CMdbTcpSer::ExitSystem(int flag) { InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } void CMdbTcpSer::ClearTcpServerRxTxThreadByChanNo(int ChanNo) @@ -280,7 +280,7 @@ void CMdbTcpSer::ClearDataProcThreadByChanNo(int ChanNo) /** * @brief CMdbTcpSer::ReadConfigParam * 读取MdbTcpSer配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CMdbTcpSer::ReadConfigParam() { @@ -295,21 +295,21 @@ int CMdbTcpSer::ReadConfigParam() memset(¶m, 0, sizeof(SMdbTcpSerAppConfigParam)); if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"modbus_tcp_s"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam ProtoclID error"); - return kbdFailed; + return iotFailed; } LOGINFO("modbus_tcp_s ProtoclID=%d", m_ProtocolId); - //if (config.load("../../data/fes/", "modbustcps.xml") == kbdFailed) - if (config.load("../../data/fes/", "modbus_tcp_s.xml") == kbdFailed)//2023-02-24 thxiao 改为统一文件名，以便配置工具可以正常打开。 + //if (config.load("../../data/fes/", "modbustcps.xml") == iotFailed) + if (config.load("../../data/fes/", "modbus_tcp_s.xml") == iotFailed)//2023-02-24 thxiao 改为统一文件名，以便配置工具可以正常打开。 { LOGDEBUG("modbus_tcp_s load modbus_tcp_s.xml error"); - return kbdSuccess; + return iotSuccess; } LOGDEBUG("modbus_tcp_s load modbus_tcp_s.xml ok"); @@ -330,7 +330,7 @@ int CMdbTcpSer::ReadConfigParam() param.RtuNo = ptrRTU->m_Param.RtuNo; items = 0; - if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == iotSuccess) { param.controlTimeoutReset = ivalue * 1000; items++; @@ -338,7 +338,7 @@ int CMdbTcpSer::ReadConfigParam() else param.controlTimeoutReset = 10 * 1000; - if (config.getIntValue(strRtuNo, "di_start_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "di_start_address", ivalue) == iotSuccess) { param.diStartAddress = ivalue; items++; @@ -346,7 +346,7 @@ int CMdbTcpSer::ReadConfigParam() else param.diStartAddress = 0x0000; - if (config.getIntValue(strRtuNo, "ddi_start_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ddi_start_address", ivalue) == iotSuccess) { param.ddiStartAddress = ivalue; items++; @@ -354,7 +354,7 @@ int CMdbTcpSer::ReadConfigParam() else param.ddiStartAddress = 0x8000; - if (config.getIntValue(strRtuNo, "ai_start_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ai_start_address", ivalue) == iotSuccess) { param.aiStartAddress = ivalue; items++; @@ -362,7 +362,7 @@ int CMdbTcpSer::ReadConfigParam() else param.aiStartAddress = 0x2000; - if (config.getIntValue(strRtuNo, "acc_start_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "acc_start_address", ivalue) == iotSuccess) { param.accStartAddress = ivalue; items++; @@ -370,7 +370,7 @@ int CMdbTcpSer::ReadConfigParam() else param.accStartAddress = 0x4000; - if (config.getIntValue(strRtuNo, "do_start_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "do_start_address", ivalue) == iotSuccess) { param.doStartAddress = ivalue; items++; @@ -378,7 +378,7 @@ int CMdbTcpSer::ReadConfigParam() else param.doStartAddress = 0x6000; - if (config.getIntValue(strRtuNo, "ao_start_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ao_start_address", ivalue) == iotSuccess) { param.aoStartAddress = ivalue; items++; @@ -386,7 +386,7 @@ int CMdbTcpSer::ReadConfigParam() else param.aoStartAddress = 0x7000; - if (config.getIntValue(strRtuNo, "ai_register_type", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ai_register_type", ivalue) == iotSuccess) { param.AiRegisterType = ivalue; items++; @@ -394,7 +394,7 @@ int CMdbTcpSer::ReadConfigParam() else param.AiRegisterType = 16; //模拟量上送类型：16字 32双字 48混合 - if (config.getIntValue(strRtuNo, "acc_register_type", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "acc_register_type", ivalue) == iotSuccess) { param.AccRegisterType = ivalue; items++; @@ -402,7 +402,7 @@ int CMdbTcpSer::ReadConfigParam() else param.AccRegisterType = 32; //累积量上送类型：16字 32双字 48混合 - if (config.getIntValue(strRtuNo, "resp_mode", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "resp_mode", ivalue) == iotSuccess) { param.respMode = ivalue; items++; @@ -410,7 +410,7 @@ int CMdbTcpSer::ReadConfigParam() else param.respMode = 0; - if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == iotSuccess) { param.maxUpdateCount = ivalue; items++; @@ -418,7 +418,7 @@ int CMdbTcpSer::ReadConfigParam() else param.maxUpdateCount = 18; //3MIN - if (config.getIntValue(strRtuNo, "start_delay", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "start_delay", ivalue) == iotSuccess) { param.startDelay = ivalue * 1000; items++; @@ -437,7 +437,7 @@ int CMdbTcpSer::ReadConfigParam() } } } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_tcp_s/MdbTcpSerDataProcThread.cpp b/product/src/fes/protocol/modbus_tcp_s/MdbTcpSerDataProcThread.cpp index 869edfd4..46dac65f 100644 --- a/product/src/fes/protocol/modbus_tcp_s/MdbTcpSerDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcp_s/MdbTcpSerDataProcThread.cpp @@ -108,7 +108,7 @@ CMdbTcpSerDataProcThread::~CMdbTcpSerDataProcThread() */ int CMdbTcpSerDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -200,12 +200,12 @@ void CMdbTcpSerDataProcThread::beforeQuit() /** * @brief CMdbTcpSerDataProcThread::InitConfigParam * MdbTcpSer 初始化配置参数 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CMdbTcpSerDataProcThread::InitConfigParam() { if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; memset(&m_AppData,0,sizeof(SMdbTcpSerAppData)); m_AppData.address = m_ptrCFesRtu->m_Param.RtuAddr; @@ -226,7 +226,7 @@ int CMdbTcpSerDataProcThread::InitConfigParam() m_AppData.state = CN_MdbTcpSerAppState_init; - return kbdSuccess; + return iotSuccess; } void CMdbTcpSerDataProcThread::DiDataProcess(int FunCode,int StartAddr, int RegisterNum) @@ -1037,7 +1037,7 @@ void CMdbTcpSerDataProcThread::RecvDataFunProcess() /** * @brief CMdbTcpSerDataProcThread::RecvDataAdrProcess -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ void CMdbTcpSerDataProcThread::RecvDataAddrProcess() { diff --git a/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVamp.cpp b/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVamp.cpp index f4a1be52..9954f892 100644 --- a/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVamp.cpp +++ b/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVamp.cpp @@ -17,38 +17,38 @@ bool g_ModbusTcpVampChanelRun=true; int EX_SetBaseAddr(void *address) { ModbusTcpVamp.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { ModbusTcpVamp.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { ModbusTcpVamp.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { ModbusTcpVamp.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { ModbusTcpVamp.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_ModbusTcpVampChanelRun=false;//使所有的线程退出。 ModbusTcpVamp.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CModbusTcpVamp::CModbusTcpVamp() @@ -82,13 +82,13 @@ int CModbusTcpVamp::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*)"modbus_tcp_vamp"); } - return kbdSuccess; + return iotSuccess; } int CModbusTcpVamp::SetProperty(int IsMainFes) { g_ModbusTcpVampIsMainFes = IsMainFes; - return kbdSuccess; + return iotSuccess; } /** @@ -97,7 +97,7 @@ int CModbusTcpVamp::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpVamp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -105,12 +105,12 @@ int CModbusTcpVamp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -125,14 +125,14 @@ int CModbusTcpVamp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpClient == NULL) { LOGERROR("CModbusTcpVamp EX_OpenChan() ChanNo:%d create CTcpClientThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpClientQueue.push_back(ptrCTcpClient); ptrCTcpClient->resume(); //start TCP CLIENT THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -146,13 +146,13 @@ int CModbusTcpVamp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CModbusTcpVamp EX_OpenChan() ChanNo:%d create CModbusTcpVampDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -162,7 +162,7 @@ int CModbusTcpVamp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpVamp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -170,12 +170,12 @@ int CModbusTcpVamp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) { @@ -195,7 +195,7 @@ int CModbusTcpVamp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -207,7 +207,7 @@ int CModbusTcpVamp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) int CModbusTcpVamp::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVampDataProcThread.cpp b/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVampDataProcThread.cpp index 0ffb4b87..3cc3e866 100644 --- a/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVampDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVampDataProcThread.cpp @@ -76,7 +76,7 @@ CModbusTcpVampDataProcThread::~CModbusTcpVampDataProcThread() */ int CModbusTcpVampDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -151,7 +151,7 @@ int CModbusTcpVampDataProcThread::SendProcess() int retLen = 0; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; //有多个RTU时，才需要获取当前最新的RTU结构，否则m_ptrCFesRtu在构造函数初始化。 if (m_ptrCFesChan->m_RtuNum > 1) @@ -181,7 +181,7 @@ int CModbusTcpVampDataProcThread::SendProcess() /** * @brief CModbusTcpVampDataProcThread::RecvNetData * MODBUS TCP 接收处理 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpVampDataProcThread::RecvNetData() { @@ -191,7 +191,7 @@ int CModbusTcpVampDataProcThread::RecvNetData() int recvLen, Len, i; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; DevAddr = m_AppData.lastCmdData[6]; FunCode = m_AppData.lastCmdData[7]; @@ -257,7 +257,7 @@ int CModbusTcpVampDataProcThread::RecvNetData() } CmdControlRespProcess(NULL, 0, 0); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } else//长度、地址、功能码 都正确则认为数据正确。 if ((Len == ExpectLen) && (DevAddr == Data[6]) && (FunCode == (Data[7] & 0x7f))) @@ -273,7 +273,7 @@ int CModbusTcpVampDataProcThread::RecvNetData() } //next RTU NextRtuIndex(m_ptrCFesChan); - return kbdSuccess; + return iotSuccess; } else { @@ -281,7 +281,7 @@ int CModbusTcpVampDataProcThread::RecvNetData() //next RTU CmdControlRespProcess(NULL, 0, 0); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } } @@ -359,7 +359,7 @@ int CModbusTcpVampDataProcThread::PollingCmdProcess() return 0; } - if (GetPollingCmd(&cmd) == kbdFailed) + if (GetPollingCmd(&cmd) == iotFailed) { //LOGERROR("CModbusTcpVampDataProcThread::PollingCmdProcess() return 0"); return 0; @@ -945,7 +945,7 @@ int CModbusTcpVampDataProcThread::DefCmdProcess(byte *Data, int dataSize) * @brief CModbusTcpVampDataProcThread::GetPollingCmd * 获取读取数据命令 * @param pCmd 返回读取数据命令 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpVampDataProcThread::GetPollingCmd(SModbusCmd *pCmd) { @@ -955,11 +955,11 @@ int CModbusTcpVampDataProcThread::GetPollingCmd(SModbusCmd *pCmd) if (m_ptrCFesRtu == NULL) { - return kbdFailed; + return iotFailed; } if (m_ptrCFesRtu->m_Param.ModbusCmdBuf.pCmd == NULL) { - return kbdFailed; + return iotFailed; } //2020-05-14 thxiao 如果没有配置块，则轮训下一个设备。 if (m_ptrCFesRtu->m_Param.ModbusCmdBuf.num == 0) @@ -980,17 +980,17 @@ int CModbusTcpVampDataProcThread::GetPollingCmd(SModbusCmd *pCmd) m_ptrCFesRtu->m_Param.ModbusCmdBuf.readx = 0; count++; if (ComFlag) - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } /** * @brief CModbusTcpVampDataProcThread::RecvDataProcess * @param Data * @param DataSize - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CModbusTcpVampDataProcThread::RecvDataProcess(byte *Data, int DataSize) { @@ -1000,7 +1000,7 @@ int CModbusTcpVampDataProcThread::RecvDataProcess(byte *Data, int DataSize) if (FunCode & 0x80) { CmdControlRespProcess(NULL, 0, 0); - return kbdSuccess; + return iotSuccess; } switch (FunCode) @@ -1024,10 +1024,10 @@ int CModbusTcpVampDataProcThread::RecvDataProcess(byte *Data, int DataSize) Cmd10RespProcess(Data, DataSize); break; default: - return kbdFailed; + return iotFailed; break; } - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/fes/protocol/opcclient/OpcClient.cpp b/product/src/fes/protocol/opcclient/OpcClient.cpp index 032b3d2d..59720a81 100644 --- a/product/src/fes/protocol/opcclient/OpcClient.cpp +++ b/product/src/fes/protocol/opcclient/OpcClient.cpp @@ -19,38 +19,38 @@ bool g_OpcClientChanelRun=true; int EX_SetBaseAddr(void *address) { OpcClient.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { OpcClient.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { OpcClient.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { OpcClient.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { OpcClient.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_OpcClientChanelRun=false;//使所有的线程退出。 OpcClient.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } /* //功能描述：OPC服务器数据变化的通知函数。 @@ -115,13 +115,13 @@ int COpcClient::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*)"opcclient"); } - return kbdSuccess; + return iotSuccess; } int COpcClient::SetProperty(int IsMainFes) { g_OpcClientIsMainFes = (bool)IsMainFes; - return kbdSuccess; + return iotSuccess; } /** @@ -130,7 +130,7 @@ int COpcClient::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int COpcClient::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -138,12 +138,12 @@ int COpcClient::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if (m_initRtuFlag == 0) { @@ -154,7 +154,7 @@ int COpcClient::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) RTU_DATA *RtuPtr = GetRtuPtrByChanNo(ChanNo); if (RtuPtr == NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesDataThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -166,13 +166,13 @@ int COpcClient::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("COpcClient EX_OpenChan() ChanNo:%d create COpcClientDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -182,7 +182,7 @@ int COpcClient::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int COpcClient::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -190,12 +190,12 @@ int COpcClient::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((CloseFlag==CN_FesDataThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) { @@ -206,7 +206,7 @@ int COpcClient::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -217,7 +217,7 @@ int COpcClient::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int COpcClient::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } void COpcClient::ClearDataProcThreadByChanNo(int ChanNo) diff --git a/product/src/fes/protocol/opcclient/OpcClientDataProcThread.cpp b/product/src/fes/protocol/opcclient/OpcClientDataProcThread.cpp index 374e0243..0bd67d09 100644 --- a/product/src/fes/protocol/opcclient/OpcClientDataProcThread.cpp +++ b/product/src/fes/protocol/opcclient/OpcClientDataProcThread.cpp @@ -88,7 +88,7 @@ COpcClientDataProcThread::~COpcClientDataProcThread() */ int COpcClientDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/protocol/protocolbase/ProtocolBase.cpp b/product/src/fes/protocol/protocolbase/ProtocolBase.cpp index 25d2e6d4..d8ad7362 100644 --- a/product/src/fes/protocol/protocolbase/ProtocolBase.cpp +++ b/product/src/fes/protocol/protocolbase/ProtocolBase.cpp @@ -25,21 +25,21 @@ CProtocolBase::~CProtocolBase() * @brief CProtocolBase::SetBaseAddr * 设置 m_ptrCFesBase 全局变量 * @param address - * @return 成功：kbdSuccess，失败：kbdFailed + * @return 成功：iotSuccess，失败：iotFailed */ /* int CProtocolBase::SetBaseAddr(void *address) { if(m_ptrCFesBase==NULL) m_ptrCFesBase = (CFesBase*)address; - return kbdSuccess; + return iotSuccess; } */ int SetBaseAddr(void *address) { if(m_ptrCFesBase==NULL) m_ptrCFesBase = (CFesBase*)address; - return kbdSuccess; + return iotSuccess; } /** diff --git a/product/src/fes/protocol/r80x_io/r80x_ioRtu.cpp b/product/src/fes/protocol/r80x_io/r80x_ioRtu.cpp index 5ae76a5c..96f98bee 100644 --- a/product/src/fes/protocol/r80x_io/r80x_ioRtu.cpp +++ b/product/src/fes/protocol/r80x_io/r80x_ioRtu.cpp @@ -18,37 +18,37 @@ bool g_r80x_ioRtuChanelRun=true; int EX_SetBaseAddr(void *address) { r80x_ioRtu.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { r80x_ioRtu.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { r80x_ioRtu.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { r80x_ioRtu.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { r80x_ioRtu.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int /*flag*/) { g_r80x_ioRtuChanelRun =false;//使所有的线程退出。 - return kbdSuccess; + return iotSuccess; } Cr80x_ioRtu::Cr80x_ioRtu() { @@ -77,14 +77,14 @@ int Cr80x_ioRtu::SetBaseAddr(void *address) m_ptrCFesBase->ProtocolRtuInitByParam1((char*)"r80x_io"); } - return kbdSuccess; + return iotSuccess; } int Cr80x_ioRtu::SetProperty(int IsMainFes) { g_r80x_ioRtuIsMainFes = IsMainFes; LOGDEBUG("Cr80x_ioRtu::SetProperty g_r80x_ioRtuIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -93,7 +93,7 @@ int Cr80x_ioRtu::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int Cr80x_ioRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -101,12 +101,12 @@ int Cr80x_ioRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -128,13 +128,13 @@ int Cr80x_ioRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("Cr80x_ioRtu EX_OpenChan() ChanNo:%d create Cr80x_ioRtuDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -144,7 +144,7 @@ int Cr80x_ioRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int Cr80x_ioRtu::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -152,12 +152,12 @@ int Cr80x_ioRtu::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("Cr80x_ioRtu::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -175,7 +175,7 @@ int Cr80x_ioRtu::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -193,7 +193,7 @@ int Cr80x_ioRtu::ChanTimer(int MainChanNo) int i, j, RtuNo; if ((ptrFesChan = m_ptrCFesBase->GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; SModbusCmd *pCmd; for (i = 0; im_RtuNum; i++) @@ -222,7 +222,7 @@ int Cr80x_ioRtu::ChanTimer(int MainChanNo) } } } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/r80x_io/r80x_ioRtuDataProcThread.cpp b/product/src/fes/protocol/r80x_io/r80x_ioRtuDataProcThread.cpp index 62bf3fde..d0ba528b 100644 --- a/product/src/fes/protocol/r80x_io/r80x_ioRtuDataProcThread.cpp +++ b/product/src/fes/protocol/r80x_io/r80x_ioRtuDataProcThread.cpp @@ -249,7 +249,7 @@ Cr80x_ioRtuDataProcThread::~Cr80x_ioRtuDataProcThread() */ int Cr80x_ioRtuDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -583,7 +583,7 @@ int Cr80x_ioRtuDataProcThread::PollingCmdProcess(int blockNum) return -1; } #if 0 - if (GetPollingCmd(&cmd) == kbdFailed) + if (GetPollingCmd(&cmd) == iotFailed) { return -1; } @@ -619,7 +619,7 @@ int Cr80x_ioRtuDataProcThread::PollingCmdProcess(int blockNum) * @brief Cr80x_ioRtuDataProcThread::GetPollingCmd * 获取读取数据命令 * @param pCmd 返回读取数据命令 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int Cr80x_ioRtuDataProcThread::GetPollingCmd(SModbusCmd *pCmd) { @@ -629,7 +629,7 @@ int Cr80x_ioRtuDataProcThread::GetPollingCmd(SModbusCmd *pCmd) int count = 0; if(m_ptrCFesRtu==NULL) - return kbdFailed; + return iotFailed; while (count < m_ptrCFesRtu->m_Param.ModbusCmdBuf.num) { @@ -646,10 +646,10 @@ int Cr80x_ioRtuDataProcThread::GetPollingCmd(SModbusCmd *pCmd) m_ptrCFesRtu->m_Param.ModbusCmdBuf.readx = 0; count++; if (ComFlag) - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } @@ -657,15 +657,15 @@ int Cr80x_ioRtuDataProcThread::GetPollingCmd(SModbusCmd *pCmd) * @brief Cr80x_ioRtuDataProcThread::RecvDataProcess * @param Data * @param DataSize -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int Cr80x_ioRtuDataProcThread::DataProcess(int Data) { //LOGDEBUG("DataProcess "); if (CmdControlRespProcess((byte*)&Data, 0, 1) == true) - return kbdSuccess; + return iotSuccess; Cmd01RespProcess(Data); - return kbdSuccess; + return iotSuccess; } void Cr80x_ioRtuDataProcThread::Cmd01RespProcess(int Data) diff --git a/product/src/fes/protocol/siemens103_tcp/SIEMENS103.cpp b/product/src/fes/protocol/siemens103_tcp/SIEMENS103.cpp index dbd4b034..43d76467 100644 --- a/product/src/fes/protocol/siemens103_tcp/SIEMENS103.cpp +++ b/product/src/fes/protocol/siemens103_tcp/SIEMENS103.cpp @@ -22,37 +22,37 @@ bool g_SIEMENS103ChanelRun=true; int EX_SetBaseAddr(void *address) { Siemens103.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { Siemens103.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { Siemens103.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { Siemens103.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { Siemens103.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_SIEMENS103ChanelRun=false;//使所有的线程退出。 Siemens103.InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } CSIEMENS103::CSIEMENS103() @@ -86,14 +86,14 @@ int CSIEMENS103::SetBaseAddr(void *address) //2020-02-13 thxiao ReadConfigParam()需要使用m_ptrCFesBase，所以改为SetBaseAddr()处调用 ReadConfigParam(); } - return kbdSuccess; + return iotSuccess; } int CSIEMENS103::SetProperty(int IsMainFes) { g_SIEMENS103IsMainFes = IsMainFes; LOGDEBUG("CSIEMENS103::SetProperty g_SIEMENS103IsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -102,7 +102,7 @@ int CSIEMENS103::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CSIEMENS103::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -110,12 +110,12 @@ int CSIEMENS103::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -130,14 +130,14 @@ int CSIEMENS103::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCTcpClient == NULL) { LOGERROR("CSIEMENS103 EX_OpenChan() ChanNo:%d create CTcpClientThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpClientQueue.push_back(ptrCTcpClient); ptrCTcpClient->resume(); //start TCP CLIENT THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -151,13 +151,13 @@ int CSIEMENS103::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CSIEMENS103 EX_OpenChan() ChanNo:%d create CSIEMENS103DataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -167,7 +167,7 @@ int CSIEMENS103::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CSIEMENS103::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -175,12 +175,12 @@ int CSIEMENS103::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; //LOGDEBUG("CSIEMENS103::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun) if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -202,7 +202,7 @@ int CSIEMENS103::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -214,7 +214,7 @@ int CSIEMENS103::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) int CSIEMENS103::ChanTimer(int /*MainChanNo*/) { //把命令缓冲时间间隔到的命放到发送命令缓冲区 - return kbdSuccess; + return iotSuccess; } void CSIEMENS103::ClearTcpClientThreadByChanNo(int ChanNo) @@ -261,7 +261,7 @@ void CSIEMENS103::ClearDataProcThreadByChanNo(int ChanNo) /** * @brief CSIEMENS103::ReadConfigParam * 读取Siemens103配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CSIEMENS103::ReadConfigParam() { @@ -274,20 +274,20 @@ int CSIEMENS103::ReadConfigParam() CFesRtuPtr ptrRTU; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"siemens103_tcp"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam ProtoclID error"); - return kbdFailed; + return iotFailed; } LOGDEBUG("siemens103_tcp ProtoclID=%d", m_ProtocolId); - if (config.load("../../data/fes/", "siemens103_tcp.xml") == kbdFailed) + if (config.load("../../data/fes/", "siemens103_tcp.xml") == iotFailed) { LOGDEBUG("siemens103_tcp load siemens103_tcp.xml error"); - return kbdFailed; + return iotFailed; } LOGDEBUG("siemens103_tcp load siemens103_tcp.xml ok"); for (i = 0; i < m_ptrCFesBase->m_vectCFesChanPtr.size(); i++) @@ -308,7 +308,7 @@ int CSIEMENS103::ReadConfigParam() items = 0; //>心跳周期(单位:秒) - if (config.getIntValue(strRtuNo, "heartbeat_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "heartbeat_interval", ivalue) == iotSuccess) { param.heartBeatPollReset = ivalue * 1000; items++; @@ -317,7 +317,7 @@ int CSIEMENS103::ReadConfigParam() param.heartBeatPollReset = 10 * 1000; //心跳周期默认10秒 //>总召唤时间周期(单位:秒) - if (config.getIntValue(strRtuNo, "alldata_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "alldata_interval", ivalue) == iotSuccess) { param.dataPollTimeoutReset = ivalue * 1000; items++; @@ -326,7 +326,7 @@ int CSIEMENS103::ReadConfigParam() param.dataPollTimeoutReset = 600 * 1000; //总召默认10分钟 //>电度量总召唤时间周期(单位:秒) - if (config.getIntValue(strRtuNo, "accdata_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "accdata_interval", ivalue) == iotSuccess) { param.accPollTimeoutReset = ivalue * 1000; items++; @@ -335,7 +335,7 @@ int CSIEMENS103::ReadConfigParam() param.accPollTimeoutReset = 900 * 1000;//电度默认15分钟 //>对时时间周期(单位:秒) - if (config.getIntValue(strRtuNo, "settime_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "settime_interval", ivalue) == iotSuccess) { param.setTimeTimeoutReset = ivalue * 1000; items++; @@ -344,7 +344,7 @@ int CSIEMENS103::ReadConfigParam() param.setTimeTimeoutReset = 600 * 1000;//对时默认10分钟 //>控制命令超时时间(单位:秒) - if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "control_timeout", ivalue) == iotSuccess) { param.controlTimeoutReset = ivalue * 1000; items++; @@ -353,7 +353,7 @@ int CSIEMENS103::ReadConfigParam() param.controlTimeoutReset = 5 * 1000; //控制超时默认5秒 //>源厂站地址 - if (config.getIntValue(strRtuNo, "sourstation_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "sourstation_address", ivalue) == iotSuccess) { param.sourStaAddr = ivalue; items++; @@ -362,7 +362,7 @@ int CSIEMENS103::ReadConfigParam() param.sourStaAddr = 0; //>目标厂站地址 - if (config.getIntValue(strRtuNo, "targetstation_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "targetstation_address", ivalue) == iotSuccess) { param.tarStaAddr = ivalue; items++; @@ -371,7 +371,7 @@ int CSIEMENS103::ReadConfigParam() param.tarStaAddr = 0; //>目标设备地址 - if (config.getIntValue(strRtuNo, "targetdevice_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "targetdevice_address", ivalue) == iotSuccess) { param.tarDevAddr = ivalue; items++; @@ -381,7 +381,7 @@ int CSIEMENS103::ReadConfigParam() //>设备类型 - if (config.getIntValue(strRtuNo, "device_type", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "device_type", ivalue) == iotSuccess) { param.deviceType = ivalue; items++; @@ -390,7 +390,7 @@ int CSIEMENS103::ReadConfigParam() param.deviceType = 43; //>设备网络状态 - if (config.getIntValue(strRtuNo, "devnetwork_status", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "devnetwork_status", ivalue) == iotSuccess) { param.devNetStatus = ivalue; items++; @@ -405,7 +405,7 @@ int CSIEMENS103::ReadConfigParam() } } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/siemens103_tcp/SIEMENS103DataProcThread.cpp b/product/src/fes/protocol/siemens103_tcp/SIEMENS103DataProcThread.cpp index 683ab6ce..4f990eb2 100644 --- a/product/src/fes/protocol/siemens103_tcp/SIEMENS103DataProcThread.cpp +++ b/product/src/fes/protocol/siemens103_tcp/SIEMENS103DataProcThread.cpp @@ -104,7 +104,7 @@ CSIEMENS103DataProcThread::~CSIEMENS103DataProcThread() */ int CSIEMENS103DataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -191,12 +191,12 @@ void CSIEMENS103DataProcThread::beforeQuit() /** * @brief CSIEMENS103DataProcThread::InitConfigParam * SIEMENS103 初始化配置参数 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CSIEMENS103DataProcThread::InitConfigParam() { if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; // memset(&m_AppData,0,sizeof(SSIEMENS103AppData)); int tempLen = sizeof(SSIEMENS103AppData) - sizeof(SSIEMENS103AppData_Temp); @@ -217,7 +217,7 @@ int CSIEMENS103DataProcThread::InitConfigParam() m_AppData.deviceType = 43; m_AppData.devNetStatus = 81; m_AppData.state = CN_SIEMENS103AppState_init; - return kbdSuccess; + return iotSuccess; } @@ -501,7 +501,7 @@ void CSIEMENS103DataProcThread::SendSetTimeFrame() /** * @brief CSIEMENS103DataProcThread::RecvDataProcess - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CSIEMENS103DataProcThread::RecvDataProcess() { @@ -510,7 +510,7 @@ int CSIEMENS103DataProcThread::RecvDataProcess() int dataType, dataSize, number; //数据类型、宽度、数目 if(m_AppData.recvBufSize<28) - return kbdFailed; + return iotFailed; //2019-06-11 thxiao 收到数据后，才认为通信状态正常。 if(m_AppData.comState != CN_FesRtuNormal) @@ -551,7 +551,7 @@ int CSIEMENS103DataProcThread::RecvDataProcess() default: break; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/snmp/snmp.cpp b/product/src/fes/protocol/snmp/snmp.cpp index ab55bdea..de6af220 100644 --- a/product/src/fes/protocol/snmp/snmp.cpp +++ b/product/src/fes/protocol/snmp/snmp.cpp @@ -24,31 +24,31 @@ bool g_snmpChanelRun=true; int EX_SetBaseAddr(void *address) { snmp.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { snmp.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { snmp.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { snmp.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { snmp.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) @@ -84,14 +84,14 @@ int CSnmp::SetBaseAddr(void *address) ReadConfigParam(); } - return kbdSuccess; + return iotSuccess; } int CSnmp::SetProperty(int IsMainFes) { g_snmpIsMainFes = IsMainFes; LOGDEBUG("CSnmp::SetProperty g_smnpIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -100,7 +100,7 @@ int CSnmp::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CSnmp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -109,19 +109,19 @@ int CSnmp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) SNMPRTUPtr RTUPtr; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if (m_initRtuFlag == 0) { InitRTUData(); m_initRtuFlag = 1; } if ((RTUPtr = GetRtuPtrByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -136,14 +136,14 @@ int CSnmp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrUdpClient == NULL) { LOGERROR("CSnmp EX_OpenChan() ChanNo:%d create CTcpServerRxTxThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_UdpClientThreadQueue.push_back(ptrUdpClient); ptrUdpClient->resume(); //start THREAD } break; default: - return kbdFailed; + return iotFailed; } } //LOGDEBUG("============"); @@ -158,14 +158,14 @@ int CSnmp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrDataProc == NULL) { LOGERROR("CSnmp EX_OpenChan() ChanNo:%d create CsmnpDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_DataProcThreadQueue.push_back(ptrDataProc); ptrDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } /** @@ -174,7 +174,7 @@ int CSnmp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CSnmp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -182,12 +182,12 @@ int CSnmp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CSnmp::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -208,7 +208,7 @@ int CSnmp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -219,14 +219,14 @@ int CSnmp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int CSnmp::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } int CSnmp::ExitSystem(int flag) { InformComThreadExit(); - return kbdSuccess; + return iotSuccess; } void CSnmp::ClearComThreadByChanNo(int ChanNo) @@ -273,7 +273,7 @@ void CSnmp::ClearDataProcThreadByChanNo(int ChanNo) /** * @brief CSnmp::ReadConfigParam * 读取smnp配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CSnmp::ReadConfigParam() { @@ -289,16 +289,16 @@ int CSnmp::ReadConfigParam() memset(¶m,0,sizeof(SSnmpAppConfigParam)); if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"snmp"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam ProtoclID error"); - return kbdFailed; + return iotFailed; } - if(config.load("../../data/fes/","snmp.xml")==kbdFailed) - return kbdSuccess; + if(config.load("../../data/fes/","snmp.xml")==iotFailed) + return iotSuccess; for (i = 0; i < m_ptrCFesBase->m_vectCFesChanPtr.size(); i++) { @@ -316,7 +316,7 @@ int CSnmp::ReadConfigParam() memset(¶m, 0, sizeof(param)); param.RtuNo = ptrRTU->m_Param.RtuNo; items = 0; - if (config.getIntValue(strRtuNo, "version", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "version", ivalue) == iotSuccess) { param.version = ivalue; items++; @@ -324,7 +324,7 @@ int CSnmp::ReadConfigParam() else param.version = 1; - if (config.getIntValue(strRtuNo, "maxGetPoints", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "maxGetPoints", ivalue) == iotSuccess) { param.maxGetPoints = ivalue; items++; @@ -332,7 +332,7 @@ int CSnmp::ReadConfigParam() else param.maxGetPoints = 150; - if (config.getStringValue(strRtuNo, "community", svalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "community", svalue) == iotSuccess) { memcpy(param.communityStr, svalue.c_str(), svalue.size()); param.communityLen = strlen((const char *)param.communityStr); @@ -349,14 +349,14 @@ int CSnmp::ReadConfigParam() } - if (config.getIntValue(strRtuNo, "port", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "port", ivalue) == iotSuccess) { param.port = ivalue; items++; } else param.port = 4700; - if (config.getStringValue(strRtuNo, "desAddress", svalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "desAddress", svalue) == iotSuccess) { memcpy(param.desAddress, svalue.c_str(), svalue.size()); //LOGDEBUG("CSnmp::ReadConfigParam %s %d", svalue.c_str(), svalue.size()); @@ -379,7 +379,7 @@ int CSnmp::ReadConfigParam() } } //LOGDEBUG("CSnmp::ReadConfigParam end"); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/snmp/snmpDataProcThread.cpp b/product/src/fes/protocol/snmp/snmpDataProcThread.cpp index 45bb79bc..0946b6cb 100644 --- a/product/src/fes/protocol/snmp/snmpDataProcThread.cpp +++ b/product/src/fes/protocol/snmp/snmpDataProcThread.cpp @@ -195,7 +195,7 @@ CSnmpDataProcThread::~CSnmpDataProcThread() */ int CSnmpDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -276,7 +276,7 @@ int CSnmpDataProcThread::RecvNetData() ////LOGDEBUG("CSnmpDataProcThread::RecvNetData() "); if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; //LOGDEBUG("CSnmpDataProcThread::RecvNetData() "); DevAddr = m_AppData.lastCmdData[6]; @@ -341,7 +341,7 @@ int CSnmpDataProcThread::RecvNetData() CmdControlRespProcess(NULL, 0, 0); #endif NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } //else//长度、地址、功能码 都正确则认为数据正确。 memset(&recvPdu, 0, sizeof(recvPdu)); @@ -365,7 +365,7 @@ int CSnmpDataProcThread::RecvNetData() } //next RTU NextRtuIndex(m_ptrCFesChan); - return kbdSuccess; + return iotSuccess; } else { @@ -375,7 +375,7 @@ int CSnmpDataProcThread::RecvNetData() //next RTU CmdControlRespProcess(NULL, 0, 0); NextRtuIndex(m_ptrCFesChan); - return kbdFailed; + return iotFailed; } } @@ -909,7 +909,7 @@ int CSnmpDataProcThread::SendProcess() //LOGDEBUG("============"); if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; int RtuNo = m_ptrCFesChan->m_RtuNo[m_ptrCFesChan->m_CurrentRtuIndex]; if ((m_ptrCFesRtu = m_ptrCFesBase->GetRtuDataByRtuNo(RtuNo)) == NULL) { @@ -1268,14 +1268,14 @@ int CSnmpDataProcThread::RecvDataProcess(byte *Data, int DataSize) { if (CmdControlRespProcess(Data, DataSize, 1) == true) { - return kbdSuccess; + return iotSuccess; } } else { if (CmdControlRespProcess(Data, DataSize, 0) == true) { - return kbdSuccess; + return iotSuccess; } } @@ -1436,7 +1436,7 @@ int CSnmpDataProcThread::RecvDataProcess(byte *Data, int DataSize) } LOGDEBUG("222m_RTUPtr:%d m_ptrCFesRtu:%d", m_RTUPtr->iRtuNo, m_ptrCFesRtu->m_Param.RtuNo); } - return kbdSuccess; + return iotSuccess; } @@ -1520,7 +1520,7 @@ void CSnmpDataProcThread::AppDataInit(vector vecAppParam, v int CSnmpDataProcThread::InitConfigParam() { if ((m_ptrCFesChan == NULL) || (m_ptrCFesRtu == NULL)) - return kbdFailed; + return iotFailed; LOGDEBUG("InitConfigParam"); //memset(&m_AppData, 0, sizeof(SSnmpAppData));//lww todo 声明结构进行初始化 m_AppData.version = 1; @@ -1529,7 +1529,7 @@ int CSnmpDataProcThread::InitConfigParam() memcpy(m_AppData.communityStr, "public", sizeof("public")); m_AppData.sendIntervalReset = 100;//100ms - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/snmps/snmps.cpp b/product/src/fes/protocol/snmps/snmps.cpp index edd8176f..06e3e6a9 100644 --- a/product/src/fes/protocol/snmps/snmps.cpp +++ b/product/src/fes/protocol/snmps/snmps.cpp @@ -11,31 +11,31 @@ bool g_SnmpsChanelRun = true; int EX_SetBaseAddr(void *address) { Snmps.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { Snmps.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo, int ChanNo, int OpenFlag) { Snmps.OpenChan(MainChanNo, ChanNo, OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo, int ChanNo, int CloseFlag) { Snmps.CloseChan(MainChanNo, ChanNo, CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { Snmps.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) @@ -43,7 +43,7 @@ int EX_ExitSystem(int flag) LOGDEBUG("snmps ExitSystem() start"); g_SnmpsChanelRun = false;//使所有的线程退出。 LOGDEBUG("snmps ExitSystem() end"); - return kbdSuccess; + return iotSuccess; } /** @@ -54,7 +54,7 @@ int EX_ExitSystem(int flag) */ int CSnmps::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } @@ -78,20 +78,20 @@ int CSnmps::SetBaseAddr(void *address) } ReadConfigParam(); - return kbdSuccess; + return iotSuccess; } int CSnmps::SetProperty(int IsMainFes) { g_SnmpsIsMainFes = IsMainFes; LOGDEBUG("CSNMPS::SetProperty g_SNMPSIsMainFes:%d", IsMainFes); - return kbdSuccess; + return iotSuccess; } /** * @brief CSnmps::ReadConfigParam * 读取smnps配置文件 -* @return 成功返回kbdSuccess，失败返回kbdFailed +* @return 成功返回iotSuccess，失败返回iotFailed */ int CSnmps::ReadConfigParam() { @@ -107,19 +107,19 @@ int CSnmps::ReadConfigParam() memset(¶m, 0, sizeof(SSnmpsAppConfigParam)); if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"snmps"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam ProtoclID error"); - return kbdFailed; + return iotFailed; } GetSnmpsProtocolInfo((char*) "snmps"); - if (config.load("../../data/fes/", "snmps.xml") == kbdFailed) - return kbdSuccess; + if (config.load("../../data/fes/", "snmps.xml") == iotFailed) + return iotSuccess; for (i = 0; i < m_ptrCFesBase->m_vectCFesChanPtr.size(); i++) { @@ -138,7 +138,7 @@ int CSnmps::ReadConfigParam() param.RtuNo = ptrRTU->m_Param.RtuNo; items = 0; //version - if (config.getIntValue(strRtuNo, "version", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "version", ivalue) == iotSuccess) { param.version = ivalue; items++; @@ -147,7 +147,7 @@ int CSnmps::ReadConfigParam() param.version = 1; //maxGetPoints - if (config.getIntValue(strRtuNo, "maxGetPoints", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "maxGetPoints", ivalue) == iotSuccess) { param.maxGetPoints = ivalue; items++; @@ -156,7 +156,7 @@ int CSnmps::ReadConfigParam() param.maxGetPoints = 150; //community - if (config.getStringValue(strRtuNo, "community", svalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "community", svalue) == iotSuccess) { memcpy(param.communityStr, svalue.c_str(), svalue.size()); param.communityLen = strlen((const char *)param.communityStr); @@ -169,7 +169,7 @@ int CSnmps::ReadConfigParam() } //maxUpdateCount - if (config.getIntValue(strRtuNo, "maxUpdateCount", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "maxUpdateCount", ivalue) == iotSuccess) { param.maxUpdateCount = ivalue; items++; @@ -185,7 +185,7 @@ int CSnmps::ReadConfigParam() } } } - return kbdSuccess; + return iotSuccess; } /** @@ -194,7 +194,7 @@ int CSnmps::ReadConfigParam() * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CSnmps::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) { @@ -202,12 +202,12 @@ int CSnmps::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if ((ptrMainFesChan = GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((ptrFesChan = GetChanDataByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((OpenFlag == CN_FesChanThread_Flag) || (OpenFlag == CN_FesChanAndDataThread_Flag)) { @@ -221,7 +221,7 @@ int CSnmps::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -235,14 +235,14 @@ int CSnmps::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) if (ptrDataProc == NULL) { LOGERROR("CSnmps EX_OpenChan() ChanNo:%d create CSmnpsDataProcThreadPtr error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_DataProcThreadQueue.push_back(ptrDataProc); ptrDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } /** @@ -251,7 +251,7 @@ int CSnmps::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CSnmps::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) { @@ -259,12 +259,12 @@ int CSnmps::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if ((ptrMainFesChan = GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((ptrFesChan = GetChanDataByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CSnmps::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d", MainChanNo, ChanNo, ptrFesChan->m_ComThreadRun, ptrMainFesChan->m_DataThreadRun); if ((CloseFlag == CN_FesChanThread_Flag) || (CloseFlag == CN_FesChanAndDataThread_Flag)) @@ -285,7 +285,7 @@ int CSnmps::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } void CSnmps::ClearDataProcThreadByChanNo(int ChanNo) diff --git a/product/src/fes/protocol/snmps/snmpsDataProcThread.cpp b/product/src/fes/protocol/snmps/snmpsDataProcThread.cpp index 04c11a67..0ae87a8a 100644 --- a/product/src/fes/protocol/snmps/snmpsDataProcThread.cpp +++ b/product/src/fes/protocol/snmps/snmpsDataProcThread.cpp @@ -45,7 +45,7 @@ int CSnmpsDataProcThread::InitSnmpAgent() { m_ptrCFesBase->WriteRtuSatus(m_ptrCFesRtu, CN_FesRtuComDown); LOGDEBUG("CSnmpsDataProcThread::InitSnmpAgent() ChanNo=%d port:%d 创建Snmpx对象失败 ", m_ptrCFesChan->m_Param.ChanNo, m_snmpPort); - return kbdFailed; + return iotFailed; } //创建MIB：创建类MIB的一个实例，保存所有的MIB信息并分发SNMP请求； @@ -75,7 +75,7 @@ int CSnmpsDataProcThread::InitSnmpAgent() //< 主要是加载之前保存的数据，如果有的话 pMib->init(); - return kbdSuccess; + return iotSuccess; } /* @@ -88,7 +88,7 @@ bool CSnmpsDataProcThread::initV3(const int nPort, const std::string &strReadCom pV3mp = new v3MP(engineId, 1, nStatus); if (SNMPv3_MP_OK != nStatus) - return kbdFailed; + return iotFailed; pRequestList->set_v3mp(pV3mp); @@ -244,7 +244,7 @@ CSnmpsDataProcThread::CSnmpsDataProcThread(CFesBase *ptrCFesBase, CFesChanPtr p //setlocale(LC_ALL, ""); //初始化Snmps相关 Snmp::socket_startup(); - if (InitSnmpAgent() == kbdSuccess) + if (InitSnmpAgent() == iotSuccess) { //静态表，ReadOnly @@ -373,7 +373,7 @@ void CSnmpsDataProcThread::beforeQuit() */ int CSnmpsDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/snmpv3/snmp.cpp b/product/src/fes/protocol/snmpv3/snmp.cpp index 668e467a..37514513 100644 --- a/product/src/fes/protocol/snmpv3/snmp.cpp +++ b/product/src/fes/protocol/snmpv3/snmp.cpp @@ -24,31 +24,31 @@ bool g_snmpChanelRun=true; int EX_SetBaseAddr(void *address) { snmp.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { snmp.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { snmp.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { snmp.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { snmp.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) @@ -84,14 +84,14 @@ int CSnmp::SetBaseAddr(void *address) ReadConfigParam(); } - return kbdSuccess; + return iotSuccess; } int CSnmp::SetProperty(int IsMainFes) { g_snmpIsMainFes = IsMainFes; LOGDEBUG("CSnmp::SetProperty g_smnpIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -100,7 +100,7 @@ int CSnmp::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CSnmp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -109,20 +109,20 @@ int CSnmp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) SNMPRTUPtr RTUPtr; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; //LOGDEBUG("CSnmp::ReadConfigParam"); if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if (m_initRtuFlag == 0) { InitRTUData(); m_initRtuFlag = 1; } if ((RTUPtr = GetRtuPtrByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; //LOGDEBUG("CSnmp::ReadConfigParam"); if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) @@ -147,14 +147,14 @@ int CSnmp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrDataProc == NULL) { LOGERROR("CSnmp EX_OpenChan() ChanNo:%d create CsmnpDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_DataProcThreadQueue.push_back(ptrDataProc); ptrDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } /** @@ -163,7 +163,7 @@ int CSnmp::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CSnmp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -171,12 +171,12 @@ int CSnmp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CSnmp::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -199,7 +199,7 @@ int CSnmp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -210,14 +210,14 @@ int CSnmp::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int CSnmp::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } int CSnmp::ExitSystem(int flag) { InformComThreadExit(); - return kbdSuccess; + return iotSuccess; } void CSnmp::ClearComThreadByChanNo(int ChanNo) @@ -267,7 +267,7 @@ void CSnmp::ClearDataProcThreadByChanNo(int ChanNo) /** * @brief CSnmp::ReadConfigParam * 读取smnp配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CSnmp::ReadConfigParam() { @@ -283,16 +283,16 @@ int CSnmp::ReadConfigParam() memset(¶m,0,sizeof(SSnmpAppConfigParam)); if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"snmpv3"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam ProtoclID error"); - return kbdFailed; + return iotFailed; } - if(config.load("../../data/fes/","snmpv3.xml")==kbdFailed) - return kbdSuccess; + if(config.load("../../data/fes/","snmpv3.xml")==iotFailed) + return iotSuccess; for (i = 0; i < m_ptrCFesBase->m_vectCFesChanPtr.size(); i++) { ptrChan = m_ptrCFesBase->m_vectCFesChanPtr[i]; @@ -311,7 +311,7 @@ int CSnmp::ReadConfigParam() param.RtuNo = ptrRTU->m_Param.RtuNo; items = 0; - if (config.getIntValue(strRtuNo, "version", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "version", ivalue) == iotSuccess) { param.version = ivalue; items++; @@ -319,7 +319,7 @@ int CSnmp::ReadConfigParam() else param.version = 1; - if (config.getIntValue(strRtuNo, "maxGetPoints", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "maxGetPoints", ivalue) == iotSuccess) { param.maxGetPoints = ivalue; @@ -328,7 +328,7 @@ int CSnmp::ReadConfigParam() else param.maxGetPoints = 150; - if (config.getStringValue(strRtuNo, "community", svalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "community", svalue) == iotSuccess) { memcpy(param.communityStr, svalue.c_str(), svalue.size()); param.communityLen = strlen((const char *)param.communityStr); @@ -345,14 +345,14 @@ int CSnmp::ReadConfigParam() } - if (config.getIntValue(strRtuNo, "port", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "port", ivalue) == iotSuccess) { param.port = ivalue; items++; } else param.port = 4700; - if (config.getStringValue(strRtuNo, "desAddress", svalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "desAddress", svalue) == iotSuccess) { memcpy(param.desAddress, svalue.c_str(), svalue.size()); //LOGDEBUG("CSnmp::ReadConfigParam %s %d", svalue.c_str(), svalue.size()); @@ -364,7 +364,7 @@ int CSnmp::ReadConfigParam() memcpy(param.desAddress, "127.0.0.1", sizeof("127.0.0.1")); - if (config.getStringValue(strRtuNo, "securityName", svalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "securityName", svalue) == iotSuccess) { memcpy(param.securityName, svalue.c_str(), svalue.size()); @@ -375,7 +375,7 @@ int CSnmp::ReadConfigParam() memcpy(param.securityName, "admin", sizeof("admin")); } - if (config.getStringValue(strRtuNo, "privPassword", svalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "privPassword", svalue) == iotSuccess) { memcpy(param.privPassword, svalue.c_str(), svalue.size()); @@ -386,7 +386,7 @@ int CSnmp::ReadConfigParam() memcpy(param.securityName, "kbdct@0755", sizeof("kbdct@0755")); } - if (config.getStringValue(strRtuNo, "authPassword", svalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "authPassword", svalue) == iotSuccess) { memcpy(param.authPassword, svalue.c_str(), svalue.size()); @@ -398,7 +398,7 @@ int CSnmp::ReadConfigParam() LOGDEBUG("CSnmp::ReadConfigParam"); } - if (config.getStringValue(strRtuNo, "contextName", svalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "contextName", svalue) == iotSuccess) { memcpy(param.contextName, svalue.c_str(), svalue.size()); @@ -409,7 +409,7 @@ int CSnmp::ReadConfigParam() memcpy(param.contextName, "", sizeof("")); } - if (config.getStringValue(strRtuNo, "contextEngineID", svalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "contextEngineID", svalue) == iotSuccess) { memcpy(param.contextEngineID, svalue.c_str(), svalue.size()); @@ -419,21 +419,21 @@ int CSnmp::ReadConfigParam() { memcpy(param.contextEngineID, "", sizeof("")); } - if (config.getIntValue(strRtuNo, "securityModel", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "securityModel", ivalue) == iotSuccess) { param.securityModel = ivalue; items++; } else param.securityModel = 2; - if (config.getIntValue(strRtuNo, "securityLevel", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "securityLevel", ivalue) == iotSuccess) { param.securityLevel = ivalue; items++; } else param.securityLevel = 3; - if (config.getIntValue(strRtuNo, "authProtocol", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "authProtocol", ivalue) == iotSuccess) { param.authProtocol = ivalue; items++; @@ -441,7 +441,7 @@ int CSnmp::ReadConfigParam() else param.authProtocol = 3; - if (config.getIntValue(strRtuNo, "privProtocol", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "privProtocol", ivalue) == iotSuccess) { param.privProtocol = ivalue; items++; @@ -460,7 +460,7 @@ int CSnmp::ReadConfigParam() } } //LOGDEBUG("CSnmp::ReadConfigParam end"); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/snmpv3/snmpDataProcThread.cpp b/product/src/fes/protocol/snmpv3/snmpDataProcThread.cpp index f79f2793..b72334da 100644 --- a/product/src/fes/protocol/snmpv3/snmpDataProcThread.cpp +++ b/product/src/fes/protocol/snmpv3/snmpDataProcThread.cpp @@ -157,7 +157,7 @@ CSnmpDataProcThread::~CSnmpDataProcThread() */ int CSnmpDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -360,7 +360,7 @@ int CSnmpDataProcThread::snmpGet() if (g_snmpIsMainFes == false)//备机不作任何操作 return 0; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; int count = 0; int retsts = true; @@ -787,6 +787,6 @@ int CSnmpDataProcThread::snmpGet() utarget.clear(); delete v3_MP; - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/sqlserver_s/DataProcThread.cpp b/product/src/fes/protocol/sqlserver_s/DataProcThread.cpp index 32ba52a5..3b7f8614 100644 --- a/product/src/fes/protocol/sqlserver_s/DataProcThread.cpp +++ b/product/src/fes/protocol/sqlserver_s/DataProcThread.cpp @@ -78,7 +78,7 @@ DataProcThread::~DataProcThread() */ int DataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -120,19 +120,19 @@ void DataProcThread::beforeQuit() /** * @brief DataProcThread::InitConfigParam * Hcmqtts 初始化配置参数 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int DataProcThread::InitConfigParam() { if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; m_AppData.db_name = "iscs_db"; m_AppData.table_name = "HistoryGenerallyVariable"; m_AppData.user_name = "sa"; m_AppData.password = "sa"; - return kbdSuccess; + return iotSuccess; } void DataProcThread::TimerProcess() @@ -177,7 +177,7 @@ int DataProcThread::handlData() if(!ifOnTimeAndRecord()) { - return kbdSuccess; + return iotSuccess; } @@ -191,7 +191,7 @@ int DataProcThread::handlData() LOGERROR("DataProcThread.cpp db open faild ChanNo:%s info %s", m_ptrCFesChan->m_Param.NetRoute[0].NetDesc, db.lastError().text().toStdString().c_str()); - return kbdFailed; + return iotFailed; } QString sql=" INSERT INTO %1 (VariableName, Time, Value) " @@ -210,7 +210,7 @@ int DataProcThread::handlData() //m_mapLastUpateTime[m_AppData.RtuNo]=getUTCTimeSec(); } - return kbdSuccess; + return iotSuccess; } bool DataProcThread::handleAiData(CFesRtuPtr ptrRtu,QSqlDatabase& db,QString& templateSql) diff --git a/product/src/fes/protocol/sqlserver_s/SqlServer.cpp b/product/src/fes/protocol/sqlserver_s/SqlServer.cpp index 5a05716f..b4c06a2f 100644 --- a/product/src/fes/protocol/sqlserver_s/SqlServer.cpp +++ b/product/src/fes/protocol/sqlserver_s/SqlServer.cpp @@ -12,31 +12,31 @@ bool g_SqlServerChanelRun = true; int EX_SetBaseAddr(void *address) { server.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { server.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { server.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { server.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { server.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) @@ -45,7 +45,7 @@ int EX_ExitSystem(int flag) server.ExitSystem(flag); LOGDEBUG("CSqlServer EX_ExitSystem() end"); g_SqlServerChanelRun = false;//使所有的线程退出。 - return kbdSuccess; + return iotSuccess; } CSqlServer::CSqlServer() { @@ -66,7 +66,7 @@ int CSqlServer::SetBaseAddr(void *address) m_ptrCFesBase = (CFesBase *)address; ReadConfigParam(); } - return kbdSuccess; + return iotSuccess; } int CSqlServer::SetProperty(int IsMainFes) @@ -85,7 +85,7 @@ int CSqlServer::SetProperty(int IsMainFes) } g_SqlServerIsMainFes = (IsMainFes == 1); LOGDEBUG("CSqlServer::SetProperty IsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -93,7 +93,7 @@ int CSqlServer::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CSqlServer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -101,12 +101,12 @@ int CSqlServer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if ((OpenFlag == CN_FesChanThread_Flag) || (OpenFlag == CN_FesChanAndDataThread_Flag)) { @@ -117,7 +117,7 @@ int CSqlServer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) break; default: LOGERROR("CSqlServer EX_OpenChan() ChanNo:%d CommType=%d is not TCP SERVER/Client!", ptrFesChan->m_Param.ChanNo, ptrFesChan->m_Param.CommType); - return kbdFailed; + return iotFailed; } } @@ -135,13 +135,13 @@ int CSqlServer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (m_ptrCDataProc == NULL) { LOGERROR("CSqlServer EX_OpenChan() ChanNo:%d create DataProcThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } LOGDEBUG("CSqlServer EX_OpenChan() ChanNo:%d create DataProcThread ok!", ptrFesChan->m_Param.ChanNo); m_ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } /** @@ -149,7 +149,7 @@ int CSqlServer::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CSqlServer::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -157,12 +157,12 @@ int CSqlServer::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CSqlServer::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d", MainChanNo, @@ -179,7 +179,7 @@ int CSqlServer::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) m_ptrCDataProc =NULL; } } - return kbdSuccess; + return iotSuccess; } /** @@ -193,7 +193,7 @@ int CSqlServer::ChanTimer(int MainChanNo) boost::ignore_unused_variable_warning(MainChanNo); //把命令缓冲时间间隔到的命放到发送命令缓冲区 - return kbdSuccess; + return iotSuccess; } int CSqlServer::ExitSystem(int flag) @@ -207,13 +207,13 @@ int CSqlServer::ExitSystem(int flag) m_ptrCDataProc = NULL; } - return kbdSuccess; + return iotSuccess; } /** * @brief CSqlServer::ReadConfigParam * 读取MdbTcpSer配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CSqlServer::ReadConfigParam() { @@ -227,20 +227,20 @@ int CSqlServer::ReadConfigParam() int ivalue; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"sqlserver_s"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam ProtoclID error"); - return kbdFailed; + return iotFailed; } LOGINFO("sqlserver_s ProtoclID=%d", m_ProtocolId); - if (config.load("../../data/fes/", "sqlserver_s.xml") == kbdFailed) + if (config.load("../../data/fes/", "sqlserver_s.xml") == iotFailed) { LOGDEBUG("sqlserver_s load sqlserver_s.xml error"); - return kbdSuccess; + return iotSuccess; } LOGDEBUG("sqlserver_s load sqlserver_s.xml ok"); @@ -262,7 +262,7 @@ int CSqlServer::ReadConfigParam() items = 0; param.db_name = "iscs_db"; strvalue.clear(); - if (config.getStringValue(strRtuNo, "db_name", strvalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "db_name", strvalue) == iotSuccess) { param.db_name = strvalue; items++; @@ -270,7 +270,7 @@ int CSqlServer::ReadConfigParam() param.interval_time = 3000; - if (config.getIntValue(strRtuNo, "interval_time", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "interval_time", ivalue) == iotSuccess) { param.interval_time = ivalue; items++; @@ -279,7 +279,7 @@ int CSqlServer::ReadConfigParam() param.table_name = "HistoryGenerallyVariable"; strvalue.clear(); - if (config.getStringValue(strRtuNo, "table_name", strvalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "table_name", strvalue) == iotSuccess) { param.table_name = strvalue; items++; @@ -290,7 +290,7 @@ int CSqlServer::ReadConfigParam() param.password="relyez@2019"; strvalue.clear(); - if (config.getStringValue(strRtuNo, "password", strvalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "password", strvalue) == iotSuccess) { param.password = strvalue; items++; @@ -300,7 +300,7 @@ int CSqlServer::ReadConfigParam() param.user_name="sa"; strvalue.clear(); - if (config.getStringValue(strRtuNo, "user_name", strvalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "user_name", strvalue) == iotSuccess) { param.user_name = strvalue; items++; @@ -308,7 +308,7 @@ int CSqlServer::ReadConfigParam() param.second_offset=0; - if (config.getIntValue(strRtuNo, "second_offset", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "second_offset", ivalue) == iotSuccess) { param.second_offset = ivalue; items++; @@ -317,7 +317,7 @@ int CSqlServer::ReadConfigParam() param.strHour="0"; strvalue.clear(); - if (config.getStringValue(strRtuNo, "strHour", strvalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "strHour", strvalue) == iotSuccess) { param.strHour = strvalue; items++; @@ -326,7 +326,7 @@ int CSqlServer::ReadConfigParam() param.strMinute="0"; strvalue.clear(); - if (config.getStringValue(strRtuNo, "strMinute", strvalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "strMinute", strvalue) == iotSuccess) { param.strMinute = strvalue; items++; @@ -335,7 +335,7 @@ int CSqlServer::ReadConfigParam() param.strSecond="0"; strvalue.clear(); - if (config.getStringValue(strRtuNo, "strSecond", strvalue) == kbdSuccess) + if (config.getStringValue(strRtuNo, "strSecond", strvalue) == iotSuccess) { param.strSecond = strvalue; items++; @@ -350,7 +350,7 @@ int CSqlServer::ReadConfigParam() } } } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/szdt_robot/SZDT_Robot.cpp b/product/src/fes/protocol/szdt_robot/SZDT_Robot.cpp index d31898e9..351573ce 100644 --- a/product/src/fes/protocol/szdt_robot/SZDT_Robot.cpp +++ b/product/src/fes/protocol/szdt_robot/SZDT_Robot.cpp @@ -19,31 +19,31 @@ bool g_SZDT_RobotChanelRun = true; int EX_SetBaseAddr(void *address) { SZDT_Robot.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { SZDT_Robot.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo, int ChanNo, int OpenFlag) { SZDT_Robot.OpenChan(MainChanNo, ChanNo, OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo, int ChanNo, int CloseFlag) { SZDT_Robot.CloseChan(MainChanNo, ChanNo, CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { SZDT_Robot.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) @@ -60,7 +60,7 @@ int EX_ExitSystem(int flag) */ int CSZDT_Robot::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } @@ -87,14 +87,14 @@ int CSZDT_Robot::SetBaseAddr(void *address) { m_ptrCFesBase = (CFesBase *)address; } - return kbdSuccess; + return iotSuccess; } int CSZDT_Robot::SetProperty(int IsMainFes) { g_SZDT_RobotIsMainFes = IsMainFes; LOGDEBUG("CSZDT_Robot::SetProperty g_SZDT_RobotIsMainFes:%d", IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -103,18 +103,18 @@ int CSZDT_Robot::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CSZDT_Robot::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) { CFesChanPtr ptrMainFesChan; CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if ((ptrMainFesChan = GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((ptrFesChan = GetChanDataByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; //TcpServerListenThread create only once time if (m_TcpServerListenThreadFlag) { @@ -122,7 +122,7 @@ int CSZDT_Robot::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) if (m_CTcpServerListenThread == NULL) { LOGERROR("CSZDT_Robot EX_OpenChan() ChanNo:%d create CTcpServerListenThread error!"); - return kbdFailed; + return iotFailed; } GetSZDT_RobotProtocolInfo((char*) "szdt_robot"); m_CTcpServerListenThread->resume(); //start TCP ServerListen THREAD @@ -142,14 +142,14 @@ int CSZDT_Robot::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) if (ptrCTcpServerRxTx == NULL) { LOGERROR("CSZDT_Robot EX_OpenChan() ChanNo:%d create CTcpServerRxTxThread error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CTcpServerRxTxQueue.push_back(ptrCTcpServerRxTx); ptrCTcpServerRxTx->resume(); //start TCP Server THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -163,13 +163,13 @@ int CSZDT_Robot::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CSZDT_Robot EX_OpenChan() ChanNo:%d create CSZDT_RobotDataProcThreadPtr error!", ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } /** @@ -178,7 +178,7 @@ int CSZDT_Robot::OpenChan(int MainChanNo, int ChanNo, int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CSZDT_Robot::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) { @@ -186,12 +186,12 @@ int CSZDT_Robot::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if ((ptrMainFesChan = GetChanDataByChanNo(MainChanNo)) == NULL) - return kbdFailed; + return iotFailed; if ((ptrFesChan = GetChanDataByChanNo(ChanNo)) == NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CSZDT_Robot::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d", MainChanNo, ChanNo, ptrFesChan->m_ComThreadRun, ptrMainFesChan->m_DataThreadRun); if ((CloseFlag == CN_FesChanThread_Flag) || (CloseFlag == CN_FesChanAndDataThread_Flag)) @@ -207,7 +207,7 @@ int CSZDT_Robot::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) } break; default: - return kbdFailed; + return iotFailed; } } @@ -220,7 +220,7 @@ int CSZDT_Robot::CloseChan(int MainChanNo, int ChanNo, int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } @@ -291,7 +291,7 @@ int CSZDT_Robot::ExitSystem(int flag) { InformTcpThreadExit(); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/szdt_robot/SZDT_RobotDataProcThread.cpp b/product/src/fes/protocol/szdt_robot/SZDT_RobotDataProcThread.cpp index b64d416e..b5a26a4a 100644 --- a/product/src/fes/protocol/szdt_robot/SZDT_RobotDataProcThread.cpp +++ b/product/src/fes/protocol/szdt_robot/SZDT_RobotDataProcThread.cpp @@ -107,7 +107,7 @@ CSZDT_RobotDataProcThread::~CSZDT_RobotDataProcThread() int CSZDT_RobotDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } void CSZDT_RobotDataProcThread::beforeQuit() @@ -162,7 +162,7 @@ void CSZDT_RobotDataProcThread::execute() /** * @brief CSZDT_RobotDataProcThread::RecvDataProcess -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CSZDT_RobotDataProcThread::RecvDataProcess() { @@ -198,14 +198,14 @@ int CSZDT_RobotDataProcThread::RecvDataProcess() if (rootElement == NULL || strcmp(rootElement->Value(), CN_SZDT_RootElement1)) { LOGDEBUG("SZDT_RobotDataProcThread:xml数据的根节点不为%s,xml格式错误！", CN_SZDT_RootElement1); - return kbdFailed; + return iotFailed; } i = 1; TiXmlElement* Element11 = rootElement->FirstChildElement(); if (Element11 == NULL || strcmp(Element11->Value(), CN_SZDT_Element11)) { LOGDEBUG("SZDT_RobotDataProcThread:xml数据的第%d个节点不为%s,xml格式错误！", i, CN_SZDT_Element11); - return kbdFailed; + return iotFailed; } i++; ReceiveCode = Element11->GetText(); @@ -214,7 +214,7 @@ int CSZDT_RobotDataProcThread::RecvDataProcess() if (Element12 == NULL || strcmp(Element12->Value(), CN_SZDT_Element12)) { LOGDEBUG("SZDT_RobotDataProcThread:xml数据的第%d个节点不为%s，xml格式错误！", i, CN_SZDT_Element12); - return kbdFailed; + return iotFailed; } i++; SendCode = Element12->GetText(); @@ -223,7 +223,7 @@ int CSZDT_RobotDataProcThread::RecvDataProcess() if (Element13 == NULL || strcmp(Element13->Value(), CN_SZDT_Element13)) { LOGDEBUG("SZDT_RobotDataProcThread:xml数据的第%d个节点不为%s，xml格式错误！", i, CN_SZDT_Element13); - return kbdFailed; + return iotFailed; } i++; Type = Element13->GetText(); @@ -233,7 +233,7 @@ int CSZDT_RobotDataProcThread::RecvDataProcess() if (Element14 == NULL || strcmp(Element14->Value(), CN_SZDT_Element14)) { LOGDEBUG("SZDT_RobotDataProcThread:xml数据的第%d个节点不为%s，xml格式错误！", i, CN_SZDT_Element14); - return kbdFailed; + return iotFailed; } i++; Code = Element14->GetText(); @@ -242,7 +242,7 @@ int CSZDT_RobotDataProcThread::RecvDataProcess() if (Element15 == NULL || strcmp(Element15->Value(), CN_SZDT_Element15)) { LOGDEBUG("SZDT_RobotDataProcThread:xml数据的第%d个节点不为%s，xml格式错误！", i, CN_SZDT_Element15); - return kbdFailed; + return iotFailed; } i++; Command = Element15->GetText(); @@ -251,7 +251,7 @@ int CSZDT_RobotDataProcThread::RecvDataProcess() if (Element16 == NULL || strcmp(Element16->Value(), CN_SZDT_Element16)) { LOGDEBUG("SZDT_RobotDataProcThread:xml数据的第%d个节点不为%s，xml格式错误！", i, CN_SZDT_Element16); - return kbdFailed; + return iotFailed; } i++; Time = Element16->GetText(); @@ -261,7 +261,7 @@ int CSZDT_RobotDataProcThread::RecvDataProcess() if (Element17 == NULL || strcmp(Element17->Value(), CN_SZDT_RootElement2)) { LOGDEBUG("SZDT_RobotDataProcThread:xml数据的第%d个节点不为%s，xml格式错误！", i, CN_SZDT_RootElement2); - return kbdFailed; + return iotFailed; } i++; /*===================item=================== */ @@ -290,7 +290,7 @@ int CSZDT_RobotDataProcThread::RecvDataProcess() /*======================================解析======================================*/ RecvDataProcessPro(); - return kbdSuccess; + return iotSuccess; } /************************************************************************/ @@ -574,7 +574,7 @@ int CSZDT_RobotDataProcThread::RecvDataProcessPro() ItemAttrName.clear(); ItemAttrValue.clear(); - return kbdSuccess; + return iotSuccess; } /************************************************************************/ @@ -648,7 +648,7 @@ int CSZDT_RobotDataProcThread::SendProcess() int retLen = 1;//测试接收数据，应=0 if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; if (m_AppData.comState == CN_FesRtuNormal) { @@ -656,7 +656,7 @@ int CSZDT_RobotDataProcThread::SendProcess() { //读取机器人运行状态 int result = ReadStatus(); - if (result == kbdSuccess) + if (result == iotSuccess) { m_AppData.state = CN_SZDT_RobotAppState_waitReadResp; m_AppData.controlTimeout = getMonotonicMsec(); @@ -668,7 +668,7 @@ int CSZDT_RobotDataProcThread::SendProcess() { //设置机器人为任务模式 int result = SetTaskMode(); - if (result == kbdSuccess) + if (result == iotSuccess) { m_AppData.state = CN_SZDT_RobotAppState_waitSetResp; m_AppData.controlTimeout = getMonotonicMsec(); @@ -703,13 +703,13 @@ int CSZDT_RobotDataProcThread::ReadStatus() SFesAi* ai = m_ptrCFesRtu->GetAiByPointNo(0); if (ai == NULL) { - return kbdFailed; + return iotFailed; } int RobotCode = ai->Param1; int Len = SendXmlToData2(data, "121", std::to_string(RobotCode), "41", itemAttrs); SendDataToPort(data, Len); - return kbdSuccess; + return iotSuccess; } /************************************************************************/ @@ -723,13 +723,13 @@ int CSZDT_RobotDataProcThread::SetTaskMode() SFesAi* ai = m_ptrCFesRtu->GetAiByPointNo(0); if (ai == NULL) { - return kbdFailed; + return iotFailed; } int RobotCode = ai->Param1; int Len = SendXmlToData(data, "1", std::to_string(RobotCode), "5", GetTime(0), items); SendDataToPort(data, Len); - return kbdSuccess; + return iotSuccess; } /** @@ -1171,7 +1171,7 @@ void CSZDT_RobotDataProcThread::SendDataToPort(byte *Data, int Size) /** * @brief CSZDT_RobotDataProcThread::RecvNetData * 接收处理 -* @return 成功：kbdSuccess 失败：kbdFailed +* @return 成功：iotSuccess 失败：iotFailed */ int CSZDT_RobotDataProcThread::RecvNetData() { @@ -1179,7 +1179,7 @@ int CSZDT_RobotDataProcThread::RecvNetData() int count; if (m_ptrCurrentChan == NULL) - return kbdFailed; + return iotFailed; count = m_ptrCurrentChan->m_Param.RespTimeout / 10; if (count <= 10) diff --git a/product/src/fes/protocol/virtualrtu/virtualrtu.cpp b/product/src/fes/protocol/virtualrtu/virtualrtu.cpp index 74a4700d..5556efc5 100644 --- a/product/src/fes/protocol/virtualrtu/virtualrtu.cpp +++ b/product/src/fes/protocol/virtualrtu/virtualrtu.cpp @@ -18,37 +18,37 @@ bool g_virtualrtu_ChanelRun=true; int EX_SetBaseAddr(void *address) { virtualrtu.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { virtualrtu.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { virtualrtu.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { virtualrtu.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { virtualrtu.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) { g_virtualrtu_IsMainFes =false;//使所有的线程退出。 - return kbdSuccess; + return iotSuccess; } CVirtualRtu::CVirtualRtu() { @@ -72,14 +72,14 @@ int CVirtualRtu::SetBaseAddr(void *address) m_ptrCFesBase = (CFesBase *)address; } - return kbdSuccess; + return iotSuccess; } int CVirtualRtu::SetProperty(int IsMainFes) { g_virtualrtu_IsMainFes = IsMainFes; LOGDEBUG("CVirtualRtu::SetProperty g_virtualrtu_IsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -88,7 +88,7 @@ int CVirtualRtu::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CVirtualRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -96,12 +96,12 @@ int CVirtualRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -121,13 +121,13 @@ int CVirtualRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrCDataProc == NULL) { LOGERROR("CVirtualRtu EX_OpenChan() ChanNo:%d create CVirtualRtuDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_CDataProcQueue.push_back(ptrCDataProc); ptrCDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } @@ -137,7 +137,7 @@ int CVirtualRtu::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CVirtualRtu::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -145,12 +145,12 @@ int CVirtualRtu::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CVirtualRtu::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -168,7 +168,7 @@ int CVirtualRtu::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -180,7 +180,7 @@ int CVirtualRtu::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) int CVirtualRtu::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/virtualrtu/virtualrtuDataProcThread.cpp b/product/src/fes/protocol/virtualrtu/virtualrtuDataProcThread.cpp index 7e718895..0fdf76c1 100644 --- a/product/src/fes/protocol/virtualrtu/virtualrtuDataProcThread.cpp +++ b/product/src/fes/protocol/virtualrtu/virtualrtuDataProcThread.cpp @@ -59,7 +59,7 @@ CVirtualRtuDataProcThread::~CVirtualRtuDataProcThread() */ int CVirtualRtuDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* diff --git a/product/src/fes/protocol/wfudpcdt/wfudpcdt.cpp b/product/src/fes/protocol/wfudpcdt/wfudpcdt.cpp index 7d2eb441..82c902b0 100644 --- a/product/src/fes/protocol/wfudpcdt/wfudpcdt.cpp +++ b/product/src/fes/protocol/wfudpcdt/wfudpcdt.cpp @@ -20,31 +20,31 @@ bool g_wfudpcdtChanelRun=true; int EX_SetBaseAddr(void *address) { wfudpcdt.SetBaseAddr(address); - return kbdSuccess; + return iotSuccess; } int EX_SetProperty(int FesStatus) { wfudpcdt.SetProperty(FesStatus); - return kbdSuccess; + return iotSuccess; } int EX_OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { wfudpcdt.OpenChan(MainChanNo,ChanNo,OpenFlag); - return kbdSuccess; + return iotSuccess; } int EX_CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { wfudpcdt.CloseChan(MainChanNo,ChanNo,CloseFlag); - return kbdSuccess; + return iotSuccess; } int EX_ChanTimer(int ChanNo) { wfudpcdt.ChanTimer(ChanNo); - return kbdSuccess; + return iotSuccess; } int EX_ExitSystem(int flag) @@ -77,14 +77,14 @@ int CWfudpcdt::SetBaseAddr(void *address) m_ptrCFesBase = (CFesBase *)address; ReadConfigParam(); } - return kbdSuccess; + return iotSuccess; } int CWfudpcdt::SetProperty(int IsMainFes) { g_wfudpcdtIsMainFes = IsMainFes; LOGDEBUG("CWfudpcdt::SetProperty g_wfudpcdtIsMainFes:%d",IsMainFes); - return kbdSuccess; + return iotSuccess; } /** @@ -93,7 +93,7 @@ int CWfudpcdt::SetProperty(int IsMainFes) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 打开标志 1：打开通道线程 2：打开数据处理线程 3：打开通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CWfudpcdt::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) { @@ -101,12 +101,12 @@ int CWfudpcdt::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; if((OpenFlag==CN_FesChanThread_Flag)||(OpenFlag==CN_FesChanAndDataThread_Flag)) { @@ -121,14 +121,14 @@ int CWfudpcdt::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrUdpClient == NULL) { LOGERROR("CWfudpcdt EX_OpenChan() ChanNo:%d create CTcpServerRxTxThread error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_UdpClientThreadQueue.push_back(ptrUdpClient); ptrUdpClient->resume(); //start THREAD } break; default: - return kbdFailed; + return iotFailed; } } @@ -142,14 +142,14 @@ int CWfudpcdt::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) if (ptrDataProc == NULL) { LOGERROR("CWfudpcdt EX_OpenChan() ChanNo:%d create CwfudpcdtDataProcThreadPtr error!",ptrFesChan->m_Param.ChanNo); - return kbdFailed; + return iotFailed; } m_DataProcThreadQueue.push_back(ptrDataProc); ptrDataProc->resume(); //start Data THREAD } } - return kbdSuccess; + return iotSuccess; } /** @@ -158,7 +158,7 @@ int CWfudpcdt::OpenChan(int MainChanNo,int ChanNo,int OpenFlag) * @param MainChanNo 主通道号 * @param ChanNo 当前通道号 * @param OpenFlag 关闭标志 1：关闭通道线程 2：关闭数据处理线程 3：关闭通道线程和数据处理线程 - * @return 成功：kbdSuccess 失败：kbdFailed + * @return 成功：iotSuccess 失败：iotFailed */ int CWfudpcdt::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) { @@ -166,12 +166,12 @@ int CWfudpcdt::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) CFesChanPtr ptrFesChan; if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; if((ptrMainFesChan = GetChanDataByChanNo(MainChanNo))==NULL) - return kbdFailed; + return iotFailed; if((ptrFesChan = GetChanDataByChanNo(ChanNo))==NULL) - return kbdFailed; + return iotFailed; LOGDEBUG("CWfudpcdt::CloseChan MainChanNo=%d chanNo=%d m_ComThreadRun=%d m_DataThreadRun=%d",MainChanNo,ChanNo,ptrFesChan->m_ComThreadRun,ptrMainFesChan->m_DataThreadRun); if((CloseFlag==CN_FesChanThread_Flag)||(CloseFlag==CN_FesChanAndDataThread_Flag)) @@ -192,7 +192,7 @@ int CWfudpcdt::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) } } - return kbdSuccess; + return iotSuccess; } /** @@ -203,14 +203,14 @@ int CWfudpcdt::CloseChan(int MainChanNo,int ChanNo,int CloseFlag) */ int CWfudpcdt::ChanTimer(int MainChanNo) { - return kbdSuccess; + return iotSuccess; } int CWfudpcdt::ExitSystem(int flag) { InformComThreadExit(); - return kbdSuccess; + return iotSuccess; } void CWfudpcdt::ClearComThreadByChanNo(int ChanNo) @@ -257,7 +257,7 @@ void CWfudpcdt::ClearDataProcThreadByChanNo(int ChanNo) /** * @brief CWfudpcdt::ReadConfigParam * 读取wfudpcdt配置文件 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CWfudpcdt::ReadConfigParam() { @@ -273,16 +273,16 @@ int CWfudpcdt::ReadConfigParam() memset(¶m,0,sizeof(SwfudpcdtAppConfigParam)); if (m_ptrCFesBase == NULL) - return kbdFailed; + return iotFailed; m_ProtocolId = m_ptrCFesBase->GetProtocolID((char*)"wfudpcdt"); if (m_ProtocolId == -1) { LOGDEBUG("ReadConfigParam ProtoclID error"); - return kbdFailed; + return iotFailed; } - if(config.load("../../data/fes/","wfudpcdt.xml")==kbdFailed) - return kbdSuccess; + if(config.load("../../data/fes/","wfudpcdt.xml")==iotFailed) + return iotSuccess; for (i = 0; i < m_ptrCFesBase->m_vectCFesChanPtr.size(); i++) { @@ -300,7 +300,7 @@ int CWfudpcdt::ReadConfigParam() memset(¶m, 0, sizeof(param)); param.RtuNo = ptrRTU->m_Param.RtuNo; items = 0; - if (config.getIntValue(strRtuNo, "enable", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "enable", ivalue) == iotSuccess) { param.enable = ivalue; items++; @@ -308,7 +308,7 @@ int CWfudpcdt::ReadConfigParam() else param.enable = 1;//2022-5-9 thxiao 初始值enable=1 - if (config.getIntValue(strRtuNo, "start_delay", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "start_delay", ivalue) == iotSuccess) { param.startDelay = ivalue * 1000; items++; @@ -316,7 +316,7 @@ int CWfudpcdt::ReadConfigParam() else param.startDelay = 30 * 1000; - if (config.getIntValue(strRtuNo, "set_time_enable", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "set_time_enable", ivalue) == iotSuccess) { param.setTimeFlag = ivalue; items++; @@ -324,7 +324,7 @@ int CWfudpcdt::ReadConfigParam() else param.setTimeFlag = 0; - if (config.getIntValue(strRtuNo, "control_limit_time", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "control_limit_time", ivalue) == iotSuccess) { param.controlLimitTime = ivalue * 1000; items++; @@ -332,7 +332,7 @@ int CWfudpcdt::ReadConfigParam() else param.controlLimitTime = 5 * 1000; - if (config.getIntValue(strRtuNo, "send_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "send_interval", ivalue) == iotSuccess) { param.sendInterval = ivalue; items++; @@ -340,7 +340,7 @@ int CWfudpcdt::ReadConfigParam() else param.sendInterval = 100; - if (config.getIntValue(strRtuNo, "D1_frame_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "D1_frame_interval", ivalue) == iotSuccess) { param.D1FrameInterval = ivalue*1000; items++; @@ -348,7 +348,7 @@ int CWfudpcdt::ReadConfigParam() else param.D1FrameInterval = 10*1000; - if (config.getIntValue(strRtuNo, "D2_frame_interval", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "D2_frame_interval", ivalue) == iotSuccess) { param.D2FrameInterval = ivalue * 1000; items++; @@ -356,7 +356,7 @@ int CWfudpcdt::ReadConfigParam() else param.D2FrameInterval = 60 * 1000; - if (config.getIntValue(strRtuNo, "sync_header", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "sync_header", ivalue) == iotSuccess) { param.syncHeader = ivalue; items++; @@ -364,7 +364,7 @@ int CWfudpcdt::ReadConfigParam() else param.syncHeader = 0; - if (config.getIntValue(strRtuNo, "dest_address", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "dest_address", ivalue) == iotSuccess) { param.destAddr = ivalue; items++; @@ -372,7 +372,7 @@ int CWfudpcdt::ReadConfigParam() else param.destAddr = 0; - if (config.getIntValue(strRtuNo, "ignore_crc", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "ignore_crc", ivalue) == iotSuccess) { param.crcIgnore = ivalue; items++; @@ -380,7 +380,7 @@ int CWfudpcdt::ReadConfigParam() else param.crcIgnore = 0; - if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == kbdSuccess) + if (config.getIntValue(strRtuNo, "max_update_count", ivalue) == iotSuccess) { param.maxUpdateCount = ivalue; items++; @@ -397,7 +397,7 @@ int CWfudpcdt::ReadConfigParam() } } LOGDEBUG("CWfudpcdt::ReadConfigParam end"); - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/fes/protocol/wfudpcdt/wfudpcdtDataProcThread.cpp b/product/src/fes/protocol/wfudpcdt/wfudpcdtDataProcThread.cpp index de419508..50cbade4 100644 --- a/product/src/fes/protocol/wfudpcdt/wfudpcdtDataProcThread.cpp +++ b/product/src/fes/protocol/wfudpcdt/wfudpcdtDataProcThread.cpp @@ -69,7 +69,7 @@ CWfudpcdtDataProcThread::~CWfudpcdtDataProcThread() */ int CWfudpcdtDataProcThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } /* @@ -139,12 +139,12 @@ void CWfudpcdtDataProcThread::beforeQuit() /** * @brief CWfudpcdtDataProcThread::InitConfigParam * wfudpcdt 初始化配置参数 - * @return 成功返回kbdSuccess，失败返回kbdFailed + * @return 成功返回iotSuccess，失败返回iotFailed */ int CWfudpcdtDataProcThread::InitConfigParam() { if((m_ptrCFesChan == NULL)||(m_ptrCFesRtu==NULL)) - return kbdFailed; + return iotFailed; memset(&m_AppData,0,sizeof(SWfudpcdtAppData)); m_AppData.enable = 1; @@ -159,7 +159,7 @@ int CWfudpcdtDataProcThread::InitConfigParam() m_AppData.syc1 = 0xeb; m_AppData.syc2 = 0x90; m_AppData.crcIgnore = 0;//crc enbale - return kbdSuccess; + return iotSuccess; } void CWfudpcdtDataProcThread::AppDataInit(vector vecAppParam) diff --git a/product/src/gui/GraphTool/IconActTool/main.cpp b/product/src/gui/GraphTool/IconActTool/main.cpp index 91ccc4c8..52609ef1 100644 --- a/product/src/gui/GraphTool/IconActTool/main.cpp +++ b/product/src/gui/GraphTool/IconActTool/main.cpp @@ -6,7 +6,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QTextCodec *codec = QTextCodec::codecForName("UTF-8"); QTextCodec::setCodecForLocale(codec); diff --git a/product/src/gui/GraphTool/NavigationTool/main.cpp b/product/src/gui/GraphTool/NavigationTool/main.cpp index e3377840..2b0d9467 100644 --- a/product/src/gui/GraphTool/NavigationTool/main.cpp +++ b/product/src/gui/GraphTool/NavigationTool/main.cpp @@ -5,7 +5,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); CNavigationDialog w; diff --git a/product/src/gui/GraphTool/fileSync/main.cpp b/product/src/gui/GraphTool/fileSync/main.cpp index 40b059a6..e9cd44bc 100644 --- a/product/src/gui/GraphTool/fileSync/main.cpp +++ b/product/src/gui/GraphTool/fileSync/main.cpp @@ -5,7 +5,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); CFileSyncDialog w; diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.cpp index d40a12a8..5c6f1eca 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.cpp @@ -139,7 +139,7 @@ int CAlarmBaseData::queryDomainIdByLocId(int loactionId) if(m_ptrSysInfo) { SLocationInfo stLocationInfo; - if(kbdSuccess == m_ptrSysInfo->getLocationInfoById(loactionId, stLocationInfo)) + if(iotSuccess == m_ptrSysInfo->getLocationInfoById(loactionId, stLocationInfo)) { return stLocationInfo.nDomainId; } @@ -154,7 +154,7 @@ bool CAlarmBaseData::queryAllPointDevGroup(int nDomainId, int nSubsystemId, cons return false; } SAppInfo stAppInfo; - if(kbdSuccess != m_ptrSysInfo->getAppInfoBySubsystemId(nSubsystemId, stAppInfo)) + if(iotSuccess != m_ptrSysInfo->getAppInfoBySubsystemId(nSubsystemId, stAppInfo)) { LOGERROR("queryAllPointDevGroup 获取应用ID失败"); return false; diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp index 9487741f..5e164ec3 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp @@ -2904,7 +2904,7 @@ void CAlarmForm::inhibitAlm(const AlarmMsgPtr &alm) SOptTagQueue optTagQueue; COptTagSet cOptTagSet; - if(createReqHead(sOptTagSet.stHead,alm)!= kbdSuccess) + if(createReqHead(sOptTagSet.stHead,alm)!= iotSuccess) { return ; } @@ -2998,7 +2998,7 @@ int CAlarmForm::createReqHead(SOptReqHead &head, const AlarmMsgPtr &alm) if(!createSysInfoInstance(m_ptrSysInfo)) { LOGERROR("创建系统信息访问库实例失败!"); - return kbdFailed; + return iotFailed; } } @@ -3014,13 +3014,13 @@ int CAlarmForm::createReqHead(SOptReqHead &head, const AlarmMsgPtr &alm) if(permMng->PermDllInit() != PERM_NORMAL) { LOGERROR("权限接口初始化失败!"); - return kbdFailed; + return iotFailed; }else { if(PERM_NORMAL != permMng->CurUser(userID, usergID, level, loginSec, instanceName)) { userID = -1; - return kbdFailed; + return iotFailed; } } } @@ -3044,7 +3044,7 @@ int CAlarmForm::createReqHead(SOptReqHead &head, const AlarmMsgPtr &alm) head.nUserGroupID = usergID; head.nOptTime = QDateTime::currentDateTime().toMSecsSinceEpoch(); - return kbdSuccess; + return iotSuccess; } void CAlarmForm::reloadDevTree() diff --git a/product/src/gui/plugin/AssetWidget/CAssetDataMng.cpp b/product/src/gui/plugin/AssetWidget/CAssetDataMng.cpp index 0a8269e1..bd30cdfe 100644 --- a/product/src/gui/plugin/AssetWidget/CAssetDataMng.cpp +++ b/product/src/gui/plugin/AssetWidget/CAssetDataMng.cpp @@ -170,7 +170,7 @@ int CAssetDataMng::readLocIdByDevg(const QString &devg,int &loc) { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QSqlQuery query; QString sqlQuery = QString("select LOCATION_ID from dev_group where TAG_NAME='%1'").arg(devg); @@ -180,9 +180,9 @@ int CAssetDataMng::readLocIdByDevg(const QString &devg,int &loc) while(query.next()) { loc = query.value(0).toInt(); - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } QList CAssetDataMng::getAssetInfoByDevg(const QStringList &devgList) @@ -357,7 +357,7 @@ int CAssetDataMng::addAsset(const AssetInfo &info) if(!m_pWriteDb->isOpen()) { m_error = m_pWriteDb->getLastErrorString(); - return kbdFailed; + return iotFailed; } QString sqlQuery= QString("insert into asset_info(dev_id,dev_name,dev_type,dev_param,setup_date,dev_status,contact,backup,dev_group,maintain_period) values('%1','%2','%3','%4',%5,'%6','%7','%8','%9',%10)").arg(getRandomId()).arg(info.name).arg(info.type).arg(info.param).arg(info.setUpTime) @@ -366,9 +366,9 @@ int CAssetDataMng::addAsset(const AssetInfo &info) if(m_pWriteDb->execute(sqlQuery) == false) { m_error = m_pWriteDb->getLastErrorString(); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } void CAssetDataMng::importAsset(const QMap &infoMap,QString &mess) @@ -442,7 +442,7 @@ int CAssetDataMng::updateAsset(const AssetInfo &info) if(!m_pWriteDb->isOpen()) { m_error = m_pWriteDb->getLastErrorString(); - return kbdFailed; + return iotFailed; } QSqlQuery query; QString sqlQuery =QString("update asset_info set dev_name='%1',dev_type='%2',dev_param='%3',setup_date=%4,dev_status='%5',contact='%6',backup='%7',dev_group='%8',maintain_period= %9 " @@ -452,9 +452,9 @@ int CAssetDataMng::updateAsset(const AssetInfo &info) if(m_pWriteDb->execute(sqlQuery, query) == false) { m_error = m_pWriteDb->getLastErrorString(); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int CAssetDataMng::delAsset(const QList &idList) @@ -462,16 +462,16 @@ int CAssetDataMng::delAsset(const QList &idList) if(!m_pWriteDb->isOpen()) { m_error = m_pWriteDb->getLastErrorString(); - return kbdFailed; + return iotFailed; } if(idList.isEmpty()) { - return kbdSuccess; + return iotSuccess; } if(m_pWriteDb->transaction() == false) { m_error = m_pWriteDb->getLastErrorString(); - return kbdFailed; + return iotFailed; } QString con = QString("dev_id in ("); for(int index(0);index &idList) { m_error = m_pWriteDb->getLastErrorString(); m_pWriteDb->rollback(); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int CAssetDataMng::addRecord(const AssetRecord &info) { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QString sqlQuery= QString("insert into asset_records(record_id,dev_id,record_name,opt_user,start_time,end_time,content) values('%1','%2','%3','%4',%5,%6,'%7')").arg(getRandomId()).arg(info.dev_id).arg(info.record_name).arg(info.opt_user).arg(info.startTime) .arg(info.endTime).arg(info.content); @@ -511,9 +511,9 @@ int CAssetDataMng::addRecord(const AssetRecord &info) if(m_pWriteDb->execute(sqlQuery) == false) { m_error = m_pWriteDb->getLastErrorString(); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } void CAssetDataMng::importRecord(const QMap &infoMap, QString &mess) @@ -583,7 +583,7 @@ int CAssetDataMng::updateRecord(const AssetRecord &info) { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QSqlQuery query; QString sqlQuery =QString("update asset_records set dev_id='%1',record_name='%2',opt_user='%3',start_time=%4,end_time=%5,content='%6' " @@ -592,20 +592,20 @@ int CAssetDataMng::updateRecord(const AssetRecord &info) LOGDEBUG("updateRecord():sql[%s]",sqlQuery.toStdString().c_str()); if(m_pWriteDb->execute(sqlQuery, query) == false) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int CAssetDataMng::delRecord(const QList &intList) { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } if(intList.isEmpty()) { - return kbdSuccess; + return iotSuccess; } QString con = QString("record_id in ("); for(int index(0);index &intList) QString sqlQuery =QString("delete from asset_records where %1 ").arg(con); LOGDEBUG("delRecord():sql[%s]",sqlQuery.toStdString().c_str()); m_pWriteDb->execute(sqlQuery); - return kbdSuccess; + return iotSuccess; } int CAssetDataMng::getCount() diff --git a/product/src/gui/plugin/AssetWidget/CAssetDelegate.cpp b/product/src/gui/plugin/AssetWidget/CAssetDelegate.cpp index b9ea3ed3..19bc544f 100644 --- a/product/src/gui/plugin/AssetWidget/CAssetDelegate.cpp +++ b/product/src/gui/plugin/AssetWidget/CAssetDelegate.cpp @@ -64,7 +64,7 @@ bool CAssetDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const return false; } AssetInfo info; - if(m_pModel->getAssetInfo(index,info) != kbdSuccess) + if(m_pModel->getAssetInfo(index,info) != iotSuccess) { return false; } diff --git a/product/src/gui/plugin/AssetWidget/CAssetTableModel.cpp b/product/src/gui/plugin/AssetWidget/CAssetTableModel.cpp index eae4ae44..c42cb9ad 100644 --- a/product/src/gui/plugin/AssetWidget/CAssetTableModel.cpp +++ b/product/src/gui/plugin/AssetWidget/CAssetTableModel.cpp @@ -146,10 +146,10 @@ int CAssetTableModel::getAssetInfo(const QModelIndex &index,AssetInfo &info) if(index.row() < m_listShowInfo.size()) { info = m_listShowInfo.at(index.row()); - return kbdSuccess; + return iotSuccess; }else { - return kbdFailed; + return iotFailed; } } diff --git a/product/src/gui/plugin/AssetWidget/CAssetWidget.cpp b/product/src/gui/plugin/AssetWidget/CAssetWidget.cpp index 8a23b986..7de20d9d 100644 --- a/product/src/gui/plugin/AssetWidget/CAssetWidget.cpp +++ b/product/src/gui/plugin/AssetWidget/CAssetWidget.cpp @@ -246,7 +246,7 @@ bool CAssetWidget::containsFilterText(const AssetInfo &info, const QString &filt void CAssetWidget::inAssetInfo() { QString fileName= QString(); - if(kbdSuccess !=getOpenFileName(fileName)) + if(iotSuccess !=getOpenFileName(fileName)) { return ; } @@ -258,7 +258,7 @@ void CAssetWidget::inRecordInfo() { QString fileName= QString(); - if(kbdSuccess !=getOpenFileName(fileName)) + if(iotSuccess !=getOpenFileName(fileName)) { return ; } @@ -269,7 +269,7 @@ void CAssetWidget::inRecordInfo() void CAssetWidget::outAssetInfo() { QString fileName= QString(); - if(kbdSuccess !=getSaveFileName(fileName)) + if(iotSuccess !=getSaveFileName(fileName)) { return ; } @@ -283,7 +283,7 @@ void CAssetWidget::outAssetInfo() void CAssetWidget::outRecordInfo() { QString fileName= QString(); - if(kbdSuccess !=getSaveFileName(fileName)) + if(iotSuccess !=getSaveFileName(fileName)) { return ; } @@ -307,13 +307,13 @@ int CAssetWidget::getSaveFileName(QString &fileName) fileName = QFileDialog::getSaveFileName(this,tr("Save File"),QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),"Excel 文件(*.xlsx)");//获取保存路径*.xls if(fileName.isEmpty()) { - return kbdFailed; + return iotFailed; } if(!fileName.endsWith(".xlsx",Qt::CaseInsensitive)) { fileName = fileName+".xlsx"; } - return kbdSuccess; + return iotSuccess; } int CAssetWidget::getOpenFileName(QString &fileName) @@ -321,9 +321,9 @@ int CAssetWidget::getOpenFileName(QString &fileName) fileName = QFileDialog::getOpenFileName(this,tr("Open File"),"","Excel(*.xlsx)"); if(fileName.isEmpty()) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } void CAssetWidget::filterText(QList &assetList) @@ -473,7 +473,7 @@ void CAssetWidget::addAsset() } if(loc == -1 && !devg.isEmpty()) { - if(kbdFailed == CAssetDataMng::instance()->readLocIdByDevg(devg,loc)) + if(iotFailed == CAssetDataMng::instance()->readLocIdByDevg(devg,loc)) { return ; } @@ -505,7 +505,7 @@ void CAssetWidget::delAsset() { return ; } - if(CAssetDataMng::instance()->delAsset(idList) == kbdFailed) + if(CAssetDataMng::instance()->delAsset(idList) == iotFailed) { messBox(tr("删除失败!")); }else @@ -568,12 +568,12 @@ void CAssetWidget::assetDoubleClicked(const QModelIndex &index) return ; } AssetInfo info; - if(m_pModel->getAssetInfo(index,info) != kbdSuccess) + if(m_pModel->getAssetInfo(index,info) != iotSuccess) { return ; } int loc = 0; - if(CAssetDataMng::instance()->readLocIdByDevg(info.dev_group,loc) == kbdFailed) + if(CAssetDataMng::instance()->readLocIdByDevg(info.dev_group,loc) == iotFailed) { return ; } diff --git a/product/src/gui/plugin/AssetWidget/CPropertyDialog.cpp b/product/src/gui/plugin/AssetWidget/CPropertyDialog.cpp index 9de7db20..32da7644 100644 --- a/product/src/gui/plugin/AssetWidget/CPropertyDialog.cpp +++ b/product/src/gui/plugin/AssetWidget/CPropertyDialog.cpp @@ -171,7 +171,7 @@ void CPropertyDialog::okClicked() m_assetInfo.dev_group = ui->cDevG->currentData().toString(); m_assetInfo.backup = ui->tBackup->toPlainText(); - if(save() == kbdSuccess) + if(save() == iotSuccess) { accept(); }else @@ -194,5 +194,5 @@ int CPropertyDialog::save() { return CAssetDataMng::instance()->updateAsset(m_assetInfo); } - return kbdFailed; + return iotFailed; } diff --git a/product/src/gui/plugin/AssetWidget/CRecordDialog.cpp b/product/src/gui/plugin/AssetWidget/CRecordDialog.cpp index 5d99adba..6f92dba6 100644 --- a/product/src/gui/plugin/AssetWidget/CRecordDialog.cpp +++ b/product/src/gui/plugin/AssetWidget/CRecordDialog.cpp @@ -132,7 +132,7 @@ void CRecordDialog::delRecord() { return ; } - if(CAssetDataMng::instance()->delRecord(idList) == kbdFailed) + if(CAssetDataMng::instance()->delRecord(idList) == iotFailed) { messBox(tr("删除失败!")); }else @@ -145,7 +145,7 @@ void CRecordDialog::delRecord() void CRecordDialog::outRecord() { QString fileName= QString(); - if(kbdSuccess !=getFileName(fileName)) + if(iotSuccess !=getFileName(fileName)) { return ; } @@ -186,7 +186,7 @@ void CRecordDialog::recordDoubleClicked(const QModelIndex &index) return ; } AssetRecord info; - if(m_pModel->getRecordInfo(index,info) != kbdSuccess) + if(m_pModel->getRecordInfo(index,info) != iotSuccess) { return ; } @@ -287,11 +287,11 @@ int CRecordDialog::getFileName(QString &fileName) fileName = QFileDialog::getSaveFileName(this,tr("Save File"),QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),"Excel 文件(*.xlsx)");//获取保存路径*.xls if(fileName.isEmpty()) { - return kbdFailed; + return iotFailed; } if(!fileName.endsWith(".xlsx",Qt::CaseInsensitive)) { fileName = fileName+".xlsx"; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/gui/plugin/AssetWidget/CRecordPropertyDialog.cpp b/product/src/gui/plugin/AssetWidget/CRecordPropertyDialog.cpp index 747fda27..870bcc12 100644 --- a/product/src/gui/plugin/AssetWidget/CRecordPropertyDialog.cpp +++ b/product/src/gui/plugin/AssetWidget/CRecordPropertyDialog.cpp @@ -98,7 +98,7 @@ void CRecordPropertyDialog::okClicked() messBox(tr("开始时间不能大于结束时间!")); return ; } - if(save() == kbdSuccess) + if(save() == iotSuccess) { accept(); }else @@ -121,5 +121,5 @@ int CRecordPropertyDialog::save() { return CAssetDataMng::instance()->updateRecord(m_assetRecord); } - return kbdFailed; + return iotFailed; } diff --git a/product/src/gui/plugin/AssetWidget/CRecordTablModel.cpp b/product/src/gui/plugin/AssetWidget/CRecordTablModel.cpp index b8e7b72f..f728dde3 100644 --- a/product/src/gui/plugin/AssetWidget/CRecordTablModel.cpp +++ b/product/src/gui/plugin/AssetWidget/CRecordTablModel.cpp @@ -107,10 +107,10 @@ int CRecordTablModel::getRecordInfo(const QModelIndex &index, AssetRecord &info) if(index.row() < m_listShowInfo.size()) { info = m_listShowInfo.at(index.row()); - return kbdSuccess; + return iotSuccess; }else { - return kbdFailed; + return iotFailed; } } diff --git a/product/src/gui/plugin/DataOptWidget/CDataOptWidget.cpp b/product/src/gui/plugin/DataOptWidget/CDataOptWidget.cpp index cf4b8ebb..609afe8c 100644 --- a/product/src/gui/plugin/DataOptWidget/CDataOptWidget.cpp +++ b/product/src/gui/plugin/DataOptWidget/CDataOptWidget.cpp @@ -454,7 +454,7 @@ int CDataOptWidget::createReqHead(SOptReqHead &head) if(createSysInfoInstance(sysInfo) == false) { LOGERROR("创建系统信息访问库实例失败!"); - return kbdFailed; + return iotFailed; } else { @@ -467,13 +467,13 @@ int CDataOptWidget::createReqHead(SOptReqHead &head) if(permMng->PermDllInit() != PERM_NORMAL) { LOGERROR("权限接口初始化失败!"); - return kbdFailed; + return iotFailed; }else { if(PERM_NORMAL != permMng->CurUser(userID, usergID, level, loginSec, instanceName)) { userID = -1; - return kbdFailed; + return iotFailed; } } } @@ -488,7 +488,7 @@ int CDataOptWidget::createReqHead(SOptReqHead &head) head.nUserGroupID = usergID; head.nOptTime = QDateTime::currentDateTime().toMSecsSinceEpoch(); - return kbdSuccess; + return iotSuccess; } void CDataOptWidget::filter(const QString &text) @@ -671,13 +671,13 @@ void CDataOptWidget::cancelSetValue() bool CDataOptWidget::cancelItemSetValue(const QString &desc,const QString &tagName, int tagType) { STOptTagInfo info; - if(m_pWork->getOptTagInfoByTagAndType(tagName,tagType,info) !=kbdSuccess ) + if(m_pWork->getOptTagInfoByTagAndType(tagName,tagType,info) !=iotSuccess ) { slotShowMess(tr("获取标签操作信息有误，%1").arg(desc)); return false; } STTagInfo tagInfo; - if(m_pWork->getTagInfoByTag(tagName,tagInfo) !=kbdSuccess ) + if(m_pWork->getTagInfoByTag(tagName,tagInfo) !=iotSuccess ) { slotShowMess(tr("获取标签信息有误，%1").arg(desc)); return false; @@ -700,7 +700,7 @@ void CDataOptWidget::removeOptTagInfo(const STOptTagInfo &info) SOptTagQueue optTagQueue; COptTagSet cOptTagSet; - if(createReqHead(sOptTagSet.stHead)!= kbdSuccess) + if(createReqHead(sOptTagSet.stHead)!= iotSuccess) { return ; } diff --git a/product/src/gui/plugin/DataOptWidget/CDataOptWork.cpp b/product/src/gui/plugin/DataOptWidget/CDataOptWork.cpp index 187bdb79..c839bda7 100644 --- a/product/src/gui/plugin/DataOptWidget/CDataOptWork.cpp +++ b/product/src/gui/plugin/DataOptWidget/CDataOptWork.cpp @@ -22,21 +22,21 @@ int CDataOptWork::getOptTagInfoByTagAndType(const QString &tag, int type,STOptTa if(m_optTagInfoList[index].tagName == tag && type == m_optTagInfoList[index].tagType) { info = m_optTagInfoList[index]; - return kbdSuccess; + return iotSuccess; } } - return kbdFailed; + return iotFailed; } int CDataOptWork::getTagInfoByTag(const QString &tag, STTagInfo &info) { if(m_TagInfoMap.find(tag) == m_TagInfoMap.end()) { - return kbdFailed; + return iotFailed; }else { info = m_TagInfoMap.value(tag); - return kbdSuccess; + return iotSuccess; } } diff --git a/product/src/gui/plugin/DevRealDataWidget/CDevRealDataWidget.cpp b/product/src/gui/plugin/DevRealDataWidget/CDevRealDataWidget.cpp index 2d6d4430..33a438e4 100644 --- a/product/src/gui/plugin/DevRealDataWidget/CDevRealDataWidget.cpp +++ b/product/src/gui/plugin/DevRealDataWidget/CDevRealDataWidget.cpp @@ -1182,7 +1182,7 @@ QString CDevRealDataWidget::checkPerm(int location, int region) void CDevRealDataWidget::readNodeInfo() { - if(m_sysInfoPtr->getLocalNodeInfo(m_nodeInfo) == kbdFailed) + if(m_sysInfoPtr->getLocalNodeInfo(m_nodeInfo) == iotFailed) { LOGERROR("获取本机节点信息失败!"); } @@ -1191,7 +1191,7 @@ void CDevRealDataWidget::readNodeInfo() bool CDevRealDataWidget::createReqHead(SOptReqHead &head, const STOptTagInfo &info) { SAppInfo stAppInfo; - if(kbdSuccess != m_sysInfoPtr->getAppInfoBySubsystemId(info.subSystem, stAppInfo)) + if(iotSuccess != m_sysInfoPtr->getAppInfoBySubsystemId(info.subSystem, stAppInfo)) { return false; } diff --git a/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.cpp b/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.cpp index 3e6beb8c..10fc90a9 100644 --- a/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.cpp +++ b/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.cpp @@ -441,7 +441,7 @@ int CHangPanelWidget::createReqHead(SOptReqHead &head) if(createSysInfoInstance(sysInfo) == false) { LOGERROR("创建系统信息访问库实例失败!"); - return kbdFailed; + return iotFailed; } else { @@ -454,13 +454,13 @@ int CHangPanelWidget::createReqHead(SOptReqHead &head) if(permMng->PermDllInit() != PERM_NORMAL) { LOGERROR("权限接口初始化失败!"); - return kbdFailed; + return iotFailed; }else { if(PERM_NORMAL != permMng->CurUser(userID, usergID, level, loginSec, instanceName)) { userID = -1; - return kbdFailed; + return iotFailed; } } } @@ -475,7 +475,7 @@ int CHangPanelWidget::createReqHead(SOptReqHead &head) head.nUserGroupID = usergID; head.nOptTime = QDateTime::currentDateTime().toMSecsSinceEpoch(); - return kbdSuccess; + return iotSuccess; } void CHangPanelWidget::filter(const QString &content) @@ -581,13 +581,13 @@ void CHangPanelWidget::cancelHangePanel() bool CHangPanelWidget::cancelItemHangePanel(const QString &desc, const QString &tagName, int tagType) { SHangPanelInfo info; - if(m_pWork->getHangInfoByTagAndType(tagName,tagType,info) !=kbdSuccess ) //得到挂牌信息 + if(m_pWork->getHangInfoByTagAndType(tagName,tagType,info) !=iotSuccess ) //得到挂牌信息 { slotShowMess(tr("获取标签挂牌信息有误，%1").arg(desc)); return false; } SDeviceInfo tagInfo; - if(m_pWork->getHangeInfoByTag(tagName,tagInfo) !=kbdSuccess ) //挂牌设备信息 + if(m_pWork->getHangeInfoByTag(tagName,tagInfo) !=iotSuccess ) //挂牌设备信息 { slotShowMess(tr("获取标签挂牌信息有误，%1").arg(desc)); return false; @@ -609,7 +609,7 @@ void CHangPanelWidget::removeHangInfo(const SHangPanelInfo &info) STokenQueue optHangQueue; CTokenSet cTokenSet; - if(createReqHead(sOptHangSet.stHead)!= kbdSuccess){ return ; } + if(createReqHead(sOptHangSet.stHead)!= iotSuccess){ return ; } optHangQueue.strKeyIdTag = info.keyIdTag.toStdString(); optHangQueue.nTokenId = info.tokenId ;// 0：取消；1：设置； diff --git a/product/src/gui/plugin/HangPanelWidget/CHangPanelWork.cpp b/product/src/gui/plugin/HangPanelWidget/CHangPanelWork.cpp index f39b1662..cc49799a 100644 --- a/product/src/gui/plugin/HangPanelWidget/CHangPanelWork.cpp +++ b/product/src/gui/plugin/HangPanelWidget/CHangPanelWork.cpp @@ -22,21 +22,21 @@ int CHangPanelWork::getHangInfoByTagAndType(const QString &tag, int type,SHangPa if(m_listHangPanel[index].tagName == tag && type == m_listHangPanel[index].tokenId) { info = m_listHangPanel[index]; - return kbdSuccess; + return iotSuccess; } } - return kbdFailed; + return iotFailed; } int CHangPanelWork::getHangeInfoByTag(const QString &tag, SDeviceInfo &info) { if(m_mapDeviceInfo.find(tag) == m_mapDeviceInfo.end()) { - return kbdFailed; + return iotFailed; }else { info = m_mapDeviceInfo.value(tag); - return kbdSuccess; + return iotSuccess; } } diff --git a/product/src/gui/plugin/IpcPlusWidget/COnvifOpt.cpp b/product/src/gui/plugin/IpcPlusWidget/COnvifOpt.cpp index 69e63e64..ee95b4a1 100644 --- a/product/src/gui/plugin/IpcPlusWidget/COnvifOpt.cpp +++ b/product/src/gui/plugin/IpcPlusWidget/COnvifOpt.cpp @@ -15,12 +15,12 @@ COnvifOpt::~COnvifOpt() void COnvifOpt::slotCamInfo(CCamInfo caminfo) { LOGINFO("in slotCamInfo(),start getOnvifArgs()"); - if(kbdSuccess ==caminfo.getOnvifArgs()) + if(iotSuccess ==caminfo.getOnvifArgs()) { - emit sigInitStream(caminfo,kbdSuccess); + emit sigInitStream(caminfo,iotSuccess); }else { - emit sigInitStream(caminfo,kbdFailed); + emit sigInitStream(caminfo,iotFailed); } LOGINFO("sig sigInitStream emit"); diff --git a/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.cpp b/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.cpp index 9a47d122..d3d773b1 100644 --- a/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.cpp +++ b/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.cpp @@ -23,7 +23,7 @@ CRdbAccessUtilty::~CRdbAccessUtilty() bool CRdbAccessUtilty::getCamInfo(std::string pointtag, CCamInfo & outCamInfo) { std::string pointtype,pointTagWithoutType; - if(splitTagName(pointtag,pointtype,pointTagWithoutType) == kbdFailed) + if(splitTagName(pointtag,pointtype,pointTagWithoutType) == iotFailed) { LOGERROR("分割标签名错误,标签名为[%s]",pointtag.c_str()); return false; @@ -58,7 +58,7 @@ int CRdbAccessUtilty::splitTagName(const std::string &inTag, std::string &outTyp std::size_t firstDotindex = inTag.find_first_of('.'); if(firstDotindex == std::string::npos) { - return kbdFailed; + return iotFailed; } // 赋值表名; @@ -75,11 +75,11 @@ int CRdbAccessUtilty::splitTagName(const std::string &inTag, std::string &outTyp else if(inTag.substr(0,firstDotindex) == std::string("mix")){ outType = "mix"; }else{ - return kbdFailed; + return iotFailed; } outTagName = inTag.substr(firstDotindex+1,inTag.size()); - return kbdSuccess; + return iotSuccess; } bool CRdbAccessUtilty::queryPointTable(const std::string &pointtag, const std::string &pointType, CCamInfo &outCamInfo) diff --git a/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.cpp b/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.cpp index b4b74fc4..bccf148b 100644 --- a/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.cpp +++ b/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.cpp @@ -191,7 +191,7 @@ void IpcPlusWidget::slotInitStream(CCamInfo caminfo,int result) { LOGINFO("slotInitStream()"); - if(result == kbdFailed) + if(result == iotFailed) { // QMessageBox::information(this,tr("提醒"),tr("设置直播流失败")); LOGINFO("information QMessagexBox 设置直播流失败"); diff --git a/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.cpp b/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.cpp index e8e42841..20288aec 100644 --- a/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.cpp +++ b/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.cpp @@ -23,7 +23,7 @@ CRdbAccessUtilty::~CRdbAccessUtilty() bool CRdbAccessUtilty::getCamInfo(std::string pointtag, CCamInfo & outCamInfo) { std::string pointtype,pointTagWithoutType; - if(splitTagName(pointtag,pointtype,pointTagWithoutType) == kbdFailed) + if(splitTagName(pointtag,pointtype,pointTagWithoutType) == iotFailed) { LOGERROR("分割标签名错误,标签名为[%s]",pointtag.c_str()); return false; @@ -58,7 +58,7 @@ int CRdbAccessUtilty::splitTagName(const std::string &inTag, std::string &outTyp std::size_t firstDotindex = inTag.find_first_of('.'); if(firstDotindex == std::string::npos) { - return kbdFailed; + return iotFailed; } // 赋值表名; @@ -75,11 +75,11 @@ int CRdbAccessUtilty::splitTagName(const std::string &inTag, std::string &outTyp else if(inTag.substr(0,firstDotindex) == std::string("mix")){ outType = "mix"; }else{ - return kbdFailed; + return iotFailed; } outTagName = inTag.substr(firstDotindex+1,inTag.size()); - return kbdSuccess; + return iotSuccess; } bool CRdbAccessUtilty::queryPointTable(const std::string &pointtag, const std::string &pointType, CCamInfo &outCamInfo) diff --git a/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.cpp b/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.cpp index e1afcda1..9f5ec32e 100644 --- a/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.cpp +++ b/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.cpp @@ -569,7 +569,7 @@ int CLimitOptWidget::getAppIdBySubName(const QString &subName) return CN_InvalidAppId; } SAppInfo stAppInfo; - if(kbdFailed == m_ptrSysInfo->getAppInfoBySubsystemName(subName.toStdString(), stAppInfo)) + if(iotFailed == m_ptrSysInfo->getAppInfoBySubsystemName(subName.toStdString(), stAppInfo)) { return CN_InvalidAppId; } diff --git a/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.cpp b/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.cpp index b255fbad..f157650a 100644 --- a/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.cpp +++ b/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.cpp @@ -78,7 +78,7 @@ bool CLimitOptWork::initSysApi() } SNodeInfo stNodeInfo; SAppInfo stAppInfo; - if(kbdFailed == m_ptrSysInfo->getLocalNodeInfo(stNodeInfo)) + if(iotFailed == m_ptrSysInfo->getLocalNodeInfo(stNodeInfo)) { LOGERROR("获取本机节点信息失败!"); return false; @@ -86,7 +86,7 @@ bool CLimitOptWork::initSysApi() m_nDomainId = stNodeInfo.nDomainId; m_strName = stNodeInfo.strName; m_nLocationId = stNodeInfo.nLocationId; - if(kbdFailed == m_ptrSysInfo->getAppInfoByName("public", stAppInfo)) + if(iotFailed == m_ptrSysInfo->getAppInfoByName("public", stAppInfo)) { LOGERROR("获取public应用信息失败!"); return false; diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.h index 7a75332f..f5340d4c 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.h +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.h @@ -5,7 +5,7 @@ class CLinkCtrlDataManage; -class CLinkCtrlMessageHandle : public kbd_application::CLinkageForHmiApi +class CLinkCtrlMessageHandle : public iot_application::CLinkageForHmiApi { public: CLinkCtrlMessageHandle(CLinkCtrlDataManage * linkCtrlDataManage); diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.cpp index 11e6c407..9a76132d 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.cpp +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.cpp @@ -161,7 +161,7 @@ void CLinkCtrlWidget::initialize() ui->actionTreeView->setHeaderHidden(false); //2020-6-15 modifi linkage type by read configuretion file - if(readLinkTypeDescXml()==kbdSuccess) + if(readLinkTypeDescXml()==iotSuccess) { QStringList linkTypeList; for(int index=0;index < (int)m_linkTypeStr.size(); index++) @@ -999,10 +999,10 @@ int CLinkCtrlWidget::readLinkTypeDescXml() //< 读取LINKAGE_SETTING配置文件，获取联动类型 std::string path = iot_public::CFileUtil::getPathOfResFile("model_studio/setting/table/LINKAGE_SETTING.xml"); - if(readXml(path,linkTypeStr)==kbdFailed) + if(readXml(path,linkTypeStr)==iotFailed) { LOGERROR("readLinkTypeDescXml load [zh] LINKAGE_SETTING.xml error"); - return kbdFailed; + return iotFailed; } std::vector destination; @@ -1016,7 +1016,7 @@ int CLinkCtrlWidget::readLinkTypeDescXml() m_linkTypeStr.insert(std::pair(destination2.at(0), destination2.at(1))); } - return kbdSuccess; + return iotSuccess; } int CLinkCtrlWidget::readXml(std::string fileName,std::string &strValue) @@ -1052,15 +1052,15 @@ int CLinkCtrlWidget::readXml(std::string fileName,std::string &strValue) catch (std::exception &ex) { LOGERROR("解析配置文件[%s]失败.Msg = [%s]", fileName.c_str(),ex.what()); - return kbdFailed; + return iotFailed; } if(strValue == "LINK_TYPE") { LOGERROR("获取联动类型值失败！"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } void CLinkCtrlWidget::filterHistoryLink() diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApi.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApi.cpp index 68168338..ca66335a 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApi.cpp +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApi.cpp @@ -1,7 +1,7 @@ #include "application/linkage_server_api/CLinkageForHmiApi.h" #include "CLinkageForHmiApiImpl.h" -using namespace kbd_application; +using namespace iot_application; CLinkageForHmiApi::CLinkageForHmiApi(int appid) { diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.cpp index cabc9d3f..469ee722 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.cpp +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.cpp @@ -4,10 +4,10 @@ #include "CLinkageForHmiApiImpl.h" -using namespace kbd_application; +using namespace iot_application; using namespace iot_idl::linkage; -kbd_application::CLinkageForHmiApiImpl::CLinkageForHmiApiImpl( +iot_application::CLinkageForHmiApiImpl::CLinkageForHmiApiImpl( int appid, CLinkageForHmiApi* api) : CTimerThreadBase("CLinkageForHmiApiImpl thread", 100), diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.h index cc9fbc42..105079af 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.h +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.h @@ -6,7 +6,7 @@ #include "net/net_msg_bus_api/CMbCommunicator.h" #include "application/linkage_server_api/CLinkageForHmiApi.h" -namespace kbd_application { +namespace iot_application { using namespace iot_idl::linkage; class CLinkageForHmiApiImpl diff --git a/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.cpp b/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.cpp index 4d3155be..c2630bc8 100644 --- a/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.cpp +++ b/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.cpp @@ -93,7 +93,7 @@ int CDbInterfaceMng::getCtrlGrpTextByCtrlPoint(const QString &tag,QString &ctrlG { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QSqlQuery query; QString sqlQuery = QString("select %1.ctrl_act_name,%2.description from %1 left join %2 on %1.tag_name = %2.tag_name where %2.tag_name = '%3' ").arg("digital_control").arg("digital").arg(tag); @@ -105,7 +105,7 @@ int CDbInterfaceMng::getCtrlGrpTextByCtrlPoint(const QString &tag,QString &ctrlG ctrlGrpText = query.value(0).toString(); title = query.value(1).toString(); } - return kbdSuccess; + return iotSuccess; } QMap CDbInterfaceMng::getDigitalTextMapByKey(const QString &key) @@ -217,45 +217,45 @@ int CDbInterfaceMng::addPointLock(const QString &tag, int digitalValue, int chec { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QString sqlQuery = QString("insert into point_lock_config_info(tag_name,actual_value,isEnable) values('%1',%2,%3)").arg(tag).arg(QString::number(digitalValue)).arg(QString::number(check)); if(m_pWriteDb->execute(sqlQuery)) { - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } int CDbInterfaceMng::delPointLock(const QString &tag, int digitalValue) { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QString sqlQuery = QString("delete from point_lock_config_info where tag_name='%1' and actual_value='%2'").arg(tag).arg(QString::number(digitalValue)); if(m_pWriteDb->execute(sqlQuery)) { - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } int CDbInterfaceMng::updatePointLock(const QString &tag, int digitalValue, bool isEnable) { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QString sqlQuery = QString("update point_lock_config_info set isEnable = %1 where tag_name = '%2' and actual_value = %3").arg(isEnable?1:0).arg(tag).arg(digitalValue); if(m_pWriteDb->execute(sqlQuery)) { - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } QString CDbInterfaceMng::getDevgByDevTag(const QString dev) @@ -267,7 +267,7 @@ int CDbInterfaceMng::addConditionLock(const QString &tag, int value, ConditionIn { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QString sqlQuery = QString(); sqlQuery = QString("insert into point_lock_condition_info(tag_name,actual_value,condition_tag_name,condition_desc,condition1" @@ -278,16 +278,16 @@ int CDbInterfaceMng::addConditionLock(const QString &tag, int value, ConditionIn qDebug()<execute(sqlQuery)) { - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } int CDbInterfaceMng::delConditionLock(const QString &tag, int value, ConditionInfoPtr condInfo) { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QString sql = QString("delete from point_lock_condition_info where tag_name ='%1' and actual_value = %2 and condition_tag_name = '%3' ") @@ -295,12 +295,12 @@ int CDbInterfaceMng::delConditionLock(const QString &tag, int value, ConditionIn if(m_pWriteDb->execute(sql)) { - return kbdSuccess; + return iotSuccess; }else { - return kbdFailed; + return iotFailed; } - return kbdFailed; + return iotFailed; } QString CDbInterfaceMng::getDevgDescByDevTag(const QString dev) @@ -312,7 +312,7 @@ int CDbInterfaceMng::getPointDesc(const QString &tag, const QString &table, QStr { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QSqlQuery query; QString sqlQuery = QString("select description from %1 where tag_name = '%2' ").arg(table).arg(tag); @@ -322,9 +322,9 @@ int CDbInterfaceMng::getPointDesc(const QString &tag, const QString &table, QStr while(query.next()) { description = query.value(0).toString(); - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } CDbInterfaceMng::CDbInterfaceMng() diff --git a/product/src/gui/plugin/PointLockWidget/CPointLockWidget.cpp b/product/src/gui/plugin/PointLockWidget/CPointLockWidget.cpp index 1d0cd5ed..9e45bfcf 100644 --- a/product/src/gui/plugin/PointLockWidget/CPointLockWidget.cpp +++ b/product/src/gui/plugin/PointLockWidget/CPointLockWidget.cpp @@ -80,7 +80,7 @@ void CPointLockWidget::init(QString tag) if(m_strTable == "digital") { QString ctrlGrgText = QString(); - if(CDbInterfaceMng::instance()->getCtrlGrpTextByCtrlPoint(m_tag, ctrlGrgText, title) == kbdFailed) + if(CDbInterfaceMng::instance()->getCtrlGrpTextByCtrlPoint(m_tag, ctrlGrgText, title) == iotFailed) { return; } @@ -97,7 +97,7 @@ void CPointLockWidget::init(QString tag) ui->comboBox->setEditable(true); QValidator *validator = new QDoubleValidator(); ui->comboBox->lineEdit()->setValidator(validator); - if(CDbInterfaceMng::instance()->getPointDesc(m_tag, m_strTable, title) == kbdFailed) + if(CDbInterfaceMng::instance()->getPointDesc(m_tag, m_strTable, title) == iotFailed) { return; } @@ -149,7 +149,7 @@ void CPointLockWidget::slotDelCondition() int value; getCtrlValue(value); ConditionInfoPtr info = m_pCondModel->getDataByIndex(modelIndexList.at(0)); - if(CDbInterfaceMng::instance()->delConditionLock(m_tag,value,info) == kbdSuccess) + if(CDbInterfaceMng::instance()->delConditionLock(m_tag,value,info) == iotSuccess) { m_pCondModel->removeData(modelIndexList.at(0)); //showMess(tr("提示"),tr("删除成功")); @@ -183,7 +183,7 @@ void CPointLockWidget::slotOkClicked() PointInfoPtr pointInfo = CDbInterfaceMng::instance()->getLockConfigInfo(m_tag,value); if(pointInfo == Q_NULLPTR) { - if(CDbInterfaceMng::instance()->addPointLock(m_tag,value,1) == kbdFailed) + if(CDbInterfaceMng::instance()->addPointLock(m_tag,value,1) == iotFailed) { showMess(tr("提示"),tr("添加失败")); return; @@ -209,7 +209,7 @@ void CPointLockWidget::slotOkClicked() info->value1 = ui->dValue1->value(); info->value2 = ui->dValue2->value(); } - if(CDbInterfaceMng::instance()->addConditionLock(m_tag,value,info) == kbdSuccess) + if(CDbInterfaceMng::instance()->addConditionLock(m_tag,value,info) == iotSuccess) { initTable(); if(m_strTable == "analog" && ui->comboBox->findText(QString::number(value)) == -1) diff --git a/product/src/gui/plugin/PointsLockWidget/CConditionOptDialog.cpp b/product/src/gui/plugin/PointsLockWidget/CConditionOptDialog.cpp index 3a247ebc..2b09cf5b 100644 --- a/product/src/gui/plugin/PointsLockWidget/CConditionOptDialog.cpp +++ b/product/src/gui/plugin/PointsLockWidget/CConditionOptDialog.cpp @@ -169,7 +169,7 @@ void CConditionOptDialog::okClicked() info->value1 = ui->dValue1->value(); info->value2 = ui->dValue2->value(); } - if(CDbInterfaceMng::instance()->addConditionLock(m_info,info) == kbdSuccess) + if(CDbInterfaceMng::instance()->addConditionLock(m_info,info) == iotSuccess) { accept(); }else diff --git a/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.cpp b/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.cpp index 93051873..b68fc6bc 100644 --- a/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.cpp +++ b/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.cpp @@ -114,37 +114,37 @@ int CDbInterfaceMng::addPointLock(const QString &tag, int digitalValue, int chec { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QString sqlQuery = QString("insert into point_lock_config_info(tag_name,actual_value,isEnable) values('%1',%2,%3)").arg(tag).arg(QString::number(digitalValue)).arg(QString::number(check)); if(m_pWriteDb->execute(sqlQuery)) { - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } int CDbInterfaceMng::updatePointLock(PointsInfoPtr info, bool isEnable) { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QString sqlQuery = QString("update point_lock_config_info set isEnable = %1 where tag_name = '%2' and actual_value = %3").arg(isEnable?1:0).arg(info->tag).arg(info->value); if(m_pWriteDb->execute(sqlQuery)) { - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } int CDbInterfaceMng::delPointLock(PointsInfoPtr info) { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } m_pWriteDb->transaction(); QString sql1 = QString("delete from point_lock_config_info where tag_name ='%1' and actual_value = %2").arg(info->tag).arg(info->value); @@ -152,13 +152,13 @@ int CDbInterfaceMng::delPointLock(PointsInfoPtr info) if(m_pWriteDb->execute(sql1) && m_pWriteDb->execute(sql2)) { m_pWriteDb->commit(); - return kbdSuccess; + return iotSuccess; }else { m_pWriteDb->rollback(); - return kbdFailed; + return iotFailed; } - return kbdFailed; + return iotFailed; } QString CDbInterfaceMng::getLocDescById(int loc) @@ -277,7 +277,7 @@ int CDbInterfaceMng::addConditionLock(PointsInfoPtr pointInfo, ConditionInfoPtr { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QString sqlQuery = QString(); if(condInfo->table == "digital") @@ -298,16 +298,16 @@ int CDbInterfaceMng::addConditionLock(PointsInfoPtr pointInfo, ConditionInfoPtr qDebug()<execute(sqlQuery)) { - return kbdSuccess; + return iotSuccess; } - return kbdFailed; + return iotFailed; } int CDbInterfaceMng::delConditionLock(PointsInfoPtr pointInfo, ConditionInfoPtr condInfo) { if(!m_pWriteDb->isOpen()) { - return kbdFailed; + return iotFailed; } QString sql = QString("delete from point_lock_condition_info where tag_name ='%1' and actual_value = %2 and condition_tag_name = '%3' ") @@ -315,12 +315,12 @@ int CDbInterfaceMng::delConditionLock(PointsInfoPtr pointInfo, ConditionInfoPtr if(m_pWriteDb->execute(sql)) { - return kbdSuccess; + return iotSuccess; }else { - return kbdFailed; + return iotFailed; } - return kbdFailed; + return iotFailed; } CDbInterfaceMng::CDbInterfaceMng() diff --git a/product/src/gui/plugin/PointsLockWidget/CPointsOptDialog.cpp b/product/src/gui/plugin/PointsLockWidget/CPointsOptDialog.cpp index 20c69e23..a8fd6d7c 100644 --- a/product/src/gui/plugin/PointsLockWidget/CPointsOptDialog.cpp +++ b/product/src/gui/plugin/PointsLockWidget/CPointsOptDialog.cpp @@ -151,7 +151,7 @@ void CPointsOptDialog::okClicked() int value = ui->comboBox->currentData().toInt(); int check = ui->checkBox->isChecked() ? 1:0; - if(CDbInterfaceMng::instance()->addPointLock(tag,value,check) == kbdSuccess) + if(CDbInterfaceMng::instance()->addPointLock(tag,value,check) == iotSuccess) { accept(); }else diff --git a/product/src/gui/plugin/PointsLockWidget/PointsLockWidget.cpp b/product/src/gui/plugin/PointsLockWidget/PointsLockWidget.cpp index 1e1b8b26..c6d0675f 100644 --- a/product/src/gui/plugin/PointsLockWidget/PointsLockWidget.cpp +++ b/product/src/gui/plugin/PointsLockWidget/PointsLockWidget.cpp @@ -151,7 +151,7 @@ void PointsLockWidget::slotDelPoint() return ; } PointsInfoPtr info = m_pmodel->getDataByIndex(modelIndexList.at(0)); - if(CDbInterfaceMng::instance()->delPointLock(info) == kbdSuccess) + if(CDbInterfaceMng::instance()->delPointLock(info) == iotSuccess) { m_pmodel->removeData(modelIndexList.at(0)); ui->tableView->clearSelection(); @@ -189,7 +189,7 @@ void PointsLockWidget::slotDelCondition() return ; } ConditionInfoPtr info = m_pCondModel->getDataByIndex(modelIndexList.at(0)); - if(m_curinfo != Q_NULLPTR && CDbInterfaceMng::instance()->delConditionLock(m_curinfo,info) == kbdSuccess) + if(m_curinfo != Q_NULLPTR && CDbInterfaceMng::instance()->delConditionLock(m_curinfo,info) == iotSuccess) { m_pCondModel->removeData(modelIndexList.at(0)); //showMess(tr("提示"),tr("删除成功")); diff --git a/product/src/gui/plugin/RelaySettingWidget/CDbMng.cpp b/product/src/gui/plugin/RelaySettingWidget/CDbMng.cpp index 85b2c694..33fee81d 100644 --- a/product/src/gui/plugin/RelaySettingWidget/CDbMng.cpp +++ b/product/src/gui/plugin/RelaySettingWidget/CDbMng.cpp @@ -347,7 +347,7 @@ QList CDbMng::getSetting() relaySetting.keyIdTag = QString("%1.%2.%3").arg("fes_const").arg(relaySetting.tagName).arg("value"); iot_public::SAppInfo stAppInfo; - if(kbdSuccess != sysInfoPtr->getAppInfoBySubsystemId(relaySetting.subSystem, stAppInfo)) + if(iotSuccess != sysInfoPtr->getAppInfoBySubsystemId(relaySetting.subSystem, stAppInfo)) { relaySetting.nAppId = relaySetting.subSystem; } diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.cpp b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.cpp index ffedd724..3a11b986 100644 --- a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.cpp +++ b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.cpp @@ -97,7 +97,7 @@ void CRelaySettingWidget::initialize() LOGERROR("创建系统信息访问库失败!"); } //2.获取节点信息 - if(m_ptrSysInfo!=Q_NULLPTR && m_ptrSysInfo->getLocalNodeInfo(m_nodeInfo) == kbdSuccess) + if(m_ptrSysInfo!=Q_NULLPTR && m_ptrSysInfo->getLocalNodeInfo(m_nodeInfo) == iotSuccess) { LOGINFO("获取节点信息成功!"); }else diff --git a/product/src/gui/plugin/ReportApp/main.cpp b/product/src/gui/plugin/ReportApp/main.cpp index 92ab14fb..3ef58d09 100644 --- a/product/src/gui/plugin/ReportApp/main.cpp +++ b/product/src/gui/plugin/ReportApp/main.cpp @@ -7,7 +7,7 @@ class SingleApplication; int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); SingleApplication app(argc, argv); diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp index 94c5fdfd..4e4a7acf 100644 --- a/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp +++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp @@ -485,7 +485,7 @@ bool CRobotCtrlWidget::getSystemInfo() LOGERROR("创建系统信息访问库失败"); return false; } - if(kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) + if(iotSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) { LOGERROR("获取系统信息失败"); return false; diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileCollect.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileCollect.cpp index 5b29a5ba..78a3f970 100644 --- a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileCollect.cpp +++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileCollect.cpp @@ -51,7 +51,7 @@ void CRobotFileCollect::loadConfig() std::string loadFilePath; config.load(file); int error = config.getStringValue("robot_config","loadFilePath",loadFilePath); - if( error != kbdSuccess) + if( error != iotSuccess) { m_path = "../../data/test";; LOGERROR("机器人加载文件路径解析失败!文件[%s],错误码[%d]",file.c_str(),error); @@ -84,7 +84,7 @@ void CRobotFileCollect::onTimeLoadFile() { QFileInfo fileInfo = fileList.at(i); RobotFilePtr robotFile(new CRobotFileInfo()); - if(robotFile->initialize(fileInfo) == kbdSuccess) + if(robotFile->initialize(fileInfo) == iotSuccess) { map.insert(robotFile->m_execPath,robotFile); diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileInfo.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileInfo.cpp index 866fde9f..d92ab4d0 100644 --- a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileInfo.cpp +++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileInfo.cpp @@ -105,7 +105,7 @@ int CRobotFileInfo::initialize(const QFileInfo fileInfo) if(list.size() != 3) { LOGERROR("文件[%s]命名格式有误!",m_fileName.toStdString().c_str()); - return kbdFailed; + return iotFailed; } QString devInt = list.at(0); m_devgId = devInt.toInt(); @@ -124,7 +124,7 @@ int CRobotFileInfo::initialize(const QFileInfo fileInfo) }else { LOGERROR("文件[%s]后缀格式有误!",m_fileName.toStdString().c_str()); - return kbdFailed; + return iotFailed; } }else if(timeList.size() == 3) { @@ -134,15 +134,15 @@ int CRobotFileInfo::initialize(const QFileInfo fileInfo) }else { LOGERROR("文件[%s]后缀格式有误!",m_fileName.toStdString().c_str()); - return kbdFailed; + return iotFailed; } }else { LOGERROR("文件[%s]命名格式有误!",m_fileName.toStdString().c_str()); - return kbdFailed; + return iotFailed; } time_stamp = getTime(timeList.at(0)); - return kbdSuccess; + return iotSuccess; } CRobotInfo::CRobotInfo() diff --git a/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.cpp b/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.cpp index 282f17e9..c8352f3e 100644 --- a/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.cpp +++ b/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.cpp @@ -507,7 +507,7 @@ bool CRobotCtrlWidget::getSystemInfo() LOGERROR("创建系统信息访问库失败"); return false; } - if(kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) + if(iotSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) { LOGERROR("获取系统信息失败"); return false; diff --git a/product/src/gui/plugin/RobotWidget/CRobotFileCollect.cpp b/product/src/gui/plugin/RobotWidget/CRobotFileCollect.cpp index 4a6b410a..ba6ee631 100644 --- a/product/src/gui/plugin/RobotWidget/CRobotFileCollect.cpp +++ b/product/src/gui/plugin/RobotWidget/CRobotFileCollect.cpp @@ -51,7 +51,7 @@ void CRobotFileCollect::loadConfig() std::string loadFilePath; config.load(file); int error = config.getStringValue("robot_config","loadFilePath",loadFilePath); - if( error != kbdSuccess) + if( error != iotSuccess) { m_path = "../../data/test";; LOGERROR("机器人加载文件路径解析失败!文件[%s],错误码[%d]",file.c_str(),error); @@ -84,7 +84,7 @@ void CRobotFileCollect::onTimeLoadFile() { QFileInfo fileInfo = fileList.at(i); RobotFilePtr robotFile(new CRobotFileInfo()); - if(robotFile->initialize(fileInfo) == kbdSuccess) + if(robotFile->initialize(fileInfo) == iotSuccess) { map.insert(robotFile->m_execPath,robotFile); diff --git a/product/src/gui/plugin/RobotWidget/CRobotFileInfo.cpp b/product/src/gui/plugin/RobotWidget/CRobotFileInfo.cpp index 866fde9f..d92ab4d0 100644 --- a/product/src/gui/plugin/RobotWidget/CRobotFileInfo.cpp +++ b/product/src/gui/plugin/RobotWidget/CRobotFileInfo.cpp @@ -105,7 +105,7 @@ int CRobotFileInfo::initialize(const QFileInfo fileInfo) if(list.size() != 3) { LOGERROR("文件[%s]命名格式有误!",m_fileName.toStdString().c_str()); - return kbdFailed; + return iotFailed; } QString devInt = list.at(0); m_devgId = devInt.toInt(); @@ -124,7 +124,7 @@ int CRobotFileInfo::initialize(const QFileInfo fileInfo) }else { LOGERROR("文件[%s]后缀格式有误!",m_fileName.toStdString().c_str()); - return kbdFailed; + return iotFailed; } }else if(timeList.size() == 3) { @@ -134,15 +134,15 @@ int CRobotFileInfo::initialize(const QFileInfo fileInfo) }else { LOGERROR("文件[%s]后缀格式有误!",m_fileName.toStdString().c_str()); - return kbdFailed; + return iotFailed; } }else { LOGERROR("文件[%s]命名格式有误!",m_fileName.toStdString().c_str()); - return kbdFailed; + return iotFailed; } time_stamp = getTime(timeList.at(0)); - return kbdSuccess; + return iotSuccess; } CRobotInfo::CRobotInfo() diff --git a/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.cpp b/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.cpp index d0834b73..832c8d6e 100644 --- a/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.cpp +++ b/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.cpp @@ -29,13 +29,13 @@ void OnTimeRecvThread::loadConfig() CCommonConfigParse config; const std::string file = iot_public::CFileUtil::getPathOfCfgFile("robot_config.xml"); int error = config.load(file); - if(error != kbdSuccess) + if(error != iotSuccess) { LOGERROR("机器人加载文件路径解析失败!文件[%s],错误码[%d]",file.c_str(),error); return ; } error = config.getIntValue("robot_config","outTime",m_outTime); - if( error != kbdSuccess) + if( error != iotSuccess) { m_outTime = 5; LOGERROR("机器人加载文件路径解析失败!文件[%s],错误码[%d]",file.c_str(),error); diff --git a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApi.cpp b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApi.cpp index 464a50cb..7f773be6 100644 --- a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApi.cpp +++ b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApi.cpp @@ -1,7 +1,7 @@ #include "application/sequence_server_api/CSeqForHmiApi.h" #include "CSeqForHmiApiImpl.h" -using namespace kbd_application; +using namespace iot_application; using namespace iot_idl::sequence; CSeqForHmiApi::CSeqForHmiApi(int appid) { diff --git a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.cpp b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.cpp index a68936e5..3cbac5b0 100644 --- a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.cpp +++ b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.cpp @@ -4,9 +4,9 @@ #include "CSeqForHmiApiImpl.h" -using namespace kbd_application; +using namespace iot_application; using namespace iot_idl::sequence; -kbd_application::CSeqForHmiApiImpl::CSeqForHmiApiImpl( +iot_application::CSeqForHmiApiImpl::CSeqForHmiApiImpl( int appid, CSeqForHmiApi* api) : CTimerThreadBase("CSeqForHmiApiImpl thread", 100), diff --git a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.h b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.h index 74f2f094..2ab4cf27 100644 --- a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.h +++ b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.h @@ -6,7 +6,7 @@ #include "net/net_msg_bus_api/CMbCommunicator.h" #include "application/sequence_server_api/CSeqForHmiApi.h" -namespace kbd_application { +namespace iot_application { using namespace iot_idl::sequence; class CSeqForHmiApiImpl : public iot_public::CTimerThreadBase diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.h b/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.h index fc656eee..642047e3 100644 --- a/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.h +++ b/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.h @@ -5,7 +5,7 @@ class CSequenceDataManage; -class CSequenceMsgHandle : public kbd_application::CSeqForHmiApi +class CSequenceMsgHandle : public iot_application::CSeqForHmiApi { public: CSequenceMsgHandle(); diff --git a/product/src/gui/plugin/ShiftWidget/HandoverWidget.cpp b/product/src/gui/plugin/ShiftWidget/HandoverWidget.cpp index d106d5a2..a787a50f 100644 --- a/product/src/gui/plugin/ShiftWidget/HandoverWidget.cpp +++ b/product/src/gui/plugin/ShiftWidget/HandoverWidget.cpp @@ -393,17 +393,17 @@ void HandoverWidget::loadXml() CCommonConfigParse configParse; std::string strFilePath = "../../common/sysconfig/"; std::string strFileName = "shiftWidget.xml"; - if(kbdSuccess == configParse.load(strFilePath,strFileName)) + if(iotSuccess == configParse.load(strFilePath,strFileName)) { int num = 0; - if(kbdSuccess == configParse.getIntValue("shiftWidget","levelNum",num)) + if(iotSuccess == configParse.getIntValue("shiftWidget","levelNum",num)) { for(int index(1);index<=num;index++) { QString name = QString("level%1").arg(QString::number(index)); int value = 0; - if(kbdSuccess == configParse.getIntValue("shiftWidget",name.toStdString(),value)) + if(iotSuccess == configParse.getIntValue("shiftWidget",name.toStdString(),value)) { m_keyAlmLevelList.append(value); LOGDEBUG("loadXml() index:%d name:%s value:%d",index,name.toStdString().c_str(),value); diff --git a/product/src/gui/plugin/ShiftWidget/QueryThread.cpp b/product/src/gui/plugin/ShiftWidget/QueryThread.cpp index 875fdc94..0ec8a1ad 100644 --- a/product/src/gui/plugin/ShiftWidget/QueryThread.cpp +++ b/product/src/gui/plugin/ShiftWidget/QueryThread.cpp @@ -32,17 +32,17 @@ void QueryThread::loadXml() CCommonConfigParse configParse; std::string strFilePath = "../../common/sysconfig/"; std::string strFileName = "shiftWidget.xml"; - if(kbdSuccess == configParse.load(strFilePath,strFileName)) + if(iotSuccess == configParse.load(strFilePath,strFileName)) { int num = 0; - if(kbdSuccess == configParse.getIntValue("shiftWidget","levelNum",num)) + if(iotSuccess == configParse.getIntValue("shiftWidget","levelNum",num)) { for(int index(1);index<=num;index++) { QString name = QString("level%1").arg(QString::number(index)); int value = 0; - if(kbdSuccess == configParse.getIntValue("shiftWidget",name.toStdString(),value)) + if(iotSuccess == configParse.getIntValue("shiftWidget",name.toStdString(),value)) { m_keyAlmLevelList.append(value); LOGDEBUG("loadXml() index:%d name:%s value:%d",index,name.toStdString().c_str(),value); diff --git a/product/src/gui/plugin/TelBookWidget/CTelBookWidget.cpp b/product/src/gui/plugin/TelBookWidget/CTelBookWidget.cpp index 521c7ddd..b56b483e 100644 --- a/product/src/gui/plugin/TelBookWidget/CTelBookWidget.cpp +++ b/product/src/gui/plugin/TelBookWidget/CTelBookWidget.cpp @@ -76,7 +76,7 @@ void CTelBookWidget::initialize() LOGERROR("创建系统信息访问库失败!"); } //2.获取节点信息 - if(m_ptrSysInfo!=Q_NULLPTR && m_ptrSysInfo->getLocalNodeInfo(m_nodeInfo) == kbdSuccess) + if(m_ptrSysInfo!=Q_NULLPTR && m_ptrSysInfo->getLocalNodeInfo(m_nodeInfo) == iotSuccess) { LOGINFO("获取节点信息成功!"); }else diff --git a/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.cpp b/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.cpp index 96abe7cd..d9937979 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.cpp +++ b/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.cpp @@ -24,7 +24,7 @@ CBiCookieManage::CBiCookieManage() return; } SNodeInfo stNodeInfo; - if(kbdFailed == sysInfoPtr->getLocalNodeInfo(stNodeInfo)) + if(iotFailed == sysInfoPtr->getLocalNodeInfo(stNodeInfo)) { LOGERROR("获取本机节点信息失败!"); return; @@ -43,7 +43,7 @@ bool CBiCookieManage::createCookie(QString &strCookie, int &nUserId) int nUserGrpId, nLevel, nLoginSec; std::string strInstanceName; - if(kbdSuccess != m_ptrPermMngApi->CurUser(nUserId, nUserGrpId, nLevel, nLoginSec, strInstanceName)) + if(iotSuccess != m_ptrPermMngApi->CurUser(nUserId, nUserGrpId, nLevel, nLoginSec, strInstanceName)) { LOGERROR("获取当前登录用户信息失败!"); return false; diff --git a/product/src/gui/plugin/iDongOpsWidget/CCfgParser.cpp b/product/src/gui/plugin/iDongOpsWidget/CCfgParser.cpp index f95ead38..96b951c1 100644 --- a/product/src/gui/plugin/iDongOpsWidget/CCfgParser.cpp +++ b/product/src/gui/plugin/iDongOpsWidget/CCfgParser.cpp @@ -27,19 +27,19 @@ bool CCfgParser::g_isValid=false; bool CCfgParser::loadGlobal(iot_public::CCommonConfigParse &cfg) { - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_PERM_CHECKED , g_global_cfg.is_perm_checked ) == kbdFailed){ LOGERROR( " is_perm_checked option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_DEFAULT_USER , g_global_cfg.default_user ) == kbdFailed){ LOGERROR( " default_user option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_DEFAULT_PASSWD , g_global_cfg.default_passwd ) == kbdFailed){ LOGERROR( " default_passwd option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_SERVER_ADDRESS , g_global_cfg.server_address ) == kbdFailed){ LOGERROR( " server_address option parser err"); return false;} - if( cfg.getIntValue(CN_GLOBAL, CN_SERVER_PORT , g_global_cfg.server_port ) == kbdFailed){ LOGERROR( " server_port option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_HTTPS , g_global_cfg.is_https ) == kbdFailed){ LOGERROR( " is_https option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_HEADER , g_global_cfg.is_header ) == kbdFailed){ LOGERROR( " is_header option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_TITLE , g_global_cfg.is_title ) == kbdFailed){ LOGERROR( " is_title option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_LEFTBAR , g_global_cfg.is_leftbar ) == kbdFailed){ LOGERROR( " is_leftbar option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_BUTTON , g_global_cfg.is_button ) == kbdFailed){ LOGERROR( " is_button option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_LOCAL_STATICPAGE_PATH , g_global_cfg.local_static_page_path ) == kbdFailed){ LOGERROR( " local_staticpage_path option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_ERR_PAGE , g_global_cfg.err_page ) == kbdFailed){ LOGERROR( " err_page option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_PERM_ERR_PAGE , g_global_cfg.perm_err_page ) == kbdFailed){ LOGERROR( " perm_err_page option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_PERM_CHECKED , g_global_cfg.is_perm_checked ) == iotFailed){ LOGERROR( " is_perm_checked option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_DEFAULT_USER , g_global_cfg.default_user ) == iotFailed){ LOGERROR( " default_user option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_DEFAULT_PASSWD , g_global_cfg.default_passwd ) == iotFailed){ LOGERROR( " default_passwd option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_SERVER_ADDRESS , g_global_cfg.server_address ) == iotFailed){ LOGERROR( " server_address option parser err"); return false;} + if( cfg.getIntValue(CN_GLOBAL, CN_SERVER_PORT , g_global_cfg.server_port ) == iotFailed){ LOGERROR( " server_port option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_HTTPS , g_global_cfg.is_https ) == iotFailed){ LOGERROR( " is_https option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_HEADER , g_global_cfg.is_header ) == iotFailed){ LOGERROR( " is_header option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_TITLE , g_global_cfg.is_title ) == iotFailed){ LOGERROR( " is_title option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_LEFTBAR , g_global_cfg.is_leftbar ) == iotFailed){ LOGERROR( " is_leftbar option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_BUTTON , g_global_cfg.is_button ) == iotFailed){ LOGERROR( " is_button option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_LOCAL_STATICPAGE_PATH , g_global_cfg.local_static_page_path ) == iotFailed){ LOGERROR( " local_staticpage_path option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_ERR_PAGE , g_global_cfg.err_page ) == iotFailed){ LOGERROR( " err_page option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_PERM_ERR_PAGE , g_global_cfg.perm_err_page ) == iotFailed){ LOGERROR( " perm_err_page option parser err"); return false;} return true; } @@ -52,7 +52,7 @@ bool CCfgParser::isValid() bool CCfgParser::loadCfg(const std::string &cfgPath) { iot_public::CCommonConfigParse cfgP; - if( cfgP.load(cfgPath) == kbdFailed) + if( cfgP.load(cfgPath) == iotFailed) { LOGERROR("config failed to load, please check config syntax!"); g_isValid = false; diff --git a/product/src/gui/plugin/iDongOpsWidget/idong_common.h b/product/src/gui/plugin/iDongOpsWidget/idong_common.h index ba1fb720..bf5b679b 100644 --- a/product/src/gui/plugin/iDongOpsWidget/idong_common.h +++ b/product/src/gui/plugin/iDongOpsWidget/idong_common.h @@ -47,7 +47,7 @@ const std::string CN_PROCESSNAME = "iDongOpsWidget"; #define COL_STATUS_VALUE_VALID 1 #define COL_STATUS_VALUE_INVALID 0 // 返回值 -#define kbdFailedRdb 2 // 内存库错误 +#define iotFailedRdb 2 // 内存库错误 #define valid_value 0 #define invalid_value 1 diff --git a/product/src/include/application/app_pa_server_api/PaServerApi.cpp b/product/src/include/application/app_pa_server_api/PaServerApi.cpp index 3bda046e..85879c75 100644 --- a/product/src/include/application/app_pa_server_api/PaServerApi.cpp +++ b/product/src/include/application/app_pa_server_api/PaServerApi.cpp @@ -7,7 +7,7 @@ #include "boost/lexical_cast.hpp" #include "app_pa_server_api/PaServerApiCommon.h" -void kbd_app::CPaServerApi::makePlayAudioCmd(int nAudioCount, +void iot_app::CPaServerApi::makePlayAudioCmd(int nAudioCount, int nAudioId, int nOperatorId, const std::string &strAreaInfo, diff --git a/product/src/include/application/app_pa_server_api/PaServerApi.h b/product/src/include/application/app_pa_server_api/PaServerApi.h index 2597b81c..ae49604b 100644 --- a/product/src/include/application/app_pa_server_api/PaServerApi.h +++ b/product/src/include/application/app_pa_server_api/PaServerApi.h @@ -6,7 +6,7 @@ #pragma once #include "operate_server_api/JsonOptCommand.h" -namespace kbd_app +namespace iot_app { class CPaServerApi { @@ -29,4 +29,4 @@ namespace kbd_app int nPlayType, std::vector &vecOptCustCtrlQueue); }; -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/include/application/app_pa_server_api/PaServerApiCommon.h b/product/src/include/application/app_pa_server_api/PaServerApiCommon.h index cbd90f85..3994af53 100644 --- a/product/src/include/application/app_pa_server_api/PaServerApiCommon.h +++ b/product/src/include/application/app_pa_server_api/PaServerApiCommon.h @@ -5,7 +5,7 @@ */ #pragma once -namespace kbd_app +namespace iot_app { #define KEY_CMD_TYPE "cmd_type" #define KEY_AUDIO_COUNT "audio_count" @@ -17,4 +17,4 @@ namespace kbd_app #define CMD_TYPE_PLAY_AUDIO "pa_play_voice" //#define KEY_VENDOR_CODE "vendor_code" -} //namespace kbd_app +} //namespace iot_app diff --git a/product/src/include/application/fault_recall_srv/JsonMsgClass.cpp b/product/src/include/application/fault_recall_srv/JsonMsgClass.cpp index 02aced17..5677de07 100644 --- a/product/src/include/application/fault_recall_srv/JsonMsgClass.cpp +++ b/product/src/include/application/fault_recall_srv/JsonMsgClass.cpp @@ -16,7 +16,7 @@ #include "JsonMsgClass.h" -namespace kbd_application +namespace iot_application { CFrMsgNewSess::CFrMsgNewSess() @@ -417,5 +417,5 @@ bool CFrMsgSetTime::operator==(const CFrMsgSetTime &other) const } -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/include/application/fault_recall_srv/JsonMsgClass.h b/product/src/include/application/fault_recall_srv/JsonMsgClass.h index 04c66dbe..a033f639 100644 --- a/product/src/include/application/fault_recall_srv/JsonMsgClass.h +++ b/product/src/include/application/fault_recall_srv/JsonMsgClass.h @@ -17,7 +17,7 @@ //< Sess : Session 会话 //< Srv : Service 服务 -namespace kbd_application +namespace iot_application { //< 会话超时时间，单位s，若此时间内未收到任何该会话的消息，则超时 @@ -164,5 +164,5 @@ public: std::string m_strSess; //< 会话名称，唯一标识 }; -} //< namespace kbd_application +} //< namespace iot_application diff --git a/product/src/include/application/idong_srv_api/idong_common.h b/product/src/include/application/idong_srv_api/idong_common.h index 27bd4b48..a522940d 100644 --- a/product/src/include/application/idong_srv_api/idong_common.h +++ b/product/src/include/application/idong_srv_api/idong_common.h @@ -47,7 +47,7 @@ const std::string CN_PROCESSNAME = "iDongOpsWidget"; #define COL_STATUS_VALUE_VALID 1 #define COL_STATUS_VALUE_INVALID 0 // 返回值 -#define kbdFailedRdb 2 // 内存库错误 +#define iotFailedRdb 2 // 内存库错误 #define valid_value 0 #define invalid_value 1 diff --git a/product/src/include/application/linkage_server_api/CLinkageForHmiApi.h b/product/src/include/application/linkage_server_api/CLinkageForHmiApi.h index 38c63fa1..45458362 100644 --- a/product/src/include/application/linkage_server_api/CLinkageForHmiApi.h +++ b/product/src/include/application/linkage_server_api/CLinkageForHmiApi.h @@ -10,7 +10,7 @@ #include "CLinkageApiExport.h" #include "LinkageMessage.pb.h" -namespace kbd_application { +namespace iot_application { class CLinkageForHmiApiImpl; using namespace iot_idl::linkage; class LINKAGE_SERVER_API CLinkageForHmiApi diff --git a/product/src/include/application/linkage_server_api/CLinkageForServerApi.h b/product/src/include/application/linkage_server_api/CLinkageForServerApi.h index 7e5aa131..6be45273 100644 --- a/product/src/include/application/linkage_server_api/CLinkageForServerApi.h +++ b/product/src/include/application/linkage_server_api/CLinkageForServerApi.h @@ -11,7 +11,7 @@ #include "CLinkageApiExport.h" #include "LinkageMessage.pb.h" -namespace kbd_application +namespace iot_application { // struct SToHostMsg // { diff --git a/product/src/include/application/sequence_server_api/CSeqForHmiApi.h b/product/src/include/application/sequence_server_api/CSeqForHmiApi.h index eece24ca..709cd9b6 100644 --- a/product/src/include/application/sequence_server_api/CSeqForHmiApi.h +++ b/product/src/include/application/sequence_server_api/CSeqForHmiApi.h @@ -9,7 +9,7 @@ #include "SequenceMessage.pb.h" #include "Common.h" -namespace kbd_application { +namespace iot_application { using namespace iot_idl::sequence; class CSeqForHmiApiImpl; class SEQUENCE_SERVER_API CSeqForHmiApi diff --git a/product/src/include/application/sequence_server_api/CSeqForServerApi.h b/product/src/include/application/sequence_server_api/CSeqForServerApi.h index b703341a..88fbc075 100644 --- a/product/src/include/application/sequence_server_api/CSeqForServerApi.h +++ b/product/src/include/application/sequence_server_api/CSeqForServerApi.h @@ -11,7 +11,7 @@ #include "CSeqApiExport.h" #include "SequenceMessage.pb.h" -namespace kbd_application { +namespace iot_application { using namespace iot_idl::sequence; class CSeqForServerApiImpl; diff --git a/product/src/include/application/trigger_api/CTriggerApi.h b/product/src/include/application/trigger_api/CTriggerApi.h index 65bd521d..f4986e71 100644 --- a/product/src/include/application/trigger_api/CTriggerApi.h +++ b/product/src/include/application/trigger_api/CTriggerApi.h @@ -15,7 +15,7 @@ #include "application/trigger_api/CTriggerApiExport.h" #include "application/trigger_api/CTriggerPara.h" -namespace kbd_application { +namespace iot_application { struct STriggerInitParam; class CTriggerApiImpl; diff --git a/product/src/include/application/trigger_api/CTriggerPara.h b/product/src/include/application/trigger_api/CTriggerPara.h index e105631f..bfcc8e4f 100644 --- a/product/src/include/application/trigger_api/CTriggerPara.h +++ b/product/src/include/application/trigger_api/CTriggerPara.h @@ -8,7 +8,7 @@ #include #include "application/trigger_api/CTriggerApiExport.h" -namespace kbd_application { +namespace iot_application { using namespace std; class TRIGGER_API CTriggerPara diff --git a/product/src/service/calc_server/CalcMsgBusMng.cpp b/product/src/service/calc_server/CalcMsgBusMng.cpp index 364fe7f5..c8936347 100644 --- a/product/src/service/calc_server/CalcMsgBusMng.cpp +++ b/product/src/service/calc_server/CalcMsgBusMng.cpp @@ -31,13 +31,13 @@ int iot_service::CalcMsgBusMng::subMessage() if(!m_objCommunicator.addSub(0,CH_SCADA_TO_HMI_DATA_CHANGE)) { LOGERROR("所有应用变化数据通道订阅失败."); - return kbdFailed; + return iotFailed; } else { LOGINFO("所有应用变化数据通道订阅成功."); } - return kbdSuccess; + return iotSuccess; } //取消消息订阅 @@ -49,7 +49,7 @@ int iot_service::CalcMsgBusMng::unsubMessage() if(!m_objCommunicator.delSub(vecSub[i].getAppID(),vecSub[i].getChannelID())) { LOGERROR("取消通道[%d,%d]订阅失败.",vecSub[i].getAppID(),vecSub[i].getChannelID()); - return kbdFailed; + return iotFailed; } } //清空消息总线中的数据 @@ -58,13 +58,13 @@ int iot_service::CalcMsgBusMng::unsubMessage() { } - return kbdSuccess; + return iotSuccess; } //初始化 int iot_service::CalcMsgBusMng::initialize() { - return kbdSuccess; + return iotSuccess; } //接收数据 diff --git a/product/src/service/calc_server/CalcRtdbTableOperate.cpp b/product/src/service/calc_server/CalcRtdbTableOperate.cpp index ccfc4fd0..aa5e6fa9 100644 --- a/product/src/service/calc_server/CalcRtdbTableOperate.cpp +++ b/product/src/service/calc_server/CalcRtdbTableOperate.cpp @@ -39,19 +39,19 @@ int iot_service::CalcRtdbTableOperate::initialize() if(!m_objCalcDefTable.open(m_stRunAppInfo.nAppId,CN_TN_CalcDef.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,CN_TN_CalcDef.c_str()); - return kbdFailed; + return iotFailed; } if(!m_objCalcInParaTable.open(m_stRunAppInfo.nAppId,CN_TN_CalcInPara.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,CN_TN_CalcInPara.c_str()); - return kbdFailed; + return iotFailed; } if(!m_objCalcOutParaTable.open(m_stRunAppInfo.nAppId,CN_TN_CalcOutPara.c_str())) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,CN_TN_CalcOutPara.c_str()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CalcRtdbTableOperate::getCalcDefAllRecord(std::vector &vecCalcDef) @@ -59,12 +59,12 @@ int iot_service::CalcRtdbTableOperate::getCalcDefAllRecord(std::vector &vecCalcPara) @@ -97,12 +97,12 @@ int iot_service::CalcRtdbTableOperate::getCalcParaAllRecord(std::vector &vecCalcPara) @@ -110,12 +110,12 @@ int iot_service::CalcRtdbTableOperate::getCalcParaAllRecord(std::vector &vecCalcDef); int getCalcDefByKey(const std::string tagName,STableCalcDef &sCalcDef); /** * @brief getCalcParaAllRecord 获取所有计算量配置信息 * @param vecCalcDef 返回的计算量配置列表 - * @return 成功返回kbdSuccess，失败返回失败码 + * @return 成功返回iotSuccess，失败返回失败码 */ int getCalcParaAllRecord(std::vector &vecCalcPara); int getCalcParaAllRecord(std::vector &vecCalcPara); diff --git a/product/src/service/calc_server/CalcServerApp.cpp b/product/src/service/calc_server/CalcServerApp.cpp index bfc73179..3b1febb4 100644 --- a/product/src/service/calc_server/CalcServerApp.cpp +++ b/product/src/service/calc_server/CalcServerApp.cpp @@ -76,13 +76,13 @@ bool iot_service::CalcServerApp::start(int argc, char *argv[], int &/*nStatus*/) return false; } //8.设置冗余通知回调 - if(kbdSuccess !=m_ptrRedundancyMng->setCallback(m_ptrCalcSrvMng)) + if(iotSuccess !=m_ptrRedundancyMng->setCallback(m_ptrCalcSrvMng)) { LOGERROR("设置冗余回调接口失败"); return false; } //9.更新当前进程冗余状态 - if(kbdSuccess !=m_ptrProcMng->updateProcessInfo(true,false,false)) + if(iotSuccess !=m_ptrProcMng->updateProcessInfo(true,false,false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -127,7 +127,7 @@ int iot_service::CalcServerApp::toQuit() m_ptrProcMng->unsetCallback(); } shutdown(); - return kbdSuccess; + return iotSuccess; } bool iot_service::CalcServerApp::parseCmdLine(int argc, char *argv[]) @@ -213,7 +213,7 @@ bool iot_service::CalcServerApp::getSystemInfo() LOGERROR("创建系统信息访问库失败"); return false; } - if(kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) + if(iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -237,7 +237,7 @@ bool iot_service::CalcServerApp::registToProcMng() LOGERROR("创建进程管理访问库失败"); return false; } - if(kbdSuccess != m_ptrProcMng->setCallback(this)) + if(iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -251,7 +251,7 @@ bool iot_service::CalcServerApp::initialize() if(!initMsgBus(CN_ProcName_CalcServer.c_str(),strUniqueName.c_str())) { LOGERROR("初始化消息总线失败"); - return kbdFailed; + return iotFailed; } //创建计算量服务管理类 m_ptrCalcSrvMng =boost::make_shared(m_stRunAppInfo,m_ptrProcMng); @@ -260,7 +260,7 @@ bool iot_service::CalcServerApp::initialize() LOGERROR("创建计算量服务管理类失败"); return false; } - if(kbdSuccess !=m_ptrCalcSrvMng->initialize()) + if(iotSuccess !=m_ptrCalcSrvMng->initialize()) { LOGERROR("初始化计算量服务管理类失败"); return false; diff --git a/product/src/service/calc_server/CalcServerMng.cpp b/product/src/service/calc_server/CalcServerMng.cpp index e576bbaf..04e00ab5 100644 --- a/product/src/service/calc_server/CalcServerMng.cpp +++ b/product/src/service/calc_server/CalcServerMng.cpp @@ -43,7 +43,7 @@ int iot_service::CalcServerMng::redundantSwitch(bool bMaster, bool bSlave) m_ptrProcMng->updateProcessInfo(true, bMaster, bSlave); - return kbdSuccess; + return iotSuccess; } //初始化 @@ -53,12 +53,12 @@ int iot_service::CalcServerMng::initialize() if(m_ptrCalcServerThread == NULL) { LOGERROR("创建计算量线程失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess !=m_ptrCalcServerThread->initialize()) + if(iotSuccess !=m_ptrCalcServerThread->initialize()) { LOGERROR("初始化计算量线程失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/service/calc_server/CalcServerMng.h b/product/src/service/calc_server/CalcServerMng.h index 10e698b1..e2e26465 100644 --- a/product/src/service/calc_server/CalcServerMng.h +++ b/product/src/service/calc_server/CalcServerMng.h @@ -25,12 +25,12 @@ namespace iot_service { * 在进程切换过程中，可能会被调用多次切换，业务进程需要保证幂等，无副作用 * @param bMaster 是否为主 * @param bSlave 是否为备 - * @return 成功返回kbdSuccess,失败返回错误码 + * @return 成功返回iotSuccess,失败返回错误码 */ virtual int redundantSwitch(bool bMaster, bool bSlave); /** * @brief initialize 初始化 - * @return 成功返回kbdSuccess,失败返回错误码 + * @return 成功返回iotSuccess,失败返回错误码 */ int initialize(); private: diff --git a/product/src/service/calc_server/CalcServerThread.cpp b/product/src/service/calc_server/CalcServerThread.cpp index 3addcf66..a37ff790 100644 --- a/product/src/service/calc_server/CalcServerThread.cpp +++ b/product/src/service/calc_server/CalcServerThread.cpp @@ -68,59 +68,59 @@ int iot_service::CalcServerThread::initialize() if(m_ptrCalcTableOpt ==NULL) { LOGERROR("创建内存表操作失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess !=m_ptrCalcTableOpt->initialize()) + if(iotSuccess !=m_ptrCalcTableOpt->initialize()) { LOGERROR("内存表初始化失败"); - return kbdFailed; + return iotFailed; } //2.初始化消息总线管理类 m_ptrMsgbusMng =boost::make_shared(m_stRunAppInfo); if(m_ptrMsgbusMng ==NULL) { LOGERROR("创建消息总线管理类失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess!=m_ptrMsgbusMng->initialize()) + if(iotSuccess!=m_ptrMsgbusMng->initialize()) { LOGERROR("初始化消息总线管理类失败"); - return kbdFailed; + return iotFailed; } if(!CDpcdaForApp::initGlobalThread()) { LOGERROR("初始化订阅点失败"); - return kbdFailed; + return iotFailed; } //3.data_process_api 实例 m_ptrDataProcApi = getDataProcInstance(m_stRunAppInfo.strAppName); if (m_ptrDataProcApi == NULL) { LOGERROR("CMainWorkThread::init(), getDataProcInstance error"); - return kbdFailed; + return iotFailed; } if(m_ptrDataProcApi->initialize() <0) { LOGERROR("CMainWorkThread::init(), data_process_api initialize() error"); - return kbdFailed; + return iotFailed; } //4.初始化订阅点 m_ptrCdpcda=boost::make_shared(); if(m_ptrCdpcda==NULL) { LOGERROR("创建订阅点失败"); - return kbdFailed; + return iotFailed; } //5.RDB管理实例 m_ptrRdbTableMng=boost::make_shared(m_stRunAppInfo.strAppName); if (m_ptrRdbTableMng == NULL) { LOGERROR("CDigProcess::initialize(), make_shared fail!\n"); - return kbdFailed; + return iotFailed; } if (m_ptrDataProcApi->getMenuMacToValMap("数字量状态", m_mapDiState) < 0) { - return kbdFailed; + return iotFailed; } MENU_STATE_DI_INVALID = m_mapDiState["MENU_STATE_DI_INVALID"]; m_nMenuStateDiSetData = m_mapDiState["MENU_STATE_DI_SET_DATA"]; @@ -128,7 +128,7 @@ int iot_service::CalcServerThread::initialize() MENU_STATE_DI_NORMAL = m_mapDiState["MENU_STATE_DI_NORMAL"]; if (m_ptrDataProcApi->getMenuMacToValMap("模拟量状态", m_mapAiState) < 0) { - return kbdFailed; + return iotFailed; } MENU_STATE_AI_INVALID = m_mapAiState["MENU_STATE_AI_INVALID"]; m_nMenuStateAiSetData = m_mapAiState["MENU_STATE_AI_SET_DATA"]; @@ -141,7 +141,7 @@ int iot_service::CalcServerThread::initialize() if(lua_state == NULL) { LOGERROR("CalcServerThread::initialize() 初始化lua失败！"); - return kbdFailed; + return iotFailed; } luabridge::getGlobalNamespace(lua_state) .beginNamespace ("kbd") @@ -159,7 +159,7 @@ int iot_service::CalcServerThread::initialize() .beginNamespace ("kbd") .addFunction ("getBitOr",&CalcServerThread::getBitOr) .endNamespace (); - return kbdSuccess; + return iotSuccess; } //设置为主 int iot_service::CalcServerThread::setMaster() @@ -178,7 +178,7 @@ int iot_service::CalcServerThread::setSlave() m_ptrMsgbusMng->unsubMessage(); inRecord=0; outRecord=0; - return kbdSuccess; + return iotSuccess; } void iot_service::CalcServerThread::execute() { @@ -194,7 +194,7 @@ void iot_service::CalcServerThread::execute() m_ptrCdpcda->unsubscribeAll(); LOGINFO("CalcServerThread::execute()：取消所有订阅点成功！"); //1.读取配置表 存缓存 订阅点 - if(kbdSuccess!=readConfigToSaveAndSubValue()) + if(iotSuccess!=readConfigToSaveAndSubValue()) { LOGERROR("CalcServerThread::execute() 内存库表结构不一致，读取配置失败！"); return ; @@ -230,12 +230,12 @@ bool iot_service::CalcServerThread::TryReadConfig() { vector vecCalcInPara; vector vecCalcOutPara; - if(kbdSuccess !=m_ptrCalcTableOpt->getCalcParaAllRecord(vecCalcInPara)) //获取所有计算量输入配置信息列表 + if(iotSuccess !=m_ptrCalcTableOpt->getCalcParaAllRecord(vecCalcInPara)) //获取所有计算量输入配置信息列表 { LOGERROR("CalcServerThread::TryReadConfig():获取所有计算量输入配置信息列表失败"); return false; } - if(kbdSuccess !=m_ptrCalcTableOpt->getCalcParaAllRecord(vecCalcOutPara)) //获取所有计算量输出配置信息列表 + if(iotSuccess !=m_ptrCalcTableOpt->getCalcParaAllRecord(vecCalcOutPara)) //获取所有计算量输出配置信息列表 { LOGERROR("CalcServerThread::TryReadConfig():获取所有计算量输出配置信息列表失败"); return false; @@ -285,13 +285,13 @@ int iot_service::CalcServerThread::readConfigToSaveAndSubValue() vector vecCalcInPara; vector vecCalcOutPara; - if(kbdSuccess !=m_ptrCalcTableOpt->getCalcParaAllRecord(vecCalcInPara)) //获取所有计算量输入配置信息列表 + if(iotSuccess !=m_ptrCalcTableOpt->getCalcParaAllRecord(vecCalcInPara)) //获取所有计算量输入配置信息列表 { - return kbdFailed; + return iotFailed; } - if(kbdSuccess !=m_ptrCalcTableOpt->getCalcParaAllRecord(vecCalcOutPara)) //获取所有计算量输出配置信息列表 + if(iotSuccess !=m_ptrCalcTableOpt->getCalcParaAllRecord(vecCalcOutPara)) //获取所有计算量输出配置信息列表 { - return kbdFailed; + return iotFailed; } inRecord=vecCalcInPara.size(); @@ -315,31 +315,31 @@ int iot_service::CalcServerThread::readConfigToSaveAndSubValue() updateCalcOutPara(vecCalcOutPara[k],0); addToCalcOutParaMAP(vecCalcOutPara[k]); } - return kbdSuccess; + return iotSuccess; } int iot_service::CalcServerThread::updateCalcInPara(const STableCalcInPara &stCalcPara, int calcParaFlag) { if(stCalcPara.szCalcFlag==calcParaFlag) { - return kbdSuccess; + return iotSuccess; } - if(kbdSuccess != m_ptrCalcTableOpt->updateCalcInParaByKey(stCalcPara.stKey,calcParaFlag)) + if(iotSuccess != m_ptrCalcTableOpt->updateCalcInParaByKey(stCalcPara.stKey,calcParaFlag)) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CalcServerThread::updateCalcOutPara(const STableCalcOutPara &stCalcPara, int calcParaFlag) { if(stCalcPara.szCalcFlag==calcParaFlag) { - return kbdSuccess; + return iotSuccess; } - if(kbdSuccess != m_ptrCalcTableOpt->updateCalcOutParaByKey(stCalcPara.stKey,calcParaFlag)) + if(iotSuccess != m_ptrCalcTableOpt->updateCalcOutParaByKey(stCalcPara.stKey,calcParaFlag)) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CalcServerThread::addToCalcInParaMAP( STableCalcInPara &sTableCalcPara) { @@ -364,7 +364,7 @@ int iot_service::CalcServerThread::addToCalcInParaMAP( STableCalcInPara &sTableC mapis.insert(make_pair(sTableCalcPara.stKey.nCalcParaId,sTableCalcPara.szTagInName)); } } - return kbdSuccess; + return iotSuccess; } int CalcServerThread::addToInOutVecMAP(STableCalcInPara &sTableCalcPara) @@ -380,7 +380,7 @@ int CalcServerThread::addToInOutVecMAP(STableCalcInPara &sTableCalcPara) inVec.push_back(sTableCalcPara.stKey.szTagName); m_inOutVecMap.insert(make_pair(sTableCalcPara.szTagInName,inVec)); } - return kbdSuccess; + return iotSuccess; } int iot_service::CalcServerThread::addToCalcOutParaMAP( STableCalcOutPara &sTableCalcPara) { @@ -390,7 +390,7 @@ int iot_service::CalcServerThread::addToCalcOutParaMAP( STableCalcOutPara &sTabl { m_calcOutParaMAP.insert(make_pair(sTableCalcPara.stKey.szTagName,sTableCalcPara)); } - return kbdSuccess; + return iotSuccess; } int CalcServerThread::checkStatus(const string &strTableName, int nStatus) @@ -425,7 +425,7 @@ int iot_service::CalcServerThread::addToInPointInfoMAP( STableCalcInPara &sTable LOGDEBUG("addToInPointInfoMAP():status:[%llu]",(unsigned long long)pointInfo.nStatus); m_inPointInfoMAP.insert(make_pair(sTableCalcPara.szTagInName,pointInfo)); } - return kbdSuccess; + return iotSuccess; } int iot_service::CalcServerThread::splitFunc(const string &inTag,string &strTableName,string &strTagName,string &strColumnName) @@ -434,13 +434,13 @@ int iot_service::CalcServerThread::splitFunc(const string &inTag,string &strTabl boost::algorithm::split(vecStr,inTag,boost::algorithm::is_any_of("."), boost::algorithm::token_compress_on); if(vecStr.empty()) //为空 不执行任何操作 { - return kbdSuccess; + return iotSuccess; } vector::size_type vec_size=vecStr.size(); if(vec_size<3) { LOGERROR("split()错误"); - return kbdSuccess; + return iotSuccess; } strTableName=vecStr[0]; if(strTableName.length()<1) @@ -457,14 +457,14 @@ int iot_service::CalcServerThread::splitFunc(const string &inTag,string &strTabl strTagName +="."; } } - return kbdSuccess; + return iotSuccess; } //订阅点 int iot_service::CalcServerThread::subValue(const string strTableName,const string strTagName,const string strColumnName) { m_ptrCdpcda->subscribe(strTableName,strTagName,strColumnName); LOGINFO("订阅点：表名:[%s],标签名:[%s],字段名:[%s] 成功!",strTableName.c_str(),strTagName.c_str(),strColumnName.c_str()); - return kbdSuccess; + return iotSuccess; } int iot_service::CalcServerThread::processMessageFromDataChange(const CMbMessage &objMsg) { @@ -476,7 +476,7 @@ int iot_service::CalcServerThread::processMessageFromDataChange(const CMbMessage default: break; } - return kbdSuccess; + return iotSuccess; } int iot_service::CalcServerThread::parserMsg(const CMbMessage &objMsg) { @@ -484,38 +484,38 @@ int iot_service::CalcServerThread::parserMsg(const CMbMessage &objMsg) if(true==changeDataPackage.ParseFromArray(objMsg.getDataPtr(),(int)objMsg.getDataSize())) { //设置需要计算的配置 - if(kbdSuccess!=setNeedCalcDataMap(changeDataPackage)) + if(iotSuccess!=setNeedCalcDataMap(changeDataPackage)) { LOGERROR("CalcServerThread::parserMsg()解析失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } else { LOGERROR("CalcServerThread::parserMsg()解析失败"); - return kbdFailed; + return iotFailed; } } int iot_service::CalcServerThread::setNeedCalcDataMap(const SRealTimeDataPkg & changeDataPackage) { - if(kbdFailed==setCalcAiData(changeDataPackage)) + if(iotFailed==setCalcAiData(changeDataPackage)) { - return kbdFailed; + return iotFailed; } - if(kbdFailed==setCalcDiData(changeDataPackage)) + if(iotFailed==setCalcDiData(changeDataPackage)) { - return kbdFailed; + return iotFailed; } - if(kbdFailed==setCalcMiData(changeDataPackage)) + if(iotFailed==setCalcMiData(changeDataPackage)) { - return kbdFailed; + return iotFailed; } - if(kbdFailed==setCalcPiData(changeDataPackage)) + if(iotFailed==setCalcPiData(changeDataPackage)) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CalcServerThread::setCalcAiData(const SRealTimeDataPkg & changeDataPackage) { @@ -543,13 +543,13 @@ int iot_service::CalcServerThread::setCalcAiData(const SRealTimeDataPkg & change catch(std::exception &ex) { LOGERROR(ex.what()); - return kbdFailed; + return iotFailed; } catch(...) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CalcServerThread::setCalcDiData(const SRealTimeDataPkg & changeDataPackage) { @@ -576,13 +576,13 @@ int iot_service::CalcServerThread::setCalcDiData(const SRealTimeDataPkg & change catch(std::exception &ex) { LOGERROR(ex.what()); - return kbdFailed; + return iotFailed; } catch(...) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CalcServerThread::setCalcMiData(const SRealTimeDataPkg & changeDataPackage) { @@ -609,13 +609,13 @@ int iot_service::CalcServerThread::setCalcMiData(const SRealTimeDataPkg & change catch(std::exception &ex) { LOGERROR(ex.what()); - return kbdFailed; + return iotFailed; } catch(...) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CalcServerThread::setCalcPiData(const SRealTimeDataPkg & changeDataPackage) { @@ -642,13 +642,13 @@ int iot_service::CalcServerThread::setCalcPiData(const SRealTimeDataPkg & change catch(std::exception &ex) { LOGERROR(ex.what()); - return kbdFailed; + return iotFailed; } catch(...) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } //更新接收到的值和状态 void iot_service::CalcServerThread::updateInTagInMap(const string &tagValue, const ValueType value, const int status, const std::string &table) @@ -688,7 +688,7 @@ int iot_service::CalcServerThread::calcAndSend() m_strPointTag = ponitTag; splitFunc(ponitTag,strTableName,s1,s2); m_table = strTableName; - if(checkCalcOutParaFunc(ponitTag,stCalcName,stCalcDef) == kbdSuccess) + if(checkCalcOutParaFunc(ponitTag,stCalcName,stCalcDef) == iotSuccess) { std::string strValue ="0"; int nStatus = 1; @@ -717,21 +717,21 @@ int iot_service::CalcServerThread::calcAndSend() luabridge::LuaRef objFunc = luabridge::getGlobal(lua_state,stCalcName.c_str()); luabridge::LuaRef ret = objFunc(); bool isChange = true; - if(dealLuaRef(ret,strValue,nStatus,isChange) == kbdSuccess) + if(dealLuaRef(ret,strValue,nStatus,isChange) == iotSuccess) { if(isChange == false) { //LOGDEBUG("point:[%s],脚本输出不允许变化。",ponitTag.c_str()); continue; } - if(needSend(m_strPointTag,strValue,nStatus) == kbdSuccess) + if(needSend(m_strPointTag,strValue,nStatus) == iotSuccess) { sendToDp(m_strPointTag,strValue,nStatus); } }else { LOGERROR("CalcServerThread::calcAndSend():脚本返回出错!point:[%s],函数名:[%s]",ponitTag.c_str(),stCalcName.c_str()); - if(needSend(m_strPointTag,strValue,nStatus) == kbdSuccess) + if(needSend(m_strPointTag,strValue,nStatus) == iotSuccess) { sendToDp(m_strPointTag,strValue,nStatus); } @@ -743,7 +743,7 @@ int iot_service::CalcServerThread::calcAndSend() } } } - return kbdSuccess; + return iotSuccess; } int CalcServerThread::calcAndSendOne(const string &tagName) @@ -756,7 +756,7 @@ int CalcServerThread::calcAndSendOne(const string &tagName) m_strPointTag = tagName; splitFunc(tagName,strTableName,s1,s2); m_table = strTableName; - if(checkCalcOutParaFunc(tagName,stCalcName,stCalcDef) == kbdSuccess) + if(checkCalcOutParaFunc(tagName,stCalcName,stCalcDef) == iotSuccess) { std::string strValue ="0"; int nStatus = 1; @@ -772,7 +772,7 @@ int CalcServerThread::calcAndSendOne(const string &tagName) { LOGERROR("CalcServerThread::calcAndSendOne():加载函数失败!函数名[%s],lua堆栈无函数",stCalcName.c_str()); } - return kbdFailed; + return iotFailed; } } catch(std::exception &ex) @@ -784,21 +784,21 @@ int CalcServerThread::calcAndSendOne(const string &tagName) luabridge::LuaRef objFunc = luabridge::getGlobal(lua_state,stCalcName.c_str()); luabridge::LuaRef ret = objFunc(); bool isChange = true; - if(dealLuaRef(ret,strValue,nStatus,isChange) == kbdSuccess) + if(dealLuaRef(ret,strValue,nStatus,isChange) == iotSuccess) { if(isChange == false) { //LOGDEBUG("point:[%s],脚本输出不允许变化。",ponitTag.c_str()); - return kbdFailed; + return iotFailed; } - if(needSend(m_strPointTag,strValue,nStatus) == kbdSuccess) + if(needSend(m_strPointTag,strValue,nStatus) == iotSuccess) { sendToDp(m_strPointTag,strValue,nStatus); } }else { LOGERROR("CalcServerThread::calcAndSendOne():脚本返回出错!point:[%s],函数名:[%s]",tagName.c_str(),stCalcName.c_str()); - if(needSend(m_strPointTag,strValue,nStatus) == kbdSuccess) + if(needSend(m_strPointTag,strValue,nStatus) == iotSuccess) { sendToDp(m_strPointTag,strValue,nStatus); } @@ -807,11 +807,11 @@ int CalcServerThread::calcAndSendOne(const string &tagName) catch(std::exception &ex) { LOGERROR("CalcServerThread-2::calcAndSendOne()抛出异常:point:[%s],函数名:[%s],函数内容:[%s],错误信息:[%s]",tagName.c_str(),stCalcName.c_str(),stCalcDef.c_str(),ex.what()); - return kbdFailed; + return iotFailed; } } -return kbdSuccess; +return iotSuccess; } int iot_service::CalcServerThread::checkCalcOutParaFunc(const std::string pos_first,std::string &stCalcName,std::string &stCalcDef) { @@ -822,22 +822,22 @@ int iot_service::CalcServerThread::checkCalcOutParaFunc(const std::string pos_fi if(it == m_calcOutParaMAP.end()) { LOGERROR("配置输出表中没有输出值为：[%s]的数据！",strName.c_str()); - return kbdFailed; + return iotFailed; } else { sTableCalcOutPara = it->second; STableCalcDef sTableCalcDef; - if(kbdSuccess != m_ptrCalcTableOpt->getCalcDefByKey(sTableCalcOutPara.szCalcTag,sTableCalcDef)) + if(iotSuccess != m_ptrCalcTableOpt->getCalcDefByKey(sTableCalcOutPara.szCalcTag,sTableCalcDef)) { LOGERROR("函数配置表中没有此函数[%s=%s]",CALC_DEF_COL_CALC_NAME, sTableCalcOutPara.szCalcTag); - return kbdFailed; + return iotFailed; } stCalcName = sTableCalcDef.stKey.szCalcName;//函数名 stCalcDef = sTableCalcDef.szCalcStr; //函数体 - return kbdSuccess; + return iotSuccess; } - return kbdSuccess; + return iotSuccess; } void iot_service::CalcServerThread::sendToDp(const std::string strName,const std::string outValue,const int inValid) @@ -908,7 +908,7 @@ void iot_service::CalcServerThread::sendToDp(const std::string strName,const std varValue.set_edatatype( CN_DATATYPE_DOUBLE ); varValue.set_dvalue(atof(outValue.c_str())); } - if(AddOptSetData(strTableName,strTagName,nAddStatus,nDelStatus,varValue) == kbdSuccess) + if(AddOptSetData(strTableName,strTagName,nAddStatus,nDelStatus,varValue) == iotSuccess) { sendCalcData(nPointType,false); } @@ -928,7 +928,7 @@ int CalcServerThread::needSend(const string strName, const string outValue, cons SOutPointInfo &pointInfo = it->second; if(pointInfo.nvalid == inValid && pointInfo.value == outValue) { - return kbdFailed; + return iotFailed; }else { pointInfo.nvalid = inValid; @@ -943,7 +943,7 @@ int CalcServerThread::needSend(const string strName, const string outValue, cons pointInfo.nTime = iot_public::getUTCTimeMsec(); m_outPointInfoMap[strName] = pointInfo; } - return kbdSuccess; + return iotSuccess; } int iot_service::CalcServerThread::AddOptSetData(const string strTableName, const string strTagName, const int nAddStatus, const int nDelStatus, const SVariable varValue) @@ -961,10 +961,10 @@ int iot_service::CalcServerThread::AddOptSetData(const string strTableName, cons m_stOptDataMsg.clear_seq_set_data_info(); LOGERROR("AddOptSetData, key_id_tag = %s.%s, nAddStatus=%d,nDelStatus=%d Fail ",\ strTableName.c_str(), strTagName.c_str(), nAddStatus, nDelStatus); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } void iot_service::CalcServerThread::sendCalcData(const int nPointType, const bool bNotAlarm) { @@ -1110,13 +1110,13 @@ int CalcServerThread::dealLuaRef(luabridge::LuaRef ret, string &strValue, int &n if(ret.isNil()) { LOGERROR("CalcServerThread::dealLuaRef()脚本返回值为空!"); - return kbdFailed; + return iotFailed; } if(!ret.isTable()) { LOGERROR("CalcServerThread::dealLuaRef()脚本返回类型错误!"); - return kbdFailed; + return iotFailed; } if(!ret[1].isNil()&&ret[1].isNumber()) @@ -1125,7 +1125,7 @@ int CalcServerThread::dealLuaRef(luabridge::LuaRef ret, string &strValue, int &n }else { LOGERROR("CalcServerThread::dealLuaRef()table[1]:输出值为nil或非数字"); - return kbdFailed; + return iotFailed; } if(!ret[2].isNil()&&(ret[2].isBool())) { @@ -1139,7 +1139,7 @@ int CalcServerThread::dealLuaRef(luabridge::LuaRef ret, string &strValue, int &n }else { LOGERROR("CalcServerThread::dealLuaRef()table[2]:输出状态为nil或非布尔值"); - return kbdFailed; + return iotFailed; } if(!ret[3].isNil() &&(ret[3].isBool())) { @@ -1148,5 +1148,5 @@ int CalcServerThread::dealLuaRef(luabridge::LuaRef ret, string &strValue, int &n isChange = false; } } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/service/calc_server/CalcServerThread.h b/product/src/service/calc_server/CalcServerThread.h index cbd68b0b..62d91a71 100644 --- a/product/src/service/calc_server/CalcServerThread.h +++ b/product/src/service/calc_server/CalcServerThread.h @@ -65,18 +65,18 @@ namespace iot_service { static luabridge::LuaRef getBitOr(double first,double second,lua_State *LuaState); /** * @brief initialize 初始化 - * @return 成功返回kbdSuccess，失败返回失败码 + * @return 成功返回iotSuccess，失败返回失败码 */ int initialize(); /** * @brief setMaster 设置为主 - * @return 成功返回kbdSuccess，失败返回失败码 + * @return 成功返回iotSuccess，失败返回失败码 */ int setMaster(); /** * @brief setSlave 设置为备 - * @return 成功返回kbdSuccess，失败返回失败码 + * @return 成功返回iotSuccess，失败返回失败码 */ int setSlave(); /** @@ -94,7 +94,7 @@ namespace iot_service { void clean(); /** * @brief readConfigToSaveAndSubValue 读取配置保存在缓存中，然后订阅需要订阅的点 - * @return 成功返回kbdSuccess，失败返回失败码 + * @return 成功返回iotSuccess，失败返回失败码 */ int readConfigToSaveAndSubValue(); /** @@ -148,7 +148,7 @@ namespace iot_service { * @param strTableName 切割得到的表名 * @param strTagName 切割得到的标签名 * @param strColumnName 切割得到的列名 - * @return 成功返回kbdSuccess，失败返回失败码 + * @return 成功返回iotSuccess，失败返回失败码 */ int splitFunc(const std::string &inTag,std::string &strTableName,std::string &strTagName, std::string &strColumnName); @@ -157,49 +157,49 @@ namespace iot_service { * @param strTableName 表名 * @param strTagName 标签名 * @param strColumnName 列名 - * @return 成功返回kbdSuccess，失败返回失败码 + * @return 成功返回iotSuccess，失败返回失败码 */ int subValue(const std::string strTableName,const std::string strTagName,const std::string strColumnName); /** * @brief processMessageFromDataChange 处理从变化数据通道接收的数据 * @param objMsg - * @return 成功返回kbdSuccess，失败返回失败码 + * @return 成功返回iotSuccess，失败返回失败码 */ int processMessageFromDataChange(const iot_net::CMbMessage &objMsg); /** * @brief parserMsg 解析 * @param objMsg 需要解析的json - * @return 成功返回kbdSuccess，失败返回失败码 + * @return 成功返回iotSuccess，失败返回失败码 */ int parserMsg(const iot_net::CMbMessage &objMsg); /** * @brief setNeedCalcDataMap 设置需要计算的数据的map * @param changeDataPackage 解析后的数据 - * @return 成功返回kbdSuccess，失败返回失败码 + * @return 成功返回iotSuccess，失败返回失败码 */ int setNeedCalcDataMap(const iot_idl::SRealTimeDataPkg & changeDataPackage); /** * @brief setCalcAiData 设置ai * @param changeDataPackage 解析后的数据 - * @return 成功返回kbdSuccess，失败返回失败码 + * @return 成功返回iotSuccess，失败返回失败码 */ int setCalcAiData(const iot_idl::SRealTimeDataPkg & changeDataPackage); /** * @brief setCalcDiData 设置di * @param changeDataPackage 解析后的数据 - * @return 成功返回kbdSuccess，失败返回失败码 + * @return 成功返回iotSuccess，失败返回失败码 */ int setCalcDiData(const iot_idl::SRealTimeDataPkg & changeDataPackage); /** * @brief getCalcMiData 设置mi * @param changeDataPackage 解析后的数据 - * @return 成功返回kbdSuccess，失败返回失败码 + * @return 成功返回iotSuccess，失败返回失败码 */ int setCalcMiData(const iot_idl::SRealTimeDataPkg & changeDataPackage); /** * @brief getCalcPiData 设置pi * @param changeDataPackage 解析后的数据 - * @return 成功返回kbdSuccess，失败返回失败码 + * @return 成功返回iotSuccess，失败返回失败码 */ int setCalcPiData(const iot_idl::SRealTimeDataPkg & changeDataPackage); /** diff --git a/product/src/service/stat_server/stat_server/CComputeUnit.cpp b/product/src/service/stat_server/stat_server/CComputeUnit.cpp index 7855a4ae..3dd59578 100644 --- a/product/src/service/stat_server/stat_server/CComputeUnit.cpp +++ b/product/src/service/stat_server/stat_server/CComputeUnit.cpp @@ -29,7 +29,7 @@ iot_service::CComputeUnit::CComputeUnit(QObject *parent, CComputeTaskPtr taskPtr m_timer.setTimerType(Qt::PreciseTimer); //< 初始化lua环境 - if(initLuaEnv() == kbdFailed) + if(initLuaEnv() == iotFailed) { LOGERROR("统计实例%s初始化lua环境失败",m_taskPtr->tagName().c_str()); m_state = COMPUTE_UNIT_BAD; @@ -77,7 +77,7 @@ void iot_service::CComputeUnit::compute() std::vector vecArgs;//< 参数列表 fillPara(vecArgs); luabridge::LuaRef ret(m_luaState);//< 函数返回值 - if(callFunction(vecArgs,ret) == kbdFailed) + if(callFunction(vecArgs,ret) == iotFailed) return; publishRet(ret); //< 发布函数返回值 LOGTRACE("统计实例%s计算完成",m_taskPtr->tagName().c_str()); @@ -386,7 +386,7 @@ int iot_service::CComputeUnit::initLuaEnv() if(m_luaState == NULL) { LOGERROR("初始化lua库环境失败"); - return kbdFailed; + return iotFailed; } //< 加载内置函数 @@ -403,12 +403,12 @@ int iot_service::CComputeUnit::initLuaEnv() if( true == luaL_dostring(m_luaState,function_text.c_str()) ) { LOGERROR("统计实例%s-----lua函数加载失败,函数体为\n%s",m_taskPtr->tagName().c_str(),function_text.c_str()); - return kbdFailed; + return iotFailed; } //< 赋值函数 m_objFunc = luabridge::getGlobal(m_luaState, m_taskPtr->statTemplate()->_template_tag.c_str()); - return kbdSuccess; + return iotSuccess; } uint64 iot_service::CComputeUnit::getTimeStampByPara(CParaTimePtr para) @@ -569,9 +569,9 @@ int iot_service::CComputeUnit::callFunction(std::vector &vecA catch (const std::exception& ex) { LOGERROR("执行函数[%s]失败,error=[%s]", m_taskPtr->tagName().c_str(), ex.what()); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } void iot_service::CComputeUnit::publishRet(luabridge::LuaRef &ret) diff --git a/product/src/service/stat_server/stat_server/CMainThreadMng.cpp b/product/src/service/stat_server/stat_server/CMainThreadMng.cpp index 2bc8a5ca..c09a009b 100644 --- a/product/src/service/stat_server/stat_server/CMainThreadMng.cpp +++ b/product/src/service/stat_server/stat_server/CMainThreadMng.cpp @@ -41,9 +41,9 @@ iot_service::CMainThreadMng::~CMainThreadMng() int iot_service::CMainThreadMng::initialize() { CRdbReloadWorker *rdbReloadWorker = new CRdbReloadWorker(NULL,m_stRunAppInfo,m_mapTagTask,m_mapTagTemplate); - if(rdbReloadWorker->initialize() == kbdFailed){ + if(rdbReloadWorker->initialize() == iotFailed){ LOGERROR("统计实例初始化失败"); - return kbdFailed; + return iotFailed; } // rdbReloadWorker->moveToThread(m_rdbReloadThread); //< 主动析构 @@ -89,14 +89,14 @@ int iot_service::CMainThreadMng::initialize() emit this->computerWorkerInit(); - if(publishWorker->initialize() == kbdFailed){ + if(publishWorker->initialize() == iotFailed){ LOGERROR("发布更新类初始化失败"); - return kbdFailed; + return iotFailed; } emit this->subDpCHgWorkerInit(); - return kbdSuccess; + return iotSuccess; } void iot_service::CMainThreadMng::startCompute() diff --git a/product/src/service/stat_server/stat_server/CMainThreadMng.h b/product/src/service/stat_server/stat_server/CMainThreadMng.h index 4ff2f8bb..b2a790e6 100644 --- a/product/src/service/stat_server/stat_server/CMainThreadMng.h +++ b/product/src/service/stat_server/stat_server/CMainThreadMng.h @@ -22,7 +22,7 @@ public: ~CMainThreadMng(); /** * @brief initialize 初始化 - * @return kbdSucess kbdFailed + * @return kbdSucess iotFailed */ int initialize(); void startCompute(); diff --git a/product/src/service/stat_server/stat_server/CPublishWorker.cpp b/product/src/service/stat_server/stat_server/CPublishWorker.cpp index 5aad1637..ba41cd4d 100644 --- a/product/src/service/stat_server/stat_server/CPublishWorker.cpp +++ b/product/src/service/stat_server/stat_server/CPublishWorker.cpp @@ -38,7 +38,7 @@ int iot_service::CPublishWorker::initialize() if(m_ptrMsgbusMng == NULL) { LOGERROR("创建消息总线管理类失败"); - return kbdFailed; + return iotFailed; } //< data_process_api 实例 @@ -46,12 +46,12 @@ int iot_service::CPublishWorker::initialize() if (m_ptrDataProcApi == NULL) { LOGERROR("CMainWorkThread::init(), getDataProcInstance error"); - return kbdFailed; + return iotFailed; } if(m_ptrDataProcApi->initialize() < 0) { LOGERROR("CMainWorkThread::init(), data_process_api initialize() error"); - return kbdFailed; + return iotFailed; } //<.RDB管理实例 @@ -59,11 +59,11 @@ int iot_service::CPublishWorker::initialize() if (m_ptrRdbTableMng == NULL) { LOGERROR("CDigProcess::initialize(), make_shared fail!\n"); - return kbdFailed; + return iotFailed; } if (m_ptrDataProcApi->getMenuMacToValMap("数字量状态", m_mapDiState) < 0) { - return kbdFailed; + return iotFailed; } MENU_STATE_DI_INVALID = m_mapDiState["MENU_STATE_DI_INVALID"]; m_nMenuStateDiSetData = m_mapDiState["MENU_STATE_DI_SET_DATA"]; @@ -71,19 +71,19 @@ int iot_service::CPublishWorker::initialize() MENU_STATE_DI_NORMAL = m_mapDiState["MENU_STATE_DI_NORMAL"]; if (m_ptrDataProcApi->getMenuMacToValMap("模拟量状态", m_mapAiState) < 0) { - return kbdFailed; + return iotFailed; } MENU_STATE_AI_INVALID = m_mapAiState["MENU_STATE_AI_INVALID"]; m_nMenuStateAiSetData = m_mapAiState["MENU_STATE_AI_SET_DATA"]; MENU_STATE_AI_GET_CAL = m_mapAiState["MENU_STATE_AI_GET_CAL"]; MENU_STATE_AI_NORMAL = m_mapAiState["MENU_STATE_AI_NORMAL"]; - if(openRdbTable() == kbdFailed) + if(openRdbTable() == iotFailed) { LOGERROR("发布消息类打开内存表失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } @@ -92,7 +92,7 @@ void iot_service::CPublishWorker::publishResult(QString instTag, double value, i // checkMainThread(); LOGTRACE("发布结果,返回值标签%s,值%f,状态%d(1有效,0无效),是否绑定测点%d(1绑定,0不绑定),绑定测点标签%s",instTag.toStdString().c_str(),value,status,(int)isBind,pointTag.toStdString().c_str()); - if(updateRdb(instTag.toStdString(),value,status) == kbdFailed) + if(updateRdb(instTag.toStdString(),value,status) == iotFailed) { LOGERROR("输出参数标签为%s更新内存库失败",instTag.toStdString().c_str()); } @@ -187,13 +187,13 @@ int iot_service::CPublishWorker::splitFunc(const std::string &inTag, std::string boost::algorithm::split(vecStr,inTag,boost::algorithm::is_any_of("."), boost::algorithm::token_compress_on); if(vecStr.empty()) //为空 不执行任何操作 { - return kbdSuccess; + return iotSuccess; } std::vector::size_type vec_size=vecStr.size(); if(vec_size<3) { LOGERROR("split()错误"); - return kbdSuccess; + return iotSuccess; } strTableName=vecStr[0]; if(strTableName.length()<1) @@ -210,7 +210,7 @@ int iot_service::CPublishWorker::splitFunc(const std::string &inTag, std::string strTagName +="."; } } - return kbdSuccess; + return iotSuccess; } void iot_service::CPublishWorker::AddOptSetData(iot_idl::SOptSetDataPkg &stOptDataMsg, const std::string &strTableName, const std::string &strTagName, const int &nAddStatus, const int &nDelStatus, const iot_idl::SVariable &varValue) @@ -266,9 +266,9 @@ int iot_service::CPublishWorker::openRdbTable() if(!m_InstRetPara.open(m_stRunAppInfo.nAppId,INST_RET_PARA)) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,INST_RET_PARA); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CPublishWorker::updateRdb(const std::string & instTag, double value, int status) @@ -283,7 +283,7 @@ int iot_service::CPublishWorker::updateRdb(const std::string & instTag, double v if(!m_InstRetPara.updateRecordByKeyTwoValue(key,std::string(COL_VALUE),value,std::string(COL_STATUS),status)) { LOGERROR("更新内存库出错,表InstRetPara,主键是%s,值为%f,状态为%d",key,value,status); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/service/stat_server/stat_server/CPublishWorker.h b/product/src/service/stat_server/stat_server/CPublishWorker.h index 1adf0e5f..a5417fec 100644 --- a/product/src/service/stat_server/stat_server/CPublishWorker.h +++ b/product/src/service/stat_server/stat_server/CPublishWorker.h @@ -77,7 +77,7 @@ private: * @param strTableName 切割得到的表名 * @param strTagName 切割得到的标签名 * @param strColumnName 切割得到的列名 - * @return 成功返回kbdSuccess，失败返回失败码 + * @return 成功返回iotSuccess，失败返回失败码 */ int splitFunc(const std::string &inTag,std::string &strTableName,std::string &strTagName, std::string &strColumnName); diff --git a/product/src/service/stat_server/stat_server/CRdbReloadWorker.cpp b/product/src/service/stat_server/stat_server/CRdbReloadWorker.cpp index 65a3ad17..b50777bc 100644 --- a/product/src/service/stat_server/stat_server/CRdbReloadWorker.cpp +++ b/product/src/service/stat_server/stat_server/CRdbReloadWorker.cpp @@ -73,31 +73,31 @@ iot_service::CRdbReloadWorker::~CRdbReloadWorker() int iot_service::CRdbReloadWorker::initialize() { - if(openRdbTable() == kbdFailed) + if(openRdbTable() == iotFailed) { LOGERROR("打开内存库表失败"); - return kbdFailed; + return iotFailed; } // LOGINFO("打开内存库统计计算相关表完成"); - if(loadRdb() == kbdFailed) + if(loadRdb() == iotFailed) { LOGERROR("加载内存库失败"); - return kbdFailed; + return iotFailed; } // LOGINFO("加载内存库成功"); - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::loadRdb() { // 加载统计实例 std::vector vecInstEnabled; - if(getAllEnabledInst(vecInstEnabled) == kbdFailed) + if(getAllEnabledInst(vecInstEnabled) == iotFailed) { LOGERROR("加载所有启用的统计实例失败"); - return kbdFailed; + return iotFailed; } // LOGINFO("加载所有启用的统计实例成功"); @@ -106,17 +106,17 @@ int iot_service::CRdbReloadWorker::loadRdb() { int state; // LOGINFO("添加统计实例%s中",vecInstEnabled[i].szTag); - if((state = addTask(vecInstEnabled[i])) == kbdFailed) + if((state = addTask(vecInstEnabled[i])) == iotFailed) { LOGERROR("添加统计实例%s失败",vecInstEnabled[i].szDesc); // 添加统计实例失败不算加载失败,这个统计实例不纳入计算范围map 后期纳入错误统计范围map } - else if (state == kbdFailedRdb) // 初始化时遇到内存库错误退出,运行时遇到错误,状态值无视即可. + else if (state == iotFailedRdb) // 初始化时遇到内存库错误退出,运行时遇到错误,状态值无视即可. { - return kbdFailed; + return iotFailed; } // LOGINFO("添加统计实例%s完成",vecInstEnabled[i].szTag); } - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::openRdbTable() @@ -124,59 +124,59 @@ int iot_service::CRdbReloadWorker::openRdbTable() if(!m_InstDef.open(m_stRunAppInfo.nAppId,INST_DEF)) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,INST_DEF); - return kbdFailed; + return iotFailed; } if(!m_InstParaTime.open(m_stRunAppInfo.nAppId,INST_PARA_TIME)) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,INST_PARA_TIME); - return kbdFailed; + return iotFailed; } if(!m_InstParaPoint.open(m_stRunAppInfo.nAppId,INST_PARA_POINT)) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,INST_PARA_POINT); - return kbdFailed; + return iotFailed; } if(!m_InstParaGrp.open(m_stRunAppInfo.nAppId,INST_PARA_GRP)) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,INST_PARA_GRP); - return kbdFailed; + return iotFailed; } if(!m_InstRetGrp.open(m_stRunAppInfo.nAppId,INST_RET_GRP)) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,INST_RET_GRP); - return kbdFailed; + return iotFailed; } if(!m_InstRetPara.open(m_stRunAppInfo.nAppId,INST_RET_PARA)) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,INST_RET_PARA); - return kbdFailed; + return iotFailed; } if(!m_TemplateDef.open(m_stRunAppInfo.nAppId,TEMPLATE_DEF)) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,TEMPLATE_DEF); - return kbdFailed; + return iotFailed; } if(!m_TemplatePara.open(m_stRunAppInfo.nAppId,TEMPLATE_PARA)) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,TEMPLATE_PARA); - return kbdFailed; + return iotFailed; } if(!m_TemplateRet.open(m_stRunAppInfo.nAppId,TEMPLATE_RET)) { LOGERROR("打开内存库失败.AppId=[%d],TableName=[%s]",m_stRunAppInfo.nAppId,TEMPLATE_RET); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::getAllEnabledInst(std::vector &vecInst) @@ -193,9 +193,9 @@ int iot_service::CRdbReloadWorker::getAllEnabledInst(std::vector & if(!m_InstDef.selectAllVec(vecCond,vecInst,vecCol)) { LOGERROR("CRdbReloadWorker::getAllEnabledInst():查询表[%s]所有的启用的统计实例失败.", INST_DEF); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::addTask(SStatInstDef &sInst) @@ -213,7 +213,7 @@ int iot_service::CRdbReloadWorker::addTask(SStatInstDef &sInst) if(period > RDB_PERIOD_VAL_YEAR || period < 0) { LOGERROR("实例%s周期定义异常",std::string(sInst.szTag).c_str()); - return kbdFailed; + return iotFailed; } task->setPeriod(sInst.nPeriod); @@ -238,17 +238,17 @@ int iot_service::CRdbReloadWorker::addTask(SStatInstDef &sInst) { CStatTemplatePtr templatePtr; int state; - if((state = getTemplate(sInst.szTemplateTag,templatePtr)) == kbdSuccess){ + if((state = getTemplate(sInst.szTemplateTag,templatePtr)) == iotSuccess){ task->setStatTemplate(templatePtr); } - else if(state == kbdFailed){ + else if(state == iotFailed){ task->setConfigState(TASK_CFG_TEMPLATE_SEARCH_ERR); LOGERROR("该统计实例%s添加统计模板参数%s出错,未查询到该统计模板",sInst.szTag,sInst.szTemplateTag); - return kbdFailed; + return iotFailed; } - else if(state == kbdFailedRdb){ + else if(state == iotFailedRdb){ LOGERROR("该统计实例%s添加统计模板参数%s出错,内存库查询出错",sInst.szTag,sInst.szTemplateTag); - return kbdFailedRdb; + return iotFailedRdb; } } @@ -256,15 +256,15 @@ int iot_service::CRdbReloadWorker::addTask(SStatInstDef &sInst) { int state; state = addParaToTask(sInst.szTag,task); - if(state == kbdFailed) + if(state == iotFailed) { task->setConfigState(TASK_CFG_PARA_ERR); - return kbdFailed; + return iotFailed; } - else if(state == kbdFailedRdb) + else if(state == iotFailedRdb) { LOGERROR("该统计实例%s添加函数参数中内存库查询出错",sInst.szTag); - return kbdFailedRdb; + return iotFailedRdb; } } @@ -273,20 +273,20 @@ int iot_service::CRdbReloadWorker::addTask(SStatInstDef &sInst) { int state; state = addRetToTask(sInst.szTag,task); - if(state == kbdFailed) + if(state == iotFailed) { task->setConfigState(TASK_CFG_RET_ERR); - return kbdFailed; + return iotFailed; } - else if(state == kbdFailedRdb) + else if(state == iotFailedRdb) { LOGERROR("该统计实例%s添加函数返回值中内存库查询出错",sInst.szTag); - return kbdFailedRdb; + return iotFailedRdb; } } m_mapTagTask->insert(std::make_pair(sInst.szTag,task)); - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::addParaToTask(const char *sInstTag, CComputeTaskPtr &outTaskPtr) @@ -294,45 +294,45 @@ int iot_service::CRdbReloadWorker::addParaToTask(const char *sInstTag, CComputeT //< 参数模板添加 { int state = addTemplateParaToTask(outTaskPtr->statTemplate()->_template_tag.c_str(),outTaskPtr); - if(state == kbdFailed) + if(state == iotFailed) { - return kbdFailed; + return iotFailed; } - else if(state == kbdFailedRdb) + else if(state == iotFailedRdb) { LOGERROR("添加统计模板标签为%s参数模板时内存库查询出错",outTaskPtr->statTemplate()->_template_tag.c_str()); - return kbdFailedRdb; + return iotFailedRdb; } } // 填充第一级参数 { int state = fillFirstRankPara(sInstTag,outTaskPtr); - if(state == kbdFailed) + if(state == iotFailed) { - return kbdFailed; + return iotFailed; } - else if(state == kbdFailedRdb) + else if(state == iotFailedRdb) { LOGERROR("添加统计实例标签为%s一级参数时内存库查询出错",sInstTag); - return kbdFailedRdb; + return iotFailedRdb; } } // 填充第二级参数 { int state = fillSecondRankPara(sInstTag,outTaskPtr); - if(state == kbdFailed) + if(state == iotFailed) { - return kbdFailed; + return iotFailed; } - else if(state == kbdFailedRdb) + else if(state == iotFailedRdb) { LOGERROR("添加统计实例标签为%s二级参数时内存库查询出错",sInstTag); - return kbdFailedRdb; + return iotFailedRdb; } } - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::addRetToTask(const char *sInstTag, CComputeTaskPtr &outTaskPtr) @@ -340,28 +340,28 @@ int iot_service::CRdbReloadWorker::addRetToTask(const char *sInstTag, CComputeTa //< 返回值模板添加 { int state = addTemplateRetToTask(outTaskPtr->statTemplate()->_template_tag.c_str(),outTaskPtr); - if(state == kbdFailed) + if(state == iotFailed) { - return kbdFailed; + return iotFailed; } - else if(state == kbdFailedRdb) + else if(state == iotFailedRdb) { LOGERROR("添加统计模板标签为%s返回值模板时内存库查询出错",outTaskPtr->statTemplate()->_template_tag.c_str()); - return kbdFailedRdb; + return iotFailedRdb; } } //< 填充第一级返回值参数 { int state = fillFirstRankRet(sInstTag,outTaskPtr); - if(state == kbdFailed) + if(state == iotFailed) { - return kbdFailed; + return iotFailed; } - else if(state == kbdFailedRdb) + else if(state == iotFailedRdb) { LOGERROR("添加统计实例标签为%s一级返回值参数时内存库查询出错",sInstTag); - return kbdFailedRdb; + return iotFailedRdb; } } @@ -369,17 +369,17 @@ int iot_service::CRdbReloadWorker::addRetToTask(const char *sInstTag, CComputeTa //< 填充第二级参数 { int state = fillSecondRankRet(sInstTag,outTaskPtr); - if(state == kbdFailed) + if(state == iotFailed) { - return kbdFailed; + return iotFailed; } - else if(state == kbdFailedRdb) + else if(state == iotFailedRdb) { LOGERROR("添加统计实例标签为%s一级返回值参数时内存库查询出错",sInstTag); - return kbdFailedRdb; + return iotFailedRdb; } } - return kbdSuccess; + return iotSuccess; } int @@ -388,7 +388,7 @@ iot_service::CRdbReloadWorker::getTemplate(const char *szTemplateTag, CStatTempl if(m_mapTagTemplate->find(szTemplateTag) != m_mapTagTemplate->end()) { outTemplatePtr = m_mapTagTemplate->at(szTemplateTag); - return kbdSuccess; + return iotSuccess; } //< 添加模板参数 @@ -401,17 +401,17 @@ iot_service::CRdbReloadWorker::getTemplate(const char *szTemplateTag, CStatTempl boost::make_shared(def.szTag,def.szFunctionHeader,def.szFunctionBody,def.szFunctionRet))); outTemplatePtr = m_mapTagTemplate->at(szTemplateTag); // LOGINFO("查询到标签为%s的模板",outTemplatePtr->_template_tag.c_str()); - return kbdSuccess; + return iotSuccess; } else if(m_TemplateDef.getRecordByKeyAllColumn(szTemplateTag,def) == 0) { LOGERROR("未查询到标签为%s的模板",szTemplateTag); - return kbdFailed; + return iotFailed; } else // m_TemplateDef.getRecordByKeyAllColumn(szTemplateTag,def) < 0情况 { LOGERROR("内存库查询出错,当前查询模板标签为%s",szTemplateTag); - return kbdFailedRdb; + return iotFailedRdb; } } } @@ -428,7 +428,7 @@ int iot_service::CRdbReloadWorker::addTemplateParaToTask(const char *sTemplateTa if(!m_TemplatePara.selectAllVec(vecCond,vecRecord,vecCol,TEMPLATE_PARA_COL_SORT,1)){ // 以sort 列为升序查询 LOGERROR("查询统计模板参数表失败"); - return kbdFailed; + return iotFailed; } //< 处理查询结果 @@ -438,7 +438,7 @@ int iot_service::CRdbReloadWorker::addTemplateParaToTask(const char *sTemplateTa if((i + 1) != vecRecord[i].nSort) { LOGERROR("参数%s配置错误,序号顺序出错,当前序号为%d,循环处理序号为%d,参数模板为%s", vecRecord[i].szTag,vecRecord[i].nSort,i,sTemplateTag); - return kbdFailed; // 配置错误 + return iotFailed; // 配置错误 } //< 判断是否为参数组 @@ -455,13 +455,13 @@ int iot_service::CRdbReloadWorker::addTemplateParaToTask(const char *sTemplateTa } else{ LOGERROR("点的类别设置不正确"); - return kbdFailed; + return iotFailed; } //< 将参数添加到outTask中 outTaskPtr->addPara(para); } - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::fillFirstRankPara(const char *sInstTag, CComputeTaskPtr &outTaskPtr) @@ -471,14 +471,14 @@ int iot_service::CRdbReloadWorker::fillFirstRankPara(const char *sInstTag, CComp if(outTaskPtr->getPara(i)->isGrp() == true) { int state = fillInstParaGrp(sInstTag,i,outTaskPtr); - if(state == kbdFailed) + if(state == iotFailed) { LOGERROR("填充实例参数组标签失败,实例标签%s",sInstTag); - return kbdFailed; + return iotFailed; } - else if(state == kbdFailedRdb) + else if(state == iotFailedRdb) { - return kbdFailedRdb; + return iotFailedRdb; } } else //< 填充参数 @@ -487,14 +487,14 @@ int iot_service::CRdbReloadWorker::fillFirstRankPara(const char *sInstTag, CComp { //填充tagname和测点相关参数 int state = fillInstParaPoint(sInstTag,i,outTaskPtr); - if(state == kbdFailed) + if(state == iotFailed) { LOGERROR("填充实例测点参数标签失败,实例标签%s",sInstTag); - return kbdFailed; + return iotFailed; } - else if(state == kbdFailedRdb) + else if(state == iotFailedRdb) { - return kbdFailedRdb; + return iotFailedRdb; } } @@ -502,14 +502,14 @@ int iot_service::CRdbReloadWorker::fillFirstRankPara(const char *sInstTag, CComp { //填充tagname和时间类型相关参数 int state = fillInstParaTime(sInstTag,i,outTaskPtr); - if(state == kbdFailed) + if(state == iotFailed) { LOGERROR("填充实例测点类参数标签失败,实例标签%s",sInstTag); - return kbdFailed; + return iotFailed; } - else if(state == kbdFailedRdb) + else if(state == iotFailedRdb) { - return kbdFailedRdb; + return iotFailedRdb; } } else @@ -518,7 +518,7 @@ int iot_service::CRdbReloadWorker::fillFirstRankPara(const char *sInstTag, CComp } } } - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::fillSecondRankPara(const char *sInstTag, CComputeTaskPtr &outTaskPtr) @@ -532,14 +532,14 @@ int iot_service::CRdbReloadWorker::fillSecondRankPara(const char *sInstTag, CCom { //填充tagname和测点相关参数 int state = fillInstParaPointSecondRank(sInstTag,grpPara->paraTag().c_str(),grpPara); - if(state == kbdFailed) + if(state == iotFailed) { LOGERROR("填充二级实例测点参数标签失败,实例标签%s",sInstTag); - return kbdFailed; + return iotFailed; } - else if(state == kbdFailedRdb) + else if(state == iotFailedRdb) { - return kbdFailedRdb; + return iotFailedRdb; } } @@ -547,14 +547,14 @@ int iot_service::CRdbReloadWorker::fillSecondRankPara(const char *sInstTag, CCom { //填充tagname和时间类型相关参数 int state = fillInstParaTimeSecondRank(sInstTag,grpPara->paraTag().c_str(),grpPara); - if(state == kbdFailed) + if(state == iotFailed) { LOGERROR("填充二级实例测点类参数标签失败,实例标签%s",sInstTag); - return kbdFailed; + return iotFailed; } - else if(state == kbdFailedRdb) + else if(state == iotFailedRdb) { - return kbdFailedRdb; + return iotFailedRdb; } } else @@ -563,7 +563,7 @@ int iot_service::CRdbReloadWorker::fillSecondRankPara(const char *sInstTag, CCom } } } - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::fillInstParaGrp(const char *sInstTag, int sort, CComputeTaskPtr &outTaskPtr) @@ -578,17 +578,17 @@ int iot_service::CRdbReloadWorker::fillInstParaGrp(const char *sInstTag, int sor iot_dbms::CTableLockGuard tableLock(m_InstParaGrp); if(!m_InstParaGrp.selectAllVec(vecCond,vecRecord,vecCol)){ LOGERROR("查询统计输入参数组失败"); - return kbdFailedRdb; + return iotFailedRdb; } if(vecRecord.size() != 1) { LOGERROR("未查询到符合数量的输入参数组记录,数量为%d",(int)vecRecord.size()); - return kbdFailed; + return iotFailed; } outTaskPtr->getPara(sort)->setParaTag(vecRecord[0].szTag); - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::fillInstParaPoint(const char *sInstTag, int sort, CComputeTaskPtr &outTaskPtr) @@ -604,13 +604,13 @@ int iot_service::CRdbReloadWorker::fillInstParaPoint(const char *sInstTag, int s iot_dbms::CTableLockGuard tableLock(m_InstParaPoint); if(!m_InstParaPoint.selectAllVec(vecCond,vecRecord,vecCol)){ LOGERROR("查询统计输入测点类参数失败"); - return kbdFailed; + return iotFailed; } if(vecRecord.size() != 1) { LOGERROR("未查询到符合数量的输入测点类参数记录,数量为%d",(int)vecRecord.size()); - return kbdFailed; + return iotFailed; } // 填充测点参数 @@ -618,7 +618,7 @@ int iot_service::CRdbReloadWorker::fillInstParaPoint(const char *sInstTag, int s CParaPointPtr pointPtr = boost::static_pointer_cast(outTaskPtr->getPara(sort)); pointPtr->setPointTag(vecRecord[0].szPointTag); - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::fillInstParaTime(const char *sInstTag, int sort, CComputeTaskPtr &outTaskPtr) @@ -634,13 +634,13 @@ int iot_service::CRdbReloadWorker::fillInstParaTime(const char *sInstTag, int so iot_dbms::CTableLockGuard tableLock(m_InstParaTime); if(!m_InstParaTime.selectAllVec(vecCond,vecRecord,vecCol)){ LOGERROR("查询统计输入时间参数失败"); - return kbdFailed; + return iotFailed; } if(vecRecord.size() != 1) { LOGERROR("未查询到符合数量的输入测点类参数,数量为%d,参数标签为%s",(int)vecRecord.size(),sInstTag); - return kbdFailed; + return iotFailed; } // 填充时间参数 @@ -657,7 +657,7 @@ int iot_service::CRdbReloadWorker::fillInstParaTime(const char *sInstTag, int so timePtr->setMinute_R(vecRecord[0].nMinute_R); timePtr->setSecond_R(vecRecord[0].nSecond_R); - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::fillInstParaPointSecondRank(const char *szInstTag, const char *szGrpTag, CParaGrpPtr &grpPara) @@ -673,7 +673,7 @@ int iot_service::CRdbReloadWorker::fillInstParaPointSecondRank(const char *szIns iot_dbms::CTableLockGuard tableLock(m_InstParaPoint); if(!m_InstParaPoint.selectAllVec(vecCond,vecRecord,vecCol,COL_SORT,1)){ // 以sort 列为升序查询 LOGERROR("查询二级统计输入测点类参数失败"); - return kbdFailed; + return iotFailed; } // 填充测点参数 @@ -684,7 +684,7 @@ int iot_service::CRdbReloadWorker::fillInstParaPointSecondRank(const char *szIns grpPara->addPara(pointPara); } - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::fillInstParaTimeSecondRank(const char *szInstTag, const char *szGrpTag, CParaGrpPtr &grpPara) @@ -700,7 +700,7 @@ int iot_service::CRdbReloadWorker::fillInstParaTimeSecondRank(const char *szInst iot_dbms::CTableLockGuard tableLock(m_InstParaTime); if(!m_InstParaTime.selectAllVec(vecCond,vecRecord,vecCol,COL_SORT,1)){ // 以sort 列为升序查询 LOGERROR("查询二级统计输入时间类参数失败"); - return kbdFailed; + return iotFailed; } // 填充时间类参数 @@ -721,7 +721,7 @@ int iot_service::CRdbReloadWorker::fillInstParaTimeSecondRank(const char *szInst grpPara->addPara(timePtr); } - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::addTemplateRetToTask(const char *sTemplateTag, CComputeTaskPtr &outTaskPtr) @@ -735,7 +735,7 @@ int iot_service::CRdbReloadWorker::addTemplateRetToTask(const char *sTemplateTag iot_dbms::CTableLockGuard tableLock(m_TemplateRet); if(!m_TemplateRet.selectAllVec(vecCond,vecRecord,vecCol,COL_SORT,1)){ // 以sort 列为升序查询 LOGERROR("查询统计模板返回值表失败"); - return kbdFailedRdb; + return iotFailedRdb; } //< 处理查询结果 @@ -745,7 +745,7 @@ int iot_service::CRdbReloadWorker::addTemplateRetToTask(const char *sTemplateTag if((i + 1) != vecRecord[i].nSort) { LOGERROR("参数%s配置错误,序号顺序出错", vecRecord[i].szTag); - return kbdFailed; // 配置错误 + return iotFailed; // 配置错误 } if(vecRecord[i].isGrp == 1){ @@ -757,7 +757,7 @@ int iot_service::CRdbReloadWorker::addTemplateRetToTask(const char *sTemplateTag } outTaskPtr->addRet(ret); } - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::fillFirstRankRet(const char *sInstTag, CComputeTaskPtr &outTaskPtr) @@ -769,31 +769,31 @@ int iot_service::CRdbReloadWorker::fillFirstRankRet(const char *sInstTag, CCompu if(outTaskPtr->getRet(i)->isGrp() == true) { int state = fillInstRetGrp(sInstTag,i,outTaskPtr); //< 填充tag - if(state == kbdFailed) + if(state == iotFailed) { LOGERROR("填充实例参数组标签失败,实例标签%s",sInstTag); - return kbdFailed; + return iotFailed; } - else if(state == kbdFailedRdb) + else if(state == iotFailedRdb) { - return kbdFailedRdb; + return iotFailedRdb; } } else //< 填充返回值参数 { int state = fillInstRetPara(sInstTag,i,outTaskPtr); - if(state == kbdFailed) + if(state == iotFailed) { LOGERROR("填充实例测点参数标签失败,实例标签%s",sInstTag); - return kbdFailed; + return iotFailed; } - else if(state == kbdFailedRdb) + else if(state == iotFailedRdb) { - return kbdFailedRdb; + return iotFailedRdb; } } } - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::fillInstRetGrp(const char *sInstTag, int sort, CComputeTaskPtr &outTaskPtr) @@ -808,17 +808,17 @@ int iot_service::CRdbReloadWorker::fillInstRetGrp(const char *sInstTag, int sort iot_dbms::CTableLockGuard tableLock(m_InstRetGrp); if(!m_InstRetGrp.selectAllVec(vecCond,vecRecord,vecCol)){ LOGERROR("查询统计实例返回值参数组失败,内存库有误"); - return kbdFailedRdb; + return iotFailedRdb; } if(vecRecord.size() != 1) { LOGERROR("未查询到符合数量的输入参数组记录,数量为%d",(int)vecRecord.size()); - return kbdFailed; + return iotFailed; } outTaskPtr->getRet(sort)->setRetTag(vecRecord[0].szTag); - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::fillInstRetPara(const char *sInstTag, int sort, CComputeTaskPtr &outTaskPtr) @@ -834,13 +834,13 @@ int iot_service::CRdbReloadWorker::fillInstRetPara(const char *sInstTag, int sor iot_dbms::CTableLockGuard tableLock(m_InstRetPara); if(!m_InstRetPara.selectAllVec(vecCond,vecRecord,vecCol)){ LOGERROR("查询统计实例返回值参数表失败,内存库异常"); - return kbdFailedRdb; + return iotFailedRdb; } if(vecRecord.size() != 1) { LOGERROR("未查询到符合数量的输入返回值参数记录,数量为%d",(int)vecRecord.size()); - return kbdFailed; + return iotFailed; } // 填充返回值参数 包含是否绑定 绑定参数 实例标签 @@ -850,7 +850,7 @@ int iot_service::CRdbReloadWorker::fillInstRetPara(const char *sInstTag, int sor retParaPtr->setBindPointTag(vecRecord[0].szPointTag); - return kbdSuccess; + return iotSuccess; } int iot_service::CRdbReloadWorker::fillSecondRankRet(const char *sInstTag, CComputeTaskPtr &outTaskPtr) @@ -871,7 +871,7 @@ int iot_service::CRdbReloadWorker::fillSecondRankRet(const char *sInstTag, CComp iot_dbms::CTableLockGuard tableLock(m_InstRetPara); if(!m_InstRetPara.selectAllVec(vecCond,vecRecord,vecCol,COL_SORT,1)){ // 以sort 列为升序查询 LOGERROR("查询二级统计实例返回值参数表失败,内存库异常"); - return kbdFailedRdb; + return iotFailedRdb; } // 添加返回值参数 @@ -884,7 +884,7 @@ int iot_service::CRdbReloadWorker::fillSecondRankRet(const char *sInstTag, CComp } } } - return kbdSuccess; + return iotSuccess; } template diff --git a/product/src/service/stat_server/stat_server/CRdbReloadWorker.h b/product/src/service/stat_server/stat_server/CRdbReloadWorker.h index 0b9ccc4f..5e28da40 100644 --- a/product/src/service/stat_server/stat_server/CRdbReloadWorker.h +++ b/product/src/service/stat_server/stat_server/CRdbReloadWorker.h @@ -22,7 +22,7 @@ public: virtual ~CRdbReloadWorker(); /** * @brief initialize 初始化 - * @return kbdSucess kbdFailed + * @return kbdSucess iotFailed */ int initialize(); @@ -66,7 +66,7 @@ private: /** * @brief getAllEnabledInst 获得所有使能的统计实例 * @param vecInst 输出参数 查询到所有启用的统计实例 - * @return kbdsuccess 成功 kbdFailed 失败 + * @return iotSuccess 成功 iotFailed 失败 */ int getAllEnabledInst(std::vector &vecInst); @@ -74,7 +74,7 @@ private: /** * @brief addParaAndRetToMapTask 添加一个统计实例到成员变量mapTask中 * @param sInst - * @return kbdsuccess 成功 kbdFailed 失败 kbdFailedRdb为内存库出错 + * @return iotSuccess 成功 iotFailed 失败 iotFailedRdb为内存库出错 */ int addTask(SStatInstDef & sInst); @@ -82,7 +82,7 @@ private: * @brief addParaToTask 添加参数到task中 * @param sInstTag 输入参数 * @param outTaskPtr 输出参数 - * @return kbdsuccess 成功 kbdFailed 失败 kbdFailedRdb为内存库出错 + * @return iotSuccess 成功 iotFailed 失败 iotFailedRdb为内存库出错 */ int addParaToTask(const char* sInstTag, CComputeTaskPtr &outTaskPtr); @@ -90,7 +90,7 @@ private: * @brief addRetToTask 添加返回值到task中 * @param sInstTag 输入参数 * @param outTaskPtr 输出参数 - * @return kbdsuccess 成功 kbdFailed 失败 kbdFailedRdb为内存库出错 + * @return iotSuccess 成功 iotFailed 失败 iotFailedRdb为内存库出错 */ int addRetToTask(const char* sInstTag, CComputeTaskPtr &outTaskPtr); @@ -99,7 +99,7 @@ private: * @brief getTemplate * @param szTemplateTag 模板标签 * @param outTemplatePtr 输出的模板参数 - * @return kbdSuccess 成功 kbdFailed失败 kbdFailedRdb为内存库出错 + * @return iotSuccess 成功 iotFailed失败 iotFailedRdb为内存库出错 */ int getTemplate(const char* szTemplateTag, CStatTemplatePtr &outTemplatePtr); @@ -107,7 +107,7 @@ private: * @brief addTemplateParaToTask 添加模板参数到统计实例中 * @param szTemplateTag 模板标签 * @param outTemplatePtr 输出的模板参数 - * @return kbdSuccess 成功 kbdFailed失败 kbdFailedRdb为内存库出错 + * @return iotSuccess 成功 iotFailed失败 iotFailedRdb为内存库出错 */ int addTemplateParaToTask(const char *sTemplateTag, CComputeTaskPtr &outTaskPtr); @@ -115,7 +115,7 @@ private: * @brief fillFirstRankPara 填充一级参数 * @param szTemplateTag 模板标签 * @param outTemplatePtr 输出的模板参数 - * @return kbdSuccess 成功 kbdFailed失败 kbdFailedRdb为内存库出错 + * @return iotSuccess 成功 iotFailed失败 iotFailedRdb为内存库出错 */ int fillFirstRankPara(const char *sInstTag, CComputeTaskPtr &outTaskPtr); @@ -123,7 +123,7 @@ private: * @brief fillSecondRankPara 填充二级参数 * @param szTemplateTag 模板标签 * @param outTemplatePtr 输出的模板参数 - * @return kbdSuccess 成功 kbdFailed失败 kbdFailedRdb为内存库出错 + * @return iotSuccess 成功 iotFailed失败 iotFailedRdb为内存库出错 */ int fillSecondRankPara(const char *sInstTag, CComputeTaskPtr &outTaskPtr); diff --git a/product/src/service/stat_server/stat_server/CStatMsgBusMng.cpp b/product/src/service/stat_server/stat_server/CStatMsgBusMng.cpp index 71a704f0..c1896c74 100644 --- a/product/src/service/stat_server/stat_server/CStatMsgBusMng.cpp +++ b/product/src/service/stat_server/stat_server/CStatMsgBusMng.cpp @@ -46,13 +46,13 @@ int iot_service::CStatMsgBusMng::subMessage() if(!m_objCommunicator.addSub(0,CH_SCADA_TO_HMI_DATA_CHANGE)) { LOGERROR("所有应用变化数据通道订阅失败."); - return kbdFailed; + return iotFailed; } else { // LOGINFO("所有应用变化数据通道订阅成功."); } - return kbdSuccess; + return iotSuccess; } int iot_service::CStatMsgBusMng::unsubMessage() @@ -64,7 +64,7 @@ int iot_service::CStatMsgBusMng::unsubMessage() if(!m_objCommunicator.delSub(vecSub[i].getAppID(),vecSub[i].getChannelID())) { LOGERROR("取消通道[%d,%d]订阅失败.",vecSub[i].getAppID(),vecSub[i].getChannelID()); - return kbdFailed; + return iotFailed; } } //清空消息总线中的数据 @@ -73,7 +73,7 @@ int iot_service::CStatMsgBusMng::unsubMessage() { } - return kbdSuccess; + return iotSuccess; } bool iot_service::CStatMsgBusMng::recvMsg(iot_net::CMbMessage &objMsg, int nTimeoutMsec) diff --git a/product/src/service/stat_server/stat_server/CStatSrvApp.cpp b/product/src/service/stat_server/stat_server/CStatSrvApp.cpp index 9bfa94cc..5435ca88 100644 --- a/product/src/service/stat_server/stat_server/CStatSrvApp.cpp +++ b/product/src/service/stat_server/stat_server/CStatSrvApp.cpp @@ -25,14 +25,14 @@ bool iot_service::CStatSrvApp::start(int argc, char *argv[], int &nStatus) if(!parseCmdLine(argc, argv)) { std::cerr<<"解析启动参数失败" <setCallback(m_ptrStatSrvMng)) + if(iotSuccess !=m_ptrRedundancyMng->setCallback(m_ptrStatSrvMng)) { LOGERROR("设置冗余回调接口失败"); - nStatus = kbdFailed; + nStatus = iotFailed; return false; } //< 10.更新当前进程冗余状态 - if(kbdSuccess !=m_ptrProcMng->updateProcessInfo(true,false,false)) + if(iotSuccess !=m_ptrProcMng->updateProcessInfo(true,false,false)) { LOGERROR("更新本进程的进程信息失败"); - nStatus = kbdFailed; + nStatus = iotFailed; return false; } @@ -149,7 +149,7 @@ int iot_service::CStatSrvApp::toQuit() m_ptrProcMng->unsetCallback(); } shutdown(); - return kbdSuccess; + return iotSuccess; } bool iot_service::CStatSrvApp::parseCmdLine(int argc, char *argv[]) @@ -237,7 +237,7 @@ bool iot_service::CStatSrvApp::getSystemInfo() LOGERROR("创建系统信息访问库失败"); return false; } - if(kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) + if(iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -260,7 +260,7 @@ bool iot_service::CStatSrvApp::registToProcMng() LOGERROR("创建进程管理访问库失败"); return false; } - if(kbdSuccess != m_ptrProcMng->setCallback(this)) + if(iotSuccess != m_ptrProcMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -278,7 +278,7 @@ bool iot_service::CStatSrvApp::initSrvMng() return false; } - if(kbdSuccess != m_ptrStatSrvMng->initialize()) + if(iotSuccess != m_ptrStatSrvMng->initialize()) { LOGERROR("统计服务管理类初始化失败"); return false; diff --git a/product/src/service/stat_server/stat_server/CStatSrvMng.cpp b/product/src/service/stat_server/stat_server/CStatSrvMng.cpp index 07b45df3..76499a9a 100644 --- a/product/src/service/stat_server/stat_server/CStatSrvMng.cpp +++ b/product/src/service/stat_server/stat_server/CStatSrvMng.cpp @@ -40,15 +40,15 @@ int iot_service::CStatSrvMng::redundantSwitch(bool bMaster, bool bSlave) } LOGINFO("当前调度系统bMaster=%s,bSlave=%s",bMaster?"true":"false",bSlave?"true":"false"); m_ptrProcMng->updateProcessInfo(true, bMaster, bSlave); - return kbdSuccess; + return iotSuccess; } int iot_service::CStatSrvMng::initialize() { - if(m_mng.initialize() == kbdFailed) + if(m_mng.initialize() == iotFailed) { LOGERROR("管理主线程初始化失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/service/stat_server/stat_server/CStatSrvMng.h b/product/src/service/stat_server/stat_server/CStatSrvMng.h index 6ac805c1..695a5c92 100644 --- a/product/src/service/stat_server/stat_server/CStatSrvMng.h +++ b/product/src/service/stat_server/stat_server/CStatSrvMng.h @@ -22,13 +22,13 @@ public: * 在进程切换过程中，可能会被调用多次切换，业务进程需要保证幂等，无副作用 * @param bMaster 是否为主 * @param bSlave 是否为备 - * @return 成功返回kbdSuccess,失败返回错误码 + * @return 成功返回iotSuccess,失败返回错误码 */ virtual int redundantSwitch(bool bMaster, bool bSlave); /** * @brief 初始化 - * @return 成功返回kbdSuccess,失败返回kbdFailed + * @return 成功返回iotSuccess,失败返回iotFailed */ int initialize(); diff --git a/product/src/service/stat_server/stat_server/CSubDpChgWorker.cpp b/product/src/service/stat_server/stat_server/CSubDpChgWorker.cpp index 55c1449f..0edb46b5 100644 --- a/product/src/service/stat_server/stat_server/CSubDpChgWorker.cpp +++ b/product/src/service/stat_server/stat_server/CSubDpChgWorker.cpp @@ -234,7 +234,7 @@ void iot_service::CSubDpChgWorker::subAllPointTag() { std::string strTableName; std::string strTagName; - if(splitTagName(it->first,strTableName,strTagName) == kbdFailed) + if(splitTagName(it->first,strTableName,strTagName) == iotFailed) { LOGERROR("切割字符串有误，tagName为[%s]",it->first.c_str()); continue; @@ -251,7 +251,7 @@ int iot_service::CSubDpChgWorker::splitTagName(const std::string &inTag, std::st std::size_t firstDotindex = inTag.find_first_of('.'); if(firstDotindex == std::string::npos) { - return kbdFailed; + return iotFailed; } // 赋值表名; @@ -268,11 +268,11 @@ int iot_service::CSubDpChgWorker::splitTagName(const std::string &inTag, std::st else if(inTag.substr(0,firstDotindex) == std::string("mix")){ outTableName = "mix"; }else{ - return kbdFailed; + return iotFailed; } outTagName = inTag.substr(firstDotindex+1,inTag.size()); - return kbdSuccess; + return iotSuccess; } int iot_service::CSubDpChgWorker::processMessageFromDataChange(const iot_net::CMbMessage &objMsg) @@ -286,7 +286,7 @@ int iot_service::CSubDpChgWorker::processMessageFromDataChange(const iot_net::CM // LOGERROR("CSubDpChgWorker::processMessageFromDataChange 消息类型数据[%d]有误",nMessageType); break; } - return kbdSuccess; + return iotSuccess; } int iot_service::CSubDpChgWorker::parserMsg(const iot_net::CMbMessage &objMsg) @@ -295,35 +295,35 @@ int iot_service::CSubDpChgWorker::parserMsg(const iot_net::CMbMessage &objMsg) if(true == changeDataPackage.ParseFromArray(objMsg.getDataPtr(),(int)objMsg.getDataSize())) { dispatchDpChg(changeDataPackage); - return kbdSuccess; + return iotSuccess; } else { LOGERROR("CSubDpChgWorker::parserMsg解析失败"); - return kbdFailed; + return iotFailed; } } int iot_service::CSubDpChgWorker::dispatchDpChg(const iot_idl::SRealTimeDataPkg &changeDataPackage) { - if(kbdFailed == parseAiData(changeDataPackage)) + if(iotFailed == parseAiData(changeDataPackage)) { - return kbdFailed; + return iotFailed; } - if(kbdFailed == parseDiData(changeDataPackage)) + if(iotFailed == parseDiData(changeDataPackage)) { - return kbdFailed; + return iotFailed; } - if(kbdFailed == parseMixData(changeDataPackage)) + if(iotFailed == parseMixData(changeDataPackage)) { - return kbdFailed; + return iotFailed; } - if(kbdFailed == parseAccData(changeDataPackage)) + if(iotFailed == parseAccData(changeDataPackage)) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } void iot_service::CSubDpChgWorker::dispatchTagName(std::string ¶) @@ -371,13 +371,13 @@ int iot_service::CSubDpChgWorker::parseAiData(const iot_idl::SRealTimeDataPkg &c catch(std::exception &ex) { LOGERROR(ex.what()); - return kbdFailed; + return iotFailed; } catch(...) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CSubDpChgWorker::parseDiData(const iot_idl::SRealTimeDataPkg &changeDataPackage) @@ -411,13 +411,13 @@ int iot_service::CSubDpChgWorker::parseDiData(const iot_idl::SRealTimeDataPkg &c catch(std::exception &ex) { LOGERROR(ex.what()); - return kbdFailed; + return iotFailed; } catch(...) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CSubDpChgWorker::parseMixData(const iot_idl::SRealTimeDataPkg &changeDataPackage) @@ -451,13 +451,13 @@ int iot_service::CSubDpChgWorker::parseMixData(const iot_idl::SRealTimeDataPkg & catch(std::exception &ex) { LOGERROR(ex.what()); - return kbdFailed; + return iotFailed; } catch(...) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int iot_service::CSubDpChgWorker::parseAccData(const iot_idl::SRealTimeDataPkg &changeDataPackage) @@ -490,13 +490,13 @@ int iot_service::CSubDpChgWorker::parseAccData(const iot_idl::SRealTimeDataPkg & catch(std::exception &ex) { LOGERROR(ex.what()); - return kbdFailed; + return iotFailed; } catch(...) { - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } bool iot_service::CSubDpChgWorker::isStatusValid(int status) diff --git a/product/src/service/stat_server/stat_server/StatCommon.h b/product/src/service/stat_server/stat_server/StatCommon.h index 05883a23..84e70584 100644 --- a/product/src/service/stat_server/stat_server/StatCommon.h +++ b/product/src/service/stat_server/stat_server/StatCommon.h @@ -54,7 +54,7 @@ #define COL_STATUS_VALUE_VALID 1 #define COL_STATUS_VALUE_INVALID 0 // 返回值 -#define kbdFailedRdb 2 // 内存库错误 +#define iotFailedRdb 2 // 内存库错误 #define valid_value 0 #define invalid_value 1 diff --git a/product/src/service/stat_server/stat_server_function/CLuaBuiltInFunc.cpp b/product/src/service/stat_server/stat_server_function/CLuaBuiltInFunc.cpp index 0013cc19..a31804d4 100644 --- a/product/src/service/stat_server/stat_server_function/CLuaBuiltInFunc.cpp +++ b/product/src/service/stat_server/stat_server_function/CLuaBuiltInFunc.cpp @@ -264,7 +264,7 @@ double iot_service::CLuaBuiltInFunc::getChangeCnt(const std::string &tag, int pe //<构造sql=================== std::string sql,tableName,tagName; - if(splitTagName(tag,tableName,tagName) == kbdFailed) + if(splitTagName(tag,tableName,tagName) == iotFailed) { LOGERROR("getChangeCnt,keyIdTag [%s] error",tag.c_str()); return 0; @@ -355,7 +355,7 @@ double iot_service::CLuaBuiltInFunc::getRunningTime(const std::string &tag, int //<构造sql=================== std::string sql,tableName,tagName; - if(splitTagName(tag,tableName,tagName) == kbdFailed) + if(splitTagName(tag,tableName,tagName) == iotFailed) { LOGERROR("getChangeCnt,keyIdTag [%s] error",tag.c_str()); return 0; @@ -1749,7 +1749,7 @@ double iot_service::CLuaBuiltInFunc::getAccFromDaily(std::string keyIdTag, int s //<构造sql=================== std::string sql,tableName,tagName; - if(splitTagName(keyIdTag,tableName,tagName) == kbdFailed) + if(splitTagName(keyIdTag,tableName,tagName) == iotFailed) { LOGERROR("getAccFromDaily,keyIdTag [%s] error",keyIdTag.c_str()); return 0; diff --git a/product/src/service/stat_server/stat_server_function/StatUtil.cpp b/product/src/service/stat_server/stat_server_function/StatUtil.cpp index 443e274c..c0bd3234 100644 --- a/product/src/service/stat_server/stat_server_function/StatUtil.cpp +++ b/product/src/service/stat_server/stat_server_function/StatUtil.cpp @@ -28,7 +28,7 @@ int iot_service::StatUtil::splitTagName(const std::string &inTag, iot_dbms::SMea std::size_t firstDotindex = inTag.find_first_of('.'); if(firstDotindex == std::string::npos) { - return kbdFailed; + return iotFailed; } // 赋值表名; @@ -45,11 +45,11 @@ int iot_service::StatUtil::splitTagName(const std::string &inTag, iot_dbms::SMea else if(inTag.substr(0,firstDotindex) == std::string("mix")){ outPoint.m_enType = iot_dbms::MPT_MIX; }else{ - return kbdFailed; + return iotFailed; } outTagName = inTag.substr(firstDotindex+1,inTag.size()); - return kbdSuccess; + return iotSuccess; } int iot_service::StatUtil::splitTagName(const std::string &inTag, std::string &outTableName, std::string &outTagName) @@ -57,7 +57,7 @@ int iot_service::StatUtil::splitTagName(const std::string &inTag, std::string &o std::size_t firstDotindex = inTag.find_first_of('.'); if(firstDotindex == std::string::npos) { - return kbdFailed; + return iotFailed; } // 赋值表名; @@ -74,11 +74,11 @@ int iot_service::StatUtil::splitTagName(const std::string &inTag, std::string &o else if(inTag.substr(0,firstDotindex) == std::string("mix")){ outTableName = "mix_sample_result"; }else{ - return kbdFailed; + return iotFailed; } outTagName = inTag.substr(firstDotindex+1,inTag.size()); - return kbdSuccess; + return iotSuccess; } bool iot_service::StatUtil::loadPVCfg(const std::string &curve, const std::string &charge, quint64 &outStartTime, double *resultTmp) diff --git a/product/src/sys/sys_file_sync/appconfigparse.cpp b/product/src/sys/sys_file_sync/appconfigparse.cpp index 6fbd1f6a..dc42e4e5 100644 --- a/product/src/sys/sys_file_sync/appconfigparse.cpp +++ b/product/src/sys/sys_file_sync/appconfigparse.cpp @@ -13,7 +13,7 @@ AppConfigParse::AppConfigParse() bool AppConfigParse::loadConfig() { - if (kbdSuccess != m_configParse.load(iot_public::CFileUtil::getPathOfCfgFile(APP_CONFIG_FILE))) + if (iotSuccess != m_configParse.load(iot_public::CFileUtil::getPathOfCfgFile(APP_CONFIG_FILE))) { LOGERROR("加载配置文件[%s]失败,使用默认配置", APP_CONFIG_FILE.c_str()); diff --git a/product/src/sys/sys_file_sync_api/FilesyncApiImpl.cpp b/product/src/sys/sys_file_sync_api/FilesyncApiImpl.cpp index 1f1dee88..6bff6343 100644 --- a/product/src/sys/sys_file_sync_api/FilesyncApiImpl.cpp +++ b/product/src/sys/sys_file_sync_api/FilesyncApiImpl.cpp @@ -22,7 +22,7 @@ FilesyncApiImpl::FilesyncApiImpl( bool isEnable = createSysInfoInstance(sysinfoPtr); if (isEnable) { - if (sysinfoPtr->getLocalNodeInfo(stNodeInfo) != kbdSuccess) + if (sysinfoPtr->getLocalNodeInfo(stNodeInfo) != iotSuccess) { return ; } diff --git a/product/src/sys/sys_startup/BrushDataThread.cpp b/product/src/sys/sys_startup/BrushDataThread.cpp index 5407d4d0..ea346410 100644 --- a/product/src/sys/sys_startup/BrushDataThread.cpp +++ b/product/src/sys/sys_startup/BrushDataThread.cpp @@ -26,7 +26,7 @@ int BrushDataThread::beforeExecute() { m_sysRunAppInfoVec = DataMng::instance()->getInitAppInfoVec(); m_sysRunProcInfoVec = DataMng::instance()->getInitProcInfoVec(); - return kbdSuccess; + return iotSuccess; } void BrushDataThread::execute() @@ -117,7 +117,7 @@ int BrushDataThread::initialize(int domainId, int appId) m_domainId = domainId; m_appId = appId; m_objRdbNetApi.connect(domainId,appId); - return kbdSuccess; + return iotSuccess; } bool BrushDataThread::queryRunInfo() diff --git a/product/src/sys/sys_startup/BrushDataThread.h b/product/src/sys/sys_startup/BrushDataThread.h index 0efe4491..da9cb5ba 100644 --- a/product/src/sys/sys_startup/BrushDataThread.h +++ b/product/src/sys/sys_startup/BrushDataThread.h @@ -56,7 +56,7 @@ public: * @brief initialize 初始化网络查询 * @param domainId 连接域 * @param appId 连接应用 - * @return kbdSuccess-成功 kbdFaild-失败 + * @return iotSuccess-成功 kbdFaild-失败 */ int initialize(int domainId,int appId); diff --git a/product/src/sys/sys_startup/DbCheck.cpp b/product/src/sys/sys_startup/DbCheck.cpp index 018667d6..d435cb71 100644 --- a/product/src/sys/sys_startup/DbCheck.cpp +++ b/product/src/sys/sys_startup/DbCheck.cpp @@ -220,7 +220,7 @@ bool DbCheckThread::initDbInfoVec() QHostInfo::localHostName().toStdString(), domainInfo); - if(res != kbdSuccess) + if(res != iotSuccess) { mLastErroStr = tr("获取域信息失败"); return false; @@ -235,7 +235,7 @@ bool DbCheckThread::initDbInfoVec() vecLocalDBInfo, vecRemoteDBInfo); - if(res != kbdSuccess) + if(res != iotSuccess) { mLastErroStr = tr("获取数据库信息失败"); @@ -250,7 +250,7 @@ bool DbCheckThread::initDbInfoVec() SNodeInfo nodeInfo; res = m_ptrSysInfo->getNodeInfoByName(stFirstConnect.strNodeName,nodeInfo); - if(res == kbdSuccess) + if(res == iotSuccess) { if(nodeInfo.eNodeType == ENodeType_VirtualNode) { @@ -276,7 +276,7 @@ bool DbCheckThread::initDbInfoVec() info.connect = *iter; res = m_ptrSysInfo->getNodeInfoByName(iter->strNodeName,nodeInfo); - if(res != kbdSuccess) + if(res != iotSuccess) { continue; } @@ -322,7 +322,7 @@ bool DbCheckThread::checkDbInfo(SDbItemInfo &info) //获取首链接节点信息 SNodeInfo stNodeInfo; int res = m_ptrSysInfo->getNodeInfoByName(info.connect.strNodeName,stNodeInfo); - if(res != kbdSuccess) + if(res != iotSuccess) { mLastErroStr = tr("获取节点信息失败"); return false; diff --git a/product/src/sys/sys_startup/DbCheckSync.cpp b/product/src/sys/sys_startup/DbCheckSync.cpp index 6e49f295..1d43bba0 100644 --- a/product/src/sys/sys_startup/DbCheckSync.cpp +++ b/product/src/sys/sys_startup/DbCheckSync.cpp @@ -24,7 +24,7 @@ int DbCheckSync::getSyncMaxId(SDatabaseInfo &info) //获取首链接节点信息 SNodeInfo stNodeInfo; int res = m_ptrSysInfo->getNodeInfoByName(info.strNodeName,stNodeInfo); - if(res != kbdSuccess) + if(res != iotSuccess) { return -1; } diff --git a/product/src/sys/sys_startup/Main.cpp b/product/src/sys/sys_startup/Main.cpp index e3193f5e..106751e2 100644 --- a/product/src/sys/sys_startup/Main.cpp +++ b/product/src/sys/sys_startup/Main.cpp @@ -14,7 +14,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); SingleApplication a(argc, argv); diff --git a/product/src/sys/sys_startup/SetupFuncWindows.cpp b/product/src/sys/sys_startup/SetupFuncWindows.cpp index 08f1e927..c4f4aa72 100644 --- a/product/src/sys/sys_startup/SetupFuncWindows.cpp +++ b/product/src/sys/sys_startup/SetupFuncWindows.cpp @@ -79,7 +79,7 @@ bool regSysService(QString &strErr) else { SERVICE_DESCRIPTION stSrvDesc; - TCHAR szDesc[] = _T("康必达监控系统加载服务"); + TCHAR szDesc[] = _T("宏茂技术监控系统加载服务"); stSrvDesc.lpDescription = szDesc; if (::ChangeServiceConfig2(hService, SERVICE_CONFIG_DESCRIPTION, &stSrvDesc)) { diff --git a/product/src/sys/sys_svn_file_sync/CFileSyncThread.cpp b/product/src/sys/sys_svn_file_sync/CFileSyncThread.cpp index 7d13a78d..7e5858ac 100644 --- a/product/src/sys/sys_svn_file_sync/CFileSyncThread.cpp +++ b/product/src/sys/sys_svn_file_sync/CFileSyncThread.cpp @@ -41,7 +41,7 @@ iot_sys::CFileSyncThread::~CFileSyncThread() int iot_sys::CFileSyncThread::beforeExecute() { - return kbdSuccess; + return iotSuccess; } void iot_sys::CFileSyncThread::execute() @@ -73,28 +73,28 @@ int iot_sys::CFileSyncThread::initialize() if(!m_objComm.addSub(CN_AppId_BASE,CH_FILE_COMMIT_NOTICE)) { LOGERROR("订阅专业[%d],通道[%d]失败",CN_AppId_BASE,CH_FILE_COMMIT_NOTICE); - return kbdFailed; + return iotFailed; } m_ptrAlarmApi = boost::make_shared(m_stRunAppInfo.nDomainId,m_stRunAppInfo.nAppId); if(NULL == m_ptrAlarmApi) { LOGERROR("创造应用报警API智能指针失败"); - return kbdFailed; + return iotFailed; } //ISCS6000_HOME的所在目录 - if(kbdSuccess != getHomeDir()) + if(iotSuccess != getHomeDir()) { - return kbdFailed; + return iotFailed; } - if(kbdSuccess != readConfig()) + if(iotSuccess != readConfig()) { LOGERROR("读取配置失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } void iot_sys::CFileSyncThread::afterResume() @@ -731,20 +731,20 @@ bool iot_sys::CFileSyncThread::isSyncType(QString &_dirName, QString &_absPathFi int iot_sys::CFileSyncThread::readConfig() { iot_public::CCommonConfigParse objCfgParse; - if(kbdSuccess != objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile(CN_XML_CONFIG_FILE_NAME))) + if(iotSuccess != objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile(CN_XML_CONFIG_FILE_NAME))) { LOGERROR("加载配置文件%s失败",CN_XML_CONFIG_FILE_NAME.c_str()); - return kbdFailed; + return iotFailed; } int nDirnum; std::string strUserName,strPassword; - if(kbdSuccess != objCfgParse.getIntValue("common_info","dir_num",nDirnum) || - kbdSuccess != objCfgParse.getStringValue("common_info","user_name",strUserName) || - kbdSuccess != objCfgParse.getStringValue("common_info","password",strPassword) || - kbdSuccess != objCfgParse.getBoolValue("common_info","is_alarm",m_bISAlarm)) + if(iotSuccess != objCfgParse.getIntValue("common_info","dir_num",nDirnum) || + iotSuccess != objCfgParse.getStringValue("common_info","user_name",strUserName) || + iotSuccess != objCfgParse.getStringValue("common_info","password",strPassword) || + iotSuccess != objCfgParse.getBoolValue("common_info","is_alarm",m_bISAlarm)) { LOGERROR("获取同步目录数量，SVN用户名，用户密码失败,是否报警等配置失败"); - return kbdFailed; + return iotFailed; } m_qStrUserName = QString::fromStdString(strUserName); m_qStrPassword = QString::fromStdString(strPassword); @@ -765,18 +765,18 @@ int iot_sys::CFileSyncThread::readConfig() bIsAutoCommit = false; bISUpdateNotice = false; vecType.clear(); - if(kbdSuccess != objCfgParse.getStringValue(moduleName,"rel_dir",rel_dir) || - kbdSuccess != objCfgParse.getBoolValue(moduleName,"first_checkout",bFirstCheckOut) || - kbdSuccess != objCfgParse.getBoolValue(moduleName,"period_checkout",bPeriodCheckOut) || - kbdSuccess != objCfgParse.getBoolValue(moduleName,"is_auto",bIsAutoCommit) || - kbdSuccess != objCfgParse.getBoolValue(moduleName,"is_notice",bISUpdateNotice)) + if(iotSuccess != objCfgParse.getStringValue(moduleName,"rel_dir",rel_dir) || + iotSuccess != objCfgParse.getBoolValue(moduleName,"first_checkout",bFirstCheckOut) || + iotSuccess != objCfgParse.getBoolValue(moduleName,"period_checkout",bPeriodCheckOut) || + iotSuccess != objCfgParse.getBoolValue(moduleName,"is_auto",bIsAutoCommit) || + iotSuccess != objCfgParse.getBoolValue(moduleName,"is_notice",bISUpdateNotice)) { LOGERROR("获取第%d个同步目录的信息失败",i); - return kbdFailed; + return iotFailed; } if(bPeriodCheckOut) { - if(kbdSuccess != objCfgParse.getIntValue(moduleName,"period_interval",nPeriodInterval)) + if(iotSuccess != objCfgParse.getIntValue(moduleName,"period_interval",nPeriodInterval)) { LOGWARN("获取第%d个目录的，周期更新间隔时间失败,默认为1分钟",i); nPeriodInterval = CN_AUTO_UPDATE_PERIOD_MSEC; @@ -784,10 +784,10 @@ int iot_sys::CFileSyncThread::readConfig() } if(bIsAutoCommit) //如果需要自动同步，则获取同步文件的后缀名 { - if(kbdSuccess != objCfgParse.getStringSeqValue(moduleName,"type",vecType)) + if(iotSuccess != objCfgParse.getStringSeqValue(moduleName,"type",vecType)) { LOGERROR("获取第%d个目录的，同步文件类型失败",i); - return kbdFailed; + return iotFailed; } } stDirInfo.bIsFirstCheckOut = bFirstCheckOut; @@ -799,7 +799,7 @@ int iot_sys::CFileSyncThread::readConfig() stDirInfo.nLastUpdateTime = 0; m_mapSyncDirInfo.insert(QString::fromStdString(rel_dir),stDirInfo); } - return kbdSuccess; + return iotSuccess; } int iot_sys::CFileSyncThread::getHomeDir() @@ -809,11 +809,11 @@ int iot_sys::CFileSyncThread::getHomeDir() if(0 != ec.value()) { LOGERROR("获取系统根目录失败，原因：%s",ec.message().c_str()); - return kbdFailed; + return iotFailed; } m_qStrHomeDir = QString::fromStdString(strHomeDir); LOGINFO("目录:[%s]",m_qStrHomeDir.toStdString().c_str()); - return kbdSuccess; + return iotSuccess; } void iot_sys::CFileSyncThread::dealConflict() diff --git a/product/src/sys/sys_svn_file_sync/CSysFileSync.cpp b/product/src/sys/sys_svn_file_sync/CSysFileSync.cpp index 66780014..8d3da1a5 100644 --- a/product/src/sys/sys_svn_file_sync/CSysFileSync.cpp +++ b/product/src/sys/sys_svn_file_sync/CSysFileSync.cpp @@ -64,7 +64,7 @@ bool iot_sys::CSysFileSync::start(int argc, char *argv[], int &nStatus) } //7、向进程管理报告启动成功 - if(kbdSuccess != m_ptrProMng->updateProcessInfo(true,true,false)) + if(iotSuccess != m_ptrProMng->updateProcessInfo(true,true,false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -107,7 +107,7 @@ int iot_sys::CSysFileSync::toQuit() m_ptrProMng->unsetCallback(); } shutdown(); - return kbdSuccess; + return iotSuccess; } @@ -137,17 +137,17 @@ bool iot_sys::CSysFileSync::getSystemInfo() LOGERROR("创建系统信息访问库失败"); return false; } - if(kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) + if(iotSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) { LOGERROR("获取本地节点信息失败"); return false; } - if(kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) + if(iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) { LOGERROR("获取本应用运行相关信息失败"); return false; } - if(kbdSuccess != m_ptrSysInfo->getLocationInfoById(m_stRunAppInfo.nLocationId,m_stLocationInfo)) + if(iotSuccess != m_ptrSysInfo->getLocationInfoById(m_stRunAppInfo.nLocationId,m_stLocationInfo)) { LOGERROR("获取车站信息失败"); return false; @@ -169,7 +169,7 @@ bool iot_sys::CSysFileSync::registerToProcMng() LOGERROR("创建进程管理访问库失败"); return false; } - if(kbdSuccess != m_ptrProMng->setCallback(this)) + if(iotSuccess != m_ptrProMng->setCallback(this)) { LOGERROR("向进程管理设置回调函数失败"); return false; @@ -194,7 +194,7 @@ bool iot_sys::CSysFileSync::initialize() return false; } - if(kbdSuccess != m_ptrFileSyncThread->initialize()) + if(iotSuccess != m_ptrFileSyncThread->initialize()) { LOGERROR("初始化业务处理线程失败"); return false; diff --git a/product/src/tools/DataImput_cfd_tool/CSvnThread.cpp b/product/src/tools/DataImput_cfd_tool/CSvnThread.cpp index 73480e19..c27a3202 100644 --- a/product/src/tools/DataImput_cfd_tool/CSvnThread.cpp +++ b/product/src/tools/DataImput_cfd_tool/CSvnThread.cpp @@ -23,7 +23,7 @@ void CSvnThread::slot_updateFile(QStringList stList) { QString mess = tr("恢复成功"); - emit sigThread(mess,kbdSuccess); + emit sigThread(mess,iotSuccess); } } diff --git a/product/src/tools/DataImput_cfd_tool/Client_DataProThread.cpp b/product/src/tools/DataImput_cfd_tool/Client_DataProThread.cpp index 32ab9c29..cb60575d 100644 --- a/product/src/tools/DataImput_cfd_tool/Client_DataProThread.cpp +++ b/product/src/tools/DataImput_cfd_tool/Client_DataProThread.cpp @@ -341,20 +341,20 @@ struct memory int clienDataprothread::readConfigForGenerate() { iot_public::CCommonConfigParse objCfgParse; - if(kbdSuccess != objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile("DataImput_cfd.xml"))) + if(iotSuccess != objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile("DataImput_cfd.xml"))) { LOGERROR("加载转发配置文件失败"); - return kbdFailed; + return iotFailed; } std::string user = ""; std::string pwd = ""; - if(kbdSuccess != objCfgParse.getStringValue("DataImputSet","user",user) || - kbdSuccess != objCfgParse.getStringValue("DataImputSet","pwd",pwd)) + if(iotSuccess != objCfgParse.getStringValue("DataImputSet","user",user) || + iotSuccess != objCfgParse.getStringValue("DataImputSet","pwd",pwd)) { LOGERROR("获取用户，密码失败"); - return kbdFailed; + return iotFailed; } LOGINFO(("user:"+user).c_str()); @@ -378,7 +378,7 @@ int clienDataprothread::readConfigForGenerate() } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/tools/DataImput_cfd_tool/MainWidget.cpp b/product/src/tools/DataImput_cfd_tool/MainWidget.cpp index 92d0cee2..15ec9850 100644 --- a/product/src/tools/DataImput_cfd_tool/MainWidget.cpp +++ b/product/src/tools/DataImput_cfd_tool/MainWidget.cpp @@ -17,7 +17,7 @@ MainWidget::MainWidget(QWidget *parent) : setWindowTitle(tr("数据补入工具")); - if(init() != kbdSuccess) + if(init() != iotSuccess) { this->setEnabled(false); return ; @@ -33,27 +33,27 @@ MainWidget::MainWidget(QWidget *parent) : int MainWidget::init() { - if(initUi() != kbdSuccess) + if(initUi() != iotSuccess) { QMessageBox::warning(this, tr("警告"), tr("初始化界面失败"), QMessageBox::Ok); - return kbdFailed; + return iotFailed; } - if(initLog() != kbdSuccess) + if(initLog() != iotSuccess) { QMessageBox::warning(this, tr("警告"), tr("初始化日志失败"), QMessageBox::Ok); - return kbdFailed; + return iotFailed; } - if(initMsg() != kbdSuccess) + if(initMsg() != iotSuccess) { QMessageBox::warning(this, tr("警告"), tr("初始化消息失败"), QMessageBox::Ok); - return kbdFailed; + return iotFailed; } - if(initThread() != kbdSuccess) + if(initThread() != iotSuccess) { QMessageBox::warning(this, tr("警告"), tr("初始化工作线程失败"), QMessageBox::Ok); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } bool MainWidget::initCurrentGroup() @@ -172,7 +172,7 @@ MainWidget::~MainWidget() int MainWidget::initLog() { iot_public::StartLogSystem(CN_AppName_BASE.c_str(),"DataImput_cfd_tool"); - return kbdSuccess; + return iotSuccess; } int MainWidget::initMsg() @@ -180,16 +180,16 @@ int MainWidget::initMsg() if(!iot_net::initMsgBus("DataImput_cfd_tool","DataImput_cfd_tool")) { LOGERROR("初始化消息总线失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int MainWidget::initUi() { ui->dateTimeEdit->setDate(QDate::currentDate()); ui->dateTimeEdit_2->setDate(QDate::currentDate()); - return kbdSuccess; + return iotSuccess; } int MainWidget::initThread() @@ -210,7 +210,7 @@ int MainWidget::initThread() initClient(); - return kbdSuccess; + return iotSuccess; } void MainWidget::initClient() diff --git a/product/src/tools/DataImput_cfd_tool/main.cpp b/product/src/tools/DataImput_cfd_tool/main.cpp index 724e67a7..7d8119ce 100644 --- a/product/src/tools/DataImput_cfd_tool/main.cpp +++ b/product/src/tools/DataImput_cfd_tool/main.cpp @@ -12,7 +12,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); // std::string strRootPath =""; diff --git a/product/src/tools/DevGroupLockWidget/main.cpp b/product/src/tools/DevGroupLockWidget/main.cpp index 108ec686..3bf67765 100644 --- a/product/src/tools/DevGroupLockWidget/main.cpp +++ b/product/src/tools/DevGroupLockWidget/main.cpp @@ -5,7 +5,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); CDevGroupLockWidget w; diff --git a/product/src/tools/NetMonite/main.cpp b/product/src/tools/NetMonite/main.cpp index 1ac9b1a7..7a167c4e 100644 --- a/product/src/tools/NetMonite/main.cpp +++ b/product/src/tools/NetMonite/main.cpp @@ -9,7 +9,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QSharedMemory share("NetMonite"); if(share.attach()) diff --git a/product/src/tools/ReportEdit/main.cpp b/product/src/tools/ReportEdit/main.cpp index 65f2db97..b06f56ec 100644 --- a/product/src/tools/ReportEdit/main.cpp +++ b/product/src/tools/ReportEdit/main.cpp @@ -68,7 +68,7 @@ void initIp() int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); initIp(); diff --git a/product/src/tools/WaveAnalyze/comtrade.ts b/product/src/tools/WaveAnalyze/comtrade.ts index 78277e4b..371ce9fb 100644 --- a/product/src/tools/WaveAnalyze/comtrade.ts +++ b/product/src/tools/WaveAnalyze/comtrade.ts @@ -713,7 +713,7 @@ asasas SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -977,7 +977,7 @@ asasas SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -1066,7 +1066,7 @@ asasas SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -1870,7 +1870,7 @@ asasas SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -2071,7 +2071,7 @@ asasas SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -2224,7 +2224,7 @@ asasas SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -2271,7 +2271,7 @@ asasas SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -2289,7 +2289,7 @@ asasas SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -2536,7 +2536,7 @@ asasas SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -2566,7 +2566,7 @@ asasas SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -2818,7 +2818,7 @@ asasas SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -3269,7 +3269,7 @@ asasas SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -3547,7 +3547,7 @@ asasas SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -3786,7 +3786,7 @@ asasas SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -4170,7 +4170,7 @@ p, li { white-space: pre-wrap; } SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -4938,7 +4938,7 @@ p, li { white-space: pre-wrap; } SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -5619,7 +5619,7 @@ p, li { white-space: pre-wrap; } SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -5739,7 +5739,7 @@ p, li { white-space: pre-wrap; } SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -5968,7 +5968,7 @@ p, li { white-space: pre-wrap; } SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -8251,7 +8251,7 @@ p, li { white-space: pre-wrap; } SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD - 深圳市康必达控制技术有限公司 + 广州市宏茂技术有限公司 @@ -8546,7 +8546,7 @@ p, li { white-space: pre-wrap; } SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD curve - 深圳市康必达控制技术有限公司 曲线 + 广州市宏茂技术有限公司 曲线 diff --git a/product/src/tools/camera_statistics/main.cpp b/product/src/tools/camera_statistics/main.cpp index bf798742..5775b38d 100644 --- a/product/src/tools/camera_statistics/main.cpp +++ b/product/src/tools/camera_statistics/main.cpp @@ -7,7 +7,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication::setAttribute(Qt::AA_UseOpenGLES); qputenv("QT_ANGLE_PLATFORM", "d3d11"); diff --git a/product/src/tools/debug_tool/CFessim.cpp b/product/src/tools/debug_tool/CFessim.cpp index e04ff85f..3b1853d8 100644 --- a/product/src/tools/debug_tool/CFessim.cpp +++ b/product/src/tools/debug_tool/CFessim.cpp @@ -403,7 +403,7 @@ bool CFessim::slot_connect() strcpy(m_IpAddr,ba.data()); m_TcpClient.Init(m_IpAddr,m_NetPortNo); - if(m_TcpClient.TcpConnect()==kbdSuccess) + if(m_TcpClient.TcpConnect()==iotSuccess) { //startThread(); QFile file("FesSimIP.txt"); diff --git a/product/src/tools/debug_tool/CSelectAppDlg.cpp b/product/src/tools/debug_tool/CSelectAppDlg.cpp index f7ff9ba9..6facee34 100644 --- a/product/src/tools/debug_tool/CSelectAppDlg.cpp +++ b/product/src/tools/debug_tool/CSelectAppDlg.cpp @@ -102,7 +102,7 @@ void CSelectAppDlg::OnConnect() strcpy(m_IpAddr,ba.data()); m_TcpClient.Init(m_IpAddr,m_NetPortNo); - if(m_TcpClient.TcpConnect()==kbdSuccess) + if(m_TcpClient.TcpConnect()==iotSuccess) { } else diff --git a/product/src/tools/debug_tool/CTcpClient.cpp b/product/src/tools/debug_tool/CTcpClient.cpp index 6cc8404e..562209c7 100644 --- a/product/src/tools/debug_tool/CTcpClient.cpp +++ b/product/src/tools/debug_tool/CTcpClient.cpp @@ -71,7 +71,7 @@ int CTcpClient::TcpConnect() m_Socket = socket(AF_INET, SOCK_STREAM, 0); if (m_Socket == INVALID_SOCKET) { - return kbdFailed; + return iotFailed; } int port; @@ -83,7 +83,7 @@ int CTcpClient::TcpConnect() if ((int)sin.sin_addr.s_addr == (-1)) { closesocket(m_Socket); - return kbdFailed; + return iotFailed; } sin.sin_family = AF_INET; sin.sin_port = htons(port); @@ -100,7 +100,7 @@ int CTcpClient::TcpConnect() printf("TcpClient.cpp unable to connect to %s:%d, ret_code = %d", host, port, ret_code); TcpClose(); - return kbdFailed; + return iotFailed; } printf("TcpClient.cpp Succeed in connect to RTU < %s:%d > ...", inet_ntoa(sin.sin_addr),sin.sin_port); time(&m_RecvTime); @@ -108,7 +108,7 @@ int CTcpClient::TcpConnect() m_HeartBeatCount = 0; m_LinkStatus = 1; emit NetConnected(); //发送连接成功信号 - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/tools/debug_tool/main.cpp b/product/src/tools/debug_tool/main.cpp index 1c05ab9b..516e61d4 100644 --- a/product/src/tools/debug_tool/main.cpp +++ b/product/src/tools/debug_tool/main.cpp @@ -15,7 +15,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); CSystemResources objRescource; diff --git a/product/src/tools/file_sync_tool/main.cpp b/product/src/tools/file_sync_tool/main.cpp index 282f5495..c6bf38d8 100644 --- a/product/src/tools/file_sync_tool/main.cpp +++ b/product/src/tools/file_sync_tool/main.cpp @@ -10,7 +10,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); QDir::setCurrent(iot_public::CFileUtil::getCurModuleDir().c_str()); diff --git a/product/src/tools/file_sync_tool/mainwindow.cpp b/product/src/tools/file_sync_tool/mainwindow.cpp index f36747ce..af33c79d 100644 --- a/product/src/tools/file_sync_tool/mainwindow.cpp +++ b/product/src/tools/file_sync_tool/mainwindow.cpp @@ -171,7 +171,7 @@ bool MainWindow::initHostCmb() m_hostCbm->clear(); - if(m_sysinfoPtr->getLocalNodeInfo(stNodeInfo) != kbdSuccess) + if(m_sysinfoPtr->getLocalNodeInfo(stNodeInfo) != iotSuccess) { showMsg("读取本机信息失败。"); return false; diff --git a/product/src/tools/his_event_del/main.cpp b/product/src/tools/his_event_del/main.cpp index 6d6db758..6aee094d 100644 --- a/product/src/tools/his_event_del/main.cpp +++ b/product/src/tools/his_event_del/main.cpp @@ -8,7 +8,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication app(argc, argv); CCheckUser objCheckUser; diff --git a/product/src/tools/model_plugin/model_linkage/linkage.cpp b/product/src/tools/model_plugin/model_linkage/linkage.cpp index 02d66253..4346808c 100644 --- a/product/src/tools/model_plugin/model_linkage/linkage.cpp +++ b/product/src/tools/model_plugin/model_linkage/linkage.cpp @@ -1651,7 +1651,7 @@ QString Linkage::convertTriggerTypeToStr(const QString &intTriggerType) else if(intTriggerType.compare("3:周期触发",Qt::CaseInsensitive) == 0) return "TRIGGER_PERIOD_DEFINE:周期触发"; else - return "kbd_debug_flag:不触发"; + return "iot_debug_flag:不触发"; } void Linkage::onActTypeChanged() diff --git a/product/src/tools/opc_tool/MainWindow.cpp b/product/src/tools/opc_tool/MainWindow.cpp index 7944d677..bd2a239b 100644 --- a/product/src/tools/opc_tool/MainWindow.cpp +++ b/product/src/tools/opc_tool/MainWindow.cpp @@ -112,7 +112,7 @@ void MainWindow::init() int MainWindow::initLog() { iot_public::StartLogSystem(CN_AppName_BASE.c_str(),"opc_tool"); - return kbdSuccess; + return iotSuccess; } int MainWindow::initMsg() @@ -120,9 +120,9 @@ int MainWindow::initMsg() if(!iot_net::initMsgBus("opc_tool","opc_tool")) { LOGERROR("初始化消息总线失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } void MainWindow::initDb() @@ -150,7 +150,7 @@ void MainWindow::initLoc() m_locToDomainMap.clear(); std::vector vecLocationInfo; - if(kbdSuccess != m_ptrSysInfo->getAllLocationInfo(vecLocationInfo)) + if(iotSuccess != m_ptrSysInfo->getAllLocationInfo(vecLocationInfo)) { LOGERROR("获取车站信息失败"); return ; @@ -168,7 +168,7 @@ void MainWindow::initSub() { std::vector vecSubsystemInfo; ui->comBoxSub->clear(); - if(kbdSuccess != m_ptrSysInfo->getAllSubsystemInfo(vecSubsystemInfo)) + if(iotSuccess != m_ptrSysInfo->getAllSubsystemInfo(vecSubsystemInfo)) { LOGERROR("获取专业信息失败"); return ; diff --git a/product/src/tools/setup/appendProductInfo/main.cpp b/product/src/tools/setup/appendProductInfo/main.cpp index c0a6bcac..e30256ab 100644 --- a/product/src/tools/setup/appendProductInfo/main.cpp +++ b/product/src/tools/setup/appendProductInfo/main.cpp @@ -5,7 +5,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); MainWindow w; diff --git a/product/src/tools/setup/qrcGenX/main.cpp b/product/src/tools/setup/qrcGenX/main.cpp index c0a6bcac..e30256ab 100644 --- a/product/src/tools/setup/qrcGenX/main.cpp +++ b/product/src/tools/setup/qrcGenX/main.cpp @@ -5,7 +5,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); MainWindow w; diff --git a/product/src/tools/setup/setup_installer/SetupFuncWindows.cpp b/product/src/tools/setup/setup_installer/SetupFuncWindows.cpp index aa26d783..0ce318cd 100644 --- a/product/src/tools/setup/setup_installer/SetupFuncWindows.cpp +++ b/product/src/tools/setup/setup_installer/SetupFuncWindows.cpp @@ -75,7 +75,7 @@ bool regSysService(QString &strErr,QString path) else { SERVICE_DESCRIPTION stSrvDesc; - TCHAR szDesc[] = _T("康必达监控系统加载服务"); + TCHAR szDesc[] = _T("宏茂技术监控系统加载服务"); stSrvDesc.lpDescription = szDesc; if (::ChangeServiceConfig2(hService, SERVICE_CONFIG_DESCRIPTION, &stSrvDesc)) { diff --git a/product/src/tools/setup/setup_installer/main.cpp b/product/src/tools/setup/setup_installer/main.cpp index 36714599..35e562d2 100644 --- a/product/src/tools/setup/setup_installer/main.cpp +++ b/product/src/tools/setup/setup_installer/main.cpp @@ -19,7 +19,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); // 单例模式 if(iot_public::CSingleProcInstance::hasInstanceRunning(INSTALLER_UNIQUE_NAME)) diff --git a/product/src/tools/setup/setup_patch/main.cpp b/product/src/tools/setup/setup_patch/main.cpp index dcaa51f3..854dc944 100644 --- a/product/src/tools/setup/setup_patch/main.cpp +++ b/product/src/tools/setup/setup_patch/main.cpp @@ -5,7 +5,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); MainWindow w; diff --git a/product/src/tools/setup/setup_uninstall/main.cpp b/product/src/tools/setup/setup_uninstall/main.cpp index ff0fd830..69c9c00f 100644 --- a/product/src/tools/setup/setup_uninstall/main.cpp +++ b/product/src/tools/setup/setup_uninstall/main.cpp @@ -9,7 +9,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); diff --git a/product/src/tools/setup_install_helper/main.cpp b/product/src/tools/setup_install_helper/main.cpp index 7f3fe582..1619c3a5 100644 --- a/product/src/tools/setup_install_helper/main.cpp +++ b/product/src/tools/setup_install_helper/main.cpp @@ -147,7 +147,7 @@ CommandLineParseResult parseCommandline(QApplication& app,SetupWidget &w) int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); diff --git a/product/src/tools/svn_file_sync_tool/CSvnThread.cpp b/product/src/tools/svn_file_sync_tool/CSvnThread.cpp index 5fd6f36b..fee762f9 100644 --- a/product/src/tools/svn_file_sync_tool/CSvnThread.cpp +++ b/product/src/tools/svn_file_sync_tool/CSvnThread.cpp @@ -33,16 +33,16 @@ void CSvnThread::slot_revertFile(QStringList stList) if(-1 == ret) { QString mess = tr("恢复文件%1至本地版本库执行命令失败或超时").arg(files); - emit sigThread(mess,kbdFailed); + emit sigThread(mess,iotFailed); } else if(1 == ret) { QString mess = tr("恢复文件%1至本地版本库执行命令出错,错误:%2").arg(files).arg(strError); - emit sigThread(mess,kbdFailed); + emit sigThread(mess,iotFailed); }else { QString mess = tr("恢复成功"); - emit sigThread(mess,kbdSuccess); + emit sigThread(mess,iotSuccess); } } @@ -63,16 +63,16 @@ void CSvnThread::slot_updateFile(QStringList stList) if(-1 == ret) { QString mess = tr("更新文件%1执行命令失败或超时").arg(files); - emit sigThread(mess,kbdFailed); + emit sigThread(mess,iotFailed); } else if(1 == ret) { QString mess = tr("更新文件%1执行命令出错，错误原因:%2").arg(files).arg(strError); - emit sigThread(mess,kbdFailed); + emit sigThread(mess,iotFailed); }else { QString mess = tr("更新成功"); - emit sigThread(mess,kbdSuccess); + emit sigThread(mess,iotSuccess); } } @@ -94,17 +94,17 @@ void CSvnThread::slot_addFile(QStringList stList) if(-1 == ret) { QString mess = tr("添加文件%1执行命令失败或超时").arg(files); - emit sigThread(mess,kbdFailed); + emit sigThread(mess,iotFailed); } else if(1 == ret) { QString mess = tr("添加文件%1执行命令出错，错误原因:%2").arg(files).arg(strError); - emit sigThread(mess,kbdFailed); + emit sigThread(mess,iotFailed); }else { QString mess = tr("添加成功"); noticeOtherNode(stList); - emit sigThread(mess,kbdSuccess); + emit sigThread(mess,iotSuccess); } } @@ -125,17 +125,17 @@ void CSvnThread::slot_commitFile(QStringList stList) if(-1 == ret) { QString mess = tr("提交文件%1执行命令失败或超时").arg(files); - emit sigThread(mess,kbdFailed); + emit sigThread(mess,iotFailed); } else if(1 == ret) { QString mess = tr("提交文件%1执行命令出错，错误原因:%1").arg(files).arg(strError); - emit sigThread(mess,kbdFailed); + emit sigThread(mess,iotFailed); }else { QString mess = tr("提交成功"); noticeOtherNode(stList); - emit sigThread(mess,kbdSuccess); + emit sigThread(mess,iotSuccess); } } @@ -157,17 +157,17 @@ void CSvnThread::slot_deleteFile(QStringList stList) if(-1 == ret) { QString mess = tr("删除文件%1执行命令失败或超时").arg(files); - emit sigThread(mess,kbdFailed); + emit sigThread(mess,iotFailed); } else if(1 == ret) { QString mess = tr("删除文件%1执行命令出错，错误原因:%2").arg(files).arg(strError); - emit sigThread(mess,kbdFailed); + emit sigThread(mess,iotFailed); }else { QString mess = tr("删除成功"); noticeOtherNode(stList); - emit sigThread(mess,kbdSuccess); + emit sigThread(mess,iotSuccess); } } @@ -189,16 +189,16 @@ void CSvnThread::slot_cleanupFile(QStringList stList) if(-1 == ret) { QString mess = tr("cleanup文件%1执行命令失败或超时").arg(files); - emit sigThread(mess,kbdFailed); + emit sigThread(mess,iotFailed); } else if(1 == ret) { QString mess = tr("cleanup文件%1执行命令出错，错误原因:%2").arg(files).arg(strError); - emit sigThread(mess,kbdFailed); + emit sigThread(mess,iotFailed); }else { QString mess = tr("cleanup文件成功"); - emit sigThread(mess,kbdSuccess); + emit sigThread(mess,iotSuccess); } } diff --git a/product/src/tools/svn_file_sync_tool/MainWidget.cpp b/product/src/tools/svn_file_sync_tool/MainWidget.cpp index 12f080a9..4c7fa94c 100644 --- a/product/src/tools/svn_file_sync_tool/MainWidget.cpp +++ b/product/src/tools/svn_file_sync_tool/MainWidget.cpp @@ -14,7 +14,7 @@ MainWidget::MainWidget(QWidget *parent) : { ui->setupUi(this); setWindowTitle(tr("文件同步操作工具")); - if(init() != kbdSuccess) + if(init() != iotSuccess) { this->setEnabled(false); return ; @@ -155,7 +155,7 @@ void MainWidget::slotThread(const QString &text,int result) { this->setEnabled(true); ui->label->setText(tr(" ")); - if(result == kbdSuccess) + if(result == iotSuccess) { LOGERROR("%s",text.toStdString().c_str()); QMessageBox::information(this, tr("提示"), text, QMessageBox::Ok); @@ -168,38 +168,38 @@ void MainWidget::slotThread(const QString &text,int result) int MainWidget::init() { - if(initUi() != kbdSuccess) + if(initUi() != iotSuccess) { QMessageBox::warning(this, tr("警告"), tr("初始化界面失败"), QMessageBox::Ok); - return kbdFailed; + return iotFailed; } - if(initLog() != kbdSuccess) + if(initLog() != iotSuccess) { QMessageBox::warning(this, tr("警告"), tr("初始化日志失败"), QMessageBox::Ok); - return kbdFailed; + return iotFailed; } - if(initMsg() != kbdSuccess) + if(initMsg() != iotSuccess) { QMessageBox::warning(this, tr("警告"), tr("初始化消息失败"), QMessageBox::Ok); - return kbdFailed; + return iotFailed; } - if(initThread() != kbdSuccess) + if(initThread() != iotSuccess) { QMessageBox::warning(this, tr("警告"), tr("初始化工作线程失败"), QMessageBox::Ok); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int MainWidget::initUi() { - return kbdSuccess; + return iotSuccess; } int MainWidget::initLog() { iot_public::StartLogSystem(CN_AppName_BASE.c_str(),"file_sync_tool"); - return kbdSuccess; + return iotSuccess; } int MainWidget::initMsg() @@ -207,9 +207,9 @@ int MainWidget::initMsg() if(!iot_net::initMsgBus("file_sync_tool","file_sync_tool")) { LOGERROR("初始化消息总线失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } int MainWidget::initThread() @@ -217,7 +217,7 @@ int MainWidget::initThread() m_thread = new QThread(this); m_svnObj = new CSvnThread; m_svnObj->moveToThread(m_thread); - return kbdSuccess; + return iotSuccess; } void MainWidget::writeToList(QStringList fileList) diff --git a/product/src/tools/svn_file_sync_tool/main.cpp b/product/src/tools/svn_file_sync_tool/main.cpp index 724e67a7..7d8119ce 100644 --- a/product/src/tools/svn_file_sync_tool/main.cpp +++ b/product/src/tools/svn_file_sync_tool/main.cpp @@ -12,7 +12,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); // std::string strRootPath =""; diff --git a/product/src/tools/upgrade/upgrade_install/CUpgradeWorker.cpp b/product/src/tools/upgrade/upgrade_install/CUpgradeWorker.cpp index 0f459b22..045c028e 100644 --- a/product/src/tools/upgrade/upgrade_install/CUpgradeWorker.cpp +++ b/product/src/tools/upgrade/upgrade_install/CUpgradeWorker.cpp @@ -504,7 +504,7 @@ QFileInfoList CUpgradeWorker::getOwnFile(const QString &path) for(int i = 0; i < file_list.size(); i++) { QString name = file_list.at(i).fileName(); - if(name == "kbd_upgrade_abcdefghigklmnopqrstuvwxyz.txt") + if(name == "iot_upgrade_abcdefghigklmnopqrstuvwxyz.txt") { list.append(file_list.at(i)); } diff --git a/product/src/tools/upgrade/upgrade_install/main.cpp b/product/src/tools/upgrade/upgrade_install/main.cpp index 14eff32f..3e1aef38 100644 --- a/product/src/tools/upgrade/upgrade_install/main.cpp +++ b/product/src/tools/upgrade/upgrade_install/main.cpp @@ -5,7 +5,7 @@ int main(int argc, char *argv[]) { - kbd_common::doQtAppGlobalSet(); + iot_common::doQtAppGlobalSet(); QApplication a(argc, argv); diff --git a/product/src/tools/upgrade/upgrade_package/MainWindow.cpp b/product/src/tools/upgrade/upgrade_package/MainWindow.cpp index 1fc9fd2f..3de26d89 100644 --- a/product/src/tools/upgrade/upgrade_package/MainWindow.cpp +++ b/product/src/tools/upgrade/upgrade_package/MainWindow.cpp @@ -134,8 +134,8 @@ bool MainWindow::addDefaultEmptyDir(const QString &src_path) QString exePath = dir.currentPath(); QDir::setCurrent(src_path); qDebug()< &objMap,std::string basePath) @@ -488,7 +488,7 @@ void iot_sys::CDownloadFile::getFileFromFtp(std::map &downloa for(vecIt = m_vecSrcPath.begin(); vecIt != m_vecSrcPath.end(); ++vecIt) { remotePath = *vecIt + it->first; - if(kbdSuccess == download(curldwn,remotePath.c_str(),localPath.string().c_str(),userName.c_str(),passwd.c_str(),ret,port,1)) + if(iotSuccess == download(curldwn,remotePath.c_str(),localPath.string().c_str(),userName.c_str(),passwd.c_str(),ret,port,1)) { LOGINFO("下载成功：从%s-------->到%s ",remotePath.c_str(),(basePath + it->first).c_str()); boost::filesystem::rename(localPath,basePath + it->first); @@ -547,11 +547,11 @@ int iot_sys::CDownloadFile::download(CURL *curlhandle, const char *remotepath, c if (ret == CURLE_OK) { - return kbdSuccess; + return iotSuccess; } else { - return kbdFailed; + return iotFailed; } } @@ -589,16 +589,16 @@ bool iot_sys::CDownloadFile::isSyncType(std::string &filePath, std::vectorsetCallback(m_ptrFileSyncMng)) + if(iotSuccess != m_ptrRedundancyMng->setCallback(m_ptrFileSyncMng)) { LOGERROR("设置冗余回调接口失败"); return false; @@ -82,7 +82,7 @@ bool iot_sys::CFileSync::start(int argc,char *argv[],int &nStatus) } //10.更新当前进程冗余状态 - if(kbdSuccess != m_ptrProMng->updateProcessInfo(true,true,false)) + if(iotSuccess != m_ptrProMng->updateProcessInfo(true,true,false)) { LOGERROR("更新本进程的进程信息失败"); return false; @@ -126,7 +126,7 @@ bool iot_sys::CFileSync::stop() int iot_sys::CFileSync::toQuit() { shutdown(); - return kbdSuccess; + return iotSuccess; } bool iot_sys::CFileSync::parseCmdLine(int argc, char *argv[]) @@ -208,7 +208,7 @@ bool iot_sys::CFileSync::getSystemInfo() LOGERROR("创建系统信息访问库失败"); return false; } - if(kbdSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) + if(iotSuccess != m_ptrSysInfo->getLocalRunAppInfoByName(m_strAppName,m_stRunAppInfo)) { LOGERROR("获取系统信息失败"); return false; @@ -232,7 +232,7 @@ bool iot_sys::CFileSync::registToProcMng() return false; } - if(kbdSuccess != m_ptrProMng->setCallback(this)) + if(iotSuccess != m_ptrProMng->setCallback(this)) { LOGERROR("向进程管设置回调函数失败"); return false; @@ -245,7 +245,7 @@ bool iot_sys::CFileSync::initialize() if(!iot_net::initMsgBus(CN_ProcName_FileSync.c_str(),"")) { LOGERROR("初始化消息总线失败"); - return kbdFailed; + return iotFailed; } m_ptrFileSyncMng = boost::make_shared(m_stRunAppInfo,m_ptrProMng); @@ -254,7 +254,7 @@ bool iot_sys::CFileSync::initialize() LOGERROR("创建文件同步服务管理类失败"); return false; } - if(kbdSuccess != m_ptrFileSyncMng->initialize()) + if(iotSuccess != m_ptrFileSyncMng->initialize()) { LOGERROR("初始化录波文件同步服务管理类失败"); return false; diff --git a/product/src/z_discard/sys_ftp_sync/CFileSyncMng.cpp b/product/src/z_discard/sys_ftp_sync/CFileSyncMng.cpp index eead555f..8a7593c5 100644 --- a/product/src/z_discard/sys_ftp_sync/CFileSyncMng.cpp +++ b/product/src/z_discard/sys_ftp_sync/CFileSyncMng.cpp @@ -67,7 +67,7 @@ int iot_sys::CFileSyncMng::redundantSwitch(bool bMaster, bool bSlave) } } m_ptrProcMng->updateProcessInfo(true,bMaster,bSlave); - return kbdSuccess; + return iotSuccess; } int iot_sys::CFileSyncMng::initialize() @@ -79,12 +79,12 @@ int iot_sys::CFileSyncMng::initialize() if(NULL == m_ptrSnedFileInfo) { LOGERROR("创建发送文件信息线程失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrSnedFileInfo->initialize()) + if(iotSuccess != m_ptrSnedFileInfo->initialize()) { LOGERROR("初始化发送文件信息线程失败"); - return kbdFailed; + return iotFailed; } } //上传至FTP服务器线程，所有的实时服务器上有 @@ -94,12 +94,12 @@ int iot_sys::CFileSyncMng::initialize() // if(NULL == m_ptrUploadFile) // { // LOGERROR("创建上传文件线程失败"); -// return kbdFailed; +// return iotFailed; // } -// if(kbdSuccess != m_ptrUploadFile->initialize()) +// if(iotSuccess != m_ptrUploadFile->initialize()) // { // LOGERROR("初始化上传文件线程失败"); -// return kbdFailed; +// return iotFailed; // } // } @@ -108,12 +108,12 @@ int iot_sys::CFileSyncMng::initialize() if(NULL == m_ptrDownliadFile) { LOGERROR("创建下载文件线程失败"); - return kbdFailed; + return iotFailed; } - if(kbdSuccess != m_ptrDownliadFile->initialize()) + if(iotSuccess != m_ptrDownliadFile->initialize()) { LOGERROR("初始化下载文件线程失败"); - return kbdFailed; + return iotFailed; } - return kbdSuccess; + return iotSuccess; } diff --git a/product/src/z_discard/sys_ftp_sync/CSendFileInfo.cpp b/product/src/z_discard/sys_ftp_sync/CSendFileInfo.cpp index 58e4ea90..453c1737 100644 --- a/product/src/z_discard/sys_ftp_sync/CSendFileInfo.cpp +++ b/product/src/z_discard/sys_ftp_sync/CSendFileInfo.cpp @@ -95,7 +95,7 @@ int iot_sys::CSendFileInfo::initialize() if(!loadConfig()) { LOGERROR("加载配置文件失败"); - return kbdFailed; + return iotFailed; } // 检查FTP根目录 if(stringEndWith(m_ftpRootDir,std::string("/"))) @@ -108,7 +108,7 @@ int iot_sys::CSendFileInfo::initialize() if(!boost::filesystem::create_directories(m_ftpRootDir,ec)) { LOGERROR("创建目录：%s 失败，原因：%s",m_ftpRootDir.c_str(),ec.message().c_str()); - return kbdFailed; + return iotFailed; } } @@ -128,7 +128,7 @@ int iot_sys::CSendFileInfo::initialize() if(!boost::filesystem::create_directories(tempPath,ec)) { LOGERROR("创建目录：%s失败,原因：%s",tempPath.string().c_str(),ec.message().c_str()); - return kbdFailed; + return iotFailed; } } } @@ -137,7 +137,7 @@ int iot_sys::CSendFileInfo::initialize() if((!iot_public::createSysInfoInstance(sysInfoInterfacePtr)) || (NULL == sysInfoInterfacePtr)) { LOGERROR("创建系统信息智能智能指针失败"); - return kbdFailed; + return iotFailed; } iot_public::SNodeInfo nodeInfo; sysInfoInterfacePtr->getLocalNodeInfo(nodeInfo); @@ -152,7 +152,7 @@ int iot_sys::CSendFileInfo::initialize() m_nTimingCycleMse *= 1000; //秒转化成毫秒 - return kbdSuccess; + return iotSuccess; } @@ -321,15 +321,15 @@ bool iot_sys::CSendFileInfo::isSyncType(std::string &filePath, std::vector &fileMap, std::string basePath) @@ -381,7 +381,7 @@ void iot_sys::CUploadFile::uploadToFtp(std::map &uploadMap,st for(vecIt = m_vecRemotePath.begin(); vecIt != m_vecRemotePath.end(); ++vecIt) { remotePath = *vecIt + it->first; - if(kbdSuccess == upload(curlUp,remotePath.c_str(),localPath.string().c_str(),userName.c_str(),passwd.c_str(),port,1,1)) + if(iotSuccess == upload(curlUp,remotePath.c_str(),localPath.string().c_str(),userName.c_str(),passwd.c_str(),port,1,1)) { LOGINFO("上传成功：从%s-------->到%s ",std::string(basePath + it->first).c_str(),remotePath.c_str()); break; @@ -461,16 +461,16 @@ int iot_sys::CUploadFile::upload(CURL *curlhandle, const char *remotepath, const bool iot_sys::CUploadFile::loadConfig() { iot_public::CCommonConfigParse objCfg; - if(kbdSuccess != objCfg.load(CN_XML_CONFIG_FILE_PATH,CN_XML_CONFIG_FILE_NAME)) + if(iotSuccess != objCfg.load(CN_XML_CONFIG_FILE_PATH,CN_XML_CONFIG_FILE_NAME)) { LOGERROR("加载配置文件：%s失败",CN_XML_CONFIG_FILE_NAME.c_str()); return false; } - if(kbdSuccess != objCfg.getStringValue("common","sync_root",m_strUploadRoot) || - kbdSuccess != objCfg.getStringValue("common","ftp_user",m_strFtpUser) || - kbdSuccess != objCfg.getStringValue("common","ftp_password",m_strFtpPasswd) || - kbdSuccess != objCfg.getStringSeqValue("rela_path","path",m_vecRelaPath) || - kbdSuccess != objCfg.getStringSeqValue("file_type","type",m_vecFileType) ) + if(iotSuccess != objCfg.getStringValue("common","sync_root",m_strUploadRoot) || + iotSuccess != objCfg.getStringValue("common","ftp_user",m_strFtpUser) || + iotSuccess != objCfg.getStringValue("common","ftp_password",m_strFtpPasswd) || + iotSuccess != objCfg.getStringSeqValue("rela_path","path",m_vecRelaPath) || + iotSuccess != objCfg.getStringSeqValue("file_type","type",m_vecFileType) ) { LOGERROR("得到配置文件内容失败"); return false;