From 9bf94916847202bb580646454327f4d0a777d03e Mon Sep 17 00:00:00 2001 From: shi_jq Date: Wed, 12 Mar 2025 16:31:35 +0800 Subject: [PATCH] iotSucces-> iotSuccess --- .../service/interlock_api/InterLockInterface.h | 4 ++-- platform/src/service/interlock_api/InterLockImpl.cpp | 8 ++++---- platform/src/service/interlock_api/InterLockImpl.h | 12 ++++++------ .../service/operate_server/OperateServerClass.cpp | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/platform/src/include/service/interlock_api/InterLockInterface.h b/platform/src/include/service/interlock_api/InterLockInterface.h index f7e576a3..33b7403f 100644 --- a/platform/src/include/service/interlock_api/InterLockInterface.h +++ b/platform/src/include/service/interlock_api/InterLockInterface.h @@ -27,12 +27,12 @@ namespace iot_service public: /** @brief 初始化 - @return 成功返回iotSucces,失败返回相应错误码 + @return 成功返回iotSuccess,失败返回相应错误码 */ virtual int initialize() =0 ; /** @brief 判断联锁关系 - @return 成功返回iotSucces,失败返回相应错误码 + @return 成功返回iotSuccess,失败返回相应错误码 */ virtual int CheckCtrlInterlock(const char *strCtrlPointName, const double dTargValue,std::string &strResult, bool &bSuccess) =0; }; diff --git a/platform/src/service/interlock_api/InterLockImpl.cpp b/platform/src/service/interlock_api/InterLockImpl.cpp index 625bd6e0..213e1af7 100644 --- a/platform/src/service/interlock_api/InterLockImpl.cpp +++ b/platform/src/service/interlock_api/InterLockImpl.cpp @@ -66,7 +66,7 @@ int CInterLockImpl::initialize() @param const char *strCtrlPointName IN:需要进行互锁判断的测点，一般为控制点，如AO,DO,MO等 string &strInterlockResult OUT 返回结果字符串 string &bInterlockSuccess OUT 返回结果，成功/失败 - @return 成功返回iotSucces,失败返回 iotFailed + @return 成功返回iotSuccess,失败返回 iotFailed */ int CInterLockImpl::CheckCtrlInterlock(const char *strCtrlPointName,const double dTargValue, string &strResult, bool &bSuccess) { @@ -124,7 +124,7 @@ int CInterLockImpl::CheckCtrlInterlock(const char *strCtrlPointName,const double const vector &vecInterlockKey：IN 输入参数队列 VECTOR string &strInterlockResult OUT 返回结果字符串 string &bInterlockSuccess OUT 返回结果，成功/失败 - @return 成功返回iotSucces,失败返回 iotFailed + @return 成功返回iotSuccess,失败返回 iotFailed */ int CInterLockImpl::CheckCtrlInterlock(const char *strInterlockName, const double dTargValue,const int nInterlockNum, const vector &vecInterLockInPara, string &strInterlockResult, bool &bInterlockSuccess) @@ -220,7 +220,7 @@ int CInterLockImpl::CheckCtrlInterlock(const char *strInterlockName, const doubl /** @brief 通过标签点获取标签点的状态和值 - @return 成功返回iotSucces,失败返回相应错误码 + @return 成功返回iotSuccess,失败返回相应错误码 */ int CInterLockImpl::GetValueStatusName(const std::string &strTagName, SOptValueStatus &stValueStatus,\ iot_public::LuaVariantTypeSeq &vecValue, std::string& strName,int nDomainId ,int nAppNo) @@ -397,7 +397,7 @@ int CInterLockImpl::SplitTagName(char *strTagName , const char *strDelimit,std:: } /** @brief 通过表名称获得表的类型 - @return 成功返回iotSucces,失败返回相应错误码 + @return 成功返回iotSuccess,失败返回相应错误码 */ int CInterLockImpl::GetPointTypeByTableName(const string &strTableName) { diff --git a/platform/src/service/interlock_api/InterLockImpl.h b/platform/src/service/interlock_api/InterLockImpl.h index df765ff6..7151eff7 100644 --- a/platform/src/service/interlock_api/InterLockImpl.h +++ b/platform/src/service/interlock_api/InterLockImpl.h @@ -37,31 +37,31 @@ namespace iot_service public: /** @brief 初始化 - @return 成功返回iotSucces,失败返回iotFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int initialize(); /** @brief 判断联锁关系 - @return 成功返回iotSucces,失败返回iotFailed + @return 成功返回iotSuccess,失败返回iotFailed */ int CheckCtrlInterlock(const char *strCtrlPointName, const double dTargValue,std::string &strResult, bool &bSuccess); private: /** @brief 判断联锁关系 - @return 成功返回iotSucces,失败返回相应错误码 + @return 成功返回iotSuccess,失败返回相应错误码 */ int CheckCtrlInterlock(const char *strInterlockName, const double dTargValue,const int nInterlockNum, const std::vector &vecInterLockInPara, std::string &strResult, bool &bSuccess); /** @brief 通过标签点获取标签点的状态和值 - @return 成功返回iotSucces,失败返回相应错误码 + @return 成功返回iotSuccess,失败返回相应错误码 */ int GetValueStatusName(const std::string &strTagName, SOptValueStatus &stValueStatus,\ iot_public::LuaVariantTypeSeq &vecValue, std::string& strName,int nDomainId=-1 ,int nAppNo=-1); /** @brief 通过LULA脚本计算连锁结果 - @return 成功返回iotSucces,失败返回相应错误码 + @return 成功返回iotSuccess,失败返回相应错误码 */ //int CtrlInterlockLuaCalc(const std::string &strInterlock,const std::vector &vecValueStatus, // const std::vector &vecName,std::string &strInterlockResult, bool &bInterlockSuccess); @@ -78,7 +78,7 @@ namespace iot_service int SplitTagName(char *strTagName , const char *strDelimit,std::vector &vecStr); /** @brief 通过表名称获得表的类型 - @return 成功返回iotSucces,失败返回相应错误码 + @return 成功返回iotSuccess,失败返回相应错误码 */ int GetPointTypeByTableName(const std::string &strTableName); }; diff --git a/platform/src/service/operate_server/OperateServerClass.cpp b/platform/src/service/operate_server/OperateServerClass.cpp index b0fba998..9d0e89e5 100644 --- a/platform/src/service/operate_server/OperateServerClass.cpp +++ b/platform/src/service/operate_server/OperateServerClass.cpp @@ -313,7 +313,7 @@ int COperateServerClass::getUserAndUserGroup(const int nUserId,const int nUsergI /** @brief 通过标签点获取标签点的状态和值 - @return 成功返回iotSucces,失败返回相应错误码 + @return 成功返回iotSuccess,失败返回相应错误码 */ int COperateServerClass::getValueStatus(const std::string &strTagName, SOptValueStatus &stValueStatus,\ int nDomainId ,int nAppNo)