From c1fadb1a0bf53de6b83128531c43caf85a8462ce Mon Sep 17 00:00:00 2001 From: shi_jq Date: Wed, 12 Mar 2025 14:17:01 +0800 Subject: [PATCH] [refactor]kbd_ -> iot_ --- .../CAcsDeviceApiImplFactory.cpp | 2 +- .../app_bio_identify_srv/CAcsDevice.cpp | 24 +- .../app_bio_identify_srv/CAcsDevice.h | 6 +- .../app_bio_identify_srv/CAcsWorkThread.cpp | 16 +- .../app_bio_identify_srv/CAcsWorkThread.h | 10 +- .../app_bio_identify_srv/CBioIdentifySrv.cpp | 26 +- .../app_bio_identify_srv/CBioIdentifySrv.h | 6 +- .../app_bio_identify_srv/CBisRedunSw.h | 2 +- .../test/test_bis_client/main.cpp | 10 +- .../test/test_hk_acs/main.cpp | 4 +- .../app_fbd/app_fbd_server/FbdConfigParse.cpp | 4 +- .../app_fbd/app_fbd_server/FbdGroupMng.cpp | 64 +- .../app_fbd_server/FbdGrpWorkThread.cpp | 20 +- .../app_fbd/app_fbd_server/FbdGrpWorkThread.h | 4 +- .../app_fbd/app_fbd_server/FbdServerApp.cpp | 24 +- .../app_fbd/app_fbd_server/FbdServerApp.h | 6 +- .../app_fbd/app_fbd_server/FbdServerMng.cpp | 2 +- .../app_fbd/app_fbd_server/FbdServerMng.h | 6 +- .../app_fbd/app_fbd_server/FbdUtil.cpp | 4 +- .../app_fbd/app_fbd_server/FbdUtil.h | 4 +- .../app_fbd_server/OnlineModifyThread.cpp | 2 +- .../app_fbd_server/OnlineModifyThread.h | 2 +- .../app_fbd/app_fbd_server/PointSubThread.cpp | 16 +- .../app_fbd/app_fbd_server/PointSubThread.h | 6 +- .../alarm_client/AlarmCltThread.cpp | 2 +- .../alarm_client/AlarmCltThread.h | 6 +- .../alarm_client/AlarmMsgHandler.cpp | 56 +- .../alarm_client/ItlAlmMsgHandler.cpp | 50 +- .../app_fbd/fbd_common/FbdAlarmSrcImpl.cpp | 4 +- .../app_fbd/fbd_common/FbdAlarmSrcImpl.h | 4 +- .../app_fbd/fbd_common/FbdDiagDataImpl.cpp | 8 +- .../app_fbd/fbd_common/FbdDiagDataImpl.h | 6 +- .../fbd_common/FbdDiagDataStructPrivate.cpp | 20 +- .../app_fbd/fbd_common/FbdPointSubImpl.cpp | 12 +- .../app_fbd/fbd_common/FbdPointSubImpl.h | 6 +- .../app_fbd/fbd_common/FbdSysInfoImpl.cpp | 6 +- .../app_fbd/fbd_common/FbdSysInfoImpl.h | 10 +- .../fbd_common/alarm_client/AlarmDataMng.cpp | 146 +- .../fbd_common/alarm_client/AlarmDataMng.h | 14 +- .../alarm_client/FbdAlarmCltImpl.cpp | 22 +- .../fbd_common/alarm_client/FbdAlarmCltImpl.h | 22 +- .../fbd_common/alarm_client/ItlAlmDataMng.cpp | 18 +- .../fbd_common/alarm_client/ItlAlmDataMng.h | 12 +- .../fbd_module/anti_shake/AntiShake.cpp | 4 +- .../app_fbd/fbd_module/ao_ctrl/AoCtrl.cpp | 18 +- .../app_fbd/fbd_module/ao_ctrl/AoCtrl.h | 2 +- .../app_fbd/fbd_module/bit_split/BitSplit.cpp | 2 +- .../app_fbd/fbd_module/do_ctrl/DoCtrl.cpp | 18 +- .../app_fbd/fbd_module/do_ctrl/DoCtrl.h | 2 +- .../four_arithmetic/FourArithmetic.cpp | 2 +- .../app_fbd/fbd_module/logic_opt/And.cpp | 2 +- .../app_fbd/fbd_module/logic_opt/Or.cpp | 2 +- .../app_fbd/fbd_module/lua/CLua.cpp | 4 +- .../app_fbd/fbd_module/mux/Mux.cpp | 2 +- .../app_fbd/fbd_module/pnt_input/PntInput.cpp | 4 +- .../fbd_module/pnt_output/PntOutput.cpp | 26 +- .../app_fbd/fbd_module/pnt_output/PntOutput.h | 2 +- .../app_push/app_push_server/MbMsgMng.h | 2 +- .../app_push_server/PushConfigParse.cpp | 2 +- .../app_push_server/PushServerApp.cpp | 6 +- .../app_push/app_push_server/PushServerApp.h | 12 +- .../app_push/app_push_server/PushSrvMng.cpp | 4 +- .../app_push/app_push_server/PushSrvMng.h | 10 +- .../app_push_server/PushWorkThread.cpp | 6 +- .../app_push/app_push_server/PushWorkThread.h | 6 +- .../app_push_server/RecvMsgThread.cpp | 8 +- .../app_push/app_push_server/RecvMsgThread.h | 8 +- .../app_push/include/BasePushModule.h | 6 +- .../push_module/bbniot_vsms/BbniotVsms.cpp | 6 +- .../push_module/bbniot_vsms/BbniotVsms.h | 4 +- .../push_module/smtp_mail/SmtpMail.cpp | 10 +- .../app_push/push_module/smtp_mail/SmtpMail.h | 4 +- .../src/application/push_debug/MainWindow.cpp | 22 +- .../src/application/push_debug/MainWindow.h | 2 +- platform/src/application/push_debug/main.cpp | 4 +- .../sim_interlock_api/SimInterLockImpl.cpp | 20 +- .../sim_interlock_api/SimInterLockImpl.h | 12 +- platform/src/dbms/db_api_ex/CDbApi.cpp | 2 +- platform/src/dbms/db_api_ex/CDbApi_impl.cpp | 4 +- platform/src/dbms/db_api_ex/CDbApi_impl.h | 4 +- platform/src/dbms/db_base_api/CDbBaseApi.cpp | 2 +- .../src/dbms/db_base_api/CDbBaseApi_impl.cpp | 2 +- .../src/dbms/db_base_api/CDbBaseApi_impl.h | 2 +- .../src/dbms/db_base_api/CDbCondition.cpp | 2 +- .../src/dbms/db_base_api/CDbKingbaseApi.cpp | 2 +- .../src/dbms/db_base_api/CDbKingbaseApi.h | 2 +- platform/src/dbms/db_base_api/CDbMySQLApi.cpp | 2 +- platform/src/dbms/db_base_api/CDbMySQLApi.h | 2 +- platform/src/dbms/db_base_api/CDbOciApi.cpp | 2 +- platform/src/dbms/db_base_api/CDbOciApi.h | 2 +- .../src/dbms/db_base_api/CDbOpenGaussApi.cpp | 2 +- .../src/dbms/db_base_api/CDbOpenGaussApi.h | 2 +- platform/src/dbms/db_base_api/CDbOrder.cpp | 2 +- platform/src/dbms/db_base_api/CDbPara.cpp | 2 +- .../src/dbms/db_base_api/CDbSQLiteApi.cpp | 2 +- platform/src/dbms/db_base_api/CDbSQLiteApi.h | 2 +- .../src/dbms/db_his_data_srv/CDumpUtils.cpp | 42 +- .../src/dbms/db_his_data_srv/CDumpUtils.h | 2 +- .../src/dbms/db_his_data_srv/DbHisCfg.cpp | 2 +- .../src/dbms/db_his_data_srv/mainlinux.cpp | 6 +- .../src/dbms/db_his_data_srv/mainwindows.cpp | 4 +- .../src/dbms/db_his_mng_api/CHisMngApi.cpp | 28 +- .../src/dbms/db_his_mng_api/CHisMngApiImp.cpp | 114 +- .../src/dbms/db_his_mng_api/CHisMngApiImp.h | 4 +- platform/src/dbms/db_his_mng_api/en.ts | 4 +- .../dbms/db_his_query_api/CTsdbBasicQuery.cpp | 4 +- .../dbms/db_his_query_api/CTsdbBasicQuery.h | 4 +- .../dbms/db_his_query_api/DbHisQueryApi.cpp | 4 +- .../test/db_his_query_api_test/main.cpp | 142 +- .../test/rapidjson_vs_boost/main.cpp | 12 +- .../src/dbms/db_manager/CLogMngWidget.cpp | 8 +- .../src/dbms/db_manager/CStationReuseForm.cpp | 2 +- .../src/dbms/db_manager/CStationReuseForm.h | 2 +- platform/src/dbms/db_manager/db_set.cpp | 4 +- platform/src/dbms/db_manager/db_set.h | 2 +- .../his_widgets/import_his_backup_dialog.cpp | 22 +- .../his_widgets/import_his_backup_dialog.h | 2 +- .../his_widgets/new_his_backup_dialog.cpp | 16 +- .../his_widgets/new_his_backup_dialog.h | 2 +- .../his_widgets/new_his_dump_dialog.cpp | 14 +- .../his_widgets/new_his_dump_dialog.h | 2 +- platform/src/dbms/db_manager/main.cpp | 16 +- platform/src/dbms/db_manager/pj_manager.cpp | 58 +- platform/src/dbms/db_manager/pj_manager.h | 4 +- .../tst_project_data_veri.cpp | 8 +- .../dbms/db_manager_api/db_manager_api.cpp | 14 +- platform/src/dbms/db_manager_api/db_opt.cpp | 10 +- .../dbms/db_manager_api/db_opt_kingbase.cpp | 2 +- .../src/dbms/db_manager_api/db_opt_mysql.cpp | 4 +- .../dbms/db_manager_api/db_opt_opengauss.cpp | 2 +- .../src/dbms/db_manager_api/db_opt_oracle.cpp | 2 +- .../src/dbms/db_manager_api/kbdwaitprgdlg.cpp | 4 +- .../project_data_veri_manual/MainWindow.cpp | 8 +- .../src/dbms/db_save/CDbSaveRedundant.cpp | 6 +- platform/src/dbms/db_save/CDbSaveRedundant.h | 10 +- platform/src/dbms/db_save/CDbSaveService.cpp | 28 +- platform/src/dbms/db_save/CDbSaveService.h | 10 +- .../src/dbms/db_save/CDbSaveServiceThread.cpp | 78 +- .../src/dbms/db_save/CDbSaveServiceThread.h | 10 +- .../dbms/db_save/CDbSaveServiceWorkThread.cpp | 28 +- .../dbms/db_save/CDbSaveServiceWorkThread.h | 24 +- platform/src/dbms/db_save/CIStreamFile.cpp | 8 +- platform/src/dbms/db_save/CIStreamFile.h | 6 +- platform/src/dbms/db_save/COStreamFile.cpp | 6 +- platform/src/dbms/db_save/COStreamFile.h | 4 +- platform/src/dbms/db_save/DbSaveCommon.h | 4 +- .../dbms/db_save/PredefineForDbSaveServer.cpp | 18 +- .../dbms/db_save/PredefineForDbSaveServer.h | 12 +- platform/src/dbms/db_save/main.cpp | 2 +- .../src/dbms/db_save_api/CDbSaveThread.cpp | 34 +- platform/src/dbms/db_save_api/CDbSaveThread.h | 18 +- platform/src/dbms/db_save_api/DbSaveApi.cpp | 14 +- platform/src/dbms/db_studio/CDbStudio.cpp | 6 +- .../src/dbms/db_sync_server/CDbSynService.cpp | 24 +- .../src/dbms/db_sync_server/CDbSynService.h | 10 +- .../dbms/db_sync_server/CDbSynSrvRedunSw.cpp | 34 +- .../dbms/db_sync_server/CDbSynSrvRedunSw.h | 10 +- .../dbms/db_sync_server/CFirstDbThread.cpp | 4 +- .../src/dbms/db_sync_server/CFirstDbThread.h | 6 +- .../dbms/db_sync_server/CLocalDbThread.cpp | 52 +- .../src/dbms/db_sync_server/CLocalDbThread.h | 6 +- platform/src/dbms/db_sync_server/main.cpp | 2 +- .../src/dbms/db_sysinfo_api/CDbSysInfo.cpp | 26 +- platform/src/dbms/rdb_api/CBaseTable.cpp | 2 +- platform/src/dbms/rdb_api/CBaseTable.h | 2 +- platform/src/dbms/rdb_api/CBptree.cpp | 8 +- platform/src/dbms/rdb_api/CBptree.h | 2 +- platform/src/dbms/rdb_api/CHashTable.cpp | 4 +- platform/src/dbms/rdb_api/CHashTable.h | 2 +- platform/src/dbms/rdb_api/CPreMalloc.h | 2 +- platform/src/dbms/rdb_api/CPremalloc.cpp | 2 +- platform/src/dbms/rdb_api/CRdbAccess.cpp | 6 +- platform/src/dbms/rdb_api/CRdbAccessImpl.cpp | 2 +- platform/src/dbms/rdb_api/CRdbAccessImpl.h | 2 +- platform/src/dbms/rdb_api/CRdbCache.cpp | 8 +- platform/src/dbms/rdb_api/CRdbColumnInfo.cpp | 2 +- platform/src/dbms/rdb_api/CRdbColumnInfo.h | 2 +- platform/src/dbms/rdb_api/CRdbConfigMan.cpp | 2 +- platform/src/dbms/rdb_api/CRdbConfigMan.h | 2 +- platform/src/dbms/rdb_api/CRdbDataSegMan.cpp | 4 +- platform/src/dbms/rdb_api/CRdbDataSegMan.h | 2 +- platform/src/dbms/rdb_api/CRdbDictionary.cpp | 2 +- platform/src/dbms/rdb_api/CRdbDictionary.h | 2 +- platform/src/dbms/rdb_api/CRdbKey.cpp | 4 +- platform/src/dbms/rdb_api/CRdbKey.h | 2 +- platform/src/dbms/rdb_api/CRdbKey_impl.h | 2 +- .../dbms/rdb_api/CRdbLoadTableAttribute.cpp | 6 +- .../src/dbms/rdb_api/CRdbLoadTableAttribute.h | 2 +- .../src/dbms/rdb_api/CRdbLoadTableData.cpp | 4 +- platform/src/dbms/rdb_api/CRdbLoadTableData.h | 2 +- .../src/dbms/rdb_api/CRdbLocalManager.cpp | 2 +- platform/src/dbms/rdb_api/CRdbLocalManager.h | 2 +- platform/src/dbms/rdb_api/CRdbLocalTable.cpp | 4 +- platform/src/dbms/rdb_api/CRdbLocalTable.h | 6 +- .../src/dbms/rdb_api/CRdbMngInterface.cpp | 10 +- .../src/dbms/rdb_api/CRdbQueryResultImpl.cpp | 2 +- .../src/dbms/rdb_api/CRdbQueryResultImpl.h | 2 +- .../src/dbms/rdb_api/CRdbQuickSortSrch.cpp | 2 +- platform/src/dbms/rdb_api/CRdbQuickSortSrch.h | 4 +- .../src/dbms/rdb_api/CRdbServerMemMan.cpp | 4 +- platform/src/dbms/rdb_api/CRdbTime.cpp | 2 +- platform/src/dbms/rdb_api/CRdbTime.h | 2 +- platform/src/dbms/rdb_api/CVarType.cpp | 16 +- .../src/dbms/rdb_api/QVariant2Vartype.inc | 2 +- platform/src/dbms/rdb_api/QuickSortSrch.cpp | 2 +- platform/src/dbms/rdb_api/QuickSortSrch.h | 2 +- platform/src/dbms/rdb_api/RdbFunc.cpp | 26 +- platform/src/dbms/rdb_api/RdbFunc.h | 2 +- platform/src/dbms/rdb_api/RdbMemMan.cpp | 8 +- .../rdb_changedata_api/CRdbChangeData.cpp | 8 +- .../dbms/rdb_changedata_api/CSubscribeApi.cpp | 2 +- .../rdb_changedata_api/CSubscribeEngine.cpp | 2 +- .../CRdbChangeDataRedunSw.cpp | 4 +- .../CRdbChangeDataRedunSw.h | 10 +- .../CRdbChangeDataServer.cpp | 18 +- .../CRdbChangeDataServer.h | 12 +- .../CRdbChangeDataWorkThread.cpp | 20 +- .../CRdbChangeDataWorkThread.h | 18 +- .../src/dbms/rdb_changedata_server/main.cpp | 2 +- platform/src/dbms/rdb_net_api/CRdbNetApi.cpp | 24 +- .../src/dbms/rdb_net_api/CRdbNetApiImpl.cpp | 74 +- .../src/dbms/rdb_net_api/CRdbNetApiImpl.h | 28 +- .../src/dbms/rdb_server/CRdbNetService.cpp | 6 +- platform/src/dbms/rdb_server/CRdbNetService.h | 20 +- .../src/dbms/rdb_server/CRdbRedundant.cpp | 6 +- platform/src/dbms/rdb_server/CRdbRedundant.h | 8 +- platform/src/dbms/rdb_server/CRdbService.cpp | 12 +- platform/src/dbms/rdb_server/CRdbService.h | 10 +- .../src/dbms/rdb_server/CRdbServiceThread.cpp | 14 +- .../src/dbms/rdb_server/CRdbServiceThread.h | 8 +- .../src/dbms/rdb_server/CRdbSynClient.cpp | 8 +- platform/src/dbms/rdb_server/CRdbSynClient.h | 4 +- .../src/dbms/rdb_server/CRdbSynThread.cpp | 20 +- platform/src/dbms/rdb_server/CRdbSynThread.h | 24 +- .../src/dbms/rdb_server/CRdbUpdateThread.cpp | 8 +- .../src/dbms/rdb_server/CRdbUpdateThread.h | 10 +- .../src/dbms/rdb_server/CRedundantSwitch.cpp | 6 +- .../src/dbms/rdb_server/CRedundantSwitch.h | 10 +- .../src/dbms/rdb_studio/CMemDictionaryM.h | 4 +- platform/src/dbms/rdb_studio/CMemTableM.cpp | 2 +- platform/src/dbms/rdb_studio/CMemTableM.h | 4 +- platform/src/dbms/rdb_studio/main.cpp | 10 +- platform/src/dbms/rdb_studio/mainwindow.h | 4 +- platform/src/dbms/tsdb_api/CTsdbConn.cpp | 4 +- platform/src/dbms/tsdb_api/CTsdbConnImp.cpp | 4 +- platform/src/dbms/tsdb_api/CTsdbConnImp.h | 4 +- platform/src/dbms/tsdb_api/TsdbApi.cpp | 18 +- .../dbms/tsdb_api/test/tsdb_api_test/main.cpp | 14 +- .../test/tsdb_api_test_fill_sample/main.cpp | 8 +- platform/src/dbms/tsdb_save/CFrontThread.cpp | 28 +- platform/src/dbms/tsdb_save/CFrontThread.h | 12 +- platform/src/dbms/tsdb_save/CNodeMng.cpp | 20 +- platform/src/dbms/tsdb_save/CNodeMng.h | 4 +- platform/src/dbms/tsdb_save/CNodeThread.cpp | 18 +- platform/src/dbms/tsdb_save/CNodeThread.h | 6 +- .../src/dbms/tsdb_save/CTsdbSaveRedunSw.cpp | 4 +- .../src/dbms/tsdb_save/CTsdbSaveRedunSw.h | 6 +- platform/src/dbms/tsdb_save/CTsdbSaveSrv.cpp | 22 +- platform/src/dbms/tsdb_save/CTsdbSaveSrv.h | 10 +- platform/src/dbms/tsdb_save/Main.cpp | 2 +- .../src/dbms/tsdb_save/TsdbSaveCommon.cpp | 22 +- platform/src/dbms/tsdb_save/TsdbSaveCommon.h | 8 +- .../src/dbms/tsdb_save_api/CTsdbSaveApi.cpp | 6 +- .../dbms/tsdb_save_api/CTsdbSaveApiImp.cpp | 14 +- .../src/dbms/tsdb_save_api/CTsdbSaveApiImp.h | 10 +- .../CAddSampleApp.cpp | 12 +- .../tsdb_save_test_add_sample/CAddSampleApp.h | 4 +- .../CAddSampleThread.cpp | 26 +- .../CAddSampleThread.h | 4 +- .../test/tsdb_save_test_add_sample/Main.cpp | 2 +- .../gui/GraphDataAcess/CGraphDataAcess.cpp | 32 +- .../src/gui/GraphDataAcess/CGraphDataAcess.h | 18 +- platform/src/gui/GraphPub/CBase.cpp | 10 +- .../src/gui/GraphPub/CCanvasGenerator.cpp | 10 +- platform/src/gui/GraphPub/CCanvasItem.cpp | 2 +- .../GraphShape/ChartShape/CChartDataQuery.cpp | 10 +- .../GraphShape/ChartShape/CChartDataQuery.h | 8 +- .../gui/GraphTool/Retriever/CRetriever.cpp | 2 +- .../gui/GraphTool/WebPublish/CWaitDialog.cpp | 4 +- .../gui/GraphTool/WebPublish/CWebPublish.cpp | 2 +- .../gui/GraphTool/WebPublish/CWebPublish.h | 2 +- platform/src/gui/hmi/CDesignerWnd.cpp | 4 +- platform/src/gui/hmi/CExplorerScene.cpp | 2 +- platform/src/gui/hmi/CExplorerScene.h | 4 +- platform/src/gui/hmi/CExplorerView.cpp | 4 +- platform/src/gui/hmi/CExplorerView.h | 2 +- platform/src/gui/hmi/CExplorerWnd.cpp | 8 +- platform/src/gui/hmi/CGraphApp.cpp | 16 +- platform/src/gui/hmi/CGraphApp.h | 4 +- platform/src/gui/hmi/CGraphDoc.cpp | 36 +- platform/src/gui/hmi/CGraphDoc.h | 4 +- .../hmi/dialog/dataBindCheck/CBindCheck.cpp | 32 +- .../gui/hmi/dialog/dataBindCheck/CBindCheck.h | 12 +- .../gui/hmi/dialog/loginDialog/CLoginDlg.cpp | 4 +- .../gui/hmi/dialog/loginDialog/CLoginDlg.h | 2 +- platform/src/idl_files/AlarmMessage.pb.cc | 360 +-- platform/src/idl_files/AlarmMessage.pb.h | 900 +++--- platform/src/idl_files/AlarmMessage.proto | 2 +- platform/src/idl_files/BioIdentifyMsg.pb.cc | 26 +- platform/src/idl_files/BioIdentifyMsg.pb.h | 40 +- platform/src/idl_files/BioIdentifyMsg.proto | 2 +- platform/src/idl_files/DataProcMessage.pb.cc | 334 +- platform/src/idl_files/DataProcMessage.pb.h | 736 ++--- platform/src/idl_files/DataProcMessage.proto | 2 +- platform/src/idl_files/DbSaveMessage.pb.cc | 534 ++-- platform/src/idl_files/DbSaveMessage.pb.h | 930 +++--- platform/src/idl_files/DbSaveMessage.proto | 2 +- platform/src/idl_files/FBD.pb.cc | 76 +- platform/src/idl_files/FBD.pb.h | 120 +- platform/src/idl_files/FBD.proto | 2 +- platform/src/idl_files/FesMessage.pb.cc | 1482 ++++----- platform/src/idl_files/FesMessage.pb.h | 2828 ++++++++--------- platform/src/idl_files/FesMessage.proto | 2 +- platform/src/idl_files/IntelliAlmMsg.pb.cc | 168 +- platform/src/idl_files/IntelliAlmMsg.pb.h | 266 +- platform/src/idl_files/IntelliAlmMsg.proto | 2 +- platform/src/idl_files/NodeMngMessage.pb.cc | 106 +- platform/src/idl_files/NodeMngMessage.pb.h | 234 +- platform/src/idl_files/NodeMngMessage.proto | 2 +- platform/src/idl_files/OptDataMessage.pb.cc | 164 +- platform/src/idl_files/OptDataMessage.pb.h | 308 +- platform/src/idl_files/OptDataMessage.proto | 2 +- platform/src/idl_files/Public.pb.cc | 40 +- platform/src/idl_files/Public.pb.h | 84 +- platform/src/idl_files/Public.proto | 2 +- platform/src/idl_files/PushMessage.pb.cc | 58 +- platform/src/idl_files/PushMessage.pb.h | 216 +- platform/src/idl_files/PushMessage.proto | 2 +- platform/src/idl_files/RdbServerMessage.pb.cc | 514 +-- platform/src/idl_files/RdbServerMessage.pb.h | 960 +++--- platform/src/idl_files/RdbServerMessage.proto | 2 +- platform/src/idl_files/TsdbSaveMessage.pb.cc | 82 +- platform/src/idl_files/TsdbSaveMessage.pb.h | 188 +- platform/src/idl_files/TsdbSaveMessage.proto | 2 +- .../app_fbd/fbd_common/FbdAlarmCltApi.h | 24 +- .../app_fbd/fbd_common/FbdAlarmSrcApi.h | 2 +- .../app_fbd/fbd_common/FbdDiagDataApi.h | 6 +- .../app_fbd/fbd_common/FbdDiagDataStruct.h | 6 +- .../app_fbd/fbd_common/FbdSysInfoApi.h | 6 +- platform/src/include/dbms/db_api_ex/CDbApi.h | 2 +- .../src/include/dbms/db_base_api/CDbBaseApi.h | 2 +- .../include/dbms/db_base_api/CDbCondition.h | 2 +- .../src/include/dbms/db_base_api/CDbOrder.h | 2 +- .../src/include/dbms/db_base_api/CDbPara.h | 2 +- .../include/dbms/db_his_mng_api/CHisMngApi.h | 2 +- .../dbms/db_his_query_api/DbHisQueryApi.h | 4 +- .../dbms/db_his_query_api/DbHisQueryBase.h | 4 +- .../dbms/db_manager_api/db_manager_api.h | 4 +- .../src/include/dbms/db_manager_api/db_opt.h | 6 +- .../dbms/db_manager_api/db_opt_kingbase.h | 2 +- .../dbms/db_manager_api/db_opt_mysql.h | 2 +- .../dbms/db_manager_api/db_opt_opengauss.h | 2 +- .../dbms/db_manager_api/db_opt_oracle.h | 2 +- .../src/include/dbms/db_save_api/DbSaveApi.h | 12 +- .../include/dbms/db_sysinfo_api/CDbSysInfo.h | 18 +- .../src/include/dbms/rdb_api/CRdbAccess.h | 2 +- .../src/include/dbms/rdb_api/CRdbAccessEx.h | 2 +- .../include/dbms/rdb_api/CRdbMngInterface.h | 2 +- platform/src/include/dbms/rdb_api/CVarType.h | 2 +- .../src/include/dbms/rdb_api/FuncForNet.h | 4 +- platform/src/include/dbms/rdb_api/RdbDefine.h | 2 +- platform/src/include/dbms/rdb_api/RdbMemMan.h | 2 +- .../src/include/dbms/rdb_api/RdbTableMng.h | 88 +- .../dbms/rdb_changedata_api/CRdbChangeData.h | 12 +- .../dbms/rdb_changedata_api/CSubscribeApi.h | 4 +- .../src/include/dbms/rdb_net_api/CRdbNetApi.h | 20 +- .../src/include/dbms/tsdb_api/CTsdbConn.h | 4 +- platform/src/include/dbms/tsdb_api/TsdbApi.h | 4 +- .../include/dbms/tsdb_save_api/CTsdbSaveApi.h | 6 +- .../gui/GraphTool/Retriever/CRetriever.h | 2 +- .../net/net_msg_bus_api/CMbCommunicator.h | 4 +- .../include/net/net_msg_bus_api/CMbMessage.h | 4 +- .../include/net/net_msg_bus_api/CMbSubInfo.h | 4 +- .../include/net/net_msg_bus_api/MbApiExport.h | 4 +- .../include/net/net_msg_bus_api/MsgBusApi.h | 4 +- .../include/public/pub_logger_api/logger.h | 14 +- .../pub_lua_engine_api/LuaEngineImpl.inl | 6 +- .../pub_lua_engine_api/LuaEngineInterface.h | 2 +- .../public/pub_sysinfo_api/SysInfoApi.h | 4 +- .../public/pub_sysinfo_api/SysInfoBase.h | 4 +- .../public/pub_utility_api/BaseService.h | 2 +- .../pub_utility_api/BreakPadInterface.h | 4 +- .../pub_utility_api/CProcessSharedMutex.h | 2 +- .../include/public/pub_utility_api/CharUtil.h | 2 +- .../pub_utility_api/CommonConfigParse.h | 4 +- .../pub_utility_api/DeadlockCheckThread.h | 4 +- .../public/pub_utility_api/FileStyle.h | 4 +- .../include/public/pub_utility_api/FileUtil.h | 4 +- .../src/include/public/pub_utility_api/I18N.h | 4 +- .../public/pub_utility_api/LoadLibrary.h | 2 +- .../include/public/pub_utility_api/ProcUtil.h | 4 +- .../pub_utility_api/SingleProcInstance.h | 4 +- .../include/public/pub_utility_api/TimeUtil.h | 4 +- .../public/pub_utility_api/TimerThreadBase.h | 4 +- .../service/alarm_server_api/AlarmCommonDef.h | 4 +- .../alarm_server_api/CAlmApiForAlmClt.h | 20 +- .../service/alarm_server_api/CAlmApiForApp.h | 8 +- .../alarm_server_api/CAlmApiForDpSrv.h | 4 +- .../alarm_server_api/CAlmApiForEvtClt.h | 22 +- .../include/service/common/NetMsgBusEx.cpp | 6 +- .../src/include/service/common/NetMsgBusEx.h | 6 +- .../service/data_process_api/DataProcessApi.h | 4 +- .../service/dp_chg_data_api/CDpcdaForApp.h | 4 +- .../service/dp_chg_data_api/CDpcdaForDp.h | 8 +- .../intelli_alm_api/CIntelliAlmApi4Clt.h | 20 +- .../service/intelli_alm_srv/CIntelliAlmSrv.h | 6 +- .../interlock_api/InterLockInterface.h | 4 +- .../operate_server_api/JsonOptCommand.cpp | 2 +- .../include/service/perm_mng_api/PermMngApi.h | 2 +- .../service/sample_server_api/SampleDefine.h | 2 +- .../sample_server_api/SampleServerApi.h | 4 +- .../sys/sys_dog_auth_api/DogAuthInterface.h | 4 +- .../LicenseAuthInterface.h | 4 +- .../src/include/sys/sys_login_api/CLoginDlg.h | 2 +- .../NetworkCheckApiCommon.h | 4 +- .../NetworkCheckInterface.h | 4 +- .../SysRunNetworkInfoTable.h | 4 +- .../sys/sys_node_mng_api/NodeMngApiCommon.h | 4 +- .../sys/sys_node_mng_api/NodeMngInterface.h | 4 +- .../sys_node_mng_api/RedundantInfoInterface.h | 4 +- .../SysRunRedundantCmdTable.h | 4 +- .../SysRunRedundantInfoTable.h | 4 +- .../sys/sys_proc_mng_api/ProcMngApiCommon.h | 4 +- .../sys/sys_proc_mng_api/ProcMngInterface.h | 4 +- .../sys/sys_proc_mng_api/SysRunAppInfoTable.h | 4 +- .../sys_proc_mng_api/SysRunProcInfoTable.h | 4 +- .../fbd_designer/fbd_retriever/CRetriever.h | 2 +- .../tools/model_table/databasedirect.h | 8 +- .../tools/model_table/databaseinterface.h | 4 +- .../tools/model_table/databasemodelsub.h | 8 +- .../tools/model_table/kbdtabledatamgr.h | 4 +- .../net_keepalived/CCheckDatabaseThread.cpp | 2 +- .../net/net_keepalived/CCheckDatabaseThread.h | 2 +- .../src/net/net_keepalived/CWorkThread.cpp | 2 +- platform/src/net/net_keepalived/main.cpp | 4 +- platform/src/net/net_msg_bus/CLocalMng.cpp | 4 +- platform/src/net/net_msg_bus/CLocalMng.h | 4 +- platform/src/net/net_msg_bus/CMbServer.cpp | 24 +- platform/src/net/net_msg_bus/CMbServer.h | 8 +- platform/src/net/net_msg_bus/CMngAccess.cpp | 4 +- platform/src/net/net_msg_bus/CMngAccess.h | 4 +- platform/src/net/net_msg_bus/CRemoteHost.cpp | 4 +- platform/src/net/net_msg_bus/CRemoteHost.h | 4 +- platform/src/net/net_msg_bus/CRemoteMng.cpp | 4 +- platform/src/net/net_msg_bus/CRemoteMng.h | 4 +- platform/src/net/net_msg_bus/Main.cpp | 4 +- .../src/net/net_msg_bus_api/CInProcBroker.cpp | 4 +- .../src/net/net_msg_bus_api/CInProcBroker.h | 4 +- .../net/net_msg_bus_api/CMbCommunicator.cpp | 4 +- .../net_msg_bus_api/CMbCommunicatorImp.cpp | 4 +- .../net/net_msg_bus_api/CMbCommunicatorImp.h | 4 +- .../src/net/net_msg_bus_api/CMbMessage.cpp | 4 +- .../src/net/net_msg_bus_api/CMbSubInfo.cpp | 4 +- .../src/net/net_msg_bus_api/MsgBusApi.cpp | 6 +- .../net/net_msg_bus_base_api/CMbSubEngine.cpp | 4 +- .../net/net_msg_bus_base_api/CMbSubEngine.h | 4 +- .../net_msg_bus_base_api/CMbSubEngineImp.cpp | 4 +- .../net_msg_bus_base_api/CMbSubEngineImp.h | 4 +- .../net_msg_bus_base_api/CMbSubInfoImp.cpp | 4 +- .../net/net_msg_bus_base_api/CMbSubInfoImp.h | 4 +- .../src/net/net_msg_bus_base_api/CommonDef.h | 4 +- .../test/subengine_test/main.cpp | 10 +- platform/src/net/net_msg_bus_mng/Main.cpp | 6 +- .../src/net/net_msg_bus_mng/ShowHostInfo.cpp | 4 +- .../src/net/net_msg_bus_mng/ShowHostInfo.h | 4 +- .../net/net_msg_bus_mng_ping_gui/cmbping.cpp | 4 +- .../net/net_msg_bus_mng_ping_gui/cmbping.h | 4 +- .../src/net/net_msg_bus_mng_ping_gui/main.cpp | 2 +- .../net_msg_bus_mng_ping_gui/mainwindow.cpp | 40 +- .../net/net_msg_bus_mng_ping_gui/mainwindow.h | 2 +- platform/src/net/net_msg_bus_ping/CMbPing.cpp | 4 +- platform/src/net/net_msg_bus_ping/CMbPing.h | 4 +- platform/src/net/net_msg_bus_ping/Main.cpp | 24 +- .../src/net/net_msg_bus_relay/CDomainMng.cpp | 26 +- .../src/net/net_msg_bus_relay/CDomainMng.h | 4 +- .../net/net_msg_bus_relay/CDomainThread.cpp | 4 +- .../src/net/net_msg_bus_relay/CDomainThread.h | 4 +- .../src/net/net_msg_bus_relay/CMainThread.cpp | 4 +- .../src/net/net_msg_bus_relay/CMainThread.h | 4 +- .../net/net_msg_bus_relay/CMbRelayRedunSw.cpp | 4 +- .../net/net_msg_bus_relay/CMbRelayRedunSw.h | 6 +- .../src/net/net_msg_bus_relay/CMbRelaySrv.cpp | 18 +- .../src/net/net_msg_bus_relay/CMbRelaySrv.h | 12 +- .../src/net/net_msg_bus_relay/CRemoteConn.cpp | 4 +- .../src/net/net_msg_bus_relay/CRemoteConn.h | 4 +- platform/src/net/net_msg_bus_relay/Main.cpp | 2 +- .../src/net/net_msg_bus_test/client/main.cpp | 18 +- .../net/net_msg_bus_test/receiver/main.cpp | 16 +- .../src/net/net_msg_bus_test/sender/main.cpp | 18 +- .../src/net/net_msg_bus_test/server/main.cpp | 18 +- .../src/net/net_snmp_agent/AgentCommon.cpp | 4 +- platform/src/net/net_snmp_agent/AgentCommon.h | 6 +- .../src/net/net_snmp_agent/CAgentServer.cpp | 24 +- .../src/net/net_snmp_agent/CAgentServer.h | 4 +- platform/src/net/net_snmp_agent/CpuGroup.cpp | 4 +- platform/src/net/net_snmp_agent/CpuGroup.h | 4 +- .../src/net/net_snmp_agent/FileSysGroup.cpp | 4 +- .../src/net/net_snmp_agent/FileSysGroup.h | 4 +- platform/src/net/net_snmp_agent/MainLinux.cpp | 20 +- .../src/net/net_snmp_agent/MainWindows.cpp | 32 +- .../src/net/net_snmp_agent/MemoryGroup.cpp | 4 +- platform/src/net/net_snmp_agent/MemoryGroup.h | 4 +- .../net/net_snmp_agent/NetInterfaceGroup.cpp | 4 +- .../net/net_snmp_agent/NetInterfaceGroup.h | 4 +- .../src/net/net_snmp_agent/ProcessGroup.cpp | 4 +- .../src/net/net_snmp_agent/ProcessGroup.h | 4 +- .../src/net/net_snmp_agent/SystemGroup.cpp | 4 +- platform/src/net/net_snmp_agent/SystemGroup.h | 4 +- platform/src/public/pub_logger_api/logger.cpp | 8 +- .../src/public/pub_sysinfo_api/SysInfoApi.cpp | 4 +- .../public/pub_sysinfo_api/SysInfoData.cpp | 6 +- .../src/public/pub_sysinfo_api/SysInfoData.h | 4 +- .../src/public/pub_sysinfo_api/SysInfoImp.cpp | 4 +- .../src/public/pub_sysinfo_api/SysInfoImp.h | 4 +- .../src/public/pub_sysinfo_api/test/main.cpp | 6 +- .../public/pub_utility_api/BaseService.cpp | 32 +- .../pub_utility_api/BreakPadInterface.cpp | 10 +- .../pub_utility_api/CProcessSharedMutex.cpp | 12 +- .../pub_utility_api/CommonConfigParse.cpp | 28 +- .../pub_utility_api/DeadlockCheckThread.cpp | 4 +- .../src/public/pub_utility_api/FileStyle.cpp | 4 +- .../src/public/pub_utility_api/FileUtil.cpp | 4 +- platform/src/public/pub_utility_api/I18N.cpp | 4 +- .../public/pub_utility_api/LoadLibrary.cpp | 12 +- .../src/public/pub_utility_api/ProcUtil.cpp | 14 +- .../pub_utility_api/SingleProcInstance.cpp | 12 +- .../pub_utility_api/TimerThreadBase.cpp | 30 +- .../test/test_file_util/main.cpp | 12 +- .../service/alarm_resource/CAlarmResource.cpp | 36 +- .../service/alarm_resource/CAlarmResource.h | 14 +- .../CAlarmResourceRedundantSwitch.cpp | 10 +- .../CAlarmResourceRedundantSwitch.h | 12 +- .../alarm_resource/CAlarmResourceThread.cpp | 10 +- .../alarm_resource/CAlarmResourceThread.h | 12 +- platform/src/service/alarm_resource/main.cpp | 2 +- .../src/service/alarm_server/AlmSrvCommon.cpp | 48 +- .../src/service/alarm_server/AlmSrvCommon.h | 12 +- .../src/service/alarm_server/CAlarmServer.cpp | 40 +- .../src/service/alarm_server/CAlarmServer.h | 16 +- .../src/service/alarm_server/CAlmDataMng.cpp | 194 +- .../src/service/alarm_server/CAlmDataMng.h | 30 +- .../service/alarm_server/CAlmDataMngBase.cpp | 164 +- .../service/alarm_server/CAlmDataMngBase.h | 10 +- .../service/alarm_server/CAlmSrvRedunSw.cpp | 4 +- .../src/service/alarm_server/CAlmSrvRedunSw.h | 6 +- .../alarm_server/CAppMsgProcThread.cpp | 86 +- .../service/alarm_server/CAppMsgProcThread.h | 34 +- .../src/service/alarm_server/CItlAlmSrv.cpp | 4 +- .../src/service/alarm_server/CItlAlmSrv.h | 4 +- .../service/alarm_server/CMainProcThread.cpp | 74 +- .../service/alarm_server/CMainProcThread.h | 20 +- .../service/alarm_server/CSlaveSyncThread.cpp | 36 +- .../service/alarm_server/CSlaveSyncThread.h | 10 +- platform/src/service/alarm_server/Main.cpp | 8 +- .../alarm_server/test/alarm_test_rdb/main.cpp | 30 +- .../alarm_server_api/CAlmApiForAlmClt.cpp | 10 +- .../alarm_server_api/CAlmApiForAlmCltImp.cpp | 62 +- .../alarm_server_api/CAlmApiForAlmCltImp.h | 14 +- .../alarm_server_api/CAlmApiForApp.cpp | 8 +- .../alarm_server_api/CAlmApiForAppImp.cpp | 14 +- .../alarm_server_api/CAlmApiForAppImp.h | 12 +- .../alarm_server_api/CAlmApiForDpSrv.cpp | 4 +- .../alarm_server_api/CAlmApiForDpSrvImp.cpp | 22 +- .../alarm_server_api/CAlmApiForDpSrvImp.h | 12 +- .../alarm_server_api/CAlmApiForEvtClt.cpp | 30 +- .../service/alarm_server_api/SAlmSrvStatus.h | 4 +- .../test/alarm_test_add_alm/CAddAlmApp.cpp | 12 +- .../test/alarm_test_add_alm/CAddAlmApp.h | 4 +- .../test/alarm_test_add_alm/CAddAlmThread.cpp | 14 +- .../test/alarm_test_add_alm/CAddAlmThread.h | 16 +- .../test/alarm_test_add_alm/Main.cpp | 2 +- .../test/alarm_test_fake_alm_clt/CAlmClt.cpp | 12 +- .../test/alarm_test_fake_alm_clt/CAlmClt.h | 4 +- .../alarm_test_fake_alm_clt/CMsgThread.cpp | 30 +- .../test/alarm_test_fake_alm_clt/CMsgThread.h | 16 +- .../test/alarm_test_fake_alm_clt/Main.cpp | 2 +- .../test/alarm_test_fake_dp/CFakeDp.cpp | 12 +- .../test/alarm_test_fake_dp/CFakeDp.h | 4 +- .../test/alarm_test_fake_dp/CMsgThread.cpp | 2 +- .../test/alarm_test_fake_dp/CMsgThread.h | 4 +- .../test/alarm_test_fake_dp/Main.cpp | 2 +- .../test/alarm_test_fake_evt_clt/CEvtClt.cpp | 12 +- .../test/alarm_test_fake_evt_clt/CEvtClt.h | 4 +- .../alarm_test_fake_evt_clt/CMsgThread.cpp | 14 +- .../test/alarm_test_fake_evt_clt/CMsgThread.h | 8 +- .../test/alarm_test_fake_evt_clt/Main.cpp | 2 +- .../src/service/alarm_system/CAlarmSystem.cpp | 36 +- .../src/service/alarm_system/CAlarmSystem.h | 14 +- .../CAlarmSystemRedundantSwitch.cpp | 10 +- .../CAlarmSystemRedundantSwitch.h | 12 +- .../alarm_system/CAlarmSystemThread.cpp | 18 +- .../service/alarm_system/CAlarmSystemThread.h | 16 +- platform/src/service/alarm_system/main.cpp | 2 +- .../src/service/data_process/AccProcess.cpp | 14 +- .../src/service/data_process/AccProcess.h | 12 +- .../service/data_process/AccStructDefine.h | 2 +- .../service/data_process/AccWorkThread.cpp | 20 +- .../src/service/data_process/AccWorkThread.h | 8 +- .../service/data_process/AlarmAckProcess.cpp | 8 +- .../service/data_process/AlarmAckProcess.h | 10 +- .../src/service/data_process/AnaProcess.cpp | 14 +- .../src/service/data_process/AnaProcess.h | 10 +- .../service/data_process/AnaStructDefine.h | 2 +- .../service/data_process/AnaWorkThread.cpp | 34 +- .../src/service/data_process/AnaWorkThread.h | 8 +- .../service/data_process/ChgWorkThread.cpp | 18 +- .../src/service/data_process/ChgWorkThread.h | 12 +- .../service/data_process/CommStructDefine.h | 2 +- .../service/data_process/DataProcessApp.cpp | 12 +- .../src/service/data_process/DataProcessApp.h | 14 +- .../service/data_process/DataProcessDefine.h | 2 +- .../src/service/data_process/DataPublish.cpp | 16 +- .../src/service/data_process/DataPublish.h | 14 +- .../src/service/data_process/DigProcess.cpp | 16 +- .../src/service/data_process/DigProcess.h | 12 +- .../service/data_process/DigStructDefine.h | 2 +- .../service/data_process/DigWorkThread.cpp | 14 +- .../src/service/data_process/DigWorkThread.h | 8 +- .../src/service/data_process/LimitProcess.cpp | 14 +- .../src/service/data_process/LimitProcess.h | 10 +- .../service/data_process/LimitStructDefine.h | 2 +- platform/src/service/data_process/Main.cpp | 4 +- .../src/service/data_process/MixProcess.cpp | 14 +- .../src/service/data_process/MixProcess.h | 10 +- .../service/data_process/MixStructDefine.h | 2 +- .../service/data_process/MixWorkThread.cpp | 32 +- .../src/service/data_process/MixWorkThread.h | 8 +- .../service/data_process/MsgRecvThread.cpp | 14 +- .../src/service/data_process/MsgRecvThread.h | 12 +- .../src/service/data_process/PacketQueue.cpp | 42 +- .../src/service/data_process/PacketQueue.h | 68 +- .../src/service/data_process/PointBase.cpp | 6 +- platform/src/service/data_process/PointBase.h | 6 +- .../service/data_process/WorkThreadMng.cpp | 8 +- .../src/service/data_process/WorkThreadMng.h | 10 +- .../data_process_api/DataProcessApi.cpp | 4 +- .../data_process_api/DataProcessImpl.cpp | 32 +- .../data_process_api/DataProcessImpl.h | 6 +- .../service/dp_chg_data_api/CDpcdaForApp.cpp | 4 +- .../dp_chg_data_api/CDpcdaForAppGlobal.cpp | 42 +- .../dp_chg_data_api/CDpcdaForAppGlobal.h | 10 +- .../service/dp_chg_data_api/CDpcdaForDp.cpp | 6 +- .../dp_chg_data_api/CDpcdaForDpImpl.cpp | 132 +- .../service/dp_chg_data_api/CDpcdaForDpImpl.h | 48 +- .../service/dp_chg_data_api/CDpcdaSubMng.cpp | 12 +- .../service/dp_chg_data_api/CDpcdaSubMng.h | 12 +- .../src/service/dp_chg_data_api/DpcdaCommon.h | 20 +- .../intelli_alm_api/CIntelliAlmApi4Clt.cpp | 10 +- .../CIntelliAlmApi4CltImpl.cpp | 68 +- .../intelli_alm_api/CIntelliAlmApi4CltImpl.h | 16 +- .../test/itl_alm_test_fake_clt/CItlAlmClt.cpp | 12 +- .../test/itl_alm_test_fake_clt/CItlAlmClt.h | 4 +- .../test/itl_alm_test_fake_clt/CMsgThread.cpp | 38 +- .../test/itl_alm_test_fake_clt/CMsgThread.h | 16 +- .../test/itl_alm_test_fake_clt/Main.cpp | 2 +- .../src/service/intelli_alm_srv/CDataMng.cpp | 188 +- .../src/service/intelli_alm_srv/CDataMng.h | 32 +- .../intelli_alm_srv/CIntelliAlmSrv.cpp | 8 +- .../intelli_alm_srv/CIntelliAlmSrvImpl.cpp | 4 +- .../intelli_alm_srv/CIntelliAlmSrvImpl.h | 4 +- .../intelli_alm_srv/CMainProcThread.cpp | 74 +- .../service/intelli_alm_srv/CMainProcThread.h | 16 +- .../intelli_alm_srv/CSlaveSyncThread.cpp | 34 +- .../intelli_alm_srv/CSlaveSyncThread.h | 10 +- .../service/intelli_alm_srv/CTopoThread.cpp | 16 +- .../src/service/intelli_alm_srv/CTopoThread.h | 8 +- .../intelli_alm_srv/ItlAlmSrvCommon.cpp | 58 +- .../service/intelli_alm_srv/ItlAlmSrvCommon.h | 16 +- .../service/interlock_api/InterLockImpl.cpp | 22 +- .../src/service/interlock_api/InterLockImpl.h | 14 +- .../interlock_api/InterLockInterface.cpp | 6 +- .../iscs_wise_mnp/CAsyncRcvSubThread.cpp | 34 +- .../iscs_wise_mnp/CAsyncRcvSubThread.h | 4 +- .../iscs_wise_mnp/CRcvRDWrtRdsThread.cpp | 106 +- .../iscs_wise_mnp/CRcvRDWrtRdsThread.h | 20 +- .../iscs_wise_mnp/CRealAlarmThread.cpp | 80 +- .../service/iscs_wise_mnp/CRealAlarmThread.h | 20 +- .../iscs_wise_mnp/CRealEventThread.cpp | 44 +- .../service/iscs_wise_mnp/CRealEventThread.h | 12 +- .../service/iscs_wise_mnp/CRedisConMng.cpp | 48 +- .../src/service/iscs_wise_mnp/CRedisConMng.h | 2 +- .../iscs_wise_mnp/CRedisConnectThread.cpp | 10 +- .../iscs_wise_mnp/CRedisConnectThread.h | 4 +- .../iscs_wise_mnp/CRelativeCallback.cpp | 16 +- .../service/iscs_wise_mnp/CRelativeCallback.h | 2 +- .../service/iscs_wise_mnp/CWebServerMng.cpp | 20 +- .../src/service/iscs_wise_mnp/CWebServerMng.h | 12 +- .../src/service/iscs_wise_mnp/CWebSrvApp.cpp | 46 +- .../src/service/iscs_wise_mnp/CWebSrvApp.h | 14 +- .../src/service/iscs_wise_mnp/DataStructDef.h | 2 +- .../service/iscs_wise_mnp/RedisCallback.cpp | 10 +- .../src/service/iscs_wise_mnp/RedisCallback.h | 2 +- .../service/iscs_wise_mnp/WebSrvCommon.cpp | 4 +- .../src/service/iscs_wise_mnp/WebSrvCommon.h | 2 +- .../service/iscs_wise_mnp/WebSrvJsonMsg.cpp | 14 +- .../src/service/iscs_wise_mnp/WebSrvJsonMsg.h | 6 +- platform/src/service/iscs_wise_mnp/main.cpp | 2 +- platform/src/service/operate_server/Main.cpp | 4 +- .../service/operate_server/OperateServer.cpp | 12 +- .../service/operate_server/OperateServer.h | 12 +- .../operate_server/OperateServerClass.cpp | 12 +- .../operate_server/OperateServerClass.h | 24 +- .../src/service/operate_server/OptCommand.cpp | 12 +- .../src/service/operate_server/OptCommand.h | 14 +- .../src/service/operate_server/OptControl.cpp | 18 +- .../service/operate_server/OptHandover.cpp | 8 +- .../service/operate_server/OptMainThread.cpp | 20 +- .../service/operate_server/OptMainThread.h | 14 +- .../service/operate_server/OptPlanShield.cpp | 8 +- .../service/operate_server/OptPlanShield.h | 8 +- .../service/operate_server/OptShieldSet.cpp | 8 +- .../src/service/operate_server/OptTagSet.cpp | 12 +- .../src/service/operate_server/OptToken.cpp | 12 +- .../operate_server/RedundantSwitch.cpp | 6 +- .../service/operate_server/RedundantSwitch.h | 8 +- .../src/service/perm_mng_api/PermMngApi.cpp | 4 +- .../src/service/perm_mng_api/PermMngImpl.cpp | 22 +- .../src/service/perm_mng_api/PermMngImpl.h | 6 +- .../sample_server_api/SampleServerApi.cpp | 6 +- .../sample_server_api/SampleThreadImpl.cpp | 32 +- .../sample_server_api/SampleThreadImpl.h | 24 +- .../src/service/sample_server_api/Sdt.cpp | 4 +- platform/src/service/sample_server_api/Sdt.h | 2 +- .../service/web_server/include/ServerApi.h | 4 +- .../service/web_server/include/SessionApi.h | 4 +- .../web_server/module_alarm/AlmCntWsLsnr.cpp | 6 +- .../web_server/module_alarm/AlmCntWsLsnr.hpp | 6 +- .../web_server/module_alarm/AlmWsLsnr.cpp | 6 +- .../web_server/module_alarm/AlmWsLsnr.hpp | 6 +- .../web_server/module_alarm/DataMngThread.cpp | 120 +- .../web_server/module_alarm/DataMngThread.hpp | 30 +- .../web_server/module_alarm/DataStruct.hpp | 42 +- .../web_server/module_alarm/SimpleCtrl.cpp | 12 +- .../web_server/module_general/CtrlGeneral.cpp | 10 +- .../web_server/module_general/CtrlGeneral.hpp | 2 +- .../module_realTimeData/CListener.cpp | 10 +- .../module_realTimeData/CListener.h | 6 +- .../module_realTimeData/CModule.cpp | 4 +- .../module_realTimeData/CSocket.cpp | 26 +- .../web_server/module_realTimeData/CSocket.h | 6 +- .../web_server/module_trend/CController.cpp | 18 +- .../web_server/module_trend/CController.h | 12 +- .../web_server/module_user/CtrlUser.cpp | 8 +- .../web_server/module_user/CtrlUser.hpp | 2 +- .../service/web_server/server/GlobalMng.cpp | 8 +- .../src/service/web_server/server/GlobalMng.h | 8 +- .../service/web_server/server/WebServer.cpp | 24 +- .../src/service/web_server/server/WebServer.h | 6 +- .../service/web_server/server/WebSrvRedunSw.h | 2 +- .../server/auth/AuthInterceptor.cpp | 4 +- .../web_server/server/auth/AuthRdbUtil.cpp | 8 +- .../web_server/server/auth/AuthRdbUtil.h | 2 +- .../server/auth/SesssionApiImpl.cpp | 66 +- .../web_server/server/auth/SesssionApiImpl.h | 28 +- .../service/web_server_bi/include/FileApi.h | 8 +- .../service/web_server_bi/include/ServerApi.h | 4 +- .../web_server_bi/include/SessionApi.h | 4 +- .../module_history/CController.cpp | 4 +- .../module_model/CController.cpp | 2 +- .../web_server_bi/module_page/Common.cpp | 2 +- .../web_server_bi/module_page/Common.hpp | 2 +- .../module_page/SimpleCtrlPage.cpp | 24 +- .../module_page/SimpleCtrlPage.hpp | 2 +- .../module_page/SimpleCtrlPrimitive.cpp | 18 +- .../module_realTimeData/CListener.cpp | 10 +- .../module_realTimeData/CListener.h | 6 +- .../module_realTimeData/CModule.cpp | 4 +- .../module_realTimeData/CSocket.cpp | 26 +- .../module_realTimeData/CSocket.h | 6 +- .../service/web_server_bi/server/FileApi.cpp | 30 +- .../web_server_bi/server/GlobalMng.cpp | 8 +- .../service/web_server_bi/server/GlobalMng.h | 8 +- .../web_server_bi/server/WebServer.cpp | 24 +- .../service/web_server_bi/server/WebServer.h | 6 +- .../web_server_bi/server/WebSrvRedunSw.h | 2 +- .../server/auth/SesssionApiImpl.cpp | 44 +- .../server/auth/SesssionApiImpl.h | 26 +- .../src/sys/file_sync_auto/FileSyncAuto.cpp | 6 +- .../src/sys/file_sync_auto/FileSyncAuto.h | 10 +- .../file_sync_auto/FileSyncAutoReSwMng.cpp | 8 +- .../sys/file_sync_auto/FileSyncAutoReSwMng.h | 10 +- .../sys/file_sync_auto/SyncthingMngThread.cpp | 48 +- .../sys/file_sync_auto/SyncthingMngThread.h | 14 +- .../src/sys/show_node_info/ConsoleMng.cpp | 8 +- platform/src/sys/show_node_info/ConsoleMng.h | 4 +- .../src/sys/show_node_info/NodeMngShowApp.cpp | 24 +- .../src/sys/show_node_info/NodeMngShowApp.h | 4 +- .../src/sys/show_node_info/ShowAppInfo.cpp | 28 +- platform/src/sys/show_node_info/ShowAppInfo.h | 4 +- .../sys/show_node_info/ShowNetworkInfo.cpp | 8 +- .../src/sys/show_node_info/ShowNetworkInfo.h | 4 +- .../sys/show_node_info/ShowNodeInfoCommon.h | 2 +- .../src/sys/show_node_info/ShowProcInfo.cpp | 20 +- .../src/sys/show_node_info/ShowProcInfo.h | 6 +- .../show_node_info/SysModelDeployInfoTable.h | 4 +- platform/src/sys/show_node_info/main.cpp | 2 +- platform/src/sys/sys_ctrl/BaseCfgParam.cpp | 26 +- platform/src/sys/sys_ctrl/BaseCfgParam.h | 10 +- platform/src/sys/sys_ctrl/StartCfgParam.cpp | 14 +- platform/src/sys/sys_ctrl/StartCfgParam.h | 6 +- platform/src/sys/sys_ctrl/StopCfgParam.cpp | 26 +- platform/src/sys/sys_ctrl/StopCfgParam.h | 6 +- platform/src/sys/sys_ctrl/SysCtrlApp.cpp | 28 +- platform/src/sys/sys_ctrl/SysCtrlApp.h | 8 +- platform/src/sys/sys_ctrl/SysCtrlCommon.h | 2 +- platform/src/sys/sys_ctrl/SysCtrlStart.cpp | 34 +- platform/src/sys/sys_ctrl/SysCtrlStart.h | 32 +- platform/src/sys/sys_ctrl/SysCtrlStop.cpp | 36 +- platform/src/sys/sys_ctrl/SysCtrlStop.h | 34 +- platform/src/sys/sys_ctrl/main.cpp | 2 +- .../src/sys/sys_dog_auth_api/DogAuthImpl.cpp | 20 +- .../src/sys/sys_dog_auth_api/DogAuthImpl.h | 4 +- .../sys/sys_dog_auth_api/DogAuthInterface.cpp | 4 +- .../src/sys/sys_dog_auth_check/mainwindow.cpp | 4 +- .../src/sys/sys_launcher_srv/CSysLauncher.cpp | 16 +- .../src/sys/sys_launcher_srv/CSysLauncher.h | 4 +- .../src/sys/sys_launcher_srv/MainLinux.cpp | 8 +- .../src/sys/sys_launcher_srv/MainWindows.cpp | 6 +- .../sys_license_auth_api/LicenseAuthImpl.cpp | 2 +- .../sys_license_auth_api/LicenseAuthImpl.h | 2 +- .../LicenseAuthInterface.cpp | 4 +- platform/src/sys/sys_login_api/CLoginDlg.cpp | 6 +- .../sys/sys_network_check/NetworkCfgParam.cpp | 22 +- .../sys/sys_network_check/NetworkCfgParam.h | 4 +- .../sys/sys_network_check/NetworkCheckApp.cpp | 36 +- .../sys/sys_network_check/NetworkCheckApp.h | 12 +- .../sys_network_check/NetworkCheckCommon.h | 2 +- .../sys_network_check/NetworkTableOperate.cpp | 18 +- .../sys_network_check/NetworkTableOperate.h | 12 +- platform/src/sys/sys_network_check/Ping.cpp | 20 +- platform/src/sys/sys_network_check/Ping.h | 4 +- platform/src/sys/sys_network_check/main.cpp | 2 +- .../NetworkCheckImpl.cpp | 16 +- .../sys_network_check_api/NetworkCheckImpl.h | 6 +- .../NetworkCheckInterface.cpp | 4 +- .../sys/sys_node_mng/AppLevelArbitrate.cpp | 64 +- .../src/sys/sys_node_mng/AppLevelArbitrate.h | 20 +- .../sys/sys_node_mng/HeartbeatCheckThread.cpp | 8 +- .../sys/sys_node_mng/HeartbeatCheckThread.h | 6 +- .../src/sys/sys_node_mng/LocalAppInfoMng.cpp | 24 +- .../src/sys/sys_node_mng/LocalAppInfoMng.h | 18 +- .../src/sys/sys_node_mng/MsgBusMngThread.cpp | 28 +- .../src/sys/sys_node_mng/MsgBusMngThread.h | 28 +- platform/src/sys/sys_node_mng/NodeInfoMng.cpp | 40 +- platform/src/sys/sys_node_mng/NodeInfoMng.h | 18 +- platform/src/sys/sys_node_mng/NodeMngApp.cpp | 32 +- platform/src/sys/sys_node_mng/NodeMngApp.h | 10 +- .../src/sys/sys_node_mng/NodeMngCfgParam.cpp | 46 +- .../src/sys/sys_node_mng/NodeMngCfgParam.h | 4 +- .../src/sys/sys_node_mng/NodeMngCommon.cpp | 30 +- platform/src/sys/sys_node_mng/NodeMngCommon.h | 4 +- .../RedundancyArbitrateThread.cpp | 22 +- .../sys_node_mng/RedundancyArbitrateThread.h | 10 +- .../src/sys/sys_node_mng/RemoteAppInfoMng.cpp | 22 +- .../src/sys/sys_node_mng/RemoteAppInfoMng.h | 14 +- platform/src/sys/sys_node_mng/RtdbOperate.cpp | 24 +- platform/src/sys/sys_node_mng/RtdbOperate.h | 14 +- platform/src/sys/sys_node_mng/main.cpp | 2 +- .../sys/sys_node_mng_api/NodeMngInterface.cpp | 8 +- .../sys_node_mng_api/RedundantInfoImpl.cpp | 18 +- .../sys/sys_node_mng_api/RedundantInfoImpl.h | 6 +- .../sys/sys_node_mng_api/RedundantMngImpl.cpp | 14 +- .../sys/sys_node_mng_api/RedundantMngImpl.h | 4 +- .../sys_node_mng_api/RedundantMngThread.cpp | 20 +- .../sys/sys_node_mng_api/RedundantMngThread.h | 8 +- .../sys_nodeinfo_tran/NodeInfoRecvThread.cpp | 26 +- .../sys_nodeinfo_tran/NodeInfoRecvThread.h | 20 +- .../sys_nodeinfo_tran/NodeInfoSendThread.cpp | 26 +- .../sys_nodeinfo_tran/NodeInfoSendThread.h | 24 +- .../sys/sys_nodeinfo_tran/NodeInfoTranApp.cpp | 32 +- .../sys/sys_nodeinfo_tran/NodeInfoTranApp.h | 10 +- .../NodeInfoTranCfgParam.cpp | 20 +- .../sys_nodeinfo_tran/NodeInfoTranCfgParam.h | 8 +- .../sys_nodeinfo_tran/NodeInfoTranCommon.h | 2 +- .../sys/sys_nodeinfo_tran/NodeInfoTranMng.cpp | 10 +- .../sys/sys_nodeinfo_tran/NodeInfoTranMng.h | 14 +- platform/src/sys/sys_nodeinfo_tran/main.cpp | 2 +- platform/src/sys/sys_proc_mng/ProcMngApp.cpp | 28 +- platform/src/sys/sys_proc_mng/ProcMngApp.h | 8 +- platform/src/sys/sys_proc_mng/ProcMngCommon.h | 8 +- .../sys/sys_proc_mng/ProcMngConfigParam.cpp | 32 +- .../src/sys/sys_proc_mng/ProcMngConfigParam.h | 16 +- .../src/sys/sys_proc_mng/ProcMngThread.cpp | 38 +- platform/src/sys/sys_proc_mng/ProcMngThread.h | 16 +- .../sys_proc_mng/RunAppInfoTableOperate.cpp | 16 +- .../sys/sys_proc_mng/RunAppInfoTableOperate.h | 14 +- .../sys_proc_mng/RunProcInfoTableOperate.cpp | 14 +- .../sys_proc_mng/RunProcInfoTableOperate.h | 6 +- platform/src/sys/sys_proc_mng/main.cpp | 2 +- .../sys/sys_proc_mng_api/ProcMngApiThread.cpp | 30 +- .../sys/sys_proc_mng_api/ProcMngApiThread.h | 10 +- .../src/sys/sys_proc_mng_api/ProcMngImpl.cpp | 16 +- .../src/sys/sys_proc_mng_api/ProcMngImpl.h | 4 +- .../sys/sys_proc_mng_api/ProcMngInterface.cpp | 4 +- .../Other/lua_function_test/CExecFunction.h | 2 +- .../lua_function_test/CLuaFunctionTest.h | 2 +- .../tools/fbd_designer/fbd_designer/main.cpp | 4 +- .../fbd_designer/fbd_diagram/CDiagram.cpp | 6 +- .../tools/fbd_designer/fbd_diagram/CDiagram.h | 2 +- .../fbd_editor/CFBDMainWindow.cpp | 16 +- .../tools/fbd_designer/fbd_editor/CGroup.cpp | 6 +- .../tools/fbd_designer/fbd_editor/CGroup.h | 4 +- .../fbd_designer/fbd_editor/CGroupEdit.cpp | 6 +- .../fbd_designer/fbd_editor/CSetGroupDlg.cpp | 4 +- platform/src/tools/model_common/common.cpp | 10 +- .../FESWidget/kbdupdatepsc3000dlg.cpp | 12 +- .../model_studio/loginDialog/logindlg.cpp | 14 +- platform/src/tools/model_studio/main.cpp | 8 +- .../tools/model_system_config/logindlg.cpp | 14 +- .../src/tools/model_system_config/main.cpp | 4 +- .../src/tools/model_table/databasedirect.cpp | 6 +- .../tools/model_table/databasemodelsub.cpp | 6 +- .../src/tools/model_table/kbdtabledatamgr.cpp | 6 +- platform/src/tools/model_table/worker.cpp | 6 +- 914 files changed, 11376 insertions(+), 11376 deletions(-) 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 d0ed0b70..8d8644da 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 @@ -153,7 +153,7 @@ bool CAcsDeviceApiImplFactory::initGlobal() if (m_bInited) return true; - const std::string strCurDir = kbd_public::CFileUtil::getCurModuleDir(); + const std::string strCurDir = iot_public::CFileUtil::getCurModuleDir(); if (strCurDir.empty()) { LOGERROR("initGlobal(): 获取程序所在路径失败！"); 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 20a07602..0de88e7d 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 @@ -102,7 +102,7 @@ void CAcsDevice::handleIdentificationEvent(bool bPass, int nUserID, size_t nPicD } } -bool CAcsDevice::handle_MT_BIS_START_ID_REQ(const kbd_net::CMbMessage &objMbMsgReq) +bool CAcsDevice::handle_MT_BIS_START_ID_REQ(const iot_net::CMbMessage &objMbMsgReq) { LOGINFO("handle_MT_BIS_START_ID_REQ(): 收到请求，开始处理！"); @@ -134,7 +134,7 @@ bool CAcsDevice::handle_MT_BIS_START_ID_REQ(const kbd_net::CMbMessage &objMbMsgR //< 切换状态 m_enState = EN_STATE_WAITE_RESULT; - m_nStateStartTime = kbd_public::getMonotonicMsec(); + m_nStateStartTime = iot_public::getMonotonicMsec(); } else { @@ -166,9 +166,9 @@ bool CAcsDevice::handle_MT_BIS_START_ID_REQ(const kbd_net::CMbMessage &objMbMsgR //< 回复消息 { - kbd_net::CMbMessage objMsgRep; + iot_net::CMbMessage objMsgRep; objMsgRep.setSubject(CN_AppId_COMAPP, CH_BIS_TO_APP); - objMsgRep.setMsgType(kbd_idlfile::MT_BIS_START_ID_REP); + objMsgRep.setMsgType(iot_idl::MT_BIS_START_ID_REP); objMsgRep.setData(strRep); objMsgRep.setPara1(bRet ? 0 : 1); @@ -179,7 +179,7 @@ bool CAcsDevice::handle_MT_BIS_START_ID_REQ(const kbd_net::CMbMessage &objMbMsgR return bRet; } -bool CAcsDevice::handle_MT_BIS_CANCEL_ID(const kbd_net::CMbMessage &objMbMsgReq) +bool CAcsDevice::handle_MT_BIS_CANCEL_ID(const iot_net::CMbMessage &objMbMsgReq) { LOGINFO("handle_MT_BIS_CANCEL_ID(): 收到请求，开始处理！"); @@ -200,7 +200,7 @@ bool CAcsDevice::handle_MT_BIS_CANCEL_ID(const kbd_net::CMbMessage &objMbMsgReq) //< 设置状态 m_enState = EN_STATE_IDLE; - m_nStateStartTime = kbd_public::getMonotonicMsec(); + m_nStateStartTime = iot_public::getMonotonicMsec(); //< 关闭认证 enableIdentification(false); @@ -210,7 +210,7 @@ bool CAcsDevice::handle_MT_BIS_CANCEL_ID(const kbd_net::CMbMessage &objMbMsgReq) void CAcsDevice::processStateMachine() { - const boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); switch (m_enState) { @@ -271,7 +271,7 @@ void CAcsDevice::processStateMachine() } //< 待回复的消息，非isValid表示还没有结果，无需回复 - kbd_net::CMbMessage objMsgRep; + iot_net::CMbMessage objMsgRep; if (nullptr == ptrIdResult) { @@ -281,7 +281,7 @@ void CAcsDevice::processStateMachine() std::string strRep = I18N("认证超时。"); objMsgRep.setSubject(CN_AppId_COMAPP, CH_BIS_TO_APP); - objMsgRep.setMsgType(kbd_idlfile::MT_BIS_ID_RESULT); + objMsgRep.setMsgType(iot_idl::MT_BIS_ID_RESULT); objMsgRep.setData(strRep); objMsgRep.setPara1(1); //< 0表示成功，其他值表示失败 } @@ -290,7 +290,7 @@ void CAcsDevice::processStateMachine() { if (ptrIdResult->m_bPass) { - kbd_idlfile::SBisIdResult objIdResult; + iot_idl::SBisIdResult objIdResult; objIdResult.set_user_id(ptrIdResult->m_nUserID); objIdResult.set_acs_dev_tag(m_strTagName); @@ -300,11 +300,11 @@ void CAcsDevice::processStateMachine() objIdResult.mutable_pic_data()->swap(ptrIdResult->m_strPicData); //< 图片几乎不可压缩，关闭 - objMsgRep.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMsgRep.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; } objMsgRep.setSubject(CN_AppId_COMAPP, CH_BIS_TO_APP); - objMsgRep.setMsgType(kbd_idlfile::MT_BIS_ID_RESULT); + objMsgRep.setMsgType(iot_idl::MT_BIS_ID_RESULT); objMsgRep.setData(objIdResult); objMsgRep.setPara1(0); //< 0表示成功，其他值表示失败 } 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 b79ac81f..49c847e6 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 @@ -28,8 +28,8 @@ public: ~CAcsDevice(); //< 处理消息，返回成功或失败 - bool handle_MT_BIS_START_ID_REQ(const kbd_net::CMbMessage &objMbMsgReq); - bool handle_MT_BIS_CANCEL_ID(const kbd_net::CMbMessage &objMbMsgReq); + bool handle_MT_BIS_START_ID_REQ(const iot_net::CMbMessage &objMbMsgReq); + bool handle_MT_BIS_CANCEL_ID(const iot_net::CMbMessage &objMbMsgReq); //< 处理状态机 void processStateMachine(); @@ -93,7 +93,7 @@ private: boost::int64_t m_nStateStartTime; //< 请求认证的原始消息，用于回复 - kbd_net::CMbMessage m_objMbMsgReq; + iot_net::CMbMessage m_objMbMsgReq; //< 认证结果 CIdResultPtr m_ptrIdResult; 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 7e625bf3..1e2d74fd 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 @@ -79,7 +79,7 @@ bool CAcsWorkThread::resumeThread() refreshCfg(); if (nullptr == m_pMbComm) - m_pMbComm = new kbd_net::CMbCommunicator(); + m_pMbComm = new iot_net::CMbCommunicator(); //< 订阅 if (!m_pMbComm->addSub(0, CH_APP_TO_BIS)) @@ -93,7 +93,7 @@ bool CAcsWorkThread::resumeThread() } if (nullptr == m_pMbMsgRcv) - m_pMbMsgRcv = new kbd_net::CMbMessage(); + m_pMbMsgRcv = new iot_net::CMbMessage(); m_bIsRunning = true; resume(); @@ -139,10 +139,10 @@ void CAcsWorkThread::refreshCfg() m_mapAcsDevice.clear(); - kbd_dbms::CVarType rdbVal_TAG_NAME, rdbVal_IP_ADDR, rdbVal_MNG_PORT, rdbVal_MNG_USER, rdbVal_MNG_PASSWD; + iot_dbms::CVarType rdbVal_TAG_NAME, rdbVal_IP_ADDR, rdbVal_MNG_PORT, rdbVal_MNG_USER, rdbVal_MNG_PASSWD; //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_acs_device_info); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_acs_device_info); const int nRcdCnt = m_objRtdb_acs_device_info.getRecordCount(); for (int nRcdIdx = 0; nRcdIdx < nRcdCnt; ++nRcdIdx) @@ -232,12 +232,12 @@ void CAcsWorkThread::handleOneMbMsg() std::string strSrcNode = m_pMbMsgRcv->getSrcHost(); strSrcNode.resize(64); //< 注意，必须与列定义一致 - kbd_dbms::CVarType rdbVal_ACS_DEVICE_TAG; + iot_dbms::CVarType rdbVal_ACS_DEVICE_TAG; //< 查找该节点的ACS设备 { //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_acs_device_node_map); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_acs_device_node_map); const int nRcdIdx = m_objRtdb_acs_device_node_map.searchRecordByKey(strSrcNode.c_str()); if (nRcdIdx < 0) @@ -262,10 +262,10 @@ void CAcsWorkThread::handleOneMbMsg() switch (m_pMbMsgRcv->getMsgType()) { - case kbd_idlfile::MT_BIS_START_ID_REQ: + case iot_idl::MT_BIS_START_ID_REQ: itDev->second->handle_MT_BIS_START_ID_REQ(*m_pMbMsgRcv); break; - case kbd_idlfile::MT_BIS_CANCEL_ID: + case iot_idl::MT_BIS_CANCEL_ID: itDev->second->handle_MT_BIS_CANCEL_ID(*m_pMbMsgRcv); break; default: 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 a40595a0..2e8d2d42 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 @@ -20,7 +20,7 @@ namespace kbd_application { -class CAcsWorkThread : private kbd_public::CTimerThreadBase +class CAcsWorkThread : private iot_public::CTimerThreadBase { friend class CAcsDevice; @@ -49,12 +49,12 @@ private: //< 实时库 acs_device_info 表的配置版本号，当前实时库暂不支持，计划中会有 int m_nCfgVer_acs_device_info; - kbd_net::CMbCommunicator *m_pMbComm; //< 消息总线通讯器 - kbd_net::CMbMessage *m_pMbMsgRcv; //< 接收的消息总线消息 + iot_net::CMbCommunicator *m_pMbComm; //< 消息总线通讯器 + iot_net::CMbMessage *m_pMbMsgRcv; //< 接收的消息总线消息 //< 实时库访问接口 - kbd_dbms::CRdbAccess m_objRtdb_acs_device_info; - kbd_dbms::CRdbAccess m_objRtdb_acs_device_node_map; + iot_dbms::CRdbAccess m_objRtdb_acs_device_info; + iot_dbms::CRdbAccess m_objRtdb_acs_device_node_map; std::map m_mapAcsDevice; }; 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 3bf42cd4..6580d81b 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 @@ -40,7 +40,7 @@ CBioIdentifySrv::~CBioIdentifySrv() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } @@ -57,7 +57,7 @@ bool CBioIdentifySrv::start(int argc, char *argv[], int & /*nStatus*/) } //< 启动日志 - kbd_public::StartLogSystem(CN_AppName_COMAPP.c_str(), BIS_PROC_NAME); + iot_public::StartLogSystem(CN_AppName_COMAPP.c_str(), BIS_PROC_NAME); //< 判断是否已启动 if (isAlreadyRunning()) @@ -74,14 +74,14 @@ bool CBioIdentifySrv::start(int argc, char *argv[], int & /*nStatus*/) } //< 消息总线 - if (!kbd_net::initMsgBus(BIS_PROC_NAME, "", true)) + if (!iot_net::initMsgBus(BIS_PROC_NAME, "", true)) { LOGFATAL("初始化消息总线失败，程序启动失败！"); return false; } //< 初始化翻译 - if (kbd_public::initI18N("/app_bio_identify_srv/translate", "app_bio_identify_srv")) + if (iot_public::initI18N("/app_bio_identify_srv/translate", "app_bio_identify_srv")) { LOGDEBUG(I18N_C("I18N output test：\n This is src hardcode. \n int = [%d] , str = [%s]\n"), 123, "test"); } @@ -112,14 +112,14 @@ bool CBioIdentifySrv::start(int argc, char *argv[], int & /*nStatus*/) strStartArgs += argv[i]; } - kbd_sys::SProcessInfoKey objProcInfo; + iot_sys::SProcessInfoKey objProcInfo; objProcInfo.nAppId = CN_AppId_COMAPP; objProcInfo.nDomainId = m_nDomainID; objProcInfo.strNodeName = m_strNodeName; objProcInfo.strProcName = BIS_PROC_NAME; objProcInfo.strProcParam = strStartArgs; - m_ptrProcMng = kbd_sys::getProcMngInstance(objProcInfo); + m_ptrProcMng = iot_sys::getProcMngInstance(objProcInfo); if (!m_ptrProcMng) { LOGFATAL("getProcMngInstance return nullptr"); @@ -131,7 +131,7 @@ bool CBioIdentifySrv::start(int argc, char *argv[], int & /*nStatus*/) //< 冗余管理 { - m_ptrRedundantMng = kbd_sys::getRedundantMngInstance(m_nDomainID, CN_AppId_COMAPP, m_strNodeName); + m_ptrRedundantMng = iot_sys::getRedundantMngInstance(m_nDomainID, CN_AppId_COMAPP, m_strNodeName); if (!m_ptrRedundantMng) { LOGERROR("getRedundantMngInstance return nullptr"); @@ -221,11 +221,11 @@ bool CBioIdentifySrv::stop() } //< 停止消息总线 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } @@ -251,7 +251,7 @@ int CBioIdentifySrv::updateProcInfo(bool bActive, bool bMaster, bool bSlave) bool CBioIdentifySrv::isAlreadyRunning() { - return kbd_public::CSingleProcInstance::hasInstanceRunning(BIS_PROC_NAME); + return iot_public::CSingleProcInstance::hasInstanceRunning(BIS_PROC_NAME); } @@ -320,14 +320,14 @@ bool CBioIdentifySrv::parseCommandLine(int argc, char *argv[]) bool CBioIdentifySrv::loadSysInfo() { - kbd_public::CSysInfoInterfacePtr sysInfoPtr; - if (kbd_public::createSysInfoInstance(sysInfoPtr) == false) + iot_public::CSysInfoInterfacePtr sysInfoPtr; + if (iot_public::createSysInfoInstance(sysInfoPtr) == false) { LOGERROR("loadSysInfo(): createSysInfoInstance() return false !"); return false; } - kbd_public::SRunAppInfo objRunAppInfo; + iot_public::SRunAppInfo objRunAppInfo; int nRc = sysInfoPtr->getLocalRunAppInfoById(CN_AppId_COMAPP, objRunAppInfo); if (kbdSuccess != nRc) { 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 b4d7ad2d..fd7b7f83 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 @@ -17,7 +17,7 @@ namespace kbd_application { -class CBioIdentifySrv : public kbd_public::CBaseService, kbd_sys::CProcessQuitInterface +class CBioIdentifySrv : public iot_public::CBaseService, iot_sys::CProcessQuitInterface { public: CBioIdentifySrv(); @@ -59,8 +59,8 @@ private: std::string m_strNodeName; //< 本机节点名 CCBisRedunSwPtr m_ptrRedunSw; - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_sys::CProcMngInterfacePtr m_ptrProcMng; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; }; } //< namespace kbd_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 a9320991..44e819d6 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 @@ -16,7 +16,7 @@ namespace kbd_application { -class CBisRedunSw : public ::kbd_sys::CRedundantSwitchInterface +class CBisRedunSw : public ::iot_sys::CRedundantSwitchInterface { public: CBisRedunSw(); diff --git a/platform/src/application/app_bio_identify/test/test_bis_client/main.cpp b/platform/src/application/app_bio_identify/test/test_bis_client/main.cpp index f4ed0835..155b29de 100644 --- a/platform/src/application/app_bio_identify/test/test_bis_client/main.cpp +++ b/platform/src/application/app_bio_identify/test/test_bis_client/main.cpp @@ -30,7 +30,7 @@ static void signalCallback(int /*sig*/) void test() { - kbd_service::CPermMngApiPtr ptrPermMng = kbd_service::getPermMngInstance("PUBLIC"); + iot_service::CPermMngApiPtr ptrPermMng = iot_service::getPermMngInstance("PUBLIC"); ptrPermMng->PermDllInit(); ptrPermMng->startBioIdentify(); @@ -119,12 +119,12 @@ int main(int /*argc*/, char ** /*argv[]*/) #endif //< 启动日志 - kbd_public::StartLogSystem("default", "test_bis_client"); + iot_public::StartLogSystem("default", "test_bis_client"); LOGINFO("Log system OK !"); //< 初始化消息总线库 - if (!(kbd_net::initMsgBus("net_msg_bus_test_client", "1"))) + if (!(iot_net::initMsgBus("net_msg_bus_test_client", "1"))) { std::cout << "Initialize message bus failed, exit !" << std::endl; return 1; @@ -139,10 +139,10 @@ int main(int /*argc*/, char ** /*argv[]*/) boost::this_thread::sleep_for(boost::chrono::seconds(2)); //< 释放消息总线库 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } diff --git a/platform/src/application/app_bio_identify/test/test_hk_acs/main.cpp b/platform/src/application/app_bio_identify/test/test_hk_acs/main.cpp index bc9d9c26..0fd71d60 100644 --- a/platform/src/application/app_bio_identify/test/test_hk_acs/main.cpp +++ b/platform/src/application/app_bio_identify/test/test_hk_acs/main.cpp @@ -6,7 +6,7 @@ int main(int argc, char *argv[]) { - kbd_public::StartLogSystem("", ""); + iot_public::StartLogSystem("", ""); LOGINFO("test_hk_acs start !"); @@ -17,7 +17,7 @@ int main(int argc, char *argv[]) a.exec(); } - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } 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 50a028d4..3949e3e2 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdConfigParse.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/FbdConfigParse.cpp @@ -25,7 +25,7 @@ int CFbdConfigParse::initialize() //< 加载平台配置文件 { - strCfgFilePath = std::move( kbd_public::CFileUtil::getPathOfCfgFile( "fbd_server.xml", CN_DIR_PLATFORM )); + strCfgFilePath = std::move( iot_public::CFileUtil::getPathOfCfgFile( "fbd_server.xml", CN_DIR_PLATFORM )); if ( strCfgFilePath.empty()) { LOGERROR( "获取平台fbd_server.xml配置文件路径失败" ); @@ -38,7 +38,7 @@ int CFbdConfigParse::initialize() //< 加载产品配置文件 { - strCfgFilePath = std::move( kbd_public::CFileUtil::getPathOfCfgFile( "fbd_server.xml", CN_DIR_PRODUCT )); + strCfgFilePath = std::move( iot_public::CFileUtil::getPathOfCfgFile( "fbd_server.xml", CN_DIR_PRODUCT )); //< 允许不存在产品 if ( !strCfgFilePath.empty()) { 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 eb6e3dd5..3215fad6 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdGroupMng.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/FbdGroupMng.cpp @@ -194,19 +194,19 @@ int CFbdGroupMng::modifyFbdGroup( const std::vector &vecGrpInfo ) const std::string strErr = "从数据库加载、解析FBD图失败"; LOGERROR( "产生告警：\n%s", strErr.c_str()); - kbd_idlfile::SAppAddAlm objAddAlm; - kbd_idlfile::SAlmInfoFromApp *pAlmInfo = objAddAlm.add_alm_info(); + iot_idl::SAppAddAlm objAddAlm; + iot_idl::SAlmInfoFromApp *pAlmInfo = objAddAlm.add_alm_info(); // 报警参数-必填项目 - pAlmInfo->set_alm_type( kbd_service::ALM_TYPE_SYSTEM ); - pAlmInfo->set_time_stamp( kbd_public::getUTCTimeMsec()); - pAlmInfo->set_status( kbd_service::ALM_STAT_SYS_PROC_ERROR ); + pAlmInfo->set_alm_type( iot_service::ALM_TYPE_SYSTEM ); + pAlmInfo->set_time_stamp( iot_public::getUTCTimeMsec()); + pAlmInfo->set_status( iot_service::ALM_STAT_SYS_PROC_ERROR ); pAlmInfo->set_location_id( ptrAlmSysInfoApi->getCurrentRunAppInfo().nLocationId ); - pAlmInfo->set_alm_style( kbd_idlfile::AS_ALARM ); + pAlmInfo->set_alm_style( iot_idl::AS_ALARM ); // 关键字定义 - kbd_idlfile::SAlmKeyword *pAlmKeyword = pAlmInfo->add_alm_keyword(); - pAlmKeyword->set_id( kbd_service::ALM_KEY_ALM_DESC ); + iot_idl::SAlmKeyword *pAlmKeyword = pAlmInfo->add_alm_keyword(); + pAlmKeyword->set_id( iot_service::ALM_KEY_ALM_DESC ); pAlmKeyword->set_value( strErr ); ptrAlmSrcApi->addAlarm( objAddAlm ); @@ -257,19 +257,19 @@ int CFbdGroupMng::modifyFbdGroup( const std::vector &vecGrpInfo ) % stGrpInfo.m_szName ); LOGERROR( "产生告警：\n%s", strErr.c_str()); - kbd_idlfile::SAppAddAlm objAddAlm; - kbd_idlfile::SAlmInfoFromApp *pAlmInfo = objAddAlm.add_alm_info(); + iot_idl::SAppAddAlm objAddAlm; + iot_idl::SAlmInfoFromApp *pAlmInfo = objAddAlm.add_alm_info(); // 报警参数-必填项目 - pAlmInfo->set_alm_type( kbd_service::ALM_TYPE_SYSTEM ); - pAlmInfo->set_time_stamp( kbd_public::getUTCTimeMsec()); - pAlmInfo->set_status( kbd_service::ALM_STAT_SYS_PROC_ERROR ); + pAlmInfo->set_alm_type( iot_service::ALM_TYPE_SYSTEM ); + pAlmInfo->set_time_stamp( iot_public::getUTCTimeMsec()); + pAlmInfo->set_status( iot_service::ALM_STAT_SYS_PROC_ERROR ); pAlmInfo->set_location_id( ptrAlmSysInfoApi->getCurrentRunAppInfo().nLocationId ); - pAlmInfo->set_alm_style( kbd_idlfile::AS_ALARM ); + pAlmInfo->set_alm_style( iot_idl::AS_ALARM ); // 关键字定义 - kbd_idlfile::SAlmKeyword *pAlmKeyword = pAlmInfo->add_alm_keyword(); - pAlmKeyword->set_id( kbd_service::ALM_KEY_ALM_DESC ); + iot_idl::SAlmKeyword *pAlmKeyword = pAlmInfo->add_alm_keyword(); + pAlmKeyword->set_id( iot_service::ALM_KEY_ALM_DESC ); pAlmKeyword->set_value( strErr ); ptrAlmSrcApi->addAlarm( objAddAlm ); @@ -290,19 +290,19 @@ int CFbdGroupMng::modifyFbdGroup( const std::vector &vecGrpInfo ) % stGrpInfo.m_szName ); LOGERROR( "产生告警：\n%s", strErr.c_str()); - kbd_idlfile::SAppAddAlm objAddAlm; - kbd_idlfile::SAlmInfoFromApp *pAlmInfo = objAddAlm.add_alm_info(); + iot_idl::SAppAddAlm objAddAlm; + iot_idl::SAlmInfoFromApp *pAlmInfo = objAddAlm.add_alm_info(); // 报警参数-必填项目 - pAlmInfo->set_alm_type( kbd_service::ALM_TYPE_SYSTEM ); - pAlmInfo->set_time_stamp( kbd_public::getUTCTimeMsec()); - pAlmInfo->set_status( kbd_service::ALM_STAT_SYS_PROC_ERROR ); + pAlmInfo->set_alm_type( iot_service::ALM_TYPE_SYSTEM ); + pAlmInfo->set_time_stamp( iot_public::getUTCTimeMsec()); + pAlmInfo->set_status( iot_service::ALM_STAT_SYS_PROC_ERROR ); pAlmInfo->set_location_id( ptrAlmSysInfoApi->getCurrentRunAppInfo().nLocationId ); - pAlmInfo->set_alm_style( kbd_idlfile::AS_ALARM ); + pAlmInfo->set_alm_style( iot_idl::AS_ALARM ); // 关键字定义 - kbd_idlfile::SAlmKeyword *pAlmKeyword = pAlmInfo->add_alm_keyword(); - pAlmKeyword->set_id( kbd_service::ALM_KEY_ALM_DESC ); + iot_idl::SAlmKeyword *pAlmKeyword = pAlmInfo->add_alm_keyword(); + pAlmKeyword->set_id( iot_service::ALM_KEY_ALM_DESC ); pAlmKeyword->set_value( strErr ); ptrAlmSrcApi->addAlarm( objAddAlm ); @@ -346,19 +346,19 @@ int CFbdGroupMng::deleteFbdGroup( const FbdGrpToInfoMAP &mapGrpInfo ) % stGrpInfo.m_szName ); LOGERROR( "产生告警：\n%s", strErr.c_str()); - kbd_idlfile::SAppAddAlm objAddAlm; - kbd_idlfile::SAlmInfoFromApp *pAlmInfo = objAddAlm.add_alm_info(); + iot_idl::SAppAddAlm objAddAlm; + iot_idl::SAlmInfoFromApp *pAlmInfo = objAddAlm.add_alm_info(); // 报警参数-必填项目 - pAlmInfo->set_alm_type( kbd_service::ALM_TYPE_SYSTEM ); - pAlmInfo->set_time_stamp( kbd_public::getUTCTimeMsec()); - pAlmInfo->set_status( kbd_service::ALM_STAT_SYS_PROC_ERROR ); + pAlmInfo->set_alm_type( iot_service::ALM_TYPE_SYSTEM ); + pAlmInfo->set_time_stamp( iot_public::getUTCTimeMsec()); + pAlmInfo->set_status( iot_service::ALM_STAT_SYS_PROC_ERROR ); pAlmInfo->set_location_id( ptrAlmSysInfoApi->getCurrentRunAppInfo().nLocationId ); - pAlmInfo->set_alm_style( kbd_idlfile::AS_ALARM ); + pAlmInfo->set_alm_style( iot_idl::AS_ALARM ); // 关键字定义 - kbd_idlfile::SAlmKeyword *pAlmKeyword = pAlmInfo->add_alm_keyword(); - pAlmKeyword->set_id( kbd_service::ALM_KEY_ALM_DESC ); + iot_idl::SAlmKeyword *pAlmKeyword = pAlmInfo->add_alm_keyword(); + pAlmKeyword->set_id( iot_service::ALM_KEY_ALM_DESC ); pAlmKeyword->set_value( strErr ); ptrAlmSrcApi->addAlarm( objAddAlm ); 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 ee3a53f0..563a2afc 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdGrpWorkThread.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/FbdGrpWorkThread.cpp @@ -77,16 +77,16 @@ void CFbdGrpWorkThread::execute() if ( m_bRunFbd ) { //< 运行间隔包含运行耗时，如果运行得慢，允许连续运行 - m_nLastRunFbdTime = kbd_public::getMonotonicMsec(); + m_nLastRunFbdTime = iot_public::getMonotonicMsec(); for ( const auto &it : m_mapFuncPtr ) { it.second->calculate(); } - m_nLastRunFbdUtc = kbd_public::getUTCTimeMsec(); + m_nLastRunFbdUtc = iot_public::getUTCTimeMsec(); } //< 接收并响应调试消息 - kbd_net::CMbMessage objMbMsgRcv; + iot_net::CMbMessage objMbMsgRcv; while ( m_pMbComm->recvMsg( objMbMsgRcv, 0 )) { if ( m_stGrpInfo.m_nId != objMbMsgRcv.getPara1()) @@ -102,13 +102,13 @@ void CFbdGrpWorkThread::execute() continue; } - if ( kbd_idlfile::MT_FBD_E2S_DBG_REQ != objMbMsgRcv.getMsgType()) + if ( iot_idl::MT_FBD_E2S_DBG_REQ != objMbMsgRcv.getMsgType()) { LOGERROR( "收到非预期消息类型，忽略，MsgType=[%d]", objMbMsgRcv.getMsgType()); continue; } - kbd_idlfile::SFBDDebugRequest objReq; + iot_idl::SFBDDebugRequest objReq; if ( !objReq.ParseFromArray( objMbMsgRcv.getDataPtr(), ( int ) ( objMbMsgRcv.getDataSize()))) { LOGERROR( "反序列化 SFBDDebugRequest 失败，忽略" ); @@ -121,7 +121,7 @@ void CFbdGrpWorkThread::execute() continue; } - kbd_idlfile::SFBDDebugResponse objRep; + iot_idl::SFBDDebugResponse objRep; if ( kbdSuccess != m_ptrFbdUtil->getDebugResponse( objReq, objRep )) { LOGERROR( "调用 getDebugResponse 失败" ); @@ -129,9 +129,9 @@ void CFbdGrpWorkThread::execute() } objRep.set_nlastupdatetime( m_nLastRunFbdUtc ); - kbd_net::CMbMessage objMsgSend; + iot_net::CMbMessage objMsgSend; objMsgSend.setData( objRep ); - objMsgSend.setMsgType( kbd_idlfile::MT_FBD_S2E_DBG_REP ); + objMsgSend.setMsgType( iot_idl::MT_FBD_S2E_DBG_REP ); objMsgSend.setSubject( getFbdSysInfoApi()->getCurrentRunAppInfo().nAppId, CH_FBDSERVER_TO_FBDEDITOR ); objMsgSend.setPara1( m_stGrpInfo.m_nId ); @@ -141,7 +141,7 @@ void CFbdGrpWorkThread::execute() //< 运行周期控制 { - const boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); CTimerThreadBase::m_nRunPeriodMsec = m_stGrpInfo.m_nRefreshTime - ( int ) ( nTimeNow - m_nLastRunFbdTime ); if ( CTimerThreadBase::m_nRunPeriodMsec > cn_nMaxRunPeriodMsec ) @@ -181,7 +181,7 @@ int CFbdGrpWorkThread::redundantSwitch( bool bMaster, bool bSlave ) if ( nullptr == m_pMbComm ) { - m_pMbComm = new kbd_net::CMbCommunicator; + m_pMbComm = new iot_net::CMbCommunicator; m_pMbComm->addSub( 0, CH_FBDEDITOR_TO_FBDSERVER ); } 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 9702d65e..70bc4176 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdGrpWorkThread.h +++ b/platform/src/application/app_fbd/app_fbd_server/FbdGrpWorkThread.h @@ -18,7 +18,7 @@ namespace app_fbd { /* @brief FBD组处理线程类 */ -class CFbdGrpWorkThread final : private kbd_public::CTimerThreadBase +class CFbdGrpWorkThread final : private iot_public::CTimerThreadBase { public: /** @@ -104,7 +104,7 @@ private: boost::int64_t m_nLastRunFbdTime{0}; //< 上一次运行图的时间，开机后ms数 boost::int64_t m_nLastRunFbdUtc{0}; //< 上一次运行图的时间，UTC毫秒数，用于给编辑端调试输出 - kbd_net::CMbCommunicator *m_pMbComm{nullptr}; //< 通讯器，当前用于调试数据交互 + iot_net::CMbCommunicator *m_pMbComm{nullptr}; //< 通讯器，当前用于调试数据交互 CFbdUtilPtr m_ptrFbdUtil; //< FBD公共操作类 const SFbdGroupInfo m_stGrpInfo; //< 本线程管理的FBD组信息 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 28f53920..c57a571b 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdServerApp.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/FbdServerApp.cpp @@ -31,7 +31,7 @@ CFbdServerApp::CFbdServerApp() = default; CFbdServerApp::~CFbdServerApp() { CFbdServerApp::stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } @@ -47,7 +47,7 @@ bool CFbdServerApp::start( int argc, char *argv[], int &/*nStatus*/) } //2.注册日志 - kbd_public::StartLogSystem( strAppName.c_str(), CN_ProcName_FbdServer ); + iot_public::StartLogSystem( strAppName.c_str(), CN_ProcName_FbdServer ); //3.避免进程重复启动 if ( isAlreadyRunning( strStartArgs )) @@ -69,8 +69,8 @@ bool CFbdServerApp::start( int argc, char *argv[], int &/*nStatus*/) } //6.创建冗余管理 - const kbd_public::SRunAppInfo &stRunAppInfo = m_ptrSysInfo->getCurrentRunAppInfo(); - m_ptrRedundancyMng = kbd_sys::getRedundantMngInstance( stRunAppInfo.nDomainId, + const iot_public::SRunAppInfo &stRunAppInfo = m_ptrSysInfo->getCurrentRunAppInfo(); + m_ptrRedundancyMng = iot_sys::getRedundantMngInstance( stRunAppInfo.nDomainId, stRunAppInfo.nAppId, stRunAppInfo.strLocalNodeName ); if ( m_ptrRedundancyMng == nullptr ) @@ -136,7 +136,7 @@ bool CFbdServerApp::stop() //2.销毁日志系统 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } @@ -228,7 +228,7 @@ bool CFbdServerApp::isAlreadyRunning( const std::string &strStartArgs ) { std::string strUniqueName = CN_ProcName_FbdServer; strUniqueName += strStartArgs; - return kbd_public::CSingleProcInstance::hasInstanceRunning( strUniqueName ); + return iot_public::CSingleProcInstance::hasInstanceRunning( strUniqueName ); } @@ -241,7 +241,7 @@ bool CFbdServerApp::getSystemInfo( const std::string &strAppName ) return false; } - kbd_public::SRunAppInfo stRunAppInfo; + iot_public::SRunAppInfo stRunAppInfo; if ( kbdSuccess != m_ptrSysInfo->getSysInfo().getLocalRunAppInfoByName( strAppName, stRunAppInfo )) { LOGERROR( "获取系统信息失败" ); @@ -256,9 +256,9 @@ bool CFbdServerApp::getSystemInfo( const std::string &strAppName ) bool CFbdServerApp::registToProcMng( const std::string &strStartArgs ) { - const kbd_public::SRunAppInfo &stRunAppInfo = m_ptrSysInfo->getCurrentRunAppInfo(); + const iot_public::SRunAppInfo &stRunAppInfo = m_ptrSysInfo->getCurrentRunAppInfo(); - kbd_sys::SProcessInfoKey stProcKey; + iot_sys::SProcessInfoKey stProcKey; stProcKey.nDomainId = stRunAppInfo.nDomainId; stProcKey.nAppId = stRunAppInfo.nAppId; stProcKey.strNodeName = stRunAppInfo.strLocalNodeName; @@ -285,7 +285,7 @@ bool CFbdServerApp::registToProcMng( const std::string &strStartArgs ) bool CFbdServerApp::initialize() { //< 初始化翻译 - if ( kbd_public::initI18N( "/app_fbd/translate", "app_fbd" )) + if ( iot_public::initI18N( "/app_fbd/translate", "app_fbd" )) { LOGDEBUG( I18N_C( "I18N test：\n This is src hardcode. \n int = [%d] , str = [%s]\n" ), 123, "test" ); } @@ -295,7 +295,7 @@ bool CFbdServerApp::initialize() } //< 初始化消息总线 - if ( !kbd_net::initMsgBus( CN_ProcName_FbdServer, "" )) + if ( !iot_net::initMsgBus( CN_ProcName_FbdServer, "" )) { LOGERROR( "初始化消息总线失败" ); return kbdFailed; @@ -331,7 +331,7 @@ bool CFbdServerApp::clean() { m_ptrFbdSvrMng.reset(); m_ptrAlmSrcApi.reset(); - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); return true; } 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 61b28d11..33f7cb40 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdServerApp.h +++ b/platform/src/application/app_fbd/app_fbd_server/FbdServerApp.h @@ -18,7 +18,7 @@ namespace kbd_app namespace app_fbd { -class CFbdServerApp final : public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface +class CFbdServerApp final : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CFbdServerApp(); @@ -82,8 +82,8 @@ private: private: CFbdSysInfoApiPtr m_ptrSysInfo{nullptr}; //< 系统信息 CFbdAlarmSrcApiPtr m_ptrAlmSrcApi{nullptr}; //< 告警源（发送告警）接口，放这里控制生命周期，防止析构 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng{nullptr}; //< 进程管理访问库智能指针 - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundancyMng{nullptr}; //< 冗余管理类 + iot_sys::CProcMngInterfacePtr m_ptrProcMng{nullptr}; //< 进程管理访问库智能指针 + iot_sys::CRedundantMngInterfacePtr m_ptrRedundancyMng{nullptr}; //< 冗余管理类 CFbdServerMngPtr m_ptrFbdSvrMng{nullptr}; //< FBD服务管理类 }; 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 d06ccd8c..219740ef 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdServerMng.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/FbdServerMng.cpp @@ -13,7 +13,7 @@ namespace kbd_app namespace app_fbd { -CFbdServerMng::CFbdServerMng( kbd_sys::CProcMngInterfacePtr ptrProcMng ) +CFbdServerMng::CFbdServerMng( iot_sys::CProcMngInterfacePtr ptrProcMng ) : m_ptrProcMng( std::move( ptrProcMng )) { } 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 8e57ddfe..1bb79934 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdServerMng.h +++ b/platform/src/application/app_fbd/app_fbd_server/FbdServerMng.h @@ -19,10 +19,10 @@ namespace kbd_app namespace app_fbd { -class CFbdServerMng final : public kbd_sys::CRedundantSwitchInterface +class CFbdServerMng final : public iot_sys::CRedundantSwitchInterface { public: - explicit CFbdServerMng( kbd_sys::CProcMngInterfacePtr ptrProcMng ); + explicit CFbdServerMng( iot_sys::CProcMngInterfacePtr ptrProcMng ); ~CFbdServerMng(); /** @@ -42,7 +42,7 @@ public: private: //< 进程管理访问库智能指针，构造时传入 - const kbd_sys::CProcMngInterfacePtr m_ptrProcMng; + const iot_sys::CProcMngInterfacePtr m_ptrProcMng; CFbdGroupMngPtr m_ptrFbdGrpMng; //< FBD组管理 COnlieModifyThreadPtr m_ptrOnlieModifyThread; //< 在线组态更新线程 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 3207d907..7a9dfa78 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdUtil.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/FbdUtil.cpp @@ -65,7 +65,7 @@ std::string CFbdUtil::getFbdPluginsPath( const std::string &strDllName ) #else strFileName = "lib" + strDllName + boost::dll::shared_library::suffix().string(); #endif - return kbd_public::CFileUtil::getPathOfBinFile( "fbd/svr_plugins/" + strFileName ); + return iot_public::CFileUtil::getPathOfBinFile( "fbd/svr_plugins/" + strFileName ); } @@ -367,7 +367,7 @@ int CFbdUtil::getGroupDataFromDB( const std::vector &vecGrpInfo, GrpIdToDataInfoMAP &mapGrpData ) { //< 析构时会自动关闭连接 - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_READ ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_READ ); if ( !objDbConn.open()) { LOGERROR( "打开数据库失败" ); 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 062c7503..d4a40c40 100644 --- a/platform/src/application/app_fbd/app_fbd_server/FbdUtil.h +++ b/platform/src/application/app_fbd/app_fbd_server/FbdUtil.h @@ -90,8 +90,8 @@ public: } - inline int getDebugResponse( const kbd_idlfile::SFBDDebugRequest &objReq, - kbd_idlfile::SFBDDebugResponse &objRep ) + inline int getDebugResponse( const iot_idl::SFBDDebugRequest &objReq, + iot_idl::SFBDDebugResponse &objRep ) { return m_ptrDiagData->getDebugResponse( objReq, objRep ); } 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 49bb388f..fedd6fff 100644 --- a/platform/src/application/app_fbd/app_fbd_server/OnlineModifyThread.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/OnlineModifyThread.cpp @@ -14,7 +14,7 @@ namespace app_fbd { COnlieModifyThread::COnlieModifyThread( CFbdGroupMngPtr ptrGrpMng ) - : kbd_public::CTimerThreadBase( "OnlineModifyThread", 2000 ), + : iot_public::CTimerThreadBase( "OnlineModifyThread", 2000 ), m_ptrFbdGrpMng( std::move( ptrGrpMng )) { } 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 987c4538..925e2dd3 100644 --- a/platform/src/application/app_fbd/app_fbd_server/OnlineModifyThread.h +++ b/platform/src/application/app_fbd/app_fbd_server/OnlineModifyThread.h @@ -14,7 +14,7 @@ namespace app_fbd { /* @brief 在线组态线程类 */ -class COnlieModifyThread final : private kbd_public::CTimerThreadBase +class COnlieModifyThread final : private iot_public::CTimerThreadBase { public: explicit COnlieModifyThread( CFbdGroupMngPtr ptrGrpMng ); 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 73956ab4..d3916feb 100644 --- a/platform/src/application/app_fbd/app_fbd_server/PointSubThread.cpp +++ b/platform/src/application/app_fbd/app_fbd_server/PointSubThread.cpp @@ -92,7 +92,7 @@ void CPointSubThread::execute() } else { - m_pMbComm = new kbd_net::CMbCommunicator(); + m_pMbComm = new iot_net::CMbCommunicator(); //< 必须订阅所有专业的变化数据，因为可能订阅其他专业的测点 if ( m_pMbComm->addSub( 0, CH_SCADA_TO_HMI_DATA_CHANGE ) && @@ -150,7 +150,7 @@ void CPointSubThread::execute() recvPntMsg( 500 ); //< 接收处理消息 - const int64 lCurTime = kbd_public::getMonotonicMsec(); + const int64 lCurTime = iot_public::getMonotonicMsec(); if ( lCurTime - m_lLastCheckTime > 1000 ) //< 1秒钟检查一次是否有测点已经失去联系 { m_ptrPointSub->resetOverTimePntValAndSta(); @@ -164,14 +164,14 @@ void CPointSubThread::recvPntMsg( const int nTimeoutMsec ) { if ( m_pMbComm->recvMsg( m_objMsgRcv, nTimeoutMsec )) { - if ( m_objMsgRcv.getMsgType() != kbd_idlfile::MT_DP_CHANGE_DATA || + if ( m_objMsgRcv.getMsgType() != iot_idl::MT_DP_CHANGE_DATA || ( m_objMsgRcv.getChannelID() != CH_SCADA_TO_HMI_DATA_CHANGE && m_objMsgRcv.getChannelID() != CH_SCADA_TO_HMI_DATA_UPDATE )) { return; } - kbd_idlfile::SRealTimeDataPkg objData; + iot_idl::SRealTimeDataPkg objData; if ( !objData.ParseFromArray( m_objMsgRcv.getDataPtr(), static_cast(m_objMsgRcv.getDataSize()))) { LOGERROR( "解析SRealTimeDataPkg消息失败" ); @@ -184,7 +184,7 @@ void CPointSubThread::recvPntMsg( const int nTimeoutMsec ) for ( int i = 0; i < objData.stairtd_size(); i++ ) { - const kbd_idlfile::SAiRealTimeData &stAi = objData.stairtd( i ); + const iot_idl::SAiRealTimeData &stAi = objData.stairtd( i ); vecPntKey.push_back( stAi.strtablename() + "." + stAi.strtagname() + "." + stAi.strcolumnname()); vecValue.push_back( stAi.fvalue()); vecStatus.push_back( stAi.ustatus()); @@ -192,7 +192,7 @@ void CPointSubThread::recvPntMsg( const int nTimeoutMsec ) for ( int i = 0; i < objData.stdirtd_size(); i++ ) { - const kbd_idlfile::SDiRealTimeData &stDi = objData.stdirtd( i ); + const iot_idl::SDiRealTimeData &stDi = objData.stdirtd( i ); vecPntKey.push_back( stDi.strtablename() + "." + stDi.strtagname() + "." + stDi.strcolumnname()); vecValue.push_back( stDi.nvalue()); vecStatus.push_back( stDi.ustatus()); @@ -200,7 +200,7 @@ void CPointSubThread::recvPntMsg( const int nTimeoutMsec ) for ( int i = 0; i < objData.stmirtd_size(); i++ ) { - const kbd_idlfile::SMiRealTimeData &stMi = objData.stmirtd( i ); + const iot_idl::SMiRealTimeData &stMi = objData.stmirtd( i ); vecPntKey.push_back( stMi.strtablename() + "." + stMi.strtagname() + "." + stMi.strcolumnname()); vecValue.push_back( stMi.nvalue()); vecStatus.push_back( stMi.ustatus()); @@ -208,7 +208,7 @@ void CPointSubThread::recvPntMsg( const int nTimeoutMsec ) for ( int i = 0; i < objData.stpirtd_size(); i++ ) { - const kbd_idlfile::SPiRealTimeData &stPi = objData.stpirtd( i ); + const iot_idl::SPiRealTimeData &stPi = objData.stpirtd( i ); vecPntKey.push_back( stPi.strtablename() + "." + stPi.strtagname() + "." + stPi.strcolumnname()); vecValue.push_back( stPi.dvalue()); vecStatus.push_back( stPi.ustatus()); 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 e8104fa3..21c146ff 100644 --- a/platform/src/application/app_fbd/app_fbd_server/PointSubThread.h +++ b/platform/src/application/app_fbd/app_fbd_server/PointSubThread.h @@ -19,7 +19,7 @@ namespace kbd_app namespace app_fbd { -class CPointSubThread final : private kbd_public::CTimerThreadBase +class CPointSubThread final : private iot_public::CTimerThreadBase { public: CPointSubThread(); @@ -56,8 +56,8 @@ private: int m_nLoopBeforClear{0}; //< m_ptrPointSub无人使用时，延迟清理的周期计数 int64 m_lLastCheckTime{0}; //< 上次检测时间，用于检测测点是否已经失效 - kbd_net::CMbCommunicator *m_pMbComm{nullptr}; //< 消息总线通讯器 - kbd_net::CMbMessage m_objMsgRcv; //< 接收的消息总线消息 + iot_net::CMbCommunicator *m_pMbComm{nullptr}; //< 消息总线通讯器 + iot_net::CMbMessage m_objMsgRcv; //< 接收的消息总线消息 CFbdPointSubApiPtr m_ptrPointSub; //< 测点订阅管理接口 }; 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 4767a489..3d0b11d7 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 @@ -87,7 +87,7 @@ void CAlarmCltThread::execute() //< 不用判断null，肯定不会失败 m_ptrFbdAlmCltAip = getFbdAlarmCltApi(); - m_pMbComm = new kbd_net::CMbCommunicator(); + m_pMbComm = new iot_net::CMbCommunicator(); //< 使用接收消息控制运行间隔 m_nRunPeriodMsec = 0; 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 1bf147ad..d11ccc29 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 @@ -22,7 +22,7 @@ namespace kbd_app namespace app_fbd { -class CAlarmCltThread final : private kbd_public::CTimerThreadBase +class CAlarmCltThread final : private iot_public::CTimerThreadBase { friend class CAlarmMsgHandler; friend class CItlAlmMsgHandler; @@ -52,8 +52,8 @@ private: private: int m_nLoopBeforClear{0}; //< m_ptrFbdAlmCltAip无人使用时，延迟清理的周期计数 - kbd_net::CMbCommunicator *m_pMbComm{nullptr}; //< 消息总线通讯器 - kbd_net::CMbMessage m_objMsgRcv; //< 接收的消息总线消息 + iot_net::CMbCommunicator *m_pMbComm{nullptr}; //< 消息总线通讯器 + iot_net::CMbMessage m_objMsgRcv; //< 接收的消息总线消息 CAlarmMsgHandler m_objAlarmHandler; //< 原始告警消息处理类 CItlAlmMsgHandler m_objItlAlmHandler; //< 智能告警消息处理类 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 4f7574fb..67b2fcc4 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 @@ -38,7 +38,7 @@ CAlarmMsgHandler::~CAlarmMsgHandler() = default; void CAlarmMsgHandler::refreshState() { - m_nTimeNow = kbd_public::getMonotonicMsec(); + m_nTimeNow = iot_public::getMonotonicMsec(); checkInit(); cleanSrvStatMap(); @@ -47,7 +47,7 @@ void CAlarmMsgHandler::refreshState() void CAlarmMsgHandler::handleMessage() { - const kbd_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; + const iot_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; if ( !objMsgRcv.isValid()) return; @@ -64,43 +64,43 @@ void CAlarmMsgHandler::handleMessage() //< 按类型处理 switch ( objMsgRcv.getMsgType()) { - case kbd_idlfile::MT_ALM_AS2AC_SEQNO: + case iot_idl::MT_ALM_AS2AC_SEQNO: { //LOGDEBUG("Received MT_ALM_AS2AC_SEQNO"); handle_MT_ALM_AS2AC_SEQNO(); } break; - case kbd_idlfile::MT_ALM_AS2AC_ALL: + case iot_idl::MT_ALM_AS2AC_ALL: { //LOGDEBUG("Received MT_ALM_AS2AC_ALL"); handle_MT_ALM_AS2AC_ALL(); } break; - case kbd_idlfile::MT_ALM_AS2AC_ADD: + case iot_idl::MT_ALM_AS2AC_ADD: { //LOGDEBUG("Received MT_ALM_AS2AC_ADD"); handle_MT_ALM_AS2AC_ADD(); } break; - case kbd_idlfile::MT_ALM_AS2AC_CFM: + case iot_idl::MT_ALM_AS2AC_CFM: { //LOGDEBUG("Received MT_ALM_AS2AC_CFM"); handle_MT_ALM_AS2AC_CFM(); } break; - case kbd_idlfile::MT_ALM_AS2AC_DEL: + case iot_idl::MT_ALM_AS2AC_DEL: { //LOGDEBUG("Received MT_ALM_AS2AC_DEL"); handle_MT_ALM_AS2AC_DEL(); } break; - case kbd_idlfile::MT_ALM_AS2AC_RELEASE: + case iot_idl::MT_ALM_AS2AC_RELEASE: { //LOGDEBUG("Received MT_ALM_AS2AC_RELEASE"); handle_MT_ALM_AS2AC_RELEASE(); } break; - case kbd_idlfile::MT_ALM_AS2AC_WAVE: + case iot_idl::MT_ALM_AS2AC_WAVE: { //LOGDEBUG("Received MT_ALM_AS2AC_WAVE"); handle_MT_ALM_AS2AC_WAVE(); @@ -138,8 +138,8 @@ void CAlarmMsgHandler::checkInit() LOGINFO( "checkInit(): 添加订阅成功！" ); //< 向告警服务请求当前序号 - kbd_net::CMbMessage objMbMsg; - objMbMsg.setMsgType( kbd_idlfile::MT_ALM_AC2AS_SEQNO_REQ ); + iot_net::CMbMessage objMbMsg; + objMbMsg.setMsgType( iot_idl::MT_ALM_AC2AS_SEQNO_REQ ); objMbMsg.setSubject( CN_AppId_PUBLIC, CH_CLT_TO_ALM ); objMbMsg.setData( cn_strSignature ); @@ -174,8 +174,8 @@ void CAlarmMsgHandler::cleanSrvStatMap() void CAlarmMsgHandler::replyAllReq() { - kbd_net::CMbMessage objMsgSend; - objMsgSend.setMsgType( kbd_idlfile::MT_ALM_AC2AS_ALL_REQ ); + iot_net::CMbMessage objMsgSend; + objMsgSend.setMsgType( iot_idl::MT_ALM_AC2AS_ALL_REQ ); objMsgSend.setSubject( CN_AppId_PUBLIC, CH_CLT_TO_ALM ); objMsgSend.setData( cn_strSignature ); @@ -191,8 +191,8 @@ void CAlarmMsgHandler::replyRtReq( SAlmSrvStatus &objSrvStatus ) LOGINFO( "请求重传。" ); - kbd_net::CMbMessage objMsgSend; - objMsgSend.setMsgType( kbd_idlfile::MT_ALM_AC2AS_RT_REQ ); + iot_net::CMbMessage objMsgSend; + objMsgSend.setMsgType( iot_idl::MT_ALM_AC2AS_RT_REQ ); objMsgSend.setSubject( CN_AppId_PUBLIC, CH_CLT_TO_ALM ); objMsgSend.setData( cn_strSignature ); @@ -208,7 +208,7 @@ void CAlarmMsgHandler::replyRtReq( SAlmSrvStatus &objSrvStatus ) void CAlarmMsgHandler::handle_MT_ALM_AS2AC_SEQNO() { - const kbd_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; + const iot_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; //< 消息验证 std::string strData(( const char * ) objMsgRcv.getDataPtr(), objMsgRcv.getDataSize()); @@ -250,10 +250,10 @@ void CAlarmMsgHandler::handle_MT_ALM_AS2AC_SEQNO() void CAlarmMsgHandler::handle_MT_ALM_AS2AC_ALL() { - const kbd_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; + const iot_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; //< 反序列化 - kbd_idlfile::SAlmCltAddAlm objAllAlm; + iot_idl::SAlmCltAddAlm objAllAlm; bool bRc = objAllAlm.ParseFromArray( objMsgRcv.getDataPtr(), ( int ) objMsgRcv.getDataSize()); if ( !bRc ) { @@ -274,10 +274,10 @@ void CAlarmMsgHandler::handle_MT_ALM_AS2AC_ALL() void CAlarmMsgHandler::handle_MT_ALM_AS2AC_ADD() { - const kbd_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; + const iot_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; //< 反序列化 - kbd_idlfile::SAlmCltAddAlm objAddAlm; + iot_idl::SAlmCltAddAlm objAddAlm; bool bRc = objAddAlm.ParseFromArray( objMsgRcv.getDataPtr(), ( int ) objMsgRcv.getDataSize()); if ( !bRc ) { @@ -317,10 +317,10 @@ void CAlarmMsgHandler::handle_MT_ALM_AS2AC_ADD() void CAlarmMsgHandler::handle_MT_ALM_AS2AC_CFM() { - const kbd_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; + const iot_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; //< 反序列化 - kbd_idlfile::SAlmCltCfmAlm objCfmAlm; + iot_idl::SAlmCltCfmAlm objCfmAlm; bool bRc = objCfmAlm.ParseFromArray( objMsgRcv.getDataPtr(), ( int ) objMsgRcv.getDataSize()); if ( !bRc ) { @@ -360,10 +360,10 @@ void CAlarmMsgHandler::handle_MT_ALM_AS2AC_CFM() void CAlarmMsgHandler::handle_MT_ALM_AS2AC_DEL() { - const kbd_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; + const iot_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; //< 反序列化 - kbd_idlfile::SAlmCltDelAlm objDelAlm; + iot_idl::SAlmCltDelAlm objDelAlm; bool bRc = objDelAlm.ParseFromArray( objMsgRcv.getDataPtr(), ( int ) objMsgRcv.getDataSize()); if ( !bRc ) { @@ -403,10 +403,10 @@ void CAlarmMsgHandler::handle_MT_ALM_AS2AC_DEL() void CAlarmMsgHandler::handle_MT_ALM_AS2AC_RELEASE() { - const kbd_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; + const iot_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; //< 反序列化 - kbd_idlfile::SAlmCltReleaseAlm objReleaseAlm; + iot_idl::SAlmCltReleaseAlm objReleaseAlm; bool bRc = objReleaseAlm.ParseFromArray( objMsgRcv.getDataPtr(), ( int ) objMsgRcv.getDataSize()); if ( !bRc ) { @@ -446,10 +446,10 @@ void CAlarmMsgHandler::handle_MT_ALM_AS2AC_RELEASE() void CAlarmMsgHandler::handle_MT_ALM_AS2AC_WAVE() { - const kbd_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; + const iot_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; //< 反序列化 - kbd_idlfile::SAlmCltLinkWave2Alm objWave2Alm; + iot_idl::SAlmCltLinkWave2Alm objWave2Alm; bool bRc = objWave2Alm.ParseFromArray( objMsgRcv.getDataPtr(), ( int ) objMsgRcv.getDataSize()); if ( !bRc ) { 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 cc6d8271..e6384b9b 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 @@ -38,7 +38,7 @@ CItlAlmMsgHandler::~CItlAlmMsgHandler() = default; void CItlAlmMsgHandler::refreshState() { - m_nTimeNow = kbd_public::getMonotonicMsec(); + m_nTimeNow = iot_public::getMonotonicMsec(); checkInit(); cleanSrvStatMap(); @@ -47,7 +47,7 @@ void CItlAlmMsgHandler::refreshState() void CItlAlmMsgHandler::handleMessage() { - const kbd_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; + const iot_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; if ( !objMsgRcv.isValid()) return; @@ -64,37 +64,37 @@ void CItlAlmMsgHandler::handleMessage() //< 按类型处理 switch ( objMsgRcv.getMsgType()) { - case kbd_idlfile::MT_IA_S2C_SEQNO: + case iot_idl::MT_IA_S2C_SEQNO: { //LOGDEBUG("Received MT_IA_S2C_SEQNO"); handle_MT_IA_S2C_SEQNO(); } break; - case kbd_idlfile::MT_IA_S2C_ALL: + case iot_idl::MT_IA_S2C_ALL: { //LOGDEBUG("Received MT_IA_S2C_ALL"); handle_MT_IA_S2C_ALL(); } break; - case kbd_idlfile::MT_IA_S2C_ADD: + case iot_idl::MT_IA_S2C_ADD: { //LOGDEBUG("Received MT_IA_S2C_ADD"); handle_MT_IA_S2C_ADD(); } break; - case kbd_idlfile::MT_IA_S2C_DEL: + case iot_idl::MT_IA_S2C_DEL: { //LOGDEBUG("Received MT_IA_S2C_DEL"); handle_MT_IA_S2C_DEL(); } break; - case kbd_idlfile::MT_IA_S2C_BROKEN: + case iot_idl::MT_IA_S2C_BROKEN: { //LOGDEBUG("Received MT_IA_S2C_BROKEN"); handle_MT_IA_S2C_BROKEN(); } break; - case kbd_idlfile::MT_IA_S2C_RELEASE: + case iot_idl::MT_IA_S2C_RELEASE: { //LOGDEBUG("Received MT_IA_S2C_RELEASE"); handle_MT_IA_S2C_RELEASE(); @@ -132,8 +132,8 @@ void CItlAlmMsgHandler::checkInit() LOGINFO( "checkInit(): 添加订阅成功！" ); //< 向告警服务请求当前序号 - kbd_net::CMbMessage objMbMsg; - objMbMsg.setMsgType( kbd_idlfile::MT_IA_C2S_SEQNO_REQ ); + iot_net::CMbMessage objMbMsg; + objMbMsg.setMsgType( iot_idl::MT_IA_C2S_SEQNO_REQ ); objMbMsg.setSubject( CN_AppId_PUBLIC, CH_IA_CLT_TO_SRV ); objMbMsg.setData( cn_strSignature ); @@ -168,8 +168,8 @@ void CItlAlmMsgHandler::cleanSrvStatMap() void CItlAlmMsgHandler::replyAllReq() { - kbd_net::CMbMessage objMsgSend; - objMsgSend.setMsgType( kbd_idlfile::MT_IA_C2S_ALL_REQ ); + iot_net::CMbMessage objMsgSend; + objMsgSend.setMsgType( iot_idl::MT_IA_C2S_ALL_REQ ); objMsgSend.setSubject( CN_AppId_PUBLIC, CH_IA_CLT_TO_SRV ); objMsgSend.setData( cn_strSignature ); @@ -185,8 +185,8 @@ void CItlAlmMsgHandler::replyRtReq( SItlAlmSrvStatus &objSrvStatus ) LOGINFO( "请求重传。" ); - kbd_net::CMbMessage objMsgSend; - objMsgSend.setMsgType( kbd_idlfile::MT_IA_C2S_RT_REQ ); + iot_net::CMbMessage objMsgSend; + objMsgSend.setMsgType( iot_idl::MT_IA_C2S_RT_REQ ); objMsgSend.setSubject( CN_AppId_PUBLIC, CH_IA_CLT_TO_SRV ); objMsgSend.setData( cn_strSignature ); @@ -202,7 +202,7 @@ void CItlAlmMsgHandler::replyRtReq( SItlAlmSrvStatus &objSrvStatus ) void CItlAlmMsgHandler::handle_MT_IA_S2C_SEQNO() { - const kbd_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; + const iot_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; //< 消息验证 std::string strData(( const char * ) objMsgRcv.getDataPtr(), objMsgRcv.getDataSize()); @@ -244,10 +244,10 @@ void CItlAlmMsgHandler::handle_MT_IA_S2C_SEQNO() void CItlAlmMsgHandler::handle_MT_IA_S2C_ALL() { - const kbd_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; + const iot_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; //< 反序列化 - kbd_idlfile::SIntelliAlmAdd objAllAlm; + iot_idl::SIntelliAlmAdd objAllAlm; bool bRc = objAllAlm.ParseFromArray( objMsgRcv.getDataPtr(), ( int ) objMsgRcv.getDataSize()); if ( !bRc ) { @@ -268,10 +268,10 @@ void CItlAlmMsgHandler::handle_MT_IA_S2C_ALL() void CItlAlmMsgHandler::handle_MT_IA_S2C_ADD() { - const kbd_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; + const iot_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; //< 反序列化 - kbd_idlfile::SIntelliAlmAdd objAddAlm; + iot_idl::SIntelliAlmAdd objAddAlm; bool bRc = objAddAlm.ParseFromArray( objMsgRcv.getDataPtr(), ( int ) objMsgRcv.getDataSize()); if ( !bRc ) { @@ -311,10 +311,10 @@ void CItlAlmMsgHandler::handle_MT_IA_S2C_ADD() void CItlAlmMsgHandler::handle_MT_IA_S2C_DEL() { - const kbd_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; + const iot_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; //< 反序列化 - kbd_idlfile::SIntelliAlmDel objDelAlm; + iot_idl::SIntelliAlmDel objDelAlm; bool bRc = objDelAlm.ParseFromArray( objMsgRcv.getDataPtr(), ( int ) objMsgRcv.getDataSize()); if ( !bRc ) { @@ -354,10 +354,10 @@ void CItlAlmMsgHandler::handle_MT_IA_S2C_DEL() void CItlAlmMsgHandler::handle_MT_IA_S2C_BROKEN() { - const kbd_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; + const iot_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; //< 反序列化 - kbd_idlfile::SIntelliAlmBroken objBrokenAlm; + iot_idl::SIntelliAlmBroken objBrokenAlm; bool bRc = objBrokenAlm.ParseFromArray( objMsgRcv.getDataPtr(), ( int ) objMsgRcv.getDataSize()); if ( !bRc ) { @@ -397,10 +397,10 @@ void CItlAlmMsgHandler::handle_MT_IA_S2C_BROKEN() void CItlAlmMsgHandler::handle_MT_IA_S2C_RELEASE() { - const kbd_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; + const iot_net::CMbMessage &objMsgRcv = m_pParent->m_objMsgRcv; //< 反序列化 - kbd_idlfile::SIntelliAlmRelease objReleaseAlm; + iot_idl::SIntelliAlmRelease objReleaseAlm; bool bRc = objReleaseAlm.ParseFromArray( objMsgRcv.getDataPtr(), ( int ) objMsgRcv.getDataSize()); if ( !bRc ) { diff --git a/platform/src/application/app_fbd/fbd_common/FbdAlarmSrcImpl.cpp b/platform/src/application/app_fbd/fbd_common/FbdAlarmSrcImpl.cpp index 7e8718cc..c406be7f 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdAlarmSrcImpl.cpp +++ b/platform/src/application/app_fbd/fbd_common/FbdAlarmSrcImpl.cpp @@ -46,7 +46,7 @@ FBD_COMMON_API CFbdAlarmSrcApiPtr getFbdAlarmSrcApi() } else { - const kbd_public::SRunAppInfo &stRunAppInfo = ptrSysInfoApi->getCurrentRunAppInfo(); + const iot_public::SRunAppInfo &stRunAppInfo = ptrSysInfoApi->getCurrentRunAppInfo(); //< 不为空，表示stRunAppInfo已被设置，有效 if ( stRunAppInfo.strAppName.empty()) @@ -88,7 +88,7 @@ CFbdAlarmSrcImpl::~CFbdAlarmSrcImpl() } -bool CFbdAlarmSrcImpl::addAlarm( kbd_idlfile::SAppAddAlm &objAlarm ) +bool CFbdAlarmSrcImpl::addAlarm( iot_idl::SAppAddAlm &objAlarm ) { return m_objImpl.addAlarm( objAlarm ); } diff --git a/platform/src/application/app_fbd/fbd_common/FbdAlarmSrcImpl.h b/platform/src/application/app_fbd/fbd_common/FbdAlarmSrcImpl.h index c626abe1..4dd123c0 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdAlarmSrcImpl.h +++ b/platform/src/application/app_fbd/fbd_common/FbdAlarmSrcImpl.h @@ -26,12 +26,12 @@ public: ~CFbdAlarmSrcImpl() override; //< 见基类说明 - bool addAlarm( kbd_idlfile::SAppAddAlm &objAlarm ) override; + bool addAlarm( iot_idl::SAppAddAlm &objAlarm ) override; private: friend CFbdAlarmSrcApiPtr getFbdAlarmSrcApi(); - kbd_service::CAlmApiForApp m_objImpl; + iot_service::CAlmApiForApp m_objImpl; }; typedef boost::shared_ptr CFbdAlarmSrcImplPtr; diff --git a/platform/src/application/app_fbd/fbd_common/FbdDiagDataImpl.cpp b/platform/src/application/app_fbd/fbd_common/FbdDiagDataImpl.cpp index 2a8befb7..cd64a7b4 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdDiagDataImpl.cpp +++ b/platform/src/application/app_fbd/fbd_common/FbdDiagDataImpl.cpp @@ -111,7 +111,7 @@ int CFbdDiagDataImpl::initialize() LOGERROR( "initialize(): 系统信息非预期，检查程序！" ); return kbdFailed; } - m_pRdbTableMng = new kbd_dbms::CRdbTableMng( getFbdSysInfoApi()->getCurrentRunAppInfo().strAppName ); + m_pRdbTableMng = new iot_dbms::CRdbTableMng( getFbdSysInfoApi()->getCurrentRunAppInfo().strAppName ); } if ( nullptr == m_pRdbTableMng || nullptr == m_pMutexModInfoTable || nullptr == m_pMutexModInputTable @@ -393,7 +393,7 @@ int CFbdDiagDataImpl::setAlarmValByKey( const SFbdValueKey &stValueKey, const SF int CFbdDiagDataImpl::getAllGroupInfo( std::vector &vecGrpInfo ) const { static const std::string strTableName = CN_TN_FbdGroup; - kbd_dbms::CRdbTableMngLockGuard lock( *m_pRdbTableMng, strTableName ); + iot_dbms::CRdbTableMngLockGuard lock( *m_pRdbTableMng, strTableName ); if ( !m_pRdbTableMng->selectAllColumnNoCondition( strTableName, vecGrpInfo )) { LOGERROR( "getAllGroupInfo(): 从RDB获取FBD组信息失败" ); @@ -552,8 +552,8 @@ int CFbdDiagDataImpl::insertAllDataByGroup( const SFbdGroupInfo &stGrpInfo, cons } -int CFbdDiagDataImpl::getDebugResponse( const kbd_idlfile::SFBDDebugRequest &objReq, - kbd_idlfile::SFBDDebugResponse &objRep ) +int CFbdDiagDataImpl::getDebugResponse( const iot_idl::SFBDDebugRequest &objReq, + iot_idl::SFBDDebugResponse &objRep ) { const std::string &strDiagName = objReq.sdiagramname(); objRep.set_ngroupid( objReq.ngroupid()); diff --git a/platform/src/application/app_fbd/fbd_common/FbdDiagDataImpl.h b/platform/src/application/app_fbd/fbd_common/FbdDiagDataImpl.h index fe9e3e3c..d43a7001 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdDiagDataImpl.h +++ b/platform/src/application/app_fbd/fbd_common/FbdDiagDataImpl.h @@ -78,12 +78,12 @@ public: int insertAllDataByGroup( const SFbdGroupInfo &stGrpInfo, const SFbdGroupData &stGrpData ) override; //< 见基类说明 - int getDebugResponse( const kbd_idlfile::SFBDDebugRequest &objReq, - kbd_idlfile::SFBDDebugResponse &objRep ) override; + int getDebugResponse( const iot_idl::SFBDDebugRequest &objReq, + iot_idl::SFBDDebugResponse &objRep ) override; private: //< 以下之所以用指针，因为读取的函数为const - kbd_dbms::CRdbTableMng *m_pRdbTableMng{nullptr}; + iot_dbms::CRdbTableMng *m_pRdbTableMng{nullptr}; boost::shared_mutex *m_pMutexModInfoTable{nullptr}; boost::shared_mutex *m_pMutexModInputTable{nullptr}; diff --git a/platform/src/application/app_fbd/fbd_common/FbdDiagDataStructPrivate.cpp b/platform/src/application/app_fbd/fbd_common/FbdDiagDataStructPrivate.cpp index 6670518d..d3ecd050 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdDiagDataStructPrivate.cpp +++ b/platform/src/application/app_fbd/fbd_common/FbdDiagDataStructPrivate.cpp @@ -154,22 +154,22 @@ EnFbdAlarmStyle SFbdAlarmInfo::getAlarmStyle() const //< todo 无锁是否有风险 if ( nullptr == m_ptrAlmInfo ) return EN_AS_DO_NOTHING; - const kbd_idlfile::enAlmLogicState enLogicState = m_ptrAlmInfo->logic_state(); + const iot_idl::enAlmLogicState enLogicState = m_ptrAlmInfo->logic_state(); switch ( enLogicState ) { - case kbd_idlfile::ALS_ALARM : - case kbd_idlfile::ALS_ALARM_CFM : - case kbd_idlfile::ALS_ALARM_DEL : - case kbd_idlfile::ALS_ALARM_CFM_DEL : + case iot_idl::ALS_ALARM : + case iot_idl::ALS_ALARM_CFM : + case iot_idl::ALS_ALARM_DEL : + case iot_idl::ALS_ALARM_CFM_DEL : return EN_AS_ALARM; //break; - case kbd_idlfile::ALS_RETURN : - case kbd_idlfile::ALS_RETURN_CFM : - case kbd_idlfile::ALS_RETURN_DEL : - case kbd_idlfile::ALS_RETURN_CFM_DEL : + case iot_idl::ALS_RETURN : + case iot_idl::ALS_RETURN_CFM : + case iot_idl::ALS_RETURN_DEL : + case iot_idl::ALS_RETURN_CFM_DEL : return EN_AS_ALARM_RTN; //break; - case kbd_idlfile::ALS_EVT_ONLY : + case iot_idl::ALS_EVT_ONLY : return EN_AS_EVENT_ONLY; //break; default: diff --git a/platform/src/application/app_fbd/fbd_common/FbdPointSubImpl.cpp b/platform/src/application/app_fbd/fbd_common/FbdPointSubImpl.cpp index 5d1ae7e4..637b34db 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdPointSubImpl.cpp +++ b/platform/src/application/app_fbd/fbd_common/FbdPointSubImpl.cpp @@ -100,19 +100,19 @@ CFbdPointSubImpl::~CFbdPointSubImpl() m_ptrDpApi.reset(); Sleep( 100 ); - kbd_service::CDpcdaForApp::releaseGlobalThread(); + iot_service::CDpcdaForApp::releaseGlobalThread(); } int CFbdPointSubImpl::initialize() { - if ( !kbd_service::CDpcdaForApp::initGlobalThread()) + if ( !iot_service::CDpcdaForApp::initGlobalThread()) { LOGERROR( "初始化数据订阅服务接口失败" ); return kbdFailed; } - m_ptrDpSub = boost::make_shared(); + m_ptrDpSub = boost::make_shared(); if ( m_ptrDpSub == nullptr ) { LOGERROR( "创建数据订阅服务接口失败" ); @@ -120,7 +120,7 @@ int CFbdPointSubImpl::initialize() } //< 初始化数据处理接口，主要用来判断测点状态字是否有效 - m_ptrDpApi = kbd_service::getDataProcInstance( getFbdSysInfoApi()->getCurrentRunAppInfo().strAppName ); + m_ptrDpApi = iot_service::getDataProcInstance( getFbdSysInfoApi()->getCurrentRunAppInfo().strAppName ); if ( m_ptrDpApi == nullptr ) { LOGERROR( "创建数据处理接口失败" ); @@ -198,7 +198,7 @@ int CFbdPointSubImpl::setPntValAndSta( const std::string &strPntKey, double dVal if ( pIter != m_mapPntKeyToValue.end()) { pIter->second.setValAndSta( dValue, nStatus ); - pIter->second.updateRefreshTime( kbd_public::getMonotonicMsec()); + pIter->second.updateRefreshTime( iot_public::getMonotonicMsec()); } return kbdSuccess; @@ -216,7 +216,7 @@ int CFbdPointSubImpl::batchSetPntValAndSta( const std::vector &vecP return kbdFailed; } - int64 lCurTime = kbd_public::getMonotonicMsec(); + int64 lCurTime = iot_public::getMonotonicMsec(); boost::mutex::scoped_lock lock( m_objPntBufLock ); for ( size_t i = 0; i < vecPntKey.size(); ++i ) diff --git a/platform/src/application/app_fbd/fbd_common/FbdPointSubImpl.h b/platform/src/application/app_fbd/fbd_common/FbdPointSubImpl.h index 81dea8cc..37f95f65 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdPointSubImpl.h +++ b/platform/src/application/app_fbd/fbd_common/FbdPointSubImpl.h @@ -85,7 +85,7 @@ struct SPntInfo /* @brief 判断是否已经超时 */ inline bool isOverTime() const { - if ( kbd_public::getMonotonicMsec() - nLastTimeMsec > CN_MasRefreshTimeMsec ) + if ( iot_public::getMonotonicMsec() - nLastTimeMsec > CN_MasRefreshTimeMsec ) { return true; } @@ -174,8 +174,8 @@ public: void resetOverTimePntValAndSta() override; private: - kbd_service::CDpcdaForAppPtr m_ptrDpSub; //< 订阅服务接口 - kbd_service::CDataProcessApiPtr m_ptrDpApi; //< 测点接口，用来判断状态字是否有效 + iot_service::CDpcdaForAppPtr m_ptrDpSub; //< 订阅服务接口 + iot_service::CDataProcessApiPtr m_ptrDpApi; //< 测点接口，用来判断状态字是否有效 /* @brief table.tagname.column --> 测点信息 */ typedef std::map KeyToValueMAP; diff --git a/platform/src/application/app_fbd/fbd_common/FbdSysInfoImpl.cpp b/platform/src/application/app_fbd/fbd_common/FbdSysInfoImpl.cpp index 0cc0ff7d..bdf96083 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdSysInfoImpl.cpp +++ b/platform/src/application/app_fbd/fbd_common/FbdSysInfoImpl.cpp @@ -53,14 +53,14 @@ FBD_COMMON_API CFbdSysInfoApiPtr getFbdSysInfoApi() /***********************************************************************************************/ -kbd_public::CSysInfoInterface &CFbdSysInfoImpl::getSysInfo() +iot_public::CSysInfoInterface &CFbdSysInfoImpl::getSysInfo() { //< m_ptrSysInfoInterface 肯定不为空 return *m_ptrSysInfoInterface; } -const kbd_public::SRunAppInfo &CFbdSysInfoImpl::getCurrentRunAppInfo() +const iot_public::SRunAppInfo &CFbdSysInfoImpl::getCurrentRunAppInfo() { if ( m_stRunAppInfo.strAppName.empty()) { @@ -71,7 +71,7 @@ const kbd_public::SRunAppInfo &CFbdSysInfoImpl::getCurrentRunAppInfo() } -void CFbdSysInfoImpl::setCurrentRunAppInfo( const kbd_public::SRunAppInfo &stSetVal ) +void CFbdSysInfoImpl::setCurrentRunAppInfo( const iot_public::SRunAppInfo &stSetVal ) { m_stRunAppInfo = stSetVal; } diff --git a/platform/src/application/app_fbd/fbd_common/FbdSysInfoImpl.h b/platform/src/application/app_fbd/fbd_common/FbdSysInfoImpl.h index e9fad228..3e7108d0 100644 --- a/platform/src/application/app_fbd/fbd_common/FbdSysInfoImpl.h +++ b/platform/src/application/app_fbd/fbd_common/FbdSysInfoImpl.h @@ -24,24 +24,24 @@ public: /******************************************************************************//** * @brief 获取系统信息接口类 **********************************************************************************/ - kbd_public::CSysInfoInterface &getSysInfo() override; + iot_public::CSysInfoInterface &getSysInfo() override; /******************************************************************************//** * @brief 获取当前进程的运行信息 **********************************************************************************/ - const kbd_public::SRunAppInfo &getCurrentRunAppInfo() override; + const iot_public::SRunAppInfo &getCurrentRunAppInfo() override; /******************************************************************************//** * @brief 设置当前进程的运行信息 * 仅供 fbd_server 启动时设置 **********************************************************************************/ - void setCurrentRunAppInfo( const kbd_public::SRunAppInfo &stSetVal ) override; + void setCurrentRunAppInfo( const iot_public::SRunAppInfo &stSetVal ) override; private: friend CFbdSysInfoApiPtr getFbdSysInfoApi(); - kbd_public::CSysInfoInterfacePtr m_ptrSysInfoInterface; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::CSysInfoInterfacePtr m_ptrSysInfoInterface; + iot_public::SRunAppInfo m_stRunAppInfo; }; typedef boost::shared_ptr CFbdSysInfoImplPtr; 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 5169b231..4bb53c1e 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 @@ -25,7 +25,7 @@ CAlarmDataMng::CAlarmDataMng() m_pMutexLiveAlmTable = new boost::shared_mutex; //< 本实例构造（出生）的时间，UTC时间 - m_nBirthTime = kbd_public::getUTCTimeMsec(); + m_nBirthTime = iot_public::getUTCTimeMsec(); } @@ -164,20 +164,20 @@ bool CAlarmDataMng::isAlarmConfirmed( const SFbdAlarmInfo &stAlmInfo ) const //< 读锁 boost::shared_lock lock( *m_pMutexLiveAlmTable ); - const kbd_idlfile::enAlmLogicState enLogicState = stAlmInfo.m_ptrAlmInfo->logic_state(); + const iot_idl::enAlmLogicState enLogicState = stAlmInfo.m_ptrAlmInfo->logic_state(); switch ( enLogicState ) { - case kbd_idlfile::ALS_ALARM_CFM : - case kbd_idlfile::ALS_ALARM_CFM_DEL : - case kbd_idlfile::ALS_RETURN_CFM : - case kbd_idlfile::ALS_RETURN_CFM_DEL : + case iot_idl::ALS_ALARM_CFM : + case iot_idl::ALS_ALARM_CFM_DEL : + case iot_idl::ALS_RETURN_CFM : + case iot_idl::ALS_RETURN_CFM_DEL : return true; //break; - case kbd_idlfile::ALS_ALARM : - case kbd_idlfile::ALS_ALARM_DEL : - case kbd_idlfile::ALS_RETURN : - case kbd_idlfile::ALS_RETURN_DEL : - case kbd_idlfile::ALS_EVT_ONLY : + case iot_idl::ALS_ALARM : + case iot_idl::ALS_ALARM_DEL : + case iot_idl::ALS_RETURN : + case iot_idl::ALS_RETURN_DEL : + case iot_idl::ALS_EVT_ONLY : break; default: LOGERROR( "isAlarmConfirmed(): 非预期的logic_state = %d", ( int ) enLogicState ); @@ -205,20 +205,20 @@ bool CAlarmDataMng::isAlarmDeleted( const SFbdAlarmInfo &stAlmInfo ) const return true; } - const kbd_idlfile::enAlmLogicState enLogicState = itUuid->m_ptrAlmInfo->logic_state(); + const iot_idl::enAlmLogicState enLogicState = itUuid->m_ptrAlmInfo->logic_state(); switch ( enLogicState ) { - case kbd_idlfile::ALS_ALARM_DEL : - case kbd_idlfile::ALS_ALARM_CFM_DEL : - case kbd_idlfile::ALS_RETURN_DEL : - case kbd_idlfile::ALS_RETURN_CFM_DEL : - case kbd_idlfile::ALS_EVT_ONLY : + case iot_idl::ALS_ALARM_DEL : + case iot_idl::ALS_ALARM_CFM_DEL : + case iot_idl::ALS_RETURN_DEL : + case iot_idl::ALS_RETURN_CFM_DEL : + case iot_idl::ALS_EVT_ONLY : return true; //break; - case kbd_idlfile::ALS_ALARM : - case kbd_idlfile::ALS_ALARM_CFM : - case kbd_idlfile::ALS_RETURN : - case kbd_idlfile::ALS_RETURN_CFM : + case iot_idl::ALS_ALARM : + case iot_idl::ALS_ALARM_CFM : + case iot_idl::ALS_RETURN : + case iot_idl::ALS_RETURN_CFM : break; default: LOGERROR( "isAlarmConfirmed(): 非预期的logic_state = %d", ( int ) enLogicState ); @@ -232,7 +232,7 @@ bool CAlarmDataMng::isAlarmDeleted( const SFbdAlarmInfo &stAlmInfo ) const /***********************************************************************************************/ -void CAlarmDataMng::setAlarmFullSync( int nDomainID, kbd_idlfile::SAlmCltAddAlm &objAllAlm ) +void CAlarmDataMng::setAlarmFullSync( int nDomainID, iot_idl::SAlmCltAddAlm &objAllAlm ) { //< 千万不要判，全同步允许为空 //if ( objAllAlm.alm_info().empty()) @@ -300,23 +300,23 @@ void CAlarmDataMng::setAlarmFullSync( int nDomainID, kbd_idlfile::SAlmCltAddAlm //< 处理复归 { bool bIsReturn = false; - const kbd_idlfile::enAlmLogicState enLogicState = objAdded.m_ptrAlmInfo->logic_state(); + const iot_idl::enAlmLogicState enLogicState = objAdded.m_ptrAlmInfo->logic_state(); switch ( enLogicState ) { - case kbd_idlfile::ALS_ALARM : - case kbd_idlfile::ALS_ALARM_CFM : - case kbd_idlfile::ALS_ALARM_DEL : - case kbd_idlfile::ALS_ALARM_CFM_DEL : + case iot_idl::ALS_ALARM : + case iot_idl::ALS_ALARM_CFM : + case iot_idl::ALS_ALARM_DEL : + case iot_idl::ALS_ALARM_CFM_DEL : //EN_AS_ALARM; break; - case kbd_idlfile::ALS_RETURN : - case kbd_idlfile::ALS_RETURN_CFM : - case kbd_idlfile::ALS_RETURN_DEL : - case kbd_idlfile::ALS_RETURN_CFM_DEL : + case iot_idl::ALS_RETURN : + case iot_idl::ALS_RETURN_CFM : + case iot_idl::ALS_RETURN_DEL : + case iot_idl::ALS_RETURN_CFM_DEL : //EN_AS_ALARM_RTN; bIsReturn = true; break; - case kbd_idlfile::ALS_EVT_ONLY : + case iot_idl::ALS_EVT_ONLY : //EN_AS_EVENT_ONLY; break; default: @@ -401,7 +401,7 @@ void CAlarmDataMng::setAlmReturned( const std::maplogic_state(); + const iot_idl::enAlmLogicState enLogicState = objAdded.m_ptrAlmInfo->logic_state(); switch ( enLogicState ) { - case kbd_idlfile::ALS_ALARM : - case kbd_idlfile::ALS_ALARM_CFM : - case kbd_idlfile::ALS_ALARM_DEL : - case kbd_idlfile::ALS_ALARM_CFM_DEL : + case iot_idl::ALS_ALARM : + case iot_idl::ALS_ALARM_CFM : + case iot_idl::ALS_ALARM_DEL : + case iot_idl::ALS_ALARM_CFM_DEL : //EN_AS_ALARM; break; - case kbd_idlfile::ALS_RETURN : - case kbd_idlfile::ALS_RETURN_CFM : - case kbd_idlfile::ALS_RETURN_DEL : - case kbd_idlfile::ALS_RETURN_CFM_DEL : + case iot_idl::ALS_RETURN : + case iot_idl::ALS_RETURN_CFM : + case iot_idl::ALS_RETURN_DEL : + case iot_idl::ALS_RETURN_CFM_DEL : //EN_AS_ALARM_RTN; bIsReturn = true; break; - case kbd_idlfile::ALS_EVT_ONLY : + case iot_idl::ALS_EVT_ONLY : //EN_AS_EVENT_ONLY; break; default: @@ -502,7 +502,7 @@ void CAlarmDataMng::addAlarm( kbd_idlfile::SAlmCltAddAlm &objAddAlm ) } -void CAlarmDataMng::cfmAlarm( kbd_idlfile::SAlmCltCfmAlm &objCfmAlm ) +void CAlarmDataMng::cfmAlarm( iot_idl::SAlmCltCfmAlm &objCfmAlm ) { const int nUuidSize = objCfmAlm.uuid_base64_size(); if ( nUuidSize <= 0 ) @@ -533,23 +533,23 @@ void CAlarmDataMng::cfmAlarm( kbd_idlfile::SAlmCltCfmAlm &objCfmAlm ) //< 注意，直接修改的内容不能为索引，否则使用replace()、modify() switch ( ptrAlmInfo->logic_state()) { - case kbd_idlfile::ALS_ALARM: - ptrAlmInfo->set_logic_state( kbd_idlfile::ALS_ALARM_CFM ); + case iot_idl::ALS_ALARM: + ptrAlmInfo->set_logic_state( iot_idl::ALS_ALARM_CFM ); break; - case kbd_idlfile::ALS_ALARM_DEL: - ptrAlmInfo->set_logic_state( kbd_idlfile::ALS_ALARM_CFM_DEL ); + case iot_idl::ALS_ALARM_DEL: + ptrAlmInfo->set_logic_state( iot_idl::ALS_ALARM_CFM_DEL ); break; - case kbd_idlfile::ALS_RETURN: - ptrAlmInfo->set_logic_state( kbd_idlfile::ALS_RETURN_CFM ); + case iot_idl::ALS_RETURN: + ptrAlmInfo->set_logic_state( iot_idl::ALS_RETURN_CFM ); break; - case kbd_idlfile::ALS_RETURN_DEL: - ptrAlmInfo->set_logic_state( kbd_idlfile::ALS_RETURN_CFM_DEL ); + case iot_idl::ALS_RETURN_DEL: + ptrAlmInfo->set_logic_state( iot_idl::ALS_RETURN_CFM_DEL ); break; - case kbd_idlfile::ALS_ALARM_CFM: - case kbd_idlfile::ALS_RETURN_CFM: - case kbd_idlfile::ALS_EVT_ONLY: - case kbd_idlfile::ALS_ALARM_CFM_DEL: - case kbd_idlfile::ALS_RETURN_CFM_DEL: + case iot_idl::ALS_ALARM_CFM: + case iot_idl::ALS_RETURN_CFM: + case iot_idl::ALS_EVT_ONLY: + case iot_idl::ALS_ALARM_CFM_DEL: + case iot_idl::ALS_RETURN_CFM_DEL: //< 无需处理 break; default: @@ -562,7 +562,7 @@ void CAlarmDataMng::cfmAlarm( kbd_idlfile::SAlmCltCfmAlm &objCfmAlm ) } -void CAlarmDataMng::delAlarm( kbd_idlfile::SAlmCltDelAlm &objDelAlm ) +void CAlarmDataMng::delAlarm( iot_idl::SAlmCltDelAlm &objDelAlm ) { const int nUuidSize = objDelAlm.uuid_base64_size(); if ( nUuidSize <= 0 ) @@ -586,23 +586,23 @@ void CAlarmDataMng::delAlarm( kbd_idlfile::SAlmCltDelAlm &objDelAlm ) //< 注意，直接修改的内容不能为索引，否则使用replace()、modify() switch ( ptrAlmInfo->logic_state()) { - case kbd_idlfile::ALS_ALARM: - ptrAlmInfo->set_logic_state( kbd_idlfile::ALS_ALARM_DEL ); + case iot_idl::ALS_ALARM: + ptrAlmInfo->set_logic_state( iot_idl::ALS_ALARM_DEL ); break; - case kbd_idlfile::ALS_ALARM_CFM: - ptrAlmInfo->set_logic_state( kbd_idlfile::ALS_ALARM_CFM_DEL ); + case iot_idl::ALS_ALARM_CFM: + ptrAlmInfo->set_logic_state( iot_idl::ALS_ALARM_CFM_DEL ); break; - case kbd_idlfile::ALS_RETURN: - ptrAlmInfo->set_logic_state( kbd_idlfile::ALS_RETURN_DEL ); + case iot_idl::ALS_RETURN: + ptrAlmInfo->set_logic_state( iot_idl::ALS_RETURN_DEL ); break; - case kbd_idlfile::ALS_RETURN_CFM: - ptrAlmInfo->set_logic_state( kbd_idlfile::ALS_RETURN_CFM_DEL ); + case iot_idl::ALS_RETURN_CFM: + ptrAlmInfo->set_logic_state( iot_idl::ALS_RETURN_CFM_DEL ); break; - case kbd_idlfile::ALS_EVT_ONLY: - case kbd_idlfile::ALS_ALARM_DEL: - case kbd_idlfile::ALS_ALARM_CFM_DEL: - case kbd_idlfile::ALS_RETURN_DEL: - case kbd_idlfile::ALS_RETURN_CFM_DEL: + case iot_idl::ALS_EVT_ONLY: + case iot_idl::ALS_ALARM_DEL: + case iot_idl::ALS_ALARM_CFM_DEL: + case iot_idl::ALS_RETURN_DEL: + case iot_idl::ALS_RETURN_CFM_DEL: //< 无需处理 break; default: @@ -615,7 +615,7 @@ void CAlarmDataMng::delAlarm( kbd_idlfile::SAlmCltDelAlm &objDelAlm ) } -void CAlarmDataMng::releaseAlarm( kbd_idlfile::SAlmCltReleaseAlm &objReleaseAlm ) +void CAlarmDataMng::releaseAlarm( iot_idl::SAlmCltReleaseAlm &objReleaseAlm ) { const int nUuidSize = objReleaseAlm.uuid_base64_size(); if ( nUuidSize <= 0 ) @@ -632,7 +632,7 @@ void CAlarmDataMng::releaseAlarm( kbd_idlfile::SAlmCltReleaseAlm &objReleaseAlm } -void CAlarmDataMng::linkWave2Alarm( kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Alm ) +void CAlarmDataMng::linkWave2Alarm( iot_idl::SAlmCltLinkWave2Alm &objWave2Alm ) { ( void ) this; ( void ) objWave2Alm; 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 9781add8..72daa04f 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 @@ -45,7 +45,7 @@ namespace kbd_app namespace app_fbd { -typedef boost::shared_ptr SAlmInfoPtr; +typedef boost::shared_ptr SAlmInfoPtr; class CAlarmDataMng final { @@ -88,22 +88,22 @@ public: //< 见基类说明 - void setAlarmFullSync( int nDomainID, kbd_idlfile::SAlmCltAddAlm &objAllAlm ); + void setAlarmFullSync( int nDomainID, iot_idl::SAlmCltAddAlm &objAllAlm ); //< 见基类说明 - void addAlarm( kbd_idlfile::SAlmCltAddAlm &objAddAlm ); + void addAlarm( iot_idl::SAlmCltAddAlm &objAddAlm ); //< 见基类说明 - void cfmAlarm( kbd_idlfile::SAlmCltCfmAlm &objCfmAlm ); + void cfmAlarm( iot_idl::SAlmCltCfmAlm &objCfmAlm ); //< 见基类说明 - void delAlarm( kbd_idlfile::SAlmCltDelAlm &objDelAlm ); + void delAlarm( iot_idl::SAlmCltDelAlm &objDelAlm ); //< 见基类说明 - void releaseAlarm( kbd_idlfile::SAlmCltReleaseAlm &objReleaseAlm ); + void releaseAlarm( iot_idl::SAlmCltReleaseAlm &objReleaseAlm ); //< 见基类说明 - void linkWave2Alarm( kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Alm ); + void linkWave2Alarm( iot_idl::SAlmCltLinkWave2Alm &objWave2Alm ); /***********************************************************************************************/ 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 9045a892..ce37ab89 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 @@ -137,67 +137,67 @@ bool CFbdAlarmCltImpl::isItlAlmDeleted( const SFbdItlAlmInfo &stItlAlm ) const /***********************************************************************************************/ -void CFbdAlarmCltImpl::setAlarmFullSync( int nDomainID, kbd_idlfile::SAlmCltAddAlm &objAllAlm ) +void CFbdAlarmCltImpl::setAlarmFullSync( int nDomainID, iot_idl::SAlmCltAddAlm &objAllAlm ) { m_objAlarmDataMng.setAlarmFullSync( nDomainID, objAllAlm ); } -void CFbdAlarmCltImpl::addAlarm( kbd_idlfile::SAlmCltAddAlm &objAddAlm ) +void CFbdAlarmCltImpl::addAlarm( iot_idl::SAlmCltAddAlm &objAddAlm ) { m_objAlarmDataMng.addAlarm( objAddAlm ); } -void CFbdAlarmCltImpl::cfmAlarm( kbd_idlfile::SAlmCltCfmAlm &objCfmAlm ) +void CFbdAlarmCltImpl::cfmAlarm( iot_idl::SAlmCltCfmAlm &objCfmAlm ) { m_objAlarmDataMng.cfmAlarm( objCfmAlm ); } -void CFbdAlarmCltImpl::delAlarm( kbd_idlfile::SAlmCltDelAlm &objDelAlm ) +void CFbdAlarmCltImpl::delAlarm( iot_idl::SAlmCltDelAlm &objDelAlm ) { m_objAlarmDataMng.delAlarm( objDelAlm ); } -void CFbdAlarmCltImpl::releaseAlarm( kbd_idlfile::SAlmCltReleaseAlm &objReleaseAlm ) +void CFbdAlarmCltImpl::releaseAlarm( iot_idl::SAlmCltReleaseAlm &objReleaseAlm ) { m_objAlarmDataMng.releaseAlarm( objReleaseAlm ); } -void CFbdAlarmCltImpl::linkWave2Alarm( kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Alm ) +void CFbdAlarmCltImpl::linkWave2Alarm( iot_idl::SAlmCltLinkWave2Alm &objWave2Alm ) { m_objAlarmDataMng.linkWave2Alarm( objWave2Alm ); } -void CFbdAlarmCltImpl::setItlAlmFullSync( int nDomainID, kbd_idlfile::SIntelliAlmAdd &objAllItlAlm ) +void CFbdAlarmCltImpl::setItlAlmFullSync( int nDomainID, iot_idl::SIntelliAlmAdd &objAllItlAlm ) { m_objItlAlmDataMng.setItlAlmFullSync( nDomainID, objAllItlAlm ); } -void CFbdAlarmCltImpl::addItlAlm( kbd_idlfile::SIntelliAlmAdd &objAddItlAlm ) +void CFbdAlarmCltImpl::addItlAlm( iot_idl::SIntelliAlmAdd &objAddItlAlm ) { m_objItlAlmDataMng.addItlAlm( objAddItlAlm ); } -void CFbdAlarmCltImpl::delItlAlm( kbd_idlfile::SIntelliAlmDel &objDelItlAlm ) +void CFbdAlarmCltImpl::delItlAlm( iot_idl::SIntelliAlmDel &objDelItlAlm ) { m_objItlAlmDataMng.delItlAlm( objDelItlAlm ); } -void CFbdAlarmCltImpl::breakItlAlm( kbd_idlfile::SIntelliAlmBroken &objBrokenItlAlm ) +void CFbdAlarmCltImpl::breakItlAlm( iot_idl::SIntelliAlmBroken &objBrokenItlAlm ) { m_objItlAlmDataMng.breakItlAlm( objBrokenItlAlm ); } -void CFbdAlarmCltImpl::releaseItlAlm( kbd_idlfile::SIntelliAlmRelease &objReleaseItlAlm ) +void CFbdAlarmCltImpl::releaseItlAlm( iot_idl::SIntelliAlmRelease &objReleaseItlAlm ) { m_objItlAlmDataMng.releaseItlAlm( objReleaseItlAlm ); } 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 2e1a0067..a98f8e8f 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 @@ -71,37 +71,37 @@ public: //< 见基类说明 - void setAlarmFullSync( int nDomainID, kbd_idlfile::SAlmCltAddAlm &objAllAlm ) override; + void setAlarmFullSync( int nDomainID, iot_idl::SAlmCltAddAlm &objAllAlm ) override; //< 见基类说明 - void addAlarm( kbd_idlfile::SAlmCltAddAlm &objAddAlm ) override; + void addAlarm( iot_idl::SAlmCltAddAlm &objAddAlm ) override; //< 见基类说明 - void cfmAlarm( kbd_idlfile::SAlmCltCfmAlm &objCfmAlm ) override; + void cfmAlarm( iot_idl::SAlmCltCfmAlm &objCfmAlm ) override; //< 见基类说明 - void delAlarm( kbd_idlfile::SAlmCltDelAlm &objDelAlm ) override; + void delAlarm( iot_idl::SAlmCltDelAlm &objDelAlm ) override; //< 见基类说明 - void releaseAlarm( kbd_idlfile::SAlmCltReleaseAlm &objReleaseAlm ) override; + void releaseAlarm( iot_idl::SAlmCltReleaseAlm &objReleaseAlm ) override; //< 见基类说明 - void linkWave2Alarm( kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Alm ) override; + void linkWave2Alarm( iot_idl::SAlmCltLinkWave2Alm &objWave2Alm ) override; //< 见基类说明 - void setItlAlmFullSync( int nDomainID, kbd_idlfile::SIntelliAlmAdd &objAllItlAlm ) override; + void setItlAlmFullSync( int nDomainID, iot_idl::SIntelliAlmAdd &objAllItlAlm ) override; //< 见基类说明 - void addItlAlm( kbd_idlfile::SIntelliAlmAdd &objAddItlAlm ) override; + void addItlAlm( iot_idl::SIntelliAlmAdd &objAddItlAlm ) override; //< 见基类说明 - void delItlAlm( kbd_idlfile::SIntelliAlmDel &objDelItlAlm ) override; + void delItlAlm( iot_idl::SIntelliAlmDel &objDelItlAlm ) override; //< 见基类说明 - void breakItlAlm( kbd_idlfile::SIntelliAlmBroken &objBrokenItlAlm ) override; + void breakItlAlm( iot_idl::SIntelliAlmBroken &objBrokenItlAlm ) override; //< 见基类说明 - void releaseItlAlm( kbd_idlfile::SIntelliAlmRelease &objReleaseItlAlm ) override; + void releaseItlAlm( iot_idl::SIntelliAlmRelease &objReleaseItlAlm ) override; private: CAlarmDataMng m_objAlarmDataMng; 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 8e3a11b0..929a90ec 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 @@ -108,7 +108,7 @@ bool CItlAlmDataMng::isItlAlmBroken( const SFbdItlAlmInfo &stItlAlm ) const return true; } - return kbd_idlfile::IALS_BROKEN == pairRange.first->m_ptrItlAlmInfo->logic_state(); + return iot_idl::IALS_BROKEN == pairRange.first->m_ptrItlAlmInfo->logic_state(); } @@ -129,14 +129,14 @@ bool CItlAlmDataMng::isItlAlmDeleted( const SFbdItlAlmInfo &stItlAlm ) const return true; } - return kbd_idlfile::IALS_DELETED == pairRange.first->m_ptrItlAlmInfo->logic_state(); + return iot_idl::IALS_DELETED == pairRange.first->m_ptrItlAlmInfo->logic_state(); } /***********************************************************************************************/ -void CItlAlmDataMng::setItlAlmFullSync( int nDomainID, kbd_idlfile::SIntelliAlmAdd &objAllItlAlm ) +void CItlAlmDataMng::setItlAlmFullSync( int nDomainID, iot_idl::SIntelliAlmAdd &objAllItlAlm ) { //< 千万不要判，全同步允许为空 //if ( objAllItlAlm.alm_info().empty()) @@ -201,7 +201,7 @@ void CItlAlmDataMng::setItlAlmFullSync( int nDomainID, kbd_idlfile::SIntelliAlmA } -void CItlAlmDataMng::addItlAlm( kbd_idlfile::SIntelliAlmAdd &objAddItlAlm ) +void CItlAlmDataMng::addItlAlm( iot_idl::SIntelliAlmAdd &objAddItlAlm ) { if ( objAddItlAlm.alm_info().empty()) return; @@ -255,7 +255,7 @@ void CItlAlmDataMng::addItlAlm( kbd_idlfile::SIntelliAlmAdd &objAddItlAlm ) } -void CItlAlmDataMng::delItlAlm( kbd_idlfile::SIntelliAlmDel &objDelItlAlm ) +void CItlAlmDataMng::delItlAlm( iot_idl::SIntelliAlmDel &objDelItlAlm ) { const int nUuidSize = objDelItlAlm.uuid_base64_size(); if ( nUuidSize <= 0 ) @@ -274,12 +274,12 @@ void CItlAlmDataMng::delItlAlm( kbd_idlfile::SIntelliAlmDel &objDelItlAlm ) continue; } - pairRange.first->m_ptrItlAlmInfo->set_logic_state( kbd_idlfile::IALS_DELETED ); + pairRange.first->m_ptrItlAlmInfo->set_logic_state( iot_idl::IALS_DELETED ); } } -void CItlAlmDataMng::breakItlAlm( kbd_idlfile::SIntelliAlmBroken &objBrokenItlAlm ) +void CItlAlmDataMng::breakItlAlm( iot_idl::SIntelliAlmBroken &objBrokenItlAlm ) { const int nUuidSize = objBrokenItlAlm.uuid_base64_size(); if ( nUuidSize <= 0 ) @@ -298,12 +298,12 @@ void CItlAlmDataMng::breakItlAlm( kbd_idlfile::SIntelliAlmBroken &objBrokenItlAl continue; } - pairRange.first->m_ptrItlAlmInfo->set_logic_state( kbd_idlfile::IALS_BROKEN ); + pairRange.first->m_ptrItlAlmInfo->set_logic_state( iot_idl::IALS_BROKEN ); } } -void CItlAlmDataMng::releaseItlAlm( kbd_idlfile::SIntelliAlmRelease &objReleaseItlAlm ) +void CItlAlmDataMng::releaseItlAlm( iot_idl::SIntelliAlmRelease &objReleaseItlAlm ) { const int nUuidSize = objReleaseItlAlm.uuid_base64_size(); if ( nUuidSize <= 0 ) 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 1461d3b9..b79a7f60 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 @@ -46,7 +46,7 @@ namespace kbd_app namespace app_fbd { -typedef boost::shared_ptr SItlAlmInfoPtr; +typedef boost::shared_ptr SItlAlmInfoPtr; class CItlAlmDataMng final { @@ -83,19 +83,19 @@ public: //< 见基类说明 - void setItlAlmFullSync( int nDomainID, kbd_idlfile::SIntelliAlmAdd &objAllItlAlm ); + void setItlAlmFullSync( int nDomainID, iot_idl::SIntelliAlmAdd &objAllItlAlm ); //< 见基类说明 - void addItlAlm( kbd_idlfile::SIntelliAlmAdd &objAddItlAlm ); + void addItlAlm( iot_idl::SIntelliAlmAdd &objAddItlAlm ); //< 见基类说明 - void delItlAlm( kbd_idlfile::SIntelliAlmDel &objDelItlAlm ); + void delItlAlm( iot_idl::SIntelliAlmDel &objDelItlAlm ); //< 见基类说明 - void breakItlAlm( kbd_idlfile::SIntelliAlmBroken &objBrokenItlAlm ); + void breakItlAlm( iot_idl::SIntelliAlmBroken &objBrokenItlAlm ); //< 见基类说明 - void releaseItlAlm( kbd_idlfile::SIntelliAlmRelease &objReleaseItlAlm ); + void releaseItlAlm( iot_idl::SIntelliAlmRelease &objReleaseItlAlm ); /***********************************************************************************************/ 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 52132ee8..200d3d3b 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 @@ -85,12 +85,12 @@ int CAntiShake::calculate() return kbdFailed; } - m_lChangeTimeMsec = kbd_public::getMonotonicMsec(); + m_lChangeTimeMsec = iot_public::getMonotonicMsec(); m_nLastValue = static_cast(stInput1.m_dValue); } else { - int64 lCurTime = kbd_public::getMonotonicMsec(); + int64 lCurTime = iot_public::getMonotonicMsec(); int nCurValue = static_cast(stInput1.m_dValue); if ( m_nLastValue != nCurValue ) 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 9bcd036f..8d84cc8b 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 @@ -90,7 +90,7 @@ int CAoCtrl::calculate() return kbdFailed; } - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; while ( m_pMbComm->recvMsg( objMsg, 0 )) { COptCtrlReply objParse; @@ -226,7 +226,7 @@ int CAoCtrl::reset( const bool bMaster ) if ( bMaster ) { if ( nullptr == m_pMbComm ) - m_pMbComm = new kbd_net::CMbCommunicator; + m_pMbComm = new iot_net::CMbCommunicator; //< 必须订阅所有专业，因为可能控制其他专业的测点 m_pMbComm->addSub( 0, CH_OPT_TO_HMI_OPTCMD_UP ); @@ -344,10 +344,10 @@ int CAoCtrl::handleCmd( SCmdOfOnePnt &stCmdOfOnePnt ) void CAoCtrl::sendCtrlCmd( SCtrlCmd &stCmd, const ECmdState eSuccessState, const ECmdState eFailState ) { - stCmd.lSendUtcMsec = kbd_public::getUTCTimeMsec(); - stCmd.lSendMonotonicMsec = kbd_public::getMonotonicMsec(); + stCmd.lSendUtcMsec = iot_public::getUTCTimeMsec(); + stCmd.lSendMonotonicMsec = iot_public::getMonotonicMsec(); - const kbd_public::SRunAppInfo &stRunAppInfo = getFbdSysInfoApi()->getCurrentRunAppInfo(); + const iot_public::SRunAppInfo &stRunAppInfo = getFbdSysInfoApi()->getCurrentRunAppInfo(); SOptCtrlRequest stReq; stReq.stHead.strSrcTag = m_stModKey.toString(); @@ -376,7 +376,7 @@ void CAoCtrl::sendCtrlCmd( SCtrlCmd &stCmd, const ECmdState eSuccessState, const return; } - kbd_net::CMbMessage objMsg( stCmd.strLastSendJsonReq, stCmd.nAppId, + iot_net::CMbMessage objMsg( stCmd.strLastSendJsonReq, stCmd.nAppId, CH_HMI_TO_OPT_OPTCMD_DOWN, MT_OPT_AUTO_CTRL_DOWN ); if ( m_pMbComm->sendMsgToDomain( objMsg, stCmd.nDstDomainId )) { @@ -397,7 +397,7 @@ void CAoCtrl::waitCtrlRep( SCmdOfOnePnt &stCmdOfOnePnt, const ECmdState eSuccess { SCtrlCmd &stCurrentCmd = *( stCmdOfOnePnt.m_ptrCurrentCmd ); - const long long lElapsedMs = kbd_public::getMonotonicMsec() - stCurrentCmd.lSendMonotonicMsec; + const long long lElapsedMs = iot_public::getMonotonicMsec() - stCurrentCmd.lSendMonotonicMsec; if ( lElapsedMs > stCurrentCmd.nTimeoutMsec || lElapsedMs < 0 ) { LOGERROR( "等待控制反馈超时，已等待时间[%lld]ms，原始控制请求：\n%s", @@ -484,8 +484,8 @@ int CAoCtrl::parseKeyIdTag( const std::string &strKeyIdTag, SCtrlCmd &stCtrlCmd return kbdFailed; } - kbd_public::SSubsystemInfo stSubsysInfo; - kbd_public::SLocationInfo stLocationInfo; + iot_public::SSubsystemInfo stSubsysInfo; + iot_public::SLocationInfo stLocationInfo; if ( kbdSuccess != ptrSysInfo->getSysInfo().getSubsystemInfoByName( stKeyInfo.strSubsystemName, stSubsysInfo ) || kbdSuccess != ptrSysInfo->getSysInfo().getLocationInfoByName( stKeyInfo.strLocationName, stLocationInfo )) { 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 4f3ccb87..096eeba4 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 @@ -142,7 +142,7 @@ private: private: CFbdDiagDataApiPtr m_ptrDiagData; //< Diagram数据接口 - kbd_net::CMbCommunicator *m_pMbComm{nullptr}; //< 消息总线通信器 + iot_net::CMbCommunicator *m_pMbComm{nullptr}; //< 消息总线通信器 SFbdModKey m_stModKey; //< 模块标识 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 c583e2a4..fa7420c1 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 @@ -59,7 +59,7 @@ int CBitSplit::init( const SFbdModKey &stModuleKey, const std::string & ) return kbdFailed; } - m_nOutputNum = kbd_public::StringToInt( strOutputNum ); + m_nOutputNum = iot_public::StringToInt( strOutputNum ); if ( m_nOutputNum < CN_MinOutputNum || m_nOutputNum > CN_MaxOutputNum ) //< 判断输出参数是否有效 { LOGERROR( "模块[%s]要求的输出参数个数最小=%d,最大=%d", 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 3d340667..1f7a49c2 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 @@ -90,7 +90,7 @@ int CDoCtrl::calculate() return kbdFailed; } - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; while ( m_pMbComm->recvMsg( objMsg, 0 )) { COptCtrlReply objParse; @@ -228,7 +228,7 @@ int CDoCtrl::reset( const bool bMaster ) if ( bMaster ) { if ( nullptr == m_pMbComm ) - m_pMbComm = new kbd_net::CMbCommunicator; + m_pMbComm = new iot_net::CMbCommunicator; //< 必须订阅所有专业，因为可能控制其他专业的测点 m_pMbComm->addSub( 0, CH_OPT_TO_HMI_OPTCMD_UP ); @@ -346,10 +346,10 @@ int CDoCtrl::handleCmd( SCmdOfOnePnt &stCmdOfOnePnt ) void CDoCtrl::sendCtrlCmd( SCtrlCmd &stCmd, const ECmdState eSuccessState, const ECmdState eFailState ) { - stCmd.lSendUtcMsec = kbd_public::getUTCTimeMsec(); - stCmd.lSendMonotonicMsec = kbd_public::getMonotonicMsec(); + stCmd.lSendUtcMsec = iot_public::getUTCTimeMsec(); + stCmd.lSendMonotonicMsec = iot_public::getMonotonicMsec(); - const kbd_public::SRunAppInfo &stRunAppInfo = getFbdSysInfoApi()->getCurrentRunAppInfo(); + const iot_public::SRunAppInfo &stRunAppInfo = getFbdSysInfoApi()->getCurrentRunAppInfo(); SOptCtrlRequest stReq; stReq.stHead.strSrcTag = m_stModKey.toString(); @@ -378,7 +378,7 @@ void CDoCtrl::sendCtrlCmd( SCtrlCmd &stCmd, const ECmdState eSuccessState, const return; } - kbd_net::CMbMessage objMsg( stCmd.strLastSendJsonReq, stCmd.nAppId, + iot_net::CMbMessage objMsg( stCmd.strLastSendJsonReq, stCmd.nAppId, CH_HMI_TO_OPT_OPTCMD_DOWN, MT_OPT_AUTO_CTRL_DOWN ); if ( m_pMbComm->sendMsgToDomain( objMsg, stCmd.nDstDomainId )) { @@ -399,7 +399,7 @@ void CDoCtrl::waitCtrlRep( SCmdOfOnePnt &stCmdOfOnePnt, const ECmdState eSuccess { SCtrlCmd &stCurrentCmd = *( stCmdOfOnePnt.m_ptrCurrentCmd ); - const long long lElapsedMs = kbd_public::getMonotonicMsec() - stCurrentCmd.lSendMonotonicMsec; + const long long lElapsedMs = iot_public::getMonotonicMsec() - stCurrentCmd.lSendMonotonicMsec; if ( lElapsedMs > stCurrentCmd.nTimeoutMsec || lElapsedMs < 0 ) { LOGERROR( "等待控制反馈超时，已等待时间[%lld]ms，原始控制请求：\n%s", @@ -486,8 +486,8 @@ int CDoCtrl::parseKeyIdTag( const std::string &strKeyIdTag, SCtrlCmd &stCtrlCmd return kbdFailed; } - kbd_public::SSubsystemInfo stSubsysInfo; - kbd_public::SLocationInfo stLocationInfo; + iot_public::SSubsystemInfo stSubsysInfo; + iot_public::SLocationInfo stLocationInfo; if ( kbdSuccess != ptrSysInfo->getSysInfo().getSubsystemInfoByName( stKeyInfo.strSubsystemName, stSubsysInfo ) || kbdSuccess != ptrSysInfo->getSysInfo().getLocationInfoByName( stKeyInfo.strLocationName, stLocationInfo )) { 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 1cf56e85..b1919671 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 @@ -142,7 +142,7 @@ private: private: CFbdDiagDataApiPtr m_ptrDiagData; //< Diagram数据接口 - kbd_net::CMbCommunicator *m_pMbComm{nullptr}; //< 消息总线通信器 + iot_net::CMbCommunicator *m_pMbComm{nullptr}; //< 消息总线通信器 SFbdModKey m_stModKey; //< 模块标识 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 e7abb5cc..bd712755 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 @@ -74,7 +74,7 @@ int CFourArithmetic::init( const SFbdModKey &stModuleKey, const std::string &str } //< 判断输入参数个数合法性 - int nInputNum = kbd_public::StringToInt( strInputNum ); + int nInputNum = iot_public::StringToInt( strInputNum ); if ( nInputNum < CN_MinInputNum ) { LOGERROR( "模块[%s]要求的最小输入参数为%d", stModuleKey.toString().c_str(), CN_MinInputNum ); 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 dd8660e4..7b57bc48 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 @@ -33,7 +33,7 @@ int CAnd::init( const CFbdDiagDataApiPtr &ptrDiagData, } //< 判断输入参数个数合法性 - m_nInputNum = kbd_public::StringToInt( strInputNum ); + m_nInputNum = iot_public::StringToInt( strInputNum ); if ( m_nInputNum < 2 ) { LOGERROR( "与运算输入参数个数必须大于等于2" ); 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 510dd615..abbc3a1f 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 @@ -30,7 +30,7 @@ int COr::init( const CFbdDiagDataApiPtr &ptrDiagData, } //< 判断输入参数个数合法性 - m_nInputNum = kbd_public::StringToInt( strInputNum ); + m_nInputNum = iot_public::StringToInt( strInputNum ); if ( m_nInputNum < 2 ) { LOGERROR( "与运算输入参数个数必须大于等于2" ); 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 62799d8c..f3a41435 100644 --- a/platform/src/application/app_fbd/fbd_module/lua/CLua.cpp +++ b/platform/src/application/app_fbd/fbd_module/lua/CLua.cpp @@ -251,7 +251,7 @@ int CLua::init( const SFbdModKey &stModuleKey, const std::string & ) } // 检查输入端口个数合法性 - m_nInputNum = kbd_public::StringToInt( sInputNum ); + m_nInputNum = iot_public::StringToInt( sInputNum ); g_nInputCount = m_nInputNum; if ( m_nInputNum < CN_MinIONum || m_nInputNum > CN_MaxIONum ) //< 判断是否有效 { @@ -279,7 +279,7 @@ int CLua::init( const SFbdModKey &stModuleKey, const std::string & ) } // 检查输出端口个数合法性 - m_nOutputNum = kbd_public::StringToInt( sOutputNum ); + m_nOutputNum = iot_public::StringToInt( sOutputNum ); g_nOutputCount = m_nOutputNum; if ( m_nOutputNum < CN_MinIONum || m_nOutputNum > CN_MaxIONum ) //< 判断是否有效 { 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 4d374e31..ff8b3f06 100644 --- a/platform/src/application/app_fbd/fbd_module/mux/Mux.cpp +++ b/platform/src/application/app_fbd/fbd_module/mux/Mux.cpp @@ -51,7 +51,7 @@ int CMux::init( const SFbdModKey &stModuleKey, const std::string & ) } //< 判断输入参数个数合法性 - m_nInputNum = kbd_public::StringToInt( strInputNum ); + m_nInputNum = iot_public::StringToInt( strInputNum ); if ( m_nInputNum < CN_MinInputNum ) { LOGERROR( "模块[%s]要求的最小输入参数为%d", stModuleKey.toString().c_str(), CN_MinInputNum ); 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 55b5ff3e..9f6346e3 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 @@ -74,11 +74,11 @@ int CPntInput::init( const SFbdModKey &stModuleKey, const std::string & ) //< 获取测点类型，用于判断状态字 if ( m_stPntInfo.strTableName == RT_DIG_TBL ) { - m_nPntType = kbd_service::TYPE_STATUS_DI; + m_nPntType = iot_service::TYPE_STATUS_DI; } else { - m_nPntType = kbd_service::TYPE_STATUS_AI; + m_nPntType = iot_service::TYPE_STATUS_AI; } } 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 f6d37c8a..44d38bed 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 @@ -48,7 +48,7 @@ CPntOutput::~CPntOutput() int CPntOutput::init( const SFbdModKey &stModuleKey, const std::string &strExtraParam ) { m_stModKey = stModuleKey; - int nSendInterval = kbd_public::StringToInt( strExtraParam ); //< 周期发送时间间隔，防止消息丢失 + int nSendInterval = iot_public::StringToInt( strExtraParam ); //< 周期发送时间间隔，防止消息丢失 if ( nSendInterval > 0 ) { m_nSendIntervalMsec = nSendInterval * MSEC_PER_SEC; @@ -107,7 +107,7 @@ int CPntOutput::calculate() } //< 到定时周期，或者与上次值发生变化 - int64 lCurTime = kbd_public::getMonotonicMsec(); + int64 lCurTime = iot_public::getMonotonicMsec(); if ( lCurTime - m_lLastSendTimeMsec > m_nSendIntervalMsec || stInput != m_stLastValAndSta ) { sendToDP( stInput ); @@ -179,8 +179,8 @@ int CPntOutput::parsePntInfo( const SLongKeyIdTagInfo &stPntInfo ) return kbdFailed; } - kbd_public::SSubsystemInfo stSubsystemInfo; - kbd_public::SLocationInfo stLocationInfo; + iot_public::SSubsystemInfo stSubsystemInfo; + iot_public::SLocationInfo stLocationInfo; if ( kbdSuccess != ptrSysInfo->getSysInfo().getSubsystemInfoByName( stPntInfo.strSubsystemName, stSubsystemInfo ) || kbdSuccess != ptrSysInfo->getSysInfo().getLocationInfoByName( stPntInfo.strLocationName, stLocationInfo )) { @@ -197,9 +197,9 @@ int CPntOutput::parsePntInfo( const SLongKeyIdTagInfo &stPntInfo ) int CPntOutput::sendToDP( const SFbdNumericValue &stValAndSta ) { - kbd_idlfile::SOptSetDataPkg objMsg; - kbd_idlfile::SOptDataPkgHead *pHead = objMsg.mutable_package_head(); - kbd_idlfile::SOptSetDataMsg *pData = objMsg.add_seq_set_data_info(); + iot_idl::SOptSetDataPkg objMsg; + iot_idl::SOptDataPkgHead *pHead = objMsg.mutable_package_head(); + iot_idl::SOptSetDataMsg *pData = objMsg.add_seq_set_data_info(); if ( pHead == nullptr || pData == nullptr ) { LOGERROR( "构建发送给数据处理的消息失败.模块=[%s]", m_stModKey.toString().c_str()); @@ -209,7 +209,7 @@ int CPntOutput::sendToDP( const SFbdNumericValue &stValAndSta ) pHead->set_str_src_tag( m_stModKey.toString()); pHead->set_b_not_alarm( true ); //< true-不会产生操作记录 pHead->set_n_point_type( m_nPntType ); //< 点类型,一个包中不允许包含多种类型的测点 - pHead->set_n_opt_time( kbd_public::getUTCTimeMsec()); + pHead->set_n_opt_time( iot_public::getUTCTimeMsec()); pData->set_str_tag_name( m_stPntInfo.strTagName ); @@ -226,12 +226,12 @@ int CPntOutput::sendToDP( const SFbdNumericValue &stValAndSta ) if ( m_nPntType == POINT_TYPE_DIG ) { - pData->mutable_var_value()->set_edatatype( kbd_idlfile::CN_DATATYPE_INT32 ); + pData->mutable_var_value()->set_edatatype( iot_idl::CN_DATATYPE_INT32 ); pData->mutable_var_value()->set_nvalue( static_cast(stValAndSta.m_dValue)); } else { - pData->mutable_var_value()->set_edatatype( kbd_idlfile::CN_DATATYPE_DOUBLE ); + pData->mutable_var_value()->set_edatatype( iot_idl::CN_DATATYPE_DOUBLE ); pData->mutable_var_value()->set_dvalue( stValAndSta.m_dValue ); } @@ -249,8 +249,8 @@ int CPntOutput::sendToDP( const SFbdNumericValue &stValAndSta ) int CPntOutput::sendMsg( const std::string &strMsg ) { - kbd_net::CMbMessage objMsg( strMsg, m_nAppIdOfPnt, CH_OPT_TO_SCADA_VALUE_SET, - kbd_idlfile::MT_OPT_SET_CAL_DATA_DOWN ); + iot_net::CMbMessage objMsg( strMsg, m_nAppIdOfPnt, CH_OPT_TO_SCADA_VALUE_SET, + iot_idl::MT_OPT_SET_CAL_DATA_DOWN ); objMsg.setPara1( m_nDomainIdOfPnt ); //TODO:需要填写吗？ if ( !m_objCommunicator.sendMsgToDomain( objMsg, m_nDomainIdOfPnt )) //< 发送到测点所在域 @@ -266,7 +266,7 @@ int CPntOutput::sendMsg( const std::string &strMsg ) int CPntOutput::getPntStatusMenu( const int nPntType ) { - kbd_service::CDataProcessApiPtr ptrDP = kbd_service::getDataProcInstance(); + iot_service::CDataProcessApiPtr ptrDP = iot_service::getDataProcInstance(); if ( ptrDP == nullptr ) { LOGERROR( "getDataProcInstance失败" ); 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 84bfc52e..82556fdb 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 @@ -82,7 +82,7 @@ private: SFbdValueKey m_stInKey1; //< 输入参数1 SFbdNumericValue m_stLastValAndSta; //< 记录上一次的值 - kbd_net::CMbCommunicator m_objCommunicator; //< 通信器 + iot_net::CMbCommunicator m_objCommunicator; //< 通信器 }; BOOST_DLL_ALIAS( 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 f9b24e7e..eedd2d22 100644 --- a/platform/src/application/app_push/app_push_server/MbMsgMng.h +++ b/platform/src/application/app_push/app_push_server/MbMsgMng.h @@ -10,7 +10,7 @@ namespace kbd_app { -typedef boost::shared_ptr CMbMessagePtr; +typedef boost::shared_ptr CMbMessagePtr; class CMbMsgMng { 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 3149e14e..2e0e070d 100644 --- a/platform/src/application/app_push/app_push_server/PushConfigParse.cpp +++ b/platform/src/application/app_push/app_push_server/PushConfigParse.cpp @@ -14,7 +14,7 @@ CPushConfigParse::~CPushConfigParse() = default; int CPushConfigParse::initialize() { //1.获取配置文件绝对路径 - const boost::filesystem::path objFullPath = kbd_public::CFileUtil::getPathOfCfgFile("push_server.xml"); + const boost::filesystem::path objFullPath = iot_public::CFileUtil::getPathOfCfgFile("push_server.xml"); if ( objFullPath.empty()) { LOGERROR( "获取配置文件路径失败" ); 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 3f0d12d3..1904728d 100644 --- a/platform/src/application/app_push/app_push_server/PushServerApp.cpp +++ b/platform/src/application/app_push/app_push_server/PushServerApp.cpp @@ -7,10 +7,10 @@ using namespace std; -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_sys; using namespace kbd_app; -using namespace kbd_net; +using namespace iot_net; #include 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 19458ded..9221bfc0 100644 --- a/platform/src/application/app_push/app_push_server/PushServerApp.h +++ b/platform/src/application/app_push/app_push_server/PushServerApp.h @@ -11,7 +11,7 @@ namespace kbd_app { -class CPushServerApp: public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface +class CPushServerApp: public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CPushServerApp(); @@ -90,12 +90,12 @@ private: private: std::string m_strAppName; //< 应用名 - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 std::string m_strStartArgs; //< 保存进程启动参数 - kbd_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundancyMng; //< 冗余管理类 + iot_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 + iot_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 + iot_sys::CRedundantMngInterfacePtr m_ptrRedundancyMng; //< 冗余管理类 CPushSrvMngPtr m_ptrPushSvrMng; //< FBD服务管理类 }; 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 fd0cc667..57e4d984 100644 --- a/platform/src/application/app_push/app_push_server/PushSrvMng.cpp +++ b/platform/src/application/app_push/app_push_server/PushSrvMng.cpp @@ -3,8 +3,8 @@ -kbd_app::CPushSrvMng::CPushSrvMng( const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng ) +kbd_app::CPushSrvMng::CPushSrvMng( const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng ) : m_stRunAppInfo( stRunAppInfo ), m_ptrProcMng( ptrProcMng ), m_ptrConfigParse( nullptr ), 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 5679c05c..3bdbec4a 100644 --- a/platform/src/application/app_push/app_push_server/PushSrvMng.h +++ b/platform/src/application/app_push/app_push_server/PushSrvMng.h @@ -13,11 +13,11 @@ namespace kbd_app { -class CPushSrvMng : public kbd_sys::CRedundantSwitchInterface +class CPushSrvMng : public iot_sys::CRedundantSwitchInterface { public: - CPushSrvMng( const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng ); + CPushSrvMng( const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng ); virtual ~CPushSrvMng(); /** @brief 冗余切换，应用需要继承并重写，实现自身的冗余切换逻辑 在进程切换过程中，可能会被调用多次切换，业务进程需要保证幂等，无副作用 @@ -33,8 +33,8 @@ public: int initialize(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 CPushConfigParsePtr m_ptrConfigParse; CMbMsgMngPtr m_ptrMbMsgMng; CRecvMsgThreadPtr m_ptrRecvMsgThread; 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 910486b7..bb60f303 100644 --- a/platform/src/application/app_push/app_push_server/PushWorkThread.cpp +++ b/platform/src/application/app_push/app_push_server/PushWorkThread.cpp @@ -6,10 +6,10 @@ namespace kbd_app{ -CPushWorkThread::CPushWorkThread(kbd_public::SRunAppInfo stRunAppInfo, +CPushWorkThread::CPushWorkThread(iot_public::SRunAppInfo stRunAppInfo, CPushConfigParsePtr ptrConfigParse, CMbMsgMngPtr ptrMbMsgMng) - : kbd_public::CTimerThreadBase( "CPushWorkThread", 1000 ), + : iot_public::CTimerThreadBase( "CPushWorkThread", 1000 ), m_stRunAppInfo( std::move( stRunAppInfo )), m_ptrConfigParse( ptrConfigParse), m_ptrMbMsgMng(ptrMbMsgMng) @@ -87,7 +87,7 @@ int CPushWorkThread::redundantSwitch(bool bMaster, bool bSlave) std::string CPushWorkThread::getPushPluginsPath() { namespace fs = boost::filesystem; - fs::path dllPath = kbd_public::CFileUtil::getCurModuleDir(); + fs::path dllPath = iot_public::CFileUtil::getCurModuleDir(); dllPath /= CN_DllPath; return dllPath.string(); } 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 cdc68c38..e292782f 100644 --- a/platform/src/application/app_push/app_push_server/PushWorkThread.h +++ b/platform/src/application/app_push/app_push_server/PushWorkThread.h @@ -10,10 +10,10 @@ namespace kbd_app { -class CPushWorkThread final : public kbd_public::CTimerThreadBase +class CPushWorkThread final : public iot_public::CTimerThreadBase { public: - CPushWorkThread(kbd_public::SRunAppInfo stRunAppInfo, + CPushWorkThread(iot_public::SRunAppInfo stRunAppInfo, CPushConfigParsePtr ptrConfigParse, CMbMsgMngPtr ptrMbMsgMng); ~CPushWorkThread() override; @@ -36,7 +36,7 @@ private: typedef boost::function PluginApiFunc; //< 模块动态库函数 typedef std::map DllToFuncPtrMAP;//< dll名称-->导出函数 - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; std::vector m_vecType; typedef std::map TypeToModPtrMAP; DllToFuncPtrMAP m_mapDllHandle; //< 本组加载的动态库 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 03be6e41..1587337b 100644 --- a/platform/src/application/app_push/app_push_server/RecvMsgThread.cpp +++ b/platform/src/application/app_push/app_push_server/RecvMsgThread.cpp @@ -5,10 +5,10 @@ namespace kbd_app { -CRecvMsgThread::CRecvMsgThread(kbd_public::SRunAppInfo stRunAppInfo , +CRecvMsgThread::CRecvMsgThread(iot_public::SRunAppInfo stRunAppInfo , CPushConfigParsePtr ptrConfigParse, CMbMsgMngPtr ptrMbMsgMng) - : kbd_public::CTimerThreadBase( "CRecvMsgThread", 1000 ), + : iot_public::CTimerThreadBase( "CRecvMsgThread", 1000 ), m_stRunAppInfo(std::move( stRunAppInfo )), m_ptrConfigParse( ptrConfigParse), m_ptrMbMsgMng(ptrMbMsgMng) @@ -56,7 +56,7 @@ int CRecvMsgThread::unsubscribeMessage() m_objCommunicator.delSub(0, 0); /* @brief 清空消息总线中的数据 */ - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; while ( m_objCommunicator.recvMsg( objMsg, 0 )) { } @@ -68,7 +68,7 @@ int CRecvMsgThread::unsubscribeMessage() void CRecvMsgThread::execute() { - CMbMessagePtr ptrMsg = boost::make_shared(); + CMbMessagePtr ptrMsg = boost::make_shared(); if ( m_objCommunicator.recvMsg( *ptrMsg )) { if ( ptrMsg->getChannelID() != CH_PSH_APP_TO_SRV_PRTBF) 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 818e2ddf..630ba697 100644 --- a/platform/src/application/app_push/app_push_server/RecvMsgThread.h +++ b/platform/src/application/app_push/app_push_server/RecvMsgThread.h @@ -13,10 +13,10 @@ namespace kbd_app { -class CRecvMsgThread final : public kbd_public::CTimerThreadBase +class CRecvMsgThread final : public iot_public::CTimerThreadBase { public: - explicit CRecvMsgThread( kbd_public::SRunAppInfo stRunAppInfo , + explicit CRecvMsgThread( iot_public::SRunAppInfo stRunAppInfo , CPushConfigParsePtr ptrConfigParse, CMbMsgMngPtr ptrMbMsgMng); ~CRecvMsgThread() override; @@ -50,8 +50,8 @@ private: private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_net::CMbCommunicator m_objCommunicator; //< 通信器 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_net::CMbCommunicator m_objCommunicator; //< 通信器 CPushConfigParsePtr m_ptrConfigParse; CMbMsgMngPtr m_ptrMbMsgMng; std::vector m_vecType; // 模块类型ID; diff --git a/platform/src/application/app_push/include/BasePushModule.h b/platform/src/application/app_push/include/BasePushModule.h index 8658bc45..1d01a667 100644 --- a/platform/src/application/app_push/include/BasePushModule.h +++ b/platform/src/application/app_push/include/BasePushModule.h @@ -28,13 +28,13 @@ public: * @param strModuleName 当前模块名 * @param strExtraParam 额外的参数，方便模块复用 */ - virtual int init( const kbd_public::SRunAppInfo &stRunAppInfo, + virtual int init( const iot_public::SRunAppInfo &stRunAppInfo, const std::string &strModuleName, const std::string &strExtraParam ) = 0; /** * 接收并发送 */ - virtual int recvAndSend(boost::shared_ptr msg) = 0; + virtual int recvAndSend(boost::shared_ptr msg) = 0; }; @@ -50,7 +50,7 @@ inline void insertPushRecord( bool result) { - kbd_dbms::CDbApi DbWriteApi(DB_CONN_MODEL_WRITE); + iot_dbms::CDbApi DbWriteApi(DB_CONN_MODEL_WRITE); if(!DbWriteApi.open()) { LOGINFO("cannot get WriteableDb"); 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 d99fd819..56116a17 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 @@ -29,14 +29,14 @@ bool split(std::string str, const std::string & token,std::vector & } -int kbd_app::CBbniotVsms::init(const kbd_public::SRunAppInfo &/*stRunAppInfo*/, const std::string &/*strModuleName*/, const std::string &/*strExtraParam*/) +int kbd_app::CBbniotVsms::init(const iot_public::SRunAppInfo &/*stRunAppInfo*/, const std::string &/*strModuleName*/, const std::string &/*strExtraParam*/) { return kbdSuccess; } -int kbd_app::CBbniotVsms::recvAndSend(boost::shared_ptr msg) +int kbd_app::CBbniotVsms::recvAndSend(boost::shared_ptr msg) { - kbd_idlfile::SBBNIOT_VSMS objData; + iot_idl::SBBNIOT_VSMS objData; if ( !objData.ParseFromArray( msg->getDataPtr(), static_cast(msg->getDataSize()))) { LOGERROR( "解析SBBNIOT_VSMS消息失败" ); 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 bf3ede90..5ffb06e5 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 @@ -18,11 +18,11 @@ public: * @param strModuleName 当前模块名 * @param strExtraParam 额外的参数，方便模块复用 */ - int init( const kbd_public::SRunAppInfo &stRunAppInfo, + int init( const iot_public::SRunAppInfo &stRunAppInfo, const std::string &strModuleName, const std::string &strExtraParam ) override; - int recvAndSend(boost::shared_ptr msg) override; + int recvAndSend(boost::shared_ptr msg) override; // Factory method static boost::shared_ptr create(); 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 4905cccb..848b85b4 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 @@ -13,16 +13,16 @@ kbd_app::CSmtpMail::~CSmtpMail() } -int kbd_app::CSmtpMail::init(const kbd_public::SRunAppInfo &/*stRunAppInfo*/, +int kbd_app::CSmtpMail::init(const iot_public::SRunAppInfo &/*stRunAppInfo*/, const std::string &/*strModuleName*/, const std::string &/*strExtraParam*/) { return kbdSuccess; } -int kbd_app::CSmtpMail::recvAndSend(boost::shared_ptr msg) +int kbd_app::CSmtpMail::recvAndSend(boost::shared_ptr msg) { - kbd_idlfile::SSMTP_MAIL objData; + iot_idl::SSMTP_MAIL objData; if ( !objData.ParseFromArray( msg->getDataPtr(), static_cast(msg->getDataSize()))) { LOGERROR( "解析SSMTP_MAIL消息失败" ); @@ -36,9 +36,9 @@ int kbd_app::CSmtpMail::recvAndSend(boost::shared_ptr msg) objData.password(), objData.server_address(), objData.port()); - if(objData.connecttiontype() == kbd_idlfile::SSMTP_MAIL_enConnectionType_CT_SSL_CONNECTION) + if(objData.connecttiontype() == iot_idl::SSMTP_MAIL_enConnectionType_CT_SSL_CONNECTION) objSendMail.SetConType(CSmtpSendMail::EM_SSL_CONNECTION); - else if (objData.connecttiontype() == kbd_idlfile::SSMTP_MAIL_enConnectionType_CT_TLS_CONNECTION) + else if (objData.connecttiontype() == iot_idl::SSMTP_MAIL_enConnectionType_CT_TLS_CONNECTION) objSendMail.SetConType(CSmtpSendMail::EM_TLS_CONNECTION); else objSendMail.SetConType(CSmtpSendMail::EM_TCP_CONNECTION); //默认TCP连接 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 30261872..2b9e8077 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 @@ -20,11 +20,11 @@ public: * @param strModuleName 当前模块名 * @param strExtraParam 额外的参数，方便模块复用 */ - int init( const kbd_public::SRunAppInfo &stRunAppInfo, + int init( const iot_public::SRunAppInfo &stRunAppInfo, const std::string &strModuleName, const std::string &strExtraParam ) override; - int recvAndSend(boost::shared_ptr msg) override; + int recvAndSend(boost::shared_ptr msg) override; // Factory method static boost::shared_ptr create(); diff --git a/platform/src/application/push_debug/MainWindow.cpp b/platform/src/application/push_debug/MainWindow.cpp index 6eaa212f..45f69ac1 100644 --- a/platform/src/application/push_debug/MainWindow.cpp +++ b/platform/src/application/push_debug/MainWindow.cpp @@ -76,16 +76,16 @@ void MainWindow::sendMail_clicked() return; } - kbd_idlfile::SSMTP_MAIL mail; + iot_idl::SSMTP_MAIL mail; mail.set_server_address(ui->lineEdit_srvAddr->text().toStdString().c_str()); mail.set_port(QString::number(ui->spinBox_port->value()).toStdString().c_str()); if(ui->comboBox_connectionType->currentIndex() == 0) { - mail.set_connecttiontype(kbd_idlfile::SSMTP_MAIL_enConnectionType_CT_TCP_CONNECTION); + mail.set_connecttiontype(iot_idl::SSMTP_MAIL_enConnectionType_CT_TCP_CONNECTION); }else if(ui->comboBox_connectionType->currentIndex() == 1){ - mail.set_connecttiontype(kbd_idlfile::SSMTP_MAIL_enConnectionType_CT_SSL_CONNECTION); + mail.set_connecttiontype(iot_idl::SSMTP_MAIL_enConnectionType_CT_SSL_CONNECTION); }else{ - mail.set_connecttiontype(kbd_idlfile::SSMTP_MAIL_enConnectionType_CT_TLS_CONNECTION); + mail.set_connecttiontype(iot_idl::SSMTP_MAIL_enConnectionType_CT_TLS_CONNECTION); } mail.set_sender(ui->lineEdit_sender->text().toStdString().c_str()); @@ -96,8 +96,8 @@ void MainWindow::sendMail_clicked() mail.set_content(ui->plainTextEdit_content->toPlainText().toStdString().c_str()); mail.set_time(QDateTime::currentMSecsSinceEpoch()); - kbd_net::CMbMessage msg; - msg.setMsgType(kbd_idlfile::MT_PUSH_SMTP_MAIL); + iot_net::CMbMessage msg; + msg.setMsgType(iot_idl::MT_PUSH_SMTP_MAIL); msg.setData(mail); msg.setSubject(CN_AppId_COMAPP,CH_PSH_APP_TO_SRV_PRTBF); @@ -127,7 +127,7 @@ void MainWindow::sendBbiot_clicked() } - kbd_idlfile::SBBNIOT_VSMS vsmsMsg; + iot_idl::SBBNIOT_VSMS vsmsMsg; vsmsMsg.set_server_address(ui->lineEdit_bbiot_srvAddr->text().toStdString().c_str()); if(ui->comboBox_bbit_method->currentIndex() == 0) { @@ -144,8 +144,8 @@ void MainWindow::sendBbiot_clicked() vsmsMsg.set_content(ui->lineEdit_bbiot_content->text().toStdString().c_str()); vsmsMsg.set_time(QDateTime::currentMSecsSinceEpoch()); - kbd_net::CMbMessage msg; - msg.setMsgType(kbd_idlfile::MT_PUSH_BBNIOT_VSMS); + iot_net::CMbMessage msg; + msg.setMsgType(iot_idl::MT_PUSH_BBNIOT_VSMS); msg.setData(vsmsMsg); msg.setSubject(CN_AppId_COMAPP,CH_PSH_APP_TO_SRV_PRTBF); @@ -161,7 +161,7 @@ void MainWindow::refreshHis() { ui->tableWidget_pushHis->setRowCount(0); - kbd_dbms::CDbApi DbReadApi(DB_CONN_MODEL_READ); + iot_dbms::CDbApi DbReadApi(DB_CONN_MODEL_READ); if(!DbReadApi.open()) { QMessageBox::information(this,"提示","无法连接数据库"); @@ -209,7 +209,7 @@ void MainWindow::emptyHis() return ; } - kbd_dbms::CDbApi DbReadApi(DB_CONN_MODEL_WRITE); + iot_dbms::CDbApi DbReadApi(DB_CONN_MODEL_WRITE); if(!DbReadApi.open()) { QMessageBox::information(this,"提示","无法连接数据库"); diff --git a/platform/src/application/push_debug/MainWindow.h b/platform/src/application/push_debug/MainWindow.h index fa3749a1..e65dd773 100644 --- a/platform/src/application/push_debug/MainWindow.h +++ b/platform/src/application/push_debug/MainWindow.h @@ -25,7 +25,7 @@ private slots: private: Ui::MainWindow *ui; - kbd_net::CMbCommunicator m_objComm; //< 通信器 + iot_net::CMbCommunicator m_objComm; //< 通信器 }; diff --git a/platform/src/application/push_debug/main.cpp b/platform/src/application/push_debug/main.cpp index 36b015d1..33a24a93 100644 --- a/platform/src/application/push_debug/main.cpp +++ b/platform/src/application/push_debug/main.cpp @@ -9,7 +9,7 @@ int main(int argc, char *argv[]) kbd_common::doQtAppGlobalSet(); QApplication a(argc, argv); - kbd_net::initMsgBus("push_debug",""); + iot_net::initMsgBus("push_debug",""); int result; { MainWindow w; @@ -18,6 +18,6 @@ int main(int argc, char *argv[]) result = a.exec(); } - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); return result; } diff --git a/platform/src/application/sim_interlock_api/SimInterLockImpl.cpp b/platform/src/application/sim_interlock_api/SimInterLockImpl.cpp index 0db7cd08..6d3fd1a5 100644 --- a/platform/src/application/sim_interlock_api/SimInterLockImpl.cpp +++ b/platform/src/application/sim_interlock_api/SimInterLockImpl.cpp @@ -9,8 +9,8 @@ #include "db_sysinfo_api/CDbSysInfo.h" using namespace std; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; kbd_app::CSimInterLockImpl::CSimInterLockImpl() { @@ -121,7 +121,7 @@ bool kbd_app::CSimInterLockImpl::loadInfoFromDB(const std::string &strTagList) CDbApi objConnect(DB_CONN_MODEL_READ); if (false == objConnect.open()) { - kbd_dbms::CDbPara objDbParam = objConnect.getCurrentDbPara() ; + iot_dbms::CDbPara objDbParam = objConnect.getCurrentDbPara() ; LOGERROR("连接模型库失败.host_name=[%s],db_name=[%s],user_name=[%s],passwd=[%s],port=[%d]", objDbParam.getHostName().toStdString().c_str(), objDbParam.getDatabaseName().toStdString().c_str(), @@ -154,7 +154,7 @@ bool kbd_app::CSimInterLockImpl::loadInfoFromDB(const std::string &strTagList) } /* @brief 加载闭锁参数信息 */ -bool kbd_app::CSimInterLockImpl::loadInterlockParam(kbd_dbms::CDbApi &objDBConnect, +bool kbd_app::CSimInterLockImpl::loadInterlockParam(iot_dbms::CDbApi &objDBConnect, const std::string &strTagList, std::string &strFuncNameList) { @@ -231,7 +231,7 @@ bool kbd_app::CSimInterLockImpl::loadInterlockParam(kbd_dbms::CDbApi &objDBConne } /* @brief 加载闭锁函数信息 */ -bool kbd_app::CSimInterLockImpl::loadInterlockDef(kbd_dbms::CDbApi &objDBConnect, +bool kbd_app::CSimInterLockImpl::loadInterlockDef(iot_dbms::CDbApi &objDBConnect, const std::string &strFuncNameList) { if (strFuncNameList.empty()) @@ -259,7 +259,7 @@ bool kbd_app::CSimInterLockImpl::loadInterlockDef(kbd_dbms::CDbApi &objDBConnect } /* @brief 加载数字量信息 */ -bool kbd_app::CSimInterLockImpl::loadDigitalInfo(kbd_dbms::CDbApi &objDBConnect, +bool kbd_app::CSimInterLockImpl::loadDigitalInfo(iot_dbms::CDbApi &objDBConnect, const std::string &strTagList) { if (strTagList.empty()) @@ -333,10 +333,10 @@ bool kbd_app::CSimInterLockImpl::checkInterlock(const std::string &strKeyIdTag, return false; } - kbd_public::LuaVariantTypeSeq vecCtrlValue; - kbd_public::LuaVariantTypeSeq vecInputValue; - kbd_public::LuaVariantTypeSeq vecInputStatus; - kbd_public::LuaVariantTypeSeq vecInputName; + iot_public::LuaVariantTypeSeq vecCtrlValue; + iot_public::LuaVariantTypeSeq vecInputValue; + iot_public::LuaVariantTypeSeq vecInputStatus; + iot_public::LuaVariantTypeSeq vecInputName; vecCtrlValue.push_back(nCtrlValue); for (int i = 0; i < stInterlockInfo.nInputNum; ++i) diff --git a/platform/src/application/sim_interlock_api/SimInterLockImpl.h b/platform/src/application/sim_interlock_api/SimInterLockImpl.h index 4a856324..58cf384f 100644 --- a/platform/src/application/sim_interlock_api/SimInterLockImpl.h +++ b/platform/src/application/sim_interlock_api/SimInterLockImpl.h @@ -98,31 +98,31 @@ namespace kbd_app /** @brief 加载闭锁参数信息 - @param kbd_dbms::CQDbInterface & objDBConnect 模型库连接 + @param iot_dbms::CQDbInterface & objDBConnect 模型库连接 @param const std::string & strTagList 测点列表 @param std::string & strFuncNameList 返回的闭锁函数列表 @return 成功返回true，失败返回false */ - bool loadInterlockParam(kbd_dbms::CDbApi &objDBConnect, + bool loadInterlockParam(iot_dbms::CDbApi &objDBConnect, const std::string &strTagList, std::string &strFuncNameList); /** @brief 加载闭锁函数信息 - @param kbd_dbms::CQDbInterface & objDBConnect 模型库连接 + @param iot_dbms::CQDbInterface & objDBConnect 模型库连接 @param const std::string & strFuncNameList 闭锁函数列表 @return 成功返回true，失败返回false */ - bool loadInterlockDef(kbd_dbms::CDbApi &objDBConnect, + bool loadInterlockDef(iot_dbms::CDbApi &objDBConnect, const std::string &strFuncNameList); /** @brief 加载数字量信息 - @param kbd_dbms::CQDbInterface & objDBConnect 模型库连接 + @param iot_dbms::CQDbInterface & objDBConnect 模型库连接 @param const std::string & strTagList 测点列表 @return 成功返回true，失败返回false */ - bool loadDigitalInfo(kbd_dbms::CDbApi &objDBConnect, + bool loadDigitalInfo(iot_dbms::CDbApi &objDBConnect, const std::string &strTagList); /** diff --git a/platform/src/dbms/db_api_ex/CDbApi.cpp b/platform/src/dbms/db_api_ex/CDbApi.cpp index 4b083d50..af38ef18 100644 --- a/platform/src/dbms/db_api_ex/CDbApi.cpp +++ b/platform/src/dbms/db_api_ex/CDbApi.cpp @@ -1,7 +1,7 @@ #include "db_api_ex/CDbApi.h" #include "CDbApi_impl.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbApi::CDbApi( EDbConnType eType ) { diff --git a/platform/src/dbms/db_api_ex/CDbApi_impl.cpp b/platform/src/dbms/db_api_ex/CDbApi_impl.cpp index 5beec2b2..49a34a30 100644 --- a/platform/src/dbms/db_api_ex/CDbApi_impl.cpp +++ b/platform/src/dbms/db_api_ex/CDbApi_impl.cpp @@ -3,8 +3,8 @@ #include using namespace std; -using namespace kbd_dbms; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_public; #define CN_SYNC_TABLENAME "dbop_list" #define CN_SYNC_COLNAME "statement" diff --git a/platform/src/dbms/db_api_ex/CDbApi_impl.h b/platform/src/dbms/db_api_ex/CDbApi_impl.h index e1dc5c58..d1a203a5 100644 --- a/platform/src/dbms/db_api_ex/CDbApi_impl.h +++ b/platform/src/dbms/db_api_ex/CDbApi_impl.h @@ -6,7 +6,7 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "db_api_ex/EDbConnType.h" -namespace kbd_dbms +namespace iot_dbms { /** @@ -123,7 +123,7 @@ private: CDbBaseApi* m_pDbBase; // 基础数据库接口 QList m_listFirstDbPara; // 中心域的所有数据库连接参数 QList m_listLocalDbPara; // 本地域的所有数据库连接参数 - kbd_public::CSysInfoInterfacePtr m_pSysInfo; + iot_public::CSysInfoInterfacePtr m_pSysInfo; QList m_listSql; // 已执行未提交的sql语句 bool m_bReadable; // 当前连接的数据库是否可读 bool m_bWritable; // 当前连接的数据库是否可写 diff --git a/platform/src/dbms/db_base_api/CDbBaseApi.cpp b/platform/src/dbms/db_base_api/CDbBaseApi.cpp index 54e87752..afe79438 100644 --- a/platform/src/dbms/db_base_api/CDbBaseApi.cpp +++ b/platform/src/dbms/db_base_api/CDbBaseApi.cpp @@ -6,7 +6,7 @@ #include "CDbOpenGaussApi.h" #include "CDbKingbaseApi.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbBaseApi::CDbBaseApi() { diff --git a/platform/src/dbms/db_base_api/CDbBaseApi_impl.cpp b/platform/src/dbms/db_base_api/CDbBaseApi_impl.cpp index 65eac9d9..2f916ec0 100644 --- a/platform/src/dbms/db_base_api/CDbBaseApi_impl.cpp +++ b/platform/src/dbms/db_base_api/CDbBaseApi_impl.cpp @@ -1,6 +1,6 @@ #include "CDbBaseApi_impl.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbBaseApi_impl::CDbBaseApi_impl() { diff --git a/platform/src/dbms/db_base_api/CDbBaseApi_impl.h b/platform/src/dbms/db_base_api/CDbBaseApi_impl.h index 4aab45ca..d97564c5 100644 --- a/platform/src/dbms/db_base_api/CDbBaseApi_impl.h +++ b/platform/src/dbms/db_base_api/CDbBaseApi_impl.h @@ -8,7 +8,7 @@ #include "db_base_api/CDbCondition.h" #include "db_base_api/CDbOrder.h" -namespace kbd_dbms +namespace iot_dbms { /** diff --git a/platform/src/dbms/db_base_api/CDbCondition.cpp b/platform/src/dbms/db_base_api/CDbCondition.cpp index d22ae07b..7d1c02f4 100644 --- a/platform/src/dbms/db_base_api/CDbCondition.cpp +++ b/platform/src/dbms/db_base_api/CDbCondition.cpp @@ -1,6 +1,6 @@ #include "db_base_api/CDbCondition.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbCondition::CDbCondition() : m_sColName( "" ) diff --git a/platform/src/dbms/db_base_api/CDbKingbaseApi.cpp b/platform/src/dbms/db_base_api/CDbKingbaseApi.cpp index 1ad46bb3..f45866f2 100644 --- a/platform/src/dbms/db_base_api/CDbKingbaseApi.cpp +++ b/platform/src/dbms/db_base_api/CDbKingbaseApi.cpp @@ -1,6 +1,6 @@ #include "CDbKingbaseApi.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbKingbaseApi::CDbKingbaseApi( const CDbPara& objDbPara ) : CDbBaseApi_impl( objDbPara ) diff --git a/platform/src/dbms/db_base_api/CDbKingbaseApi.h b/platform/src/dbms/db_base_api/CDbKingbaseApi.h index 795f388e..7c7cc796 100644 --- a/platform/src/dbms/db_base_api/CDbKingbaseApi.h +++ b/platform/src/dbms/db_base_api/CDbKingbaseApi.h @@ -3,7 +3,7 @@ #include "CDbBaseApi_impl.h" -namespace kbd_dbms +namespace iot_dbms { class CDbKingbaseApi : public CDbBaseApi_impl diff --git a/platform/src/dbms/db_base_api/CDbMySQLApi.cpp b/platform/src/dbms/db_base_api/CDbMySQLApi.cpp index 698da4f3..36af310d 100644 --- a/platform/src/dbms/db_base_api/CDbMySQLApi.cpp +++ b/platform/src/dbms/db_base_api/CDbMySQLApi.cpp @@ -1,6 +1,6 @@ #include "CDbMySQLApi.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbMySQLApi::CDbMySQLApi() : CDbBaseApi_impl() diff --git a/platform/src/dbms/db_base_api/CDbMySQLApi.h b/platform/src/dbms/db_base_api/CDbMySQLApi.h index e8ffb047..0aeb5156 100644 --- a/platform/src/dbms/db_base_api/CDbMySQLApi.h +++ b/platform/src/dbms/db_base_api/CDbMySQLApi.h @@ -3,7 +3,7 @@ #include "CDbBaseApi_impl.h" -namespace kbd_dbms +namespace iot_dbms { class CDbMySQLApi : public CDbBaseApi_impl diff --git a/platform/src/dbms/db_base_api/CDbOciApi.cpp b/platform/src/dbms/db_base_api/CDbOciApi.cpp index a617ce86..59895a10 100644 --- a/platform/src/dbms/db_base_api/CDbOciApi.cpp +++ b/platform/src/dbms/db_base_api/CDbOciApi.cpp @@ -1,6 +1,6 @@ #include "CDbOciApi.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbOciApi::CDbOciApi() : CDbBaseApi_impl() diff --git a/platform/src/dbms/db_base_api/CDbOciApi.h b/platform/src/dbms/db_base_api/CDbOciApi.h index e0a98162..53cd7bc7 100644 --- a/platform/src/dbms/db_base_api/CDbOciApi.h +++ b/platform/src/dbms/db_base_api/CDbOciApi.h @@ -3,7 +3,7 @@ #include "CDbBaseApi_impl.h" -namespace kbd_dbms +namespace iot_dbms { class CDbOciApi : public CDbBaseApi_impl diff --git a/platform/src/dbms/db_base_api/CDbOpenGaussApi.cpp b/platform/src/dbms/db_base_api/CDbOpenGaussApi.cpp index 9da66264..f97fa742 100644 --- a/platform/src/dbms/db_base_api/CDbOpenGaussApi.cpp +++ b/platform/src/dbms/db_base_api/CDbOpenGaussApi.cpp @@ -1,6 +1,6 @@ #include "CDbOpenGaussApi.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbOpenGaussApi::CDbOpenGaussApi( const CDbPara& objDbPara ) : CDbBaseApi_impl( objDbPara ) diff --git a/platform/src/dbms/db_base_api/CDbOpenGaussApi.h b/platform/src/dbms/db_base_api/CDbOpenGaussApi.h index 41ed62c2..d25e5caa 100644 --- a/platform/src/dbms/db_base_api/CDbOpenGaussApi.h +++ b/platform/src/dbms/db_base_api/CDbOpenGaussApi.h @@ -3,7 +3,7 @@ #include "CDbBaseApi_impl.h" -namespace kbd_dbms +namespace iot_dbms { class CDbOpenGaussApi : public CDbBaseApi_impl diff --git a/platform/src/dbms/db_base_api/CDbOrder.cpp b/platform/src/dbms/db_base_api/CDbOrder.cpp index 2004c6bc..e848251a 100644 --- a/platform/src/dbms/db_base_api/CDbOrder.cpp +++ b/platform/src/dbms/db_base_api/CDbOrder.cpp @@ -1,6 +1,6 @@ #include "db_base_api/CDbOrder.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbOrder::CDbOrder() : m_sColName( "" ) diff --git a/platform/src/dbms/db_base_api/CDbPara.cpp b/platform/src/dbms/db_base_api/CDbPara.cpp index b97ccb6c..93a3ec17 100644 --- a/platform/src/dbms/db_base_api/CDbPara.cpp +++ b/platform/src/dbms/db_base_api/CDbPara.cpp @@ -1,6 +1,6 @@ #include "db_base_api/CDbPara.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbPara::CDbPara() { diff --git a/platform/src/dbms/db_base_api/CDbSQLiteApi.cpp b/platform/src/dbms/db_base_api/CDbSQLiteApi.cpp index d4bdc1ec..7d894f07 100644 --- a/platform/src/dbms/db_base_api/CDbSQLiteApi.cpp +++ b/platform/src/dbms/db_base_api/CDbSQLiteApi.cpp @@ -1,6 +1,6 @@ #include "CDbSQLiteApi.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbSQLiteApi::CDbSQLiteApi() : CDbBaseApi_impl() diff --git a/platform/src/dbms/db_base_api/CDbSQLiteApi.h b/platform/src/dbms/db_base_api/CDbSQLiteApi.h index 25a9d1a6..e17b7a97 100644 --- a/platform/src/dbms/db_base_api/CDbSQLiteApi.h +++ b/platform/src/dbms/db_base_api/CDbSQLiteApi.h @@ -3,7 +3,7 @@ #include "CDbBaseApi_impl.h" -namespace kbd_dbms +namespace iot_dbms { class CDbSQLiteApi : public CDbBaseApi_impl diff --git a/platform/src/dbms/db_his_data_srv/CDumpUtils.cpp b/platform/src/dbms/db_his_data_srv/CDumpUtils.cpp index 9db05e47..07350b8e 100644 --- a/platform/src/dbms/db_his_data_srv/CDumpUtils.cpp +++ b/platform/src/dbms/db_his_data_srv/CDumpUtils.cpp @@ -61,10 +61,10 @@ QString formatSize(qint64 size) } -bool CDumpUtils::getDbConn(const CDbHisCfg &dbCfg,kbd_dbms::CDbBaseApi &objDb) +bool CDumpUtils::getDbConn(const CDbHisCfg &dbCfg,iot_dbms::CDbBaseApi &objDb) { //< 连接数据库 - kbd_dbms::CDbPara objPara; + iot_dbms::CDbPara objPara; objPara.setUserName(dbCfg.strUsername); objPara.setPassword(dbCfg.strPasswd); objPara.setHostName("127.0.0.1"); @@ -72,12 +72,12 @@ bool CDumpUtils::getDbConn(const CDbHisCfg &dbCfg,kbd_dbms::CDbBaseApi &objDb) if ( dbCfg.strDbType == "QPSQL") { objPara.setPort(54321); - objPara.setDbType(kbd_dbms::EDbType::DB_KINGBASE); + objPara.setDbType(iot_dbms::EDbType::DB_KINGBASE); } else { objPara.setPort(3306); - objPara.setDbType(kbd_dbms::EDbType::DB_MYSQL); + objPara.setDbType(iot_dbms::EDbType::DB_MYSQL); } objPara.setDatabaseName(DATABASE_NAME); objDb.setDbPara(objPara); @@ -89,10 +89,10 @@ bool CDumpUtils::getDbConn(const CDbHisCfg &dbCfg,kbd_dbms::CDbBaseApi &objDb) //获取首链接连接 { - kbd_public::CSysInfoInterfacePtr ptrSysInfo; - kbd_public::SDatabaseInfo stFirstConnectInfo; //数据库连接信息 - std::vector vecLocalDbInfo; - std::vector vecRemoteDbInfo; + iot_public::CSysInfoInterfacePtr ptrSysInfo; + iot_public::SDatabaseInfo stFirstConnectInfo; //数据库连接信息 + std::vector vecLocalDbInfo; + std::vector vecRemoteDbInfo; int nRet = ptrSysInfo->getLocalDBInfo( stFirstConnectInfo, vecLocalDbInfo, vecRemoteDbInfo ); if ( kbdFailed == nRet ) { @@ -101,20 +101,20 @@ bool CDumpUtils::getDbConn(const CDbHisCfg &dbCfg,kbd_dbms::CDbBaseApi &objDb) } // 仅获取首链接的数据库类型 用户名和密码 端口 { - kbd_dbms::CDbPara objTmpDbPara; + iot_dbms::CDbPara objTmpDbPara; switch ( stFirstConnectInfo.eDBType ) { - case kbd_public::EDBType_ORACLE: - objTmpDbPara.setDbType( kbd_dbms::DB_ORACLE ); + case iot_public::EDBType_ORACLE: + objTmpDbPara.setDbType( iot_dbms::DB_ORACLE ); break; - case kbd_public::EDBType_MYSQL: - objTmpDbPara.setDbType( kbd_dbms::DB_MYSQL ); + case iot_public::EDBType_MYSQL: + objTmpDbPara.setDbType( iot_dbms::DB_MYSQL ); break; - case kbd_public::EDBType_OPENGAUSS: - objTmpDbPara.setDbType( kbd_dbms::DB_OPENGAUSS ); + case iot_public::EDBType_OPENGAUSS: + objTmpDbPara.setDbType( iot_dbms::DB_OPENGAUSS ); break; - case kbd_public::EDBType_KINGBASE: - objTmpDbPara.setDbType( kbd_dbms::DB_KINGBASE ); + case iot_public::EDBType_KINGBASE: + objTmpDbPara.setDbType( iot_dbms::DB_KINGBASE ); break; default: LOGERROR( "未知的数据库类型" ); @@ -141,7 +141,7 @@ bool CDumpUtils::getDbConn(const CDbHisCfg &dbCfg,kbd_dbms::CDbBaseApi &objDb) bool CDumpUtils::doBackup(const CDbHisCfg &dbCfg) { - kbd_dbms::CDbBaseApi objDb; + iot_dbms::CDbBaseApi objDb; if( !getDbConn(dbCfg,objDb) ) { LOGERROR("cannot get db connection"); @@ -180,7 +180,7 @@ bool CDumpUtils::doBackup(const CDbHisCfg &dbCfg) qint64 expired_days_timestamp = expired_days.toMSecsSinceEpoch(); //==================================================================== - kbd_dbms::CHisMngApi hismng; + iot_dbms::CHisMngApi hismng; hismng.exportHisPartV2(objDb.getDatabase(),"127.0.0.1",TSDB_DB_NAME,0,expired_days_timestamp,dbFilePath,tsdbFilePath); //< 生成配置 @@ -229,7 +229,7 @@ bool CDumpUtils::doBackup(const CDbHisCfg &dbCfg) bool CDumpUtils::doClean(const CDbHisCfg &dbCfg, bool isAll) { - kbd_dbms::CDbBaseApi objDb; + iot_dbms::CDbBaseApi objDb; if( !getDbConn(dbCfg,objDb) ) { LOGERROR("cannot get db connection"); @@ -251,7 +251,7 @@ bool CDumpUtils::doClean(const CDbHisCfg &dbCfg, bool isAll) //==================================================================== - kbd_dbms::CHisMngApi hismng; + iot_dbms::CHisMngApi hismng; hismng.delHis(objDb.getDatabase(),"127.0.0.1",TSDB_DB_NAME,expired_days_timestamp); QString logPath = QCoreApplication::applicationDirPath() + "/../../log/"; diff --git a/platform/src/dbms/db_his_data_srv/CDumpUtils.h b/platform/src/dbms/db_his_data_srv/CDumpUtils.h index a2bc2350..fb3ab034 100644 --- a/platform/src/dbms/db_his_data_srv/CDumpUtils.h +++ b/platform/src/dbms/db_his_data_srv/CDumpUtils.h @@ -9,7 +9,7 @@ class CDumpUtils { public: - static bool getDbConn(const CDbHisCfg &dbCfg, kbd_dbms::CDbBaseApi &objDb); + static bool getDbConn(const CDbHisCfg &dbCfg, iot_dbms::CDbBaseApi &objDb); static bool doBackup(const CDbHisCfg &dbCfg); static bool doClean(const CDbHisCfg &dbCfg,bool isAll = false); static void doWork(const CDbHisCfg &dbCfg); diff --git a/platform/src/dbms/db_his_data_srv/DbHisCfg.cpp b/platform/src/dbms/db_his_data_srv/DbHisCfg.cpp index cceab48a..f34034c1 100644 --- a/platform/src/dbms/db_his_data_srv/DbHisCfg.cpp +++ b/platform/src/dbms/db_his_data_srv/DbHisCfg.cpp @@ -13,7 +13,7 @@ bool CDbHisCfg::loadFromFile() { //< 加载配置文件 { - QDir Dir(kbd_public::CFileUtil::getCurModuleDir().c_str()); + QDir Dir(iot_public::CFileUtil::getCurModuleDir().c_str()); Dir.cdUp(); Dir.cdUp(); Dir.cd("data"); diff --git a/platform/src/dbms/db_his_data_srv/mainlinux.cpp b/platform/src/dbms/db_his_data_srv/mainlinux.cpp index 3bff1327..4e91f16a 100644 --- a/platform/src/dbms/db_his_data_srv/mainlinux.cpp +++ b/platform/src/dbms/db_his_data_srv/mainlinux.cpp @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) { //< 启动日志 - kbd_public::StartLogSystem(CN_AppName_BASE.c_str(), PROCESS_NAME); + iot_public::StartLogSystem(CN_AppName_BASE.c_str(), PROCESS_NAME); LOGINFO("service pid=[%ld],starts,version 1.02", (long) getpid()); @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) { LOGINFO("service pid=[%ld], failed to start!", (long) getpid()); //< 停止日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return EXIT_FAILURE; } @@ -102,7 +102,7 @@ int main(int argc, char *argv[]) { LOGINFO("service pid=[%ld],ends", (long) getpid()); //< 停止日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return EXIT_SUCCESS; } diff --git a/platform/src/dbms/db_his_data_srv/mainwindows.cpp b/platform/src/dbms/db_his_data_srv/mainwindows.cpp index 0edecddc..7b50b1b7 100644 --- a/platform/src/dbms/db_his_data_srv/mainwindows.cpp +++ b/platform/src/dbms/db_his_data_srv/mainwindows.cpp @@ -30,7 +30,7 @@ int main(int argc, char** argv) app.addLibraryPath(strLibPath); //< 启动日志 - kbd_public::StartLogSystem(CN_AppName_BASE.c_str(), PROCESS_NAME); + iot_public::StartLogSystem(CN_AppName_BASE.c_str(), PROCESS_NAME); //< 设置全局变量初始值 { @@ -56,7 +56,7 @@ int main(int argc, char** argv) } //< 停止日志 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } diff --git a/platform/src/dbms/db_his_mng_api/CHisMngApi.cpp b/platform/src/dbms/db_his_mng_api/CHisMngApi.cpp index 974a5c97..6d517404 100644 --- a/platform/src/dbms/db_his_mng_api/CHisMngApi.cpp +++ b/platform/src/dbms/db_his_mng_api/CHisMngApi.cpp @@ -3,7 +3,7 @@ Q_DECLARE_METATYPE(std::vector) -kbd_dbms::CHisMngApi::CHisMngApi(QObject *parent): +iot_dbms::CHisMngApi::CHisMngApi(QObject *parent): QObject(parent) { m_pImp = new CHisMngApiImp(this); @@ -13,7 +13,7 @@ kbd_dbms::CHisMngApi::CHisMngApi(QObject *parent): qRegisterMetaType< std::vector >(); } -kbd_dbms::CHisMngApi::~CHisMngApi() +iot_dbms::CHisMngApi::~CHisMngApi() { if(m_pImp != NULL) delete m_pImp; @@ -21,7 +21,7 @@ kbd_dbms::CHisMngApi::~CHisMngApi() } -void kbd_dbms::CHisMngApi::exportHis(QSqlDatabase *conn, const QString & dbFilePath, const QString &tsdbName, const QString &tsdbDirPath, qint64 startTimeStamp, qint64 endTimeStamp) +void iot_dbms::CHisMngApi::exportHis(QSqlDatabase *conn, const QString & dbFilePath, const QString &tsdbName, const QString &tsdbDirPath, qint64 startTimeStamp, qint64 endTimeStamp) { if(m_pImp->exportHis(*conn, dbFilePath,tsdbName,tsdbDirPath,startTimeStamp,endTimeStamp)) emit exportHisFinished(true); @@ -31,7 +31,7 @@ void kbd_dbms::CHisMngApi::exportHis(QSqlDatabase *conn, const QString & dbFileP -void kbd_dbms::CHisMngApi::exportHisPart(QSqlDatabase *conn, const QString &ip, const QString &tsdbDbName, bool isEventExported, bool isDataExported, qint64 eventStartTimeStamp, qint64 eventEndTimeStamp, qint64 dataStartTimeStamp, qint64 dataEndTimeStamp, const std::vector &vecDataMeasurements, const QString &dbEventFilePath, const QString &tsdbEventFilePath, const QString &tsdbDataFilePath) +void iot_dbms::CHisMngApi::exportHisPart(QSqlDatabase *conn, const QString &ip, const QString &tsdbDbName, bool isEventExported, bool isDataExported, qint64 eventStartTimeStamp, qint64 eventEndTimeStamp, qint64 dataStartTimeStamp, qint64 dataEndTimeStamp, const std::vector &vecDataMeasurements, const QString &dbEventFilePath, const QString &tsdbEventFilePath, const QString &tsdbDataFilePath) { if(m_pImp->exportHisPart(*conn,ip,tsdbDbName,isEventExported,isDataExported,eventStartTimeStamp,eventEndTimeStamp,dataStartTimeStamp,dataEndTimeStamp,vecDataMeasurements,dbEventFilePath,tsdbEventFilePath,tsdbDataFilePath)) { @@ -44,7 +44,7 @@ void kbd_dbms::CHisMngApi::exportHisPart(QSqlDatabase *conn, const QString &ip, } -void kbd_dbms::CHisMngApi::exportHisPartV2(QSqlDatabase *conn, const QString &ip, const QString &tsdbDbName, qint64 starttime, qint64 endtime, const QString &dbFilePath, const QString &tsdbFilePath) +void iot_dbms::CHisMngApi::exportHisPartV2(QSqlDatabase *conn, const QString &ip, const QString &tsdbDbName, qint64 starttime, qint64 endtime, const QString &dbFilePath, const QString &tsdbFilePath) { if(m_pImp->exportHisPartV2(*conn,ip,tsdbDbName,starttime,endtime,dbFilePath,tsdbFilePath)) { @@ -56,7 +56,7 @@ void kbd_dbms::CHisMngApi::exportHisPartV2(QSqlDatabase *conn, const QString &ip } } -void kbd_dbms::CHisMngApi::importHisPart(QSqlDatabase *conn, const QString &ip, const QString &tsdbDbName, bool isEventImported, bool isDataImported, const QString &dbEventFilePath, const QString &tsdbEventFilePath, const QString &tsdbDataFilePath) +void iot_dbms::CHisMngApi::importHisPart(QSqlDatabase *conn, const QString &ip, const QString &tsdbDbName, bool isEventImported, bool isDataImported, const QString &dbEventFilePath, const QString &tsdbEventFilePath, const QString &tsdbDataFilePath) { if(m_pImp->importHisPart(*conn,ip,tsdbDbName,isEventImported,isDataImported,dbEventFilePath,tsdbEventFilePath,tsdbDataFilePath)) { @@ -69,7 +69,7 @@ void kbd_dbms::CHisMngApi::importHisPart(QSqlDatabase *conn, const QString &ip, } -void kbd_dbms::CHisMngApi::importHisPartV2(QSqlDatabase *conn, const QString &ip, const QString &tsdbDbName, const QString &dbFilePath, const QString &tsdbFilePath) +void iot_dbms::CHisMngApi::importHisPartV2(QSqlDatabase *conn, const QString &ip, const QString &tsdbDbName, const QString &dbFilePath, const QString &tsdbFilePath) { if(m_pImp->importHisPartV2(*conn,ip,tsdbDbName,dbFilePath,tsdbFilePath)) { @@ -81,7 +81,7 @@ void kbd_dbms::CHisMngApi::importHisPartV2(QSqlDatabase *conn, const QString &ip } } -void kbd_dbms::CHisMngApi::delHisAll(QSqlDatabase *conn, const QString &ip, const QString &databaseName) +void iot_dbms::CHisMngApi::delHisAll(QSqlDatabase *conn, const QString &ip, const QString &databaseName) { if(m_pImp->delHisAll(*conn,ip,databaseName)) emit delHisAllFinished(true); @@ -89,7 +89,7 @@ void kbd_dbms::CHisMngApi::delHisAll(QSqlDatabase *conn, const QString &ip, cons emit delHisAllFinished(false); } -void kbd_dbms::CHisMngApi::delHis(QSqlDatabase *conn, const QString &ip, const QString &databaseName, qint64 endTimeStamp) +void iot_dbms::CHisMngApi::delHis(QSqlDatabase *conn, const QString &ip, const QString &databaseName, qint64 endTimeStamp) { if(m_pImp->delHis(*conn,ip,databaseName,endTimeStamp)) emit delHisFinished(true); @@ -97,14 +97,14 @@ void kbd_dbms::CHisMngApi::delHis(QSqlDatabase *conn, const QString &ip, const Q emit delHisFinished(false); } -void kbd_dbms::CHisMngApi::needTerminate() +void iot_dbms::CHisMngApi::needTerminate() { m_pImp->needTerminate(); } -void kbd_dbms::CHisMngApi::importHis(QSqlDatabase *conn, const QString &srcFilePath, const QString &ip, const QString &databaseName, const QString &srcDirPath) +void iot_dbms::CHisMngApi::importHis(QSqlDatabase *conn, const QString &srcFilePath, const QString &ip, const QString &databaseName, const QString &srcDirPath) { if(m_pImp->importHis(*conn,srcFilePath,ip,databaseName,srcDirPath)) emit importHisFinished(true); @@ -112,7 +112,7 @@ void kbd_dbms::CHisMngApi::importHis(QSqlDatabase *conn, const QString &srcFileP emit importHisFinished(false); } -void kbd_dbms::CHisMngApi::importHisDump(QSqlDatabase *conn, const QString &dbFilePath, const QString &ip, const QString &databaseName, const QString &tsdbFilePath) +void iot_dbms::CHisMngApi::importHisDump(QSqlDatabase *conn, const QString &dbFilePath, const QString &ip, const QString &databaseName, const QString &tsdbFilePath) { if(m_pImp->importHisDump(*conn,dbFilePath,ip,databaseName,tsdbFilePath)) emit importHisDumpFinished(true); @@ -120,7 +120,7 @@ void kbd_dbms::CHisMngApi::importHisDump(QSqlDatabase *conn, const QString &dbFi emit importHisDumpFinished(false); } -void kbd_dbms::CHisMngApi::optimizeDbSpace(QSqlDatabase *conn) +void iot_dbms::CHisMngApi::optimizeDbSpace(QSqlDatabase *conn) { if(m_pImp->optimizeDbSpace(*conn)) emit optimizeDbSpaceFinished(true); @@ -128,7 +128,7 @@ void kbd_dbms::CHisMngApi::optimizeDbSpace(QSqlDatabase *conn) emit optimizeDbSpaceFinished(false); } -void kbd_dbms::CHisMngApi::dumpHis(QSqlDatabase *conn, const QString &srcDbFilePath, const QString &tsdbDatabaseName, const QString &srcTsdbFilePath, qint64 endTimeStamp) +void iot_dbms::CHisMngApi::dumpHis(QSqlDatabase *conn, const QString &srcDbFilePath, const QString &tsdbDatabaseName, const QString &srcTsdbFilePath, qint64 endTimeStamp) { status(tr("开始转储")); if(m_pImp->dumpHis(*conn,srcDbFilePath,tsdbDatabaseName,srcTsdbFilePath,endTimeStamp)) diff --git a/platform/src/dbms/db_his_mng_api/CHisMngApiImp.cpp b/platform/src/dbms/db_his_mng_api/CHisMngApiImp.cpp index c6688097..07be2148 100644 --- a/platform/src/dbms/db_his_mng_api/CHisMngApiImp.cpp +++ b/platform/src/dbms/db_his_mng_api/CHisMngApiImp.cpp @@ -47,7 +47,7 @@ std::vector getHisEventTables() return results; } -kbd_dbms::CHisMngApiImp::CHisMngApiImp(QObject *parent): +iot_dbms::CHisMngApiImp::CHisMngApiImp(QObject *parent): QObject(parent) { m_pExportProc = new QProcess(this); @@ -63,7 +63,7 @@ kbd_dbms::CHisMngApiImp::CHisMngApiImp(QObject *parent): initTsdbApi(); } -kbd_dbms::CHisMngApiImp::~CHisMngApiImp() +iot_dbms::CHisMngApiImp::~CHisMngApiImp() { if(m_pExportProc != NULL) { @@ -77,7 +77,7 @@ kbd_dbms::CHisMngApiImp::~CHisMngApiImp() releaseTsdbApi(); } -bool kbd_dbms::CHisMngApiImp::getColumnMySQL(QSqlDatabase &conn, const QString &sTableName, QList &listColumn) +bool iot_dbms::CHisMngApiImp::getColumnMySQL(QSqlDatabase &conn, const QString &sTableName, QList &listColumn) { QString sSql = "show full columns from " + conn.databaseName() + "." + sTableName; QSqlQuery query(sSql,conn); @@ -109,7 +109,7 @@ bool kbd_dbms::CHisMngApiImp::getColumnMySQL(QSqlDatabase &conn, const QString & return true; } -bool kbd_dbms::CHisMngApiImp::getColumnPostgres(QSqlDatabase &conn, const QString &sTableName, QList &listColumn) +bool iot_dbms::CHisMngApiImp::getColumnPostgres(QSqlDatabase &conn, const QString &sTableName, QList &listColumn) { QString sSql = "SELECT * from " "(SELECT " @@ -157,7 +157,7 @@ bool kbd_dbms::CHisMngApiImp::getColumnPostgres(QSqlDatabase &conn, const QStrin } -bool kbd_dbms::CHisMngApiImp::exportTables(QSqlDatabase &conn, qint64 startTimeStamp, qint64 endTimeStamp, const std::string & tableName, QTextStream &textStream) +bool iot_dbms::CHisMngApiImp::exportTables(QSqlDatabase &conn, qint64 startTimeStamp, qint64 endTimeStamp, const std::string & tableName, QTextStream &textStream) { if(!conn.isOpen()) { @@ -278,7 +278,7 @@ bool kbd_dbms::CHisMngApiImp::exportTables(QSqlDatabase &conn, qint64 startTimeS //===================================================================== } -bool kbd_dbms::CHisMngApiImp::exportTsdbBin(const QString &ip, const QString &dbName, const QString &dirPath, qint64 startTime, qint64 endTime) +bool iot_dbms::CHisMngApiImp::exportTsdbBin(const QString &ip, const QString &dbName, const QString &dirPath, qint64 startTime, qint64 endTime) { QString program = "influxd";//备份工具 QStringList arguments; @@ -302,7 +302,7 @@ bool kbd_dbms::CHisMngApiImp::exportTsdbBin(const QString &ip, const QString &db return true; } -bool kbd_dbms::CHisMngApiImp::exportTsdbByInspect(const QString &dbName, const QString &dstFilePath, qint64 startTime, qint64 endTime) +bool iot_dbms::CHisMngApiImp::exportTsdbByInspect(const QString &dbName, const QString &dstFilePath, qint64 startTime, qint64 endTime) { if(!isTsdbDbExist(dbName,"127.0.0.1")) @@ -349,7 +349,7 @@ bool kbd_dbms::CHisMngApiImp::exportTsdbByInspect(const QString &dbName, const Q -void kbd_dbms::CHisMngApiImp::slotBackupProgressHandler() +void iot_dbms::CHisMngApiImp::slotBackupProgressHandler() { while(m_pExportProc->canReadLine()) { @@ -375,7 +375,7 @@ void kbd_dbms::CHisMngApiImp::slotBackupProgressHandler() } } -void kbd_dbms::CHisMngApiImp::slotRestoreProgressHandler() +void iot_dbms::CHisMngApiImp::slotRestoreProgressHandler() { while(m_pImportProc->canReadLine()) { @@ -384,7 +384,7 @@ void kbd_dbms::CHisMngApiImp::slotRestoreProgressHandler() } } -void kbd_dbms::CHisMngApiImp::slotBackupFinishedHandler(int exitCode, QProcess::ExitStatus exitStatus) +void iot_dbms::CHisMngApiImp::slotBackupFinishedHandler(int exitCode, QProcess::ExitStatus exitStatus) { Q_UNUSED(exitStatus); Q_UNUSED(exitCode); @@ -393,9 +393,9 @@ void kbd_dbms::CHisMngApiImp::slotBackupFinishedHandler(int exitCode, QProcess:: // logStatus(tr("导出完成")); } -bool kbd_dbms::CHisMngApiImp::isTsdbDbExist(const QString &database, const QString &ip) +bool iot_dbms::CHisMngApiImp::isTsdbDbExist(const QString &database, const QString &ip) { - kbd_dbms::CTsdbConn db_conn(ip.toStdString().c_str()); + iot_dbms::CTsdbConn db_conn(ip.toStdString().c_str()); if(!db_conn.pingServer()) { logError(tr("数据库测试连接失败")); @@ -417,7 +417,7 @@ bool kbd_dbms::CHisMngApiImp::isTsdbDbExist(const QString &database, const QStri return false; } -bool kbd_dbms::CHisMngApiImp::isLocalhost(const QString &addr) +bool iot_dbms::CHisMngApiImp::isLocalhost(const QString &addr) { QHostAddress ip(addr); if(ip.isLoopback()) @@ -431,7 +431,7 @@ bool kbd_dbms::CHisMngApiImp::isLocalhost(const QString &addr) return false; } -std::string kbd_dbms::CHisMngApiImp::genUrlHisEvent(const QString &ip, const QString &databaseName, qint64 startTime, qint64 endTime) +std::string iot_dbms::CHisMngApiImp::genUrlHisEvent(const QString &ip, const QString &databaseName, qint64 startTime, qint64 endTime) { QString strStartTime = QString::number(startTime); QString strEndTime = QString::number(endTime); @@ -451,7 +451,7 @@ std::string kbd_dbms::CHisMngApiImp::genUrlHisEvent(const QString &ip, const QSt return result.toStdString(); } -std::string kbd_dbms::CHisMngApiImp::genUrlHisData(const QString &ip, const QString &databaseName,qint64 startTime, qint64 endTime, const std::vector &vecTables) +std::string iot_dbms::CHisMngApiImp::genUrlHisData(const QString &ip, const QString &databaseName,qint64 startTime, qint64 endTime, const std::vector &vecTables) { QString strStartTime = QString::number(startTime); QString strEndTime = QString::number(endTime); @@ -488,7 +488,7 @@ std::string kbd_dbms::CHisMngApiImp::genUrlHisData(const QString &ip, const QSt return result.toStdString(); } -std::string kbd_dbms::CHisMngApiImp::genUrlHis(const QString &ip, const QString &databaseName, qint64 startTime, qint64 endTime) +std::string iot_dbms::CHisMngApiImp::genUrlHis(const QString &ip, const QString &databaseName, qint64 startTime, qint64 endTime) { QString strStartTime = QString::number(startTime); @@ -546,19 +546,19 @@ std::string kbd_dbms::CHisMngApiImp::genUrlHis(const QString &ip, const QString return result.toStdString(); } -bool kbd_dbms::CHisMngApiImp::optimizeTable(QSqlDatabase &conn, const QString &tableName) +bool iot_dbms::CHisMngApiImp::optimizeTable(QSqlDatabase &conn, const QString &tableName) { QString sql = "optimize table "+ tableName; return executeSql(conn,sql); } -bool kbd_dbms::CHisMngApiImp::truncateTable(QSqlDatabase &conn, const QString &tableName) +bool iot_dbms::CHisMngApiImp::truncateTable(QSqlDatabase &conn, const QString &tableName) { QString sql = "truncate table "+ tableName; return executeSql(conn,sql); } -bool kbd_dbms::CHisMngApiImp::executeSql(QSqlDatabase &conn, QString &sSql) +bool iot_dbms::CHisMngApiImp::executeSql(QSqlDatabase &conn, QString &sSql) { if ( sSql.isEmpty() || !conn.isOpen() ) return false; @@ -578,7 +578,7 @@ bool kbd_dbms::CHisMngApiImp::executeSql(QSqlDatabase &conn, QString &sSql) return true; } -bool kbd_dbms::CHisMngApiImp::trashMysqlTableByPartition(QSqlDatabase &conn, const QString &strTableName, qint64 endTimestamp) +bool iot_dbms::CHisMngApiImp::trashMysqlTableByPartition(QSqlDatabase &conn, const QString &strTableName, qint64 endTimestamp) { if(!conn.isOpen()) { @@ -635,7 +635,7 @@ bool kbd_dbms::CHisMngApiImp::trashMysqlTableByPartition(QSqlDatabase &conn, con return true; } -bool kbd_dbms::CHisMngApiImp::trashTableByTimestamp(QSqlDatabase &conn, const QString &strTableName, qint64 endTimestamp) +bool iot_dbms::CHisMngApiImp::trashTableByTimestamp(QSqlDatabase &conn, const QString &strTableName, qint64 endTimestamp) { if(!conn.isOpen()) { @@ -654,7 +654,7 @@ bool kbd_dbms::CHisMngApiImp::trashTableByTimestamp(QSqlDatabase &conn, const QS return true; } -bool kbd_dbms::CHisMngApiImp::trashMysqlTableDboplist(QSqlDatabase &conn) +bool iot_dbms::CHisMngApiImp::trashMysqlTableDboplist(QSqlDatabase &conn) { QString id_before_delete; @@ -692,7 +692,7 @@ bool kbd_dbms::CHisMngApiImp::trashMysqlTableDboplist(QSqlDatabase &conn) } } -bool kbd_dbms::CHisMngApiImp::trashMysqlTableSystriginfo(QSqlDatabase &conn) +bool iot_dbms::CHisMngApiImp::trashMysqlTableSystriginfo(QSqlDatabase &conn) { QString id_before_delete; @@ -733,7 +733,7 @@ bool kbd_dbms::CHisMngApiImp::trashMysqlTableSystriginfo(QSqlDatabase &conn) } -bool kbd_dbms::CHisMngApiImp::exportHisEventDb(QSqlDatabase &conn, const std::vector &vecTables, const QString &dstFilePath, qint64 startTimeStamp, qint64 endTimeStamp) +bool iot_dbms::CHisMngApiImp::exportHisEventDb(QSqlDatabase &conn, const std::vector &vecTables, const QString &dstFilePath, qint64 startTimeStamp, qint64 endTimeStamp) { if(startTimeStamp == 0) { @@ -767,7 +767,7 @@ bool kbd_dbms::CHisMngApiImp::exportHisEventDb(QSqlDatabase &conn, const std::ve } -bool kbd_dbms::CHisMngApiImp::exportHisEventDbAll(QSqlDatabase &conn, const QString &dstFilePath, qint64 startTimeStamp, qint64 endTimeStamp) +bool iot_dbms::CHisMngApiImp::exportHisEventDbAll(QSqlDatabase &conn, const QString &dstFilePath, qint64 startTimeStamp, qint64 endTimeStamp) { std::vector tables = getHisEventTables(); @@ -780,7 +780,7 @@ bool kbd_dbms::CHisMngApiImp::exportHisEventDbAll(QSqlDatabase &conn, const QStr return true; } -bool kbd_dbms::CHisMngApiImp::exportHis(QSqlDatabase &conn, const QString &dbFilePath, const QString &tsdbName, const QString &tsdbDirPath, qint64 startTimeStamp, qint64 endTimeStamp) +bool iot_dbms::CHisMngApiImp::exportHis(QSqlDatabase &conn, const QString &dbFilePath, const QString &tsdbName, const QString &tsdbDirPath, qint64 startTimeStamp, qint64 endTimeStamp) { if(!exportHisEventDbAll(conn,dbFilePath,startTimeStamp,endTimeStamp)) { @@ -799,7 +799,7 @@ bool kbd_dbms::CHisMngApiImp::exportHis(QSqlDatabase &conn, const QString &dbFil } -bool kbd_dbms::CHisMngApiImp::exportHisEventTsdb(const QString &ip, +bool iot_dbms::CHisMngApiImp::exportHisEventTsdb(const QString &ip, const QString &databaseName, qint64 startTimeStamp, qint64 endTimeStamp, @@ -834,19 +834,19 @@ bool kbd_dbms::CHisMngApiImp::exportHisEventTsdb(const QString &ip, return true; } -bool kbd_dbms::CHisMngApiImp::exportHisEventTsdb(const QString &ip, const QString &databaseName, qint64 endTimeStamp, const QString &dstFilePath) +bool iot_dbms::CHisMngApiImp::exportHisEventTsdb(const QString &ip, const QString &databaseName, qint64 endTimeStamp, const QString &dstFilePath) { return exportHisEventTsdb(ip,databaseName,1,endTimeStamp,dstFilePath); } -bool kbd_dbms::CHisMngApiImp::exportHisEventTsdb(const QString &ip, const QString &databaseName, const QString &dstFilePath) +bool iot_dbms::CHisMngApiImp::exportHisEventTsdb(const QString &ip, const QString &databaseName, const QString &dstFilePath) { return exportHisEventTsdb(ip,databaseName,1,QDateTime::currentMSecsSinceEpoch(),dstFilePath); } -bool kbd_dbms::CHisMngApiImp::exportTsdbByQuery(const QString &ip, const QString &dbName, const QString &dstFilePath, qint64 startTime, qint64 endTime) +bool iot_dbms::CHisMngApiImp::exportTsdbByQuery(const QString &ip, const QString &dbName, const QString &dstFilePath, qint64 startTime, qint64 endTime) { std::string url = genUrlHis(ip,dbName,startTime,endTime); qDebug() << url.c_str(); @@ -880,7 +880,7 @@ bool kbd_dbms::CHisMngApiImp::exportTsdbByQuery(const QString &ip, const QString } -bool kbd_dbms::CHisMngApiImp::exportHisData(const QString &ip, const QString &databaseName, qint64 startTimeStamp, qint64 endTimeStamp, const std::vector &vecMeasurements, const QString &dstFilePath) +bool iot_dbms::CHisMngApiImp::exportHisData(const QString &ip, const QString &databaseName, qint64 startTimeStamp, qint64 endTimeStamp, const std::vector &vecMeasurements, const QString &dstFilePath) { std::string url = genUrlHisData(ip,databaseName,startTimeStamp,endTimeStamp,vecMeasurements); @@ -911,7 +911,7 @@ bool kbd_dbms::CHisMngApiImp::exportHisData(const QString &ip, const QString &da return true; } -bool kbd_dbms::CHisMngApiImp::exportHisDataByTime(const QString &ip, const QString &databaseName, qint64 startTimeStamp, qint64 endTimeStamp, const QString &dstFilePath) +bool iot_dbms::CHisMngApiImp::exportHisDataByTime(const QString &ip, const QString &databaseName, qint64 startTimeStamp, qint64 endTimeStamp, const QString &dstFilePath) { std::vector tables; tables.push_back("ai_sample_result"); @@ -922,7 +922,7 @@ bool kbd_dbms::CHisMngApiImp::exportHisDataByTime(const QString &ip, const QStri return exportHisData(ip,databaseName,startTimeStamp,endTimeStamp,tables,dstFilePath); } -bool kbd_dbms::CHisMngApiImp::exportHisData(const QString &ip, const QString &databaseName, qint64 endTimeStamp, const QString &dstFilePath) +bool iot_dbms::CHisMngApiImp::exportHisData(const QString &ip, const QString &databaseName, qint64 endTimeStamp, const QString &dstFilePath) { std::vector tables; tables.push_back("ai_sample_result"); @@ -933,7 +933,7 @@ bool kbd_dbms::CHisMngApiImp::exportHisData(const QString &ip, const QString &da return exportHisData(ip,databaseName,1,endTimeStamp,tables,dstFilePath); } -bool kbd_dbms::CHisMngApiImp::exportHisData(const QString &ip, const QString &databaseName, const QString &dstFilePath) +bool iot_dbms::CHisMngApiImp::exportHisData(const QString &ip, const QString &databaseName, const QString &dstFilePath) { std::vector tables; tables.push_back("ai_sample_result"); @@ -944,7 +944,7 @@ bool kbd_dbms::CHisMngApiImp::exportHisData(const QString &ip, const QString &da return exportHisData(ip,databaseName,1,QDateTime::currentMSecsSinceEpoch(),tables,dstFilePath); } -bool kbd_dbms::CHisMngApiImp::exportHisDump(QSqlDatabase &conn, const QString &dbFilePath, const QString &tsdbName, const QString &tsdbFilePath, qint64 endTimeStamp) +bool iot_dbms::CHisMngApiImp::exportHisDump(QSqlDatabase &conn, const QString &dbFilePath, const QString &tsdbName, const QString &tsdbFilePath, qint64 endTimeStamp) { //< 历史事件关系库 @@ -967,7 +967,7 @@ bool kbd_dbms::CHisMngApiImp::exportHisDump(QSqlDatabase &conn, const QString &d return true; } -bool kbd_dbms::CHisMngApiImp::exportHisPart(QSqlDatabase conn, +bool iot_dbms::CHisMngApiImp::exportHisPart(QSqlDatabase conn, const QString &ip, const QString & tsdbDbName, @@ -1021,7 +1021,7 @@ bool kbd_dbms::CHisMngApiImp::exportHisPart(QSqlDatabase conn, return true; } -bool kbd_dbms::CHisMngApiImp::exportHisPartV2(QSqlDatabase conn, const QString &ip, const QString &tsdbDbName, qint64 starttime, qint64 endtime, const QString &dbFilePath, const QString &tsdbFilePath) +bool iot_dbms::CHisMngApiImp::exportHisPartV2(QSqlDatabase conn, const QString &ip, const QString &tsdbDbName, qint64 starttime, qint64 endtime, const QString &dbFilePath, const QString &tsdbFilePath) { //< 导出关系库历史 @@ -1058,7 +1058,7 @@ bool kbd_dbms::CHisMngApiImp::exportHisPartV2(QSqlDatabase conn, const QString & return true; } -bool kbd_dbms::CHisMngApiImp::importHisPart(QSqlDatabase &conn, +bool iot_dbms::CHisMngApiImp::importHisPart(QSqlDatabase &conn, const QString &ip, const QString &tsdbDbName, bool isEventImported, @@ -1104,7 +1104,7 @@ bool kbd_dbms::CHisMngApiImp::importHisPart(QSqlDatabase &conn, return true; } -bool kbd_dbms::CHisMngApiImp::importHisPartV2(QSqlDatabase conn, const QString &ip, const QString &tsdbDbName, const QString &dbFilePath, const QString &tsdbFilePath) +bool iot_dbms::CHisMngApiImp::importHisPartV2(QSqlDatabase conn, const QString &ip, const QString &tsdbDbName, const QString &dbFilePath, const QString &tsdbFilePath) { //< 导入关系库历史事件 logStatus(tr("开始导入关系库历史事件")); @@ -1126,7 +1126,7 @@ bool kbd_dbms::CHisMngApiImp::importHisPartV2(QSqlDatabase conn, const QString & return true; } -bool kbd_dbms::CHisMngApiImp::delHisTsdb(const QString &ip, const QString &databaseName, qint64 endTimeStamp) +bool iot_dbms::CHisMngApiImp::delHisTsdb(const QString &ip, const QString &databaseName, qint64 endTimeStamp) { QString delProgram("influx"); @@ -1143,7 +1143,7 @@ bool kbd_dbms::CHisMngApiImp::delHisTsdb(const QString &ip, const QString &datab { //< to-do // 清除统计缓存 - std::string curDir = kbd_public::CFileUtil::getCurModuleDir(); + std::string curDir = iot_public::CFileUtil::getCurModuleDir(); QDir dir(curDir.c_str()); dir.cdUp(); dir.cdUp(); @@ -1163,7 +1163,7 @@ bool kbd_dbms::CHisMngApiImp::delHisTsdb(const QString &ip, const QString &datab return true; } -bool kbd_dbms::CHisMngApiImp::delHisEventDb(QSqlDatabase &conn, qint64 endTimeStamp) +bool iot_dbms::CHisMngApiImp::delHisEventDb(QSqlDatabase &conn, qint64 endTimeStamp) { std::vector tables = getHisEventTables(); @@ -1184,7 +1184,7 @@ bool kbd_dbms::CHisMngApiImp::delHisEventDb(QSqlDatabase &conn, qint64 endTimeSt return true; } -bool kbd_dbms::CHisMngApiImp::delHis(QSqlDatabase &conn, const QString &ip, const QString &databaseName, qint64 endTimeStamp) +bool iot_dbms::CHisMngApiImp::delHis(QSqlDatabase &conn, const QString &ip, const QString &databaseName, qint64 endTimeStamp) { if(!delHisEventDb(conn,endTimeStamp)) { @@ -1202,7 +1202,7 @@ bool kbd_dbms::CHisMngApiImp::delHis(QSqlDatabase &conn, const QString &ip, cons } -bool kbd_dbms::CHisMngApiImp::delHisAll(QSqlDatabase &conn, const QString &ip, const QString &databaseName) +bool iot_dbms::CHisMngApiImp::delHisAll(QSqlDatabase &conn, const QString &ip, const QString &databaseName) { if(!delHisDbAll(conn)) { @@ -1219,7 +1219,7 @@ bool kbd_dbms::CHisMngApiImp::delHisAll(QSqlDatabase &conn, const QString &ip, c return true; } -bool kbd_dbms::CHisMngApiImp::delHisDbAll(QSqlDatabase &conn) +bool iot_dbms::CHisMngApiImp::delHisDbAll(QSqlDatabase &conn) { std::vector tables = getHisEventTables(); @@ -1235,7 +1235,7 @@ bool kbd_dbms::CHisMngApiImp::delHisDbAll(QSqlDatabase &conn) return true; } -bool kbd_dbms::CHisMngApiImp::importTsdbBin(const QString &ip, const QString &databaseName, const QString &srcDirPath) +bool iot_dbms::CHisMngApiImp::importTsdbBin(const QString &ip, const QString &databaseName, const QString &srcDirPath) { if( ip.isEmpty() || databaseName.isEmpty() || srcDirPath.isEmpty()) return false; @@ -1248,7 +1248,7 @@ bool kbd_dbms::CHisMngApiImp::importTsdbBin(const QString &ip, const QString &da return false; } - if(kbd_dbms::initTsdbApi() == false) + if(iot_dbms::initTsdbApi() == false) { logError(tr("无法初始化influx数据库连接条件,请检查软件依赖是否安装正确")); return false; @@ -1256,7 +1256,7 @@ bool kbd_dbms::CHisMngApiImp::importTsdbBin(const QString &ip, const QString &da // 连接influxdb,delete and create database { - kbd_dbms::CTsdbConn db_conn(ip.toStdString().c_str()); + iot_dbms::CTsdbConn db_conn(ip.toStdString().c_str()); if(db_conn.pingServer() == false) { logError(tr("数据库连接失败")); @@ -1272,7 +1272,7 @@ bool kbd_dbms::CHisMngApiImp::importTsdbBin(const QString &ip, const QString &da } //释放tsdb_api - if(kbd_dbms::releaseTsdbApi() == false) + if(iot_dbms::releaseTsdbApi() == false) { logError(tr("无法销毁influx数据库连接资源")); return false; @@ -1294,7 +1294,7 @@ bool kbd_dbms::CHisMngApiImp::importTsdbBin(const QString &ip, const QString &da return true; } -bool kbd_dbms::CHisMngApiImp::importTsdbSQL(const QString &ip, const QString &databaseName, const QString &srcFilePath, bool isPrecisionMs) +bool iot_dbms::CHisMngApiImp::importTsdbSQL(const QString &ip, const QString &databaseName, const QString &srcFilePath, bool isPrecisionMs) { if( ip.isEmpty() || databaseName.isEmpty() || srcFilePath.isEmpty()) return false; @@ -1328,7 +1328,7 @@ bool kbd_dbms::CHisMngApiImp::importTsdbSQL(const QString &ip, const QString &da return true; } -bool kbd_dbms::CHisMngApiImp::importDbSQL(QSqlDatabase &conn, const QString &srcFilePath) +bool iot_dbms::CHisMngApiImp::importDbSQL(QSqlDatabase &conn, const QString &srcFilePath) { if(!conn.isOpen() || srcFilePath.isEmpty()) return false; @@ -1405,7 +1405,7 @@ bool kbd_dbms::CHisMngApiImp::importDbSQL(QSqlDatabase &conn, const QString &src return true; } -bool kbd_dbms::CHisMngApiImp::importHis(QSqlDatabase &conn, const QString &srcFilePath, const QString &ip, const QString &databaseName, const QString &srcDirPath) +bool iot_dbms::CHisMngApiImp::importHis(QSqlDatabase &conn, const QString &srcFilePath, const QString &ip, const QString &databaseName, const QString &srcDirPath) { if(!delHisEventDb(conn,QDateTime::currentMSecsSinceEpoch())) { @@ -1429,7 +1429,7 @@ bool kbd_dbms::CHisMngApiImp::importHis(QSqlDatabase &conn, const QString &srcFi return true; } -bool kbd_dbms::CHisMngApiImp::importHisDump(QSqlDatabase &conn, +bool iot_dbms::CHisMngApiImp::importHisDump(QSqlDatabase &conn, const QString &dbFilePath, const QString &ip, const QString &databaseName, @@ -1453,7 +1453,7 @@ bool kbd_dbms::CHisMngApiImp::importHisDump(QSqlDatabase &conn, return true; } -bool kbd_dbms::CHisMngApiImp::optimizeDbSpace(QSqlDatabase &conn) +bool iot_dbms::CHisMngApiImp::optimizeDbSpace(QSqlDatabase &conn) { std::vector tables = getHisEventTables(); @@ -1469,7 +1469,7 @@ bool kbd_dbms::CHisMngApiImp::optimizeDbSpace(QSqlDatabase &conn) return true; } -bool kbd_dbms::CHisMngApiImp::dumpHis(QSqlDatabase &conn, const QString &srcDbFilePath, const QString &tsdbDatabaseName, const QString &srcTsdbFilePath, qint64 endTimeStamp) +bool iot_dbms::CHisMngApiImp::dumpHis(QSqlDatabase &conn, const QString &srcDbFilePath, const QString &tsdbDatabaseName, const QString &srcTsdbFilePath, qint64 endTimeStamp) { if(!exportHisDump(conn,srcDbFilePath,tsdbDatabaseName,srcTsdbFilePath,endTimeStamp)) @@ -1488,13 +1488,13 @@ bool kbd_dbms::CHisMngApiImp::dumpHis(QSqlDatabase &conn, const QString &srcDbFi } -void kbd_dbms::CHisMngApiImp::logStatus(const QString &msg) +void iot_dbms::CHisMngApiImp::logStatus(const QString &msg) { emit status(msg); LOGINFO(msg.toStdString().c_str()); } -void kbd_dbms::CHisMngApiImp::logError(const QString &errMsg) +void iot_dbms::CHisMngApiImp::logError(const QString &errMsg) { emit error(errMsg); LOGERROR(errMsg.toStdString().c_str()); diff --git a/platform/src/dbms/db_his_mng_api/CHisMngApiImp.h b/platform/src/dbms/db_his_mng_api/CHisMngApiImp.h index 8192d027..8425f80d 100644 --- a/platform/src/dbms/db_his_mng_api/CHisMngApiImp.h +++ b/platform/src/dbms/db_his_mng_api/CHisMngApiImp.h @@ -6,7 +6,7 @@ #include #include -namespace kbd_dbms { +namespace iot_dbms { class CHisMngApiImp : public QObject { @@ -259,6 +259,6 @@ private: }; -} //< namespace kbd_dbms; +} //< namespace iot_dbms; #endif // CHISMNGAPIIMP_H diff --git a/platform/src/dbms/db_his_mng_api/en.ts b/platform/src/dbms/db_his_mng_api/en.ts index 9a58140f..0a1e152b 100644 --- a/platform/src/dbms/db_his_mng_api/en.ts +++ b/platform/src/dbms/db_his_mng_api/en.ts @@ -40,7 +40,7 @@ - kbd_dbms::CHisMngApi + iot_dbms::CHisMngApi 开始转储 @@ -48,7 +48,7 @@ - kbd_dbms::CHisMngApiImp + iot_dbms::CHisMngApiImp 的列数量 diff --git a/platform/src/dbms/db_his_query_api/CTsdbBasicQuery.cpp b/platform/src/dbms/db_his_query_api/CTsdbBasicQuery.cpp index 293bbc6e..a78c1048 100644 --- a/platform/src/dbms/db_his_query_api/CTsdbBasicQuery.cpp +++ b/platform/src/dbms/db_his_query_api/CTsdbBasicQuery.cpp @@ -21,7 +21,7 @@ #include "CTsdbBasicQuery.h" -namespace kbd_dbms +namespace iot_dbms { //< 通过 EnComputeMethod 获取查询的字符串 @@ -1315,5 +1315,5 @@ bool CTsdbBasicQuery::CEpHelper::addValue(const size_t nMpIdx, return true; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_his_query_api/CTsdbBasicQuery.h b/platform/src/dbms/db_his_query_api/CTsdbBasicQuery.h index 333d0d1a..4b7bfd8c 100644 --- a/platform/src/dbms/db_his_query_api/CTsdbBasicQuery.h +++ b/platform/src/dbms/db_his_query_api/CTsdbBasicQuery.h @@ -15,7 +15,7 @@ #include "db_his_query_api/DbHisQueryBase.h" -namespace kbd_dbms +namespace iot_dbms { class CTsdbConn; @@ -227,5 +227,5 @@ public: }; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_his_query_api/DbHisQueryApi.cpp b/platform/src/dbms/db_his_query_api/DbHisQueryApi.cpp index f3b235a3..f4bcb8f5 100644 --- a/platform/src/dbms/db_his_query_api/DbHisQueryApi.cpp +++ b/platform/src/dbms/db_his_query_api/DbHisQueryApi.cpp @@ -11,7 +11,7 @@ #include "db_his_query_api/DbHisQueryApi.h" -namespace kbd_dbms +namespace iot_dbms { bool getHisSamplePoint(CTsdbConn &objConn, int nTimeOut, @@ -156,5 +156,5 @@ bool getHisEventPoint(CTsdbConn &objConn, int nTimeOut, -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_his_query_api/test/db_his_query_api_test/main.cpp b/platform/src/dbms/db_his_query_api/test/db_his_query_api_test/main.cpp index fdaa982d..a49cd662 100644 --- a/platform/src/dbms/db_his_query_api/test/db_his_query_api_test/main.cpp +++ b/platform/src/dbms/db_his_query_api/test/db_his_query_api_test/main.cpp @@ -19,7 +19,7 @@ #include "tsdb_api/TsdbApi.h" #include "db_his_query_api/DbHisQueryApi.h" -kbd_dbms::CTsdbConn *g_pTsdbConn = NULL; +iot_dbms::CTsdbConn *g_pTsdbConn = NULL; //< 不使用正式库测试 const char *g_pszDbName = "iscs6000_his_query_api_test"; @@ -109,7 +109,7 @@ static void fillSample() } static void testVariantCast( - const std::vector *> &vecSpResult) + const std::vector *> &vecSpResult) { LOGINFO("testVariantCast(): start"); @@ -121,7 +121,7 @@ static void testVariantCast( for (size_t i = 0; i < vecSpResult.size(); ++i) { - const std::vector + const std::vector &vecOneMpSp = *(vecSpResult[i]); for (size_t j = 0; j < vecOneMpSp.size(); ++j) { @@ -139,11 +139,11 @@ static void testVariantCast( for (size_t i = 0; i < vecSpResult.size(); ++i) { - const std::vector + const std::vector &vecOneMpSp = *(vecSpResult[i]); for (size_t j = 0; j < vecOneMpSp.size(); ++j) { - const kbd_dbms::VarMeasPiontVal &v = vecOneMpSp[j].m_varValue; + const iot_dbms::VarMeasPiontVal &v = vecOneMpSp[j].m_varValue; if (typeid(boost::int32_t) == v.type()) { vecDstTypeid.push_back((double)boost::get(v)); @@ -177,45 +177,45 @@ static void testVariantCast( static void testVarQuery() { - std::vector vecMpKey; + std::vector vecMpKey; //< 记得释放 - std::vector *> vecSpResult; - std::vector *> vecHvResult; + std::vector *> vecSpResult; + std::vector *> vecHvResult; for (size_t i = 0; i < g_pvecTagName->size(); ++i) { - kbd_dbms::SMeasPointKey objMpKey; + iot_dbms::SMeasPointKey objMpKey; { - objMpKey.m_enType = kbd_dbms::MPT_AI; + objMpKey.m_enType = iot_dbms::MPT_AI; objMpKey.m_pszTagName = (*g_pvecTagName)[i].c_str(); vecMpKey.push_back(objMpKey); - vecSpResult.push_back(new std::vector); - vecHvResult.push_back(new std::vector); + vecSpResult.push_back(new std::vector); + vecHvResult.push_back(new std::vector); } { - objMpKey.m_enType = kbd_dbms::MPT_DI; + objMpKey.m_enType = iot_dbms::MPT_DI; objMpKey.m_pszTagName = (*g_pvecTagName)[i].c_str(); vecMpKey.push_back(objMpKey); - vecSpResult.push_back(new std::vector); - vecHvResult.push_back(new std::vector); + vecSpResult.push_back(new std::vector); + vecHvResult.push_back(new std::vector); } { - objMpKey.m_enType = kbd_dbms::MPT_MIX; + objMpKey.m_enType = iot_dbms::MPT_MIX; objMpKey.m_pszTagName = (*g_pvecTagName)[i].c_str(); vecMpKey.push_back(objMpKey); - vecSpResult.push_back(new std::vector); - vecHvResult.push_back(new std::vector); + vecSpResult.push_back(new std::vector); + vecHvResult.push_back(new std::vector); } { - objMpKey.m_enType = kbd_dbms::MPT_ACC; + objMpKey.m_enType = iot_dbms::MPT_ACC; objMpKey.m_pszTagName = (*g_pvecTagName)[i].c_str(); vecMpKey.push_back(objMpKey); - vecSpResult.push_back(new std::vector); - vecHvResult.push_back(new std::vector); + vecSpResult.push_back(new std::vector); + vecHvResult.push_back(new std::vector); } } @@ -225,8 +225,8 @@ static void testVarQuery() LOGINFO("testVarQuery(): getHisSamplePoint() start"); tpStart = boost::chrono::steady_clock::now(); - kbd_dbms::getHisSamplePoint(*g_pTsdbConn, -1, vecMpKey, g_nTimeBegin, g_nTimeEnd, - NULL,NULL,kbd_dbms::CM_NULL,0,kbd_dbms::FM_NULL_METHOD, + iot_dbms::getHisSamplePoint(*g_pTsdbConn, -1, vecMpKey, g_nTimeBegin, g_nTimeEnd, + NULL,NULL,iot_dbms::CM_NULL,0,iot_dbms::FM_NULL_METHOD, vecSpResult, true); tpStop = boost::chrono::steady_clock::now(); @@ -252,8 +252,8 @@ static void testVarQuery() LOGINFO("testVarQuery(): getHisValue() start"); tpStart = boost::chrono::steady_clock::now(); - kbd_dbms::getHisValue(*g_pTsdbConn, -1, vecMpKey, g_nTimeBegin, g_nTimeEnd, - NULL, NULL, NULL,NULL,NULL,kbd_dbms::CM_LAST, 1000000,kbd_dbms::FM_NONE, vecHvResult); + iot_dbms::getHisValue(*g_pTsdbConn, -1, vecMpKey, g_nTimeBegin, g_nTimeEnd, + NULL, NULL, NULL,NULL,NULL,iot_dbms::CM_LAST, 1000000,iot_dbms::FM_NONE, vecHvResult); tpStop = boost::chrono::steady_clock::now(); long long nUsSpan = (boost::chrono::duration_cast(tpStop - tpStart)).count(); @@ -288,45 +288,45 @@ static void testVarQuery() static void testUniQuery() { - std::vector vecMpKey; + std::vector vecMpKey; //< 记得释放 - std::vector *> vecSpResult; - std::vector *> vecHvResult; + std::vector *> vecSpResult; + std::vector *> vecHvResult; for (size_t i = 0; i < g_pvecTagName->size(); ++i) { - kbd_dbms::SMeasPointKey objMpKey; + iot_dbms::SMeasPointKey objMpKey; { - objMpKey.m_enType = kbd_dbms::MPT_AI; + objMpKey.m_enType = iot_dbms::MPT_AI; objMpKey.m_pszTagName = (*g_pvecTagName)[i].c_str(); vecMpKey.push_back(objMpKey); - vecSpResult.push_back(new std::vector); - vecHvResult.push_back(new std::vector); + vecSpResult.push_back(new std::vector); + vecHvResult.push_back(new std::vector); } { - objMpKey.m_enType = kbd_dbms::MPT_DI; + objMpKey.m_enType = iot_dbms::MPT_DI; objMpKey.m_pszTagName = (*g_pvecTagName)[i].c_str(); vecMpKey.push_back(objMpKey); - vecSpResult.push_back(new std::vector); - vecHvResult.push_back(new std::vector); + vecSpResult.push_back(new std::vector); + vecHvResult.push_back(new std::vector); } { - objMpKey.m_enType = kbd_dbms::MPT_MIX; + objMpKey.m_enType = iot_dbms::MPT_MIX; objMpKey.m_pszTagName = (*g_pvecTagName)[i].c_str(); vecMpKey.push_back(objMpKey); - vecSpResult.push_back(new std::vector); - vecHvResult.push_back(new std::vector); + vecSpResult.push_back(new std::vector); + vecHvResult.push_back(new std::vector); } { - objMpKey.m_enType = kbd_dbms::MPT_ACC; + objMpKey.m_enType = iot_dbms::MPT_ACC; objMpKey.m_pszTagName = (*g_pvecTagName)[i].c_str(); vecMpKey.push_back(objMpKey); - vecSpResult.push_back(new std::vector); - vecHvResult.push_back(new std::vector); + vecSpResult.push_back(new std::vector); + vecHvResult.push_back(new std::vector); } } @@ -336,8 +336,8 @@ static void testUniQuery() LOGINFO("testUniQuery(): getHisSamplePoint() start"); tpStart = boost::chrono::steady_clock::now(); - kbd_dbms::getHisSamplePoint(*g_pTsdbConn, -1, vecMpKey, g_nTimeBegin, g_nTimeEnd, - NULL,NULL,kbd_dbms::CM_NULL,0,kbd_dbms::FM_NULL_METHOD, + iot_dbms::getHisSamplePoint(*g_pTsdbConn, -1, vecMpKey, g_nTimeBegin, g_nTimeEnd, + NULL,NULL,iot_dbms::CM_NULL,0,iot_dbms::FM_NULL_METHOD, vecSpResult, false); tpStop = boost::chrono::steady_clock::now(); @@ -361,10 +361,10 @@ static void testUniQuery() LOGINFO("testUniQuery(): getHisValue() start"); tpStart = boost::chrono::steady_clock::now(); - kbd_dbms::getHisValue(*g_pTsdbConn, -1, vecMpKey, g_nTimeBegin, g_nTimeEnd, + iot_dbms::getHisValue(*g_pTsdbConn, -1, vecMpKey, g_nTimeBegin, g_nTimeEnd, NULL, NULL, - kbd_dbms::CM_LAST , - 1000000,kbd_dbms::FM_NONE, vecHvResult); + iot_dbms::CM_LAST , + 1000000,iot_dbms::FM_NONE, vecHvResult); tpStop = boost::chrono::steady_clock::now(); long long nUsSpan = (boost::chrono::duration_cast(tpStop - tpStart)).count(); @@ -399,47 +399,47 @@ static void testUniQuery() static void testEventQuery() { - std::vector vecMpKey; + std::vector vecMpKey; //< 记得释放 - std::vector *> vecEpResult; - std::vector *> vecEGpResult; + std::vector *> vecEpResult; + std::vector *> vecEGpResult; for (size_t i = 0; i < g_pvecTagName->size(); ++i) { - kbd_dbms::SMeasPointKey objMpKey; + iot_dbms::SMeasPointKey objMpKey; { - objMpKey.m_enType = kbd_dbms::MPT_AI; + objMpKey.m_enType = iot_dbms::MPT_AI; objMpKey.m_pszTagName = (*g_pvecTagName)[i].c_str(); vecMpKey.push_back(objMpKey); - vecEpResult.push_back(new std::vector); - vecEGpResult.push_back(new std::vector); + vecEpResult.push_back(new std::vector); + vecEGpResult.push_back(new std::vector); } { - objMpKey.m_enType = kbd_dbms::MPT_DI; + objMpKey.m_enType = iot_dbms::MPT_DI; objMpKey.m_pszTagName = (*g_pvecTagName)[i].c_str(); vecMpKey.push_back(objMpKey); - vecEpResult.push_back(new std::vector); - vecEGpResult.push_back(new std::vector); + vecEpResult.push_back(new std::vector); + vecEGpResult.push_back(new std::vector); } { - objMpKey.m_enType = kbd_dbms::MPT_MIX; + objMpKey.m_enType = iot_dbms::MPT_MIX; objMpKey.m_pszTagName = (*g_pvecTagName)[i].c_str(); vecMpKey.push_back(objMpKey); - vecEpResult.push_back(new std::vector); - vecEGpResult.push_back(new std::vector); + vecEpResult.push_back(new std::vector); + vecEGpResult.push_back(new std::vector); } { - objMpKey.m_enType = kbd_dbms::MPT_ACC; + objMpKey.m_enType = iot_dbms::MPT_ACC; objMpKey.m_pszTagName = (*g_pvecTagName)[i].c_str(); vecMpKey.push_back(objMpKey); - vecEpResult.push_back(new std::vector); - vecEGpResult.push_back(new std::vector); + vecEpResult.push_back(new std::vector); + vecEGpResult.push_back(new std::vector); } } @@ -450,7 +450,7 @@ static void testEventQuery() LOGINFO("testEventQuery(): getHisEventPoint() start"); tpStart = boost::chrono::steady_clock::now(); - kbd_dbms::getHisEventPoint(*g_pTsdbConn, -1, vecMpKey, g_nTimeBegin, g_nTimeEnd, vecEpResult); + iot_dbms::getHisEventPoint(*g_pTsdbConn, -1, vecMpKey, g_nTimeBegin, g_nTimeEnd, vecEpResult); tpStop = boost::chrono::steady_clock::now(); long long nUsSpan = (boost::chrono::duration_cast(tpStop - tpStart)).count(); @@ -477,7 +477,7 @@ static void testEventQuery() LOGINFO("testEventQuery(): getHisEventPoint()[GroupBy version] start"); tpStart = boost::chrono::steady_clock::now(); - kbd_dbms::getHisEventPoint(*g_pTsdbConn, -1, vecMpKey, g_nTimeBegin, g_nTimeEnd, kbd_dbms::CM_FIRST, g_groupByDuration , vecEGpResult); + iot_dbms::getHisEventPoint(*g_pTsdbConn, -1, vecMpKey, g_nTimeBegin, g_nTimeEnd, iot_dbms::CM_FIRST, g_groupByDuration , vecEGpResult); tpStop = boost::chrono::steady_clock::now(); long long nUsSpan = (boost::chrono::duration_cast(tpStop - tpStart)).count(); @@ -512,13 +512,13 @@ static void testEventQuery() static int doTest() { - if (!kbd_dbms::initTsdbApi()) + if (!iot_dbms::initTsdbApi()) { LOGERROR("initTsdbApi() failed !"); return 1; } - g_pTsdbConn = new kbd_dbms::CTsdbConn("127.0.0.1", 8086, g_pszDbName, "", ""); + g_pTsdbConn = new iot_dbms::CTsdbConn("127.0.0.1", 8086, g_pszDbName, "", ""); g_pvecTagName = new std::vector; @@ -556,12 +556,12 @@ int main(/*int argc, char *argv[]*/) int nRc = 1; //< 启动日志 - kbd_public::StartLogSystem("default", "db_his_query_api_test"); + iot_public::StartLogSystem("default", "db_his_query_api_test"); LOGINFO("db_his_query_api_test start !"); - LOGINFO("sizeof(kbd_dbms::VarMeasPiontVal) == %lu", sizeof(kbd_dbms::VarMeasPiontVal)); - LOGINFO("sizeof(kbd_dbms::SHisSamplePointVar) == %lu", sizeof(kbd_dbms::SVarHisSamplePoint)); + LOGINFO("sizeof(iot_dbms::VarMeasPiontVal) == %lu", sizeof(iot_dbms::VarMeasPiontVal)); + LOGINFO("sizeof(iot_dbms::SHisSamplePointVar) == %lu", sizeof(iot_dbms::SVarHisSamplePoint)); nRc = doTest(); @@ -572,14 +572,14 @@ int main(/*int argc, char *argv[]*/) delete g_pvecTagName; g_pvecTagName = NULL; - if (!kbd_dbms::releaseTsdbApi()) + if (!iot_dbms::releaseTsdbApi()) { LOGERROR("releaseTsdbApi() failed !"); nRc = 1; } //< 停止日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return nRc; } diff --git a/platform/src/dbms/db_his_query_api/test/rapidjson_vs_boost/main.cpp b/platform/src/dbms/db_his_query_api/test/rapidjson_vs_boost/main.cpp index fae43a18..412bf7cd 100644 --- a/platform/src/dbms/db_his_query_api/test/rapidjson_vs_boost/main.cpp +++ b/platform/src/dbms/db_his_query_api/test/rapidjson_vs_boost/main.cpp @@ -36,7 +36,7 @@ const char *pszJsonTail = "]}]}]}"; using namespace boost::chrono; -using namespace kbd_dbms; +using namespace iot_dbms; bool parseRapidJson(const std::string &strResult, std::vector &vecResult) @@ -180,7 +180,7 @@ bool parseBoost(const std::string &strResult, std::vector &v int main(/*int argc, char *argv[]*/) { //< 启动日志 - kbd_public::StartLogSystem("default", "rapidjson_vs_boost"); + iot_public::StartLogSystem("default", "rapidjson_vs_boost"); std::cout << "\nRapidJSON vs Boost" << std::endl; @@ -202,7 +202,7 @@ int main(/*int argc, char *argv[]*/) } strResult += pszJsonTail; - std::vector vecRapid, vecBoost; + std::vector vecRapid, vecBoost; steady_clock::time_point tpStart, tpStop; @@ -264,8 +264,8 @@ int main(/*int argc, char *argv[]*/) { //std::cout << i << std::endl; - kbd_dbms::SVarHisSamplePoint &objRapid = vecRapid[i]; - kbd_dbms::SVarHisSamplePoint &objBoost = vecBoost[i]; + iot_dbms::SVarHisSamplePoint &objRapid = vecRapid[i]; + iot_dbms::SVarHisSamplePoint &objBoost = vecBoost[i]; if (objRapid.m_nTime != objBoost.m_nTime) { @@ -292,7 +292,7 @@ int main(/*int argc, char *argv[]*/) std::cout << "Consistency verify complete\n" << std::endl; //< 停止日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } diff --git a/platform/src/dbms/db_manager/CLogMngWidget.cpp b/platform/src/dbms/db_manager/CLogMngWidget.cpp index 9c6a9fbd..9549a459 100644 --- a/platform/src/dbms/db_manager/CLogMngWidget.cpp +++ b/platform/src/dbms/db_manager/CLogMngWidget.cpp @@ -57,14 +57,14 @@ void CLogMngWidget::reload() QGridLayout * layout = new QGridLayout; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { appDesc2Name.clear(); - std::vector vecSubsystemInfo; + std::vector vecSubsystemInfo; spSysInfo->getAllSubsystemInfo(vecSubsystemInfo); - foreach (kbd_public::SSubsystemInfo info, vecSubsystemInfo) + foreach (iot_public::SSubsystemInfo info, vecSubsystemInfo) { appDesc2Name.insert(info.strDesc.c_str(),info.strName.c_str()); appName2Desc.insert(info.strName.c_str(),info.strDesc.c_str()); diff --git a/platform/src/dbms/db_manager/CStationReuseForm.cpp b/platform/src/dbms/db_manager/CStationReuseForm.cpp index 168c14f8..1ccd2506 100644 --- a/platform/src/dbms/db_manager/CStationReuseForm.cpp +++ b/platform/src/dbms/db_manager/CStationReuseForm.cpp @@ -8,7 +8,7 @@ #define OPT_DB_TYPE_SRC 1 #define OPT_DB_TYPE_DST 2 -using namespace kbd_dbms; +using namespace iot_dbms; CStationReuseForm::CStationReuseForm(QWidget *parent) : QWidget(parent), diff --git a/platform/src/dbms/db_manager/CStationReuseForm.h b/platform/src/dbms/db_manager/CStationReuseForm.h index bd872504..b2781865 100644 --- a/platform/src/dbms/db_manager/CStationReuseForm.h +++ b/platform/src/dbms/db_manager/CStationReuseForm.h @@ -37,7 +37,7 @@ public slots: private: Ui::CStationReuseForm *ui; db_compare* m_pDbCompare; - kbd_dbms::db_manager_api* m_pdbManager ; + iot_dbms::db_manager_api* m_pdbManager ; QThread *m_hThreadReuse; db_opt* m_pDbOpt ; int m_nOptDbType; diff --git a/platform/src/dbms/db_manager/db_set.cpp b/platform/src/dbms/db_manager/db_set.cpp index 68037f17..7f9bd348 100644 --- a/platform/src/dbms/db_manager/db_set.cpp +++ b/platform/src/dbms/db_manager/db_set.cpp @@ -7,7 +7,7 @@ #include "db_base_api/CDbBaseApi.h" #include -using namespace kbd_dbms; +using namespace iot_dbms; db_set::db_set( QWidget* parent ) : QDialog( parent ) , ui( new Ui::db_set ) @@ -179,7 +179,7 @@ void db_set::on_pushButton_clicked() } { - kbd_dbms::CDbBaseApi objDb; + iot_dbms::CDbBaseApi objDb; CDbPara objPara; objPara.setUserName(ui->le_user->text()); objPara.setPassword(ui->le_passwd->text()); diff --git a/platform/src/dbms/db_manager/db_set.h b/platform/src/dbms/db_manager/db_set.h index 1aedee72..463a5116 100644 --- a/platform/src/dbms/db_manager/db_set.h +++ b/platform/src/dbms/db_manager/db_set.h @@ -21,7 +21,7 @@ public: public: QString getName(); QString getDbType(); - kbd_dbms::EDbType getEDbType(); + iot_dbms::EDbType getEDbType(); QString getIp(); QString getPort(); QString getUser(); diff --git a/platform/src/dbms/db_manager/his_widgets/import_his_backup_dialog.cpp b/platform/src/dbms/db_manager/his_widgets/import_his_backup_dialog.cpp index acc77ad0..09327514 100644 --- a/platform/src/dbms/db_manager/his_widgets/import_his_backup_dialog.cpp +++ b/platform/src/dbms/db_manager/his_widgets/import_his_backup_dialog.cpp @@ -85,21 +85,21 @@ void import_his_backup_dialog::initUi() void import_his_backup_dialog::initHisMng() { - m_pHisMng = new kbd_dbms::CHisMngApi; + m_pHisMng = new iot_dbms::CHisMngApi; m_pHisMng->moveToThread(&workThread); connect(&workThread, &QThread::finished, m_pHisMng, &QObject::deleteLater); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::status,this,&import_his_backup_dialog::addMsg); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::error,this,&import_his_backup_dialog::addMsg); + connect(m_pHisMng,& iot_dbms::CHisMngApi::status,this,&import_his_backup_dialog::addMsg); + connect(m_pHisMng,& iot_dbms::CHisMngApi::error,this,&import_his_backup_dialog::addMsg); - connect(this,&import_his_backup_dialog::importHis,m_pHisMng,& kbd_dbms::CHisMngApi::importHis); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::importHisFinished,this,&import_his_backup_dialog::handleImportHis); + connect(this,&import_his_backup_dialog::importHis,m_pHisMng,& iot_dbms::CHisMngApi::importHis); + connect(m_pHisMng,& iot_dbms::CHisMngApi::importHisFinished,this,&import_his_backup_dialog::handleImportHis); - connect(this,&import_his_backup_dialog::importHisDump,m_pHisMng,& kbd_dbms::CHisMngApi::importHisDump); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::importHisDumpFinished,this,&import_his_backup_dialog::handleImportHisDump); + connect(this,&import_his_backup_dialog::importHisDump,m_pHisMng,& iot_dbms::CHisMngApi::importHisDump); + connect(m_pHisMng,& iot_dbms::CHisMngApi::importHisDumpFinished,this,&import_his_backup_dialog::handleImportHisDump); - connect(this,&import_his_backup_dialog::importPart,m_pHisMng,& kbd_dbms::CHisMngApi::importHisPart); - connect(this,&import_his_backup_dialog::importPartV2,m_pHisMng,& kbd_dbms::CHisMngApi::importHisPartV2); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::importHisPartFinished,this,&import_his_backup_dialog::handleImportHisPart); + connect(this,&import_his_backup_dialog::importPart,m_pHisMng,& iot_dbms::CHisMngApi::importHisPart); + connect(this,&import_his_backup_dialog::importPartV2,m_pHisMng,& iot_dbms::CHisMngApi::importHisPartV2); + connect(m_pHisMng,& iot_dbms::CHisMngApi::importHisPartFinished,this,&import_his_backup_dialog::handleImportHisPart); connect(ui->listWidget->model(), SIGNAL(rowsInserted(QModelIndex,int,int)), ui->listWidget, SLOT(scrollToBottom())); @@ -178,7 +178,7 @@ void import_his_backup_dialog::showPartInfo(const QDomElement &elem) QString import_his_backup_dialog::getHisBakDir() { //< 得到当前目录 - QDir dir(kbd_public::CFileUtil::getCurModuleDir().c_str()); //< 软件目录 + QDir dir(iot_public::CFileUtil::getCurModuleDir().c_str()); //< 软件目录 dir.cdUp(); //platform dir.cdUp();//home if(!dir.cd("hisdata")) diff --git a/platform/src/dbms/db_manager/his_widgets/import_his_backup_dialog.h b/platform/src/dbms/db_manager/his_widgets/import_his_backup_dialog.h index b20addae..d46e991a 100644 --- a/platform/src/dbms/db_manager/his_widgets/import_his_backup_dialog.h +++ b/platform/src/dbms/db_manager/his_widgets/import_his_backup_dialog.h @@ -58,7 +58,7 @@ public slots: private: Ui::import_his_backup_dialog *ui; QSqlDatabase* m_pConn; - kbd_dbms::CHisMngApi* m_pHisMng; + iot_dbms::CHisMngApi* m_pHisMng; QThread workThread; QString m_backupDir; QTimer timer; diff --git a/platform/src/dbms/db_manager/his_widgets/new_his_backup_dialog.cpp b/platform/src/dbms/db_manager/his_widgets/new_his_backup_dialog.cpp index bfc8a943..328cb152 100644 --- a/platform/src/dbms/db_manager/his_widgets/new_his_backup_dialog.cpp +++ b/platform/src/dbms/db_manager/his_widgets/new_his_backup_dialog.cpp @@ -121,15 +121,15 @@ void new_his_backup_dialog::initStyleSheet() void new_his_backup_dialog::initHisMng() { - m_pHisMng = new kbd_dbms::CHisMngApi; + m_pHisMng = new iot_dbms::CHisMngApi; m_pHisMng->moveToThread(&workThread); connect(&workThread, &QThread::finished, m_pHisMng, &QObject::deleteLater); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::status,this,&new_his_backup_dialog::addMsg); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::error,this,&new_his_backup_dialog::addMsg); - connect(this,&new_his_backup_dialog::exportHis,m_pHisMng,& kbd_dbms::CHisMngApi::exportHis); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::exportHisFinished,this,&new_his_backup_dialog::handleBackUpAll); - connect(this,&new_his_backup_dialog::exportPart,m_pHisMng,& kbd_dbms::CHisMngApi::exportHisPartV2); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::exportHisPartFinished,this,&new_his_backup_dialog::handleBackUpPart); + connect(m_pHisMng,& iot_dbms::CHisMngApi::status,this,&new_his_backup_dialog::addMsg); + connect(m_pHisMng,& iot_dbms::CHisMngApi::error,this,&new_his_backup_dialog::addMsg); + connect(this,&new_his_backup_dialog::exportHis,m_pHisMng,& iot_dbms::CHisMngApi::exportHis); + connect(m_pHisMng,& iot_dbms::CHisMngApi::exportHisFinished,this,&new_his_backup_dialog::handleBackUpAll); + connect(this,&new_his_backup_dialog::exportPart,m_pHisMng,& iot_dbms::CHisMngApi::exportHisPartV2); + connect(m_pHisMng,& iot_dbms::CHisMngApi::exportHisPartFinished,this,&new_his_backup_dialog::handleBackUpPart); workThread.start(); } @@ -137,7 +137,7 @@ void new_his_backup_dialog::initHisMng() QString new_his_backup_dialog::getNewHisBakDir() { //< 得到当前目录 - QDir dir(kbd_public::CFileUtil::getCurModuleDir().c_str()); //< 软件目录 + QDir dir(iot_public::CFileUtil::getCurModuleDir().c_str()); //< 软件目录 dir.cdUp(); //platform dir.cdUp();//home if(!dir.cd("hisdata")) diff --git a/platform/src/dbms/db_manager/his_widgets/new_his_backup_dialog.h b/platform/src/dbms/db_manager/his_widgets/new_his_backup_dialog.h index 517f4d1b..06d5cbc6 100644 --- a/platform/src/dbms/db_manager/his_widgets/new_his_backup_dialog.h +++ b/platform/src/dbms/db_manager/his_widgets/new_his_backup_dialog.h @@ -60,7 +60,7 @@ private slots: private: Ui::new_his_backup_dialog *ui; QThread workThread; - kbd_dbms::CHisMngApi* m_pHisMng; + iot_dbms::CHisMngApi* m_pHisMng; QSqlDatabase* m_pConn; QString m_hisBakDir; QString m_hisBakDirRelative; diff --git a/platform/src/dbms/db_manager/his_widgets/new_his_dump_dialog.cpp b/platform/src/dbms/db_manager/his_widgets/new_his_dump_dialog.cpp index e752c864..55fba3d6 100644 --- a/platform/src/dbms/db_manager/his_widgets/new_his_dump_dialog.cpp +++ b/platform/src/dbms/db_manager/his_widgets/new_his_dump_dialog.cpp @@ -93,17 +93,17 @@ void new_his_dump_dialog::initUi() void new_his_dump_dialog::initHisMng() { - m_pHisMng = new kbd_dbms::CHisMngApi; + m_pHisMng = new iot_dbms::CHisMngApi; m_pHisMng->moveToThread(&workThread); connect(&workThread, &QThread::finished, m_pHisMng, &QObject::deleteLater); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::status,this,&new_his_dump_dialog::addMsg); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::error,this,&new_his_dump_dialog::addMsg); + connect(m_pHisMng,& iot_dbms::CHisMngApi::status,this,&new_his_dump_dialog::addMsg); + connect(m_pHisMng,& iot_dbms::CHisMngApi::error,this,&new_his_dump_dialog::addMsg); //< 一系列信号 - connect(this,&new_his_dump_dialog::dumpHis,m_pHisMng,& kbd_dbms::CHisMngApi::dumpHis); - connect(this,&new_his_dump_dialog::needTermiate,m_pHisMng,& kbd_dbms::CHisMngApi::needTerminate); + connect(this,&new_his_dump_dialog::dumpHis,m_pHisMng,& iot_dbms::CHisMngApi::dumpHis); + connect(this,&new_his_dump_dialog::needTermiate,m_pHisMng,& iot_dbms::CHisMngApi::needTerminate); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::dumpHisFinished,this,&new_his_dump_dialog::handleDumpHisFinished); + connect(m_pHisMng,& iot_dbms::CHisMngApi::dumpHisFinished,this,&new_his_dump_dialog::handleDumpHisFinished); connect(ui->listWidget->model(), SIGNAL(rowsInserted(QModelIndex,int,int)), ui->listWidget, SLOT(scrollToBottom())); workThread.start(); @@ -191,7 +191,7 @@ void new_his_dump_dialog::genConfig() QString new_his_dump_dialog::getNewHisBakDir() { //< 得到当前目录 - QDir dir(kbd_public::CFileUtil::getCurModuleDir().c_str()); //< 软件目录 + QDir dir(iot_public::CFileUtil::getCurModuleDir().c_str()); //< 软件目录 dir.cdUp(); //platform dir.cdUp();//home if(!dir.cd("hisdata")) diff --git a/platform/src/dbms/db_manager/his_widgets/new_his_dump_dialog.h b/platform/src/dbms/db_manager/his_widgets/new_his_dump_dialog.h index be5f9323..36cd4c33 100644 --- a/platform/src/dbms/db_manager/his_widgets/new_his_dump_dialog.h +++ b/platform/src/dbms/db_manager/his_widgets/new_his_dump_dialog.h @@ -50,7 +50,7 @@ private: QString getNewHisBakDir(); void addMsg(const QString &msg); - kbd_dbms::CHisMngApi* m_pHisMng; + iot_dbms::CHisMngApi* m_pHisMng; QSqlDatabase* m_pConn; qint64 m_dumpTimestamp; QThread workThread; diff --git a/platform/src/dbms/db_manager/main.cpp b/platform/src/dbms/db_manager/main.cpp index 7d962259..0e2a6c88 100644 --- a/platform/src/dbms/db_manager/main.cpp +++ b/platform/src/dbms/db_manager/main.cpp @@ -11,15 +11,15 @@ #include "pub_utility_api/FileUtil.h" #include "pub_utility_api/SingleProcInstance.h" -using namespace kbd_public; +using namespace iot_public; class SingleApplication; void initI8n() { - const std::string strLanguage = std::move( kbd_public::getCurLanguage()); + const std::string strLanguage = std::move( iot_public::getCurLanguage()); - std::string strQmFile = std::move( kbd_public::CFileUtil::getPathOfResFile( "db_manager/" + strLanguage + ".qm" )); + std::string strQmFile = std::move( iot_public::CFileUtil::getPathOfResFile( "db_manager/" + strLanguage + ".qm" )); if ( !strQmFile.empty()) { auto *pTrans = new QTranslator; @@ -27,7 +27,7 @@ void initI8n() QApplication::installTranslator( pTrans ); } - strQmFile = std::move( kbd_public::CFileUtil::getPathOfResFile( "db_manager_api/" + strLanguage + ".qm" )); + strQmFile = std::move( iot_public::CFileUtil::getPathOfResFile( "db_manager_api/" + strLanguage + ".qm" )); if ( !strQmFile.empty()) { auto *pTrans = new QTranslator; @@ -35,7 +35,7 @@ void initI8n() QApplication::installTranslator( pTrans ); } - strQmFile = std::move( kbd_public::CFileUtil::getPathOfResFile( "db_his_mng_api/" + strLanguage + ".qm" )); + strQmFile = std::move( iot_public::CFileUtil::getPathOfResFile( "db_his_mng_api/" + strLanguage + ".qm" )); if ( !strQmFile.empty()) { auto *pTrans = new QTranslator; @@ -47,7 +47,7 @@ void initI8n() int main( int argc, char *argv[] ) { - //if(kbd_public::CSingleProcInstance::hasInstanceRunning("db_manager")) + //if(iot_public::CSingleProcInstance::hasInstanceRunning("db_manager")) // return 0; kbd_common::doQtAppGlobalSet(); @@ -57,7 +57,7 @@ int main( int argc, char *argv[] ) QCoreApplication::setOrganizationDomain( "KbdTech.com" ); QCoreApplication::setApplicationName( "db_manager" ); - kbd_public::StartLogSystem( "PUBLIC", "db_manager" ); + iot_public::StartLogSystem( "PUBLIC", "db_manager" ); initI8n(); @@ -73,7 +73,7 @@ int main( int argc, char *argv[] ) } ); int nRet = a.exec(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return nRet; } diff --git a/platform/src/dbms/db_manager/pj_manager.cpp b/platform/src/dbms/db_manager/pj_manager.cpp index a5bcfa60..c29554dd 100644 --- a/platform/src/dbms/db_manager/pj_manager.cpp +++ b/platform/src/dbms/db_manager/pj_manager.cpp @@ -25,7 +25,7 @@ #include "../db_manager_api/db_manager_api_common.h" -using namespace kbd_public; +using namespace iot_public; #define INDEX_NONDB_LOG 0 #define INDEX_LOG_STACK_PROJECT 3 @@ -1385,7 +1385,7 @@ void pj_manager::slotDeleteDatabaseServiceSet() void pj_manager::slotImportBaseData() { - const std::string strLanguage = std::move(kbd_public::getCurLanguage()); + const std::string strLanguage = std::move(iot_public::getCurLanguage()); if(strLanguage.empty()) return; @@ -1552,11 +1552,11 @@ void pj_manager::deleteDatabase() db_opt* pDbOpt = getDbOpt( pItem ); if ( pDbOpt == NULL ) return; - if( pDbOpt->getDbType() == kbd_dbms::EDbType::DB_OPENGAUSS) + if( pDbOpt->getDbType() == iot_dbms::EDbType::DB_OPENGAUSS) { pDbOpt->switchDatabase("postgres"); } - if( pDbOpt->getDbType() == kbd_dbms::EDbType::DB_KINGBASE) + if( pDbOpt->getDbType() == iot_dbms::EDbType::DB_KINGBASE) { pDbOpt->switchDatabase("test"); } @@ -1625,13 +1625,13 @@ void pj_manager::slotDeploy() info.password = dbPara.getPassword(); switch (m_pDbOpt->getDbType()) { - case kbd_dbms::EDbType::DB_MYSQL: + case iot_dbms::EDbType::DB_MYSQL: info.db_type = "mysql"; break; - case kbd_dbms::EDbType::DB_OPENGAUSS: + case iot_dbms::EDbType::DB_OPENGAUSS: info.db_type = "openguass"; m_pDbOpt->closeDatabase(); break; - case kbd_dbms::EDbType::DB_KINGBASE: + case iot_dbms::EDbType::DB_KINGBASE: info.db_type = "kingbase"; m_pDbOpt->closeDatabase(); break; @@ -1650,13 +1650,13 @@ void pj_manager::slotDeploy() } switch (m_pDbOpt->getDbType()) { - case kbd_dbms::EDbType::DB_MYSQL: + case iot_dbms::EDbType::DB_MYSQL: break; - case kbd_dbms::EDbType::DB_OPENGAUSS: + case iot_dbms::EDbType::DB_OPENGAUSS: m_pDbOpt->openDatabase(info.address,info.port,info.username,info.password,info.db_name); break; - case kbd_dbms::EDbType::DB_KINGBASE: + case iot_dbms::EDbType::DB_KINGBASE: m_pDbOpt->openDatabase(info.address,info.port,info.username,info.password,info.db_name); break; default: @@ -1930,7 +1930,7 @@ bool pj_manager::loadBakCfgDbType(const QString &sContent, bool &isDbTypeDiff) { QFile file( getBackupDir()+ QDir::separator() + sContent + QDir::separator() + BACKUP_MANIFEST); if ( !file.exists() ) - { if(m_pDbOpt->getDbType() == kbd_dbms::EDbType::DB_MYSQL) + { if(m_pDbOpt->getDbType() == iot_dbms::EDbType::DB_MYSQL) { isDbTypeDiff = false; return true; @@ -1986,11 +1986,11 @@ QString pj_manager::getDbType() { switch (m_pDbOpt->getDbType()) { - case kbd_dbms::EDbType::DB_MYSQL: + case iot_dbms::EDbType::DB_MYSQL: return "MYSQL"; - case kbd_dbms::EDbType::DB_OPENGAUSS: + case iot_dbms::EDbType::DB_OPENGAUSS: return "OPENGAUSS"; - case kbd_dbms::EDbType::DB_KINGBASE: + case iot_dbms::EDbType::DB_KINGBASE: return "KINGBASE"; default: LOGERROR("不支持的数据库类型！"); @@ -2333,7 +2333,7 @@ bool pj_manager::createDatabase() } - if(pDbOpt->getDbType() == kbd_dbms::DB_KINGBASE ) + if(pDbOpt->getDbType() == iot_dbms::DB_KINGBASE ) { sSql = "CREATE SCHEMA iscs6000;" ; if(!pDbOpt->switchDatabase(sDatabaseName)) @@ -2354,30 +2354,30 @@ bool pj_manager::createDatabase() void pj_manager::initHisMng() { - m_pHisMng = new kbd_dbms::CHisMngApi; + m_pHisMng = new iot_dbms::CHisMngApi; m_pHisMng->moveToThread(&hisWorkThread); connect(&hisWorkThread, &QThread::finished, m_pHisMng, &QObject::deleteLater); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::status,this,&pj_manager::addStatusMsg); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::error,this,&pj_manager::addErrMsg); - connect(this,&pj_manager::optimizeDbSpace,m_pHisMng,& kbd_dbms::CHisMngApi::optimizeDbSpace); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::optimizeDbSpaceFinished,this,&pj_manager::handleOptimizeDbSpaceFinished); - connect(this,&pj_manager::delHisAll,m_pHisMng,& kbd_dbms::CHisMngApi::delHisAll); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::delHisAllFinished,this,&pj_manager::handleDelHisAllFinished); - connect(this,&pj_manager::delHis,m_pHisMng,& kbd_dbms::CHisMngApi::delHis); - connect(m_pHisMng,& kbd_dbms::CHisMngApi::delHisFinished,this,&pj_manager::handleDelHisFinished); + connect(m_pHisMng,& iot_dbms::CHisMngApi::status,this,&pj_manager::addStatusMsg); + connect(m_pHisMng,& iot_dbms::CHisMngApi::error,this,&pj_manager::addErrMsg); + connect(this,&pj_manager::optimizeDbSpace,m_pHisMng,& iot_dbms::CHisMngApi::optimizeDbSpace); + connect(m_pHisMng,& iot_dbms::CHisMngApi::optimizeDbSpaceFinished,this,&pj_manager::handleOptimizeDbSpaceFinished); + connect(this,&pj_manager::delHisAll,m_pHisMng,& iot_dbms::CHisMngApi::delHisAll); + connect(m_pHisMng,& iot_dbms::CHisMngApi::delHisAllFinished,this,&pj_manager::handleDelHisAllFinished); + connect(this,&pj_manager::delHis,m_pHisMng,& iot_dbms::CHisMngApi::delHis); + connect(m_pHisMng,& iot_dbms::CHisMngApi::delHisFinished,this,&pj_manager::handleDelHisFinished); hisWorkThread.start(); } bool pj_manager::isEn() { - return kbd_public::getCurLanguage() == "en"; + return iot_public::getCurLanguage() == "en"; } QString pj_manager::getBackupDir() { //< 得到当前目录 - QDir dir(kbd_public::CFileUtil::getCurModuleDir().c_str()); //< 软件目录 + QDir dir(iot_public::CFileUtil::getCurModuleDir().c_str()); //< 软件目录 dir.cdUp(); //platform dir.cdUp();//home if(!dir.cd("backup")) @@ -2391,7 +2391,7 @@ QString pj_manager::getBackupDir() QString pj_manager::getHisBakDir() { //< 得到当前目录 - QDir dir(kbd_public::CFileUtil::getCurModuleDir().c_str()); //< 软件目录 + QDir dir(iot_public::CFileUtil::getCurModuleDir().c_str()); //< 软件目录 dir.cdUp(); //platform dir.cdUp();//home if(!dir.cd("hisdata")) @@ -2410,7 +2410,7 @@ QString pj_manager::getHisBakDir() QString pj_manager::getHisDumpDir() { //< 得到当前目录 - QDir dir(kbd_public::CFileUtil::getCurModuleDir().c_str()); //< 软件目录 + QDir dir(iot_public::CFileUtil::getCurModuleDir().c_str()); //< 软件目录 dir.cdUp(); //platform dir.cdUp();//home if(!dir.cd("hisdata")) @@ -2429,7 +2429,7 @@ QString pj_manager::getHisDumpDir() QString pj_manager::getHisDumpSrvConfigPath() { //< 得到当前目录 - QDir dir(kbd_public::CFileUtil::getCurModuleDir().c_str()); //< 软件目录 + QDir dir(iot_public::CFileUtil::getCurModuleDir().c_str()); //< 软件目录 dir.cdUp(); //platform dir.cdUp();//home if(!dir.cd("data")) diff --git a/platform/src/dbms/db_manager/pj_manager.h b/platform/src/dbms/db_manager/pj_manager.h index 2dc6a6ee..a7b056c5 100644 --- a/platform/src/dbms/db_manager/pj_manager.h +++ b/platform/src/dbms/db_manager/pj_manager.h @@ -26,7 +26,7 @@ struct sTableInfos QString type; }; -using namespace kbd_dbms; +using namespace iot_dbms; class CLogMngWidget; class pj_manager : public QMainWindow @@ -251,7 +251,7 @@ private: QString m_sDatabaseName; //工程管理使用 QThread hisWorkThread; - kbd_dbms::CHisMngApi* m_pHisMng; + iot_dbms::CHisMngApi* m_pHisMng; bool m_withTitle = true; QString m_exportDir; diff --git a/platform/src/dbms/db_manager_api/auto/project_data_veri/tst_project_data_veri.cpp b/platform/src/dbms/db_manager_api/auto/project_data_veri/tst_project_data_veri.cpp index 5c175cba..be794614 100644 --- a/platform/src/dbms/db_manager_api/auto/project_data_veri/tst_project_data_veri.cpp +++ b/platform/src/dbms/db_manager_api/auto/project_data_veri/tst_project_data_veri.cpp @@ -62,12 +62,12 @@ void project_data_veri::validateProject() QTemporaryDir rootDir; // 开始拷贝 - doCopy(QString(kbd_public::CFileUtil::getCurModuleDir().c_str()) + QDir::separator() + "../../",rootDir.path(),product,project); + doCopy(QString(iot_public::CFileUtil::getCurModuleDir().c_str()) + QDir::separator() + "../../",rootDir.path(),product,project); //修改语言 setLang(lang); - kbd_dbms::db_manager_api db_mng_api; - connect(&db_mng_api,&kbd_dbms::db_manager_api::sig_showMsg,this,&project_data_veri::handleMsg); + iot_dbms::db_manager_api db_mng_api; + connect(&db_mng_api,&iot_dbms::db_manager_api::sig_showMsg,this,&project_data_veri::handleMsg); db_mng_api.setRootPath(rootDir.path()); SDbConnInfo info; info.address = TEST_DB_IP; @@ -263,7 +263,7 @@ bool project_data_veri::cpyDir(const QString &srcPath, const QStringList &subDir bool project_data_veri::setLang(const QString &lang) { //< 获得language配置文件路径 - QFile config_file( kbd_public::CFileUtil::getPathOfCfgFile("language.xml").c_str() ); + QFile config_file( iot_public::CFileUtil::getPathOfCfgFile("language.xml").c_str() ); if ( !config_file.open( QIODevice::ReadWrite ) ) { return false; 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 4979fbb1..e216503a 100644 --- a/platform/src/dbms/db_manager_api/db_manager_api.cpp +++ b/platform/src/dbms/db_manager_api/db_manager_api.cpp @@ -17,13 +17,13 @@ #include "pub_logger_api/logger.h" #include "Common.h" -using namespace kbd_dbms; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_public; bool getLang(std::string& lang) { //< 获得language配置文件路径 - QFile config_file( kbd_public::CFileUtil::getPathOfCfgFile("language.xml").c_str() ); + QFile config_file( iot_public::CFileUtil::getPathOfCfgFile("language.xml").c_str() ); if ( config_file.open( QIODevice::ReadOnly ) == false ) { return false; @@ -66,7 +66,7 @@ db_manager_api::db_manager_api() void db_manager_api::initPath() { - QDir dir( kbd_public::CFileUtil::getCurModuleDir().c_str() ); + QDir dir( iot_public::CFileUtil::getCurModuleDir().c_str() ); dir.cdUp(); dir.cdUp(); setRootPath(dir.absolutePath()); @@ -86,8 +86,8 @@ QString db_manager_api::getBackUpPath() const void db_manager_api::loadConfig() { - kbd_public::CCommonConfigParse config; - if(config.load(kbd_public::CFileUtil::getPathOfCfgFile(DB_MANAGER_CFG_NAME)) == kbdFailed) + iot_public::CCommonConfigParse config; + if(config.load(iot_public::CFileUtil::getPathOfCfgFile(DB_MANAGER_CFG_NAME)) == kbdFailed) { LOGERROR("加载db_manager_cfg.xml配置文件出错"); return; @@ -795,7 +795,7 @@ bool db_manager_api::updateDatabaseStruct(db_opt *pDbOpt, QString &sDatabaseName void db_manager_api::importBasedataExe() { - m_language = kbd_public::getCurLanguage(); + m_language = iot_public::getCurLanguage(); QString sPlatFilePath = CFileUtil::getSimplePath(CFileUtil::getCurModuleDir()+ "/" + CN_PLATFORM_INITDATA_PATH + "/" + m_language + "/" + BASEDATA).c_str(); QString sProdFilePath = CFileUtil::getSimplePath(CFileUtil::getCurModuleDir()+ "/" + CN_PRODUCT_INITDATA_PATH + "/" + m_language + "/" + BASEDATA).c_str(); diff --git a/platform/src/dbms/db_manager_api/db_opt.cpp b/platform/src/dbms/db_manager_api/db_opt.cpp index 307fe526..efa4ec58 100644 --- a/platform/src/dbms/db_manager_api/db_opt.cpp +++ b/platform/src/dbms/db_manager_api/db_opt.cpp @@ -11,8 +11,8 @@ #include #include -using namespace kbd_dbms; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_public; db_opt::db_opt() { m_sIp = ""; @@ -42,7 +42,7 @@ bool db_opt::openDatabase(QString sIp, int nPort, QString sUser, QString sPasswd m_sPasswd = sPasswd; //初始化数据库操作接口 - kbd_dbms::CDbPara objPara; + iot_dbms::CDbPara objPara; objPara.setUserName(m_sUser); objPara.setPassword(m_sPasswd); objPara.setPort(m_nPort); @@ -1305,8 +1305,8 @@ void db_opt::filterTable(QMap &tableOptMap) bool isProductExist = false; QByteArray byFileContentProd,byFileContentPlat; { - QString sPlatFilePath = kbd_public::CFileUtil::getPathOfCfgFile("db_manager_opt.xml").c_str(); - QString sProdFilePath = kbd_public::CFileUtil::getPathOfCfgFile("db_manager_opt.xml","product").c_str(); + QString sPlatFilePath = iot_public::CFileUtil::getPathOfCfgFile("db_manager_opt.xml").c_str(); + QString sProdFilePath = iot_public::CFileUtil::getPathOfCfgFile("db_manager_opt.xml","product").c_str(); //读取配置文件 diff --git a/platform/src/dbms/db_manager_api/db_opt_kingbase.cpp b/platform/src/dbms/db_manager_api/db_opt_kingbase.cpp index c3978b2f..ee96293f 100644 --- a/platform/src/dbms/db_manager_api/db_opt_kingbase.cpp +++ b/platform/src/dbms/db_manager_api/db_opt_kingbase.cpp @@ -2,7 +2,7 @@ #include "pub_logger_api/logger.h" #include "db_manager_api_common.h" -using namespace kbd_dbms; +using namespace iot_dbms; const QString g_sDefaultSchema= QStringLiteral(KINGBASE_DEFAULT_SCHEMA); diff --git a/platform/src/dbms/db_manager_api/db_opt_mysql.cpp b/platform/src/dbms/db_manager_api/db_opt_mysql.cpp index e97db748..89cb7856 100644 --- a/platform/src/dbms/db_manager_api/db_opt_mysql.cpp +++ b/platform/src/dbms/db_manager_api/db_opt_mysql.cpp @@ -11,8 +11,8 @@ #include "pub_logger_api/logger.h" -using namespace kbd_dbms; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_public; db_opt_mysql::db_opt_mysql() { diff --git a/platform/src/dbms/db_manager_api/db_opt_opengauss.cpp b/platform/src/dbms/db_manager_api/db_opt_opengauss.cpp index 43e4225d..bfa7cb94 100644 --- a/platform/src/dbms/db_manager_api/db_opt_opengauss.cpp +++ b/platform/src/dbms/db_manager_api/db_opt_opengauss.cpp @@ -2,7 +2,7 @@ #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; db_opt_opengauss::db_opt_opengauss() { diff --git a/platform/src/dbms/db_manager_api/db_opt_oracle.cpp b/platform/src/dbms/db_manager_api/db_opt_oracle.cpp index d375d0fb..d66e9f93 100644 --- a/platform/src/dbms/db_manager_api/db_opt_oracle.cpp +++ b/platform/src/dbms/db_manager_api/db_opt_oracle.cpp @@ -1,7 +1,7 @@ #include "db_manager_api/db_opt_oracle.h" -using namespace kbd_dbms; +using namespace iot_dbms; db_opt_oracle::db_opt_oracle() { m_sDatabaseConnectionName = "dbOpt_oracle_" + QDateTime::currentDateTime().toString( "yyyy-MM-dd_hh:mm:ss.zzz" ); diff --git a/platform/src/dbms/db_manager_api/kbdwaitprgdlg.cpp b/platform/src/dbms/db_manager_api/kbdwaitprgdlg.cpp index 5a5cb993..ec573ea1 100644 --- a/platform/src/dbms/db_manager_api/kbdwaitprgdlg.cpp +++ b/platform/src/dbms/db_manager_api/kbdwaitprgdlg.cpp @@ -55,7 +55,7 @@ int KbdWaitPrgDlg::exec() return QDialog::Rejected; } - m_beginDuration = kbd_public::getUTCTimeMsec(); + m_beginDuration = iot_public::getUTCTimeMsec(); m_timer->start(1000); emit thdStart(); m_ptrThread = boost::make_shared(m_fun); @@ -113,7 +113,7 @@ void KbdWaitPrgDlg::slot_timeOut() } - int64 nowTime = kbd_public::getUTCTimeMsec(); + int64 nowTime = iot_public::getUTCTimeMsec(); if (nowTime - m_beginDuration > m_minimumDuration) { this->layout()->setEnabled(true); diff --git a/platform/src/dbms/db_manager_api/manual/project_data_veri_manual/MainWindow.cpp b/platform/src/dbms/db_manager_api/manual/project_data_veri_manual/MainWindow.cpp index 27804b2d..8a45a8ec 100644 --- a/platform/src/dbms/db_manager_api/manual/project_data_veri_manual/MainWindow.cpp +++ b/platform/src/dbms/db_manager_api/manual/project_data_veri_manual/MainWindow.cpp @@ -98,13 +98,13 @@ void MainWindow::on_pushButton_clicked() QTemporaryDir rootDir; // 开始拷贝 - doCopy(QString(kbd_public::CFileUtil::getCurModuleDir().c_str()) + QDir::separator() + "../../",rootDir.path(),product,project); + doCopy(QString(iot_public::CFileUtil::getCurModuleDir().c_str()) + QDir::separator() + "../../",rootDir.path(),product,project); //修改语言 setLang(ui->comboBox_lang->currentText()); - kbd_dbms::db_manager_api db_mng_api; - connect(&db_mng_api,&kbd_dbms::db_manager_api::sig_showMsg,this,&MainWindow::handleMsg); + iot_dbms::db_manager_api db_mng_api; + connect(&db_mng_api,&iot_dbms::db_manager_api::sig_showMsg,this,&MainWindow::handleMsg); db_mng_api.setRootPath(rootDir.path()); SDbConnInfo info; info.address = TEST_DB_IP; @@ -253,7 +253,7 @@ bool MainWindow::cpyDir(const QString &srcPath, const QStringList &subDirs, cons bool MainWindow::setLang(const QString &lang) { //< 获得language配置文件路径 - QFile config_file( kbd_public::CFileUtil::getPathOfCfgFile("language.xml").c_str() ); + QFile config_file( iot_public::CFileUtil::getPathOfCfgFile("language.xml").c_str() ); if ( !config_file.open( QIODevice::ReadWrite ) ) { return false; diff --git a/platform/src/dbms/db_save/CDbSaveRedundant.cpp b/platform/src/dbms/db_save/CDbSaveRedundant.cpp index 48fa0a26..77960b62 100644 --- a/platform/src/dbms/db_save/CDbSaveRedundant.cpp +++ b/platform/src/dbms/db_save/CDbSaveRedundant.cpp @@ -1,7 +1,7 @@  #include "CDbSaveRedundant.h" -namespace kbd_dbms +namespace iot_dbms { CDbSaveRedundant::CDbSaveRedundant() @@ -43,9 +43,9 @@ void CDbSaveRedundant::setBSlave( bool bSlave ) m_bSlave.store( bSlave ); } -void CDbSaveRedundant::bindProcMng( kbd_sys::CProcMngInterfacePtr ptrProcMng ) +void CDbSaveRedundant::bindProcMng( iot_sys::CProcMngInterfacePtr ptrProcMng ) { m_pProcMng = ptrProcMng; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_save/CDbSaveRedundant.h b/platform/src/dbms/db_save/CDbSaveRedundant.h index 06f0efb7..70a210ab 100644 --- a/platform/src/dbms/db_save/CDbSaveRedundant.h +++ b/platform/src/dbms/db_save/CDbSaveRedundant.h @@ -5,10 +5,10 @@ #include "sys_node_mng_api/NodeMngInterface.h" #include "boost/atomic.hpp" -namespace kbd_dbms +namespace iot_dbms { -class CDbSaveRedundant : public kbd_sys::CRedundantSwitchInterface +class CDbSaveRedundant : public iot_sys::CRedundantSwitchInterface { public: CDbSaveRedundant(); @@ -20,14 +20,14 @@ public: bool bSlave() const; void setBMaster( bool bMaster ); void setBSlave( bool bSlave ); - void bindProcMng( kbd_sys::CProcMngInterfacePtr pProcMng ); + void bindProcMng( iot_sys::CProcMngInterfacePtr pProcMng ); private: boost::atomic_bool m_bMaster; boost::atomic_bool m_bSlave; - kbd_sys::CProcMngInterfacePtr m_pProcMng; + iot_sys::CProcMngInterfacePtr m_pProcMng; }; -} //< namespace kbd_dbms +} //< namespace iot_dbms #endif // CRDBREDUNDANT_H diff --git a/platform/src/dbms/db_save/CDbSaveService.cpp b/platform/src/dbms/db_save/CDbSaveService.cpp index 7cc24b85..5b15e6aa 100644 --- a/platform/src/dbms/db_save/CDbSaveService.cpp +++ b/platform/src/dbms/db_save/CDbSaveService.cpp @@ -14,7 +14,7 @@ #define DATA_SAVE_PROCESSNAME "db_save" -namespace kbd_dbms +namespace iot_dbms { CDbSaveService::CDbSaveService() @@ -38,7 +38,7 @@ bool CDbSaveService::start( int argc, char *argv[], int &nStatus ) return false; } - kbd_public::StartLogSystem( CN_AppName_PUBLIC.c_str(), "db_save" ); + iot_public::StartLogSystem( CN_AppName_PUBLIC.c_str(), "db_save" ); if ( isAlreadyRunning()) { @@ -46,10 +46,10 @@ bool CDbSaveService::start( int argc, char *argv[], int &nStatus ) return false; } - kbd_public::SRunAppInfo stRunAppInfo; + iot_public::SRunAppInfo stRunAppInfo; { - kbd_public::CSysInfoInterfacePtr sysInfoPtr; - if ( kbd_public::createSysInfoInstance( sysInfoPtr ) == false ) + iot_public::CSysInfoInterfacePtr sysInfoPtr; + if ( iot_public::createSysInfoInstance( sysInfoPtr ) == false ) { LOGFATAL( "createSysInfoInstance() return false, exit!" ); return false; @@ -62,7 +62,7 @@ bool CDbSaveService::start( int argc, char *argv[], int &nStatus ) } } - bool bRet = kbd_net::initMsgBus( DATA_SAVE_PROCESSNAME, CN_AppName_PUBLIC.c_str()); + bool bRet = iot_net::initMsgBus( DATA_SAVE_PROCESSNAME, CN_AppName_PUBLIC.c_str()); if ( false == bRet ) { LOGFATAL( "initMsgBus() return false, exit!" ); @@ -71,8 +71,8 @@ bool CDbSaveService::start( int argc, char *argv[], int &nStatus ) //进程注册，冗余管理 { - using namespace kbd_public; - using namespace kbd_sys; + using namespace iot_public; + using namespace iot_sys; using namespace boost; SProcessInfoKey processInfo; processInfo.nAppId = stRunAppInfo.nAppId; @@ -82,7 +82,7 @@ bool CDbSaveService::start( int argc, char *argv[], int &nStatus ) processInfo.strProcParam = sStartArgs; { - using namespace kbd_sys; + using namespace iot_sys; m_pProcMng = getProcMngInstance( processInfo ); if ( NULL == m_pProcMng ) { @@ -113,7 +113,7 @@ bool CDbSaveService::start( int argc, char *argv[], int &nStatus ) m_pProcMng->updateProcessInfo( true, false, false ); - const std::string strDataDerictory = kbd_public::CFileUtil::getAbsolutePath(DATA_DIRECTORY, ""); + const std::string strDataDerictory = iot_public::CFileUtil::getAbsolutePath(DATA_DIRECTORY, ""); if ( !boost::filesystem::is_directory( strDataDerictory )) { if ( !boost::filesystem::create_directories( strDataDerictory )) @@ -146,14 +146,14 @@ bool CDbSaveService::stop() m_pProcMng.reset(); } - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return true; } bool CDbSaveService::isAlreadyRunning() { - return kbd_public::CSingleProcInstance::hasInstanceRunning( DATA_SAVE_PROCESSNAME ); + return iot_public::CSingleProcInstance::hasInstanceRunning( DATA_SAVE_PROCESSNAME ); } int CDbSaveService::toQuit() @@ -212,4 +212,4 @@ bool CDbSaveService::parseCommandLine( int argc, char *argv[], std::string &sSta return true; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_save/CDbSaveService.h b/platform/src/dbms/db_save/CDbSaveService.h index 8a32fceb..4f3c9b12 100644 --- a/platform/src/dbms/db_save/CDbSaveService.h +++ b/platform/src/dbms/db_save/CDbSaveService.h @@ -4,10 +4,10 @@ #include "pub_utility_api/BaseService.h" #include "CDbSaveServiceThread.h" -namespace kbd_dbms +namespace iot_dbms { -class CDbSaveService final : public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface +class CDbSaveService final : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CDbSaveService(); @@ -23,9 +23,9 @@ private: bool isAlreadyRunning(); private: - kbd_sys::CProcMngInterfacePtr m_pProcMng; - kbd_sys::CRedundantMngInterfacePtr m_pRedundantMng; + iot_sys::CProcMngInterfacePtr m_pProcMng; + iot_sys::CRedundantMngInterfacePtr m_pRedundantMng; CDbSaveServiceThreadPtr m_pServiceThread; }; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_save/CDbSaveServiceThread.cpp b/platform/src/dbms/db_save/CDbSaveServiceThread.cpp index 62081614..6f6bfcdb 100644 --- a/platform/src/dbms/db_save/CDbSaveServiceThread.cpp +++ b/platform/src/dbms/db_save/CDbSaveServiceThread.cpp @@ -8,7 +8,7 @@ #include "public/pub_sysinfo_api/SysInfoApi.h" #include "CDbSaveServiceThread.h" -namespace kbd_dbms +namespace iot_dbms { CDbSaveServiceThread::CDbSaveServiceThread( int nDomainID ) @@ -44,17 +44,17 @@ bool CDbSaveServiceThread::init() m_vecLocalDbThread.clear(); m_vecRemoteDbThread.clear(); - kbd_public::CSysInfoInterfacePtr ptrSysInfo; - if ( kbd_public::createSysInfoInstance( ptrSysInfo ) == false ) + iot_public::CSysInfoInterfacePtr ptrSysInfo; + if ( iot_public::createSysInfoInstance( ptrSysInfo ) == false ) { LOGERROR( "createSysInfoInstance() return false !" ); return false; } //< 本地域数据库连接信息 - kbd_public::SDatabaseInfo stFirstDbInfo; - std::vector vecLocalDbInfo; - std::vector vecRemoteDbInfo; + iot_public::SDatabaseInfo stFirstDbInfo; + std::vector vecLocalDbInfo; + std::vector vecRemoteDbInfo; int nRc = ptrSysInfo->getDBInfoByDomainId( m_nDomainID, stFirstDbInfo, vecLocalDbInfo, vecRemoteDbInfo ); if ( kbdSuccess != nRc ) @@ -63,13 +63,13 @@ bool CDbSaveServiceThread::init() return false; } - kbd_public::SNodeInfo stDbNodeInfo; + iot_public::SNodeInfo stDbNodeInfo; CDbPara objDbParaTemp; //< 初始化 m_vecLocalDbThread for ( size_t nDbInfoIndex = 0; nDbInfoIndex < vecLocalDbInfo.size(); nDbInfoIndex++ ) { - const kbd_public::SDatabaseInfo &objDbInfo = vecLocalDbInfo[nDbInfoIndex]; + const iot_public::SDatabaseInfo &objDbInfo = vecLocalDbInfo[nDbInfoIndex]; nRc = ptrSysInfo->getNodeInfoByName( objDbInfo.strNodeName, stDbNodeInfo ); if ( kbdSuccess != nRc ) { @@ -95,16 +95,16 @@ bool CDbSaveServiceThread::init() switch ( objDbInfo.eDBType ) { - case kbd_public::EDBType_MYSQL: + case iot_public::EDBType_MYSQL: objDbParaTemp.setDbType( DB_MYSQL ); break; - case kbd_public::EDBType_ORACLE: + case iot_public::EDBType_ORACLE: objDbParaTemp.setDbType( DB_ORACLE ); break; - case kbd_public::EDBType_OPENGAUSS: + case iot_public::EDBType_OPENGAUSS: objDbParaTemp.setDbType( DB_OPENGAUSS ); break; - case kbd_public::EDBType_KINGBASE: + case iot_public::EDBType_KINGBASE: objDbParaTemp.setDbType( DB_KINGBASE ); break; default: @@ -129,7 +129,7 @@ bool CDbSaveServiceThread::init() //< 初始化 m_vecRemoteDbThread for ( size_t nDbInfoIndex = 0; nDbInfoIndex < vecRemoteDbInfo.size(); nDbInfoIndex++ ) { - const kbd_public::SDatabaseInfo &objDbInfo = vecRemoteDbInfo[nDbInfoIndex]; + const iot_public::SDatabaseInfo &objDbInfo = vecRemoteDbInfo[nDbInfoIndex]; nRc = ptrSysInfo->getNodeInfoByName( objDbInfo.strNodeName, stDbNodeInfo ); if ( kbdSuccess != nRc ) { @@ -155,16 +155,16 @@ bool CDbSaveServiceThread::init() switch ( objDbInfo.eDBType ) { - case kbd_public::EDBType_MYSQL: + case iot_public::EDBType_MYSQL: objDbParaTemp.setDbType( DB_MYSQL ); break; - case kbd_public::EDBType_ORACLE: + case iot_public::EDBType_ORACLE: objDbParaTemp.setDbType( DB_ORACLE ); break; - case kbd_public::EDBType_OPENGAUSS: + case iot_public::EDBType_OPENGAUSS: objDbParaTemp.setDbType( DB_OPENGAUSS ); break; - case kbd_public::EDBType_KINGBASE: + case iot_public::EDBType_KINGBASE: objDbParaTemp.setDbType( DB_KINGBASE ); break; default: @@ -197,7 +197,7 @@ void CDbSaveServiceThread::execute() return; } - kbd_net::CMbMessage objMbMsgRcv; + iot_net::CMbMessage objMbMsgRcv; for ( int i = 0; i < 200; ++i ) { @@ -210,7 +210,7 @@ void CDbSaveServiceThread::execute() } -void CDbSaveServiceThread::handleOneMbMsg( const kbd_net::CMbMessage &objMbMsgRcv ) +void CDbSaveServiceThread::handleOneMbMsg( const iot_net::CMbMessage &objMbMsgRcv ) { /* LOGDEBUG("MsgType = %d , Para1 = %d , Para2 = %d , DataSize = %llu", @@ -231,8 +231,8 @@ void CDbSaveServiceThread::handleOneMbMsg( const kbd_net::CMbMessage &objMbMsgRc //< 1、防止应用端因一条错误消息而死循环 //< 2、提高速度 { - kbd_net::CMbMessage objMbMSgRep; - objMbMSgRep.setMsgType( kbd_idlfile::MT_DSS_SRV2APP_ACK ); + iot_net::CMbMessage objMbMSgRep; + objMbMSgRep.setMsgType( iot_idl::MT_DSS_SRV2APP_ACK ); objMbMSgRep.setSubject( CN_AppId_PUBLIC, CH_DSS_SRV_TO_APP ); objMbMSgRep.setData( std::string( "DSS" )); objMbMSgRep.setPara1( objMbMsgRcv.getPara1()); @@ -242,7 +242,7 @@ void CDbSaveServiceThread::handleOneMbMsg( const kbd_net::CMbMessage &objMbMsgRc m_oMbComm.replyMsg( objMbMSgRep, objMbMsgRcv ); } - const boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); //< 1小时清理一次 m_mapAppStatus if ( m_nLastCleanAppStatusTime + 3600000 < nTimeNow ) @@ -297,13 +297,13 @@ void CDbSaveServiceThread::handleOneMbMsg( const kbd_net::CMbMessage &objMbMsgRc } } - DbRequestPtr ptrDbReq( new kbd_idlfile::DbRequest ); - kbd_idlfile::enDssSaveAction enSaveAction = kbd_idlfile::SA_DSS_DO_NOTHING; + DbRequestPtr ptrDbReq( new iot_idl::DbRequest ); + iot_idl::enDssSaveAction enSaveAction = iot_idl::SA_DSS_DO_NOTHING; switch ( objMbMsgRcv.getMsgType()) { - case kbd_idlfile::MT_DSS_APP2SRV_INSERT: + case iot_idl::MT_DSS_APP2SRV_INSERT: { - kbd_idlfile::DbInsert *pDbInsert = ptrDbReq->mutable_msginsert(); + iot_idl::DbInsert *pDbInsert = ptrDbReq->mutable_msginsert(); const bool bRc = pDbInsert->ParseFromArray( objMbMsgRcv.getDataPtr(), ( int ) objMbMsgRcv.getDataSize()); if ( !bRc ) { @@ -313,9 +313,9 @@ void CDbSaveServiceThread::handleOneMbMsg( const kbd_net::CMbMessage &objMbMsgRc enSaveAction = pDbInsert->ensaveaction(); } break; - case kbd_idlfile::MT_DSS_APP2SRV_REMOVE: + case iot_idl::MT_DSS_APP2SRV_REMOVE: { - kbd_idlfile::DbRemove *pDbRemove = ptrDbReq->mutable_msgremove(); + iot_idl::DbRemove *pDbRemove = ptrDbReq->mutable_msgremove(); const bool bRc = pDbRemove->ParseFromArray( objMbMsgRcv.getDataPtr(), ( int ) objMbMsgRcv.getDataSize()); if ( !bRc ) { @@ -325,9 +325,9 @@ void CDbSaveServiceThread::handleOneMbMsg( const kbd_net::CMbMessage &objMbMsgRc enSaveAction = pDbRemove->ensaveaction(); } break; - case kbd_idlfile::MT_DSS_APP2SRV_REMOVEMULTI: + case iot_idl::MT_DSS_APP2SRV_REMOVEMULTI: { - kbd_idlfile::DbRemoveMulti *pDbRemoveMulti = ptrDbReq->mutable_msgremovemulti(); + iot_idl::DbRemoveMulti *pDbRemoveMulti = ptrDbReq->mutable_msgremovemulti(); const bool bRc = pDbRemoveMulti->ParseFromArray( objMbMsgRcv.getDataPtr(), ( int ) objMbMsgRcv.getDataSize()); if ( !bRc ) @@ -338,9 +338,9 @@ void CDbSaveServiceThread::handleOneMbMsg( const kbd_net::CMbMessage &objMbMsgRc enSaveAction = pDbRemoveMulti->ensaveaction(); } break; - case kbd_idlfile::MT_DSS_APP2SRV_UPDATE: + case iot_idl::MT_DSS_APP2SRV_UPDATE: { - kbd_idlfile::DbUpdate *pDbUpdate = ptrDbReq->mutable_msgupdate(); + iot_idl::DbUpdate *pDbUpdate = ptrDbReq->mutable_msgupdate(); const bool bRc = pDbUpdate->ParseFromArray( objMbMsgRcv.getDataPtr(), ( int ) objMbMsgRcv.getDataSize()); if ( !bRc ) { @@ -350,9 +350,9 @@ void CDbSaveServiceThread::handleOneMbMsg( const kbd_net::CMbMessage &objMbMsgRc enSaveAction = pDbUpdate->ensaveaction(); } break; - case kbd_idlfile::MT_DSS_APP2SRV_UPDATEMULTI: + case iot_idl::MT_DSS_APP2SRV_UPDATEMULTI: { - kbd_idlfile::DbUpdateMulti *pDbUpdateMulti = ptrDbReq->mutable_msgupdatemulti(); + iot_idl::DbUpdateMulti *pDbUpdateMulti = ptrDbReq->mutable_msgupdatemulti(); const bool bRc = pDbUpdateMulti->ParseFromArray( objMbMsgRcv.getDataPtr(), ( int ) objMbMsgRcv.getDataSize()); if ( !bRc ) @@ -376,15 +376,15 @@ void CDbSaveServiceThread::handleOneMbMsg( const kbd_net::CMbMessage &objMbMsgRc bool bToRemote = false; switch ( enSaveAction ) { - case kbd_idlfile::SA_DSS_DO_NOTHING: + case iot_idl::SA_DSS_DO_NOTHING: break; - case kbd_idlfile::SA_DSS_LOCAL_ONLY: + case iot_idl::SA_DSS_LOCAL_ONLY: bToLocal = true; break; - case kbd_idlfile::SA_DSS_REMOTE_ONLY: + case iot_idl::SA_DSS_REMOTE_ONLY: bToRemote = true; break; - case kbd_idlfile::SA_DSS_LOCAL_REMOTE: + case iot_idl::SA_DSS_LOCAL_REMOTE: bToLocal = true; bToRemote = true; break; @@ -438,4 +438,4 @@ int CDbSaveServiceThread::redundantSwitch( bool bMaster, bool bSlave ) return kbdSuccess; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_save/CDbSaveServiceThread.h b/platform/src/dbms/db_save/CDbSaveServiceThread.h index ffd9de4d..b2e679d9 100644 --- a/platform/src/dbms/db_save/CDbSaveServiceThread.h +++ b/platform/src/dbms/db_save/CDbSaveServiceThread.h @@ -6,7 +6,7 @@ #include "CDbSaveRedundant.h" #include "CDbSaveServiceWorkThread.h" -namespace kbd_dbms +namespace iot_dbms { //< 向本服务发送写库请求的应用的状态，用于消息防重 @@ -19,7 +19,7 @@ struct SAppStatus {} }; -class CDbSaveServiceThread final : public kbd_public::CTimerThreadBase, public CDbSaveRedundant +class CDbSaveServiceThread final : public iot_public::CTimerThreadBase, public CDbSaveRedundant { public: explicit CDbSaveServiceThread( int nDomainID ); @@ -32,13 +32,13 @@ public: private: bool init(); - void handleOneMbMsg( const kbd_net::CMbMessage &objMbMsgRcv ); + void handleOneMbMsg( const iot_net::CMbMessage &objMbMsgRcv ); private: bool m_bInit; int m_nDomainID; boost::int64_t m_nLastCleanAppStatusTime; //< 上一次清理 m_mapAppStatus 的时间 ms - kbd_net::CMbCommunicator m_oMbComm; + iot_net::CMbCommunicator m_oMbComm; std::vector m_vecLocalDbThread; std::vector m_vecRemoteDbThread; boost::unordered::unordered_map m_mapAppStatus; //< key为通讯器名UUID @@ -46,4 +46,4 @@ private: typedef boost::shared_ptr CDbSaveServiceThreadPtr; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_save/CDbSaveServiceWorkThread.cpp b/platform/src/dbms/db_save/CDbSaveServiceWorkThread.cpp index 5f1f7271..8fedc239 100644 --- a/platform/src/dbms/db_save/CDbSaveServiceWorkThread.cpp +++ b/platform/src/dbms/db_save/CDbSaveServiceWorkThread.cpp @@ -7,11 +7,11 @@ #include "PredefineForDbSaveServer.h" #include "CDbSaveServiceWorkThread.h" -using namespace kbd_idlfile; +using namespace iot_idl; //< todo 本地缓存文件管理需完善，可用SQLite作为本地缓存 -namespace kbd_dbms +namespace iot_dbms { //< 20 ms 执行一次，死锁超时 24小时 @@ -35,7 +35,7 @@ void CDbSaveServiceWorkThread::execute() if ( openDb()) { bool bIsEnd = false; - kbd_idlfile::DbRequest oRequest; + iot_idl::DbRequest oRequest; while ( getMsg( oRequest, bIsEnd )) { @@ -135,7 +135,7 @@ bool CDbSaveServiceWorkThread::openDb() return false; } -bool CDbSaveServiceWorkThread::getMsg( kbd_idlfile::DbRequest &oRequest, bool &bIsEnd ) +bool CDbSaveServiceWorkThread::getMsg( iot_idl::DbRequest &oRequest, bool &bIsEnd ) { m_objOutputStream.uninit(); m_objInputStream.init( m_strNodeName ); @@ -143,7 +143,7 @@ bool CDbSaveServiceWorkThread::getMsg( kbd_idlfile::DbRequest &oRequest, bool &b return m_objInputStream.readMsg( oRequest, bIsEnd ); } -void CDbSaveServiceWorkThread::writeMsg( const kbd_idlfile::DbRequest &oRequest ) +void CDbSaveServiceWorkThread::writeMsg( const iot_idl::DbRequest &oRequest ) { std::string strData; if ( oRequest.SerializeToString( &strData )) @@ -161,7 +161,7 @@ void CDbSaveServiceWorkThread::writeMsg( const kbd_idlfile::DbRequest &oRequest void CDbSaveServiceWorkThread::delFile() { - const std::string sFullPath = kbd_public::CFileUtil::getAbsolutePath(DATA_DIRECTORY, m_strNodeName); + const std::string sFullPath = iot_public::CFileUtil::getAbsolutePath(DATA_DIRECTORY, m_strNodeName); if ( sFullPath.empty()) { LOGERROR( "获取全路径失败." ); @@ -183,9 +183,9 @@ void CDbSaveServiceWorkThread::pushMsg( DbRequestPtr pAdd ) m_queIncome.push( pAdd ); } -bool CDbSaveServiceWorkThread::deal( const kbd_idlfile::DbRequest &msgDbReq, bool bWriteFile ) +bool CDbSaveServiceWorkThread::deal( const iot_idl::DbRequest &msgDbReq, bool bWriteFile ) { - using namespace kbd_idlfile; + using namespace iot_idl; bool bRet = false; @@ -245,7 +245,7 @@ bool CDbSaveServiceWorkThread::deal( const kbd_idlfile::DbRequest &msgDbReq, boo return false; } -bool CDbSaveServiceWorkThread::dealInsert( const kbd_idlfile::DbInsert &msgInsert ) +bool CDbSaveServiceWorkThread::dealInsert( const iot_idl::DbInsert &msgInsert ) { if ( m_objDb.isOpen()) { @@ -285,7 +285,7 @@ bool CDbSaveServiceWorkThread::dealInsert( const kbd_idlfile::DbInsert &msgInser return true; } -bool CDbSaveServiceWorkThread::dealUpdate( const kbd_idlfile::DbUpdate &msgUpdate ) +bool CDbSaveServiceWorkThread::dealUpdate( const iot_idl::DbUpdate &msgUpdate ) { if ( m_objDb.isOpen()) { @@ -322,7 +322,7 @@ bool CDbSaveServiceWorkThread::dealUpdate( const kbd_idlfile::DbUpdate &msgUpdat return true; } -bool CDbSaveServiceWorkThread::dealUpdateMulti( const kbd_idlfile::DbUpdateMulti &msgUpdateMulti ) +bool CDbSaveServiceWorkThread::dealUpdateMulti( const iot_idl::DbUpdateMulti &msgUpdateMulti ) { if ( m_objDb.isOpen()) { @@ -377,7 +377,7 @@ bool CDbSaveServiceWorkThread::dealUpdateMulti( const kbd_idlfile::DbUpdateMulti return true; } -bool CDbSaveServiceWorkThread::dealRemove( const kbd_idlfile::DbRemove &msgRemove ) +bool CDbSaveServiceWorkThread::dealRemove( const iot_idl::DbRemove &msgRemove ) { if ( m_objDb.isOpen()) { @@ -405,7 +405,7 @@ bool CDbSaveServiceWorkThread::dealRemove( const kbd_idlfile::DbRemove &msgRemov return true; } -bool CDbSaveServiceWorkThread::dealRemoveMulti( const kbd_idlfile::DbRemoveMulti &msgRemoveMulti ) +bool CDbSaveServiceWorkThread::dealRemoveMulti( const iot_idl::DbRemoveMulti &msgRemoveMulti ) { if ( m_objDb.isOpen()) { @@ -451,4 +451,4 @@ bool CDbSaveServiceWorkThread::dealRemoveMulti( const kbd_idlfile::DbRemoveMulti return true; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_save/CDbSaveServiceWorkThread.h b/platform/src/dbms/db_save/CDbSaveServiceWorkThread.h index c4571479..cdf06bbd 100644 --- a/platform/src/dbms/db_save/CDbSaveServiceWorkThread.h +++ b/platform/src/dbms/db_save/CDbSaveServiceWorkThread.h @@ -10,12 +10,12 @@ #include "COStreamFile.h" #include "PredefineForDbSaveServer.h" -typedef boost::shared_ptr DbRequestPtr; +typedef boost::shared_ptr DbRequestPtr; -namespace kbd_dbms +namespace iot_dbms { -class CDbSaveServiceWorkThread final : public kbd_public::CTimerThreadBase +class CDbSaveServiceWorkThread final : public iot_public::CTimerThreadBase { public: CDbSaveServiceWorkThread( const std::string &strNodeName, @@ -30,15 +30,15 @@ public: private: bool openDb(); - bool deal( const kbd_idlfile::DbRequest &msgDbReq, bool bWriteFile ); //< 无法处理时，返回false，即执行不成功，且不是语句问题，又没有写文件时 + bool deal( const iot_idl::DbRequest &msgDbReq, bool bWriteFile ); //< 无法处理时，返回false，即执行不成功，且不是语句问题，又没有写文件时 bool popMsg( DbRequestPtr &pGet ); //pop msg from queue - bool dealInsert( const kbd_idlfile::DbInsert &msgInsert ); - bool dealUpdate( const kbd_idlfile::DbUpdate &msgUpdate ); - bool dealUpdateMulti( const kbd_idlfile::DbUpdateMulti &msgUpdateMulti ); - bool dealRemove( const kbd_idlfile::DbRemove &msgRemove ); - bool dealRemoveMulti( const kbd_idlfile::DbRemoveMulti &msgRemoveMulti ); - bool getMsg( kbd_idlfile::DbRequest &oRequest, bool &bIsEnd ); //< bIsEnd，输出参数，文件是否已读取完 - void writeMsg( const kbd_idlfile::DbRequest &oRequest ); + bool dealInsert( const iot_idl::DbInsert &msgInsert ); + bool dealUpdate( const iot_idl::DbUpdate &msgUpdate ); + bool dealUpdateMulti( const iot_idl::DbUpdateMulti &msgUpdateMulti ); + bool dealRemove( const iot_idl::DbRemove &msgRemove ); + bool dealRemoveMulti( const iot_idl::DbRemoveMulti &msgRemoveMulti ); + bool getMsg( iot_idl::DbRequest &oRequest, bool &bIsEnd ); //< bIsEnd，输出参数，文件是否已读取完 + void writeMsg( const iot_idl::DbRequest &oRequest ); void delFile(); private: @@ -61,4 +61,4 @@ private: typedef boost::shared_ptr CDbSaveServiceWorkThreadPtr; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_save/CIStreamFile.cpp b/platform/src/dbms/db_save/CIStreamFile.cpp index a98b7c12..1d8b2c4a 100644 --- a/platform/src/dbms/db_save/CIStreamFile.cpp +++ b/platform/src/dbms/db_save/CIStreamFile.cpp @@ -22,7 +22,7 @@ #include "pub_logger_api/logger.h" #include "pub_utility_api/FileUtil.h" -namespace kbd_dbms +namespace iot_dbms { CIStreamFile::CIStreamFile() @@ -38,7 +38,7 @@ bool CIStreamFile::init( const std::string &sFileName ) if ( NULL == m_pStream ) { - const std::string sFullPath = kbd_public::CFileUtil::getAbsolutePath(DATA_DIRECTORY, sFileName); + const std::string sFullPath = iot_public::CFileUtil::getAbsolutePath(DATA_DIRECTORY, sFileName); if ( sFullPath.empty()) { LOGERROR( "获取全路径失败." ); @@ -82,7 +82,7 @@ bool CIStreamFile::uninit() } -bool CIStreamFile::readMsg( kbd_idlfile::DbRequest &oRequest, bool &bIsEnd ) +bool CIStreamFile::readMsg( iot_idl::DbRequest &oRequest, bool &bIsEnd ) { if ( !m_pStream ) return false; @@ -143,4 +143,4 @@ bool CIStreamFile::readMsg( kbd_idlfile::DbRequest &oRequest, bool &bIsEnd ) } } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_save/CIStreamFile.h b/platform/src/dbms/db_save/CIStreamFile.h index 956d70fc..7d7dffed 100644 --- a/platform/src/dbms/db_save/CIStreamFile.h +++ b/platform/src/dbms/db_save/CIStreamFile.h @@ -5,7 +5,7 @@ #include "DbSaveCommon.h" #include "DbSaveMessage.pb.h" -namespace kbd_dbms +namespace iot_dbms { class CIStreamFile { @@ -15,7 +15,7 @@ public: public: bool init( const std::string &sFileName ); bool uninit(); - bool readMsg( kbd_idlfile::DbRequest &oRequest, bool &bIsEnd ); //< bIsEnd，输出参数，文件是否已读取完 + bool readMsg( iot_idl::DbRequest &oRequest, bool &bIsEnd ); //< bIsEnd，输出参数，文件是否已读取完 private: google::protobuf::io::CodedInputStream *m_pStream; @@ -23,6 +23,6 @@ private: int m_nFd; //< file discriptor }; -} //< namespace kbd_dbms +} //< namespace iot_dbms #endif // CSTREAMFILE_H diff --git a/platform/src/dbms/db_save/COStreamFile.cpp b/platform/src/dbms/db_save/COStreamFile.cpp index 2ca1666a..c37f854a 100644 --- a/platform/src/dbms/db_save/COStreamFile.cpp +++ b/platform/src/dbms/db_save/COStreamFile.cpp @@ -19,7 +19,7 @@ #include "pub_logger_api/logger.h" #include "pub_utility_api/FileUtil.h" -namespace kbd_dbms +namespace iot_dbms { COStreamFile::COStreamFile() @@ -34,7 +34,7 @@ bool COStreamFile::init( const std::string &sFileName ) if ( NULL == m_pStream ) { - const std::string sFullPath = kbd_public::CFileUtil::getAbsolutePath(DATA_DIRECTORY, sFileName); + const std::string sFullPath = iot_public::CFileUtil::getAbsolutePath(DATA_DIRECTORY, sFileName); if ( sFullPath.empty()) { LOGERROR( "获取全路径失败." ); @@ -105,4 +105,4 @@ void COStreamFile::writeMsg( const std::string &strData ) m_pStream->WriteRaw(( const void * ) strData.data(), strData.size()); } -} //< namespace kbd_dbms \ No newline at end of file +} //< namespace iot_dbms \ No newline at end of file diff --git a/platform/src/dbms/db_save/COStreamFile.h b/platform/src/dbms/db_save/COStreamFile.h index 67d3a9c9..3f534c5b 100644 --- a/platform/src/dbms/db_save/COStreamFile.h +++ b/platform/src/dbms/db_save/COStreamFile.h @@ -4,7 +4,7 @@ #include "google/protobuf/io/coded_stream.h" #include "DbSaveCommon.h" -namespace kbd_dbms +namespace iot_dbms { class COStreamFile @@ -23,6 +23,6 @@ private: int m_nFd; //< file discriptor }; -} //< namespace kbd_dbms +} //< namespace iot_dbms #endif // COSTREAMFILE_H diff --git a/platform/src/dbms/db_save/DbSaveCommon.h b/platform/src/dbms/db_save/DbSaveCommon.h index 12898753..1ee78de7 100644 --- a/platform/src/dbms/db_save/DbSaveCommon.h +++ b/platform/src/dbms/db_save/DbSaveCommon.h @@ -11,7 +11,7 @@ const uint64 cn_check_mask = 0x90EB90EB00000000; #define DATA_DIRECTORY "../../data/cache/db_save_cache/" #endif -namespace kbd_dbms +namespace iot_dbms { -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_save/PredefineForDbSaveServer.cpp b/platform/src/dbms/db_save/PredefineForDbSaveServer.cpp index 4efebc0e..57b36134 100644 --- a/platform/src/dbms/db_save/PredefineForDbSaveServer.cpp +++ b/platform/src/dbms/db_save/PredefineForDbSaveServer.cpp @@ -2,12 +2,12 @@ #include "pub_logger_api/logger.h" #include "PredefineForDbSaveServer.h" -namespace kbd_dbms +namespace iot_dbms { -QVariant convert2QVariant( const kbd_idlfile::SVariable &rValue ) +QVariant convert2QVariant( const iot_idl::SVariable &rValue ) { - using namespace kbd_idlfile; + using namespace iot_idl; QVariant lValue; switch ( rValue.edatatype()) { @@ -97,9 +97,9 @@ QVariant convert2QVariant( const kbd_idlfile::SVariable &rValue ) return lValue; } -CDbCondition convert2CDbCondition( const kbd_idlfile::DbCondition &rValue ) +CDbCondition convert2CDbCondition( const iot_idl::DbCondition &rValue ) { - using namespace kbd_idlfile; + using namespace iot_idl; CDbCondition objCondition; objCondition.m_sColName = rValue.strcolumnname().c_str(); objCondition.m_value = convert2QVariant( rValue.msgvalue()); @@ -141,10 +141,10 @@ CDbCondition convert2CDbCondition( const kbd_idlfile::DbCondition &rValue ) } -CDbCondition convert2CDbCondition( const kbd_idlfile::DbConditionHead &objCondHead, - const kbd_idlfile::SVariable &objCondVal ) +CDbCondition convert2CDbCondition( const iot_idl::DbConditionHead &objCondHead, + const iot_idl::SVariable &objCondVal ) { - using namespace kbd_idlfile; + using namespace iot_idl; CDbCondition objCondition; objCondition.m_sColName = objCondHead.strcolumnname().c_str(); objCondition.m_value = convert2QVariant( objCondVal ); @@ -188,4 +188,4 @@ CDbCondition convert2CDbCondition( const kbd_idlfile::DbConditionHead &objCondHe return objCondition; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_save/PredefineForDbSaveServer.h b/platform/src/dbms/db_save/PredefineForDbSaveServer.h index db70563e..24e5bae7 100644 --- a/platform/src/dbms/db_save/PredefineForDbSaveServer.h +++ b/platform/src/dbms/db_save/PredefineForDbSaveServer.h @@ -5,16 +5,16 @@ #include "db_base_api/CDbBaseApi.h" #include "DbSaveMessage.pb.h" -namespace kbd_dbms +namespace iot_dbms { -QVariant convert2QVariant( const kbd_idlfile::SVariable &rValue ); +QVariant convert2QVariant( const iot_idl::SVariable &rValue ); -CDbCondition convert2CDbCondition( const kbd_idlfile::DbCondition &rValue ); +CDbCondition convert2CDbCondition( const iot_idl::DbCondition &rValue ); -CDbCondition convert2CDbCondition( const kbd_idlfile::DbConditionHead &objCondHead, - const kbd_idlfile::SVariable &objCondVal ); +CDbCondition convert2CDbCondition( const iot_idl::DbConditionHead &objCondHead, + const iot_idl::SVariable &objCondVal ); -} //< namespace kbd_dbms +} //< namespace iot_dbms #endif // CDATASAVEPREDEFINE_H diff --git a/platform/src/dbms/db_save/main.cpp b/platform/src/dbms/db_save/main.cpp index 78e2b5ae..217e8af0 100644 --- a/platform/src/dbms/db_save/main.cpp +++ b/platform/src/dbms/db_save/main.cpp @@ -3,7 +3,7 @@ int main( int argc, char *argv[] ) { - kbd_dbms::CDbSaveService objService; + iot_dbms::CDbSaveService objService; objService.main( argc, argv ); return 0; diff --git a/platform/src/dbms/db_save_api/CDbSaveThread.cpp b/platform/src/dbms/db_save_api/CDbSaveThread.cpp index ff96c074..72231529 100644 --- a/platform/src/dbms/db_save_api/CDbSaveThread.cpp +++ b/platform/src/dbms/db_save_api/CDbSaveThread.cpp @@ -14,7 +14,7 @@ //< 输入队列的上限，防止异常情况下的内存无限制增长 #define CN_MAX_SIZE_OF_QUEUE 6000 -namespace kbd_dbms +namespace iot_dbms { //< 死锁检测6分钟，大于单次执行的最坏情况 @@ -43,7 +43,7 @@ void CDbSaveThread::execute() //< 一次运行最多发100条 for (int i = 0; i < 100; i++) { - kbd_net::CMbMessage objMbMsg; + iot_net::CMbMessage objMbMsg; while (m_objComm.recvMsg(objMbMsg, 0)) { //< 清空所有收到的消息，防止脏数据 @@ -112,7 +112,7 @@ void CDbSaveThread::execute() nSendSeq, strData.c_str());*/ - if (objMbMsg.getMsgType() == kbd_idlfile::MT_DSS_SRV2APP_ACK + if (objMbMsg.getMsgType() == iot_idl::MT_DSS_SRV2APP_ACK && objMbMsg.getPara1() == ptrCachedMsg->m_nSendSeq && objMbMsg.getPara2() == m_nDomainID && strData == "DSS") @@ -140,7 +140,7 @@ void CDbSaveThread::execute() } -bool CDbSaveThread::saveHisData(const kbd_idlfile::DbInsert &objInsert) +bool CDbSaveThread::saveHisData(const iot_idl::DbInsert &objInsert) { const int nColSize = objInsert.strcolumnname_size(); if (nColSize <= 0) @@ -159,7 +159,7 @@ bool CDbSaveThread::saveHisData(const kbd_idlfile::DbInsert &objInsert) //< 检查数量一致性 for (int i = 0; i < nRcdSize; ++i) { - const kbd_idlfile::DbValueArray &objOneRcd = objInsert.msgrecord(i); + const iot_idl::DbValueArray &objOneRcd = objInsert.msgrecord(i); if (objOneRcd.msgvalue_size() != nColSize) { @@ -175,7 +175,7 @@ bool CDbSaveThread::saveHisData(const kbd_idlfile::DbInsert &objInsert) return false; } - ptrCachedMsg->m_nMsgType = kbd_idlfile::MT_DSS_APP2SRV_INSERT; + ptrCachedMsg->m_nMsgType = iot_idl::MT_DSS_APP2SRV_INSERT; { //< 加锁 @@ -192,7 +192,7 @@ bool CDbSaveThread::saveHisData(const kbd_idlfile::DbInsert &objInsert) } -bool CDbSaveThread::saveHisData(const kbd_idlfile::DbUpdate &objUpdate) +bool CDbSaveThread::saveHisData(const iot_idl::DbUpdate &objUpdate) { if (objUpdate.msgupdatevalue_size() <= 0) { @@ -213,7 +213,7 @@ bool CDbSaveThread::saveHisData(const kbd_idlfile::DbUpdate &objUpdate) return false; } - ptrCachedMsg->m_nMsgType = kbd_idlfile::MT_DSS_APP2SRV_UPDATE; + ptrCachedMsg->m_nMsgType = iot_idl::MT_DSS_APP2SRV_UPDATE; { //< 加锁 @@ -230,7 +230,7 @@ bool CDbSaveThread::saveHisData(const kbd_idlfile::DbUpdate &objUpdate) } -bool CDbSaveThread::saveHisData(const kbd_idlfile::DbUpdateMulti &objUpdateMulti) +bool CDbSaveThread::saveHisData(const iot_idl::DbUpdateMulti &objUpdateMulti) { if (objUpdateMulti.msgupdatevalue_size() <= 0) { @@ -255,7 +255,7 @@ bool CDbSaveThread::saveHisData(const kbd_idlfile::DbUpdateMulti &objUpdateMulti //< 检查数量一致性 for (int i = 0; i < nCondValSize; ++i) { - const kbd_idlfile::DbValueArray &objOneCond = objUpdateMulti.msgconditionvalue(i); + const iot_idl::DbValueArray &objOneCond = objUpdateMulti.msgconditionvalue(i); if (objOneCond.msgvalue_size() != nCondHeadSize) { @@ -271,7 +271,7 @@ bool CDbSaveThread::saveHisData(const kbd_idlfile::DbUpdateMulti &objUpdateMulti return false; } - ptrCachedMsg->m_nMsgType = kbd_idlfile::MT_DSS_APP2SRV_UPDATEMULTI; + ptrCachedMsg->m_nMsgType = iot_idl::MT_DSS_APP2SRV_UPDATEMULTI; { //< 加锁 @@ -288,7 +288,7 @@ bool CDbSaveThread::saveHisData(const kbd_idlfile::DbUpdateMulti &objUpdateMulti } -bool CDbSaveThread::saveHisData(const kbd_idlfile::DbRemove &objRemove) +bool CDbSaveThread::saveHisData(const iot_idl::DbRemove &objRemove) { if (objRemove.msgcondtionarray_size() <= 0) { @@ -303,7 +303,7 @@ bool CDbSaveThread::saveHisData(const kbd_idlfile::DbRemove &objRemove) return false; } - ptrCachedMsg->m_nMsgType = kbd_idlfile::MT_DSS_APP2SRV_REMOVE; + ptrCachedMsg->m_nMsgType = iot_idl::MT_DSS_APP2SRV_REMOVE; { //< 加锁 @@ -320,7 +320,7 @@ bool CDbSaveThread::saveHisData(const kbd_idlfile::DbRemove &objRemove) } -bool CDbSaveThread::saveHisData(const kbd_idlfile::DbRemoveMulti &objRemoveMulti) +bool CDbSaveThread::saveHisData(const iot_idl::DbRemoveMulti &objRemoveMulti) { const int nCondHeadSize = objRemoveMulti.msgconditionhead_size(); if (nCondHeadSize <= 0) @@ -339,7 +339,7 @@ bool CDbSaveThread::saveHisData(const kbd_idlfile::DbRemoveMulti &objRemoveMulti //< 检查数量一致性 for (int i = 0; i < nCondValSize; ++i) { - const kbd_idlfile::DbValueArray &objOneCond = objRemoveMulti.msgconditionvalue(i); + const iot_idl::DbValueArray &objOneCond = objRemoveMulti.msgconditionvalue(i); if (objOneCond.msgvalue_size() != nCondHeadSize) { @@ -355,7 +355,7 @@ bool CDbSaveThread::saveHisData(const kbd_idlfile::DbRemoveMulti &objRemoveMulti return false; } - ptrCachedMsg->m_nMsgType = kbd_idlfile::MT_DSS_APP2SRV_REMOVEMULTI; + ptrCachedMsg->m_nMsgType = iot_idl::MT_DSS_APP2SRV_REMOVEMULTI; { //< 加锁 @@ -371,5 +371,5 @@ bool CDbSaveThread::saveHisData(const kbd_idlfile::DbRemoveMulti &objRemoveMulti return true; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_save_api/CDbSaveThread.h b/platform/src/dbms/db_save_api/CDbSaveThread.h index e4b8aeb2..40a20753 100644 --- a/platform/src/dbms/db_save_api/CDbSaveThread.h +++ b/platform/src/dbms/db_save_api/CDbSaveThread.h @@ -39,20 +39,20 @@ #include "pub_utility_api/TimerThreadBase.h" #include "net/net_msg_bus_api/CMbCommunicator.h" -namespace kbd_dbms +namespace iot_dbms { -class CDbSaveThread : public kbd_public::CTimerThreadBase +class CDbSaveThread : public iot_public::CTimerThreadBase { public: CDbSaveThread(int nDomainID, int nAppID); ~CDbSaveThread(); - bool saveHisData(const kbd_idlfile::DbInsert &objInsert); - bool saveHisData(const kbd_idlfile::DbUpdate &objUpdate); - bool saveHisData(const kbd_idlfile::DbUpdateMulti &objUpdateMulti); - bool saveHisData(const kbd_idlfile::DbRemove &objRemove); - bool saveHisData(const kbd_idlfile::DbRemoveMulti &objRemoveMulti); + bool saveHisData(const iot_idl::DbInsert &objInsert); + bool saveHisData(const iot_idl::DbUpdate &objUpdate); + bool saveHisData(const iot_idl::DbUpdateMulti &objUpdateMulti); + bool saveHisData(const iot_idl::DbRemove &objRemove); + bool saveHisData(const iot_idl::DbRemoveMulti &objRemoveMulti); private: void execute()override; @@ -77,7 +77,7 @@ private: int m_nSendSeq; - kbd_net::CMbCommunicator m_objComm; + iot_net::CMbCommunicator m_objComm; boost::mutex m_mutexQue; //< m_queAddedMsg的锁 std::queue m_queAddedMsg; //< 已添加的消息的队列 @@ -86,5 +86,5 @@ private: typedef boost::shared_ptr CDbSaveThreadPtr; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_save_api/DbSaveApi.cpp b/platform/src/dbms/db_save_api/DbSaveApi.cpp index 96c1d9da..2b5dcc79 100644 --- a/platform/src/dbms/db_save_api/DbSaveApi.cpp +++ b/platform/src/dbms/db_save_api/DbSaveApi.cpp @@ -11,7 +11,7 @@ #include "db_save_api/DbSaveApi.h" #include "CDbSaveThread.h" -namespace kbd_dbms +namespace iot_dbms { CDbSaveThreadPtr g_workThreadPtr; @@ -41,7 +41,7 @@ DLL_CLASS bool initDbSaveApi(int nDomainID, int nAppID) return true; } -DLL_CLASS bool saveHisData(const kbd_idlfile::DbInsert &objInsert) +DLL_CLASS bool saveHisData(const iot_idl::DbInsert &objInsert) { if (g_workThreadPtr) { @@ -53,7 +53,7 @@ DLL_CLASS bool saveHisData(const kbd_idlfile::DbInsert &objInsert) return false; } -DLL_CLASS bool saveHisData(const kbd_idlfile::DbUpdate &objUpdate) +DLL_CLASS bool saveHisData(const iot_idl::DbUpdate &objUpdate) { if (g_workThreadPtr) { @@ -65,7 +65,7 @@ DLL_CLASS bool saveHisData(const kbd_idlfile::DbUpdate &objUpdate) return false; } -DLL_CLASS bool saveHisData(const kbd_idlfile::DbUpdateMulti &objUpdateMulti) +DLL_CLASS bool saveHisData(const iot_idl::DbUpdateMulti &objUpdateMulti) { if (g_workThreadPtr) { @@ -77,7 +77,7 @@ DLL_CLASS bool saveHisData(const kbd_idlfile::DbUpdateMulti &objUpdateMulti) return false; } -DLL_CLASS bool saveHisData(const kbd_idlfile::DbRemove &objRemove) +DLL_CLASS bool saveHisData(const iot_idl::DbRemove &objRemove) { if (g_workThreadPtr) { @@ -89,7 +89,7 @@ DLL_CLASS bool saveHisData(const kbd_idlfile::DbRemove &objRemove) return false; } -DLL_CLASS bool saveHisData(const kbd_idlfile::DbRemoveMulti &objRemoveMulti) +DLL_CLASS bool saveHisData(const iot_idl::DbRemoveMulti &objRemoveMulti) { if (g_workThreadPtr) { @@ -109,5 +109,5 @@ DLL_CLASS void releaseDbSaveApi() } } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_studio/CDbStudio.cpp b/platform/src/dbms/db_studio/CDbStudio.cpp index f7ef5133..0c485605 100644 --- a/platform/src/dbms/db_studio/CDbStudio.cpp +++ b/platform/src/dbms/db_studio/CDbStudio.cpp @@ -144,9 +144,9 @@ bool CDbStudio::loadConfig() oFile.close(); // 加载专业信息 - kbd_public::CSysInfoInterfacePtr pSysInfo; - std::vector vecSubsystemInfo; - if ( kbd_public::createSysInfoInstance( pSysInfo ) == false ) + iot_public::CSysInfoInterfacePtr pSysInfo; + std::vector vecSubsystemInfo; + if ( iot_public::createSysInfoInstance( pSysInfo ) == false ) { QMessageBox::warning( 0, "警告", tr("createSysInfoInstance失败，导致无法修改表所属的专业，其他功能可用") ); } diff --git a/platform/src/dbms/db_sync_server/CDbSynService.cpp b/platform/src/dbms/db_sync_server/CDbSynService.cpp index 04129f26..1a9ba42b 100644 --- a/platform/src/dbms/db_sync_server/CDbSynService.cpp +++ b/platform/src/dbms/db_sync_server/CDbSynService.cpp @@ -17,7 +17,7 @@ #include "CDbSynService.h" -namespace kbd_dbms +namespace iot_dbms { const char *const CDbSynService::m_szProcName = "db_sync_server"; @@ -32,7 +32,7 @@ CDbSynService::~CDbSynService() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } @@ -49,17 +49,17 @@ bool CDbSynService::start( int argc, char *argv[], int & /*nStatus*/) } //< 启动日志 - kbd_public::StartLogSystem( CN_AppName_PUBLIC.c_str(), m_szProcName ); + iot_public::StartLogSystem( CN_AppName_PUBLIC.c_str(), m_szProcName ); //< 判断是否已启动 - if ( kbd_public::CSingleProcInstance::hasInstanceRunning( m_szProcName )) + if ( iot_public::CSingleProcInstance::hasInstanceRunning( m_szProcName )) { LOGFATAL( "%s 已启动，不可重复启动，本实例退出！", m_szProcName ); return false; } //< 初始化翻译 - if ( kbd_public::initI18N( "/db_sync_server/translate", "db_sync_server" )) + if ( iot_public::initI18N( "/db_sync_server/translate", "db_sync_server" )) { LOGDEBUG( I18N_C( "I18N output test：\n This is src hardcode. \n int = [%d] , str = [%s]\n" ), 123, "test" ); } @@ -69,7 +69,7 @@ bool CDbSynService::start( int argc, char *argv[], int & /*nStatus*/) } //< 消息总线 - if ( !kbd_net::initMsgBus( m_szProcName, "", true )) + if ( !iot_net::initMsgBus( m_szProcName, "", true )) { LOGFATAL( "初始化消息总线失败，程序启动失败！" ); return false; @@ -100,14 +100,14 @@ bool CDbSynService::start( int argc, char *argv[], int & /*nStatus*/) strStartArgs += argv[i]; } - kbd_sys::SProcessInfoKey objProcInfo; + iot_sys::SProcessInfoKey objProcInfo; objProcInfo.nAppId = CN_AppId_PUBLIC; objProcInfo.nDomainId = m_ptrRedunSw->getLocalDomainID(); objProcInfo.strNodeName = m_ptrRedunSw->getLocalNodeName(); objProcInfo.strProcName = m_szProcName; objProcInfo.strProcParam = strStartArgs; - m_ptrProcMng = kbd_sys::getProcMngInstance( objProcInfo ); + m_ptrProcMng = iot_sys::getProcMngInstance( objProcInfo ); if ( !m_ptrProcMng ) { LOGFATAL( "getProcMngInstance return NULL" ); @@ -119,7 +119,7 @@ bool CDbSynService::start( int argc, char *argv[], int & /*nStatus*/) //< 冗余管理 { - m_ptrRedundantMng = kbd_sys::getRedundantMngInstance( m_ptrRedunSw->getLocalDomainID(), + m_ptrRedundantMng = iot_sys::getRedundantMngInstance( m_ptrRedunSw->getLocalDomainID(), CN_AppId_PUBLIC, m_ptrRedunSw->getLocalNodeName()); if ( !m_ptrRedundantMng ) @@ -210,11 +210,11 @@ bool CDbSynService::stop() } //< 停止消息总线 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } @@ -300,5 +300,5 @@ bool CDbSynService::parseCommandLine( int argc, char *argv[] ) return true; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_sync_server/CDbSynService.h b/platform/src/dbms/db_sync_server/CDbSynService.h index 2f636b1c..ca861446 100644 --- a/platform/src/dbms/db_sync_server/CDbSynService.h +++ b/platform/src/dbms/db_sync_server/CDbSynService.h @@ -14,10 +14,10 @@ #include "CDbSynSrvRedunSw.h" -namespace kbd_dbms +namespace iot_dbms { -class CDbSynService final : public kbd_public::CBaseService, kbd_sys::CProcessQuitInterface +class CDbSynService final : public iot_public::CBaseService, iot_sys::CProcessQuitInterface { public: CDbSynService(); @@ -50,9 +50,9 @@ private: static const char *const m_szProcName; enRunModel m_enRunModel; CDbSynSrvRedunSwPtr m_ptrRedunSw; - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_sys::CProcMngInterfacePtr m_ptrProcMng; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; }; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_sync_server/CDbSynSrvRedunSw.cpp b/platform/src/dbms/db_sync_server/CDbSynSrvRedunSw.cpp index 1fe389ed..1c758009 100644 --- a/platform/src/dbms/db_sync_server/CDbSynSrvRedunSw.cpp +++ b/platform/src/dbms/db_sync_server/CDbSynSrvRedunSw.cpp @@ -13,7 +13,7 @@ #include "CDbSynService.h" #include "CDbSynSrvRedunSw.h" -namespace kbd_dbms +namespace iot_dbms { CDbSynSrvRedunSw::CDbSynSrvRedunSw( CDbSynService *pParent ) @@ -92,12 +92,12 @@ int CDbSynSrvRedunSw::redundantSwitch( bool bMaster, bool bSlave ) return kbdSuccess; } -static bool getDbConnPara( const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, - const kbd_public::SDatabaseInfo &stDbInfo, +static bool getDbConnPara( const iot_public::CSysInfoInterfacePtr &ptrSysInfo, + const iot_public::SDatabaseInfo &stDbInfo, std::string &strIpA, std::string &strIpB, CDbPara &objDbPara ) { - kbd_public::SNodeInfo stDbNodeInfo; + iot_public::SNodeInfo stDbNodeInfo; if ( kbdSuccess != ptrSysInfo->getNodeInfoByName( stDbInfo.strNodeName, stDbNodeInfo )) { LOGERROR( "getNodeInfoByName failed, continue !" ); @@ -123,16 +123,16 @@ static bool getDbConnPara( const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, switch ( stDbInfo.eDBType ) { - case kbd_public::EDBType_MYSQL: + case iot_public::EDBType_MYSQL: objDbPara.setDbType( DB_MYSQL ); break; - case kbd_public::EDBType_ORACLE: + case iot_public::EDBType_ORACLE: objDbPara.setDbType( DB_ORACLE ); break; - case kbd_public::EDBType_OPENGAUSS: + case iot_public::EDBType_OPENGAUSS: objDbPara.setDbType( DB_OPENGAUSS ); break; - case kbd_public::EDBType_KINGBASE: + case iot_public::EDBType_KINGBASE: objDbPara.setDbType( DB_KINGBASE ); break; default: @@ -158,8 +158,8 @@ bool CDbSynSrvRedunSw::loadSysInfo() return false; } - kbd_public::CSysInfoInterfacePtr ptrSysInfo; - if ( kbd_public::createSysInfoInstance( ptrSysInfo ) == false ) + iot_public::CSysInfoInterfacePtr ptrSysInfo; + if ( iot_public::createSysInfoInstance( ptrSysInfo ) == false ) { LOGFATAL( "createSysInfoInstance() return false !" ); return false; @@ -167,7 +167,7 @@ bool CDbSynSrvRedunSw::loadSysInfo() //< 获取本机域ID和主机名 { - kbd_public::SNodeInfo stLocalNodeInfo; + iot_public::SNodeInfo stLocalNodeInfo; if ( kbdSuccess != ptrSysInfo->getLocalNodeInfo( stLocalNodeInfo )) { LOGFATAL( "getLocalNodeInfo() failed !" ); @@ -180,9 +180,9 @@ bool CDbSynSrvRedunSw::loadSysInfo() } //< 本地域数据库连接信息 - kbd_public::SDatabaseInfo stFirstDbInfo; - std::vector vecLocalDbInfo; - std::vector vecRemoteDbInfo; + iot_public::SDatabaseInfo stFirstDbInfo; + std::vector vecLocalDbInfo; + std::vector vecRemoteDbInfo; int nRc = ptrSysInfo->getDBInfoByDomainId( m_nLocalDomainID, stFirstDbInfo, vecLocalDbInfo, vecRemoteDbInfo ); if ( kbdSuccess != nRc ) @@ -219,7 +219,7 @@ bool CDbSynSrvRedunSw::loadSysInfo() } //< 告警服务接口 - m_ptrAlmApi.reset( new kbd_service::CAlmApiForApp( m_nLocalDomainID, CN_AppId_PUBLIC )); + m_ptrAlmApi.reset( new iot_service::CAlmApiForApp( m_nLocalDomainID, CN_AppId_PUBLIC )); if ( !m_ptrAlmApi->resumeThread()) { LOGFATAL( "告警服务接口初始化失败，程序启动失败！" ); @@ -254,7 +254,7 @@ const std::vector &CDbSynSrvRedunSw::getLocalDbThreads() cons return m_vecLocalDbThreads; } -bool CDbSynSrvRedunSw::addAlarm( kbd_idlfile::SAppAddAlm &objAlarm ) +bool CDbSynSrvRedunSw::addAlarm( iot_idl::SAppAddAlm &objAlarm ) { if ( nullptr == m_ptrAlmApi ) { @@ -265,4 +265,4 @@ bool CDbSynSrvRedunSw::addAlarm( kbd_idlfile::SAppAddAlm &objAlarm ) return m_ptrAlmApi->addAlarm( objAlarm ); } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_sync_server/CDbSynSrvRedunSw.h b/platform/src/dbms/db_sync_server/CDbSynSrvRedunSw.h index d91f4ed3..90514326 100644 --- a/platform/src/dbms/db_sync_server/CDbSynSrvRedunSw.h +++ b/platform/src/dbms/db_sync_server/CDbSynSrvRedunSw.h @@ -16,12 +16,12 @@ #include "CFirstDbThread.h" #include "CLocalDbThread.h" -namespace kbd_dbms +namespace iot_dbms { class CDbSynService; -class CDbSynSrvRedunSw final : public ::kbd_sys::CRedundantSwitchInterface +class CDbSynSrvRedunSw final : public ::iot_sys::CRedundantSwitchInterface { public: explicit CDbSynSrvRedunSw( CDbSynService *pParent ); @@ -47,7 +47,7 @@ public: const std::vector &getLocalDbThreads() const; //< 添加告警 - bool addAlarm( kbd_idlfile::SAppAddAlm &objAlarm ); + bool addAlarm( iot_idl::SAppAddAlm &objAlarm ); private: @@ -65,7 +65,7 @@ private: CDbSynService *const m_pParent; //< 告警服务接口 - kbd_service::CAlmApiForAppPtr m_ptrAlmApi; + iot_service::CAlmApiForAppPtr m_ptrAlmApi; //< 首连接处理线程 CFirstDbThreadPtr m_ptrFirstDbThread; @@ -76,4 +76,4 @@ private: typedef boost::shared_ptr CDbSynSrvRedunSwPtr; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_sync_server/CFirstDbThread.cpp b/platform/src/dbms/db_sync_server/CFirstDbThread.cpp index 28aec0bf..cb26f934 100644 --- a/platform/src/dbms/db_sync_server/CFirstDbThread.cpp +++ b/platform/src/dbms/db_sync_server/CFirstDbThread.cpp @@ -15,7 +15,7 @@ #include "CDbSynSrvRedunSw.h" #include "CFirstDbThread.h" -namespace kbd_dbms +namespace iot_dbms { CFirstDbThread::CFirstDbThread( CDbSynSrvRedunSw *pParent, std::string strIpA, std::string strIpB, @@ -224,4 +224,4 @@ bool CFirstDbThread::openDb( bool &bIsChanged ) return false; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_sync_server/CFirstDbThread.h b/platform/src/dbms/db_sync_server/CFirstDbThread.h index 0cd7e099..86d06ac8 100644 --- a/platform/src/dbms/db_sync_server/CFirstDbThread.h +++ b/platform/src/dbms/db_sync_server/CFirstDbThread.h @@ -12,12 +12,12 @@ #include "pub_utility_api/TimerThreadBase.h" #include "db_base_api/CDbBaseApi.h" -namespace kbd_dbms +namespace iot_dbms { class CDbSynSrvRedunSw; -class CFirstDbThread final : private kbd_public::CTimerThreadBase +class CFirstDbThread final : private iot_public::CTimerThreadBase { public: CFirstDbThread( CDbSynSrvRedunSw *pParent, std::string strIpA, std::string strIpB, const CDbPara &objDbPara ); @@ -53,4 +53,4 @@ private: typedef boost::shared_ptr CFirstDbThreadPtr; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_sync_server/CLocalDbThread.cpp b/platform/src/dbms/db_sync_server/CLocalDbThread.cpp index 08ce9210..38946d5f 100644 --- a/platform/src/dbms/db_sync_server/CLocalDbThread.cpp +++ b/platform/src/dbms/db_sync_server/CLocalDbThread.cpp @@ -18,7 +18,7 @@ #include "CDbSynSrvRedunSw.h" #include "CLocalDbThread.h" -namespace kbd_dbms +namespace iot_dbms { CLocalDbThread::CLocalDbThread( CDbSynSrvRedunSw *pParent, std::string strIpA, std::string strIpB, @@ -49,7 +49,7 @@ bool CLocalDbThread::resumeThread() boost::mutex::scoped_lock locker( m_mutexState ); m_enState = EN_STAT_UNCONNECTED; m_enLastState = m_enState; - m_nStateTime = kbd_public::getMonotonicMsec(); + m_nStateTime = iot_public::getMonotonicMsec(); } resume(); @@ -68,7 +68,7 @@ bool CLocalDbThread::suspendThread() boost::mutex::scoped_lock locker( m_mutexState ); m_enState = EN_STAT_UNCONNECTED; m_enLastState = m_enState; - m_nStateTime = kbd_public::getMonotonicMsec(); + m_nStateTime = iot_public::getMonotonicMsec(); m_nMaxId = -1; m_strHostNameOfDb = ""; @@ -115,7 +115,7 @@ void CLocalDbThread::pushRecord( const std::vector &vecRcdAdd ) if ( nAddedCnt > 0 ) { m_enState = EN_STAT_INPUT_COMPLETE; - m_nStateTime = kbd_public::getMonotonicMsec(); + m_nStateTime = iot_public::getMonotonicMsec(); //< 唤醒 notify(); @@ -133,7 +133,7 @@ long long CLocalDbThread::getMaxId( const QString &strSrcHostName ) m_strSrcHostName = strSrcHostName; //< 超时刷新 - const long long nTimeNow = kbd_public::getMonotonicMsec(); + const long long nTimeNow = iot_public::getMonotonicMsec(); if ( m_nStateTime + 120000 < nTimeNow ) { m_enState = EN_STAT_REFRESH_INFO; @@ -171,12 +171,12 @@ void CLocalDbThread::execute() case EN_STAT_UNCONNECTED: { //< 防止连接过于频繁 - if ( m_nStateTime + 10000 < kbd_public::getMonotonicMsec()) + if ( m_nStateTime + 10000 < iot_public::getMonotonicMsec()) { if ( openDb()) m_enState = EN_STAT_REFRESH_INFO; - m_nStateTime = kbd_public::getMonotonicMsec(); + m_nStateTime = iot_public::getMonotonicMsec(); } } break; @@ -185,12 +185,12 @@ void CLocalDbThread::execute() if ( refreshInfo()) { m_enState = EN_STAT_WAIT_INPUT; - m_nStateTime = kbd_public::getMonotonicMsec(); + m_nStateTime = iot_public::getMonotonicMsec(); } else { m_enState = EN_STAT_ERROR; - m_nStateTime = kbd_public::getMonotonicMsec(); + m_nStateTime = iot_public::getMonotonicMsec(); } } break; @@ -205,7 +205,7 @@ void CLocalDbThread::execute() if ( syncRecord()) { m_enState = EN_STAT_REFRESH_INFO; - m_nStateTime = kbd_public::getMonotonicMsec(); + m_nStateTime = iot_public::getMonotonicMsec(); //< 成功一次即清0 m_nErrCnt = 0; @@ -213,7 +213,7 @@ void CLocalDbThread::execute() else { m_enState = EN_STAT_ERROR; - m_nStateTime = kbd_public::getMonotonicMsec(); + m_nStateTime = iot_public::getMonotonicMsec(); } } break; @@ -226,7 +226,7 @@ void CLocalDbThread::execute() { m_objDb.close(); m_enState = EN_STAT_UNCONNECTED; - m_nStateTime = kbd_public::getMonotonicMsec(); + m_nStateTime = iot_public::getMonotonicMsec(); } else { @@ -246,21 +246,21 @@ void CLocalDbThread::execute() % m_strHostNameOfDb.toStdString()); LOGERROR( "产生告警：\n%s", strErr.c_str()); - kbd_idlfile::SAppAddAlm objAddAlm; - kbd_idlfile::SAlmInfoFromApp *pAlmInfo = objAddAlm.add_alm_info(); + iot_idl::SAppAddAlm objAddAlm; + iot_idl::SAlmInfoFromApp *pAlmInfo = objAddAlm.add_alm_info(); // 报警参数-必填项目 - pAlmInfo->set_alm_type( kbd_service::ALM_TYPE_SYSTEM ); - pAlmInfo->set_time_stamp( kbd_public::getUTCTimeMsec()); + pAlmInfo->set_alm_type( iot_service::ALM_TYPE_SYSTEM ); + pAlmInfo->set_time_stamp( iot_public::getUTCTimeMsec()); //< todo 增加同步异常的告警类型 - pAlmInfo->set_status( kbd_service::ALM_STAT_SYS_DB_LINK_ERROR ); + pAlmInfo->set_status( iot_service::ALM_STAT_SYS_DB_LINK_ERROR ); pAlmInfo->set_location_id( m_pParent->getLocalLocationID()); - pAlmInfo->set_alm_style( kbd_idlfile::AS_ALARM ); + pAlmInfo->set_alm_style( iot_idl::AS_ALARM ); // 关键字定义 - kbd_idlfile::SAlmKeyword *pAlmKeyword = pAlmInfo->add_alm_keyword(); - pAlmKeyword->set_id( kbd_service::ALM_KEY_ALM_DESC ); + iot_idl::SAlmKeyword *pAlmKeyword = pAlmInfo->add_alm_keyword(); + pAlmKeyword->set_id( iot_service::ALM_KEY_ALM_DESC ); pAlmKeyword->set_value( strErr ); m_pParent->addAlarm( objAddAlm ); @@ -268,10 +268,10 @@ void CLocalDbThread::execute() } //< 暂停一会 - if ( m_nStateTime + nDelay < kbd_public::getMonotonicMsec()) + if ( m_nStateTime + nDelay < iot_public::getMonotonicMsec()) { m_enState = EN_STAT_REFRESH_INFO; - m_nStateTime = kbd_public::getMonotonicMsec(); + m_nStateTime = iot_public::getMonotonicMsec(); } } } @@ -281,7 +281,7 @@ void CLocalDbThread::execute() LOGERROR( "非法状态 enState = %d，检查程序！", ( int ) enState ); boost::mutex::scoped_lock locker( m_mutexState ); m_enState = EN_STAT_UNCONNECTED; - m_nStateTime = kbd_public::getMonotonicMsec(); + m_nStateTime = iot_public::getMonotonicMsec(); } break; } @@ -455,7 +455,7 @@ bool CLocalDbThread::syncRecord() QSqlQuery objQuery( *m_objDb.getDatabase()); - if( kbd_dbms::DB_MYSQL == m_objDb.getDbPara().getDbType()) + if( iot_dbms::DB_MYSQL == m_objDb.getDbPara().getDbType()) { //< db_sync(:src_hostname, :src_last_id, :src_last_statement, :new_id, :new_statement) objQuery.prepare( "call db_sync(?, ?, ?, ?, ?, @db_sync_return) " ); @@ -490,7 +490,7 @@ bool CLocalDbThread::syncRecord() } int nSpRc = -1; - if( kbd_dbms::DB_MYSQL == m_objDb.getDbPara().getDbType()) + if( iot_dbms::DB_MYSQL == m_objDb.getDbPara().getDbType()) { objQuery.exec( "select @db_sync_return" ); objQuery.next(); @@ -620,4 +620,4 @@ bool CLocalDbThread::syncRecord() return bRc; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_sync_server/CLocalDbThread.h b/platform/src/dbms/db_sync_server/CLocalDbThread.h index 9d344fc6..c2c8fb23 100644 --- a/platform/src/dbms/db_sync_server/CLocalDbThread.h +++ b/platform/src/dbms/db_sync_server/CLocalDbThread.h @@ -12,7 +12,7 @@ #include "pub_utility_api/TimerThreadBase.h" #include "db_base_api/CDbBaseApi.h" -namespace kbd_dbms +namespace iot_dbms { //< 数据库操作记录，对应 dbop_list 表中的记录 @@ -43,7 +43,7 @@ typedef boost::shared_ptr CDbOpListRcdPtr; class CDbSynSrvRedunSw; -class CLocalDbThread final : private kbd_public::CTimerThreadBase +class CLocalDbThread final : private iot_public::CTimerThreadBase { public: CLocalDbThread( CDbSynSrvRedunSw *pParent, std::string strIpA, std::string strIpB, const CDbPara &objDbPara ); @@ -121,4 +121,4 @@ private: typedef boost::shared_ptr CLocalDbThreadPtr; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/db_sync_server/main.cpp b/platform/src/dbms/db_sync_server/main.cpp index 6be58e3c..2a3b81a6 100644 --- a/platform/src/dbms/db_sync_server/main.cpp +++ b/platform/src/dbms/db_sync_server/main.cpp @@ -1,6 +1,6 @@ #include "CDbSynService.h" -using namespace kbd_dbms; +using namespace iot_dbms; int main( int argc, char *argv[] ) { diff --git a/platform/src/dbms/db_sysinfo_api/CDbSysInfo.cpp b/platform/src/dbms/db_sysinfo_api/CDbSysInfo.cpp index c4f52215..20ac63fd 100644 --- a/platform/src/dbms/db_sysinfo_api/CDbSysInfo.cpp +++ b/platform/src/dbms/db_sysinfo_api/CDbSysInfo.cpp @@ -16,10 +16,10 @@ #include using namespace std; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; -kbd_public::CSysInfoInterfacePtr CDbSysInfo::m_ptrSysInfo = NULL; +iot_public::CSysInfoInterfacePtr CDbSysInfo::m_ptrSysInfo = NULL; CDbSysInfo::CDbSysInfo() { @@ -108,7 +108,7 @@ int CDbSysInfo::getAppIdByTableName( const std::string& strAppName, const std::s try { boost::property_tree::ptree pt; - std::string strFileName = boost::str(boost::format("%s/../../platform/common/database/initscript/iscs6000_table_struct.xml") % kbd_public::CFileUtil::getCurModuleDir().c_str()); + std::string strFileName = boost::str(boost::format("%s/../../platform/common/database/initscript/iscs6000_table_struct.xml") % iot_public::CFileUtil::getCurModuleDir().c_str()); boost::property_tree::xml_parser::read_xml(strFileName, pt); BOOST_AUTO(table, pt.get_child("DatabaseStruct")); for (BOOST_AUTO(itTable, table.begin()); itTable!=table.end(); itTable++) @@ -144,7 +144,7 @@ int CDbSysInfo::getAppIdByTableName( const std::string& strAppName, const std::s try { boost::property_tree::ptree pt; - std::string strFileName = boost::str(boost::format("%s/../../product/common/database/initscript/iscs6000_table_struct.xml") % kbd_public::CFileUtil::getCurModuleDir().c_str()); + std::string strFileName = boost::str(boost::format("%s/../../product/common/database/initscript/iscs6000_table_struct.xml") % iot_public::CFileUtil::getCurModuleDir().c_str()); boost::property_tree::xml_parser::read_xml(strFileName, pt); BOOST_AUTO(table, pt.get_child("DatabaseStruct")); for (BOOST_AUTO(itTable, table.begin()); itTable!=table.end(); itTable++) @@ -273,7 +273,7 @@ bool CDbSysInfo::getAllRdbTableNameBySubsystemId( const int nSubsystemId, std::v try { boost::property_tree::ptree pt; - std::string strFileName = boost::str(boost::format("%s/../../platform/common/database/initscript/iscs6000_table_struct.xml") % kbd_public::CFileUtil::getCurModuleDir().c_str()); + std::string strFileName = boost::str(boost::format("%s/../../platform/common/database/initscript/iscs6000_table_struct.xml") % iot_public::CFileUtil::getCurModuleDir().c_str()); boost::property_tree::xml_parser::read_xml(strFileName, pt); BOOST_AUTO(table, pt.get_child("DatabaseStruct")); for (BOOST_AUTO(itTable, table.begin()); itTable!=table.end(); itTable++) @@ -301,7 +301,7 @@ bool CDbSysInfo::getAllRdbTableNameBySubsystemId( const int nSubsystemId, std::v try { boost::property_tree::ptree pt; - std::string strFileName = boost::str(boost::format("%s/../../product/common/database/initscript/iscs6000_table_struct.xml") % kbd_public::CFileUtil::getCurModuleDir().c_str()); + std::string strFileName = boost::str(boost::format("%s/../../product/common/database/initscript/iscs6000_table_struct.xml") % iot_public::CFileUtil::getCurModuleDir().c_str()); boost::property_tree::xml_parser::read_xml(strFileName, pt); BOOST_AUTO(table, pt.get_child("DatabaseStruct")); for (BOOST_AUTO(itTable, table.begin()); itTable!=table.end(); itTable++) @@ -347,7 +347,7 @@ bool CDbSysInfo::getAllRdbColumnNameByTableName( const std::string sTableName, s try { boost::property_tree::ptree pt; - std::string strFileName = boost::str(boost::format("%s/../../platform/common/database/initscript/iscs6000_table_struct.xml") % kbd_public::CFileUtil::getCurModuleDir().c_str()); + std::string strFileName = boost::str(boost::format("%s/../../platform/common/database/initscript/iscs6000_table_struct.xml") % iot_public::CFileUtil::getCurModuleDir().c_str()); boost::property_tree::xml_parser::read_xml(strFileName, pt); BOOST_AUTO(table, pt.get_child("DatabaseStruct")); for (BOOST_AUTO(itTable, table.begin()); itTable!=table.end(); itTable++) @@ -384,7 +384,7 @@ bool CDbSysInfo::getAllRdbColumnNameByTableName( const std::string sTableName, s try { boost::property_tree::ptree pt; - std::string strFileName = boost::str(boost::format("%s/../../product/common/database/initscript/iscs6000_table_struct.xml") % kbd_public::CFileUtil::getCurModuleDir().c_str()); + std::string strFileName = boost::str(boost::format("%s/../../product/common/database/initscript/iscs6000_table_struct.xml") % iot_public::CFileUtil::getCurModuleDir().c_str()); boost::property_tree::xml_parser::read_xml(strFileName, pt); BOOST_AUTO(table, pt.get_child("DatabaseStruct")); for (BOOST_AUTO(itTable, table.begin()); itTable!=table.end(); itTable++) @@ -445,7 +445,7 @@ bool CDbSysInfo::getTableModeByTableName( const std::string& strTableName ,STab try { boost::property_tree::ptree pt; - std::string strFileName = boost::str(boost::format("%s/../../platform/common/database/initscript/iscs6000_table_struct.xml") % kbd_public::CFileUtil::getCurModuleDir().c_str()); + std::string strFileName = boost::str(boost::format("%s/../../platform/common/database/initscript/iscs6000_table_struct.xml") % iot_public::CFileUtil::getCurModuleDir().c_str()); boost::property_tree::xml_parser::read_xml(strFileName, pt); BOOST_AUTO(table, pt.get_child("DatabaseStruct")); for (BOOST_AUTO(itTable, table.begin()); itTable!=table.end(); itTable++) @@ -495,7 +495,7 @@ bool CDbSysInfo::getTableModeByTableName( const std::string& strTableName ,STab try { boost::property_tree::ptree pt; - std::string strFileName = boost::str(boost::format("%s/../../product/common/database/initscript/iscs6000_table_struct.xml") % kbd_public::CFileUtil::getCurModuleDir().c_str()); + std::string strFileName = boost::str(boost::format("%s/../../product/common/database/initscript/iscs6000_table_struct.xml") % iot_public::CFileUtil::getCurModuleDir().c_str()); boost::property_tree::xml_parser::read_xml(strFileName, pt); BOOST_AUTO(table, pt.get_child("DatabaseStruct")); for (BOOST_AUTO(itTable, table.begin()); itTable!=table.end(); itTable++) @@ -566,7 +566,7 @@ bool CDbSysInfo::getSubsystemFlagByTableName( const std::string sTableName, uint try { boost::property_tree::ptree pt; - std::string strFileName = boost::str(boost::format("%s/../../platform/common/database/initscript/iscs6000_table_struct.xml") % kbd_public::CFileUtil::getCurModuleDir().c_str()); + std::string strFileName = boost::str(boost::format("%s/../../platform/common/database/initscript/iscs6000_table_struct.xml") % iot_public::CFileUtil::getCurModuleDir().c_str()); boost::property_tree::xml_parser::read_xml(strFileName, pt); BOOST_AUTO(table, pt.get_child("DatabaseStruct")); for (BOOST_AUTO(itTable, table.begin()); itTable!=table.end(); itTable++) @@ -594,7 +594,7 @@ bool CDbSysInfo::getSubsystemFlagByTableName( const std::string sTableName, uint try { boost::property_tree::ptree pt; - std::string strFileName = boost::str(boost::format("%s/../../product/common/database/initscript/iscs6000_table_struct.xml") % kbd_public::CFileUtil::getCurModuleDir().c_str()); + std::string strFileName = boost::str(boost::format("%s/../../product/common/database/initscript/iscs6000_table_struct.xml") % iot_public::CFileUtil::getCurModuleDir().c_str()); boost::property_tree::xml_parser::read_xml(strFileName, pt); BOOST_AUTO(table, pt.get_child("DatabaseStruct")); for (BOOST_AUTO(itTable, table.begin()); itTable!=table.end(); itTable++) diff --git a/platform/src/dbms/rdb_api/CBaseTable.cpp b/platform/src/dbms/rdb_api/CBaseTable.cpp index 4c35d8c1..9f9e9f6d 100644 --- a/platform/src/dbms/rdb_api/CBaseTable.cpp +++ b/platform/src/dbms/rdb_api/CBaseTable.cpp @@ -12,7 +12,7 @@ #define UN_USED 0 using namespace boost; -using namespace kbd_dbms; +using namespace iot_dbms; CBaseTable::CBaseTable() { diff --git a/platform/src/dbms/rdb_api/CBaseTable.h b/platform/src/dbms/rdb_api/CBaseTable.h index a7c993d6..11a2ad2b 100644 --- a/platform/src/dbms/rdb_api/CBaseTable.h +++ b/platform/src/dbms/rdb_api/CBaseTable.h @@ -9,7 +9,7 @@ #pragma warning(disable:4251) #endif -namespace kbd_dbms +namespace iot_dbms { #define RDB_SYN_TYPE "SynType" // 变化记录表的最后一列，用来记录变化类型 diff --git a/platform/src/dbms/rdb_api/CBptree.cpp b/platform/src/dbms/rdb_api/CBptree.cpp index 9f1d8027..e57ff361 100644 --- a/platform/src/dbms/rdb_api/CBptree.cpp +++ b/platform/src/dbms/rdb_api/CBptree.cpp @@ -2,7 +2,7 @@ #include "RdbFunc.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; CBptree::CBptree() { @@ -56,7 +56,7 @@ int CBptree::clear() * @param nMaxRcdNums * @return int */ -int kbd_dbms::bptTotalNode( int nMaxRcdNums ) +int iot_dbms::bptTotalNode( int nMaxRcdNums ) { return (int)( ( (float)nMaxRcdNums - 1.0 ) / ( (float)0.5 * BPTREE_RANK - 1.0 ) ) + 1; } @@ -70,7 +70,7 @@ int kbd_dbms::bptTotalNode( int nMaxRcdNums ) * @param pKeyOff * @return int */ -int kbd_dbms::bptNodeStruInfo( int nKeyInfoLength, int nKeyAlign, int* pKeyOff ) +int iot_dbms::bptNodeStruInfo( int nKeyInfoLength, int nKeyAlign, int* pKeyOff ) { int tmpoff, tmpalign = 4; tmpoff = sizeof( BPTREE_LINK ); @@ -100,7 +100,7 @@ int kbd_dbms::bptNodeStruInfo( int nKeyInfoLength, int nKeyAlign, int* pKeyOff ) * @param nKeyAlign * @return int */ -int kbd_dbms::bptTotalMemlen( int nMaxRcdNums, int nKeyInfoLength, int nKeyAlign ) +int iot_dbms::bptTotalMemlen( int nMaxRcdNums, int nKeyInfoLength, int nKeyAlign ) { int nNodeRecordLength = bptNodeStruInfo( nKeyInfoLength, nKeyAlign ); int nodenums = bptTotalNode( nMaxRcdNums ); diff --git a/platform/src/dbms/rdb_api/CBptree.h b/platform/src/dbms/rdb_api/CBptree.h index 647a1bb0..49419ba6 100644 --- a/platform/src/dbms/rdb_api/CBptree.h +++ b/platform/src/dbms/rdb_api/CBptree.h @@ -3,7 +3,7 @@ #include "CRdbKey_impl.h" #include "rdb_api/RdbDefine.h" -namespace kbd_dbms +namespace iot_dbms { int bptTotalNode( int nMaxRcdNums ); diff --git a/platform/src/dbms/rdb_api/CHashTable.cpp b/platform/src/dbms/rdb_api/CHashTable.cpp index d6887c4e..17cc8eb6 100644 --- a/platform/src/dbms/rdb_api/CHashTable.cpp +++ b/platform/src/dbms/rdb_api/CHashTable.cpp @@ -3,7 +3,7 @@ //#include "RdbFunc.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; #define GetBorderAlign(off,alig) (off%alig==0 ? off : off+alig-off%alig) @@ -43,7 +43,7 @@ int getHashCount( const int nKeyCount ) } // 根据关键字长度和个数计算哈希表占用内存的总长度 -int kbd_dbms::getHashTableTotalMemoryLength( const int nKeyLength, const int nKeyCount ) +int iot_dbms::getHashTableTotalMemoryLength( const int nKeyLength, const int nKeyCount ) { if ( nKeyLength <=0 || nKeyCount < 0 ) return -1; diff --git a/platform/src/dbms/rdb_api/CHashTable.h b/platform/src/dbms/rdb_api/CHashTable.h index 62029d16..2da6236d 100644 --- a/platform/src/dbms/rdb_api/CHashTable.h +++ b/platform/src/dbms/rdb_api/CHashTable.h @@ -5,7 +5,7 @@ #include "DataType.h" #include "CRdbKey_impl.h" -namespace kbd_dbms +namespace iot_dbms { #define CN_LoadFactor 0.75 // 装填因子 diff --git a/platform/src/dbms/rdb_api/CPreMalloc.h b/platform/src/dbms/rdb_api/CPreMalloc.h index 7776928b..615da442 100644 --- a/platform/src/dbms/rdb_api/CPreMalloc.h +++ b/platform/src/dbms/rdb_api/CPreMalloc.h @@ -2,7 +2,7 @@ #include "stdlib.h" -namespace kbd_dbms +namespace iot_dbms { /** * @brief The CPreMalloc class 内存管理类 diff --git a/platform/src/dbms/rdb_api/CPremalloc.cpp b/platform/src/dbms/rdb_api/CPremalloc.cpp index cdd7e2c8..aca62575 100644 --- a/platform/src/dbms/rdb_api/CPremalloc.cpp +++ b/platform/src/dbms/rdb_api/CPremalloc.cpp @@ -2,7 +2,7 @@ #include #include "stdlib.h" -using namespace kbd_dbms; +using namespace iot_dbms; CPreMalloc::CPreMalloc( int nPn, int nSize, int nZeroF ) { diff --git a/platform/src/dbms/rdb_api/CRdbAccess.cpp b/platform/src/dbms/rdb_api/CRdbAccess.cpp index 049ac964..792ea734 100644 --- a/platform/src/dbms/rdb_api/CRdbAccess.cpp +++ b/platform/src/dbms/rdb_api/CRdbAccess.cpp @@ -12,7 +12,7 @@ #include "pub_logger_api/logger.h" using namespace std; -using namespace kbd_dbms; +using namespace iot_dbms; CRdbAccess::CRdbAccess() { @@ -44,7 +44,7 @@ bool CRdbAccess::open( const char* pAppName, const char* pTableName ) return open( nAppId, pTableName ); } -bool kbd_dbms::CRdbAccess::open( int nAppID, const char* pTableName ) +bool iot_dbms::CRdbAccess::open( int nAppID, const char* pTableName ) { if ( m_pAccessImpl != NULL ) { @@ -612,7 +612,7 @@ void* CRdbQueryResult::getRecordAddr() return m_pRtdbQueryResultImpl->getRecordAddr( 0 ); } -int kbd_dbms::CRdbQueryResult::getRecordLength() +int iot_dbms::CRdbQueryResult::getRecordLength() { return m_pRtdbQueryResultImpl->GetRecordLength(); } diff --git a/platform/src/dbms/rdb_api/CRdbAccessImpl.cpp b/platform/src/dbms/rdb_api/CRdbAccessImpl.cpp index 97780af9..57c05788 100644 --- a/platform/src/dbms/rdb_api/CRdbAccessImpl.cpp +++ b/platform/src/dbms/rdb_api/CRdbAccessImpl.cpp @@ -6,7 +6,7 @@ #include "pub_logger_api/logger.h" //#include "sys/time.h" -using namespace kbd_dbms; +using namespace iot_dbms; CRdbAccessImpl::CRdbAccessImpl( int nAppId ) : CRdbLocalTable( nAppId ) diff --git a/platform/src/dbms/rdb_api/CRdbAccessImpl.h b/platform/src/dbms/rdb_api/CRdbAccessImpl.h index 0d5e295f..a4c6034e 100644 --- a/platform/src/dbms/rdb_api/CRdbAccessImpl.h +++ b/platform/src/dbms/rdb_api/CRdbAccessImpl.h @@ -4,7 +4,7 @@ #include "CRdbLocalTable.h" #include "rdb_api/CRdbAccess.h" -namespace kbd_dbms +namespace iot_dbms { /** diff --git a/platform/src/dbms/rdb_api/CRdbCache.cpp b/platform/src/dbms/rdb_api/CRdbCache.cpp index 37ec9bdb..e3df192f 100644 --- a/platform/src/dbms/rdb_api/CRdbCache.cpp +++ b/platform/src/dbms/rdb_api/CRdbCache.cpp @@ -13,9 +13,9 @@ #define CN_MAXROWOFONEFILE 100000 // 单个缓存文件容纳的最多行数 #define CN_VERSIONFILE "rdb_cache_version.md5" // 内存库缓存版本 -using namespace kbd_public; -using namespace kbd_dbms; -using namespace kbd_idlfile; +using namespace iot_public; +using namespace iot_dbms; +using namespace iot_idl; CRdbCache::CRdbCache( QString sAppName ) { @@ -315,7 +315,7 @@ bool CRdbCache::load() QString CRdbCache::getCacheVersion() { // 判断文件是否存在 - std::string strPath = kbd_public::CFileUtil::getCurModuleDir(); + std::string strPath = iot_public::CFileUtil::getCurModuleDir(); QString sDbConfigFile_platform = QString("%1/../../platform/common/database/initscript/iscs6000_table_struct.xml").arg(strPath.c_str()); QString sDbConfigFile_product = QString("%1/../../product/common/database/initscript/iscs6000_table_struct.xml").arg(strPath.c_str()); QFileInfo objFileInfo_platform( sDbConfigFile_platform ); diff --git a/platform/src/dbms/rdb_api/CRdbColumnInfo.cpp b/platform/src/dbms/rdb_api/CRdbColumnInfo.cpp index 991233e2..e0521f1f 100644 --- a/platform/src/dbms/rdb_api/CRdbColumnInfo.cpp +++ b/platform/src/dbms/rdb_api/CRdbColumnInfo.cpp @@ -2,7 +2,7 @@ #include "rdb_api/RdbDefine.h" #include "RdbFunc.h" -using namespace kbd_dbms; +using namespace iot_dbms; CRdbColumnInfo::CRdbColumnInfo() { diff --git a/platform/src/dbms/rdb_api/CRdbColumnInfo.h b/platform/src/dbms/rdb_api/CRdbColumnInfo.h index eaafacb8..03d98816 100644 --- a/platform/src/dbms/rdb_api/CRdbColumnInfo.h +++ b/platform/src/dbms/rdb_api/CRdbColumnInfo.h @@ -3,7 +3,7 @@ #include "rdb_api/RdbDefine.h" -namespace kbd_dbms +namespace iot_dbms { /** diff --git a/platform/src/dbms/rdb_api/CRdbConfigMan.cpp b/platform/src/dbms/rdb_api/CRdbConfigMan.cpp index 54ce48f7..9a663652 100644 --- a/platform/src/dbms/rdb_api/CRdbConfigMan.cpp +++ b/platform/src/dbms/rdb_api/CRdbConfigMan.cpp @@ -2,7 +2,7 @@ #include "CRdbServerMemMan.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; CRdbConfigMan::CRdbConfigMan( int nAppId ) { diff --git a/platform/src/dbms/rdb_api/CRdbConfigMan.h b/platform/src/dbms/rdb_api/CRdbConfigMan.h index 99046b0a..64e7ffad 100644 --- a/platform/src/dbms/rdb_api/CRdbConfigMan.h +++ b/platform/src/dbms/rdb_api/CRdbConfigMan.h @@ -8,7 +8,7 @@ #include "rdb_api/RdbMemMan.h" -namespace kbd_dbms { +namespace iot_dbms { /** * @brief The CRdbConfigMan class，mutiple-write/one-read diff --git a/platform/src/dbms/rdb_api/CRdbDataSegMan.cpp b/platform/src/dbms/rdb_api/CRdbDataSegMan.cpp index 3617e48b..8a019e3f 100644 --- a/platform/src/dbms/rdb_api/CRdbDataSegMan.cpp +++ b/platform/src/dbms/rdb_api/CRdbDataSegMan.cpp @@ -4,9 +4,9 @@ #include "boost/thread.hpp" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; -std::map kbd_dbms::CRdbDataSegMan::m_mapAppId2DataSegMan; +std::map iot_dbms::CRdbDataSegMan::m_mapAppId2DataSegMan; static boost::mutex m_gMutex; /** diff --git a/platform/src/dbms/rdb_api/CRdbDataSegMan.h b/platform/src/dbms/rdb_api/CRdbDataSegMan.h index 47b21f7e..9f935fd7 100644 --- a/platform/src/dbms/rdb_api/CRdbDataSegMan.h +++ b/platform/src/dbms/rdb_api/CRdbDataSegMan.h @@ -11,7 +11,7 @@ * @class CRdbDataSegMan crtdbdatasegman.h "librtdb/crtdbdatasegman.h" */ -namespace kbd_dbms +namespace iot_dbms { struct SDataSegMan diff --git a/platform/src/dbms/rdb_api/CRdbDictionary.cpp b/platform/src/dbms/rdb_api/CRdbDictionary.cpp index 3192b172..16732b2e 100644 --- a/platform/src/dbms/rdb_api/CRdbDictionary.cpp +++ b/platform/src/dbms/rdb_api/CRdbDictionary.cpp @@ -2,7 +2,7 @@ #include "CRdbServerMemMan.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; CRdbDictionary::CRdbDictionary( int nAppId ) { diff --git a/platform/src/dbms/rdb_api/CRdbDictionary.h b/platform/src/dbms/rdb_api/CRdbDictionary.h index b63fd91c..bf312304 100644 --- a/platform/src/dbms/rdb_api/CRdbDictionary.h +++ b/platform/src/dbms/rdb_api/CRdbDictionary.h @@ -10,7 +10,7 @@ #pragma warning(disable:4251) #endif -namespace kbd_dbms +namespace iot_dbms { /** diff --git a/platform/src/dbms/rdb_api/CRdbKey.cpp b/platform/src/dbms/rdb_api/CRdbKey.cpp index 485969be..49a51f25 100644 --- a/platform/src/dbms/rdb_api/CRdbKey.cpp +++ b/platform/src/dbms/rdb_api/CRdbKey.cpp @@ -3,9 +3,9 @@ #include "CHashTable.h" #include "CBptree.h" -using namespace kbd_dbms; +using namespace iot_dbms; -int kbd_dbms::getKeyTotalMemoryLength( int nKeyLength, int nKeyCount ) +int iot_dbms::getKeyTotalMemoryLength( int nKeyLength, int nKeyCount ) { #ifdef USE_HASHTABLE return getHashTableTotalMemoryLength( nKeyLength, nKeyCount ); diff --git a/platform/src/dbms/rdb_api/CRdbKey.h b/platform/src/dbms/rdb_api/CRdbKey.h index 93b5c67b..a84eb30d 100644 --- a/platform/src/dbms/rdb_api/CRdbKey.h +++ b/platform/src/dbms/rdb_api/CRdbKey.h @@ -3,7 +3,7 @@ #include -namespace kbd_dbms +namespace iot_dbms { class CRdbKey_impl; diff --git a/platform/src/dbms/rdb_api/CRdbKey_impl.h b/platform/src/dbms/rdb_api/CRdbKey_impl.h index e29f4206..b8229480 100644 --- a/platform/src/dbms/rdb_api/CRdbKey_impl.h +++ b/platform/src/dbms/rdb_api/CRdbKey_impl.h @@ -1,7 +1,7 @@ #ifndef CRDBKEY_IMPL_H #define CRDBKEY_IMPL_H -namespace kbd_dbms +namespace iot_dbms { class CRdbKey_impl diff --git a/platform/src/dbms/rdb_api/CRdbLoadTableAttribute.cpp b/platform/src/dbms/rdb_api/CRdbLoadTableAttribute.cpp index 2c8c4025..fc3f3bd0 100644 --- a/platform/src/dbms/rdb_api/CRdbLoadTableAttribute.cpp +++ b/platform/src/dbms/rdb_api/CRdbLoadTableAttribute.cpp @@ -13,8 +13,8 @@ #include "pub_utility_api/FileUtil.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_public; using namespace std; CRdbLoadTableAttribute::CRdbLoadTableAttribute( int nAppId ) @@ -36,7 +36,7 @@ CRdbLoadTableAttribute::~CRdbLoadTableAttribute() int CRdbLoadTableAttribute::CreateTable() { // 获取程序所在路径 - std::string strPath = kbd_public::CFileUtil::getCurModuleDir(); + std::string strPath = iot_public::CFileUtil::getCurModuleDir(); // 加载平台配置文件 QString sDbConfigFile_platform = QString("%1/../../platform/common/database/initscript/iscs6000_table_struct.xml").arg(strPath.c_str()); diff --git a/platform/src/dbms/rdb_api/CRdbLoadTableAttribute.h b/platform/src/dbms/rdb_api/CRdbLoadTableAttribute.h index 394ff62f..20823be1 100644 --- a/platform/src/dbms/rdb_api/CRdbLoadTableAttribute.h +++ b/platform/src/dbms/rdb_api/CRdbLoadTableAttribute.h @@ -20,6 +20,6 @@ private: private: int m_nAppId; - kbd_public::CSysInfoInterfacePtr m_sysInfo; + iot_public::CSysInfoInterfacePtr m_sysInfo; QList m_listTableName; // 已加载的表名，防止平台和产品的表重名 }; diff --git a/platform/src/dbms/rdb_api/CRdbLoadTableData.cpp b/platform/src/dbms/rdb_api/CRdbLoadTableData.cpp index b60ea902..826c0788 100644 --- a/platform/src/dbms/rdb_api/CRdbLoadTableData.cpp +++ b/platform/src/dbms/rdb_api/CRdbLoadTableData.cpp @@ -9,7 +9,7 @@ #include "RdbFunc.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; #include "QVariant2Vartype.inc" @@ -114,7 +114,7 @@ int CRdbLoadTableData::GetBackupPara( char* table_name, char* para_table_name, c int CRdbLoadTableData::getLocationAndSubsystemConditon( SRdbTableAttribute* pRdbTable, std::string& strSubsystemWhereSentence ) { using namespace std; - using namespace kbd_public; + using namespace iot_public; strSubsystemWhereSentence = "WHERE "; CSysInfoInterfacePtr ptrSysInfo; diff --git a/platform/src/dbms/rdb_api/CRdbLoadTableData.h b/platform/src/dbms/rdb_api/CRdbLoadTableData.h index 78609cfb..cd0a3443 100644 --- a/platform/src/dbms/rdb_api/CRdbLoadTableData.h +++ b/platform/src/dbms/rdb_api/CRdbLoadTableData.h @@ -7,7 +7,7 @@ #include "CRdbDictionary.h" #include "db_api_ex/CDbApi.h" -namespace kbd_dbms +namespace iot_dbms { /** diff --git a/platform/src/dbms/rdb_api/CRdbLocalManager.cpp b/platform/src/dbms/rdb_api/CRdbLocalManager.cpp index 4f04a0b9..1ddcdd1f 100644 --- a/platform/src/dbms/rdb_api/CRdbLocalManager.cpp +++ b/platform/src/dbms/rdb_api/CRdbLocalManager.cpp @@ -4,7 +4,7 @@ #include "CRdbKey.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; int CRdbLocalManager::AddTable( SRdbTableAttribute* pRdbTableAttr, int columnnums, SRdbColumnAttribute* pSrcRtdbColumnAttr ) diff --git a/platform/src/dbms/rdb_api/CRdbLocalManager.h b/platform/src/dbms/rdb_api/CRdbLocalManager.h index b2fb511c..4bb4c573 100644 --- a/platform/src/dbms/rdb_api/CRdbLocalManager.h +++ b/platform/src/dbms/rdb_api/CRdbLocalManager.h @@ -6,7 +6,7 @@ #include "CRdbDataSegMan.h" #include "rdb_api/RdbMemMan.h" -namespace kbd_dbms +namespace iot_dbms { /** diff --git a/platform/src/dbms/rdb_api/CRdbLocalTable.cpp b/platform/src/dbms/rdb_api/CRdbLocalTable.cpp index 9a0f8c23..eb40d828 100644 --- a/platform/src/dbms/rdb_api/CRdbLocalTable.cpp +++ b/platform/src/dbms/rdb_api/CRdbLocalTable.cpp @@ -12,7 +12,7 @@ #include #endif -using namespace kbd_dbms; +using namespace iot_dbms; CRdbLocalTable::CRdbLocalTable( int nAppId ) { @@ -123,7 +123,7 @@ int CRdbLocalTable::OpenTable( const char* table_name ) if ( m_pMutex == NULL ) { int nKey = RDB_TABLE_MEMID + m_nAppId * 10000 + m_pRtdbTableAttribute->nTableNumber; - m_pMutex = new kbd_public::CProcessSharedMutex(); + m_pMutex = new iot_public::CProcessSharedMutex(); int nRet = m_pMutex->init( m_pRtdbTableAttribute->strName, nKey ); if ( nRet != 0 ) return -1; diff --git a/platform/src/dbms/rdb_api/CRdbLocalTable.h b/platform/src/dbms/rdb_api/CRdbLocalTable.h index 0d62e523..b3822b1a 100644 --- a/platform/src/dbms/rdb_api/CRdbLocalTable.h +++ b/platform/src/dbms/rdb_api/CRdbLocalTable.h @@ -11,7 +11,7 @@ #pragma warning(disable:4251) #endif -namespace kbd_dbms +namespace iot_dbms { /** @@ -19,7 +19,7 @@ namespace kbd_dbms * * @class CRdbLocalTable crtdblocaltable.h "librtdb/crtdblocaltable.h" */ -class RTDBEXPORT CRdbLocalTable : public kbd_dbms::CBaseTable +class RTDBEXPORT CRdbLocalTable : public iot_dbms::CBaseTable { public: CRdbLocalTable( int nAppId ); @@ -66,7 +66,7 @@ private: BTBL_COLUMNINFO* m_pColumnInfo; char m_cKeyFlag; /**< 0没有主键，1有主键，2第一个主键字段为字符串类型 */ CRdbKey m_oRdbKeySearch; - kbd_public::CProcessSharedMutex* m_pMutex; // 互斥锁，用于锁表 + iot_public::CProcessSharedMutex* m_pMutex; // 互斥锁，用于锁表 CRdbDictionary* m_pRtdbDict; // key diff --git a/platform/src/dbms/rdb_api/CRdbMngInterface.cpp b/platform/src/dbms/rdb_api/CRdbMngInterface.cpp index f02f685c..ec63edf3 100644 --- a/platform/src/dbms/rdb_api/CRdbMngInterface.cpp +++ b/platform/src/dbms/rdb_api/CRdbMngInterface.cpp @@ -17,11 +17,11 @@ #include "pub_logger_api/logger.h" #include "CRdbCache.h" -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; using namespace std; -bool kbd_dbms::CRdbMngIntereface::loadAppDb( const std::string& strAppName ) +bool iot_dbms::CRdbMngIntereface::loadAppDb( const std::string& strAppName ) { // 创建管理段共享内存 CRdbServerMemMan cServerMemman; @@ -108,7 +108,7 @@ bool kbd_dbms::CRdbMngIntereface::loadAppDb( const std::string& strAppName ) return true; } -int kbd_dbms::CRdbMngIntereface::deleteAppDbShm( const std::string& strAppName ) +int iot_dbms::CRdbMngIntereface::deleteAppDbShm( const std::string& strAppName ) { if ( isLoadAppDb(strAppName) ) { @@ -133,7 +133,7 @@ int kbd_dbms::CRdbMngIntereface::deleteAppDbShm( const std::string& strAppName ) return 0; } -bool kbd_dbms::CRdbMngIntereface::isLoadAppDb( const std::string& strAppName ) +bool iot_dbms::CRdbMngIntereface::isLoadAppDb( const std::string& strAppName ) { CRdbServerMemMan objMemMan; int nAppId = CDbSysInfo::getAppIdByAppName( strAppName ); diff --git a/platform/src/dbms/rdb_api/CRdbQueryResultImpl.cpp b/platform/src/dbms/rdb_api/CRdbQueryResultImpl.cpp index 64c13284..9c128b3f 100644 --- a/platform/src/dbms/rdb_api/CRdbQueryResultImpl.cpp +++ b/platform/src/dbms/rdb_api/CRdbQueryResultImpl.cpp @@ -6,7 +6,7 @@ #include "CRdbQueryResultImpl.h" -using namespace kbd_dbms; +using namespace iot_dbms; CRdbQueryResultImpl::CRdbQueryResultImpl() { diff --git a/platform/src/dbms/rdb_api/CRdbQueryResultImpl.h b/platform/src/dbms/rdb_api/CRdbQueryResultImpl.h index ccaa60d4..db202faa 100644 --- a/platform/src/dbms/rdb_api/CRdbQueryResultImpl.h +++ b/platform/src/dbms/rdb_api/CRdbQueryResultImpl.h @@ -7,7 +7,7 @@ #include "CBaseTable.h" #include "rdb_api/CRdbAccess.h" -namespace kbd_dbms +namespace iot_dbms { /** diff --git a/platform/src/dbms/rdb_api/CRdbQuickSortSrch.cpp b/platform/src/dbms/rdb_api/CRdbQuickSortSrch.cpp index 2d36b2d0..b92ebcdd 100644 --- a/platform/src/dbms/rdb_api/CRdbQuickSortSrch.cpp +++ b/platform/src/dbms/rdb_api/CRdbQuickSortSrch.cpp @@ -1,7 +1,7 @@ #include "CRdbQuickSortSrch.h" #include "RdbFunc.h" -using namespace kbd_dbms; +using namespace iot_dbms; void CRdbQuickSortSrch::InitCompare( int col_nums, int* offset, unsigned char* datatype ) { diff --git a/platform/src/dbms/rdb_api/CRdbQuickSortSrch.h b/platform/src/dbms/rdb_api/CRdbQuickSortSrch.h index d1d2595f..33cd3718 100644 --- a/platform/src/dbms/rdb_api/CRdbQuickSortSrch.h +++ b/platform/src/dbms/rdb_api/CRdbQuickSortSrch.h @@ -3,13 +3,13 @@ #include "QuickSortSrch.h" -namespace kbd_dbms +namespace iot_dbms { /** * @brief The CRdbQuickSortSrch class 实时库排序操作封装 */ -class CRdbQuickSortSrch : public kbd_dbms::QuickSortSrch +class CRdbQuickSortSrch : public iot_dbms::QuickSortSrch { public: CRdbQuickSortSrch( void* buf, int rlen, int nums, int asc = 0 ) diff --git a/platform/src/dbms/rdb_api/CRdbServerMemMan.cpp b/platform/src/dbms/rdb_api/CRdbServerMemMan.cpp index fa20daef..01e3e352 100644 --- a/platform/src/dbms/rdb_api/CRdbServerMemMan.cpp +++ b/platform/src/dbms/rdb_api/CRdbServerMemMan.cpp @@ -11,8 +11,8 @@ // Construction/Destruction ////////////////////////////////////////////////////////////////////// -using namespace kbd_dbms; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_public; std::map CRdbServerMemMan::m_mapMemMan; std::map CRdbServerMemMan::m_mapId2Name; diff --git a/platform/src/dbms/rdb_api/CRdbTime.cpp b/platform/src/dbms/rdb_api/CRdbTime.cpp index f0e8779e..bde979b9 100644 --- a/platform/src/dbms/rdb_api/CRdbTime.cpp +++ b/platform/src/dbms/rdb_api/CRdbTime.cpp @@ -13,7 +13,7 @@ extern struct tm* localtime_r( const time_t*, struct tm* ); #include "time.h" #endif -using namespace kbd_dbms; +using namespace iot_dbms; void CRdbTime::GetInterTime( int32* intertimep, unsigned short* msecp ) { diff --git a/platform/src/dbms/rdb_api/CRdbTime.h b/platform/src/dbms/rdb_api/CRdbTime.h index 991fe000..af951cbe 100644 --- a/platform/src/dbms/rdb_api/CRdbTime.h +++ b/platform/src/dbms/rdb_api/CRdbTime.h @@ -6,7 +6,7 @@ #include "rdb_api/RdbDefine.h" -namespace kbd_dbms +namespace iot_dbms { class RTDBEXPORT CRdbTime diff --git a/platform/src/dbms/rdb_api/CVarType.cpp b/platform/src/dbms/rdb_api/CVarType.cpp index a422f6f7..137393a0 100644 --- a/platform/src/dbms/rdb_api/CVarType.cpp +++ b/platform/src/dbms/rdb_api/CVarType.cpp @@ -1,12 +1,12 @@ #include "rdb_api/CVarType.h" #include "string.h" -using namespace kbd_dbms; +using namespace iot_dbms; #define RDB_OK 0 //////////////////////////////////////////////////////////////////////////////////////////// -int kbd_dbms::datatypelen( int datatype ) +int iot_dbms::datatypelen( int datatype ) { switch ( datatype ) { @@ -31,7 +31,7 @@ int kbd_dbms::datatypelen( int datatype ) } } -int kbd_dbms::vtu_swapinval( VTVALUE_UNION* vtvalu, unsigned char valtype, const void* valaddr ) +int iot_dbms::vtu_swapinval( VTVALUE_UNION* vtvalu, unsigned char valtype, const void* valaddr ) { switch ( valtype ) { @@ -69,7 +69,7 @@ int kbd_dbms::vtu_swapinval( VTVALUE_UNION* vtvalu, unsigned char valtype, const return RDB_OK; } -int kbd_dbms::vtu_swapoutdecval( const VTVALUE_UNION* vtvalu, unsigned char valtype, char* decval, int decstrlen, int dotnums ) +int iot_dbms::vtu_swapoutdecval( const VTVALUE_UNION* vtvalu, unsigned char valtype, char* decval, int decstrlen, int dotnums ) { char tmpstr[1024]; char tmpformat[20]; @@ -108,7 +108,7 @@ int kbd_dbms::vtu_swapoutdecval( const VTVALUE_UNION* vtvalu, unsigned char valt return RDB_OK; } -int kbd_dbms::vtu_swapoutval( const VTVALUE_UNION* vtvalu, unsigned char valtype, void* valaddr ) +int iot_dbms::vtu_swapoutval( const VTVALUE_UNION* vtvalu, unsigned char valtype, void* valaddr ) { switch ( valtype ) { @@ -145,7 +145,7 @@ int kbd_dbms::vtu_swapoutval( const VTVALUE_UNION* vtvalu, unsigned char valtype } return RDB_OK; } -int kbd_dbms::vtu_swapoutexpval( const VTVALUE_UNION* vtvalu, unsigned char expvaltype, unsigned char valtype, void* valaddr ) +int iot_dbms::vtu_swapoutexpval( const VTVALUE_UNION* vtvalu, unsigned char expvaltype, unsigned char valtype, void* valaddr ) { switch ( expvaltype ) { @@ -664,7 +664,7 @@ unsigned char CVarType::ValueType() const return m_ValueType; } -int kbd_dbms::vtu_cmpvalue( unsigned char valtype1, const VTVALUE_UNION* vtvalu1, +int iot_dbms::vtu_cmpvalue( unsigned char valtype1, const VTVALUE_UNION* vtvalu1, unsigned char valtype2, const VTVALUE_UNION* vtvalu2 ) { float tmpfloat; @@ -886,7 +886,7 @@ int kbd_dbms::vtu_cmpvalue( unsigned char valtype1, const VTVALUE_UNION* vtvalu1 return RDB_OK; } -int kbd_dbms::datatypealign( int datatype, int off ) +int iot_dbms::datatypealign( int datatype, int off ) { int unitlen; diff --git a/platform/src/dbms/rdb_api/QVariant2Vartype.inc b/platform/src/dbms/rdb_api/QVariant2Vartype.inc index 87d2bee7..c9d10830 100644 --- a/platform/src/dbms/rdb_api/QVariant2Vartype.inc +++ b/platform/src/dbms/rdb_api/QVariant2Vartype.inc @@ -2,7 +2,7 @@ #define QVARIANT2VARTYPE_INC #include "rdb_api/CVarType.h" -void QVariantToVartypeValue(const QVariant& srcVal, unsigned char datatype, kbd_dbms::CVarType& varVal) +void QVariantToVartypeValue(const QVariant& srcVal, unsigned char datatype, iot_dbms::CVarType& varVal) { unsigned char ucVal; char cVal; diff --git a/platform/src/dbms/rdb_api/QuickSortSrch.cpp b/platform/src/dbms/rdb_api/QuickSortSrch.cpp index ca70189a..2eb8f04b 100644 --- a/platform/src/dbms/rdb_api/QuickSortSrch.cpp +++ b/platform/src/dbms/rdb_api/QuickSortSrch.cpp @@ -4,7 +4,7 @@ #include "list" #include "public/pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; #define QSS_KEYADDR( a ) ( ( (char*)rcdbuf ) + (a)*rcdlen ) #define QSS_KEYMOVE( obj, src ) memcpy( QSS_KEYADDR( obj ), QSS_KEYADDR( src ), rcdlen ) diff --git a/platform/src/dbms/rdb_api/QuickSortSrch.h b/platform/src/dbms/rdb_api/QuickSortSrch.h index d479b2a5..8b04e480 100644 --- a/platform/src/dbms/rdb_api/QuickSortSrch.h +++ b/platform/src/dbms/rdb_api/QuickSortSrch.h @@ -1,7 +1,7 @@ #ifndef QUICKSORTSRCH_H #define QUICKSORTSRCH_H -namespace kbd_dbms +namespace iot_dbms { /** diff --git a/platform/src/dbms/rdb_api/RdbFunc.cpp b/platform/src/dbms/rdb_api/RdbFunc.cpp index 4f20952e..ccb9db0b 100644 --- a/platform/src/dbms/rdb_api/RdbFunc.cpp +++ b/platform/src/dbms/rdb_api/RdbFunc.cpp @@ -24,13 +24,13 @@ #include #include -using namespace kbd_dbms; +using namespace iot_dbms; extern int g_SybaseOk; int g_SybaseOk = CS_FAIL; -int kbd_dbms::RtdbSleepms( int msecs ) +int iot_dbms::RtdbSleepms( int msecs ) { #ifdef OS_LINUX struct timeval stoptime; @@ -46,9 +46,9 @@ int kbd_dbms::RtdbSleepms( int msecs ) #endif } -int kbd_dbms::getSubSystemFlagByAppName( const std::string& strAppName, unsigned int& flag ) +int iot_dbms::getSubSystemFlagByAppName( const std::string& strAppName, unsigned int& flag ) { - using namespace kbd_public; + using namespace iot_public; using namespace std; SAppInfo stAppInfo; CSysInfoInterfacePtr ptrSysInfo; @@ -79,23 +79,23 @@ int kbd_dbms::getSubSystemFlagByAppName( const std::string& strAppName, unsigned return RDB_OK; } -int kbd_dbms::columnnamecmp( const void* colinfo1, const void* colinfo2 ) +int iot_dbms::columnnamecmp( const void* colinfo1, const void* colinfo2 ) { return strcmp( ( (BTBL_COLUMNINFO*)colinfo1 )->name, ( (BTBL_COLUMNINFO*)colinfo2 )->name ); } -int kbd_dbms::columnnamesort( void* pAddr, int rcdcnt ) +int iot_dbms::columnnamesort( void* pAddr, int rcdcnt ) { qsort( pAddr, rcdcnt, sizeof( BTBL_COLUMNINFO ), columnnamecmp ); return RDB_OK; } -int kbd_dbms::ColumnOrderCompare( const void* col1, const void* col2 ) +int iot_dbms::ColumnOrderCompare( const void* col1, const void* col2 ) { return ( (SRdbColumnAttribute*)col1 )->nColumnNo - ( (SRdbColumnAttribute*)col2 )->nColumnNo; } -int kbd_dbms::CheckColumnMatching( int columnnums, BTBL_COLUMNINFO* srccolumnp, +int iot_dbms::CheckColumnMatching( int columnnums, BTBL_COLUMNINFO* srccolumnp, BTBL_COLUMNINFO* objcolumnp ) { int i; @@ -113,7 +113,7 @@ int kbd_dbms::CheckColumnMatching( int columnnums, BTBL_COLUMNINFO* srccolumnp, return RDB_OK; } -int kbd_dbms::getRdbColumnInfoValue( char* rcdAddr, const BTBL_COLUMNINFO* stColumnInfo, CVarType& objVal ) +int iot_dbms::getRdbColumnInfoValue( char* rcdAddr, const BTBL_COLUMNINFO* stColumnInfo, CVarType& objVal ) { unsigned char ucTmpval; if ( stColumnInfo->offset < 0 ) @@ -133,7 +133,7 @@ int kbd_dbms::getRdbColumnInfoValue( char* rcdAddr, const BTBL_COLUMNINFO* stCol return RDB_OK; } -int kbd_dbms::recordcopy( int columnnums, BTBL_COLUMNINFO* srccolumnp, char* srcrcdaddr, +int iot_dbms::recordcopy( int columnnums, BTBL_COLUMNINFO* srccolumnp, char* srcrcdaddr, BTBL_COLUMNINFO* objcolumnp, char* objrcdaddr ) { int i, ret; @@ -148,7 +148,7 @@ int kbd_dbms::recordcopy( int columnnums, BTBL_COLUMNINFO* srccolumnp, char* src return RDB_OK; } -int kbd_dbms::RdbDataCompare( int datatype, void* data1, void* data2 ) +int iot_dbms::RdbDataCompare( int datatype, void* data1, void* data2 ) { switch ( datatype ) { @@ -191,7 +191,7 @@ int kbd_dbms::RdbDataCompare( int datatype, void* data1, void* data2 ) } return 0; } -int kbd_dbms::calcultRcdLen( int colnums, SRdbColumnAttribute* columnp ) +int iot_dbms::calcultRcdLen( int colnums, SRdbColumnAttribute* columnp ) { int i; CRdbColumnInfo rcol; @@ -203,7 +203,7 @@ int kbd_dbms::calcultRcdLen( int colnums, SRdbColumnAttribute* columnp ) return rcol.totalLength(); } -int kbd_dbms::calculteRecordInfo( BTBL_TABLEINFO* tablep, BTBL_COLUMNINFO* columnp ) +int iot_dbms::calculteRecordInfo( BTBL_TABLEINFO* tablep, BTBL_COLUMNINFO* columnp ) { tablep->recordlen = calculteRecordInfo( tablep->columnnums, columnp ); return RDB_OK; diff --git a/platform/src/dbms/rdb_api/RdbFunc.h b/platform/src/dbms/rdb_api/RdbFunc.h index 7ead68f0..f5d0bf9d 100644 --- a/platform/src/dbms/rdb_api/RdbFunc.h +++ b/platform/src/dbms/rdb_api/RdbFunc.h @@ -11,7 +11,7 @@ #include "rdb_api/RdbExport.h" #include "CRdbTime.h" -namespace kbd_dbms +namespace iot_dbms { /** diff --git a/platform/src/dbms/rdb_api/RdbMemMan.cpp b/platform/src/dbms/rdb_api/RdbMemMan.cpp index 840277b8..a55dcd61 100644 --- a/platform/src/dbms/rdb_api/RdbMemMan.cpp +++ b/platform/src/dbms/rdb_api/RdbMemMan.cpp @@ -2,7 +2,7 @@ #include "CRdbColumnInfo.h" #include "pub_logger_api/logger.h" -int kbd_dbms::calculteRecordInfo( int colnums, BTBL_COLUMNINFO* columnp ) +int iot_dbms::calculteRecordInfo( int colnums, BTBL_COLUMNINFO* columnp ) { int i; CRdbColumnInfo rcol; @@ -14,7 +14,7 @@ int kbd_dbms::calculteRecordInfo( int colnums, BTBL_COLUMNINFO* columnp ) return rcol.totalLength(); } -int kbd_dbms::putRdbColumnInfoValue( char* rcdaddr, const SRdbColumnAttribute* columninfop, const CVarType* pvtval ) +int iot_dbms::putRdbColumnInfoValue( char* rcdaddr, const SRdbColumnAttribute* columninfop, const CVarType* pvtval ) { unsigned char tmpval, mask0, *tmpup; @@ -37,7 +37,7 @@ int kbd_dbms::putRdbColumnInfoValue( char* rcdaddr, const SRdbColumnAttribute* c return RDB_OK; } -int kbd_dbms::putColumnInfoValue( char* rcdaddr, const BTBL_COLUMNINFO* columninfop, const CVarType& pvtval ) +int iot_dbms::putColumnInfoValue( char* rcdaddr, const BTBL_COLUMNINFO* columninfop, const CVarType& pvtval ) { unsigned char tmpval, mask0, *tmpup; @@ -64,7 +64,7 @@ int kbd_dbms::putColumnInfoValue( char* rcdaddr, const BTBL_COLUMNINFO* columnin return RDB_OK; } -int kbd_dbms::getColumnInfoValue( char* rcdaddr, BTBL_COLUMNINFO* columninfop, CVarType& gvtval ) +int iot_dbms::getColumnInfoValue( char* rcdaddr, BTBL_COLUMNINFO* columninfop, CVarType& gvtval ) { unsigned char tmpval; if ( columninfop->offset < 0 ) diff --git a/platform/src/dbms/rdb_changedata_api/CRdbChangeData.cpp b/platform/src/dbms/rdb_changedata_api/CRdbChangeData.cpp index 049dedd9..09097173 100644 --- a/platform/src/dbms/rdb_changedata_api/CRdbChangeData.cpp +++ b/platform/src/dbms/rdb_changedata_api/CRdbChangeData.cpp @@ -11,10 +11,10 @@ #include "DataProcMessage.pb.h" using namespace std; -using namespace kbd_net; -using namespace kbd_idlfile; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_net; +using namespace iot_idl; +using namespace iot_public; +using namespace iot_dbms; CRdbChangeData::CRdbChangeData() : CTimerThreadBase( "rdb_changedata_api CRdbChangeData 变化数据接口线程", 0 ) diff --git a/platform/src/dbms/rdb_changedata_api/CSubscribeApi.cpp b/platform/src/dbms/rdb_changedata_api/CSubscribeApi.cpp index 4f810bda..f1e368c1 100644 --- a/platform/src/dbms/rdb_changedata_api/CSubscribeApi.cpp +++ b/platform/src/dbms/rdb_changedata_api/CSubscribeApi.cpp @@ -3,7 +3,7 @@ #include "pub_utility_api/TimeUtil.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; CSubscribeApi::CSubscribeApi() { diff --git a/platform/src/dbms/rdb_changedata_api/CSubscribeEngine.cpp b/platform/src/dbms/rdb_changedata_api/CSubscribeEngine.cpp index e41f11dc..675885bb 100644 --- a/platform/src/dbms/rdb_changedata_api/CSubscribeEngine.cpp +++ b/platform/src/dbms/rdb_changedata_api/CSubscribeEngine.cpp @@ -3,7 +3,7 @@ #include "pub_utility_api/TimeUtil.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; CSubscribeEngine::CSubscribeEngine() { diff --git a/platform/src/dbms/rdb_changedata_server/CRdbChangeDataRedunSw.cpp b/platform/src/dbms/rdb_changedata_server/CRdbChangeDataRedunSw.cpp index 734acdca..3788d8d8 100644 --- a/platform/src/dbms/rdb_changedata_server/CRdbChangeDataRedunSw.cpp +++ b/platform/src/dbms/rdb_changedata_server/CRdbChangeDataRedunSw.cpp @@ -11,9 +11,9 @@ #include "pub_logger_api/logger.h" #include "CRdbChangeDataRedunSw.h" -using namespace kbd_dbms; +using namespace iot_dbms; -CRdbChangeDataRedunSw::CRdbChangeDataRedunSw( kbd_sys::CProcMngInterfacePtr pProc ) +CRdbChangeDataRedunSw::CRdbChangeDataRedunSw( iot_sys::CProcMngInterfacePtr pProc ) { m_pProcManage = pProc; m_pWorkThread = NULL; diff --git a/platform/src/dbms/rdb_changedata_server/CRdbChangeDataRedunSw.h b/platform/src/dbms/rdb_changedata_server/CRdbChangeDataRedunSw.h index 8812fcac..8bc79dbb 100644 --- a/platform/src/dbms/rdb_changedata_server/CRdbChangeDataRedunSw.h +++ b/platform/src/dbms/rdb_changedata_server/CRdbChangeDataRedunSw.h @@ -13,13 +13,13 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "CRdbChangeDataWorkThread.h" -namespace kbd_dbms +namespace iot_dbms { -class CRdbChangeDataRedunSw : public ::kbd_sys::CRedundantSwitchInterface +class CRdbChangeDataRedunSw : public ::iot_sys::CRedundantSwitchInterface { public: - CRdbChangeDataRedunSw( kbd_sys::CProcMngInterfacePtr pProc ); + CRdbChangeDataRedunSw( iot_sys::CProcMngInterfacePtr pProc ); virtual ~CRdbChangeDataRedunSw(); public: @@ -27,11 +27,11 @@ public: int redundantSwitch( bool bMaster, bool bSlave ); private: - kbd_sys::CProcMngInterfacePtr m_pProcManage; + iot_sys::CProcMngInterfacePtr m_pProcManage; CRdbChangeDataWorkThreadPtr m_pWorkThread; }; typedef boost::shared_ptr CRdbChangeDataServerRedunSwPtr; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/rdb_changedata_server/CRdbChangeDataServer.cpp b/platform/src/dbms/rdb_changedata_server/CRdbChangeDataServer.cpp index a3195f02..1f9898fe 100644 --- a/platform/src/dbms/rdb_changedata_server/CRdbChangeDataServer.cpp +++ b/platform/src/dbms/rdb_changedata_server/CRdbChangeDataServer.cpp @@ -18,9 +18,9 @@ #define RDB_CHANGE_DATA_SERVER_NAME "rdb_changedata_server" -using namespace kbd_public; -using namespace kbd_dbms; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_dbms; +using namespace iot_sys; CRdbChangeDataServer::CRdbChangeDataServer() { @@ -31,7 +31,7 @@ CRdbChangeDataServer::CRdbChangeDataServer() CRdbChangeDataServer::~CRdbChangeDataServer() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } bool CRdbChangeDataServer::start(int argc, char *argv[], int& /*nStatus*/) @@ -61,7 +61,7 @@ bool CRdbChangeDataServer::start(int argc, char *argv[], int& /*nStatus*/) } // 5.消初始化息总线 - if ( kbd_net::initMsgBus(RDB_CHANGE_DATA_SERVER_NAME, "", true) == false ) + if ( iot_net::initMsgBus(RDB_CHANGE_DATA_SERVER_NAME, "", true) == false ) { LOGFATAL("初始化消息总线失败，程序启动失败！"); return false; @@ -129,11 +129,11 @@ bool CRdbChangeDataServer::stop() } // 停止消息总线 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); // 停止日志系统 // 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } @@ -147,7 +147,7 @@ int CRdbChangeDataServer::toQuit() bool CRdbChangeDataServer::isAlreadyRunning() { - return kbd_public::CSingleProcInstance::hasInstanceRunning(RDB_CHANGE_DATA_SERVER_NAME); + return iot_public::CSingleProcInstance::hasInstanceRunning(RDB_CHANGE_DATA_SERVER_NAME); } bool CRdbChangeDataServer::getSysAppInfo() @@ -192,7 +192,7 @@ bool CRdbChangeDataServer::initProcess() return false; } m_pRedunSw->setWorkThread( m_pWorkThread ); - m_pRedundantMng = kbd_sys::getRedundantMngInstance( m_stRunAppInfo.nDomainId, + m_pRedundantMng = iot_sys::getRedundantMngInstance( m_stRunAppInfo.nDomainId, CN_AppId_PUBLIC, m_stRunAppInfo.strLocalNodeName ); if ( m_pRedundantMng == NULL ) diff --git a/platform/src/dbms/rdb_changedata_server/CRdbChangeDataServer.h b/platform/src/dbms/rdb_changedata_server/CRdbChangeDataServer.h index 0b1a2d78..56baae26 100644 --- a/platform/src/dbms/rdb_changedata_server/CRdbChangeDataServer.h +++ b/platform/src/dbms/rdb_changedata_server/CRdbChangeDataServer.h @@ -14,10 +14,10 @@ #include "CRdbChangeDataWorkThread.h" #include "CRdbChangeDataRedunSw.h" -namespace kbd_dbms +namespace iot_dbms { -class CRdbChangeDataServer : public kbd_public::CBaseService, kbd_sys::CProcessQuitInterface +class CRdbChangeDataServer : public iot_public::CBaseService, iot_sys::CProcessQuitInterface { public: CRdbChangeDataServer(); @@ -37,12 +37,12 @@ private: private: std::string m_sStartArgs; // 启动参数 - kbd_public::SRunAppInfo m_stRunAppInfo; // 进程运行常用信息 - kbd_sys::CProcMngInterfacePtr m_pProcMng; // 进程管理访问库接口 - kbd_sys::CRedundantMngInterfacePtr m_pRedundantMng; // 冗余管理接口 + iot_public::SRunAppInfo m_stRunAppInfo; // 进程运行常用信息 + iot_sys::CProcMngInterfacePtr m_pProcMng; // 进程管理访问库接口 + iot_sys::CRedundantMngInterfacePtr m_pRedundantMng; // 冗余管理接口 CRdbChangeDataServerRedunSwPtr m_pRedunSw; // 冗余切换通知 CRdbChangeDataWorkThreadPtr m_pWorkThread; // 工作线程 }; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/rdb_changedata_server/CRdbChangeDataWorkThread.cpp b/platform/src/dbms/rdb_changedata_server/CRdbChangeDataWorkThread.cpp index eab1a4e1..0ec3716a 100644 --- a/platform/src/dbms/rdb_changedata_server/CRdbChangeDataWorkThread.cpp +++ b/platform/src/dbms/rdb_changedata_server/CRdbChangeDataWorkThread.cpp @@ -15,12 +15,12 @@ #include "pub_utility_api/TimeUtil.h" using namespace std; -using namespace kbd_net; -using namespace kbd_idlfile; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_net; +using namespace iot_idl; +using namespace iot_public; +using namespace iot_dbms; -CRdbChangeDataWorkThread::CRdbChangeDataWorkThread( kbd_public::SRunAppInfo &stRunAppInfo ) : +CRdbChangeDataWorkThread::CRdbChangeDataWorkThread( iot_public::SRunAppInfo &stRunAppInfo ) : CTimerThreadBase("CRdbChangeDataWorkThread 变化数据工作线程", 0) { m_stRunAppInfo = stRunAppInfo; @@ -66,7 +66,7 @@ void CRdbChangeDataWorkThread::afterResume() LOGERROR( "变化数据工作线程 恢复" ); if ( m_pMbComm == NULL ) { - m_pMbComm = new kbd_net::CMbCommunicator(); + m_pMbComm = new iot_net::CMbCommunicator(); if ( !m_pMbComm->addSub(0, CH_SUB_APP_TO_CHGSRV) || !m_pMbComm->addSub(0, CH_SUB_CHGSRV_TO_CHGSRV) || !m_pMbComm->addSub(0, CH_DATA_RDBSRV_TO_CHGSRV) || !m_pMbComm->addSub(0, CH_DATA_CHGSRV_TO_CHGSRV) ) { @@ -150,7 +150,7 @@ void CRdbChangeDataWorkThread::execute() } } -int CRdbChangeDataWorkThread::sendSubscribe ( kbd_net::CMbMessage& oMbMsg ) +int CRdbChangeDataWorkThread::sendSubscribe ( iot_net::CMbMessage& oMbMsg ) { // 从消息中解析订阅 SPointMsgPackage oPointMsgPackage; @@ -274,7 +274,7 @@ int CRdbChangeDataWorkThread::sendSubscribe ( kbd_net::CMbMessage& oMbMsg ) return 0; } -int CRdbChangeDataWorkThread::sendChangeData( kbd_net::CMbMessage& oMbMsg, CSubscribeEngine* pSubscribe, int nChannel ) +int CRdbChangeDataWorkThread::sendChangeData( iot_net::CMbMessage& oMbMsg, CSubscribeEngine* pSubscribe, int nChannel ) { STableRealTimeData oRealTimeData; if ( false == oRealTimeData.ParseFromArray(oMbMsg.getDataPtr(), (int)oMbMsg.getDataSize()) ) @@ -316,7 +316,7 @@ int CRdbChangeDataWorkThread::sendChangeData( kbd_net::CMbMessage& oMbMsg, CSubs return 0; } -int CRdbChangeDataWorkThread::dealSubscribeSnapFromLocalDomin ( kbd_net::CMbMessage& oMbMsg ) +int CRdbChangeDataWorkThread::dealSubscribeSnapFromLocalDomin ( iot_net::CMbMessage& oMbMsg ) { SPointMsgPackage oPointMsgPackage; if ( false == oPointMsgPackage.ParseFromArray(oMbMsg.getDataPtr(), (int)oMbMsg.getDataSize()) ) @@ -359,7 +359,7 @@ int CRdbChangeDataWorkThread::dealSubscribeSnapFromLocalDomin ( kbd_net::CMbMess return 0; } -int CRdbChangeDataWorkThread::dealSubscribeSnapFromOtherDomin ( kbd_net::CMbMessage& oMbMsg ) +int CRdbChangeDataWorkThread::dealSubscribeSnapFromOtherDomin ( iot_net::CMbMessage& oMbMsg ) { SPointMsgPackage oPointMsgPackage; if ( false == oPointMsgPackage.ParseFromArray(oMbMsg.getDataPtr(), (int)oMbMsg.getDataSize()) ) diff --git a/platform/src/dbms/rdb_changedata_server/CRdbChangeDataWorkThread.h b/platform/src/dbms/rdb_changedata_server/CRdbChangeDataWorkThread.h index adf9db55..f704db82 100644 --- a/platform/src/dbms/rdb_changedata_server/CRdbChangeDataWorkThread.h +++ b/platform/src/dbms/rdb_changedata_server/CRdbChangeDataWorkThread.h @@ -15,20 +15,20 @@ #include "rdb_changedata_api/CSubscribeEngine.h" #include "pub_sysinfo_api/SysInfoApi.h" -namespace kbd_dbms +namespace iot_dbms { -class CRdbChangeDataWorkThread : public kbd_public::CTimerThreadBase +class CRdbChangeDataWorkThread : public iot_public::CTimerThreadBase { public: - CRdbChangeDataWorkThread( kbd_public::SRunAppInfo& stRunAppInfo ); + CRdbChangeDataWorkThread( iot_public::SRunAppInfo& stRunAppInfo ); virtual ~CRdbChangeDataWorkThread(); public: - int sendSubscribe ( kbd_net::CMbMessage& oMbMsg ); - int sendChangeData( kbd_net::CMbMessage& oMbMsg, CSubscribeEngine* pSubscribe, int nChannel ); - int dealSubscribeSnapFromLocalDomin ( kbd_net::CMbMessage& oMbMsg ); - int dealSubscribeSnapFromOtherDomin ( kbd_net::CMbMessage& oMbMsg ); + int sendSubscribe ( iot_net::CMbMessage& oMbMsg ); + int sendChangeData( iot_net::CMbMessage& oMbMsg, CSubscribeEngine* pSubscribe, int nChannel ); + int dealSubscribeSnapFromLocalDomin ( iot_net::CMbMessage& oMbMsg ); + int dealSubscribeSnapFromOtherDomin ( iot_net::CMbMessage& oMbMsg ); public: void afterResume(); @@ -40,8 +40,8 @@ public: private: int64 m_nLastSendSubscribeSnapTime;//ms - kbd_public::SRunAppInfo m_stRunAppInfo; - kbd_net::CMbCommunicator* m_pMbComm; // 消息总线通讯器 + iot_public::SRunAppInfo m_stRunAppInfo; + iot_net::CMbCommunicator* m_pMbComm; // 消息总线通讯器 CSubscribeEngine* m_pLocalDominSubscribeLocalDomin; // 本域订阅本域 CSubscribeEngine* m_pOtherDominSubscribeLocalDomin; // 其他域订阅本域 CSubscribeEngine* m_pLocalDominSubscribeOtherDomin; // 本域订阅其他域 diff --git a/platform/src/dbms/rdb_changedata_server/main.cpp b/platform/src/dbms/rdb_changedata_server/main.cpp index b20f6e36..a7859b9e 100644 --- a/platform/src/dbms/rdb_changedata_server/main.cpp +++ b/platform/src/dbms/rdb_changedata_server/main.cpp @@ -11,7 +11,7 @@ int main(int argc, char *argv[]) { - kbd_dbms::CRdbChangeDataServer objApp; + iot_dbms::CRdbChangeDataServer objApp; return objApp.main(argc, argv); } diff --git a/platform/src/dbms/rdb_net_api/CRdbNetApi.cpp b/platform/src/dbms/rdb_net_api/CRdbNetApi.cpp index 7e45d491..c28203d8 100644 --- a/platform/src/dbms/rdb_net_api/CRdbNetApi.cpp +++ b/platform/src/dbms/rdb_net_api/CRdbNetApi.cpp @@ -1,29 +1,29 @@ #include "rdb_net_api/CRdbNetApi.h" #include "CRdbNetApiImpl.h" -using namespace kbd_dbms; +using namespace iot_dbms; CRdbNetApi::CRdbNetApi() { m_pImpl = new CRdbNetApiImpl(); } -bool CRdbNetApi::query( kbd_idlfile::RdbQuery& objQuery, kbd_idlfile::RdbRet& objRet, bool asyn ) +bool CRdbNetApi::query( iot_idl::RdbQuery& objQuery, iot_idl::RdbRet& objRet, bool asyn ) { return m_pImpl->query( objQuery, objRet, asyn ); } -bool CRdbNetApi::queryByKey( const std::string& sTable, const std::string& sKey, const std::string& sColumn, kbd_idlfile::RdbRet& objRet, bool asyn ) +bool CRdbNetApi::queryByKey( const std::string& sTable, const std::string& sKey, const std::string& sColumn, iot_idl::RdbRet& objRet, bool asyn ) { return m_pImpl->queryByKey( sTable, sKey, sColumn, objRet, asyn ); } -bool CRdbNetApi::queryByKey( const std::string& sTable, const std::vector& vecKey, const std::vector& vecColumn, kbd_idlfile::RdbRet& objRet, bool asyn ) +bool CRdbNetApi::queryByKey( const std::string& sTable, const std::vector& vecKey, const std::vector& vecColumn, iot_idl::RdbRet& objRet, bool asyn ) { return m_pImpl->queryByKey( sTable, vecKey, vecColumn, objRet, asyn ); } -bool CRdbNetApi::queryTotal( const std::string& sTable, const std::vector& vecColumn, kbd_idlfile::RdbRet& objRet, bool asyn, bool bSendToDomain ) +bool CRdbNetApi::queryTotal( const std::string& sTable, const std::vector& vecColumn, iot_idl::RdbRet& objRet, bool asyn, bool bSendToDomain ) { return m_pImpl->queryTotal( sTable, vecColumn, objRet, asyn, bSendToDomain ); } @@ -43,12 +43,12 @@ bool CRdbNetApi::checkStatus() return m_pImpl->checkStatus(); } -bool CRdbNetApi::getRet( kbd_idlfile::RdbRet* const objRet ) +bool CRdbNetApi::getRet( iot_idl::RdbRet* const objRet ) { return m_pImpl->getRet( objRet ); } -const std::string& kbd_dbms::CRdbNetApi::getErr() const +const std::string& iot_dbms::CRdbNetApi::getErr() const { return m_pImpl->getErr(); } @@ -58,7 +58,7 @@ void CRdbNetApi::clearAsynRequest() m_pImpl->clearAsynRequest(); } -kbd_dbms::CRdbNetApi::~CRdbNetApi() +iot_dbms::CRdbNetApi::~CRdbNetApi() { if ( NULL != m_pImpl ) { @@ -67,22 +67,22 @@ kbd_dbms::CRdbNetApi::~CRdbNetApi() } } -void kbd_dbms::CRdbNetApi::connect( int nDomainID, int nAppID ) +void iot_dbms::CRdbNetApi::connect( int nDomainID, int nAppID ) { return m_pImpl->connect( nDomainID, nAppID ); } -bool kbd_dbms::CRdbNetApi::insert( kbd_idlfile::RdbInsert& objInsert, bool asyn ) +bool iot_dbms::CRdbNetApi::insert( iot_idl::RdbInsert& objInsert, bool asyn ) { return m_pImpl->insert( objInsert, asyn ); } -bool kbd_dbms::CRdbNetApi::remove( kbd_idlfile::RdbRemove& objRemove, bool asyn ) +bool iot_dbms::CRdbNetApi::remove( iot_idl::RdbRemove& objRemove, bool asyn ) { return m_pImpl->remove( objRemove, asyn ); } -bool kbd_dbms::CRdbNetApi::update( kbd_idlfile::RdbUpdate& objUpdate, bool asyn ) +bool iot_dbms::CRdbNetApi::update( iot_idl::RdbUpdate& objUpdate, bool asyn ) { return m_pImpl->update( objUpdate, asyn ); } diff --git a/platform/src/dbms/rdb_net_api/CRdbNetApiImpl.cpp b/platform/src/dbms/rdb_net_api/CRdbNetApiImpl.cpp index 8e7b63f6..04c7a2a6 100644 --- a/platform/src/dbms/rdb_net_api/CRdbNetApiImpl.cpp +++ b/platform/src/dbms/rdb_net_api/CRdbNetApiImpl.cpp @@ -9,11 +9,11 @@ #define TIMEOUT_MS 500 // lww 200 -> 500 #define RETRY_TIMES 5 -using namespace kbd_dbms; -using namespace kbd_idlfile; +using namespace iot_dbms; +using namespace iot_idl; CRdbNetApiImpl::CRdbNetApiImpl() - : kbd_public::CTimerThreadBase( "rdb_net_api CRdbNetApiImpl 内存库网络接口线程", 5 ) + : iot_public::CTimerThreadBase( "rdb_net_api CRdbNetApiImpl 内存库网络接口线程", 5 ) , m_nAppID( -1 ) , m_nDomainID( -1 ) { @@ -30,10 +30,10 @@ CRdbNetApiImpl::~CRdbNetApiImpl() if ( m_nAppID > 0 && m_nDomainID > 0 ) { - kbd_idlfile::RdbRequest objRequest; + iot_idl::RdbRequest objRequest; objRequest.set_strsessionid( m_strSessionID.c_str() ); objRequest.set_strpackageid( "" ); - kbd_net::CMbMessage objNetMsg; + iot_net::CMbMessage objNetMsg; objNetMsg.setData( objRequest.SerializeAsString() ); objNetMsg.setMsgType( MT_DBMS_RTDATA_NET_DELETECLI ); objNetMsg.setSubject( m_nAppID, CH_HMI_TO_RDB_DATA_REQ ); @@ -93,73 +93,73 @@ void CRdbNetApiImpl::execute() return; } -bool CRdbNetApiImpl::insert( kbd_idlfile::RdbInsert& objInsert, bool asyn ) +bool CRdbNetApiImpl::insert( iot_idl::RdbInsert& objInsert, bool asyn ) { LOGTRACE( "!@# CRdbNetApiImpl::insert processId:%ld threadId:%ld", (long)GETPROCESSID(), (long)GETTHREADID() ); - kbd_idlfile::RdbRequest objRequest; - kbd_idlfile::RdbInsert* pObjInsert = objRequest.mutable_msginsert(); + iot_idl::RdbRequest objRequest; + iot_idl::RdbInsert* pObjInsert = objRequest.mutable_msginsert(); *pObjInsert = objInsert; - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; return request( objRequest, objRet, asyn ); } -bool CRdbNetApiImpl::remove( kbd_idlfile::RdbRemove& objRemove, bool asyn ) +bool CRdbNetApiImpl::remove( iot_idl::RdbRemove& objRemove, bool asyn ) { LOGTRACE( "!@# CRdbNetApiImpl::remove processId:%ld threadId:%ld", (long)GETPROCESSID(), (long)GETTHREADID() ); - kbd_idlfile::RdbRequest objRequest; - kbd_idlfile::RdbRemove* pRemove = objRequest.mutable_msgremove(); + iot_idl::RdbRequest objRequest; + iot_idl::RdbRemove* pRemove = objRequest.mutable_msgremove(); *pRemove = objRemove; - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; return request( objRequest, objRet, asyn ); } -bool CRdbNetApiImpl::update( kbd_idlfile::RdbUpdate& objUpdate, bool asyn ) +bool CRdbNetApiImpl::update( iot_idl::RdbUpdate& objUpdate, bool asyn ) { LOGTRACE( "!@# CRdbNetApiImpl::update processId:%ld threadId:%ld", (long)GETPROCESSID(), (long)GETTHREADID() ); - kbd_idlfile::RdbRequest objRequest; - kbd_idlfile::RdbUpdate* pUpdate = objRequest.mutable_msgupdate(); + iot_idl::RdbRequest objRequest; + iot_idl::RdbUpdate* pUpdate = objRequest.mutable_msgupdate(); *pUpdate = objUpdate; - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; return request( objRequest, objRet, asyn ); } -bool CRdbNetApiImpl::query( kbd_idlfile::RdbQuery& objQuery, kbd_idlfile::RdbRet& objRet, bool asyn ) +bool CRdbNetApiImpl::query( iot_idl::RdbQuery& objQuery, iot_idl::RdbRet& objRet, bool asyn ) { LOGTRACE( "!@# CRdbNetApiImpl::query processId:%ld threadId:%ld", (long)GETPROCESSID(), (long)GETTHREADID() ); - kbd_idlfile::RdbRequest objRequest; - kbd_idlfile::RdbQuery* pQuery = objRequest.mutable_msgquery(); + iot_idl::RdbRequest objRequest; + iot_idl::RdbQuery* pQuery = objRequest.mutable_msgquery(); *pQuery = objQuery; return request( objRequest, objRet, asyn ); } -bool CRdbNetApiImpl::queryByKey( const std::string& sTable, const std::string& sKey, const std::string& sColumn, kbd_idlfile::RdbRet& objRet, bool asyn ) +bool CRdbNetApiImpl::queryByKey( const std::string& sTable, const std::string& sKey, const std::string& sColumn, iot_idl::RdbRet& objRet, bool asyn ) { LOGTRACE( "!@# CRdbNetApiImpl::queryByKey processId:%ld threadId:%ld", (long)GETPROCESSID(), (long)GETTHREADID() ); if ( sTable == "" || sKey=="" || sColumn=="" ) return false; - kbd_idlfile::RdbRequest objRequest; - kbd_idlfile::RdbQuery* pQuery = objRequest.mutable_msgquery(); + iot_idl::RdbRequest objRequest; + iot_idl::RdbQuery* pQuery = objRequest.mutable_msgquery(); pQuery->set_strtablename( "!"+sTable );//以"!"开始表示以主键查询 *(pQuery->add_strordercolnamearr()) = sKey; *(pQuery->add_strselectcolnamearr()) = sColumn; return request( objRequest, objRet, asyn ); } -bool CRdbNetApiImpl::queryByKey( const std::string& sTable, const std::vector& vecKey, const std::vector& vecColumn, kbd_idlfile::RdbRet& objRet, bool asyn ) +bool CRdbNetApiImpl::queryByKey( const std::string& sTable, const std::vector& vecKey, const std::vector& vecColumn, iot_idl::RdbRet& objRet, bool asyn ) { LOGTRACE( "!@# CRdbNetApiImpl::queryByKey processId:%ld threadId:%ld", (long)GETPROCESSID(), (long)GETTHREADID() ); if ( sTable == "" || vecKey.size()<=0 || vecColumn.size()<=0 ) return false; - kbd_idlfile::RdbRequest objRequest; - kbd_idlfile::RdbQuery* pQuery = objRequest.mutable_msgquery(); + iot_idl::RdbRequest objRequest; + iot_idl::RdbQuery* pQuery = objRequest.mutable_msgquery(); pQuery->set_strtablename( "!"+sTable );//以"!"开始表示以主键查询 for ( size_t i=0; iadd_strordercolnamearr()) = vecKey.at(i); @@ -168,15 +168,15 @@ bool CRdbNetApiImpl::queryByKey( const std::string& sTable, const std::vector& vecColumn, kbd_idlfile::RdbRet& objRet, bool asyn, bool bSendToDomain ) +bool CRdbNetApiImpl::queryTotal( const std::string& sTable, const std::vector& vecColumn, iot_idl::RdbRet& objRet, bool asyn, bool bSendToDomain ) { LOGTRACE( "!@# CRdbNetApiImpl::queryTotal processId:%ld threadId:%ld", (long)GETPROCESSID(), (long)GETTHREADID() ); if ( sTable == ""|| vecColumn.size()<=0 ) return false; - kbd_idlfile::RdbRequest objRequest; - kbd_idlfile::RdbQuery* pQuery = objRequest.mutable_msgquery(); + iot_idl::RdbRequest objRequest; + iot_idl::RdbQuery* pQuery = objRequest.mutable_msgquery(); pQuery->set_strtablename( "@"+sTable );//以"@"开始表示查询全表 for ( size_t i=0; iadd_strselectcolnamearr()) = vecColumn.at(i); @@ -232,7 +232,7 @@ void CRdbNetApiImpl::clearAsynRequest() m_listAsyncRequest_ret.clear(); } -bool CRdbNetApiImpl::request( kbd_idlfile::RdbRequest& objRequest, kbd_idlfile::RdbRet& objRet, bool asyn, bool bSendToDomain ) +bool CRdbNetApiImpl::request( iot_idl::RdbRequest& objRequest, iot_idl::RdbRet& objRet, bool asyn, bool bSendToDomain ) { // 处理异步查询请求 if ( asyn ) @@ -261,7 +261,7 @@ bool CRdbNetApiImpl::request( kbd_idlfile::RdbRequest& objRequest, kbd_idlfile:: std::string strPackid = to_string( stUuid ); objRequest.set_strsessionid( m_strSessionID.c_str() ); - kbd_net::CMbMessage objNetMsg; + iot_net::CMbMessage objNetMsg; objRequest.set_strpackageid( strPackid ); objNetMsg.setData( objRequest.SerializeAsString() ); objNetMsg.setMsgType( MT_DBMS_RTDATA_NET_REQUEST ); @@ -286,11 +286,11 @@ bool CRdbNetApiImpl::request( kbd_idlfile::RdbRequest& objRequest, kbd_idlfile:: } //get reply - kbd_idlfile::RdbReply objReply; + iot_idl::RdbReply objReply; int i = 0; for ( ; i < RETRY_TIMES; ++i ) { - kbd_net::CMbMessage objNetMsgRecv; + iot_net::CMbMessage objNetMsgRecv; if ( false == m_com.recvMsg( objNetMsgRecv, TIMEOUT_MS ) ) { continue; @@ -331,11 +331,11 @@ bool CRdbNetApiImpl::request( kbd_idlfile::RdbRequest& objRequest, kbd_idlfile:: bool CRdbNetApiImpl::setLock( const std::string& strTableName, bool bLock, bool asyn ) { - kbd_idlfile::RdbRequest objRequest; - kbd_idlfile::RdbLockTable* objReqLock = objRequest.mutable_msglock(); + iot_idl::RdbRequest objRequest; + iot_idl::RdbLockTable* objReqLock = objRequest.mutable_msglock(); objReqLock->set_strtablename( strTableName ); objReqLock->set_block( bLock ); - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; return request( objRequest, objRet, asyn ); } @@ -345,7 +345,7 @@ void CRdbNetApiImpl::setErr( const std::string& strErr ) m_strErr = strErr; } -void kbd_dbms::CRdbNetApiImpl::connect( int nDomainID, int nAppID ) +void iot_dbms::CRdbNetApiImpl::connect( int nDomainID, int nAppID ) { m_nDomainID = nDomainID; m_nAppID = nAppID; diff --git a/platform/src/dbms/rdb_net_api/CRdbNetApiImpl.h b/platform/src/dbms/rdb_net_api/CRdbNetApiImpl.h index a1572119..3396bc29 100644 --- a/platform/src/dbms/rdb_net_api/CRdbNetApiImpl.h +++ b/platform/src/dbms/rdb_net_api/CRdbNetApiImpl.h @@ -8,18 +8,18 @@ #define CN_ASYNCREQUEST_MAX 1000 // 最大异步请求个数 -namespace kbd_dbms +namespace iot_dbms { // 异步请求结构体 struct SAsyncRequest { volatile bool m_bLastRet; - kbd_idlfile::RdbRequest m_objRequest; //异步接口使用，保存异步的请求 - kbd_idlfile::RdbRet m_objRet; //异步接口使用，返回异步请求的结果 + iot_idl::RdbRequest m_objRequest; //异步接口使用，保存异步的请求 + iot_idl::RdbRet m_objRet; //异步接口使用，返回异步请求的结果 }; -class CRdbNetApiImpl : public kbd_public::CTimerThreadBase +class CRdbNetApiImpl : public iot_public::CTimerThreadBase { public: CRdbNetApiImpl(); @@ -28,19 +28,19 @@ public: void execute(); void connect( int nDomainID, int nAppID ); - bool insert( kbd_idlfile::RdbInsert& objInsert, bool asyn = false ); - bool remove( kbd_idlfile::RdbRemove& objRemove, bool asyn = false ); - bool update( kbd_idlfile::RdbUpdate& objUpdate, bool asyn = false ); + bool insert( iot_idl::RdbInsert& objInsert, bool asyn = false ); + bool remove( iot_idl::RdbRemove& objRemove, bool asyn = false ); + bool update( iot_idl::RdbUpdate& objUpdate, bool asyn = false ); /** * @objReply msgrecord成员是结果集 * @return true查询成功，false失败 */ - bool query( kbd_idlfile::RdbQuery& objQuery, kbd_idlfile::RdbRet& objRet, bool asyn = false ); - bool queryByKey( const std::string& sTable, const std::string& sKey, const std::string& sColumn, kbd_idlfile::RdbRet& objRet, bool asyn = false ); - bool queryByKey( const std::string& sTable, const std::vector& vecKey, const std::vector& vecColumn, kbd_idlfile::RdbRet& objRet, bool asyn = false ); - bool queryTotal( const std::string& sTable, const std::vector& vecColumn, kbd_idlfile::RdbRet& objRet, bool asyn = false, bool bSendToDomain = true ); + bool query( iot_idl::RdbQuery& objQuery, iot_idl::RdbRet& objRet, bool asyn = false ); + bool queryByKey( const std::string& sTable, const std::string& sKey, const std::string& sColumn, iot_idl::RdbRet& objRet, bool asyn = false ); + bool queryByKey( const std::string& sTable, const std::vector& vecKey, const std::vector& vecColumn, iot_idl::RdbRet& objRet, bool asyn = false ); + bool queryTotal( const std::string& sTable, const std::vector& vecColumn, iot_idl::RdbRet& objRet, bool asyn = false, bool bSendToDomain = true ); - bool getRet( kbd_idlfile::RdbRet* const objRet = NULL ); + bool getRet( iot_idl::RdbRet* const objRet = NULL ); bool checkStatus(); //true 已经有结果 bool lock( const std::string& strTableName, bool asyn = false ); @@ -50,13 +50,13 @@ public: void clearAsynRequest(); private: - bool request( kbd_idlfile::RdbRequest& objRequest, kbd_idlfile::RdbRet& objReply, bool asyn, bool bSendToDomain = true ); + bool request( iot_idl::RdbRequest& objRequest, iot_idl::RdbRet& objReply, bool asyn, bool bSendToDomain = true ); void setErr( const std::string& strErr ); bool setLock( const std::string& strTableName, bool bLock, bool asyn ); private: std::string m_strSessionID; - kbd_net::CMbCommunicator m_com; + iot_net::CMbCommunicator m_com; int m_nAppID; int m_nDomainID; std::string m_strErr; diff --git a/platform/src/dbms/rdb_server/CRdbNetService.cpp b/platform/src/dbms/rdb_server/CRdbNetService.cpp index a0ee12a5..a5d5ad19 100644 --- a/platform/src/dbms/rdb_server/CRdbNetService.cpp +++ b/platform/src/dbms/rdb_server/CRdbNetService.cpp @@ -4,9 +4,9 @@ #include using namespace std; -using namespace kbd_net; -using namespace kbd_dbms; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_dbms; +using namespace iot_idl; CRdbNetService::CRdbNetService( const string& strSessionID, int nAppID ) { diff --git a/platform/src/dbms/rdb_server/CRdbNetService.h b/platform/src/dbms/rdb_server/CRdbNetService.h index 5ee28000..46f95be7 100644 --- a/platform/src/dbms/rdb_server/CRdbNetService.h +++ b/platform/src/dbms/rdb_server/CRdbNetService.h @@ -6,7 +6,7 @@ #include "RdbServerMessage.pb.h" #include "net/net_msg_bus_api/CMbCommunicator.h" -typedef boost::shared_ptr CMbMessagePtr; +typedef boost::shared_ptr CMbMessagePtr; /** * 为网络查询封装实时库操作。optimize:继承线程类 @@ -18,21 +18,21 @@ public: ~CRdbNetService(); public: - void deal( const CMbMessagePtr netMsgPtr, const kbd_idlfile::RdbRequest& msgRequest ); + void deal( const CMbMessagePtr netMsgPtr, const iot_idl::RdbRequest& msgRequest ); private: - void dealSelect( const kbd_idlfile::RdbQuery& msgQurey, kbd_idlfile::RdbRet* pMsgRet ); - void dealInsert( const kbd_idlfile::RdbInsert& msgInsert, kbd_idlfile::RdbRet* pMsgRet ); - void dealRemove( const kbd_idlfile::RdbRemove& msgRemove, kbd_idlfile::RdbRet* pMsgRet ); - void dealUpdate( const kbd_idlfile::RdbUpdate& msgUpdate, kbd_idlfile::RdbRet* pMsgRet ); - void dealLock( const kbd_idlfile::RdbLockTable& msgLock, kbd_idlfile::RdbRet* pMsgRet ); - kbd_dbms::CRdbAccessEx& getAccess( const std::string& strTableName ); + void dealSelect( const iot_idl::RdbQuery& msgQurey, iot_idl::RdbRet* pMsgRet ); + void dealInsert( const iot_idl::RdbInsert& msgInsert, iot_idl::RdbRet* pMsgRet ); + void dealRemove( const iot_idl::RdbRemove& msgRemove, iot_idl::RdbRet* pMsgRet ); + void dealUpdate( const iot_idl::RdbUpdate& msgUpdate, iot_idl::RdbRet* pMsgRet ); + void dealLock( const iot_idl::RdbLockTable& msgLock, iot_idl::RdbRet* pMsgRet ); + iot_dbms::CRdbAccessEx& getAccess( const std::string& strTableName ); private: std::string m_strSessionID; int m_nAppID; - kbd_net::CMbCommunicator m_objMbComm; - std::map m_mapTable2Access; + iot_net::CMbCommunicator m_objMbComm; + std::map m_mapTable2Access; }; typedef boost::shared_ptr CRdbNetClientPtr; diff --git a/platform/src/dbms/rdb_server/CRdbRedundant.cpp b/platform/src/dbms/rdb_server/CRdbRedundant.cpp index 4e5a784b..c88d9534 100644 --- a/platform/src/dbms/rdb_server/CRdbRedundant.cpp +++ b/platform/src/dbms/rdb_server/CRdbRedundant.cpp @@ -11,8 +11,8 @@ int CRdbRedundant::redundantSwitch(bool bMaster, bool bSlave) bool CRdbRedundant::initSwitch(int nAppId) { - kbd_dbms::CRdbConfigMan objConfigMan(nAppId); - m_pShmRdbConfig = (kbd_dbms::SRdbConfig*)objConfigMan.getConfigAddr(); + iot_dbms::CRdbConfigMan objConfigMan(nAppId); + m_pShmRdbConfig = (iot_dbms::SRdbConfig*)objConfigMan.getConfigAddr(); if (NULL == m_pShmRdbConfig) { return false; @@ -41,7 +41,7 @@ bool CRdbRedundant::setStatus(bool bMaster /*= true*/) return true; } -void CRdbRedundant::bindProcMng(kbd_sys::CProcMngInterfacePtr ptrProcMng) +void CRdbRedundant::bindProcMng(iot_sys::CProcMngInterfacePtr ptrProcMng) { m_ptrProcMng = ptrProcMng; } diff --git a/platform/src/dbms/rdb_server/CRdbRedundant.h b/platform/src/dbms/rdb_server/CRdbRedundant.h index f85e4a45..20450602 100644 --- a/platform/src/dbms/rdb_server/CRdbRedundant.h +++ b/platform/src/dbms/rdb_server/CRdbRedundant.h @@ -4,7 +4,7 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "rdb_api/RdbMemMan.h" -class CRdbRedundant: public kbd_sys::CRedundantSwitchInterface +class CRdbRedundant: public iot_sys::CRedundantSwitchInterface { public: CRdbRedundant():m_pShmRdbConfig(NULL) {} @@ -17,11 +17,11 @@ public: bool bSlave() const; void setBSlave(bool bSlave); - void bindProcMng(kbd_sys::CProcMngInterfacePtr ptrProcMng); + void bindProcMng(iot_sys::CProcMngInterfacePtr ptrProcMng); bool setStatus(bool bMaster = true); private: - kbd_dbms::SRdbConfig *m_pShmRdbConfig; - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; + iot_dbms::SRdbConfig *m_pShmRdbConfig; + iot_sys::CProcMngInterfacePtr m_ptrProcMng; }; #endif // CRDBREDUNDANT_H diff --git a/platform/src/dbms/rdb_server/CRdbService.cpp b/platform/src/dbms/rdb_server/CRdbService.cpp index c3c7534a..c1f2ca81 100644 --- a/platform/src/dbms/rdb_server/CRdbService.cpp +++ b/platform/src/dbms/rdb_server/CRdbService.cpp @@ -13,11 +13,11 @@ #define OPT_DESC_HELP "help" using namespace std; -using namespace kbd_net; -using namespace kbd_sys; -using namespace kbd_public; -using namespace kbd_dbms; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_sys; +using namespace iot_public; +using namespace iot_dbms; +using namespace iot_idl; CRdbService::CRdbService() { @@ -101,7 +101,7 @@ bool CRdbService::isAlreadyRunning( std::string strProcessName ) m_strInstName += " -a "; m_strInstName += m_strAppName; - return kbd_public::CSingleProcInstance::hasInstanceRunning( m_strInstName ); + return iot_public::CSingleProcInstance::hasInstanceRunning( m_strInstName ); } bool CRdbService::loadAppDb() diff --git a/platform/src/dbms/rdb_server/CRdbService.h b/platform/src/dbms/rdb_server/CRdbService.h index a12f8f75..11dc0b1f 100644 --- a/platform/src/dbms/rdb_server/CRdbService.h +++ b/platform/src/dbms/rdb_server/CRdbService.h @@ -15,7 +15,7 @@ /** * @brief The CRdbService class ： 服务线程，包含多个工作线程，进程管理，服务管理，冗余管理。。。都在这个类实现。 */ -class CRdbService : public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface +class CRdbService : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CRdbService(); @@ -39,7 +39,7 @@ public: private: //进程系统信息 std::string m_strStartArgs; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; std::string m_strAppName; std::string m_strProcessName; std::string m_strInstName; @@ -51,9 +51,9 @@ private: private: //管理进程指针 - kbd_sys::CProcMngInterfacePtr m_ptrProcManage; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; - kbd_dbms::CRedundantSwitchPtr m_ptrRedundantSwitch; + iot_sys::CProcMngInterfacePtr m_ptrProcManage; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_dbms::CRedundantSwitchPtr m_ptrRedundantSwitch; public: /** diff --git a/platform/src/dbms/rdb_server/CRdbServiceThread.cpp b/platform/src/dbms/rdb_server/CRdbServiceThread.cpp index 9294b34d..943047b8 100644 --- a/platform/src/dbms/rdb_server/CRdbServiceThread.cpp +++ b/platform/src/dbms/rdb_server/CRdbServiceThread.cpp @@ -7,7 +7,7 @@ #include "rdb_api/FuncForNet.h" #include "boost/shared_ptr.hpp" -CRdbServiceThread::CRdbServiceThread( const kbd_public::SRunAppInfo& stAppInfo ) +CRdbServiceThread::CRdbServiceThread( const iot_public::SRunAppInfo& stAppInfo ) : CTimerThreadBase( "rdb_server CRdbServiceThread 内存库服务线程", 0 ) { m_stAppInfo = stAppInfo; @@ -20,7 +20,7 @@ CRdbServiceThread::~CRdbServiceThread() //int CRdbServiceThread::beforeExecute() //{ -// using namespace kbd_net; +// using namespace iot_net; // m_objMbCommREQ.recvMsg(m_objRequest); // return kbdSuccess; //} @@ -28,8 +28,8 @@ CRdbServiceThread::~CRdbServiceThread() void CRdbServiceThread::execute() { //暂时只处理一个 - using namespace kbd_net; - typedef boost::shared_ptr CMbMessagePtr; + using namespace iot_net; + typedef boost::shared_ptr CMbMessagePtr; CMbMessagePtr netMsgPtr = boost::make_shared(); if ( m_objMbComm.recvMsg( *netMsgPtr, 100 ) == false ) { @@ -69,7 +69,7 @@ void CRdbServiceThread::execute() setErr( "Msg:appID not match." ); return; } - kbd_idlfile::RdbRequest msgRequest; //这里不解直接用，用两个参数 + iot_idl::RdbRequest msgRequest; //这里不解直接用，用两个参数 if ( msgRequest.ParseFromArray( netMsgPtr->getDataPtr(), (int)netMsgPtr->getDataSize() ) != true ) { setErr( "实时库消息反序列化失败！" ); @@ -101,7 +101,7 @@ void CRdbServiceThread::newClient( const std::string& strSessionID ) void CRdbServiceThread::beforeQuit() { - using namespace kbd_dbms; + using namespace iot_dbms; // CRdbMngIntereface objMng; // objMng.deleteAppDbShm(m_stAppInfo.strAppName); m_objMbComm.delSub( m_stAppInfo.nAppId, CH_HMI_TO_RDB_DATA_REQ ); @@ -118,7 +118,7 @@ void CRdbServiceThread::afterSuspend() m_objMbComm.delSub( m_stAppInfo.nAppId, CH_HMI_TO_RDB_DATA_REQ ); //取消注册通道 //备状态 删除多于数据 - //kbd_net::CMbMessage objRecvMessage; + //iot_net::CMbMessage objRecvMessage; //while (m_objMbComm.recvMsg(objRecvMessage,10)); //清除总线缓存数据 std::cout << "CRdbServiceThread::Thread afterSuspend" << std::endl; diff --git a/platform/src/dbms/rdb_server/CRdbServiceThread.h b/platform/src/dbms/rdb_server/CRdbServiceThread.h index d12beb19..b0b689d8 100644 --- a/platform/src/dbms/rdb_server/CRdbServiceThread.h +++ b/platform/src/dbms/rdb_server/CRdbServiceThread.h @@ -13,10 +13,10 @@ /** * @brief The CRdbServiceThread class */ -class CRdbServiceThread : public kbd_public::CTimerThreadBase +class CRdbServiceThread : public iot_public::CTimerThreadBase { public: - CRdbServiceThread( const kbd_public::SRunAppInfo& stAppInfo ); + CRdbServiceThread( const iot_public::SRunAppInfo& stAppInfo ); ~CRdbServiceThread(); public: @@ -32,8 +32,8 @@ private: private: std::map m_mapSessionID2Service; - kbd_public::SRunAppInfo m_stAppInfo; - kbd_net::CMbCommunicator m_objMbComm; + iot_public::SRunAppInfo m_stAppInfo; + iot_net::CMbCommunicator m_objMbComm; std::string m_strErr; }; diff --git a/platform/src/dbms/rdb_server/CRdbSynClient.cpp b/platform/src/dbms/rdb_server/CRdbSynClient.cpp index 530d0381..8d729aba 100644 --- a/platform/src/dbms/rdb_server/CRdbSynClient.cpp +++ b/platform/src/dbms/rdb_server/CRdbSynClient.cpp @@ -4,8 +4,8 @@ #include "public/pub_utility_api/TimeUtil.h" using namespace std; -using namespace kbd_idlfile; -using namespace kbd_dbms; +using namespace iot_idl; +using namespace iot_dbms; CRdbSynClient::CRdbSynClient( const std::string& strSessionID, int nAppID ) { @@ -45,7 +45,7 @@ void CRdbSynClient::dealSnapSync( CMbMessagePtr netMsg ) LOGERROR( "open table failed. app id %d, table name %s", m_nAppID, objReplace.strtablename().c_str() ); } - int64 nStartTime = kbd_public::getUTCTimeMsec(); + int64 nStartTime = iot_public::getUTCTimeMsec(); //LOGERROR( "dealSnapSync msgtype[%d] appid[%d] table[%s]",netMsg->getMsgType(), m_nAppID,objReplace.strtablename().c_str()); string strErr = ""; @@ -99,7 +99,7 @@ void CRdbSynClient::dealSnapSync( CMbMessagePtr netMsg ) } } - int64 nEndTime = kbd_public::getUTCTimeMsec(); + int64 nEndTime = iot_public::getUTCTimeMsec(); LOGTRACE("处理同步条数：%d，用时(ms)：%lld",nRecord,(long long)(nEndTime-nStartTime)); } diff --git a/platform/src/dbms/rdb_server/CRdbSynClient.h b/platform/src/dbms/rdb_server/CRdbSynClient.h index 9bc1cf5b..d8c87ea3 100644 --- a/platform/src/dbms/rdb_server/CRdbSynClient.h +++ b/platform/src/dbms/rdb_server/CRdbSynClient.h @@ -7,7 +7,7 @@ #include "RdbServerMessage.pb.h" #include "net/net_msg_bus_api/CMbCommunicator.h" -typedef boost::shared_ptr CMbMessagePtr; +typedef boost::shared_ptr CMbMessagePtr; /** * @brief The CRdbSynClient class : 处理实时库同步消息 @@ -26,7 +26,7 @@ public: private: std::string m_strSessionID; int m_nAppID; - kbd_dbms::CRdbAccessEx m_objAccessEx; + iot_dbms::CRdbAccessEx m_objAccessEx; }; #endif // CRTDBSYNCLIENT_H diff --git a/platform/src/dbms/rdb_server/CRdbSynThread.cpp b/platform/src/dbms/rdb_server/CRdbSynThread.cpp index 43b0e249..915be07f 100644 --- a/platform/src/dbms/rdb_server/CRdbSynThread.cpp +++ b/platform/src/dbms/rdb_server/CRdbSynThread.cpp @@ -14,12 +14,12 @@ #define RET_SUCCESS 0 using namespace std; -using namespace kbd_net; -using namespace kbd_dbms; -using namespace kbd_idlfile; -using namespace kbd_public; +using namespace iot_net; +using namespace iot_dbms; +using namespace iot_idl; +using namespace iot_public; -CRdbSynThread::CRdbSynThread( const kbd_public::SRunAppInfo& stAppInfo ) +CRdbSynThread::CRdbSynThread( const iot_public::SRunAppInfo& stAppInfo ) : CTimerThreadBase( "rdb_server CRdbSynThread 内存库同步线程", 0 ) , m_bMaster( false ) , m_bSlave( false ) @@ -264,7 +264,7 @@ void CRdbSynThread::dealMessage() } } -void CRdbSynThread::dealSubscribeMessage( kbd_net::CMbMessage& oSrcMsg ) +void CRdbSynThread::dealSubscribeMessage( iot_net::CMbMessage& oSrcMsg ) { int nMsgType = oSrcMsg.getMsgType(); LOGERROR( "receive message in channel CH_SUB_CHGSRV_TO_RDBSRV" ); @@ -544,7 +544,7 @@ void CRdbSynThread::checkChangeData() } } -bool CRdbSynThread::getValueFromRtdb( std::string& sTable, std::string& sKey, std::string& sColumn, kbd_dbms::CVarType& oValue ) +bool CRdbSynThread::getValueFromRtdb( std::string& sTable, std::string& sKey, std::string& sColumn, iot_dbms::CVarType& oValue ) { CRdbLocalTable* pRdbLocalTable = getRdbLocalTablePtr( sTable.c_str() ); if ( pRdbLocalTable == NULL ) @@ -561,7 +561,7 @@ bool CRdbSynThread::getValueFromRtdb( std::string& sTable, std::string& sKey, st return false; } -void CRdbSynThread::sendChangeData( std::string& sTable, std::string& sKey, std::string& sColumn, kbd_dbms::CVarType& oValue ) +void CRdbSynThread::sendChangeData( std::string& sTable, std::string& sKey, std::string& sColumn, iot_dbms::CVarType& oValue ) { SPointInfo oPointInfo; oPointInfo.nDomainId = m_stAppInfo.nDomainId; @@ -864,11 +864,11 @@ void CRdbSynThread::sendValueTableData() } } -kbd_dbms::CRdbLocalTable* CRdbSynThread::getRdbLocalTablePtr( const char* cTableName ) +iot_dbms::CRdbLocalTable* CRdbSynThread::getRdbLocalTablePtr( const char* cTableName ) { CRdbLocalTable* pRet = NULL; std::string sTableName(cTableName); - std::map::iterator it = m_mapRdbLocalTable.find( sTableName ); + std::map::iterator it = m_mapRdbLocalTable.find( sTableName ); if ( it == m_mapRdbLocalTable.end() ) { CRdbLocalTable* pTmp = new CRdbLocalTable( m_stAppInfo.nAppId ); diff --git a/platform/src/dbms/rdb_server/CRdbSynThread.h b/platform/src/dbms/rdb_server/CRdbSynThread.h index 3494a361..cd26819a 100644 --- a/platform/src/dbms/rdb_server/CRdbSynThread.h +++ b/platform/src/dbms/rdb_server/CRdbSynThread.h @@ -17,10 +17,10 @@ class CSubscribeEngine; -class CRdbSynThread : public kbd_public::CTimerThreadBase +class CRdbSynThread : public iot_public::CTimerThreadBase { public: - CRdbSynThread( const kbd_public::SRunAppInfo& stAppInfo ); + CRdbSynThread( const iot_public::SRunAppInfo& stAppInfo ); ~CRdbSynThread(); public: @@ -29,7 +29,7 @@ public: void afterSuspend(); void setRedundantStatus( bool bMaster, bool bSlave ); void checkChangeData(); // 检查变化数据 - void sendSnapData( kbd_net::CMbMessage& oSrcMsg ); // 同步快照数据 + void sendSnapData( iot_net::CMbMessage& oSrcMsg ); // 同步快照数据 void sendOneTableSnapData(); // 同步单表数据快照 void sendValueTableData(); // 同步内存数据表 void clearAllSynNote(); // 清空变化记录缓冲区，即将读写序号全置0 @@ -37,30 +37,30 @@ public: void sendFirstSnapRequest(); // 发送第一次快照请求 void sendSnapRequest(); // 发送快照请求 void dealMessage(); // 处理消息 - void dealSubscribeMessage( kbd_net::CMbMessage& oSrcMsg ); // 处理订阅消息 + void dealSubscribeMessage( iot_net::CMbMessage& oSrcMsg ); // 处理订阅消息 void checkSubscribe(); // 检查订阅相关 int getNextSynIndex(); // 获取下一个同步序号 int getCurrentSynIndex(); // 获取当前同步序号 void setSynIndex( int nSynIndex );// 设置同步序号 - bool getValueFromRtdb( std::string& sTable, std::string& sKey, std::string& sColumn, kbd_dbms::CVarType& oValue ); - void sendChangeData( std::string& sTable, std::string& sKey, std::string& sColumn, kbd_dbms::CVarType& oValue ); + bool getValueFromRtdb( std::string& sTable, std::string& sKey, std::string& sColumn, iot_dbms::CVarType& oValue ); + void sendChangeData( std::string& sTable, std::string& sKey, std::string& sColumn, iot_dbms::CVarType& oValue ); void sendSubscribeData(); - kbd_dbms::CRdbLocalTable* getRdbLocalTablePtr( const char* cTableName ); + iot_dbms::CRdbLocalTable* getRdbLocalTablePtr( const char* cTableName ); private: bool m_bMaster; // 是否为主 bool m_bSlave; // 是否为备 - kbd_public::SRunAppInfo m_stAppInfo; // 进程运行常用信息 - kbd_dbms::CRdbDictionary m_objDictionary; // 所有表属性的管理对象 -// kbd_dbms::SRdbConfig* m_shmRdbConfig; - kbd_net::CMbCommunicator m_objCommunicator; // 消息总线通讯器 + iot_public::SRunAppInfo m_stAppInfo; // 进程运行常用信息 + iot_dbms::CRdbDictionary m_objDictionary; // 所有表属性的管理对象 +// iot_dbms::SRdbConfig* m_shmRdbConfig; + iot_net::CMbCommunicator m_objCommunicator; // 消息总线通讯器 CRdbSynClient m_objSynClient; // 备rdb_server用来处理主发来的同步信息 int m_nSynIndex; // 已同步的序号 int64 m_nLastSnapSynTime; // 上次快照时间,ms CSubscribeEngine* m_pSubscribe; // 变化数据订阅关系 int64 m_nLastCheckTimeOutTime; // 上次检查订阅关系超时时间,ms int64 m_nLastSendSubscribeDataTime; // 上次发送订阅数据时间,ms - std::map m_mapRdbLocalTable;// 用于记录内存表指针，不用每次都opentable + std::map m_mapRdbLocalTable;// 用于记录内存表指针，不用每次都opentable }; typedef boost::shared_ptr CRdbSynThreadPtr; diff --git a/platform/src/dbms/rdb_server/CRdbUpdateThread.cpp b/platform/src/dbms/rdb_server/CRdbUpdateThread.cpp index a41473d3..320f0ff3 100644 --- a/platform/src/dbms/rdb_server/CRdbUpdateThread.cpp +++ b/platform/src/dbms/rdb_server/CRdbUpdateThread.cpp @@ -9,10 +9,10 @@ #include "db_sysinfo_api/CDbSysInfo.h" #include "rdb_api/CRdbAccessEx.h" -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; -CRdbUpdateThread::CRdbUpdateThread( const kbd_public::SRunAppInfo stAppInfo ) +CRdbUpdateThread::CRdbUpdateThread( const iot_public::SRunAppInfo stAppInfo ) : CTimerThreadBase( "rdb_server CRdbUpdateThread 关系数据库向内存库更新线程", 1000, 1000*60*5 ), m_objDb(DB_CONN_MODEL_READ) { @@ -50,7 +50,7 @@ int CRdbUpdateThread::initialize() LOGERROR("模型实时库同步初始化失败，createSysInfoInstance fail."); return false ; } - if(kbd_public::createSysInfoInstance(m_ptrSysInfo) == false) + if(iot_public::createSysInfoInstance(m_ptrSysInfo) == false) { LOGERROR("模型实时库同步初始化失败，createSysInfoInstance fail."); return false ; diff --git a/platform/src/dbms/rdb_server/CRdbUpdateThread.h b/platform/src/dbms/rdb_server/CRdbUpdateThread.h index 76dc5c4d..1df39ac7 100644 --- a/platform/src/dbms/rdb_server/CRdbUpdateThread.h +++ b/platform/src/dbms/rdb_server/CRdbUpdateThread.h @@ -15,10 +15,10 @@ * * @details 先调init() 之后定时调用updateRtdb() */ -class CRdbUpdateThread : public kbd_public::CTimerThreadBase +class CRdbUpdateThread : public iot_public::CTimerThreadBase { public: - CRdbUpdateThread( const kbd_public::SRunAppInfo stAppInfo ); + CRdbUpdateThread( const iot_public::SRunAppInfo stAppInfo ); ~CRdbUpdateThread(); public: @@ -37,11 +37,11 @@ private: void checkCurrentDatabaseChange();// 检查当前数据库是否变化 private: - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; - kbd_public::SRunAppInfo m_stAppInfo; + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_public::SRunAppInfo m_stAppInfo; //std::map m_mapAppId2Info; uint64* m_ulAppShmIdAddr; - kbd_dbms::CDbApi m_objDb; + iot_dbms::CDbApi m_objDb; std::vector m_vecSynNote; uint64 m_ullCurId; QString m_sNodeName; diff --git a/platform/src/dbms/rdb_server/CRedundantSwitch.cpp b/platform/src/dbms/rdb_server/CRedundantSwitch.cpp index 38d27ad7..697b618b 100644 --- a/platform/src/dbms/rdb_server/CRedundantSwitch.cpp +++ b/platform/src/dbms/rdb_server/CRedundantSwitch.cpp @@ -5,10 +5,10 @@ */ #include "CRedundantSwitch.h" -using namespace kbd_dbms; -using namespace kbd_sys; +using namespace iot_dbms; +using namespace iot_sys; -CRedundantSwitch::CRedundantSwitch( kbd_sys::CProcMngInterfacePtr ptrProc ) +CRedundantSwitch::CRedundantSwitch( iot_sys::CProcMngInterfacePtr ptrProc ) { m_ptrProcManage = ptrProc; } diff --git a/platform/src/dbms/rdb_server/CRedundantSwitch.h b/platform/src/dbms/rdb_server/CRedundantSwitch.h index a34ff4b6..2d0bbd54 100644 --- a/platform/src/dbms/rdb_server/CRedundantSwitch.h +++ b/platform/src/dbms/rdb_server/CRedundantSwitch.h @@ -14,18 +14,18 @@ #include "sys_node_mng_api/NodeMngInterface.h" #include "sys_proc_mng_api/ProcMngInterface.h" -namespace kbd_dbms +namespace iot_dbms { -class CRedundantSwitch : public ::kbd_sys::CRedundantSwitchInterface +class CRedundantSwitch : public ::iot_sys::CRedundantSwitchInterface { public: - CRedundantSwitch( kbd_sys::CProcMngInterfacePtr ptrProc ); + CRedundantSwitch( iot_sys::CProcMngInterfacePtr ptrProc ); ~CRedundantSwitch(); private: - kbd_sys::CProcMngInterfacePtr m_ptrProcManage; + iot_sys::CProcMngInterfacePtr m_ptrProcManage; - std::vector > m_vectWorkThread; + std::vector > m_vectWorkThread; CRdbServiceThreadPtr m_ptrServiceThread; CRdbUpdateThreadPtr m_ptrRtdbUpdateThread; diff --git a/platform/src/dbms/rdb_studio/CMemDictionaryM.h b/platform/src/dbms/rdb_studio/CMemDictionaryM.h index f3c1282b..cf17a50b 100644 --- a/platform/src/dbms/rdb_studio/CMemDictionaryM.h +++ b/platform/src/dbms/rdb_studio/CMemDictionaryM.h @@ -4,12 +4,12 @@ #include #include -namespace kbd_dbms +namespace iot_dbms { class CRdbDictionary; } -using namespace kbd_dbms; +using namespace iot_dbms; class CMemDictionaryM { diff --git a/platform/src/dbms/rdb_studio/CMemTableM.cpp b/platform/src/dbms/rdb_studio/CMemTableM.cpp index 941ab38d..b532dfdf 100644 --- a/platform/src/dbms/rdb_studio/CMemTableM.cpp +++ b/platform/src/dbms/rdb_studio/CMemTableM.cpp @@ -1,7 +1,7 @@ #include "CMemTableM.h" #include "rdb_api/CRdbAccessEx.h" -using namespace kbd_dbms; +using namespace iot_dbms; CMemTableM::CMemTableM() { diff --git a/platform/src/dbms/rdb_studio/CMemTableM.h b/platform/src/dbms/rdb_studio/CMemTableM.h index 2820e44b..a3ebae1b 100644 --- a/platform/src/dbms/rdb_studio/CMemTableM.h +++ b/platform/src/dbms/rdb_studio/CMemTableM.h @@ -4,12 +4,12 @@ #include #include -namespace kbd_dbms +namespace iot_dbms { class CRdbAccessEx; } -using namespace kbd_dbms; +using namespace iot_dbms; class CMemTableM { diff --git a/platform/src/dbms/rdb_studio/main.cpp b/platform/src/dbms/rdb_studio/main.cpp index 97beac2c..4a35d65b 100644 --- a/platform/src/dbms/rdb_studio/main.cpp +++ b/platform/src/dbms/rdb_studio/main.cpp @@ -10,15 +10,15 @@ int main( int argc, char* argv[] ) { kbd_common::doQtAppGlobalSet(); - kbd_public::StartLogSystem( "default", "rdb_studio" ); + iot_public::StartLogSystem( "default", "rdb_studio" ); QApplication a( argc, argv ); - kbd_net::initMsgBus( "sfda", "sdfafds" ); - kbd_net::CMbCommunicator* pCom = new kbd_net::CMbCommunicator(); + iot_net::initMsgBus( "sfda", "sdfafds" ); + iot_net::CMbCommunicator* pCom = new iot_net::CMbCommunicator(); delete pCom; - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); MainWindow w; w.show(); int nRet = a.exec(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return nRet; } diff --git a/platform/src/dbms/rdb_studio/mainwindow.h b/platform/src/dbms/rdb_studio/mainwindow.h index edfcc8d1..6b1fdb9c 100644 --- a/platform/src/dbms/rdb_studio/mainwindow.h +++ b/platform/src/dbms/rdb_studio/mainwindow.h @@ -18,8 +18,8 @@ class KbdTable; class KbdTreeView; using namespace std; -using namespace kbd_dbms; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_public; class MainWindow : public QMainWindow { diff --git a/platform/src/dbms/tsdb_api/CTsdbConn.cpp b/platform/src/dbms/tsdb_api/CTsdbConn.cpp index 255a3d97..2e89ec53 100644 --- a/platform/src/dbms/tsdb_api/CTsdbConn.cpp +++ b/platform/src/dbms/tsdb_api/CTsdbConn.cpp @@ -11,7 +11,7 @@ #include "tsdb_api/CTsdbConn.h" -namespace kbd_dbms +namespace iot_dbms { CTsdbConn::CTsdbConn(const char *pchHost, int nPort, const char *pchDb, @@ -54,5 +54,5 @@ bool CTsdbConn::doQuery(const char *pchQuery, std::string *pstrResult, int nTime } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_api/CTsdbConnImp.cpp b/platform/src/dbms/tsdb_api/CTsdbConnImp.cpp index e2caf5b4..26f1081f 100644 --- a/platform/src/dbms/tsdb_api/CTsdbConnImp.cpp +++ b/platform/src/dbms/tsdb_api/CTsdbConnImp.cpp @@ -16,7 +16,7 @@ #include "CTsdbConnImp.h" -namespace kbd_dbms +namespace iot_dbms { extern volatile bool g_bTsdbApiInited; @@ -497,5 +497,5 @@ bool CTsdbConnImp::doHttpGet(const char *pchUrl, const char *pchBody, } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_api/CTsdbConnImp.h b/platform/src/dbms/tsdb_api/CTsdbConnImp.h index 0b3e4bba..85bb809d 100644 --- a/platform/src/dbms/tsdb_api/CTsdbConnImp.h +++ b/platform/src/dbms/tsdb_api/CTsdbConnImp.h @@ -14,7 +14,7 @@ #include "boost/thread/mutex.hpp" #include "curl/curl.h" -namespace kbd_dbms +namespace iot_dbms { class CTsdbConnImp @@ -71,5 +71,5 @@ private: }; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_api/TsdbApi.cpp b/platform/src/dbms/tsdb_api/TsdbApi.cpp index b5ca75ca..37f553c7 100644 --- a/platform/src/dbms/tsdb_api/TsdbApi.cpp +++ b/platform/src/dbms/tsdb_api/TsdbApi.cpp @@ -13,7 +13,7 @@ #include "tsdb_api/TsdbApi.h" -namespace kbd_dbms +namespace iot_dbms { volatile bool g_bTsdbApiInited = false; @@ -63,7 +63,7 @@ CTsdbConnPtr getOneUseableConn(bool bLocalDomain) return ptrConn; } - kbd_public::CSysInfoInterfacePtr ptrSysInfo; + iot_public::CSysInfoInterfacePtr ptrSysInfo; if (!createSysInfoInstance(ptrSysInfo)) { LOGERROR("createSysInfoInstance() failed , return NULL !"); @@ -71,7 +71,7 @@ CTsdbConnPtr getOneUseableConn(bool bLocalDomain) } //< 本机节点信息 - kbd_public::SNodeInfo stLocalNodeInfo; + iot_public::SNodeInfo stLocalNodeInfo; int nRc = ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo); if (kbdSuccess != nRc) { @@ -80,9 +80,9 @@ CTsdbConnPtr getOneUseableConn(bool bLocalDomain) } //< 本地域数据库连接信息 - kbd_public::SDatabaseInfo stFirstDbInfo; - std::vector vecLocalDbInfo; - std::vector vecRemoteDbInfo; + iot_public::SDatabaseInfo stFirstDbInfo; + std::vector vecLocalDbInfo; + std::vector vecRemoteDbInfo; nRc = ptrSysInfo->getDBInfoByDomainId(stLocalNodeInfo.nDomainId, stFirstDbInfo, vecLocalDbInfo, vecRemoteDbInfo); if (kbdSuccess != nRc) @@ -92,7 +92,7 @@ CTsdbConnPtr getOneUseableConn(bool bLocalDomain) } //< 选择获取本地域还是远程域 - const std::vector *pvecDbToCheck = NULL; + const std::vector *pvecDbToCheck = NULL; if (bLocalDomain) { pvecDbToCheck = &vecLocalDbInfo; @@ -105,7 +105,7 @@ CTsdbConnPtr getOneUseableConn(bool bLocalDomain) //< 测试是否可连接 for (size_t nDbInfoIndex = 0; nDbInfoIndex < pvecDbToCheck->size(); nDbInfoIndex++) { - kbd_public::SNodeInfo stNodeInfoToCheck; + iot_public::SNodeInfo stNodeInfoToCheck; nRc = ptrSysInfo->getNodeInfoByName((*pvecDbToCheck)[nDbInfoIndex].strNodeName, stNodeInfoToCheck); if (kbdSuccess != nRc) @@ -165,5 +165,5 @@ bool releaseTsdbApi() return true; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_api/test/tsdb_api_test/main.cpp b/platform/src/dbms/tsdb_api/test/tsdb_api_test/main.cpp index d30c472e..a1c67533 100644 --- a/platform/src/dbms/tsdb_api/test/tsdb_api_test/main.cpp +++ b/platform/src/dbms/tsdb_api/test/tsdb_api_test/main.cpp @@ -12,7 +12,7 @@ const int nLoopCntBig = 10; //< 小循环次数 const int nLoopCntSmall = 100; -static bool fillAiSample(kbd_dbms::CTsdbConnPtr ptrConn) +static bool fillAiSample(iot_dbms::CTsdbConnPtr ptrConn) { const char *pszTagName = "ai.a1.b2.c3"; @@ -59,7 +59,7 @@ static bool fillAiSample(kbd_dbms::CTsdbConnPtr ptrConn) void tsdb_api_test() { LOGINFO("\n\n******** Test initTsdbApi() ********"); - if (!kbd_dbms::initTsdbApi()) + if (!iot_dbms::initTsdbApi()) { LOGERROR("initTsdbApi() failed !"); } @@ -67,7 +67,7 @@ void tsdb_api_test() { LOGINFO("\n\n******** Test getOneUseableConn() ********"); - kbd_dbms::CTsdbConnPtr ptrConn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr ptrConn = iot_dbms::getOneUseableConn(true); if (!ptrConn) { LOGINFO("getOneUseableConn() return NULL !") @@ -76,7 +76,7 @@ void tsdb_api_test() //< 不使用getOneUseableConn()返回的正式库测试 - ptrConn.reset(new kbd_dbms::CTsdbConn("127.0.0.1", -1, "ykn_test", "", "")); + ptrConn.reset(new iot_dbms::CTsdbConn("127.0.0.1", -1, "ykn_test", "", "")); LOGINFO("\n\n******** Test pingServer() ********"); if (!ptrConn->pingServer(1000)) @@ -141,7 +141,7 @@ void tsdb_api_test() } LOGINFO("\n\n******** Test releaseTsdbApi() ********"); - if (!kbd_dbms::releaseTsdbApi()) + if (!iot_dbms::releaseTsdbApi()) { LOGINFO("releaseTsdbApi() failed !"); } @@ -151,12 +151,12 @@ void tsdb_api_test() int main(/*int argc, char *argv[]*/) { - kbd_public::StartLogSystem("default", "tsdb_api_test"); + iot_public::StartLogSystem("default", "tsdb_api_test"); LOGINFO("Log system OK !"); tsdb_api_test(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } diff --git a/platform/src/dbms/tsdb_api/test/tsdb_api_test_fill_sample/main.cpp b/platform/src/dbms/tsdb_api/test/tsdb_api_test_fill_sample/main.cpp index 19f9c745..d2ef1a87 100644 --- a/platform/src/dbms/tsdb_api/test/tsdb_api_test_fill_sample/main.cpp +++ b/platform/src/dbms/tsdb_api/test/tsdb_api_test_fill_sample/main.cpp @@ -23,7 +23,7 @@ const int nLoopCntBig = 500; //< 小循环次数 const int nLoopCntSmall = 1000; -kbd_dbms::CTsdbConn *g_pTsdbConn = NULL; +iot_dbms::CTsdbConn *g_pTsdbConn = NULL; static void fillAiSample() { @@ -193,13 +193,13 @@ static void fillAccSample() int main(/*int argc, char *argv[]*/) { - if (!kbd_dbms::initTsdbApi()) + if (!iot_dbms::initTsdbApi()) { std::cout << "initTsdbApi() failed !" << std::endl; return 0; } - g_pTsdbConn = new kbd_dbms::CTsdbConn("127.0.0.1", 8086, "iscs6000", "", ""); + g_pTsdbConn = new iot_dbms::CTsdbConn("127.0.0.1", 8086, "iscs6000", "", ""); if (NULL == g_pTsdbConn) { @@ -232,7 +232,7 @@ int main(/*int argc, char *argv[]*/) delete g_pTsdbConn; g_pTsdbConn = NULL; - if (!kbd_dbms::releaseTsdbApi()) + if (!iot_dbms::releaseTsdbApi()) { std::cout << "releaseTsdbApi() failed !" << std::endl; } diff --git a/platform/src/dbms/tsdb_save/CFrontThread.cpp b/platform/src/dbms/tsdb_save/CFrontThread.cpp index 5b9c2860..e41464f9 100644 --- a/platform/src/dbms/tsdb_save/CFrontThread.cpp +++ b/platform/src/dbms/tsdb_save/CFrontThread.cpp @@ -38,7 +38,7 @@ #include "CNodeMng.h" #include "CFrontThread.h" -namespace kbd_dbms +namespace iot_dbms { CFrontThread::CFrontThread() : @@ -68,7 +68,7 @@ bool CFrontThread::resumeThread() if (NULL == m_pMbComm) { - m_pMbComm = new kbd_net::CMbCommunicator(); + m_pMbComm = new iot_net::CMbCommunicator(); } //< 订阅 @@ -84,7 +84,7 @@ bool CFrontThread::resumeThread() if (NULL == m_pMbMsgRcv) { - m_pMbMsgRcv = new kbd_net::CMbMessage(); + m_pMbMsgRcv = new iot_net::CMbMessage(); } //< 注意：先赋值，后resume() @@ -115,7 +115,7 @@ bool CFrontThread::suspendThread() m_strTags.swap(str1); m_strFields.swap(str2); - kbd_idlfile::STssInsert objNew; + iot_idl::STssInsert objNew; m_objTssInsert.Swap(&objNew); } @@ -156,7 +156,7 @@ void CFrontThread::execute() m_strTags.swap(str1); m_strFields.swap(str2); - kbd_idlfile::STssInsert objNew; + iot_idl::STssInsert objNew; m_objTssInsert.Swap(&objNew); if (m_objTssInsert.mutable_point()->Capacity() > 0) @@ -191,8 +191,8 @@ void CFrontThread::handleOneMbMsg() //< 1、防止应用端因一条错误消息而死循环 //< 2、提高速度 { - kbd_net::CMbMessage objMbMSgRep; - objMbMSgRep.setMsgType(kbd_idlfile::MT_TSS_SRV2APP_ADD_ACK); + iot_net::CMbMessage objMbMSgRep; + objMbMSgRep.setMsgType(iot_idl::MT_TSS_SRV2APP_ADD_ACK); objMbMSgRep.setSubject(CN_AppId_PUBLIC, CH_TSS_SRV_TO_APP); objMbMSgRep.setData(std::string("TSS")); objMbMSgRep.setPara1(m_pMbMsgRcv->getPara1()); @@ -203,7 +203,7 @@ void CFrontThread::handleOneMbMsg() } //< 当前只有一种消息 - if (m_pMbMsgRcv->getMsgType() != kbd_idlfile::MT_TSS_APP2SRV_ADD) + if (m_pMbMsgRcv->getMsgType() != iot_idl::MT_TSS_APP2SRV_ADD) { LOGINFO("收到非预期消息类型！"); return; @@ -254,7 +254,7 @@ void CFrontThread::handleOneMbMsg() StdStringPtr ptrStrInsert(new std::string); for (int nPointIndex = 0; nPointIndex < nPointCnt; nPointIndex++) { - const kbd_idlfile::STsdbPoint &objPoint = m_objTssInsert.point(nPointIndex); + const iot_idl::STsdbPoint &objPoint = m_objTssInsert.point(nPointIndex); if (objPoint.tag_val_size() != m_objTssInsert.tag_name_size()) { @@ -339,15 +339,15 @@ void CFrontThread::handleOneMbMsg() bool bToRemote = false; switch (m_objTssInsert.save_action()) { - case kbd_idlfile::SA_TSS_DO_NOTHING: + case iot_idl::SA_TSS_DO_NOTHING: break; - case kbd_idlfile::SA_TSS_LOCAL_ONLY: + case iot_idl::SA_TSS_LOCAL_ONLY: bToLocal = true; break; - case kbd_idlfile::SA_TSS_REMOTE_ONLY: + case iot_idl::SA_TSS_REMOTE_ONLY: bToRemote = true; break; - case kbd_idlfile::SA_TSS_LOCAL_REMOTE: + case iot_idl::SA_TSS_LOCAL_REMOTE: bToLocal = true; bToRemote = true; break; @@ -359,5 +359,5 @@ void CFrontThread::handleOneMbMsg() CNodeMng::getInstance().pushSaveStr(ptrStrInsert, bToLocal, bToRemote); } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_save/CFrontThread.h b/platform/src/dbms/tsdb_save/CFrontThread.h index 05a845af..58034926 100644 --- a/platform/src/dbms/tsdb_save/CFrontThread.h +++ b/platform/src/dbms/tsdb_save/CFrontThread.h @@ -33,10 +33,10 @@ #include "pub_utility_api/TimerThreadBase.h" #include "net_msg_bus_api/MsgBusApi.h" -namespace kbd_dbms +namespace iot_dbms { -class CFrontThread final : private kbd_public::CTimerThreadBase +class CFrontThread final : private iot_public::CTimerThreadBase { public: CFrontThread(); @@ -61,15 +61,15 @@ private: int m_nLoopCnt; int m_nReleaseThreshold; - kbd_net::CMbCommunicator *m_pMbComm; //< 消息总线通讯器 - kbd_net::CMbMessage *m_pMbMsgRcv; //< 接收的消息总线消息 + iot_net::CMbCommunicator *m_pMbComm; //< 消息总线通讯器 + iot_net::CMbMessage *m_pMbMsgRcv; //< 接收的消息总线消息 //< handleOneMbMsg() 函数中使用，为了性能作为成员函数，避免频繁构造 std::string m_strTags; std::string m_strFields; - kbd_idlfile::STssInsert m_objTssInsert; + iot_idl::STssInsert m_objTssInsert; }; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_save/CNodeMng.cpp b/platform/src/dbms/tsdb_save/CNodeMng.cpp index d3efd3d8..05c52ca1 100644 --- a/platform/src/dbms/tsdb_save/CNodeMng.cpp +++ b/platform/src/dbms/tsdb_save/CNodeMng.cpp @@ -15,7 +15,7 @@ #include "CNodeMng.h" -namespace kbd_dbms +namespace iot_dbms { static CNodeMng *g_pNodeMng = NULL; @@ -69,8 +69,8 @@ bool CNodeMng::haveInstance() bool CNodeMng::init() { - kbd_public::CSysInfoInterfacePtr ptrSysInfo; - if (kbd_public::createSysInfoInstance(ptrSysInfo) == false) + iot_public::CSysInfoInterfacePtr ptrSysInfo; + if (iot_public::createSysInfoInstance(ptrSysInfo) == false) { LOGERROR("createSysInfoInstance() return false !"); return false; @@ -78,7 +78,7 @@ bool CNodeMng::init() //< 获取本机域ID和主机名 { - kbd_public::SNodeInfo stLocalNodeInfo; + iot_public::SNodeInfo stLocalNodeInfo; if (kbdSuccess != ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) { LOGERROR("getLocalNodeInfo() failed !"); @@ -90,9 +90,9 @@ bool CNodeMng::init() } //< 本地域数据库连接信息 - kbd_public::SDatabaseInfo stFirstDbInfo; - std::vector vecLocalDbInfo; - std::vector vecRemoteDbInfo; + iot_public::SDatabaseInfo stFirstDbInfo; + std::vector vecLocalDbInfo; + std::vector vecRemoteDbInfo; int nRc = ptrSysInfo->getDBInfoByDomainId(m_nLocalDomainID, stFirstDbInfo, vecLocalDbInfo, vecRemoteDbInfo); if (kbdSuccess != nRc) @@ -104,7 +104,7 @@ bool CNodeMng::init() //< 初始化 m_vecLocalThreads for (size_t nDbInfoIndex = 0; nDbInfoIndex < vecLocalDbInfo.size(); nDbInfoIndex++) { - kbd_public::SNodeInfo stDbNodeInfo; + iot_public::SNodeInfo stDbNodeInfo; nRc = ptrSysInfo->getNodeInfoByName(vecLocalDbInfo[nDbInfoIndex].strNodeName, stDbNodeInfo); if (kbdSuccess != nRc) @@ -143,7 +143,7 @@ bool CNodeMng::init() //< 初始化 m_vecRemoteThreads for (size_t nDbInfoIndex = 0; nDbInfoIndex < vecRemoteDbInfo.size(); nDbInfoIndex++) { - kbd_public::SNodeInfo stDbNodeInfo; + iot_public::SNodeInfo stDbNodeInfo; nRc = ptrSysInfo->getNodeInfoByName(vecRemoteDbInfo[nDbInfoIndex].strNodeName, stDbNodeInfo); if (kbdSuccess != nRc) @@ -235,5 +235,5 @@ void CNodeMng::pushSaveStr(StdStringPtr ptrStrSave, bool bToLocal, bool bToRemot } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_save/CNodeMng.h b/platform/src/dbms/tsdb_save/CNodeMng.h index 1a21ba0f..248c32dc 100644 --- a/platform/src/dbms/tsdb_save/CNodeMng.h +++ b/platform/src/dbms/tsdb_save/CNodeMng.h @@ -14,7 +14,7 @@ #include "CNodeThread.h" #include "TsdbSaveCommon.h" -namespace kbd_dbms +namespace iot_dbms { class CNodeThread; @@ -72,5 +72,5 @@ private: }; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_save/CNodeThread.cpp b/platform/src/dbms/tsdb_save/CNodeThread.cpp index 547b864e..7750c132 100644 --- a/platform/src/dbms/tsdb_save/CNodeThread.cpp +++ b/platform/src/dbms/tsdb_save/CNodeThread.cpp @@ -16,7 +16,7 @@ #include "CNodeThread.h" -namespace kbd_dbms +namespace iot_dbms { //< 1s运行一次，死锁超时 1天 @@ -289,13 +289,13 @@ bool CNodeThread::updateConnInUse(bool bForce) } //< 更新时间 - m_nLastCheckConnTime = kbd_public::getMonotonicMsec(); + m_nLastCheckConnTime = iot_public::getMonotonicMsec(); } else { //< 强制更新，或者已到周期性检查时间（防止频繁检查） if (bForce - || m_nLastCheckConnTime + 5000 < kbd_public::getMonotonicMsec()) + || m_nLastCheckConnTime + 5000 < iot_public::getMonotonicMsec()) { //< 检查当前 m_pConnInUse 是否可用 if (!m_pConnInUse->pingServer(1000)) @@ -317,7 +317,7 @@ bool CNodeThread::updateConnInUse(bool bForce) } //< 更新时间 - m_nLastCheckConnTime = kbd_public::getMonotonicMsec(); + m_nLastCheckConnTime = iot_public::getMonotonicMsec(); } } @@ -334,7 +334,7 @@ bool CNodeThread::readFromFile(std::string &strOutput) if (!m_objReadStream.is_open()) { - std::string strFullPath = kbd_public::CFileUtil::getAbsolutePath(DATA_DIRECTORY, m_strNodeName); + std::string strFullPath = iot_public::CFileUtil::getAbsolutePath(DATA_DIRECTORY, m_strNodeName); if (strFullPath.empty()) return false; @@ -365,7 +365,7 @@ void CNodeThread::writeToFile(const std::string &strInput) if (!m_objWriteStream.is_open()) { - std::string strFullPath = kbd_public::CFileUtil::getAbsolutePath(DATA_DIRECTORY, ""); + std::string strFullPath = iot_public::CFileUtil::getAbsolutePath(DATA_DIRECTORY, ""); if (!boost::filesystem::is_directory(strFullPath)) { if (!boost::filesystem::create_directories(strFullPath)) @@ -374,7 +374,7 @@ void CNodeThread::writeToFile(const std::string &strInput) } } - strFullPath = kbd_public::CFileUtil::getAbsolutePath(DATA_DIRECTORY, m_strNodeName); + strFullPath = iot_public::CFileUtil::getAbsolutePath(DATA_DIRECTORY, m_strNodeName); if (strFullPath.empty()) return; @@ -390,7 +390,7 @@ void CNodeThread::delFile() m_objReadStream.close(); m_objWriteStream.close(); - std::string strFullPath = kbd_public::CFileUtil::getAbsolutePath(DATA_DIRECTORY, m_strNodeName); + std::string strFullPath = iot_public::CFileUtil::getAbsolutePath(DATA_DIRECTORY, m_strNodeName); if (strFullPath.empty()) return; @@ -403,5 +403,5 @@ void CNodeThread::delFile() } } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_save/CNodeThread.h b/platform/src/dbms/tsdb_save/CNodeThread.h index a4f02aed..d0fdd54f 100644 --- a/platform/src/dbms/tsdb_save/CNodeThread.h +++ b/platform/src/dbms/tsdb_save/CNodeThread.h @@ -20,12 +20,12 @@ #include "TsdbSaveCommon.h" -namespace kbd_dbms +namespace iot_dbms { class CTsdbConn; -class CNodeThread final : private kbd_public::CTimerThreadBase +class CNodeThread final : private iot_public::CTimerThreadBase { public: CNodeThread(const std::string &strNodeName, @@ -88,5 +88,5 @@ private: typedef boost::shared_ptr CNodeThreadPtr; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_save/CTsdbSaveRedunSw.cpp b/platform/src/dbms/tsdb_save/CTsdbSaveRedunSw.cpp index 346f78dc..6938beb8 100644 --- a/platform/src/dbms/tsdb_save/CTsdbSaveRedunSw.cpp +++ b/platform/src/dbms/tsdb_save/CTsdbSaveRedunSw.cpp @@ -12,7 +12,7 @@ #include "CTsdbSaveRedunSw.h" -namespace kbd_dbms +namespace iot_dbms { CTsdbSaveRedunSw::CTsdbSaveRedunSw( CTsdbSaveSrv *pParent ) @@ -44,5 +44,5 @@ int CTsdbSaveRedunSw::redundantSwitch(bool bMaster, bool bSlave) return kbdSuccess; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_save/CTsdbSaveRedunSw.h b/platform/src/dbms/tsdb_save/CTsdbSaveRedunSw.h index 105e8c49..39c258e6 100644 --- a/platform/src/dbms/tsdb_save/CTsdbSaveRedunSw.h +++ b/platform/src/dbms/tsdb_save/CTsdbSaveRedunSw.h @@ -13,12 +13,12 @@ #include "CFrontThread.h" -namespace kbd_dbms +namespace iot_dbms { class CTsdbSaveSrv; -class CTsdbSaveRedunSw final : public ::kbd_sys::CRedundantSwitchInterface +class CTsdbSaveRedunSw final : public ::iot_sys::CRedundantSwitchInterface { public: explicit CTsdbSaveRedunSw( CTsdbSaveSrv *pParent ); @@ -37,5 +37,5 @@ private: typedef boost::shared_ptr CTsdbSaveRedunSwPtr; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_save/CTsdbSaveSrv.cpp b/platform/src/dbms/tsdb_save/CTsdbSaveSrv.cpp index b459ad90..c812cfc6 100644 --- a/platform/src/dbms/tsdb_save/CTsdbSaveSrv.cpp +++ b/platform/src/dbms/tsdb_save/CTsdbSaveSrv.cpp @@ -23,7 +23,7 @@ #define TSDB_SAVE_SRV_PROC_NAME "tsdb_save" -namespace kbd_dbms +namespace iot_dbms { CTsdbSaveSrv::CTsdbSaveSrv() @@ -36,7 +36,7 @@ CTsdbSaveSrv::~CTsdbSaveSrv() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } @@ -53,7 +53,7 @@ bool CTsdbSaveSrv::start(int argc, char *argv[], int& /*nStatus*/) } //< 启动日志 - kbd_public::StartLogSystem(CN_AppName_PUBLIC.c_str(), TSDB_SAVE_SRV_PROC_NAME); + iot_public::StartLogSystem(CN_AppName_PUBLIC.c_str(), TSDB_SAVE_SRV_PROC_NAME); //< 判断是否已启动 if (isAlreadyRunning()) @@ -63,7 +63,7 @@ bool CTsdbSaveSrv::start(int argc, char *argv[], int& /*nStatus*/) } //< 消息总线 - if (!kbd_net::initMsgBus(TSDB_SAVE_SRV_PROC_NAME, "", true)) + if (!iot_net::initMsgBus(TSDB_SAVE_SRV_PROC_NAME, "", true)) { LOGFATAL("初始化消息总线失败，程序启动失败！"); return false; @@ -105,14 +105,14 @@ bool CTsdbSaveSrv::start(int argc, char *argv[], int& /*nStatus*/) strStartArgs += argv[i]; } - kbd_sys::SProcessInfoKey objProcInfo; + iot_sys::SProcessInfoKey objProcInfo; objProcInfo.nAppId = CN_AppId_PUBLIC; objProcInfo.nDomainId = CNodeMng::getInstance().getLocalDomainID(); objProcInfo.strNodeName = CNodeMng::getInstance().getLocalNodeName(); objProcInfo.strProcName = TSDB_SAVE_SRV_PROC_NAME; objProcInfo.strProcParam = strStartArgs; - m_ptrProcMng = kbd_sys::getProcMngInstance(objProcInfo); + m_ptrProcMng = iot_sys::getProcMngInstance(objProcInfo); if (!m_ptrProcMng) { LOGFATAL("getProcMngInstance return NULL"); @@ -124,7 +124,7 @@ bool CTsdbSaveSrv::start(int argc, char *argv[], int& /*nStatus*/) //< 冗余管理 { - m_ptrRedundantMng = kbd_sys::getRedundantMngInstance(CNodeMng::getInstance().getLocalDomainID(), + m_ptrRedundantMng = iot_sys::getRedundantMngInstance(CNodeMng::getInstance().getLocalDomainID(), CN_AppId_PUBLIC, CNodeMng::getInstance().getLocalNodeName()); if (!m_ptrRedundantMng) @@ -229,11 +229,11 @@ bool CTsdbSaveSrv::stop() releaseTsdbApi(); //< 停止消息总线 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } @@ -259,7 +259,7 @@ int CTsdbSaveSrv::updateProcInfo(bool bActive, bool bMaster, bool bSlave) bool CTsdbSaveSrv::isAlreadyRunning() { - return kbd_public::CSingleProcInstance::hasInstanceRunning(TSDB_SAVE_SRV_PROC_NAME); + return iot_public::CSingleProcInstance::hasInstanceRunning(TSDB_SAVE_SRV_PROC_NAME); } @@ -326,5 +326,5 @@ bool CTsdbSaveSrv::parseCommandLine(int argc, char *argv[]) return true; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_save/CTsdbSaveSrv.h b/platform/src/dbms/tsdb_save/CTsdbSaveSrv.h index 8e64cc26..5def67db 100644 --- a/platform/src/dbms/tsdb_save/CTsdbSaveSrv.h +++ b/platform/src/dbms/tsdb_save/CTsdbSaveSrv.h @@ -14,10 +14,10 @@ #include "CTsdbSaveRedunSw.h" -namespace kbd_dbms +namespace iot_dbms { -class CTsdbSaveSrv final : public kbd_public::CBaseService, kbd_sys::CProcessQuitInterface +class CTsdbSaveSrv final : public iot_public::CBaseService, iot_sys::CProcessQuitInterface { public: CTsdbSaveSrv(); @@ -51,9 +51,9 @@ private: private: enRunModel m_enRunModel; CTsdbSaveRedunSwPtr m_ptrRedunSw; - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_sys::CProcMngInterfacePtr m_ptrProcMng; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; }; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_save/Main.cpp b/platform/src/dbms/tsdb_save/Main.cpp index f3fbdac5..28ca3064 100644 --- a/platform/src/dbms/tsdb_save/Main.cpp +++ b/platform/src/dbms/tsdb_save/Main.cpp @@ -11,7 +11,7 @@ int main(int argc, char *argv[]) { - kbd_dbms::CTsdbSaveSrv objApp; + iot_dbms::CTsdbSaveSrv objApp; return objApp.main(argc, argv); } diff --git a/platform/src/dbms/tsdb_save/TsdbSaveCommon.cpp b/platform/src/dbms/tsdb_save/TsdbSaveCommon.cpp index cfcbabf3..8da77489 100644 --- a/platform/src/dbms/tsdb_save/TsdbSaveCommon.cpp +++ b/platform/src/dbms/tsdb_save/TsdbSaveCommon.cpp @@ -35,38 +35,38 @@ #include "TsdbSaveCommon.h" -namespace kbd_dbms +namespace iot_dbms { -std::string toInfluxString(const kbd_idlfile::SVariable &objInput) +std::string toInfluxString(const iot_idl::SVariable &objInput) { //< 经测试，lexical_cast比format快几十倍 std::string strOutput; switch (objInput.edatatype()) { - case kbd_idlfile::DataType::CN_DATATYPE_BOOL: + case iot_idl::DataType::CN_DATATYPE_BOOL: strOutput = boost::lexical_cast(objInput.bvalue()); break; - case kbd_idlfile::DataType::CN_DATATYPE_DOUBLE: + case iot_idl::DataType::CN_DATATYPE_DOUBLE: strOutput = boost::lexical_cast(objInput.dvalue()); break; - case kbd_idlfile::DataType::CN_DATATYPE_FLOAT: + case iot_idl::DataType::CN_DATATYPE_FLOAT: strOutput = boost::lexical_cast(objInput.fvalue()); break; - case kbd_idlfile::DataType::CN_DATATYPE_INT32: + case iot_idl::DataType::CN_DATATYPE_INT32: strOutput = boost::lexical_cast(objInput.nvalue()) + "i"; break; - case kbd_idlfile::DataType::CN_DATATYPE_INT64: + case iot_idl::DataType::CN_DATATYPE_INT64: strOutput = boost::lexical_cast(objInput.lvalue()) + "i"; break; - case kbd_idlfile::DataType::CN_DATATYPE_STRING: + case iot_idl::DataType::CN_DATATYPE_STRING: strOutput = objInput.strvalue(); break; - case kbd_idlfile::DataType::CN_DATATYPE_UINT32: + case iot_idl::DataType::CN_DATATYPE_UINT32: strOutput = boost::lexical_cast(objInput.uvalue()) + "i"; break; - case kbd_idlfile::DataType::CN_DATATYPE_UINT64: + case iot_idl::DataType::CN_DATATYPE_UINT64: strOutput = boost::lexical_cast(objInput.ulvalue()) + "i"; break; default: @@ -76,5 +76,5 @@ std::string toInfluxString(const kbd_idlfile::SVariable &objInput) return strOutput; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_save/TsdbSaveCommon.h b/platform/src/dbms/tsdb_save/TsdbSaveCommon.h index e69bab51..4bb89428 100644 --- a/platform/src/dbms/tsdb_save/TsdbSaveCommon.h +++ b/platform/src/dbms/tsdb_save/TsdbSaveCommon.h @@ -16,12 +16,12 @@ typedef boost::shared_ptr StdStringPtr; -namespace kbd_idlfile +namespace iot_idl { class SVariable; } -namespace kbd_dbms +namespace iot_dbms { #ifdef OS_WINDOWS @@ -30,7 +30,7 @@ namespace kbd_dbms #define DATA_DIRECTORY "../../data/cache/tsdb_save_cache/" #endif -std::string toInfluxString(const kbd_idlfile::SVariable &objInput); +std::string toInfluxString(const iot_idl::SVariable &objInput); -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_save_api/CTsdbSaveApi.cpp b/platform/src/dbms/tsdb_save_api/CTsdbSaveApi.cpp index ddf7dd7d..37b1d39e 100644 --- a/platform/src/dbms/tsdb_save_api/CTsdbSaveApi.cpp +++ b/platform/src/dbms/tsdb_save_api/CTsdbSaveApi.cpp @@ -11,7 +11,7 @@ #include "CTsdbSaveApiImp.h" -namespace kbd_dbms +namespace iot_dbms { CTsdbSaveApi::CTsdbSaveApi(int nDomainID, int nAppID) @@ -36,11 +36,11 @@ bool CTsdbSaveApi::suspendThread(bool bCleanPendingMsg) return m_pImp->suspendThread(bCleanPendingMsg); } -bool CTsdbSaveApi::addInsertMsg(const kbd_idlfile::STssInsert &objInsert) +bool CTsdbSaveApi::addInsertMsg(const iot_idl::STssInsert &objInsert) { return m_pImp->addInsertMsg(objInsert); } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_save_api/CTsdbSaveApiImp.cpp b/platform/src/dbms/tsdb_save_api/CTsdbSaveApiImp.cpp index 6f0e7cc2..4afcb725 100644 --- a/platform/src/dbms/tsdb_save_api/CTsdbSaveApiImp.cpp +++ b/platform/src/dbms/tsdb_save_api/CTsdbSaveApiImp.cpp @@ -16,7 +16,7 @@ //< 输入队列的上限，防止异常情况下的内存无限制增长 #define CN_MAX_SIZE_OF_QUEUE 6000 -namespace kbd_dbms +namespace iot_dbms { //< 死锁检测6分钟，大于单次执行的最坏情况 @@ -66,7 +66,7 @@ bool CTsdbSaveApiImp::suspendThread(bool bCleanPendingMsg) } -bool CTsdbSaveApiImp::addInsertMsg(const kbd_idlfile::STssInsert &objInsert) +bool CTsdbSaveApiImp::addInsertMsg(const iot_idl::STssInsert &objInsert) { //< 当前不允许没有tag if (objInsert.tag_name_size() <= 0) @@ -98,7 +98,7 @@ bool CTsdbSaveApiImp::addInsertMsg(const kbd_idlfile::STssInsert &objInsert) //< 检查tag、field数量是否对应 for (int i = 0; i < objInsert.point_size(); i++) { - const kbd_idlfile::STsdbPoint &objPoint = objInsert.point(i); + const iot_idl::STsdbPoint &objPoint = objInsert.point(i); if (objPoint.tag_val_size() != objInsert.tag_name_size()) { @@ -121,7 +121,7 @@ bool CTsdbSaveApiImp::addInsertMsg(const kbd_idlfile::STssInsert &objInsert) return false; } - ptrCachedMsg->m_nMsgType = kbd_idlfile::MT_TSS_APP2SRV_ADD; + ptrCachedMsg->m_nMsgType = iot_idl::MT_TSS_APP2SRV_ADD; { //< 加锁 @@ -146,7 +146,7 @@ void CTsdbSaveApiImp::execute() //< 一次运行最多发100条 for (int i = 0; i < 100; i++) { - kbd_net::CMbMessage objMbMsg; + iot_net::CMbMessage objMbMsg; while (m_objComm.recvMsg(objMbMsg, 0)) { //< 清空所有收到的消息，防止脏数据 @@ -215,7 +215,7 @@ void CTsdbSaveApiImp::execute() nSendSeq, strData.c_str());*/ - if (objMbMsg.getMsgType() == kbd_idlfile::MT_TSS_SRV2APP_ADD_ACK + if (objMbMsg.getMsgType() == iot_idl::MT_TSS_SRV2APP_ADD_ACK && objMbMsg.getPara1() == ptrCachedMsg->m_nSendSeq && objMbMsg.getPara2() == m_nDomainID && strData == "TSS") @@ -242,5 +242,5 @@ void CTsdbSaveApiImp::execute() } } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/dbms/tsdb_save_api/CTsdbSaveApiImp.h b/platform/src/dbms/tsdb_save_api/CTsdbSaveApiImp.h index ab94d2e0..042f16ed 100644 --- a/platform/src/dbms/tsdb_save_api/CTsdbSaveApiImp.h +++ b/platform/src/dbms/tsdb_save_api/CTsdbSaveApiImp.h @@ -38,10 +38,10 @@ #include "pub_utility_api/TimerThreadBase.h" #include "net_msg_bus_api/MsgBusApi.h" -namespace kbd_dbms +namespace iot_dbms { -class CTsdbSaveApiImp : private kbd_public::CTimerThreadBase +class CTsdbSaveApiImp : private iot_public::CTimerThreadBase { public: CTsdbSaveApiImp(int nDomainID, int nAppID); @@ -51,7 +51,7 @@ public: bool suspendThread(bool bCleanPendingMsg); - bool addInsertMsg(const kbd_idlfile::STssInsert &objInsert); + bool addInsertMsg(const iot_idl::STssInsert &objInsert); private: void execute()override; @@ -74,10 +74,10 @@ private: int m_nDomainID; //< 域ID int m_nAppID; //< 应用ID int m_nSendSeq; //< 发送序号，从1开始，循环使用 - kbd_net::CMbCommunicator m_objComm; //< 消息总线通讯器，动态UUID命名 + iot_net::CMbCommunicator m_objComm; //< 消息总线通讯器，动态UUID命名 boost::mutex m_mutexQue; //< m_queAddedMsg的锁 std::queue m_queAddedMsg; //< 已添加的消息的队列 }; -} //< namespace kbd_dbms +} //< namespace iot_dbms 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 624b5929..c251b75d 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 @@ -4,7 +4,7 @@ #include "CAddSampleApp.h" -namespace kbd_dbms +namespace iot_dbms { CAddSampleApp::CAddSampleApp() @@ -17,7 +17,7 @@ CAddSampleApp::~CAddSampleApp() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } bool CAddSampleApp::start(int /*argc*/, char ** /*argv[]*/, int&/*nStatus*/) @@ -25,10 +25,10 @@ bool CAddSampleApp::start(int /*argc*/, char ** /*argv[]*/, int&/*nStatus*/) bool bRc = false; //< 1 - kbd_public::StartLogSystem("default", "test"); + iot_public::StartLogSystem("default", "test"); //< 2 - bRc = kbd_net::initMsgBus("tsdb_save_test_add_sample", "1", true); + bRc = iot_net::initMsgBus("tsdb_save_test_add_sample", "1", true); assert(bRc); //< 3 @@ -54,12 +54,12 @@ bool CAddSampleApp::stop() //< 2 { - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); } //< 1 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } diff --git a/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/CAddSampleApp.h b/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/CAddSampleApp.h index 4726aa7e..6e2ec1b7 100644 --- a/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/CAddSampleApp.h +++ b/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/CAddSampleApp.h @@ -6,10 +6,10 @@ #include "CAddSampleThread.h" -namespace kbd_dbms +namespace iot_dbms { -class CAddSampleApp : public kbd_public::CBaseService, kbd_sys::CProcessQuitInterface +class CAddSampleApp : public iot_public::CBaseService, iot_sys::CProcessQuitInterface { public: CAddSampleApp(); 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 7638a79e..d3598de1 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 @@ -11,10 +11,10 @@ #include "CAddSampleThread.h" -using namespace kbd_idlfile; -using namespace kbd_public; +using namespace iot_idl; +using namespace iot_public; -namespace kbd_dbms +namespace iot_dbms { CAddSampleThread::CAddSampleThread() : @@ -26,7 +26,7 @@ CAddSampleThread::CAddSampleThread() : { SNodeInfo stNodeInfo; CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + if (iot_public::createSysInfoInstance(spSysInfo)) { if (kbdSuccess != spSysInfo->getLocalNodeInfo(stNodeInfo)) { @@ -36,7 +36,7 @@ CAddSampleThread::CAddSampleThread() : } else { - std::cout << "false == kbd_public::createSysInfoInstance(spSysInfo)" << std::endl; + std::cout << "false == iot_public::createSysInfoInstance(spSysInfo)" << std::endl; } //< 测试数据库配置，APPID 4，电力 @@ -64,7 +64,7 @@ void CAddSampleThread::execute() return; } - boost::int64_t nTimeNow = kbd_public::getUTCTimeMsec(); + boost::int64_t nTimeNow = iot_public::getUTCTimeMsec(); if (m_nLastSampleTime + 60000 > nTimeNow) { @@ -72,9 +72,9 @@ void CAddSampleThread::execute() } m_nLastSampleTime = nTimeNow; - kbd_idlfile::STssInsert objInsert; + iot_idl::STssInsert objInsert; - objInsert.set_save_action(kbd_idlfile::enTssSaveAction::SA_TSS_LOCAL_REMOTE); + objInsert.set_save_action(iot_idl::enTssSaveAction::SA_TSS_LOCAL_REMOTE); objInsert.set_meas_name("ai_sample_result"); @@ -85,7 +85,7 @@ void CAddSampleThread::execute() for (int i = 0; i < 1000; i++) { - kbd_idlfile::STsdbPoint *pPoint = objInsert.add_point(); + iot_idl::STsdbPoint *pPoint = objInsert.add_point(); pPoint->set_time_stamp(nTimeNow); @@ -93,12 +93,12 @@ void CAddSampleThread::execute() % i); pPoint->add_tag_val(strTagName); - kbd_idlfile::SVariable *pVarValue = pPoint->add_field_val(); - pVarValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_DOUBLE); + iot_idl::SVariable *pVarValue = pPoint->add_field_val(); + pVarValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_DOUBLE); pVarValue->set_dvalue(i + 0.123); - kbd_idlfile::SVariable *pVarStatus = pPoint->add_field_val(); - pVarStatus->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_UINT32); + iot_idl::SVariable *pVarStatus = pPoint->add_field_val(); + pVarStatus->set_edatatype(iot_idl::DataType::CN_DATATYPE_UINT32); pVarStatus->set_uvalue((unsigned int)i); } diff --git a/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/CAddSampleThread.h b/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/CAddSampleThread.h index 0685040a..74c46bfb 100644 --- a/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/CAddSampleThread.h +++ b/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/CAddSampleThread.h @@ -3,12 +3,12 @@ #include "pub_utility_api/TimerThreadBase.h" -namespace kbd_dbms +namespace iot_dbms { class CTsdbSaveApi; -class CAddSampleThread : public kbd_public::CTimerThreadBase +class CAddSampleThread : public iot_public::CTimerThreadBase { public: CAddSampleThread(); diff --git a/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/Main.cpp b/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/Main.cpp index de7a989d..18e46c07 100644 --- a/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/Main.cpp +++ b/platform/src/dbms/tsdb_save_api/test/tsdb_save_test_add_sample/Main.cpp @@ -3,6 +3,6 @@ int main(int argc, char *argv[]) { - kbd_dbms::CAddSampleApp objApp; + iot_dbms::CAddSampleApp objApp; return objApp.main(argc, argv); } \ No newline at end of file diff --git a/platform/src/gui/GraphDataAcess/CGraphDataAcess.cpp b/platform/src/gui/GraphDataAcess/CGraphDataAcess.cpp index 1f49cc23..9755d95e 100644 --- a/platform/src/gui/GraphDataAcess/CGraphDataAcess.cpp +++ b/platform/src/gui/GraphDataAcess/CGraphDataAcess.cpp @@ -92,7 +92,7 @@ int CGraphDataAcess::init() if(m_communicator == NULL) { registName = "SDAO_PUT"; - m_communicator = new kbd_net::CMbCommunicator(registName.c_str()); + m_communicator = new iot_net::CMbCommunicator(registName.c_str()); } m_dbMng = new CDbApi(DB_CONN_MODEL_READ); @@ -123,7 +123,7 @@ int CGraphDataAcess::init() } m_permMng->PermDllInit(); - m_ptrDogAuth = kbd_sys::getDogAuthInstance(); + m_ptrDogAuth = iot_sys::getDogAuthInstance(); SNodeInfo stNodeInfo; m_sysInfo->getLocalNodeInfo(stNodeInfo); @@ -209,7 +209,7 @@ QVariantList CGraphDataAcess::rdbSelect(const QString &appName, const QString &t m_rdbAccess->open(appName.toStdString().c_str(), tableName.toStdString().c_str()); - kbd_dbms::CONDINFO stCondInfo; + iot_dbms::CONDINFO stCondInfo; int val = parseCondition(condition, stCondInfo); if(val == -1) { @@ -303,8 +303,8 @@ bool CGraphDataAcess::getLocationDesc(const QString &tagName, QString &desc) QVariantList CGraphDataAcess::rdbNetSelect(const QString &appName, const QString &tableName, const QString &columnsName, const int &domainID, const QString &condition, bool asyn) { QVariantList result; - kbd_idlfile::RdbQuery objQuery; - kbd_idlfile::RdbRet objReply; + iot_idl::RdbQuery objQuery; + iot_idl::RdbRet objReply; int appID = getAppIdByName(appName); m_rdbNetAccess->connect(domainID, appID); @@ -319,7 +319,7 @@ QVariantList CGraphDataAcess::rdbNetSelect(const QString &appName, const QString QStringList condList = condition.split("="); if(condList.size() == 2) { - kbd_idlfile::RdbCondition *pCondtion = objQuery.add_msgcondition(); + iot_idl::RdbCondition *pCondtion = objQuery.add_msgcondition(); std::string column = condList[0].toStdString(); pCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pCondtion->set_strcolumnname(column); @@ -394,8 +394,8 @@ QVariantList CGraphDataAcess::rdbNetSelect(const QString &appName, const QString QVariantList CGraphDataAcess::rdbNetGetByKey(const QString &appName, const QString &tableName, const QString &keyInfo, const QString &columnsName, const int &domainId, bool asyn) { QVariantList result; - kbd_idlfile::RdbQuery objQuery; - kbd_idlfile::RdbRet objReply; + iot_idl::RdbQuery objQuery; + iot_idl::RdbRet objReply; int appID = getAppIdByName(appName); m_rdbNetAccess->connect(domainId, appID); @@ -407,7 +407,7 @@ QVariantList CGraphDataAcess::rdbNetGetByKey(const QString &appName, const QStri *pColName = tmpList[i].toStdString(); } - kbd_idlfile::RdbCondition *pCondtion = objQuery.add_msgcondition(); + iot_idl::RdbCondition *pCondtion = objQuery.add_msgcondition(); pCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pCondtion->set_strcolumnname("tag_name"); SVariable *pCondValue = pCondtion->mutable_msgvalue(); @@ -594,7 +594,7 @@ void CGraphDataAcess::getValueList(RdbRet *objReply, QVariantList &result) } } -int CGraphDataAcess::parseCondition(const QString &str, kbd_dbms::CONDINFO &stCondInfo) +int CGraphDataAcess::parseCondition(const QString &str, iot_dbms::CONDINFO &stCondInfo) { if(str.isEmpty()) { @@ -620,7 +620,7 @@ int CGraphDataAcess::parseCondition(const QString &str, kbd_dbms::CONDINFO &stCo int CGraphDataAcess::sendMessage(int appId, int channelId, int msgType, const QString &content, int domain) { int ret = 0; - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; msg.setData(content.toStdString()); msg.setMsgType(msgType); msg.setSubject(appId, channelId); @@ -635,7 +635,7 @@ int CGraphDataAcess::sendMessage(int appId, int channelId, int msgType, const QS int CGraphDataAcess::sendToPeer(int appId, int channelId, int msgType, const QString &commName, const QString &buffer, const QString &hostName, const QString &procName, const QString &instanceName) { - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; msg.setData(buffer.toStdString()); msg.setMsgType(msgType); msg.setSubject(appId, channelId); @@ -647,7 +647,7 @@ int CGraphDataAcess::sendToPeer(int appId, int channelId, int msgType, const QSt int CGraphDataAcess::sendToHost(int appId, int channelId, int msgType, const QString &buffer, const QString &hostName) { - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; msg.setData(buffer.toStdString()); msg.setMsgType(msgType); msg.setSubject(appId, channelId); @@ -1622,7 +1622,7 @@ QVariantList CGraphDataAcess::checkCtrlInterlock(const QString &strKeyIdTag, con bool CGraphDataAcess::health() { - kbd_sys::CRedundantInfoInterfacePtr ptrRedundancyInfo = kbd_sys::getRedundantInfoInstance(); + iot_sys::CRedundantInfoInterfacePtr ptrRedundancyInfo = iot_sys::getRedundantInfoInstance(); if(ptrRedundancyInfo == NULL) { return false; @@ -1633,7 +1633,7 @@ bool CGraphDataAcess::health() m_sysInfo->getLocalNodeInfo(stNodeInfo); // int appNo = getAppIdByName("base"); - kbd_sys::SNodeRedundantInfo stMasterNodeInfo; + iot_sys::SNodeRedundantInfo stMasterNodeInfo; if(kbdSuccess != ptrRedundancyInfo->getMasterNodeInfo(stNodeInfo.nDomainId, CN_AppId_BASE, stMasterNodeInfo)) { return false; @@ -1669,7 +1669,7 @@ int CGraphDataAcess::sendAlarm(const QStringList &alarmInfo) stAlmInfoFromApp.set_time_stamp(alarmInfo[1].toLongLong()); stAlmInfoFromApp.set_status(alarmInfo[2].toInt()); stAlmInfoFromApp.set_location_id(alarmInfo[3].toInt()); - stAlmInfoFromApp.set_alm_style(::kbd_idlfile::enAlmStyle(alarmInfo[4].toInt())); + stAlmInfoFromApp.set_alm_style(::iot_idl::enAlmStyle(alarmInfo[4].toInt())); stAlmInfoFromApp.set_region_id(-1); //责任区ID,HMI 系统操作责任区统一为-1 ,系统事件 SAlmKeyword stAlmKeyword; diff --git a/platform/src/gui/GraphDataAcess/CGraphDataAcess.h b/platform/src/gui/GraphDataAcess/CGraphDataAcess.h index c4d48e16..b9e3da22 100644 --- a/platform/src/gui/GraphDataAcess/CGraphDataAcess.h +++ b/platform/src/gui/GraphDataAcess/CGraphDataAcess.h @@ -14,10 +14,10 @@ #include "sys_dog_auth_api/DogAuthInterface.h" using namespace kbd_app; -using namespace kbd_dbms; -using namespace kbd_service; -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_dbms; +using namespace iot_service; +using namespace iot_public; +using namespace iot_idl; class GRAPHDATAACESSSHARED_EXPORT CGraphDataAcess : QObject { @@ -120,7 +120,7 @@ public slots: private: void getValueList(CRdbQueryResult &rdbResult, QVariantList &result); void getValueList(RdbRet *objReply, QVariantList &result); - int parseCondition(const QString &str, kbd_dbms::CONDINFO &stCondInfo); + int parseCondition(const QString &str, iot_dbms::CONDINFO &stCondInfo); private: QMap m_colMap; QMap m_stnDmMap; @@ -129,14 +129,14 @@ private: CDbApi *m_dbMng; CDbApi *m_dbWriter; - kbd_dbms::CRdbAccessEx *m_rdbAccess; - kbd_dbms::CRdbNetApi *m_rdbNetAccess; - kbd_net::CMbCommunicator *m_communicator; + iot_dbms::CRdbAccessEx *m_rdbAccess; + iot_dbms::CRdbNetApi *m_rdbNetAccess; + iot_net::CMbCommunicator *m_communicator; CPermMngApiPtr m_permMng; CSysInfoInterfacePtr m_sysInfo; CSimInterLockInterfacePtr m_lockCal; CAlmApiForApp *m_pAlmApi; - kbd_sys::CDogAuthInterfacePtr m_ptrDogAuth; + iot_sys::CDogAuthInterfacePtr m_ptrDogAuth; }; #endif // CGRAPHDATAACESS_H diff --git a/platform/src/gui/GraphPub/CBase.cpp b/platform/src/gui/GraphPub/CBase.cpp index 80f6b49a..2807d66d 100644 --- a/platform/src/gui/GraphPub/CBase.cpp +++ b/platform/src/gui/GraphPub/CBase.cpp @@ -10,7 +10,7 @@ CBase *CBaseInstance() CBase::CBase() { - QDir tempDir = QDir(QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir())); + QDir tempDir = QDir(QString::fromStdString(iot_public::CFileUtil::getCurModuleDir())); tempDir.cdUp(); tempDir.cdUp(); QString sys_home = tempDir.absolutePath(); @@ -32,10 +32,10 @@ void CBase::setSysHome(const QString &sys) } m_sysHome = sys; QChar spt = QDir::separator(); - m_pathTypeNameMap[PATH_TYPE_BIN] = QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir()) + spt; + m_pathTypeNameMap[PATH_TYPE_BIN] = QString::fromStdString(iot_public::CFileUtil::getCurModuleDir()) + spt; m_pathTypeNameMap[PATH_TYPE_DLL] = m_pathTypeNameMap[PATH_TYPE_BIN]; - const std::string strLanguage = std::move(kbd_public::getCurLanguage()); + const std::string strLanguage = std::move(iot_public::getCurLanguage()); m_pathTypeNameMap[PATH_TYPE_ICONSET] = getSysHome() + spt + DIR_PLAT_OR_PROD + spt + "common" + spt + "resource" + spt + QString::fromStdString(strLanguage) + spt + "gui" + spt + "icon" + spt + "hmi" + spt; @@ -485,7 +485,7 @@ QGradient stringToGradient(const QString &prostr) QString CBase::getSysLanguage() { - return QString::fromStdString(kbd_public::getCurLanguage()); + return QString::fromStdString(iot_public::getCurLanguage()); } QString CBase::getBrushStyle(const QBrush &brush, const QString &pix) @@ -616,7 +616,7 @@ int CBase::getIconPathNameByIconName(const QString &iconName, QString &iconPath) std::string CBase::getPathOfBinFile(const std::string &strFileName, std::string *pStrParentDir = nullptr) { - return kbd_public::CFileUtil::getPathOfBinFile(strFileName, pStrParentDir); + return iot_public::CFileUtil::getPathOfBinFile(strFileName, pStrParentDir); } int CBase::getPathName(int pathType, QString &pathName) diff --git a/platform/src/gui/GraphPub/CCanvasGenerator.cpp b/platform/src/gui/GraphPub/CCanvasGenerator.cpp index 3a28b403..c07e5a1c 100644 --- a/platform/src/gui/GraphPub/CCanvasGenerator.cpp +++ b/platform/src/gui/GraphPub/CCanvasGenerator.cpp @@ -325,7 +325,7 @@ void CCanvasGenerator::publishColorCfgInfo() xmls.CLOSE(); - std::string strStyleName = kbd_public::CFileStyle::getCurStyle(); + std::string strStyleName = iot_public::CFileStyle::getCurStyle(); if(strStyleName == "") { strStyleName = "light"; @@ -411,7 +411,7 @@ void CCanvasGenerator::beginIndex(const QString &fileName) CGStream outfs; outfs.SetMode(CGStream::xmlfile); m_indexStream = outfs.m_XMLStream; - std::string strStyleName = kbd_public::CFileStyle::getCurStyle(); + std::string strStyleName = iot_public::CFileStyle::getCurStyle(); if(strStyleName == "") { strStyleName = "light"; @@ -671,7 +671,7 @@ int CCanvasGenerator::publishHtml(CXMLStream &xmls, QString &fileName) CGStream outfs; outfs.SetMode(CGStream::xmlfile); CXMLStream &destXmls = outfs.m_XMLStream; - std::string strStyleName = kbd_public::CFileStyle::getCurStyle(); + std::string strStyleName = iot_public::CFileStyle::getCurStyle(); if(strStyleName == "") { strStyleName = "light"; @@ -1141,7 +1141,7 @@ int CCanvasGenerator::publishCanvas(CXMLStream &xmls, QString &fileName) GroupItemList.clear(); xmls.CLOSE(); - std::string strStyleName = kbd_public::CFileStyle::getCurStyle(); + std::string strStyleName = iot_public::CFileStyle::getCurStyle(); if(strStyleName == "") { strStyleName = "light"; @@ -1294,7 +1294,7 @@ int CCanvasGenerator::publishIcon(QString &iconName) releaseItem(planeMap); xmls.CLOSE(); - std::string strStyleName = kbd_public::CFileStyle::getCurStyle(); + std::string strStyleName = iot_public::CFileStyle::getCurStyle(); if(strStyleName == "") { strStyleName = "light"; diff --git a/platform/src/gui/GraphPub/CCanvasItem.cpp b/platform/src/gui/GraphPub/CCanvasItem.cpp index 66157984..732d9628 100644 --- a/platform/src/gui/GraphPub/CCanvasItem.cpp +++ b/platform/src/gui/GraphPub/CCanvasItem.cpp @@ -1900,7 +1900,7 @@ void CWidgetItem::write(QJsonObject &json, int plane) ret = CBaseInstance()->getValueByName(qssValue, m_styleSheet, "QPushButton", imageList[k], eventList[j]); if(ret == 1) { - const std::string fileStyle = kbd_public::CFileStyle::getCurStyle(); + const std::string fileStyle = iot_public::CFileStyle::getCurStyle(); int begin = qssValue.indexOf("(")+1; int end = qssValue.indexOf("back_pixmap"); if(begin == 0 || end == -1 || begin >= end) diff --git a/platform/src/gui/GraphShape/ChartShape/CChartDataQuery.cpp b/platform/src/gui/GraphShape/ChartShape/CChartDataQuery.cpp index acc73095..2f084bcf 100644 --- a/platform/src/gui/GraphShape/ChartShape/CChartDataQuery.cpp +++ b/platform/src/gui/GraphShape/ChartShape/CChartDataQuery.cpp @@ -1,14 +1,14 @@ #include "CChartDataQuery.h" #include "../../include/CBase.h" -using namespace kbd_dbms; +using namespace iot_dbms; CChartDataQuery::CChartDataQuery(long range, QObject *parent) : QObject(parent), m_tsdbConnPtr((CTsdbConn*)nullptr) { initTsdbApi(); m_range = range; - m_pDbReadApi = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + m_pDbReadApi = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); } CChartDataQuery::~CChartDataQuery() @@ -146,7 +146,7 @@ QMap CChartDataQuery::querySamFromTSDB(const TagSrcInfo &info, b qint64 nIntervalSecs = m_range * 1000; qint64 upper = QDateTime::currentMSecsSinceEpoch(); - kbd_dbms::CTsdbConnPtr tsdbConnPtr; + iot_dbms::CTsdbConnPtr tsdbConnPtr; if(getValidTsdbConnPtr(tsdbConnPtr)) { vecResult->push_back(new std::vector()); @@ -222,7 +222,7 @@ QMap CChartDataQuery::queryHisFromTSDB(const TagSrcInfo &info, b qint64 nIntervalSecs = m_range * 1000; qint64 upper = QDateTime::currentMSecsSinceEpoch(); - kbd_dbms::CTsdbConnPtr tsdbConnPtr; + iot_dbms::CTsdbConnPtr tsdbConnPtr; if(getValidTsdbConnPtr(tsdbConnPtr)) { vecResult->push_back(new std::vector()); @@ -279,7 +279,7 @@ QMap CChartDataQuery::queryHisFromTSDB(const TagSrcInfo &info, b return values; } -bool CChartDataQuery::getValidTsdbConnPtr(kbd_dbms::CTsdbConnPtr &ptr) +bool CChartDataQuery::getValidTsdbConnPtr(iot_dbms::CTsdbConnPtr &ptr) { if(m_tsdbConnPtr != NULL) { diff --git a/platform/src/gui/GraphShape/ChartShape/CChartDataQuery.h b/platform/src/gui/GraphShape/ChartShape/CChartDataQuery.h index 1bffc970..71755571 100644 --- a/platform/src/gui/GraphShape/ChartShape/CChartDataQuery.h +++ b/platform/src/gui/GraphShape/ChartShape/CChartDataQuery.h @@ -32,14 +32,14 @@ private: QMap querySamFromTSDB(const TagSrcInfo &info, bool &b); QMap queryHisFromTSDB(const TagSrcInfo &info, bool &b); - bool getValidTsdbConnPtr(kbd_dbms::CTsdbConnPtr &ptr); + bool getValidTsdbConnPtr(iot_dbms::CTsdbConnPtr &ptr); - kbd_dbms::EnMeasPiontType getTagType(const QString &strTagName); + iot_dbms::EnMeasPiontType getTagType(const QString &strTagName); private: long m_range; - kbd_dbms::CDbApi * m_pDbReadApi; - kbd_dbms::CTsdbConnPtr m_tsdbConnPtr; + iot_dbms::CDbApi * m_pDbReadApi; + iot_dbms::CTsdbConnPtr m_tsdbConnPtr; }; #endif // CCHARTDATAQUERY_H diff --git a/platform/src/gui/GraphTool/Retriever/CRetriever.cpp b/platform/src/gui/GraphTool/Retriever/CRetriever.cpp index b4e730ac..93198b13 100644 --- a/platform/src/gui/GraphTool/Retriever/CRetriever.cpp +++ b/platform/src/gui/GraphTool/Retriever/CRetriever.cpp @@ -245,7 +245,7 @@ void CRetriever::initPanel() void CRetriever::readDevTypeXml() { QDomDocument document; - QString strFileName = QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/retriever.xml"); + QString strFileName = QString::fromStdString(iot_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/retriever.xml"); QFile file(strFileName); if (!file.open(QIODevice::ReadOnly)) { diff --git a/platform/src/gui/GraphTool/WebPublish/CWaitDialog.cpp b/platform/src/gui/GraphTool/WebPublish/CWaitDialog.cpp index a739c72a..8202db97 100644 --- a/platform/src/gui/GraphTool/WebPublish/CWaitDialog.cpp +++ b/platform/src/gui/GraphTool/WebPublish/CWaitDialog.cpp @@ -53,7 +53,7 @@ int CWaitDialog::exec() return QDialog::Rejected; } - m_benginDuration = kbd_public::getUTCTimeMsec(); + m_benginDuration = iot_public::getUTCTimeMsec(); m_timer->start(100); emit thdStart(); m_ptrThread = boost::make_shared(m_fun); @@ -107,7 +107,7 @@ void CWaitDialog::slot_timeOut() m_ptrThread.reset(); } - int64 nowTime = kbd_public::getUTCTimeMsec(); + int64 nowTime = iot_public::getUTCTimeMsec(); if (nowTime - m_benginDuration > m_minimumDuration) { this->layout()->setEnabled(true); diff --git a/platform/src/gui/GraphTool/WebPublish/CWebPublish.cpp b/platform/src/gui/GraphTool/WebPublish/CWebPublish.cpp index 56b0a8db..7f6ec20b 100644 --- a/platform/src/gui/GraphTool/WebPublish/CWebPublish.cpp +++ b/platform/src/gui/GraphTool/WebPublish/CWebPublish.cpp @@ -179,7 +179,7 @@ void CWebPublish::publish() { int ret = 1; - std::string strStyleName = kbd_public::CFileStyle::getCurStyle("light"); + std::string strStyleName = iot_public::CFileStyle::getCurStyle("light"); int backRet = 1; if(ui->m_imageCheck->checkState() == Qt::Checked) //拷贝BITMAP文件 { diff --git a/platform/src/gui/GraphTool/WebPublish/CWebPublish.h b/platform/src/gui/GraphTool/WebPublish/CWebPublish.h index 280b7ae0..02c85881 100644 --- a/platform/src/gui/GraphTool/WebPublish/CWebPublish.h +++ b/platform/src/gui/GraphTool/WebPublish/CWebPublish.h @@ -9,7 +9,7 @@ namespace Ui { class MainWindow; } -using namespace kbd_public; +using namespace iot_public; class WEBPUBLISH CWebPublish : public QDialog { Q_OBJECT diff --git a/platform/src/gui/hmi/CDesignerWnd.cpp b/platform/src/gui/hmi/CDesignerWnd.cpp index b3efe3d0..1ee9db94 100644 --- a/platform/src/gui/hmi/CDesignerWnd.cpp +++ b/platform/src/gui/hmi/CDesignerWnd.cpp @@ -1577,8 +1577,8 @@ bool CDesignerWnd::toolOpen() { QAction *action = dynamic_cast(sender()); QString name = action->data().toString(); - const std::string strPath = std::move(kbd_public::CFileUtil::getPathOfBinFile( - name.toStdString() + kbd_public::CFileUtil::getProcSuffix())); + const std::string strPath = std::move(iot_public::CFileUtil::getPathOfBinFile( + name.toStdString() + iot_public::CFileUtil::getProcSuffix())); if(strPath.empty()) { LOGERROR("未找到可执行文件%s", name.toStdString().c_str()); diff --git a/platform/src/gui/hmi/CExplorerScene.cpp b/platform/src/gui/hmi/CExplorerScene.cpp index 097ddad6..76ce6556 100644 --- a/platform/src/gui/hmi/CExplorerScene.cpp +++ b/platform/src/gui/hmi/CExplorerScene.cpp @@ -8,7 +8,7 @@ #include "../GraphShape/include/CBusShape.h" -using namespace kbd_service; +using namespace iot_service; CExplorerScene::CExplorerScene(): CGraphScene() { diff --git a/platform/src/gui/hmi/CExplorerScene.h b/platform/src/gui/hmi/CExplorerScene.h index 6aa8e997..b9f24b42 100644 --- a/platform/src/gui/hmi/CExplorerScene.h +++ b/platform/src/gui/hmi/CExplorerScene.h @@ -72,8 +72,8 @@ private: QMultiMap m_DValueMultiMap; QVector m_DValueVect; - kbd_service::CDpcdaForApp *m_dataReq; - //kbd_net::CMbCommunicator * m_communicator; + iot_service::CDpcdaForApp *m_dataReq; + //iot_net::CMbCommunicator * m_communicator; }; #endif // CEXPLORERSCENE_H diff --git a/platform/src/gui/hmi/CExplorerView.cpp b/platform/src/gui/hmi/CExplorerView.cpp index c8d40bed..6fbd6d71 100644 --- a/platform/src/gui/hmi/CExplorerView.cpp +++ b/platform/src/gui/hmi/CExplorerView.cpp @@ -1209,7 +1209,7 @@ int CExplorerView::InitMsg(QString instance) Q_UNUSED(instance) if (m_communicator == NULL) { - m_communicator = new kbd_net::CMbCommunicator(); + m_communicator = new iot_net::CMbCommunicator(); } return 1; } @@ -1227,7 +1227,7 @@ QString CExplorerView::getCommName() QList CExplorerView::recvMessage(int msgType) { QList retList; - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; if (m_communicator) { if(m_communicator->recvMsg(msg, 50)) diff --git a/platform/src/gui/hmi/CExplorerView.h b/platform/src/gui/hmi/CExplorerView.h index 053b915f..aa5ef49d 100644 --- a/platform/src/gui/hmi/CExplorerView.h +++ b/platform/src/gui/hmi/CExplorerView.h @@ -199,7 +199,7 @@ private: QMap > m_menuItemMap; QMap m_menuMap; CSimulate *m_simulate; - kbd_net::CMbCommunicator *m_communicator; + iot_net::CMbCommunicator *m_communicator; }; #endif // CEXPLORERVIEW_H diff --git a/platform/src/gui/hmi/CExplorerWnd.cpp b/platform/src/gui/hmi/CExplorerWnd.cpp index ccf5aa31..c2a473a9 100644 --- a/platform/src/gui/hmi/CExplorerWnd.cpp +++ b/platform/src/gui/hmi/CExplorerWnd.cpp @@ -253,7 +253,7 @@ void CExplorerWnd::fileOpen() void CExplorerWnd::showCheckDogInfo() { - kbd_sys::CDogAuthInterfacePtr ptrDogAuth = kbd_sys::getDogAuthInstance(); + iot_sys::CDogAuthInterfacePtr ptrDogAuth = iot_sys::getDogAuthInstance(); int nRet = ptrDogAuth->checkAuthStatus(); if(nRet == AUTH_STATUS_OK) { @@ -888,7 +888,7 @@ bool CExplorerWnd::startDetached(const QString &program, const QString &argument { #ifdef OS_WINDOWS const std::string strFileName = program.toStdString(); - std::string strPath = kbd_public::CFileUtil::getPathOfBinFile(strFileName); + std::string strPath = iot_public::CFileUtil::getPathOfBinFile(strFileName); if(strPath.empty()) { //< 也许配置的是外部脚本，不在我们的路径中 @@ -898,7 +898,7 @@ bool CExplorerWnd::startDetached(const QString &program, const QString &argument #else QString temp = program; const std::string strFileName = temp.remove(temp.size()-4,4).toStdString() + ".sh"; - std::string strPath = kbd_public::CFileUtil::getPathOfBinFile(strFileName); + std::string strPath = iot_public::CFileUtil::getPathOfBinFile(strFileName); if(strPath.empty()) { //< 也许配置的是外部脚本，不在我们的路径中 @@ -910,7 +910,7 @@ bool CExplorerWnd::startDetached(const QString &program, const QString &argument else { const std::string strFileName = program.toStdString(); - std::string strPath = kbd_public::CFileUtil::getPathOfBinFile(strFileName); + std::string strPath = iot_public::CFileUtil::getPathOfBinFile(strFileName); if(strPath.empty()) { //< 也许配置的是外部程序，不在我们的路径中 diff --git a/platform/src/gui/hmi/CGraphApp.cpp b/platform/src/gui/hmi/CGraphApp.cpp index 902d5aef..0bdf1bfa 100644 --- a/platform/src/gui/hmi/CGraphApp.cpp +++ b/platform/src/gui/hmi/CGraphApp.cpp @@ -15,7 +15,7 @@ #include "MessageChannel.h" #include "DataProcMessage.pb.h" -using namespace kbd_idlfile; +using namespace iot_idl; #ifdef OS_WINDOWS #include @@ -126,8 +126,8 @@ CGraphApp::~CGraphApp() m_ptrDogAuth.reset(); CDpcdaForApp::releaseGlobalThread(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); } @@ -169,9 +169,9 @@ void CGraphApp::runApp(QString name) m_curDWndIndex = 0; m_registerName = name; - kbd_public::StartLogSystem("HMI", "hmi"); + iot_public::StartLogSystem("HMI", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + if (!(iot_net::initMsgBus("HMI", "HMI"))) { LOGERROR("initMsgBus fail return;"); return; @@ -179,13 +179,13 @@ void CGraphApp::runApp(QString name) CDpcdaForApp::initGlobalThread(); - m_communicator = new kbd_net::CMbCommunicator("HMI_CHG_DATA"); + m_communicator = new iot_net::CMbCommunicator("HMI_CHG_DATA"); m_communicator->addSub(0, CH_SCADA_TO_HMI_DATA_CHANGE); m_communicator->addSub(0, CH_SCADA_TO_HMI_DATA_UPDATE); m_communicator->addSub(0, CH_LINK_TO_HMI_CTRL_UP); m_communicator->addSub(0, CH_FILE_UPDATE_NOTICE); - m_ptrDogAuth = kbd_sys::getDogAuthInstance(); + m_ptrDogAuth = iot_sys::getDogAuthInstance(); m_dataAccess = new CGraphDataAcess(this); m_graphDoc = new CGraphDoc(); @@ -929,7 +929,7 @@ void CGraphApp::timerEvent(QTimerEvent *e) processChangeData(); } - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; for (int i = 0; i < 6; i++) { if (m_communicator->recvMsg(msg, 0)) diff --git a/platform/src/gui/hmi/CGraphApp.h b/platform/src/gui/hmi/CGraphApp.h index 582fe4c4..6bffe691 100644 --- a/platform/src/gui/hmi/CGraphApp.h +++ b/platform/src/gui/hmi/CGraphApp.h @@ -150,8 +150,8 @@ private: bool m_forceRequery; GraphDispInfo m_graphDispInfo; - kbd_net::CMbCommunicator *m_communicator; - kbd_sys::CDogAuthInterfacePtr m_ptrDogAuth; + iot_net::CMbCommunicator *m_communicator; + iot_sys::CDogAuthInterfacePtr m_ptrDogAuth; bool m_bRunning; QString m_serverName; diff --git a/platform/src/gui/hmi/CGraphDoc.cpp b/platform/src/gui/hmi/CGraphDoc.cpp index 16c57547..bb125667 100644 --- a/platform/src/gui/hmi/CGraphDoc.cpp +++ b/platform/src/gui/hmi/CGraphDoc.cpp @@ -38,25 +38,25 @@ void CGraphDoc::readModelInfo() } } -int CGraphDoc::addToChgDataMap(const kbd_net::CMbMessage &msg, long long &ntimestamp) +int CGraphDoc::addToChgDataMap(const iot_net::CMbMessage &msg, long long &ntimestamp) { QTime time; time.start(); - ::kbd_idlfile::SRealTimeDataPkg chgDataPkg; + ::iot_idl::SRealTimeDataPkg chgDataPkg; try { AppKeyStru appKey; ChgDataStru chgData; chgDataPkg.ParseFromArray(msg.getDataPtr(), msg.getDataSize()); - ::kbd_idlfile::SRealTimePkgHead head = chgDataPkg.sthead(); + ::iot_idl::SRealTimePkgHead head = chgDataPkg.sthead(); ntimestamp = head.ntimestamp(); int aiSize = chgDataPkg.stairtd_size(); LOGDEBUG("change data, aiSize: %d", aiSize); for(int i = 0;i < aiSize; i++) { - ::kbd_idlfile::SAiRealTimeData aiStru = chgDataPkg.stairtd(i); + ::iot_idl::SAiRealTimeData aiStru = chgDataPkg.stairtd(i); //LOGINFO("ndomainid: %d, nappid: %d, strtagname: %s, strcolumnname: %s", aiStru.nlocation(), aiStru.nsubsystem(), aiStru.strtagname().c_str(), aiStru.strcolumnname().c_str()); appKey.tag_name = transTagName(aiStru.nlocation(), aiStru.nsubsystem(), aiStru.strtablename(), aiStru.strtagname(), aiStru.strcolumnname()); chgData.value = QVariant::fromValue(aiStru.fvalue()); @@ -69,7 +69,7 @@ int CGraphDoc::addToChgDataMap(const kbd_net::CMbMessage &msg, long long &ntimes LOGDEBUG("change data, diSize: %d - %lld - %s", diSize, ntimestamp, head.strsrctag().c_str()); for(int i = 0;i < diSize; i++) { - ::kbd_idlfile::SDiRealTimeData diStru = chgDataPkg.stdirtd(i); + ::iot_idl::SDiRealTimeData diStru = chgDataPkg.stdirtd(i); //LOGINFO("ndomainid: %d, nappid: %d, strtagname: %s, strcolumnname: %s", diStru.nlocation(), diStru.nsubsystem(), diStru.strtagname().c_str(), diStru.strcolumnname().c_str()); appKey.tag_name = transTagName(diStru.nlocation(), diStru.nsubsystem(), diStru.strtablename(), diStru.strtagname(), diStru.strcolumnname()); chgData.value = QVariant::fromValue(diStru.nvalue()); @@ -82,7 +82,7 @@ int CGraphDoc::addToChgDataMap(const kbd_net::CMbMessage &msg, long long &ntimes LOGDEBUG("change data, piSize: %d", piSize); for(int i = 0;i < piSize; i++) { - ::kbd_idlfile::SPiRealTimeData piStru = chgDataPkg.stpirtd(i); + ::iot_idl::SPiRealTimeData piStru = chgDataPkg.stpirtd(i); //LOGINFO("ndomainid: %d, nappid: %d, strtagname: %s, strcolumnname: %s", piStru.nlocation(), piStru.nsubsystem(), piStru.strtagname().c_str(), piStru.strcolumnname().c_str()); appKey.tag_name = transTagName(piStru.nlocation(), piStru.nsubsystem(), piStru.strtablename(), piStru.strtagname(), piStru.strcolumnname()); chgData.value = QVariant::fromValue(piStru.dvalue()); @@ -95,7 +95,7 @@ int CGraphDoc::addToChgDataMap(const kbd_net::CMbMessage &msg, long long &ntimes LOGDEBUG("change data, miSize: %d", miSize); for(int i = 0;i < miSize; i++) { - ::kbd_idlfile::SMiRealTimeData miStru = chgDataPkg.stmirtd(i); + ::iot_idl::SMiRealTimeData miStru = chgDataPkg.stmirtd(i); appKey.tag_name = transTagName(miStru.nlocation(), miStru.nsubsystem(), miStru.strtablename(), miStru.strtagname(), miStru.strcolumnname()); chgData.value = QVariant::fromValue(miStru.nvalue()); chgData.status = miStru.ustatus(); @@ -108,40 +108,40 @@ int CGraphDoc::addToChgDataMap(const kbd_net::CMbMessage &msg, long long &ntimes for(int i = 0;i < utSize; i++) { - ::kbd_idlfile::STableRealTimeData utStru = chgDataPkg.sttblrtd(i); + ::iot_idl::STableRealTimeData utStru = chgDataPkg.sttblrtd(i); //LOGINFO("ndomainid: %d, nappid: %d, strtagname: %s, strcolumnname: %s", utStru.nlocation(), utStru.nsubsystem(), utStru.strtagname().c_str(), utStru.strcolumnname().c_str()); appKey.tag_name = transTagName(utStru.nlocation(), utStru.nsubsystem(), utStru.strtablename(), utStru.strtagname(), utStru.strcolumnname()); - kbd_idlfile::SVariable value = utStru.varvalue(); - if(value.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_BOOL) + iot_idl::SVariable value = utStru.varvalue(); + if(value.edatatype() == iot_idl::DataType::CN_DATATYPE_BOOL) { chgData.value = QVariant::fromValue(value.bvalue()); } - else if(value.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_UINT32) + else if(value.edatatype() == iot_idl::DataType::CN_DATATYPE_UINT32) { chgData.value = QVariant::fromValue(value.uvalue()); } - else if(value.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_INT32) + else if(value.edatatype() == iot_idl::DataType::CN_DATATYPE_INT32) { chgData.value = QVariant::fromValue(value.nvalue()); } - else if(value.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_UINT64) + else if(value.edatatype() == iot_idl::DataType::CN_DATATYPE_UINT64) { chgData.value = QVariant::fromValue(value.ulvalue()); } - else if(value.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_INT64) + else if(value.edatatype() == iot_idl::DataType::CN_DATATYPE_INT64) { chgData.value = QVariant::fromValue(value.lvalue()); } - else if(value.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_FLOAT) + else if(value.edatatype() == iot_idl::DataType::CN_DATATYPE_FLOAT) { chgData.value = QVariant::fromValue(value.fvalue()); } - else if(value.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_DOUBLE) + else if(value.edatatype() == iot_idl::DataType::CN_DATATYPE_DOUBLE) { chgData.value = QVariant::fromValue(value.dvalue()); } - else if(value.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_STRING || - value.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_BYTES) + else if(value.edatatype() == iot_idl::DataType::CN_DATATYPE_STRING || + value.edatatype() == iot_idl::DataType::CN_DATATYPE_BYTES) { QString str = QString::fromStdString(value.strvalue()); chgData.value = QVariant::fromValue(str); diff --git a/platform/src/gui/hmi/CGraphDoc.h b/platform/src/gui/hmi/CGraphDoc.h index 5e1fe394..ee800e13 100644 --- a/platform/src/gui/hmi/CGraphDoc.h +++ b/platform/src/gui/hmi/CGraphDoc.h @@ -7,7 +7,7 @@ #include "../../include/net/net_msg_bus_api/CMbMessage.h" #include "../../include/public/pub_sysinfo_api/SysInfoApi.h" -using namespace kbd_public; +using namespace iot_public; struct AppKeyStru { @@ -65,7 +65,7 @@ public: virtual ~CGraphDoc(); public: void readModelInfo(); - int addToChgDataMap(const kbd_net::CMbMessage &msg, long long &ntimestamp); + int addToChgDataMap(const iot_net::CMbMessage &msg, long long &ntimestamp); ChgDataMap &getChgDataMap(); ChgStatusMap &getChgStatusMap(); int resetChgDataMap(); diff --git a/platform/src/gui/hmi/dialog/dataBindCheck/CBindCheck.cpp b/platform/src/gui/hmi/dialog/dataBindCheck/CBindCheck.cpp index 83b99b1c..6d3f7992 100644 --- a/platform/src/gui/hmi/dialog/dataBindCheck/CBindCheck.cpp +++ b/platform/src/gui/hmi/dialog/dataBindCheck/CBindCheck.cpp @@ -8,7 +8,7 @@ CBindCheck::CBindCheck(QObject *parent) void CBindCheck::slotBindCheck(QList resultList) { - kbd_dbms::CDbApi dbRead(DB_CONN_MODEL_READ); + iot_dbms::CDbApi dbRead(DB_CONN_MODEL_READ); if(!dbRead.open()) { emit sigCheckResult(QList()); @@ -126,7 +126,7 @@ void CBindCheck::slotBindCheck(QList resultList) emit sigCheckResult(resultList); } -bool CBindCheck::queryTagName(kbd_dbms::CDbApi &dbRead, const QString &table, QMap &tagDesc) +bool CBindCheck::queryTagName(iot_dbms::CDbApi &dbRead, const QString &table, QMap &tagDesc) { if(!dbRead.isOpen()) { @@ -152,7 +152,7 @@ bool CBindCheck::queryTagName(kbd_dbms::CDbApi &dbRead, const QString &table, QM return true; } -bool CBindCheck::querySubIdTag(kbd_dbms::CDbApi &dbRead, QMap &tagId) +bool CBindCheck::querySubIdTag(iot_dbms::CDbApi &dbRead, QMap &tagId) { if(!dbRead.isOpen()) { @@ -178,7 +178,7 @@ bool CBindCheck::querySubIdTag(kbd_dbms::CDbApi &dbRead, QMap &tag return true; } -bool CBindCheck::queryColumnExist(kbd_dbms::CDbApi &dbRead, const QString &table, const QString &column) +bool CBindCheck::queryColumnExist(iot_dbms::CDbApi &dbRead, const QString &table, const QString &column) { if(!dbRead.isOpen()) { @@ -204,7 +204,7 @@ bool CBindCheck::queryColumnExist(kbd_dbms::CDbApi &dbRead, const QString &table return ret; } -bool CBindCheck::queryKeyFromTable(kbd_dbms::CDbApi &dbRead, const QString &table, QString &column) +bool CBindCheck::queryKeyFromTable(iot_dbms::CDbApi &dbRead, const QString &table, QString &column) { if(!dbRead.isOpen()) { @@ -231,7 +231,7 @@ bool CBindCheck::queryKeyFromTable(kbd_dbms::CDbApi &dbRead, const QString &tabl return false; } -bool CBindCheck::queryPointExist(kbd_dbms::CDbApi &dbRead, const QString &table, const QString &column, const QString &point) +bool CBindCheck::queryPointExist(iot_dbms::CDbApi &dbRead, const QString &table, const QString &column, const QString &point) { if(!dbRead.isOpen()) { @@ -256,7 +256,7 @@ bool CBindCheck::queryPointExist(kbd_dbms::CDbApi &dbRead, const QString &table, return ret; } -bool CBindCheck::queryPointDesc(kbd_dbms::CDbApi &dbRead, const QString &table, const QString &tagName, QString &desc) +bool CBindCheck::queryPointDesc(iot_dbms::CDbApi &dbRead, const QString &table, const QString &tagName, QString &desc) { if(!dbRead.isOpen()) { @@ -267,10 +267,10 @@ bool CBindCheck::queryPointDesc(kbd_dbms::CDbApi &dbRead, const QString &table, QList listColName; listColName.append("DESCRIPTION"); listColName.append("DEVICE"); - kbd_dbms::CDbCondition objCondition; + iot_dbms::CDbCondition objCondition; objCondition.m_sColName = "TAG_NAME"; - objCondition.m_eLogic = kbd_dbms::CDbCondition::LOGIC_AND; - objCondition.m_eCompare = kbd_dbms::CDbCondition::COMPARE_EQ; + objCondition.m_eLogic = iot_dbms::CDbCondition::LOGIC_AND; + objCondition.m_eCompare = iot_dbms::CDbCondition::COMPARE_EQ; objCondition.m_value = tagName; if(!dbRead.select(table, listColName, objCondition, query)) @@ -290,10 +290,10 @@ bool CBindCheck::queryPointDesc(kbd_dbms::CDbApi &dbRead, const QString &table, QList listColName; listColName.append("DESCRIPTION"); listColName.append("GROUP_TAG_NAME"); - kbd_dbms::CDbCondition objCondition; + iot_dbms::CDbCondition objCondition; objCondition.m_sColName = "TAG_NAME"; - objCondition.m_eLogic = kbd_dbms::CDbCondition::LOGIC_AND; - objCondition.m_eCompare = kbd_dbms::CDbCondition::COMPARE_EQ; + objCondition.m_eLogic = iot_dbms::CDbCondition::LOGIC_AND; + objCondition.m_eCompare = iot_dbms::CDbCondition::COMPARE_EQ; objCondition.m_value = device; if(!dbRead.select(DEV_INFO, listColName, objCondition, query)) @@ -310,10 +310,10 @@ bool CBindCheck::queryPointDesc(kbd_dbms::CDbApi &dbRead, const QString &table, QList listColName; listColName.append("DESCRIPTION"); - kbd_dbms::CDbCondition objCondition; + iot_dbms::CDbCondition objCondition; objCondition.m_sColName = "TAG_NAME"; - objCondition.m_eLogic = kbd_dbms::CDbCondition::LOGIC_AND; - objCondition.m_eCompare = kbd_dbms::CDbCondition::COMPARE_EQ; + objCondition.m_eLogic = iot_dbms::CDbCondition::LOGIC_AND; + objCondition.m_eCompare = iot_dbms::CDbCondition::COMPARE_EQ; objCondition.m_value = devGroup; if(!dbRead.select(DEV_GROUP, listColName, objCondition, query)) diff --git a/platform/src/gui/hmi/dialog/dataBindCheck/CBindCheck.h b/platform/src/gui/hmi/dialog/dataBindCheck/CBindCheck.h index a6cd8c64..7132c853 100644 --- a/platform/src/gui/hmi/dialog/dataBindCheck/CBindCheck.h +++ b/platform/src/gui/hmi/dialog/dataBindCheck/CBindCheck.h @@ -24,12 +24,12 @@ public slots: void slotBindCheck(QList resultList); private: - bool queryTagName(kbd_dbms::CDbApi &dbRead, const QString &table, QMap &tagDesc); - bool querySubIdTag(kbd_dbms::CDbApi &dbRead, QMap &tagId); - bool queryColumnExist(kbd_dbms::CDbApi &dbRead, const QString &table, const QString &column); - bool queryKeyFromTable(kbd_dbms::CDbApi &dbRead, const QString &table, QString &column); //查询第一个主键 - bool queryPointExist(kbd_dbms::CDbApi &dbRead, const QString &table, const QString &column, const QString &point); - bool queryPointDesc(kbd_dbms::CDbApi &dbRead, const QString &table, const QString &tagName, QString &desc); + bool queryTagName(iot_dbms::CDbApi &dbRead, const QString &table, QMap &tagDesc); + bool querySubIdTag(iot_dbms::CDbApi &dbRead, QMap &tagId); + bool queryColumnExist(iot_dbms::CDbApi &dbRead, const QString &table, const QString &column); + bool queryKeyFromTable(iot_dbms::CDbApi &dbRead, const QString &table, QString &column); //查询第一个主键 + bool queryPointExist(iot_dbms::CDbApi &dbRead, const QString &table, const QString &column, const QString &point); + bool queryPointDesc(iot_dbms::CDbApi &dbRead, const QString &table, const QString &tagName, QString &desc); private: QStringList m_listPoint; diff --git a/platform/src/gui/hmi/dialog/loginDialog/CLoginDlg.cpp b/platform/src/gui/hmi/dialog/loginDialog/CLoginDlg.cpp index b4701f24..9403d252 100644 --- a/platform/src/gui/hmi/dialog/loginDialog/CLoginDlg.cpp +++ b/platform/src/gui/hmi/dialog/loginDialog/CLoginDlg.cpp @@ -7,13 +7,13 @@ #include #include -using namespace kbd_service; +using namespace iot_service; CLoginDlg::CLoginDlg(QWidget *parent) : QDialog(parent) { setWindowTitle(tr("登录")); initLayout(); - m_ptrPerm = kbd_service::getPermMngInstance("base"); + m_ptrPerm = iot_service::getPermMngInstance("base"); if(m_ptrPerm->PermDllInit() != 0) { } diff --git a/platform/src/gui/hmi/dialog/loginDialog/CLoginDlg.h b/platform/src/gui/hmi/dialog/loginDialog/CLoginDlg.h index b599878b..07229794 100644 --- a/platform/src/gui/hmi/dialog/loginDialog/CLoginDlg.h +++ b/platform/src/gui/hmi/dialog/loginDialog/CLoginDlg.h @@ -27,7 +27,7 @@ private: QPushButton *m_loginBtn; QPushButton *m_cancleBtn; - kbd_service::CPermMngApiPtr m_ptrPerm; + iot_service::CPermMngApiPtr m_ptrPerm; private slots: void onLogin(); void onUserNameChanged(const QString &text); diff --git a/platform/src/idl_files/AlarmMessage.pb.cc b/platform/src/idl_files/AlarmMessage.pb.cc index b3ef7c8a..7c68a985 100644 --- a/platform/src/idl_files/AlarmMessage.pb.cc +++ b/platform/src/idl_files/AlarmMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -421,7 +421,7 @@ void protobuf_AddDesc_AlarmMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\022AlarmMessage.proto\022\013kbd_idlfile\"\200\001\n\nSA" + "\n\022AlarmMessage.proto\022\013iot_idl\"\200\001\n\nSA" "lmManner\022\020\n\010priority\030\001 \002(\005\022\025\n\rif_ack_on_" "rtn\030\002 \002(\005\022\026\n\016del_act_on_ack\030\003 \002(\005\022\033\n\023if_" "never_alm_on_rtn\030\004 \002(\005\022\024\n\014if_water_alm\030\005" @@ -429,8 +429,8 @@ void protobuf_AddDesc_AlarmMessage_2eproto() { "\030\002 \002(\t\"\233\003\n\017SAlmInfoFromApp\022\020\n\010alm_type\030\001" " \002(\005\022\016\n\006status\030\002 \002(\005\022\022\n\ntime_stamp\030\003 \002(\003" "\022\023\n\013location_id\030\004 \002(\005\022*\n\talm_style\030\005 \002(\016" - "2\027.kbd_idlfile.enAlmStyle\022-\n\013alm_keyword" - "\030\006 \003(\0132\030.kbd_idlfile.SAlmKeyword\022\022\n\nsub_" + "2\027.iot_idl.enAlmStyle\022-\n\013alm_keyword" + "\030\006 \003(\0132\030.iot_idl.SAlmKeyword\022\022\n\nsub_" "system\030\007 \001(\005\022\020\n\010dev_type\030\010 \001(\005\022\021\n\tregion" "_id\030\t \001(\005\022\025\n\rdev_group_tag\030\n \001(\t\022\022\n\nkey_" "id_tag\030\013 \001(\t\022\022\n\ngraph_name\030\014 \001(\t\022\022\n\nsoun" @@ -438,12 +438,12 @@ void protobuf_AddDesc_AlarmMessage_2eproto() { "dlfile.SAlmManner\022\022\n\ncamera_tag\030\017 \001(\t\022\025\n" "\rcamera_preset\030\020 \001(\t\"_\n\nSAppAddAlm\022\021\n\tdo" "main_id\030\001 \001(\005\022\016\n\006app_id\030\002 \001(\005\022.\n\010alm_inf" - "o\030\003 \003(\0132\034.kbd_idlfile.SAlmInfoFromApp\"]\n" + "o\030\003 \003(\0132\034.iot_idl.SAlmInfoFromApp\"]\n" "\013SAppAddWave\022\022\n\nstart_time\030\001 \002(\003\022\020\n\010end_" "time\030\002 \002(\003\022\025\n\rdev_group_tag\030\003 \002(\t\022\021\n\twav" "e_file\030\004 \002(\t\"\233\004\n\020SAlmInfoToAlmClt\022\020\n\010alm" "_type\030\001 \002(\005\022\022\n\nalm_status\030\002 \002(\005\0221\n\013logic" - "_state\030\003 \002(\0162\034.kbd_idlfile.enAlmLogicSta" + "_state\030\003 \002(\0162\034.iot_idl.enAlmLogicSta" "te\022\022\n\ntime_stamp\030\004 \002(\003\022\021\n\tdomain_id\030\005 \002(" "\005\022\023\n\013location_id\030\006 \002(\005\022\016\n\006app_id\030\007 \002(\005\022\020" "\n\010priority\030\010 \002(\005\022\025\n\rif_ack_on_rtn\030\t \002(\005\022" @@ -472,10 +472,10 @@ void protobuf_AddDesc_AlarmMessage_2eproto() { "\007 \002(\005\022\023\n\013uuid_base64\030\010 \002(\t\022\017\n\007content\030\t " "\002(\t\022\022\n\nsub_system\030\n \001(\005\022\020\n\010dev_type\030\013 \001(" "\005\022\021\n\tregion_id\030\014 \001(\005\0221\n\013logic_state\030\r \001(" - "\0162\034.kbd_idlfile.enAlmLogicState\022\025\n\rdev_g" + "\0162\034.iot_idl.enAlmLogicState\022\025\n\rdev_g" "roup_tag\030\016 \001(\t\022\022\n\nkey_id_tag\030\017 \001(\t\022\021\n\twa" "ve_file\030\020 \001(\t\"@\n\rSEvtCltAddEvt\022/\n\010evt_in" - "fo\030\001 \003(\0132\035.kbd_idlfile.SEvtInfoToEvtClt*" + "fo\030\001 \003(\0132\035.iot_idl.SEvtInfoToEvtClt*" "\304\003\n\014enAlmMsgType\022\024\n\020MT_ALM_AP2AS_ADD\020\001\022\030" "\n\024MT_ALM_AS2AP_ADD_ACK\020\002\022\025\n\021MT_ALM_AP2AS" "_WAVE\020\003\022\031\n\025MT_ALM_AS2AP_WAVE_ACK\020\004\022\026\n\022MT" @@ -613,7 +613,7 @@ const int SAlmManner::kIfWaterAlmFieldNumber; SAlmManner::SAlmManner() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SAlmManner) + // @@protoc_insertion_point(constructor:iot_idl.SAlmManner) } void SAlmManner::InitAsDefaultInstance() { @@ -623,7 +623,7 @@ SAlmManner::SAlmManner(const SAlmManner& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SAlmManner) + // @@protoc_insertion_point(copy_constructor:iot_idl.SAlmManner) } void SAlmManner::SharedCtor() { @@ -637,7 +637,7 @@ void SAlmManner::SharedCtor() { } SAlmManner::~SAlmManner() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SAlmManner) + // @@protoc_insertion_point(destructor:iot_idl.SAlmManner) SharedDtor(); } @@ -693,7 +693,7 @@ bool SAlmManner::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SAlmManner) + // @@protoc_insertion_point(parse_start:iot_idl.SAlmManner) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -787,17 +787,17 @@ bool SAlmManner::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SAlmManner) + // @@protoc_insertion_point(parse_success:iot_idl.SAlmManner) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SAlmManner) + // @@protoc_insertion_point(parse_failure:iot_idl.SAlmManner) return false; #undef DO_ } void SAlmManner::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SAlmManner) + // @@protoc_insertion_point(serialize_start:iot_idl.SAlmManner) // required int32 priority = 1; if (has_priority()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->priority(), output); @@ -827,12 +827,12 @@ void SAlmManner::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SAlmManner) + // @@protoc_insertion_point(serialize_end:iot_idl.SAlmManner) } ::google::protobuf::uint8* SAlmManner::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SAlmManner) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SAlmManner) // required int32 priority = 1; if (has_priority()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->priority(), target); @@ -862,7 +862,7 @@ void SAlmManner::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SAlmManner) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SAlmManner) return target; } @@ -1001,7 +1001,7 @@ const int SAlmKeyword::kValueFieldNumber; SAlmKeyword::SAlmKeyword() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SAlmKeyword) + // @@protoc_insertion_point(constructor:iot_idl.SAlmKeyword) } void SAlmKeyword::InitAsDefaultInstance() { @@ -1011,7 +1011,7 @@ SAlmKeyword::SAlmKeyword(const SAlmKeyword& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SAlmKeyword) + // @@protoc_insertion_point(copy_constructor:iot_idl.SAlmKeyword) } void SAlmKeyword::SharedCtor() { @@ -1023,7 +1023,7 @@ void SAlmKeyword::SharedCtor() { } SAlmKeyword::~SAlmKeyword() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SAlmKeyword) + // @@protoc_insertion_point(destructor:iot_idl.SAlmKeyword) SharedDtor(); } @@ -1073,7 +1073,7 @@ bool SAlmKeyword::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SAlmKeyword) + // @@protoc_insertion_point(parse_start:iot_idl.SAlmKeyword) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1124,17 +1124,17 @@ bool SAlmKeyword::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SAlmKeyword) + // @@protoc_insertion_point(parse_success:iot_idl.SAlmKeyword) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SAlmKeyword) + // @@protoc_insertion_point(parse_failure:iot_idl.SAlmKeyword) return false; #undef DO_ } void SAlmKeyword::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SAlmKeyword) + // @@protoc_insertion_point(serialize_start:iot_idl.SAlmKeyword) // required int32 id = 1; if (has_id()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->id(), output); @@ -1154,12 +1154,12 @@ void SAlmKeyword::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SAlmKeyword) + // @@protoc_insertion_point(serialize_end:iot_idl.SAlmKeyword) } ::google::protobuf::uint8* SAlmKeyword::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SAlmKeyword) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SAlmKeyword) // required int32 id = 1; if (has_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->id(), target); @@ -1180,7 +1180,7 @@ void SAlmKeyword::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SAlmKeyword) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SAlmKeyword) return target; } @@ -1300,18 +1300,18 @@ const int SAlmInfoFromApp::kCameraPresetFieldNumber; SAlmInfoFromApp::SAlmInfoFromApp() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SAlmInfoFromApp) + // @@protoc_insertion_point(constructor:iot_idl.SAlmInfoFromApp) } void SAlmInfoFromApp::InitAsDefaultInstance() { - alm_manner_ = const_cast< ::kbd_idlfile::SAlmManner*>(&::kbd_idlfile::SAlmManner::default_instance()); + alm_manner_ = const_cast< ::iot_idl::SAlmManner*>(&::iot_idl::SAlmManner::default_instance()); } SAlmInfoFromApp::SAlmInfoFromApp(const SAlmInfoFromApp& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SAlmInfoFromApp) + // @@protoc_insertion_point(copy_constructor:iot_idl.SAlmInfoFromApp) } void SAlmInfoFromApp::SharedCtor() { @@ -1335,7 +1335,7 @@ void SAlmInfoFromApp::SharedCtor() { } SAlmInfoFromApp::~SAlmInfoFromApp() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SAlmInfoFromApp) + // @@protoc_insertion_point(destructor:iot_idl.SAlmInfoFromApp) SharedDtor(); } @@ -1414,7 +1414,7 @@ void SAlmInfoFromApp::Clear() { } } if (has_alm_manner()) { - if (alm_manner_ != NULL) alm_manner_->::kbd_idlfile::SAlmManner::Clear(); + if (alm_manner_ != NULL) alm_manner_->::iot_idl::SAlmManner::Clear(); } if (has_camera_tag()) { if (camera_tag_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { @@ -1441,7 +1441,7 @@ bool SAlmInfoFromApp::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SAlmInfoFromApp) + // @@protoc_insertion_point(parse_start:iot_idl.SAlmInfoFromApp) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); tag = p.first; @@ -1506,7 +1506,7 @@ bool SAlmInfoFromApp::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.enAlmStyle alm_style = 5; + // required .iot_idl.enAlmStyle alm_style = 5; case 5: { if (tag == 40) { parse_alm_style: @@ -1514,8 +1514,8 @@ bool SAlmInfoFromApp::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::enAlmStyle_IsValid(value)) { - set_alm_style(static_cast< ::kbd_idlfile::enAlmStyle >(value)); + if (::iot_idl::enAlmStyle_IsValid(value)) { + set_alm_style(static_cast< ::iot_idl::enAlmStyle >(value)); } else { mutable_unknown_fields()->AddVarint(5, value); } @@ -1526,7 +1526,7 @@ bool SAlmInfoFromApp::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SAlmKeyword alm_keyword = 6; + // repeated .iot_idl.SAlmKeyword alm_keyword = 6; case 6: { if (tag == 50) { parse_alm_keyword: @@ -1655,7 +1655,7 @@ bool SAlmInfoFromApp::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.SAlmManner alm_manner = 14; + // optional .iot_idl.SAlmManner alm_manner = 14; case 14: { if (tag == 114) { parse_alm_manner: @@ -1716,17 +1716,17 @@ bool SAlmInfoFromApp::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SAlmInfoFromApp) + // @@protoc_insertion_point(parse_success:iot_idl.SAlmInfoFromApp) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SAlmInfoFromApp) + // @@protoc_insertion_point(parse_failure:iot_idl.SAlmInfoFromApp) return false; #undef DO_ } void SAlmInfoFromApp::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SAlmInfoFromApp) + // @@protoc_insertion_point(serialize_start:iot_idl.SAlmInfoFromApp) // required int32 alm_type = 1; if (has_alm_type()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->alm_type(), output); @@ -1747,13 +1747,13 @@ void SAlmInfoFromApp::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->location_id(), output); } - // required .kbd_idlfile.enAlmStyle alm_style = 5; + // required .iot_idl.enAlmStyle alm_style = 5; if (has_alm_style()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 5, this->alm_style(), output); } - // repeated .kbd_idlfile.SAlmKeyword alm_keyword = 6; + // repeated .iot_idl.SAlmKeyword alm_keyword = 6; for (int i = 0; i < this->alm_keyword_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 6, this->alm_keyword(i), output); @@ -1814,7 +1814,7 @@ void SAlmInfoFromApp::SerializeWithCachedSizes( 13, this->sound_file(i), output); } - // optional .kbd_idlfile.SAlmManner alm_manner = 14; + // optional .iot_idl.SAlmManner alm_manner = 14; if (has_alm_manner()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 14, this->alm_manner(), output); @@ -1844,12 +1844,12 @@ void SAlmInfoFromApp::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SAlmInfoFromApp) + // @@protoc_insertion_point(serialize_end:iot_idl.SAlmInfoFromApp) } ::google::protobuf::uint8* SAlmInfoFromApp::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SAlmInfoFromApp) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SAlmInfoFromApp) // required int32 alm_type = 1; if (has_alm_type()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->alm_type(), target); @@ -1870,13 +1870,13 @@ void SAlmInfoFromApp::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->location_id(), target); } - // required .kbd_idlfile.enAlmStyle alm_style = 5; + // required .iot_idl.enAlmStyle alm_style = 5; if (has_alm_style()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 5, this->alm_style(), target); } - // repeated .kbd_idlfile.SAlmKeyword alm_keyword = 6; + // repeated .iot_idl.SAlmKeyword alm_keyword = 6; for (int i = 0; i < this->alm_keyword_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1941,7 +1941,7 @@ void SAlmInfoFromApp::SerializeWithCachedSizes( WriteStringToArray(13, this->sound_file(i), target); } - // optional .kbd_idlfile.SAlmManner alm_manner = 14; + // optional .iot_idl.SAlmManner alm_manner = 14; if (has_alm_manner()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1974,7 +1974,7 @@ void SAlmInfoFromApp::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SAlmInfoFromApp) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SAlmInfoFromApp) return target; } @@ -2010,7 +2010,7 @@ int SAlmInfoFromApp::ByteSize() const { this->location_id()); } - // required .kbd_idlfile.enAlmStyle alm_style = 5; + // required .iot_idl.enAlmStyle alm_style = 5; if (has_alm_style()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->alm_style()); @@ -2060,7 +2060,7 @@ int SAlmInfoFromApp::ByteSize() const { this->graph_name()); } - // optional .kbd_idlfile.SAlmManner alm_manner = 14; + // optional .iot_idl.SAlmManner alm_manner = 14; if (has_alm_manner()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -2082,7 +2082,7 @@ int SAlmInfoFromApp::ByteSize() const { } } - // repeated .kbd_idlfile.SAlmKeyword alm_keyword = 6; + // repeated .iot_idl.SAlmKeyword alm_keyword = 6; total_size += 1 * this->alm_keyword_size(); for (int i = 0; i < this->alm_keyword_size(); i++) { total_size += @@ -2161,7 +2161,7 @@ void SAlmInfoFromApp::MergeFrom(const SAlmInfoFromApp& from) { set_graph_name(from.graph_name()); } if (from.has_alm_manner()) { - mutable_alm_manner()->::kbd_idlfile::SAlmManner::MergeFrom(from.alm_manner()); + mutable_alm_manner()->::iot_idl::SAlmManner::MergeFrom(from.alm_manner()); } if (from.has_camera_tag()) { set_camera_tag(from.camera_tag()); @@ -2239,7 +2239,7 @@ const int SAppAddAlm::kAlmInfoFieldNumber; SAppAddAlm::SAppAddAlm() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SAppAddAlm) + // @@protoc_insertion_point(constructor:iot_idl.SAppAddAlm) } void SAppAddAlm::InitAsDefaultInstance() { @@ -2249,7 +2249,7 @@ SAppAddAlm::SAppAddAlm(const SAppAddAlm& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SAppAddAlm) + // @@protoc_insertion_point(copy_constructor:iot_idl.SAppAddAlm) } void SAppAddAlm::SharedCtor() { @@ -2260,7 +2260,7 @@ void SAppAddAlm::SharedCtor() { } SAppAddAlm::~SAppAddAlm() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SAppAddAlm) + // @@protoc_insertion_point(destructor:iot_idl.SAppAddAlm) SharedDtor(); } @@ -2315,7 +2315,7 @@ bool SAppAddAlm::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SAppAddAlm) + // @@protoc_insertion_point(parse_start:iot_idl.SAppAddAlm) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2350,7 +2350,7 @@ bool SAppAddAlm::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SAlmInfoFromApp alm_info = 3; + // repeated .iot_idl.SAlmInfoFromApp alm_info = 3; case 3: { if (tag == 26) { parse_alm_info: @@ -2378,17 +2378,17 @@ bool SAppAddAlm::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SAppAddAlm) + // @@protoc_insertion_point(parse_success:iot_idl.SAppAddAlm) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SAppAddAlm) + // @@protoc_insertion_point(parse_failure:iot_idl.SAppAddAlm) return false; #undef DO_ } void SAppAddAlm::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SAppAddAlm) + // @@protoc_insertion_point(serialize_start:iot_idl.SAppAddAlm) // optional int32 domain_id = 1; if (has_domain_id()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->domain_id(), output); @@ -2399,7 +2399,7 @@ void SAppAddAlm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->app_id(), output); } - // repeated .kbd_idlfile.SAlmInfoFromApp alm_info = 3; + // repeated .iot_idl.SAlmInfoFromApp alm_info = 3; for (int i = 0; i < this->alm_info_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->alm_info(i), output); @@ -2409,12 +2409,12 @@ void SAppAddAlm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SAppAddAlm) + // @@protoc_insertion_point(serialize_end:iot_idl.SAppAddAlm) } ::google::protobuf::uint8* SAppAddAlm::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SAppAddAlm) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SAppAddAlm) // optional int32 domain_id = 1; if (has_domain_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->domain_id(), target); @@ -2425,7 +2425,7 @@ void SAppAddAlm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->app_id(), target); } - // repeated .kbd_idlfile.SAlmInfoFromApp alm_info = 3; + // repeated .iot_idl.SAlmInfoFromApp alm_info = 3; for (int i = 0; i < this->alm_info_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -2436,7 +2436,7 @@ void SAppAddAlm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SAppAddAlm) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SAppAddAlm) return target; } @@ -2459,7 +2459,7 @@ int SAppAddAlm::ByteSize() const { } } - // repeated .kbd_idlfile.SAlmInfoFromApp alm_info = 3; + // repeated .iot_idl.SAlmInfoFromApp alm_info = 3; total_size += 1 * this->alm_info_size(); for (int i = 0; i < this->alm_info_size(); i++) { total_size += @@ -2554,7 +2554,7 @@ const int SAppAddWave::kWaveFileFieldNumber; SAppAddWave::SAppAddWave() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SAppAddWave) + // @@protoc_insertion_point(constructor:iot_idl.SAppAddWave) } void SAppAddWave::InitAsDefaultInstance() { @@ -2564,7 +2564,7 @@ SAppAddWave::SAppAddWave(const SAppAddWave& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SAppAddWave) + // @@protoc_insertion_point(copy_constructor:iot_idl.SAppAddWave) } void SAppAddWave::SharedCtor() { @@ -2578,7 +2578,7 @@ void SAppAddWave::SharedCtor() { } SAppAddWave::~SAppAddWave() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SAppAddWave) + // @@protoc_insertion_point(destructor:iot_idl.SAppAddWave) SharedDtor(); } @@ -2650,7 +2650,7 @@ bool SAppAddWave::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SAppAddWave) + // @@protoc_insertion_point(parse_start:iot_idl.SAppAddWave) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2733,17 +2733,17 @@ bool SAppAddWave::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SAppAddWave) + // @@protoc_insertion_point(parse_success:iot_idl.SAppAddWave) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SAppAddWave) + // @@protoc_insertion_point(parse_failure:iot_idl.SAppAddWave) return false; #undef DO_ } void SAppAddWave::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SAppAddWave) + // @@protoc_insertion_point(serialize_start:iot_idl.SAppAddWave) // required int64 start_time = 1; if (has_start_time()) { ::google::protobuf::internal::WireFormatLite::WriteInt64(1, this->start_time(), output); @@ -2778,12 +2778,12 @@ void SAppAddWave::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SAppAddWave) + // @@protoc_insertion_point(serialize_end:iot_idl.SAppAddWave) } ::google::protobuf::uint8* SAppAddWave::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SAppAddWave) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SAppAddWave) // required int64 start_time = 1; if (has_start_time()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(1, this->start_time(), target); @@ -2820,7 +2820,7 @@ void SAppAddWave::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SAppAddWave) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SAppAddWave) return target; } @@ -2970,7 +2970,7 @@ const int SAlmInfoToAlmClt::kCameraPresetFieldNumber; SAlmInfoToAlmClt::SAlmInfoToAlmClt() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SAlmInfoToAlmClt) + // @@protoc_insertion_point(constructor:iot_idl.SAlmInfoToAlmClt) } void SAlmInfoToAlmClt::InitAsDefaultInstance() { @@ -2980,7 +2980,7 @@ SAlmInfoToAlmClt::SAlmInfoToAlmClt(const SAlmInfoToAlmClt& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SAlmInfoToAlmClt) + // @@protoc_insertion_point(copy_constructor:iot_idl.SAlmInfoToAlmClt) } void SAlmInfoToAlmClt::SharedCtor() { @@ -3013,7 +3013,7 @@ void SAlmInfoToAlmClt::SharedCtor() { } SAlmInfoToAlmClt::~SAlmInfoToAlmClt() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SAlmInfoToAlmClt) + // @@protoc_insertion_point(destructor:iot_idl.SAlmInfoToAlmClt) SharedDtor(); } @@ -3141,7 +3141,7 @@ bool SAlmInfoToAlmClt::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SAlmInfoToAlmClt) + // @@protoc_insertion_point(parse_start:iot_idl.SAlmInfoToAlmClt) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); tag = p.first; @@ -3176,7 +3176,7 @@ bool SAlmInfoToAlmClt::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.enAlmLogicState logic_state = 3; + // required .iot_idl.enAlmLogicState logic_state = 3; case 3: { if (tag == 24) { parse_logic_state: @@ -3184,8 +3184,8 @@ bool SAlmInfoToAlmClt::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::enAlmLogicState_IsValid(value)) { - set_logic_state(static_cast< ::kbd_idlfile::enAlmLogicState >(value)); + if (::iot_idl::enAlmLogicState_IsValid(value)) { + set_logic_state(static_cast< ::iot_idl::enAlmLogicState >(value)); } else { mutable_unknown_fields()->AddVarint(3, value); } @@ -3545,17 +3545,17 @@ bool SAlmInfoToAlmClt::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SAlmInfoToAlmClt) + // @@protoc_insertion_point(parse_success:iot_idl.SAlmInfoToAlmClt) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SAlmInfoToAlmClt) + // @@protoc_insertion_point(parse_failure:iot_idl.SAlmInfoToAlmClt) return false; #undef DO_ } void SAlmInfoToAlmClt::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SAlmInfoToAlmClt) + // @@protoc_insertion_point(serialize_start:iot_idl.SAlmInfoToAlmClt) // required int32 alm_type = 1; if (has_alm_type()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->alm_type(), output); @@ -3566,7 +3566,7 @@ void SAlmInfoToAlmClt::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->alm_status(), output); } - // required .kbd_idlfile.enAlmLogicState logic_state = 3; + // required .iot_idl.enAlmLogicState logic_state = 3; if (has_logic_state()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 3, this->logic_state(), output); @@ -3726,12 +3726,12 @@ void SAlmInfoToAlmClt::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SAlmInfoToAlmClt) + // @@protoc_insertion_point(serialize_end:iot_idl.SAlmInfoToAlmClt) } ::google::protobuf::uint8* SAlmInfoToAlmClt::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SAlmInfoToAlmClt) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SAlmInfoToAlmClt) // required int32 alm_type = 1; if (has_alm_type()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->alm_type(), target); @@ -3742,7 +3742,7 @@ void SAlmInfoToAlmClt::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->alm_status(), target); } - // required .kbd_idlfile.enAlmLogicState logic_state = 3; + // required .iot_idl.enAlmLogicState logic_state = 3; if (has_logic_state()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 3, this->logic_state(), target); @@ -3910,7 +3910,7 @@ void SAlmInfoToAlmClt::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SAlmInfoToAlmClt) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SAlmInfoToAlmClt) return target; } @@ -3932,7 +3932,7 @@ int SAlmInfoToAlmClt::ByteSize() const { this->alm_status()); } - // required .kbd_idlfile.enAlmLogicState logic_state = 3; + // required .iot_idl.enAlmLogicState logic_state = 3; if (has_logic_state()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->logic_state()); @@ -4262,7 +4262,7 @@ const int SAlmCltAddAlm::kAlmInfoFieldNumber; SAlmCltAddAlm::SAlmCltAddAlm() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SAlmCltAddAlm) + // @@protoc_insertion_point(constructor:iot_idl.SAlmCltAddAlm) } void SAlmCltAddAlm::InitAsDefaultInstance() { @@ -4272,7 +4272,7 @@ SAlmCltAddAlm::SAlmCltAddAlm(const SAlmCltAddAlm& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SAlmCltAddAlm) + // @@protoc_insertion_point(copy_constructor:iot_idl.SAlmCltAddAlm) } void SAlmCltAddAlm::SharedCtor() { @@ -4281,7 +4281,7 @@ void SAlmCltAddAlm::SharedCtor() { } SAlmCltAddAlm::~SAlmCltAddAlm() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SAlmCltAddAlm) + // @@protoc_insertion_point(destructor:iot_idl.SAlmCltAddAlm) SharedDtor(); } @@ -4321,13 +4321,13 @@ bool SAlmCltAddAlm::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SAlmCltAddAlm) + // @@protoc_insertion_point(parse_start:iot_idl.SAlmCltAddAlm) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated .kbd_idlfile.SAlmInfoToAlmClt alm_info = 1; + // repeated .iot_idl.SAlmInfoToAlmClt alm_info = 1; case 1: { if (tag == 10) { parse_alm_info: @@ -4355,18 +4355,18 @@ bool SAlmCltAddAlm::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SAlmCltAddAlm) + // @@protoc_insertion_point(parse_success:iot_idl.SAlmCltAddAlm) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SAlmCltAddAlm) + // @@protoc_insertion_point(parse_failure:iot_idl.SAlmCltAddAlm) return false; #undef DO_ } void SAlmCltAddAlm::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SAlmCltAddAlm) - // repeated .kbd_idlfile.SAlmInfoToAlmClt alm_info = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SAlmCltAddAlm) + // repeated .iot_idl.SAlmInfoToAlmClt alm_info = 1; for (int i = 0; i < this->alm_info_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->alm_info(i), output); @@ -4376,13 +4376,13 @@ void SAlmCltAddAlm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SAlmCltAddAlm) + // @@protoc_insertion_point(serialize_end:iot_idl.SAlmCltAddAlm) } ::google::protobuf::uint8* SAlmCltAddAlm::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SAlmCltAddAlm) - // repeated .kbd_idlfile.SAlmInfoToAlmClt alm_info = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SAlmCltAddAlm) + // repeated .iot_idl.SAlmInfoToAlmClt alm_info = 1; for (int i = 0; i < this->alm_info_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -4393,14 +4393,14 @@ void SAlmCltAddAlm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SAlmCltAddAlm) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SAlmCltAddAlm) return target; } int SAlmCltAddAlm::ByteSize() const { int total_size = 0; - // repeated .kbd_idlfile.SAlmInfoToAlmClt alm_info = 1; + // repeated .iot_idl.SAlmInfoToAlmClt alm_info = 1; total_size += 1 * this->alm_info_size(); for (int i = 0; i < this->alm_info_size(); i++) { total_size += @@ -4490,7 +4490,7 @@ const int SAlmCltCfmAlm::kKeyIdTagFieldNumber; SAlmCltCfmAlm::SAlmCltCfmAlm() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SAlmCltCfmAlm) + // @@protoc_insertion_point(constructor:iot_idl.SAlmCltCfmAlm) } void SAlmCltCfmAlm::InitAsDefaultInstance() { @@ -4500,7 +4500,7 @@ SAlmCltCfmAlm::SAlmCltCfmAlm(const SAlmCltCfmAlm& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SAlmCltCfmAlm) + // @@protoc_insertion_point(copy_constructor:iot_idl.SAlmCltCfmAlm) } void SAlmCltCfmAlm::SharedCtor() { @@ -4516,7 +4516,7 @@ void SAlmCltCfmAlm::SharedCtor() { } SAlmCltCfmAlm::~SAlmCltCfmAlm() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SAlmCltCfmAlm) + // @@protoc_insertion_point(destructor:iot_idl.SAlmCltCfmAlm) SharedDtor(); } @@ -4583,7 +4583,7 @@ bool SAlmCltCfmAlm::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SAlmCltCfmAlm) + // @@protoc_insertion_point(parse_start:iot_idl.SAlmCltCfmAlm) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -4751,17 +4751,17 @@ bool SAlmCltCfmAlm::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SAlmCltCfmAlm) + // @@protoc_insertion_point(parse_success:iot_idl.SAlmCltCfmAlm) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SAlmCltCfmAlm) + // @@protoc_insertion_point(parse_failure:iot_idl.SAlmCltCfmAlm) return false; #undef DO_ } void SAlmCltCfmAlm::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SAlmCltCfmAlm) + // @@protoc_insertion_point(serialize_start:iot_idl.SAlmCltCfmAlm) // required string node_name = 1; if (has_node_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4827,12 +4827,12 @@ void SAlmCltCfmAlm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SAlmCltCfmAlm) + // @@protoc_insertion_point(serialize_end:iot_idl.SAlmCltCfmAlm) } ::google::protobuf::uint8* SAlmCltCfmAlm::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SAlmCltCfmAlm) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SAlmCltCfmAlm) // required string node_name = 1; if (has_node_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4899,7 +4899,7 @@ void SAlmCltCfmAlm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SAlmCltCfmAlm) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SAlmCltCfmAlm) return target; } @@ -5079,7 +5079,7 @@ const int SAlmCltDelAlm::kUuidBase64FieldNumber; SAlmCltDelAlm::SAlmCltDelAlm() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SAlmCltDelAlm) + // @@protoc_insertion_point(constructor:iot_idl.SAlmCltDelAlm) } void SAlmCltDelAlm::InitAsDefaultInstance() { @@ -5089,7 +5089,7 @@ SAlmCltDelAlm::SAlmCltDelAlm(const SAlmCltDelAlm& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SAlmCltDelAlm) + // @@protoc_insertion_point(copy_constructor:iot_idl.SAlmCltDelAlm) } void SAlmCltDelAlm::SharedCtor() { @@ -5100,7 +5100,7 @@ void SAlmCltDelAlm::SharedCtor() { } SAlmCltDelAlm::~SAlmCltDelAlm() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SAlmCltDelAlm) + // @@protoc_insertion_point(destructor:iot_idl.SAlmCltDelAlm) SharedDtor(); } @@ -5141,7 +5141,7 @@ bool SAlmCltDelAlm::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SAlmCltDelAlm) + // @@protoc_insertion_point(parse_start:iot_idl.SAlmCltDelAlm) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -5194,17 +5194,17 @@ bool SAlmCltDelAlm::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SAlmCltDelAlm) + // @@protoc_insertion_point(parse_success:iot_idl.SAlmCltDelAlm) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SAlmCltDelAlm) + // @@protoc_insertion_point(parse_failure:iot_idl.SAlmCltDelAlm) return false; #undef DO_ } void SAlmCltDelAlm::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SAlmCltDelAlm) + // @@protoc_insertion_point(serialize_start:iot_idl.SAlmCltDelAlm) // required int32 domain_id = 1; if (has_domain_id()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->domain_id(), output); @@ -5224,12 +5224,12 @@ void SAlmCltDelAlm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SAlmCltDelAlm) + // @@protoc_insertion_point(serialize_end:iot_idl.SAlmCltDelAlm) } ::google::protobuf::uint8* SAlmCltDelAlm::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SAlmCltDelAlm) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SAlmCltDelAlm) // required int32 domain_id = 1; if (has_domain_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->domain_id(), target); @@ -5249,7 +5249,7 @@ void SAlmCltDelAlm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SAlmCltDelAlm) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SAlmCltDelAlm) return target; } @@ -5352,7 +5352,7 @@ const int SAlmCltReleaseAlm::kUuidBase64FieldNumber; SAlmCltReleaseAlm::SAlmCltReleaseAlm() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SAlmCltReleaseAlm) + // @@protoc_insertion_point(constructor:iot_idl.SAlmCltReleaseAlm) } void SAlmCltReleaseAlm::InitAsDefaultInstance() { @@ -5362,7 +5362,7 @@ SAlmCltReleaseAlm::SAlmCltReleaseAlm(const SAlmCltReleaseAlm& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SAlmCltReleaseAlm) + // @@protoc_insertion_point(copy_constructor:iot_idl.SAlmCltReleaseAlm) } void SAlmCltReleaseAlm::SharedCtor() { @@ -5372,7 +5372,7 @@ void SAlmCltReleaseAlm::SharedCtor() { } SAlmCltReleaseAlm::~SAlmCltReleaseAlm() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SAlmCltReleaseAlm) + // @@protoc_insertion_point(destructor:iot_idl.SAlmCltReleaseAlm) SharedDtor(); } @@ -5412,7 +5412,7 @@ bool SAlmCltReleaseAlm::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SAlmCltReleaseAlm) + // @@protoc_insertion_point(parse_start:iot_idl.SAlmCltReleaseAlm) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -5451,17 +5451,17 @@ bool SAlmCltReleaseAlm::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SAlmCltReleaseAlm) + // @@protoc_insertion_point(parse_success:iot_idl.SAlmCltReleaseAlm) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SAlmCltReleaseAlm) + // @@protoc_insertion_point(parse_failure:iot_idl.SAlmCltReleaseAlm) return false; #undef DO_ } void SAlmCltReleaseAlm::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SAlmCltReleaseAlm) + // @@protoc_insertion_point(serialize_start:iot_idl.SAlmCltReleaseAlm) // repeated string uuid_base64 = 1; for (int i = 0; i < this->uuid_base64_size(); i++) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -5476,12 +5476,12 @@ void SAlmCltReleaseAlm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SAlmCltReleaseAlm) + // @@protoc_insertion_point(serialize_end:iot_idl.SAlmCltReleaseAlm) } ::google::protobuf::uint8* SAlmCltReleaseAlm::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SAlmCltReleaseAlm) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SAlmCltReleaseAlm) // repeated string uuid_base64 = 1; for (int i = 0; i < this->uuid_base64_size(); i++) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -5496,7 +5496,7 @@ void SAlmCltReleaseAlm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SAlmCltReleaseAlm) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SAlmCltReleaseAlm) return target; } @@ -5584,7 +5584,7 @@ const int SAlmCltLinkWave2Alm::kUuidBase64FieldNumber; SAlmCltLinkWave2Alm::SAlmCltLinkWave2Alm() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SAlmCltLinkWave2Alm) + // @@protoc_insertion_point(constructor:iot_idl.SAlmCltLinkWave2Alm) } void SAlmCltLinkWave2Alm::InitAsDefaultInstance() { @@ -5594,7 +5594,7 @@ SAlmCltLinkWave2Alm::SAlmCltLinkWave2Alm(const SAlmCltLinkWave2Alm& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SAlmCltLinkWave2Alm) + // @@protoc_insertion_point(copy_constructor:iot_idl.SAlmCltLinkWave2Alm) } void SAlmCltLinkWave2Alm::SharedCtor() { @@ -5605,7 +5605,7 @@ void SAlmCltLinkWave2Alm::SharedCtor() { } SAlmCltLinkWave2Alm::~SAlmCltLinkWave2Alm() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SAlmCltLinkWave2Alm) + // @@protoc_insertion_point(destructor:iot_idl.SAlmCltLinkWave2Alm) SharedDtor(); } @@ -5653,7 +5653,7 @@ bool SAlmCltLinkWave2Alm::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SAlmCltLinkWave2Alm) + // @@protoc_insertion_point(parse_start:iot_idl.SAlmCltLinkWave2Alm) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -5708,17 +5708,17 @@ bool SAlmCltLinkWave2Alm::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SAlmCltLinkWave2Alm) + // @@protoc_insertion_point(parse_success:iot_idl.SAlmCltLinkWave2Alm) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SAlmCltLinkWave2Alm) + // @@protoc_insertion_point(parse_failure:iot_idl.SAlmCltLinkWave2Alm) return false; #undef DO_ } void SAlmCltLinkWave2Alm::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SAlmCltLinkWave2Alm) + // @@protoc_insertion_point(serialize_start:iot_idl.SAlmCltLinkWave2Alm) // required string wave_file = 1; if (has_wave_file()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -5743,12 +5743,12 @@ void SAlmCltLinkWave2Alm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SAlmCltLinkWave2Alm) + // @@protoc_insertion_point(serialize_end:iot_idl.SAlmCltLinkWave2Alm) } ::google::protobuf::uint8* SAlmCltLinkWave2Alm::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SAlmCltLinkWave2Alm) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SAlmCltLinkWave2Alm) // required string wave_file = 1; if (has_wave_file()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -5774,7 +5774,7 @@ void SAlmCltLinkWave2Alm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SAlmCltLinkWave2Alm) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SAlmCltLinkWave2Alm) return target; } @@ -5892,7 +5892,7 @@ const int SEvtInfoToEvtClt::kWaveFileFieldNumber; SEvtInfoToEvtClt::SEvtInfoToEvtClt() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SEvtInfoToEvtClt) + // @@protoc_insertion_point(constructor:iot_idl.SEvtInfoToEvtClt) } void SEvtInfoToEvtClt::InitAsDefaultInstance() { @@ -5902,7 +5902,7 @@ SEvtInfoToEvtClt::SEvtInfoToEvtClt(const SEvtInfoToEvtClt& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SEvtInfoToEvtClt) + // @@protoc_insertion_point(copy_constructor:iot_idl.SEvtInfoToEvtClt) } void SEvtInfoToEvtClt::SharedCtor() { @@ -5928,7 +5928,7 @@ void SEvtInfoToEvtClt::SharedCtor() { } SEvtInfoToEvtClt::~SEvtInfoToEvtClt() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SEvtInfoToEvtClt) + // @@protoc_insertion_point(destructor:iot_idl.SEvtInfoToEvtClt) SharedDtor(); } @@ -6027,7 +6027,7 @@ bool SEvtInfoToEvtClt::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SEvtInfoToEvtClt) + // @@protoc_insertion_point(parse_start:iot_idl.SEvtInfoToEvtClt) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); tag = p.first; @@ -6216,7 +6216,7 @@ bool SEvtInfoToEvtClt::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.enAlmLogicState logic_state = 13; + // optional .iot_idl.enAlmLogicState logic_state = 13; case 13: { if (tag == 104) { parse_logic_state: @@ -6224,8 +6224,8 @@ bool SEvtInfoToEvtClt::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::enAlmLogicState_IsValid(value)) { - set_logic_state(static_cast< ::kbd_idlfile::enAlmLogicState >(value)); + if (::iot_idl::enAlmLogicState_IsValid(value)) { + set_logic_state(static_cast< ::iot_idl::enAlmLogicState >(value)); } else { mutable_unknown_fields()->AddVarint(13, value); } @@ -6301,17 +6301,17 @@ bool SEvtInfoToEvtClt::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SEvtInfoToEvtClt) + // @@protoc_insertion_point(parse_success:iot_idl.SEvtInfoToEvtClt) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SEvtInfoToEvtClt) + // @@protoc_insertion_point(parse_failure:iot_idl.SEvtInfoToEvtClt) return false; #undef DO_ } void SEvtInfoToEvtClt::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SEvtInfoToEvtClt) + // @@protoc_insertion_point(serialize_start:iot_idl.SEvtInfoToEvtClt) // required int32 alm_type = 1; if (has_alm_type()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->alm_type(), output); @@ -6382,7 +6382,7 @@ void SEvtInfoToEvtClt::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(12, this->region_id(), output); } - // optional .kbd_idlfile.enAlmLogicState logic_state = 13; + // optional .iot_idl.enAlmLogicState logic_state = 13; if (has_logic_state()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 13, this->logic_state(), output); @@ -6422,12 +6422,12 @@ void SEvtInfoToEvtClt::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SEvtInfoToEvtClt) + // @@protoc_insertion_point(serialize_end:iot_idl.SEvtInfoToEvtClt) } ::google::protobuf::uint8* SEvtInfoToEvtClt::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SEvtInfoToEvtClt) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SEvtInfoToEvtClt) // required int32 alm_type = 1; if (has_alm_type()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->alm_type(), target); @@ -6500,7 +6500,7 @@ void SEvtInfoToEvtClt::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(12, this->region_id(), target); } - // optional .kbd_idlfile.enAlmLogicState logic_state = 13; + // optional .iot_idl.enAlmLogicState logic_state = 13; if (has_logic_state()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 13, this->logic_state(), target); @@ -6543,7 +6543,7 @@ void SEvtInfoToEvtClt::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SEvtInfoToEvtClt) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SEvtInfoToEvtClt) return target; } @@ -6637,7 +6637,7 @@ int SEvtInfoToEvtClt::ByteSize() const { this->region_id()); } - // optional .kbd_idlfile.enAlmLogicState logic_state = 13; + // optional .iot_idl.enAlmLogicState logic_state = 13; if (has_logic_state()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->logic_state()); @@ -6805,7 +6805,7 @@ const int SEvtCltAddEvt::kEvtInfoFieldNumber; SEvtCltAddEvt::SEvtCltAddEvt() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SEvtCltAddEvt) + // @@protoc_insertion_point(constructor:iot_idl.SEvtCltAddEvt) } void SEvtCltAddEvt::InitAsDefaultInstance() { @@ -6815,7 +6815,7 @@ SEvtCltAddEvt::SEvtCltAddEvt(const SEvtCltAddEvt& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SEvtCltAddEvt) + // @@protoc_insertion_point(copy_constructor:iot_idl.SEvtCltAddEvt) } void SEvtCltAddEvt::SharedCtor() { @@ -6824,7 +6824,7 @@ void SEvtCltAddEvt::SharedCtor() { } SEvtCltAddEvt::~SEvtCltAddEvt() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SEvtCltAddEvt) + // @@protoc_insertion_point(destructor:iot_idl.SEvtCltAddEvt) SharedDtor(); } @@ -6864,13 +6864,13 @@ bool SEvtCltAddEvt::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SEvtCltAddEvt) + // @@protoc_insertion_point(parse_start:iot_idl.SEvtCltAddEvt) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated .kbd_idlfile.SEvtInfoToEvtClt evt_info = 1; + // repeated .iot_idl.SEvtInfoToEvtClt evt_info = 1; case 1: { if (tag == 10) { parse_evt_info: @@ -6898,18 +6898,18 @@ bool SEvtCltAddEvt::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SEvtCltAddEvt) + // @@protoc_insertion_point(parse_success:iot_idl.SEvtCltAddEvt) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SEvtCltAddEvt) + // @@protoc_insertion_point(parse_failure:iot_idl.SEvtCltAddEvt) return false; #undef DO_ } void SEvtCltAddEvt::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SEvtCltAddEvt) - // repeated .kbd_idlfile.SEvtInfoToEvtClt evt_info = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SEvtCltAddEvt) + // repeated .iot_idl.SEvtInfoToEvtClt evt_info = 1; for (int i = 0; i < this->evt_info_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->evt_info(i), output); @@ -6919,13 +6919,13 @@ void SEvtCltAddEvt::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SEvtCltAddEvt) + // @@protoc_insertion_point(serialize_end:iot_idl.SEvtCltAddEvt) } ::google::protobuf::uint8* SEvtCltAddEvt::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SEvtCltAddEvt) - // repeated .kbd_idlfile.SEvtInfoToEvtClt evt_info = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SEvtCltAddEvt) + // repeated .iot_idl.SEvtInfoToEvtClt evt_info = 1; for (int i = 0; i < this->evt_info_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -6936,14 +6936,14 @@ void SEvtCltAddEvt::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SEvtCltAddEvt) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SEvtCltAddEvt) return target; } int SEvtCltAddEvt::ByteSize() const { int total_size = 0; - // repeated .kbd_idlfile.SEvtInfoToEvtClt evt_info = 1; + // repeated .iot_idl.SEvtInfoToEvtClt evt_info = 1; total_size += 1 * this->evt_info_size(); for (int i = 0; i < this->evt_info_size(); i++) { total_size += @@ -7018,6 +7018,6 @@ void SEvtCltAddEvt::Swap(SEvtCltAddEvt* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/platform/src/idl_files/AlarmMessage.pb.h b/platform/src/idl_files/AlarmMessage.pb.h index 8eb8f98e..08698867 100644 --- a/platform/src/idl_files/AlarmMessage.pb.h +++ b/platform/src/idl_files/AlarmMessage.pb.h @@ -27,7 +27,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { // Internal implementation detail -- do not call these. void IDL_FILES_EXPORT protobuf_AddDesc_AlarmMessage_2eproto(); @@ -220,7 +220,7 @@ class IDL_FILES_EXPORT SAlmManner : public ::google::protobuf::Message { inline ::google::protobuf::int32 if_water_alm() const; inline void set_if_water_alm(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SAlmManner) + // @@protoc_insertion_point(class_scope:iot_idl.SAlmManner) private: inline void set_has_priority(); inline void clear_has_priority(); @@ -323,7 +323,7 @@ class IDL_FILES_EXPORT SAlmKeyword : public ::google::protobuf::Message { inline ::std::string* release_value(); inline void set_allocated_value(::std::string* value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SAlmKeyword) + // @@protoc_insertion_point(class_scope:iot_idl.SAlmKeyword) private: inline void set_has_id(); inline void clear_has_id(); @@ -426,23 +426,23 @@ class IDL_FILES_EXPORT SAlmInfoFromApp : public ::google::protobuf::Message { inline ::google::protobuf::int32 location_id() const; inline void set_location_id(::google::protobuf::int32 value); - // required .kbd_idlfile.enAlmStyle alm_style = 5; + // required .iot_idl.enAlmStyle alm_style = 5; inline bool has_alm_style() const; inline void clear_alm_style(); static const int kAlmStyleFieldNumber = 5; - inline ::kbd_idlfile::enAlmStyle alm_style() const; - inline void set_alm_style(::kbd_idlfile::enAlmStyle value); + inline ::iot_idl::enAlmStyle alm_style() const; + inline void set_alm_style(::iot_idl::enAlmStyle value); - // repeated .kbd_idlfile.SAlmKeyword alm_keyword = 6; + // repeated .iot_idl.SAlmKeyword alm_keyword = 6; inline int alm_keyword_size() const; inline void clear_alm_keyword(); static const int kAlmKeywordFieldNumber = 6; - inline const ::kbd_idlfile::SAlmKeyword& alm_keyword(int index) const; - inline ::kbd_idlfile::SAlmKeyword* mutable_alm_keyword(int index); - inline ::kbd_idlfile::SAlmKeyword* add_alm_keyword(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAlmKeyword >& + inline const ::iot_idl::SAlmKeyword& alm_keyword(int index) const; + inline ::iot_idl::SAlmKeyword* mutable_alm_keyword(int index); + inline ::iot_idl::SAlmKeyword* add_alm_keyword(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SAlmKeyword >& alm_keyword() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAlmKeyword >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SAlmKeyword >* mutable_alm_keyword(); // optional int32 sub_system = 7; @@ -518,14 +518,14 @@ class IDL_FILES_EXPORT SAlmInfoFromApp : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& sound_file() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_sound_file(); - // optional .kbd_idlfile.SAlmManner alm_manner = 14; + // optional .iot_idl.SAlmManner alm_manner = 14; inline bool has_alm_manner() const; inline void clear_alm_manner(); static const int kAlmMannerFieldNumber = 14; - inline const ::kbd_idlfile::SAlmManner& alm_manner() const; - inline ::kbd_idlfile::SAlmManner* mutable_alm_manner(); - inline ::kbd_idlfile::SAlmManner* release_alm_manner(); - inline void set_allocated_alm_manner(::kbd_idlfile::SAlmManner* alm_manner); + inline const ::iot_idl::SAlmManner& alm_manner() const; + inline ::iot_idl::SAlmManner* mutable_alm_manner(); + inline ::iot_idl::SAlmManner* release_alm_manner(); + inline void set_allocated_alm_manner(::iot_idl::SAlmManner* alm_manner); // optional string camera_tag = 15; inline bool has_camera_tag() const; @@ -551,7 +551,7 @@ class IDL_FILES_EXPORT SAlmInfoFromApp : public ::google::protobuf::Message { inline ::std::string* release_camera_preset(); inline void set_allocated_camera_preset(::std::string* camera_preset); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SAlmInfoFromApp) + // @@protoc_insertion_point(class_scope:iot_idl.SAlmInfoFromApp) private: inline void set_has_alm_type(); inline void clear_has_alm_type(); @@ -591,14 +591,14 @@ class IDL_FILES_EXPORT SAlmInfoFromApp : public ::google::protobuf::Message { ::google::protobuf::int64 time_stamp_; ::google::protobuf::int32 location_id_; int alm_style_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAlmKeyword > alm_keyword_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SAlmKeyword > alm_keyword_; ::google::protobuf::int32 sub_system_; ::google::protobuf::int32 dev_type_; ::std::string* dev_group_tag_; ::std::string* key_id_tag_; ::std::string* graph_name_; ::google::protobuf::RepeatedPtrField< ::std::string> sound_file_; - ::kbd_idlfile::SAlmManner* alm_manner_; + ::iot_idl::SAlmManner* alm_manner_; ::std::string* camera_tag_; ::std::string* camera_preset_; ::google::protobuf::int32 region_id_; @@ -678,19 +678,19 @@ class IDL_FILES_EXPORT SAppAddAlm : public ::google::protobuf::Message { inline ::google::protobuf::int32 app_id() const; inline void set_app_id(::google::protobuf::int32 value); - // repeated .kbd_idlfile.SAlmInfoFromApp alm_info = 3; + // repeated .iot_idl.SAlmInfoFromApp alm_info = 3; inline int alm_info_size() const; inline void clear_alm_info(); static const int kAlmInfoFieldNumber = 3; - inline const ::kbd_idlfile::SAlmInfoFromApp& alm_info(int index) const; - inline ::kbd_idlfile::SAlmInfoFromApp* mutable_alm_info(int index); - inline ::kbd_idlfile::SAlmInfoFromApp* add_alm_info(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAlmInfoFromApp >& + inline const ::iot_idl::SAlmInfoFromApp& alm_info(int index) const; + inline ::iot_idl::SAlmInfoFromApp* mutable_alm_info(int index); + inline ::iot_idl::SAlmInfoFromApp* add_alm_info(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SAlmInfoFromApp >& alm_info() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAlmInfoFromApp >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SAlmInfoFromApp >* mutable_alm_info(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SAppAddAlm) + // @@protoc_insertion_point(class_scope:iot_idl.SAppAddAlm) private: inline void set_has_domain_id(); inline void clear_has_domain_id(); @@ -703,7 +703,7 @@ class IDL_FILES_EXPORT SAppAddAlm : public ::google::protobuf::Message { mutable int _cached_size_; ::google::protobuf::int32 domain_id_; ::google::protobuf::int32 app_id_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAlmInfoFromApp > alm_info_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SAlmInfoFromApp > alm_info_; friend void IDL_FILES_EXPORT protobuf_AddDesc_AlarmMessage_2eproto(); friend void protobuf_AssignDesc_AlarmMessage_2eproto(); friend void protobuf_ShutdownFile_AlarmMessage_2eproto(); @@ -804,7 +804,7 @@ class IDL_FILES_EXPORT SAppAddWave : public ::google::protobuf::Message { inline ::std::string* release_wave_file(); inline void set_allocated_wave_file(::std::string* wave_file); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SAppAddWave) + // @@protoc_insertion_point(class_scope:iot_idl.SAppAddWave) private: inline void set_has_start_time(); inline void clear_has_start_time(); @@ -899,12 +899,12 @@ class IDL_FILES_EXPORT SAlmInfoToAlmClt : public ::google::protobuf::Message { inline ::google::protobuf::int32 alm_status() const; inline void set_alm_status(::google::protobuf::int32 value); - // required .kbd_idlfile.enAlmLogicState logic_state = 3; + // required .iot_idl.enAlmLogicState logic_state = 3; inline bool has_logic_state() const; inline void clear_logic_state(); static const int kLogicStateFieldNumber = 3; - inline ::kbd_idlfile::enAlmLogicState logic_state() const; - inline void set_logic_state(::kbd_idlfile::enAlmLogicState value); + inline ::iot_idl::enAlmLogicState logic_state() const; + inline void set_logic_state(::iot_idl::enAlmLogicState value); // required int64 time_stamp = 4; inline bool has_time_stamp() const; @@ -1102,7 +1102,7 @@ class IDL_FILES_EXPORT SAlmInfoToAlmClt : public ::google::protobuf::Message { inline ::std::string* release_camera_preset(); inline void set_allocated_camera_preset(::std::string* camera_preset); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SAlmInfoToAlmClt) + // @@protoc_insertion_point(class_scope:iot_idl.SAlmInfoToAlmClt) private: inline void set_has_alm_type(); inline void clear_has_alm_type(); @@ -1241,26 +1241,26 @@ class IDL_FILES_EXPORT SAlmCltAddAlm : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // repeated .kbd_idlfile.SAlmInfoToAlmClt alm_info = 1; + // repeated .iot_idl.SAlmInfoToAlmClt alm_info = 1; inline int alm_info_size() const; inline void clear_alm_info(); static const int kAlmInfoFieldNumber = 1; - inline const ::kbd_idlfile::SAlmInfoToAlmClt& alm_info(int index) const; - inline ::kbd_idlfile::SAlmInfoToAlmClt* mutable_alm_info(int index); - inline ::kbd_idlfile::SAlmInfoToAlmClt* add_alm_info(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAlmInfoToAlmClt >& + inline const ::iot_idl::SAlmInfoToAlmClt& alm_info(int index) const; + inline ::iot_idl::SAlmInfoToAlmClt* mutable_alm_info(int index); + inline ::iot_idl::SAlmInfoToAlmClt* add_alm_info(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SAlmInfoToAlmClt >& alm_info() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAlmInfoToAlmClt >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SAlmInfoToAlmClt >* mutable_alm_info(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SAlmCltAddAlm) + // @@protoc_insertion_point(class_scope:iot_idl.SAlmCltAddAlm) private: ::google::protobuf::UnknownFieldSet _unknown_fields_; ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAlmInfoToAlmClt > alm_info_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SAlmInfoToAlmClt > alm_info_; friend void IDL_FILES_EXPORT protobuf_AddDesc_AlarmMessage_2eproto(); friend void protobuf_AssignDesc_AlarmMessage_2eproto(); friend void protobuf_ShutdownFile_AlarmMessage_2eproto(); @@ -1414,7 +1414,7 @@ class IDL_FILES_EXPORT SAlmCltCfmAlm : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& key_id_tag() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_key_id_tag(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SAlmCltCfmAlm) + // @@protoc_insertion_point(class_scope:iot_idl.SAlmCltCfmAlm) private: inline void set_has_node_name(); inline void clear_has_node_name(); @@ -1527,7 +1527,7 @@ class IDL_FILES_EXPORT SAlmCltDelAlm : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& uuid_base64() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_uuid_base64(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SAlmCltDelAlm) + // @@protoc_insertion_point(class_scope:iot_idl.SAlmCltDelAlm) private: inline void set_has_domain_id(); inline void clear_has_domain_id(); @@ -1616,7 +1616,7 @@ class IDL_FILES_EXPORT SAlmCltReleaseAlm : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& uuid_base64() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_uuid_base64(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SAlmCltReleaseAlm) + // @@protoc_insertion_point(class_scope:iot_idl.SAlmCltReleaseAlm) private: ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -1714,7 +1714,7 @@ class IDL_FILES_EXPORT SAlmCltLinkWave2Alm : public ::google::protobuf::Message inline const ::google::protobuf::RepeatedPtrField< ::std::string>& uuid_base64() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_uuid_base64(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SAlmCltLinkWave2Alm) + // @@protoc_insertion_point(class_scope:iot_idl.SAlmCltLinkWave2Alm) private: inline void set_has_wave_file(); inline void clear_has_wave_file(); @@ -1881,12 +1881,12 @@ class IDL_FILES_EXPORT SEvtInfoToEvtClt : public ::google::protobuf::Message { inline ::google::protobuf::int32 region_id() const; inline void set_region_id(::google::protobuf::int32 value); - // optional .kbd_idlfile.enAlmLogicState logic_state = 13; + // optional .iot_idl.enAlmLogicState logic_state = 13; inline bool has_logic_state() const; inline void clear_logic_state(); static const int kLogicStateFieldNumber = 13; - inline ::kbd_idlfile::enAlmLogicState logic_state() const; - inline void set_logic_state(::kbd_idlfile::enAlmLogicState value); + inline ::iot_idl::enAlmLogicState logic_state() const; + inline void set_logic_state(::iot_idl::enAlmLogicState value); // optional string dev_group_tag = 14; inline bool has_dev_group_tag() const; @@ -1924,7 +1924,7 @@ class IDL_FILES_EXPORT SEvtInfoToEvtClt : public ::google::protobuf::Message { inline ::std::string* release_wave_file(); inline void set_allocated_wave_file(::std::string* wave_file); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SEvtInfoToEvtClt) + // @@protoc_insertion_point(class_scope:iot_idl.SEvtInfoToEvtClt) private: inline void set_has_alm_type(); inline void clear_has_alm_type(); @@ -2041,26 +2041,26 @@ class IDL_FILES_EXPORT SEvtCltAddEvt : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // repeated .kbd_idlfile.SEvtInfoToEvtClt evt_info = 1; + // repeated .iot_idl.SEvtInfoToEvtClt evt_info = 1; inline int evt_info_size() const; inline void clear_evt_info(); static const int kEvtInfoFieldNumber = 1; - inline const ::kbd_idlfile::SEvtInfoToEvtClt& evt_info(int index) const; - inline ::kbd_idlfile::SEvtInfoToEvtClt* mutable_evt_info(int index); - inline ::kbd_idlfile::SEvtInfoToEvtClt* add_evt_info(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SEvtInfoToEvtClt >& + inline const ::iot_idl::SEvtInfoToEvtClt& evt_info(int index) const; + inline ::iot_idl::SEvtInfoToEvtClt* mutable_evt_info(int index); + inline ::iot_idl::SEvtInfoToEvtClt* add_evt_info(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SEvtInfoToEvtClt >& evt_info() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SEvtInfoToEvtClt >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SEvtInfoToEvtClt >* mutable_evt_info(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SEvtCltAddEvt) + // @@protoc_insertion_point(class_scope:iot_idl.SEvtCltAddEvt) private: ::google::protobuf::UnknownFieldSet _unknown_fields_; ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SEvtInfoToEvtClt > evt_info_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SEvtInfoToEvtClt > evt_info_; friend void IDL_FILES_EXPORT protobuf_AddDesc_AlarmMessage_2eproto(); friend void protobuf_AssignDesc_AlarmMessage_2eproto(); friend void protobuf_ShutdownFile_AlarmMessage_2eproto(); @@ -2090,13 +2090,13 @@ inline void SAlmManner::clear_priority() { clear_has_priority(); } inline ::google::protobuf::int32 SAlmManner::priority() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmManner.priority) + // @@protoc_insertion_point(field_get:iot_idl.SAlmManner.priority) return priority_; } inline void SAlmManner::set_priority(::google::protobuf::int32 value) { set_has_priority(); priority_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmManner.priority) + // @@protoc_insertion_point(field_set:iot_idl.SAlmManner.priority) } // required int32 if_ack_on_rtn = 2; @@ -2114,13 +2114,13 @@ inline void SAlmManner::clear_if_ack_on_rtn() { clear_has_if_ack_on_rtn(); } inline ::google::protobuf::int32 SAlmManner::if_ack_on_rtn() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmManner.if_ack_on_rtn) + // @@protoc_insertion_point(field_get:iot_idl.SAlmManner.if_ack_on_rtn) return if_ack_on_rtn_; } inline void SAlmManner::set_if_ack_on_rtn(::google::protobuf::int32 value) { set_has_if_ack_on_rtn(); if_ack_on_rtn_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmManner.if_ack_on_rtn) + // @@protoc_insertion_point(field_set:iot_idl.SAlmManner.if_ack_on_rtn) } // required int32 del_act_on_ack = 3; @@ -2138,13 +2138,13 @@ inline void SAlmManner::clear_del_act_on_ack() { clear_has_del_act_on_ack(); } inline ::google::protobuf::int32 SAlmManner::del_act_on_ack() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmManner.del_act_on_ack) + // @@protoc_insertion_point(field_get:iot_idl.SAlmManner.del_act_on_ack) return del_act_on_ack_; } inline void SAlmManner::set_del_act_on_ack(::google::protobuf::int32 value) { set_has_del_act_on_ack(); del_act_on_ack_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmManner.del_act_on_ack) + // @@protoc_insertion_point(field_set:iot_idl.SAlmManner.del_act_on_ack) } // required int32 if_never_alm_on_rtn = 4; @@ -2162,13 +2162,13 @@ inline void SAlmManner::clear_if_never_alm_on_rtn() { clear_has_if_never_alm_on_rtn(); } inline ::google::protobuf::int32 SAlmManner::if_never_alm_on_rtn() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmManner.if_never_alm_on_rtn) + // @@protoc_insertion_point(field_get:iot_idl.SAlmManner.if_never_alm_on_rtn) return if_never_alm_on_rtn_; } inline void SAlmManner::set_if_never_alm_on_rtn(::google::protobuf::int32 value) { set_has_if_never_alm_on_rtn(); if_never_alm_on_rtn_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmManner.if_never_alm_on_rtn) + // @@protoc_insertion_point(field_set:iot_idl.SAlmManner.if_never_alm_on_rtn) } // required int32 if_water_alm = 5; @@ -2186,13 +2186,13 @@ inline void SAlmManner::clear_if_water_alm() { clear_has_if_water_alm(); } inline ::google::protobuf::int32 SAlmManner::if_water_alm() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmManner.if_water_alm) + // @@protoc_insertion_point(field_get:iot_idl.SAlmManner.if_water_alm) return if_water_alm_; } inline void SAlmManner::set_if_water_alm(::google::protobuf::int32 value) { set_has_if_water_alm(); if_water_alm_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmManner.if_water_alm) + // @@protoc_insertion_point(field_set:iot_idl.SAlmManner.if_water_alm) } // ------------------------------------------------------------------- @@ -2214,13 +2214,13 @@ inline void SAlmKeyword::clear_id() { clear_has_id(); } inline ::google::protobuf::int32 SAlmKeyword::id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmKeyword.id) + // @@protoc_insertion_point(field_get:iot_idl.SAlmKeyword.id) return id_; } inline void SAlmKeyword::set_id(::google::protobuf::int32 value) { set_has_id(); id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmKeyword.id) + // @@protoc_insertion_point(field_set:iot_idl.SAlmKeyword.id) } // required string value = 2; @@ -2240,7 +2240,7 @@ inline void SAlmKeyword::clear_value() { clear_has_value(); } inline const ::std::string& SAlmKeyword::value() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmKeyword.value) + // @@protoc_insertion_point(field_get:iot_idl.SAlmKeyword.value) return *value_; } inline void SAlmKeyword::set_value(const ::std::string& value) { @@ -2249,7 +2249,7 @@ inline void SAlmKeyword::set_value(const ::std::string& value) { value_ = new ::std::string; } value_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmKeyword.value) + // @@protoc_insertion_point(field_set:iot_idl.SAlmKeyword.value) } inline void SAlmKeyword::set_value(const char* value) { set_has_value(); @@ -2257,7 +2257,7 @@ inline void SAlmKeyword::set_value(const char* value) { value_ = new ::std::string; } value_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmKeyword.value) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmKeyword.value) } inline void SAlmKeyword::set_value(const char* value, size_t size) { set_has_value(); @@ -2265,14 +2265,14 @@ inline void SAlmKeyword::set_value(const char* value, size_t size) { value_ = new ::std::string; } value_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmKeyword.value) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmKeyword.value) } inline ::std::string* SAlmKeyword::mutable_value() { set_has_value(); if (value_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { value_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmKeyword.value) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmKeyword.value) return value_; } inline ::std::string* SAlmKeyword::release_value() { @@ -2296,7 +2296,7 @@ inline void SAlmKeyword::set_allocated_value(::std::string* value) { clear_has_value(); value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmKeyword.value) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmKeyword.value) } // ------------------------------------------------------------------- @@ -2318,13 +2318,13 @@ inline void SAlmInfoFromApp::clear_alm_type() { clear_has_alm_type(); } inline ::google::protobuf::int32 SAlmInfoFromApp::alm_type() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoFromApp.alm_type) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoFromApp.alm_type) return alm_type_; } inline void SAlmInfoFromApp::set_alm_type(::google::protobuf::int32 value) { set_has_alm_type(); alm_type_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoFromApp.alm_type) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoFromApp.alm_type) } // required int32 status = 2; @@ -2342,13 +2342,13 @@ inline void SAlmInfoFromApp::clear_status() { clear_has_status(); } inline ::google::protobuf::int32 SAlmInfoFromApp::status() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoFromApp.status) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoFromApp.status) return status_; } inline void SAlmInfoFromApp::set_status(::google::protobuf::int32 value) { set_has_status(); status_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoFromApp.status) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoFromApp.status) } // required int64 time_stamp = 3; @@ -2366,13 +2366,13 @@ inline void SAlmInfoFromApp::clear_time_stamp() { clear_has_time_stamp(); } inline ::google::protobuf::int64 SAlmInfoFromApp::time_stamp() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoFromApp.time_stamp) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoFromApp.time_stamp) return time_stamp_; } inline void SAlmInfoFromApp::set_time_stamp(::google::protobuf::int64 value) { set_has_time_stamp(); time_stamp_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoFromApp.time_stamp) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoFromApp.time_stamp) } // required int32 location_id = 4; @@ -2390,16 +2390,16 @@ inline void SAlmInfoFromApp::clear_location_id() { clear_has_location_id(); } inline ::google::protobuf::int32 SAlmInfoFromApp::location_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoFromApp.location_id) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoFromApp.location_id) return location_id_; } inline void SAlmInfoFromApp::set_location_id(::google::protobuf::int32 value) { set_has_location_id(); location_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoFromApp.location_id) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoFromApp.location_id) } -// required .kbd_idlfile.enAlmStyle alm_style = 5; +// required .iot_idl.enAlmStyle alm_style = 5; inline bool SAlmInfoFromApp::has_alm_style() const { return (_has_bits_[0] & 0x00000010u) != 0; } @@ -2413,44 +2413,44 @@ inline void SAlmInfoFromApp::clear_alm_style() { alm_style_ = 0; clear_has_alm_style(); } -inline ::kbd_idlfile::enAlmStyle SAlmInfoFromApp::alm_style() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoFromApp.alm_style) - return static_cast< ::kbd_idlfile::enAlmStyle >(alm_style_); +inline ::iot_idl::enAlmStyle SAlmInfoFromApp::alm_style() const { + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoFromApp.alm_style) + return static_cast< ::iot_idl::enAlmStyle >(alm_style_); } -inline void SAlmInfoFromApp::set_alm_style(::kbd_idlfile::enAlmStyle value) { - assert(::kbd_idlfile::enAlmStyle_IsValid(value)); +inline void SAlmInfoFromApp::set_alm_style(::iot_idl::enAlmStyle value) { + assert(::iot_idl::enAlmStyle_IsValid(value)); set_has_alm_style(); alm_style_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoFromApp.alm_style) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoFromApp.alm_style) } -// repeated .kbd_idlfile.SAlmKeyword alm_keyword = 6; +// repeated .iot_idl.SAlmKeyword alm_keyword = 6; inline int SAlmInfoFromApp::alm_keyword_size() const { return alm_keyword_.size(); } inline void SAlmInfoFromApp::clear_alm_keyword() { alm_keyword_.Clear(); } -inline const ::kbd_idlfile::SAlmKeyword& SAlmInfoFromApp::alm_keyword(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoFromApp.alm_keyword) +inline const ::iot_idl::SAlmKeyword& SAlmInfoFromApp::alm_keyword(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoFromApp.alm_keyword) return alm_keyword_.Get(index); } -inline ::kbd_idlfile::SAlmKeyword* SAlmInfoFromApp::mutable_alm_keyword(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoFromApp.alm_keyword) +inline ::iot_idl::SAlmKeyword* SAlmInfoFromApp::mutable_alm_keyword(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoFromApp.alm_keyword) return alm_keyword_.Mutable(index); } -inline ::kbd_idlfile::SAlmKeyword* SAlmInfoFromApp::add_alm_keyword() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SAlmInfoFromApp.alm_keyword) +inline ::iot_idl::SAlmKeyword* SAlmInfoFromApp::add_alm_keyword() { + // @@protoc_insertion_point(field_add:iot_idl.SAlmInfoFromApp.alm_keyword) return alm_keyword_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAlmKeyword >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SAlmKeyword >& SAlmInfoFromApp::alm_keyword() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SAlmInfoFromApp.alm_keyword) + // @@protoc_insertion_point(field_list:iot_idl.SAlmInfoFromApp.alm_keyword) return alm_keyword_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAlmKeyword >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SAlmKeyword >* SAlmInfoFromApp::mutable_alm_keyword() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SAlmInfoFromApp.alm_keyword) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SAlmInfoFromApp.alm_keyword) return &alm_keyword_; } @@ -2469,13 +2469,13 @@ inline void SAlmInfoFromApp::clear_sub_system() { clear_has_sub_system(); } inline ::google::protobuf::int32 SAlmInfoFromApp::sub_system() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoFromApp.sub_system) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoFromApp.sub_system) return sub_system_; } inline void SAlmInfoFromApp::set_sub_system(::google::protobuf::int32 value) { set_has_sub_system(); sub_system_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoFromApp.sub_system) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoFromApp.sub_system) } // optional int32 dev_type = 8; @@ -2493,13 +2493,13 @@ inline void SAlmInfoFromApp::clear_dev_type() { clear_has_dev_type(); } inline ::google::protobuf::int32 SAlmInfoFromApp::dev_type() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoFromApp.dev_type) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoFromApp.dev_type) return dev_type_; } inline void SAlmInfoFromApp::set_dev_type(::google::protobuf::int32 value) { set_has_dev_type(); dev_type_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoFromApp.dev_type) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoFromApp.dev_type) } // optional int32 region_id = 9; @@ -2517,13 +2517,13 @@ inline void SAlmInfoFromApp::clear_region_id() { clear_has_region_id(); } inline ::google::protobuf::int32 SAlmInfoFromApp::region_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoFromApp.region_id) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoFromApp.region_id) return region_id_; } inline void SAlmInfoFromApp::set_region_id(::google::protobuf::int32 value) { set_has_region_id(); region_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoFromApp.region_id) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoFromApp.region_id) } // optional string dev_group_tag = 10; @@ -2543,7 +2543,7 @@ inline void SAlmInfoFromApp::clear_dev_group_tag() { clear_has_dev_group_tag(); } inline const ::std::string& SAlmInfoFromApp::dev_group_tag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoFromApp.dev_group_tag) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoFromApp.dev_group_tag) return *dev_group_tag_; } inline void SAlmInfoFromApp::set_dev_group_tag(const ::std::string& value) { @@ -2552,7 +2552,7 @@ inline void SAlmInfoFromApp::set_dev_group_tag(const ::std::string& value) { dev_group_tag_ = new ::std::string; } dev_group_tag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoFromApp.dev_group_tag) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoFromApp.dev_group_tag) } inline void SAlmInfoFromApp::set_dev_group_tag(const char* value) { set_has_dev_group_tag(); @@ -2560,7 +2560,7 @@ inline void SAlmInfoFromApp::set_dev_group_tag(const char* value) { dev_group_tag_ = new ::std::string; } dev_group_tag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmInfoFromApp.dev_group_tag) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmInfoFromApp.dev_group_tag) } inline void SAlmInfoFromApp::set_dev_group_tag(const char* value, size_t size) { set_has_dev_group_tag(); @@ -2568,14 +2568,14 @@ inline void SAlmInfoFromApp::set_dev_group_tag(const char* value, size_t size) { dev_group_tag_ = new ::std::string; } dev_group_tag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmInfoFromApp.dev_group_tag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmInfoFromApp.dev_group_tag) } inline ::std::string* SAlmInfoFromApp::mutable_dev_group_tag() { set_has_dev_group_tag(); if (dev_group_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { dev_group_tag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoFromApp.dev_group_tag) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoFromApp.dev_group_tag) return dev_group_tag_; } inline ::std::string* SAlmInfoFromApp::release_dev_group_tag() { @@ -2599,7 +2599,7 @@ inline void SAlmInfoFromApp::set_allocated_dev_group_tag(::std::string* dev_grou clear_has_dev_group_tag(); dev_group_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmInfoFromApp.dev_group_tag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmInfoFromApp.dev_group_tag) } // optional string key_id_tag = 11; @@ -2619,7 +2619,7 @@ inline void SAlmInfoFromApp::clear_key_id_tag() { clear_has_key_id_tag(); } inline const ::std::string& SAlmInfoFromApp::key_id_tag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoFromApp.key_id_tag) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoFromApp.key_id_tag) return *key_id_tag_; } inline void SAlmInfoFromApp::set_key_id_tag(const ::std::string& value) { @@ -2628,7 +2628,7 @@ inline void SAlmInfoFromApp::set_key_id_tag(const ::std::string& value) { key_id_tag_ = new ::std::string; } key_id_tag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoFromApp.key_id_tag) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoFromApp.key_id_tag) } inline void SAlmInfoFromApp::set_key_id_tag(const char* value) { set_has_key_id_tag(); @@ -2636,7 +2636,7 @@ inline void SAlmInfoFromApp::set_key_id_tag(const char* value) { key_id_tag_ = new ::std::string; } key_id_tag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmInfoFromApp.key_id_tag) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmInfoFromApp.key_id_tag) } inline void SAlmInfoFromApp::set_key_id_tag(const char* value, size_t size) { set_has_key_id_tag(); @@ -2644,14 +2644,14 @@ inline void SAlmInfoFromApp::set_key_id_tag(const char* value, size_t size) { key_id_tag_ = new ::std::string; } key_id_tag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmInfoFromApp.key_id_tag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmInfoFromApp.key_id_tag) } inline ::std::string* SAlmInfoFromApp::mutable_key_id_tag() { set_has_key_id_tag(); if (key_id_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { key_id_tag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoFromApp.key_id_tag) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoFromApp.key_id_tag) return key_id_tag_; } inline ::std::string* SAlmInfoFromApp::release_key_id_tag() { @@ -2675,7 +2675,7 @@ inline void SAlmInfoFromApp::set_allocated_key_id_tag(::std::string* key_id_tag) clear_has_key_id_tag(); key_id_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmInfoFromApp.key_id_tag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmInfoFromApp.key_id_tag) } // optional string graph_name = 12; @@ -2695,7 +2695,7 @@ inline void SAlmInfoFromApp::clear_graph_name() { clear_has_graph_name(); } inline const ::std::string& SAlmInfoFromApp::graph_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoFromApp.graph_name) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoFromApp.graph_name) return *graph_name_; } inline void SAlmInfoFromApp::set_graph_name(const ::std::string& value) { @@ -2704,7 +2704,7 @@ inline void SAlmInfoFromApp::set_graph_name(const ::std::string& value) { graph_name_ = new ::std::string; } graph_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoFromApp.graph_name) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoFromApp.graph_name) } inline void SAlmInfoFromApp::set_graph_name(const char* value) { set_has_graph_name(); @@ -2712,7 +2712,7 @@ inline void SAlmInfoFromApp::set_graph_name(const char* value) { graph_name_ = new ::std::string; } graph_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmInfoFromApp.graph_name) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmInfoFromApp.graph_name) } inline void SAlmInfoFromApp::set_graph_name(const char* value, size_t size) { set_has_graph_name(); @@ -2720,14 +2720,14 @@ inline void SAlmInfoFromApp::set_graph_name(const char* value, size_t size) { graph_name_ = new ::std::string; } graph_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmInfoFromApp.graph_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmInfoFromApp.graph_name) } inline ::std::string* SAlmInfoFromApp::mutable_graph_name() { set_has_graph_name(); if (graph_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { graph_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoFromApp.graph_name) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoFromApp.graph_name) return graph_name_; } inline ::std::string* SAlmInfoFromApp::release_graph_name() { @@ -2751,7 +2751,7 @@ inline void SAlmInfoFromApp::set_allocated_graph_name(::std::string* graph_name) clear_has_graph_name(); graph_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmInfoFromApp.graph_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmInfoFromApp.graph_name) } // repeated string sound_file = 13; @@ -2762,53 +2762,53 @@ inline void SAlmInfoFromApp::clear_sound_file() { sound_file_.Clear(); } inline const ::std::string& SAlmInfoFromApp::sound_file(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoFromApp.sound_file) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoFromApp.sound_file) return sound_file_.Get(index); } inline ::std::string* SAlmInfoFromApp::mutable_sound_file(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoFromApp.sound_file) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoFromApp.sound_file) return sound_file_.Mutable(index); } inline void SAlmInfoFromApp::set_sound_file(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoFromApp.sound_file) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoFromApp.sound_file) sound_file_.Mutable(index)->assign(value); } inline void SAlmInfoFromApp::set_sound_file(int index, const char* value) { sound_file_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmInfoFromApp.sound_file) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmInfoFromApp.sound_file) } inline void SAlmInfoFromApp::set_sound_file(int index, const char* value, size_t size) { sound_file_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmInfoFromApp.sound_file) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmInfoFromApp.sound_file) } inline ::std::string* SAlmInfoFromApp::add_sound_file() { return sound_file_.Add(); } inline void SAlmInfoFromApp::add_sound_file(const ::std::string& value) { sound_file_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.SAlmInfoFromApp.sound_file) + // @@protoc_insertion_point(field_add:iot_idl.SAlmInfoFromApp.sound_file) } inline void SAlmInfoFromApp::add_sound_file(const char* value) { sound_file_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.SAlmInfoFromApp.sound_file) + // @@protoc_insertion_point(field_add_char:iot_idl.SAlmInfoFromApp.sound_file) } inline void SAlmInfoFromApp::add_sound_file(const char* value, size_t size) { sound_file_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.SAlmInfoFromApp.sound_file) + // @@protoc_insertion_point(field_add_pointer:iot_idl.SAlmInfoFromApp.sound_file) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& SAlmInfoFromApp::sound_file() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SAlmInfoFromApp.sound_file) + // @@protoc_insertion_point(field_list:iot_idl.SAlmInfoFromApp.sound_file) return sound_file_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* SAlmInfoFromApp::mutable_sound_file() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SAlmInfoFromApp.sound_file) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SAlmInfoFromApp.sound_file) return &sound_file_; } -// optional .kbd_idlfile.SAlmManner alm_manner = 14; +// optional .iot_idl.SAlmManner alm_manner = 14; inline bool SAlmInfoFromApp::has_alm_manner() const { return (_has_bits_[0] & 0x00002000u) != 0; } @@ -2819,26 +2819,26 @@ inline void SAlmInfoFromApp::clear_has_alm_manner() { _has_bits_[0] &= ~0x00002000u; } inline void SAlmInfoFromApp::clear_alm_manner() { - if (alm_manner_ != NULL) alm_manner_->::kbd_idlfile::SAlmManner::Clear(); + if (alm_manner_ != NULL) alm_manner_->::iot_idl::SAlmManner::Clear(); clear_has_alm_manner(); } -inline const ::kbd_idlfile::SAlmManner& SAlmInfoFromApp::alm_manner() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoFromApp.alm_manner) +inline const ::iot_idl::SAlmManner& SAlmInfoFromApp::alm_manner() const { + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoFromApp.alm_manner) return alm_manner_ != NULL ? *alm_manner_ : *default_instance_->alm_manner_; } -inline ::kbd_idlfile::SAlmManner* SAlmInfoFromApp::mutable_alm_manner() { +inline ::iot_idl::SAlmManner* SAlmInfoFromApp::mutable_alm_manner() { set_has_alm_manner(); - if (alm_manner_ == NULL) alm_manner_ = new ::kbd_idlfile::SAlmManner; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoFromApp.alm_manner) + if (alm_manner_ == NULL) alm_manner_ = new ::iot_idl::SAlmManner; + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoFromApp.alm_manner) return alm_manner_; } -inline ::kbd_idlfile::SAlmManner* SAlmInfoFromApp::release_alm_manner() { +inline ::iot_idl::SAlmManner* SAlmInfoFromApp::release_alm_manner() { clear_has_alm_manner(); - ::kbd_idlfile::SAlmManner* temp = alm_manner_; + ::iot_idl::SAlmManner* temp = alm_manner_; alm_manner_ = NULL; return temp; } -inline void SAlmInfoFromApp::set_allocated_alm_manner(::kbd_idlfile::SAlmManner* alm_manner) { +inline void SAlmInfoFromApp::set_allocated_alm_manner(::iot_idl::SAlmManner* alm_manner) { delete alm_manner_; alm_manner_ = alm_manner; if (alm_manner) { @@ -2846,7 +2846,7 @@ inline void SAlmInfoFromApp::set_allocated_alm_manner(::kbd_idlfile::SAlmManner* } else { clear_has_alm_manner(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmInfoFromApp.alm_manner) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmInfoFromApp.alm_manner) } // optional string camera_tag = 15; @@ -2866,7 +2866,7 @@ inline void SAlmInfoFromApp::clear_camera_tag() { clear_has_camera_tag(); } inline const ::std::string& SAlmInfoFromApp::camera_tag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoFromApp.camera_tag) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoFromApp.camera_tag) return *camera_tag_; } inline void SAlmInfoFromApp::set_camera_tag(const ::std::string& value) { @@ -2875,7 +2875,7 @@ inline void SAlmInfoFromApp::set_camera_tag(const ::std::string& value) { camera_tag_ = new ::std::string; } camera_tag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoFromApp.camera_tag) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoFromApp.camera_tag) } inline void SAlmInfoFromApp::set_camera_tag(const char* value) { set_has_camera_tag(); @@ -2883,7 +2883,7 @@ inline void SAlmInfoFromApp::set_camera_tag(const char* value) { camera_tag_ = new ::std::string; } camera_tag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmInfoFromApp.camera_tag) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmInfoFromApp.camera_tag) } inline void SAlmInfoFromApp::set_camera_tag(const char* value, size_t size) { set_has_camera_tag(); @@ -2891,14 +2891,14 @@ inline void SAlmInfoFromApp::set_camera_tag(const char* value, size_t size) { camera_tag_ = new ::std::string; } camera_tag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmInfoFromApp.camera_tag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmInfoFromApp.camera_tag) } inline ::std::string* SAlmInfoFromApp::mutable_camera_tag() { set_has_camera_tag(); if (camera_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { camera_tag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoFromApp.camera_tag) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoFromApp.camera_tag) return camera_tag_; } inline ::std::string* SAlmInfoFromApp::release_camera_tag() { @@ -2922,7 +2922,7 @@ inline void SAlmInfoFromApp::set_allocated_camera_tag(::std::string* camera_tag) clear_has_camera_tag(); camera_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmInfoFromApp.camera_tag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmInfoFromApp.camera_tag) } // optional string camera_preset = 16; @@ -2942,7 +2942,7 @@ inline void SAlmInfoFromApp::clear_camera_preset() { clear_has_camera_preset(); } inline const ::std::string& SAlmInfoFromApp::camera_preset() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoFromApp.camera_preset) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoFromApp.camera_preset) return *camera_preset_; } inline void SAlmInfoFromApp::set_camera_preset(const ::std::string& value) { @@ -2951,7 +2951,7 @@ inline void SAlmInfoFromApp::set_camera_preset(const ::std::string& value) { camera_preset_ = new ::std::string; } camera_preset_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoFromApp.camera_preset) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoFromApp.camera_preset) } inline void SAlmInfoFromApp::set_camera_preset(const char* value) { set_has_camera_preset(); @@ -2959,7 +2959,7 @@ inline void SAlmInfoFromApp::set_camera_preset(const char* value) { camera_preset_ = new ::std::string; } camera_preset_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmInfoFromApp.camera_preset) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmInfoFromApp.camera_preset) } inline void SAlmInfoFromApp::set_camera_preset(const char* value, size_t size) { set_has_camera_preset(); @@ -2967,14 +2967,14 @@ inline void SAlmInfoFromApp::set_camera_preset(const char* value, size_t size) { camera_preset_ = new ::std::string; } camera_preset_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmInfoFromApp.camera_preset) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmInfoFromApp.camera_preset) } inline ::std::string* SAlmInfoFromApp::mutable_camera_preset() { set_has_camera_preset(); if (camera_preset_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { camera_preset_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoFromApp.camera_preset) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoFromApp.camera_preset) return camera_preset_; } inline ::std::string* SAlmInfoFromApp::release_camera_preset() { @@ -2998,7 +2998,7 @@ inline void SAlmInfoFromApp::set_allocated_camera_preset(::std::string* camera_p clear_has_camera_preset(); camera_preset_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmInfoFromApp.camera_preset) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmInfoFromApp.camera_preset) } // ------------------------------------------------------------------- @@ -3020,13 +3020,13 @@ inline void SAppAddAlm::clear_domain_id() { clear_has_domain_id(); } inline ::google::protobuf::int32 SAppAddAlm::domain_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAppAddAlm.domain_id) + // @@protoc_insertion_point(field_get:iot_idl.SAppAddAlm.domain_id) return domain_id_; } inline void SAppAddAlm::set_domain_id(::google::protobuf::int32 value) { set_has_domain_id(); domain_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAppAddAlm.domain_id) + // @@protoc_insertion_point(field_set:iot_idl.SAppAddAlm.domain_id) } // optional int32 app_id = 2; @@ -3044,42 +3044,42 @@ inline void SAppAddAlm::clear_app_id() { clear_has_app_id(); } inline ::google::protobuf::int32 SAppAddAlm::app_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAppAddAlm.app_id) + // @@protoc_insertion_point(field_get:iot_idl.SAppAddAlm.app_id) return app_id_; } inline void SAppAddAlm::set_app_id(::google::protobuf::int32 value) { set_has_app_id(); app_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAppAddAlm.app_id) + // @@protoc_insertion_point(field_set:iot_idl.SAppAddAlm.app_id) } -// repeated .kbd_idlfile.SAlmInfoFromApp alm_info = 3; +// repeated .iot_idl.SAlmInfoFromApp alm_info = 3; inline int SAppAddAlm::alm_info_size() const { return alm_info_.size(); } inline void SAppAddAlm::clear_alm_info() { alm_info_.Clear(); } -inline const ::kbd_idlfile::SAlmInfoFromApp& SAppAddAlm::alm_info(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAppAddAlm.alm_info) +inline const ::iot_idl::SAlmInfoFromApp& SAppAddAlm::alm_info(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SAppAddAlm.alm_info) return alm_info_.Get(index); } -inline ::kbd_idlfile::SAlmInfoFromApp* SAppAddAlm::mutable_alm_info(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAppAddAlm.alm_info) +inline ::iot_idl::SAlmInfoFromApp* SAppAddAlm::mutable_alm_info(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SAppAddAlm.alm_info) return alm_info_.Mutable(index); } -inline ::kbd_idlfile::SAlmInfoFromApp* SAppAddAlm::add_alm_info() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SAppAddAlm.alm_info) +inline ::iot_idl::SAlmInfoFromApp* SAppAddAlm::add_alm_info() { + // @@protoc_insertion_point(field_add:iot_idl.SAppAddAlm.alm_info) return alm_info_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAlmInfoFromApp >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SAlmInfoFromApp >& SAppAddAlm::alm_info() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SAppAddAlm.alm_info) + // @@protoc_insertion_point(field_list:iot_idl.SAppAddAlm.alm_info) return alm_info_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAlmInfoFromApp >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SAlmInfoFromApp >* SAppAddAlm::mutable_alm_info() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SAppAddAlm.alm_info) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SAppAddAlm.alm_info) return &alm_info_; } @@ -3102,13 +3102,13 @@ inline void SAppAddWave::clear_start_time() { clear_has_start_time(); } inline ::google::protobuf::int64 SAppAddWave::start_time() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAppAddWave.start_time) + // @@protoc_insertion_point(field_get:iot_idl.SAppAddWave.start_time) return start_time_; } inline void SAppAddWave::set_start_time(::google::protobuf::int64 value) { set_has_start_time(); start_time_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAppAddWave.start_time) + // @@protoc_insertion_point(field_set:iot_idl.SAppAddWave.start_time) } // required int64 end_time = 2; @@ -3126,13 +3126,13 @@ inline void SAppAddWave::clear_end_time() { clear_has_end_time(); } inline ::google::protobuf::int64 SAppAddWave::end_time() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAppAddWave.end_time) + // @@protoc_insertion_point(field_get:iot_idl.SAppAddWave.end_time) return end_time_; } inline void SAppAddWave::set_end_time(::google::protobuf::int64 value) { set_has_end_time(); end_time_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAppAddWave.end_time) + // @@protoc_insertion_point(field_set:iot_idl.SAppAddWave.end_time) } // required string dev_group_tag = 3; @@ -3152,7 +3152,7 @@ inline void SAppAddWave::clear_dev_group_tag() { clear_has_dev_group_tag(); } inline const ::std::string& SAppAddWave::dev_group_tag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAppAddWave.dev_group_tag) + // @@protoc_insertion_point(field_get:iot_idl.SAppAddWave.dev_group_tag) return *dev_group_tag_; } inline void SAppAddWave::set_dev_group_tag(const ::std::string& value) { @@ -3161,7 +3161,7 @@ inline void SAppAddWave::set_dev_group_tag(const ::std::string& value) { dev_group_tag_ = new ::std::string; } dev_group_tag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAppAddWave.dev_group_tag) + // @@protoc_insertion_point(field_set:iot_idl.SAppAddWave.dev_group_tag) } inline void SAppAddWave::set_dev_group_tag(const char* value) { set_has_dev_group_tag(); @@ -3169,7 +3169,7 @@ inline void SAppAddWave::set_dev_group_tag(const char* value) { dev_group_tag_ = new ::std::string; } dev_group_tag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAppAddWave.dev_group_tag) + // @@protoc_insertion_point(field_set_char:iot_idl.SAppAddWave.dev_group_tag) } inline void SAppAddWave::set_dev_group_tag(const char* value, size_t size) { set_has_dev_group_tag(); @@ -3177,14 +3177,14 @@ inline void SAppAddWave::set_dev_group_tag(const char* value, size_t size) { dev_group_tag_ = new ::std::string; } dev_group_tag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAppAddWave.dev_group_tag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAppAddWave.dev_group_tag) } inline ::std::string* SAppAddWave::mutable_dev_group_tag() { set_has_dev_group_tag(); if (dev_group_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { dev_group_tag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAppAddWave.dev_group_tag) + // @@protoc_insertion_point(field_mutable:iot_idl.SAppAddWave.dev_group_tag) return dev_group_tag_; } inline ::std::string* SAppAddWave::release_dev_group_tag() { @@ -3208,7 +3208,7 @@ inline void SAppAddWave::set_allocated_dev_group_tag(::std::string* dev_group_ta clear_has_dev_group_tag(); dev_group_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAppAddWave.dev_group_tag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAppAddWave.dev_group_tag) } // required string wave_file = 4; @@ -3228,7 +3228,7 @@ inline void SAppAddWave::clear_wave_file() { clear_has_wave_file(); } inline const ::std::string& SAppAddWave::wave_file() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAppAddWave.wave_file) + // @@protoc_insertion_point(field_get:iot_idl.SAppAddWave.wave_file) return *wave_file_; } inline void SAppAddWave::set_wave_file(const ::std::string& value) { @@ -3237,7 +3237,7 @@ inline void SAppAddWave::set_wave_file(const ::std::string& value) { wave_file_ = new ::std::string; } wave_file_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAppAddWave.wave_file) + // @@protoc_insertion_point(field_set:iot_idl.SAppAddWave.wave_file) } inline void SAppAddWave::set_wave_file(const char* value) { set_has_wave_file(); @@ -3245,7 +3245,7 @@ inline void SAppAddWave::set_wave_file(const char* value) { wave_file_ = new ::std::string; } wave_file_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAppAddWave.wave_file) + // @@protoc_insertion_point(field_set_char:iot_idl.SAppAddWave.wave_file) } inline void SAppAddWave::set_wave_file(const char* value, size_t size) { set_has_wave_file(); @@ -3253,14 +3253,14 @@ inline void SAppAddWave::set_wave_file(const char* value, size_t size) { wave_file_ = new ::std::string; } wave_file_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAppAddWave.wave_file) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAppAddWave.wave_file) } inline ::std::string* SAppAddWave::mutable_wave_file() { set_has_wave_file(); if (wave_file_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { wave_file_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAppAddWave.wave_file) + // @@protoc_insertion_point(field_mutable:iot_idl.SAppAddWave.wave_file) return wave_file_; } inline ::std::string* SAppAddWave::release_wave_file() { @@ -3284,7 +3284,7 @@ inline void SAppAddWave::set_allocated_wave_file(::std::string* wave_file) { clear_has_wave_file(); wave_file_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAppAddWave.wave_file) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAppAddWave.wave_file) } // ------------------------------------------------------------------- @@ -3306,13 +3306,13 @@ inline void SAlmInfoToAlmClt::clear_alm_type() { clear_has_alm_type(); } inline ::google::protobuf::int32 SAlmInfoToAlmClt::alm_type() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.alm_type) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.alm_type) return alm_type_; } inline void SAlmInfoToAlmClt::set_alm_type(::google::protobuf::int32 value) { set_has_alm_type(); alm_type_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.alm_type) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.alm_type) } // required int32 alm_status = 2; @@ -3330,16 +3330,16 @@ inline void SAlmInfoToAlmClt::clear_alm_status() { clear_has_alm_status(); } inline ::google::protobuf::int32 SAlmInfoToAlmClt::alm_status() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.alm_status) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.alm_status) return alm_status_; } inline void SAlmInfoToAlmClt::set_alm_status(::google::protobuf::int32 value) { set_has_alm_status(); alm_status_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.alm_status) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.alm_status) } -// required .kbd_idlfile.enAlmLogicState logic_state = 3; +// required .iot_idl.enAlmLogicState logic_state = 3; inline bool SAlmInfoToAlmClt::has_logic_state() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -3353,15 +3353,15 @@ inline void SAlmInfoToAlmClt::clear_logic_state() { logic_state_ = 0; clear_has_logic_state(); } -inline ::kbd_idlfile::enAlmLogicState SAlmInfoToAlmClt::logic_state() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.logic_state) - return static_cast< ::kbd_idlfile::enAlmLogicState >(logic_state_); +inline ::iot_idl::enAlmLogicState SAlmInfoToAlmClt::logic_state() const { + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.logic_state) + return static_cast< ::iot_idl::enAlmLogicState >(logic_state_); } -inline void SAlmInfoToAlmClt::set_logic_state(::kbd_idlfile::enAlmLogicState value) { - assert(::kbd_idlfile::enAlmLogicState_IsValid(value)); +inline void SAlmInfoToAlmClt::set_logic_state(::iot_idl::enAlmLogicState value) { + assert(::iot_idl::enAlmLogicState_IsValid(value)); set_has_logic_state(); logic_state_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.logic_state) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.logic_state) } // required int64 time_stamp = 4; @@ -3379,13 +3379,13 @@ inline void SAlmInfoToAlmClt::clear_time_stamp() { clear_has_time_stamp(); } inline ::google::protobuf::int64 SAlmInfoToAlmClt::time_stamp() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.time_stamp) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.time_stamp) return time_stamp_; } inline void SAlmInfoToAlmClt::set_time_stamp(::google::protobuf::int64 value) { set_has_time_stamp(); time_stamp_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.time_stamp) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.time_stamp) } // required int32 domain_id = 5; @@ -3403,13 +3403,13 @@ inline void SAlmInfoToAlmClt::clear_domain_id() { clear_has_domain_id(); } inline ::google::protobuf::int32 SAlmInfoToAlmClt::domain_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.domain_id) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.domain_id) return domain_id_; } inline void SAlmInfoToAlmClt::set_domain_id(::google::protobuf::int32 value) { set_has_domain_id(); domain_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.domain_id) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.domain_id) } // required int32 location_id = 6; @@ -3427,13 +3427,13 @@ inline void SAlmInfoToAlmClt::clear_location_id() { clear_has_location_id(); } inline ::google::protobuf::int32 SAlmInfoToAlmClt::location_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.location_id) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.location_id) return location_id_; } inline void SAlmInfoToAlmClt::set_location_id(::google::protobuf::int32 value) { set_has_location_id(); location_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.location_id) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.location_id) } // required int32 app_id = 7; @@ -3451,13 +3451,13 @@ inline void SAlmInfoToAlmClt::clear_app_id() { clear_has_app_id(); } inline ::google::protobuf::int32 SAlmInfoToAlmClt::app_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.app_id) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.app_id) return app_id_; } inline void SAlmInfoToAlmClt::set_app_id(::google::protobuf::int32 value) { set_has_app_id(); app_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.app_id) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.app_id) } // required int32 priority = 8; @@ -3475,13 +3475,13 @@ inline void SAlmInfoToAlmClt::clear_priority() { clear_has_priority(); } inline ::google::protobuf::int32 SAlmInfoToAlmClt::priority() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.priority) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.priority) return priority_; } inline void SAlmInfoToAlmClt::set_priority(::google::protobuf::int32 value) { set_has_priority(); priority_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.priority) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.priority) } // required int32 if_ack_on_rtn = 9; @@ -3499,13 +3499,13 @@ inline void SAlmInfoToAlmClt::clear_if_ack_on_rtn() { clear_has_if_ack_on_rtn(); } inline ::google::protobuf::int32 SAlmInfoToAlmClt::if_ack_on_rtn() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.if_ack_on_rtn) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.if_ack_on_rtn) return if_ack_on_rtn_; } inline void SAlmInfoToAlmClt::set_if_ack_on_rtn(::google::protobuf::int32 value) { set_has_if_ack_on_rtn(); if_ack_on_rtn_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.if_ack_on_rtn) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.if_ack_on_rtn) } // required int32 del_act_on_ack = 10; @@ -3523,13 +3523,13 @@ inline void SAlmInfoToAlmClt::clear_del_act_on_ack() { clear_has_del_act_on_ack(); } inline ::google::protobuf::int32 SAlmInfoToAlmClt::del_act_on_ack() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.del_act_on_ack) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.del_act_on_ack) return del_act_on_ack_; } inline void SAlmInfoToAlmClt::set_del_act_on_ack(::google::protobuf::int32 value) { set_has_del_act_on_ack(); del_act_on_ack_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.del_act_on_ack) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.del_act_on_ack) } // required int32 if_never_alm_on_rtn = 11; @@ -3547,13 +3547,13 @@ inline void SAlmInfoToAlmClt::clear_if_never_alm_on_rtn() { clear_has_if_never_alm_on_rtn(); } inline ::google::protobuf::int32 SAlmInfoToAlmClt::if_never_alm_on_rtn() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.if_never_alm_on_rtn) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.if_never_alm_on_rtn) return if_never_alm_on_rtn_; } inline void SAlmInfoToAlmClt::set_if_never_alm_on_rtn(::google::protobuf::int32 value) { set_has_if_never_alm_on_rtn(); if_never_alm_on_rtn_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.if_never_alm_on_rtn) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.if_never_alm_on_rtn) } // required int32 if_water_alm = 12; @@ -3571,13 +3571,13 @@ inline void SAlmInfoToAlmClt::clear_if_water_alm() { clear_has_if_water_alm(); } inline ::google::protobuf::int32 SAlmInfoToAlmClt::if_water_alm() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.if_water_alm) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.if_water_alm) return if_water_alm_; } inline void SAlmInfoToAlmClt::set_if_water_alm(::google::protobuf::int32 value) { set_has_if_water_alm(); if_water_alm_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.if_water_alm) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.if_water_alm) } // required string uuid_base64 = 13; @@ -3597,7 +3597,7 @@ inline void SAlmInfoToAlmClt::clear_uuid_base64() { clear_has_uuid_base64(); } inline const ::std::string& SAlmInfoToAlmClt::uuid_base64() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.uuid_base64) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.uuid_base64) return *uuid_base64_; } inline void SAlmInfoToAlmClt::set_uuid_base64(const ::std::string& value) { @@ -3606,7 +3606,7 @@ inline void SAlmInfoToAlmClt::set_uuid_base64(const ::std::string& value) { uuid_base64_ = new ::std::string; } uuid_base64_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.uuid_base64) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.uuid_base64) } inline void SAlmInfoToAlmClt::set_uuid_base64(const char* value) { set_has_uuid_base64(); @@ -3614,7 +3614,7 @@ inline void SAlmInfoToAlmClt::set_uuid_base64(const char* value) { uuid_base64_ = new ::std::string; } uuid_base64_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmInfoToAlmClt.uuid_base64) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmInfoToAlmClt.uuid_base64) } inline void SAlmInfoToAlmClt::set_uuid_base64(const char* value, size_t size) { set_has_uuid_base64(); @@ -3622,14 +3622,14 @@ inline void SAlmInfoToAlmClt::set_uuid_base64(const char* value, size_t size) { uuid_base64_ = new ::std::string; } uuid_base64_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmInfoToAlmClt.uuid_base64) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmInfoToAlmClt.uuid_base64) } inline ::std::string* SAlmInfoToAlmClt::mutable_uuid_base64() { set_has_uuid_base64(); if (uuid_base64_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { uuid_base64_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoToAlmClt.uuid_base64) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoToAlmClt.uuid_base64) return uuid_base64_; } inline ::std::string* SAlmInfoToAlmClt::release_uuid_base64() { @@ -3653,7 +3653,7 @@ inline void SAlmInfoToAlmClt::set_allocated_uuid_base64(::std::string* uuid_base clear_has_uuid_base64(); uuid_base64_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmInfoToAlmClt.uuid_base64) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmInfoToAlmClt.uuid_base64) } // required string content = 14; @@ -3673,7 +3673,7 @@ inline void SAlmInfoToAlmClt::clear_content() { clear_has_content(); } inline const ::std::string& SAlmInfoToAlmClt::content() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.content) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.content) return *content_; } inline void SAlmInfoToAlmClt::set_content(const ::std::string& value) { @@ -3682,7 +3682,7 @@ inline void SAlmInfoToAlmClt::set_content(const ::std::string& value) { content_ = new ::std::string; } content_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.content) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.content) } inline void SAlmInfoToAlmClt::set_content(const char* value) { set_has_content(); @@ -3690,7 +3690,7 @@ inline void SAlmInfoToAlmClt::set_content(const char* value) { content_ = new ::std::string; } content_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmInfoToAlmClt.content) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmInfoToAlmClt.content) } inline void SAlmInfoToAlmClt::set_content(const char* value, size_t size) { set_has_content(); @@ -3698,14 +3698,14 @@ inline void SAlmInfoToAlmClt::set_content(const char* value, size_t size) { content_ = new ::std::string; } content_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmInfoToAlmClt.content) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmInfoToAlmClt.content) } inline ::std::string* SAlmInfoToAlmClt::mutable_content() { set_has_content(); if (content_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { content_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoToAlmClt.content) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoToAlmClt.content) return content_; } inline ::std::string* SAlmInfoToAlmClt::release_content() { @@ -3729,7 +3729,7 @@ inline void SAlmInfoToAlmClt::set_allocated_content(::std::string* content) { clear_has_content(); content_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmInfoToAlmClt.content) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmInfoToAlmClt.content) } // repeated string sound_file = 15; @@ -3740,49 +3740,49 @@ inline void SAlmInfoToAlmClt::clear_sound_file() { sound_file_.Clear(); } inline const ::std::string& SAlmInfoToAlmClt::sound_file(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.sound_file) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.sound_file) return sound_file_.Get(index); } inline ::std::string* SAlmInfoToAlmClt::mutable_sound_file(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoToAlmClt.sound_file) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoToAlmClt.sound_file) return sound_file_.Mutable(index); } inline void SAlmInfoToAlmClt::set_sound_file(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.sound_file) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.sound_file) sound_file_.Mutable(index)->assign(value); } inline void SAlmInfoToAlmClt::set_sound_file(int index, const char* value) { sound_file_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmInfoToAlmClt.sound_file) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmInfoToAlmClt.sound_file) } inline void SAlmInfoToAlmClt::set_sound_file(int index, const char* value, size_t size) { sound_file_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmInfoToAlmClt.sound_file) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmInfoToAlmClt.sound_file) } inline ::std::string* SAlmInfoToAlmClt::add_sound_file() { return sound_file_.Add(); } inline void SAlmInfoToAlmClt::add_sound_file(const ::std::string& value) { sound_file_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.SAlmInfoToAlmClt.sound_file) + // @@protoc_insertion_point(field_add:iot_idl.SAlmInfoToAlmClt.sound_file) } inline void SAlmInfoToAlmClt::add_sound_file(const char* value) { sound_file_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.SAlmInfoToAlmClt.sound_file) + // @@protoc_insertion_point(field_add_char:iot_idl.SAlmInfoToAlmClt.sound_file) } inline void SAlmInfoToAlmClt::add_sound_file(const char* value, size_t size) { sound_file_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.SAlmInfoToAlmClt.sound_file) + // @@protoc_insertion_point(field_add_pointer:iot_idl.SAlmInfoToAlmClt.sound_file) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& SAlmInfoToAlmClt::sound_file() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SAlmInfoToAlmClt.sound_file) + // @@protoc_insertion_point(field_list:iot_idl.SAlmInfoToAlmClt.sound_file) return sound_file_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* SAlmInfoToAlmClt::mutable_sound_file() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SAlmInfoToAlmClt.sound_file) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SAlmInfoToAlmClt.sound_file) return &sound_file_; } @@ -3801,13 +3801,13 @@ inline void SAlmInfoToAlmClt::clear_sub_system() { clear_has_sub_system(); } inline ::google::protobuf::int32 SAlmInfoToAlmClt::sub_system() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.sub_system) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.sub_system) return sub_system_; } inline void SAlmInfoToAlmClt::set_sub_system(::google::protobuf::int32 value) { set_has_sub_system(); sub_system_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.sub_system) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.sub_system) } // optional int32 dev_type = 17; @@ -3825,13 +3825,13 @@ inline void SAlmInfoToAlmClt::clear_dev_type() { clear_has_dev_type(); } inline ::google::protobuf::int32 SAlmInfoToAlmClt::dev_type() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.dev_type) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.dev_type) return dev_type_; } inline void SAlmInfoToAlmClt::set_dev_type(::google::protobuf::int32 value) { set_has_dev_type(); dev_type_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.dev_type) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.dev_type) } // optional int32 region_id = 18; @@ -3849,13 +3849,13 @@ inline void SAlmInfoToAlmClt::clear_region_id() { clear_has_region_id(); } inline ::google::protobuf::int32 SAlmInfoToAlmClt::region_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.region_id) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.region_id) return region_id_; } inline void SAlmInfoToAlmClt::set_region_id(::google::protobuf::int32 value) { set_has_region_id(); region_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.region_id) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.region_id) } // optional string dev_group_tag = 19; @@ -3875,7 +3875,7 @@ inline void SAlmInfoToAlmClt::clear_dev_group_tag() { clear_has_dev_group_tag(); } inline const ::std::string& SAlmInfoToAlmClt::dev_group_tag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.dev_group_tag) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.dev_group_tag) return *dev_group_tag_; } inline void SAlmInfoToAlmClt::set_dev_group_tag(const ::std::string& value) { @@ -3884,7 +3884,7 @@ inline void SAlmInfoToAlmClt::set_dev_group_tag(const ::std::string& value) { dev_group_tag_ = new ::std::string; } dev_group_tag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.dev_group_tag) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.dev_group_tag) } inline void SAlmInfoToAlmClt::set_dev_group_tag(const char* value) { set_has_dev_group_tag(); @@ -3892,7 +3892,7 @@ inline void SAlmInfoToAlmClt::set_dev_group_tag(const char* value) { dev_group_tag_ = new ::std::string; } dev_group_tag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmInfoToAlmClt.dev_group_tag) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmInfoToAlmClt.dev_group_tag) } inline void SAlmInfoToAlmClt::set_dev_group_tag(const char* value, size_t size) { set_has_dev_group_tag(); @@ -3900,14 +3900,14 @@ inline void SAlmInfoToAlmClt::set_dev_group_tag(const char* value, size_t size) dev_group_tag_ = new ::std::string; } dev_group_tag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmInfoToAlmClt.dev_group_tag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmInfoToAlmClt.dev_group_tag) } inline ::std::string* SAlmInfoToAlmClt::mutable_dev_group_tag() { set_has_dev_group_tag(); if (dev_group_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { dev_group_tag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoToAlmClt.dev_group_tag) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoToAlmClt.dev_group_tag) return dev_group_tag_; } inline ::std::string* SAlmInfoToAlmClt::release_dev_group_tag() { @@ -3931,7 +3931,7 @@ inline void SAlmInfoToAlmClt::set_allocated_dev_group_tag(::std::string* dev_gro clear_has_dev_group_tag(); dev_group_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmInfoToAlmClt.dev_group_tag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmInfoToAlmClt.dev_group_tag) } // optional string key_id_tag = 20; @@ -3951,7 +3951,7 @@ inline void SAlmInfoToAlmClt::clear_key_id_tag() { clear_has_key_id_tag(); } inline const ::std::string& SAlmInfoToAlmClt::key_id_tag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.key_id_tag) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.key_id_tag) return *key_id_tag_; } inline void SAlmInfoToAlmClt::set_key_id_tag(const ::std::string& value) { @@ -3960,7 +3960,7 @@ inline void SAlmInfoToAlmClt::set_key_id_tag(const ::std::string& value) { key_id_tag_ = new ::std::string; } key_id_tag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.key_id_tag) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.key_id_tag) } inline void SAlmInfoToAlmClt::set_key_id_tag(const char* value) { set_has_key_id_tag(); @@ -3968,7 +3968,7 @@ inline void SAlmInfoToAlmClt::set_key_id_tag(const char* value) { key_id_tag_ = new ::std::string; } key_id_tag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmInfoToAlmClt.key_id_tag) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmInfoToAlmClt.key_id_tag) } inline void SAlmInfoToAlmClt::set_key_id_tag(const char* value, size_t size) { set_has_key_id_tag(); @@ -3976,14 +3976,14 @@ inline void SAlmInfoToAlmClt::set_key_id_tag(const char* value, size_t size) { key_id_tag_ = new ::std::string; } key_id_tag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmInfoToAlmClt.key_id_tag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmInfoToAlmClt.key_id_tag) } inline ::std::string* SAlmInfoToAlmClt::mutable_key_id_tag() { set_has_key_id_tag(); if (key_id_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { key_id_tag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoToAlmClt.key_id_tag) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoToAlmClt.key_id_tag) return key_id_tag_; } inline ::std::string* SAlmInfoToAlmClt::release_key_id_tag() { @@ -4007,7 +4007,7 @@ inline void SAlmInfoToAlmClt::set_allocated_key_id_tag(::std::string* key_id_tag clear_has_key_id_tag(); key_id_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmInfoToAlmClt.key_id_tag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmInfoToAlmClt.key_id_tag) } // optional string graph_name = 21; @@ -4027,7 +4027,7 @@ inline void SAlmInfoToAlmClt::clear_graph_name() { clear_has_graph_name(); } inline const ::std::string& SAlmInfoToAlmClt::graph_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.graph_name) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.graph_name) return *graph_name_; } inline void SAlmInfoToAlmClt::set_graph_name(const ::std::string& value) { @@ -4036,7 +4036,7 @@ inline void SAlmInfoToAlmClt::set_graph_name(const ::std::string& value) { graph_name_ = new ::std::string; } graph_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.graph_name) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.graph_name) } inline void SAlmInfoToAlmClt::set_graph_name(const char* value) { set_has_graph_name(); @@ -4044,7 +4044,7 @@ inline void SAlmInfoToAlmClt::set_graph_name(const char* value) { graph_name_ = new ::std::string; } graph_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmInfoToAlmClt.graph_name) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmInfoToAlmClt.graph_name) } inline void SAlmInfoToAlmClt::set_graph_name(const char* value, size_t size) { set_has_graph_name(); @@ -4052,14 +4052,14 @@ inline void SAlmInfoToAlmClt::set_graph_name(const char* value, size_t size) { graph_name_ = new ::std::string; } graph_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmInfoToAlmClt.graph_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmInfoToAlmClt.graph_name) } inline ::std::string* SAlmInfoToAlmClt::mutable_graph_name() { set_has_graph_name(); if (graph_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { graph_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoToAlmClt.graph_name) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoToAlmClt.graph_name) return graph_name_; } inline ::std::string* SAlmInfoToAlmClt::release_graph_name() { @@ -4083,7 +4083,7 @@ inline void SAlmInfoToAlmClt::set_allocated_graph_name(::std::string* graph_name clear_has_graph_name(); graph_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmInfoToAlmClt.graph_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmInfoToAlmClt.graph_name) } // optional string wave_file = 22; @@ -4103,7 +4103,7 @@ inline void SAlmInfoToAlmClt::clear_wave_file() { clear_has_wave_file(); } inline const ::std::string& SAlmInfoToAlmClt::wave_file() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.wave_file) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.wave_file) return *wave_file_; } inline void SAlmInfoToAlmClt::set_wave_file(const ::std::string& value) { @@ -4112,7 +4112,7 @@ inline void SAlmInfoToAlmClt::set_wave_file(const ::std::string& value) { wave_file_ = new ::std::string; } wave_file_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.wave_file) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.wave_file) } inline void SAlmInfoToAlmClt::set_wave_file(const char* value) { set_has_wave_file(); @@ -4120,7 +4120,7 @@ inline void SAlmInfoToAlmClt::set_wave_file(const char* value) { wave_file_ = new ::std::string; } wave_file_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmInfoToAlmClt.wave_file) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmInfoToAlmClt.wave_file) } inline void SAlmInfoToAlmClt::set_wave_file(const char* value, size_t size) { set_has_wave_file(); @@ -4128,14 +4128,14 @@ inline void SAlmInfoToAlmClt::set_wave_file(const char* value, size_t size) { wave_file_ = new ::std::string; } wave_file_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmInfoToAlmClt.wave_file) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmInfoToAlmClt.wave_file) } inline ::std::string* SAlmInfoToAlmClt::mutable_wave_file() { set_has_wave_file(); if (wave_file_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { wave_file_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoToAlmClt.wave_file) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoToAlmClt.wave_file) return wave_file_; } inline ::std::string* SAlmInfoToAlmClt::release_wave_file() { @@ -4159,7 +4159,7 @@ inline void SAlmInfoToAlmClt::set_allocated_wave_file(::std::string* wave_file) clear_has_wave_file(); wave_file_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmInfoToAlmClt.wave_file) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmInfoToAlmClt.wave_file) } // optional string camera_tag = 23; @@ -4179,7 +4179,7 @@ inline void SAlmInfoToAlmClt::clear_camera_tag() { clear_has_camera_tag(); } inline const ::std::string& SAlmInfoToAlmClt::camera_tag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.camera_tag) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.camera_tag) return *camera_tag_; } inline void SAlmInfoToAlmClt::set_camera_tag(const ::std::string& value) { @@ -4188,7 +4188,7 @@ inline void SAlmInfoToAlmClt::set_camera_tag(const ::std::string& value) { camera_tag_ = new ::std::string; } camera_tag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.camera_tag) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.camera_tag) } inline void SAlmInfoToAlmClt::set_camera_tag(const char* value) { set_has_camera_tag(); @@ -4196,7 +4196,7 @@ inline void SAlmInfoToAlmClt::set_camera_tag(const char* value) { camera_tag_ = new ::std::string; } camera_tag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmInfoToAlmClt.camera_tag) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmInfoToAlmClt.camera_tag) } inline void SAlmInfoToAlmClt::set_camera_tag(const char* value, size_t size) { set_has_camera_tag(); @@ -4204,14 +4204,14 @@ inline void SAlmInfoToAlmClt::set_camera_tag(const char* value, size_t size) { camera_tag_ = new ::std::string; } camera_tag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmInfoToAlmClt.camera_tag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmInfoToAlmClt.camera_tag) } inline ::std::string* SAlmInfoToAlmClt::mutable_camera_tag() { set_has_camera_tag(); if (camera_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { camera_tag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoToAlmClt.camera_tag) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoToAlmClt.camera_tag) return camera_tag_; } inline ::std::string* SAlmInfoToAlmClt::release_camera_tag() { @@ -4235,7 +4235,7 @@ inline void SAlmInfoToAlmClt::set_allocated_camera_tag(::std::string* camera_tag clear_has_camera_tag(); camera_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmInfoToAlmClt.camera_tag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmInfoToAlmClt.camera_tag) } // optional string camera_preset = 24; @@ -4255,7 +4255,7 @@ inline void SAlmInfoToAlmClt::clear_camera_preset() { clear_has_camera_preset(); } inline const ::std::string& SAlmInfoToAlmClt::camera_preset() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmInfoToAlmClt.camera_preset) + // @@protoc_insertion_point(field_get:iot_idl.SAlmInfoToAlmClt.camera_preset) return *camera_preset_; } inline void SAlmInfoToAlmClt::set_camera_preset(const ::std::string& value) { @@ -4264,7 +4264,7 @@ inline void SAlmInfoToAlmClt::set_camera_preset(const ::std::string& value) { camera_preset_ = new ::std::string; } camera_preset_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmInfoToAlmClt.camera_preset) + // @@protoc_insertion_point(field_set:iot_idl.SAlmInfoToAlmClt.camera_preset) } inline void SAlmInfoToAlmClt::set_camera_preset(const char* value) { set_has_camera_preset(); @@ -4272,7 +4272,7 @@ inline void SAlmInfoToAlmClt::set_camera_preset(const char* value) { camera_preset_ = new ::std::string; } camera_preset_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmInfoToAlmClt.camera_preset) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmInfoToAlmClt.camera_preset) } inline void SAlmInfoToAlmClt::set_camera_preset(const char* value, size_t size) { set_has_camera_preset(); @@ -4280,14 +4280,14 @@ inline void SAlmInfoToAlmClt::set_camera_preset(const char* value, size_t size) camera_preset_ = new ::std::string; } camera_preset_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmInfoToAlmClt.camera_preset) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmInfoToAlmClt.camera_preset) } inline ::std::string* SAlmInfoToAlmClt::mutable_camera_preset() { set_has_camera_preset(); if (camera_preset_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { camera_preset_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmInfoToAlmClt.camera_preset) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmInfoToAlmClt.camera_preset) return camera_preset_; } inline ::std::string* SAlmInfoToAlmClt::release_camera_preset() { @@ -4311,40 +4311,40 @@ inline void SAlmInfoToAlmClt::set_allocated_camera_preset(::std::string* camera_ clear_has_camera_preset(); camera_preset_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmInfoToAlmClt.camera_preset) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmInfoToAlmClt.camera_preset) } // ------------------------------------------------------------------- // SAlmCltAddAlm -// repeated .kbd_idlfile.SAlmInfoToAlmClt alm_info = 1; +// repeated .iot_idl.SAlmInfoToAlmClt alm_info = 1; inline int SAlmCltAddAlm::alm_info_size() const { return alm_info_.size(); } inline void SAlmCltAddAlm::clear_alm_info() { alm_info_.Clear(); } -inline const ::kbd_idlfile::SAlmInfoToAlmClt& SAlmCltAddAlm::alm_info(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmCltAddAlm.alm_info) +inline const ::iot_idl::SAlmInfoToAlmClt& SAlmCltAddAlm::alm_info(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SAlmCltAddAlm.alm_info) return alm_info_.Get(index); } -inline ::kbd_idlfile::SAlmInfoToAlmClt* SAlmCltAddAlm::mutable_alm_info(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmCltAddAlm.alm_info) +inline ::iot_idl::SAlmInfoToAlmClt* SAlmCltAddAlm::mutable_alm_info(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmCltAddAlm.alm_info) return alm_info_.Mutable(index); } -inline ::kbd_idlfile::SAlmInfoToAlmClt* SAlmCltAddAlm::add_alm_info() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SAlmCltAddAlm.alm_info) +inline ::iot_idl::SAlmInfoToAlmClt* SAlmCltAddAlm::add_alm_info() { + // @@protoc_insertion_point(field_add:iot_idl.SAlmCltAddAlm.alm_info) return alm_info_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAlmInfoToAlmClt >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SAlmInfoToAlmClt >& SAlmCltAddAlm::alm_info() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SAlmCltAddAlm.alm_info) + // @@protoc_insertion_point(field_list:iot_idl.SAlmCltAddAlm.alm_info) return alm_info_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAlmInfoToAlmClt >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SAlmInfoToAlmClt >* SAlmCltAddAlm::mutable_alm_info() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SAlmCltAddAlm.alm_info) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SAlmCltAddAlm.alm_info) return &alm_info_; } @@ -4369,7 +4369,7 @@ inline void SAlmCltCfmAlm::clear_node_name() { clear_has_node_name(); } inline const ::std::string& SAlmCltCfmAlm::node_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmCltCfmAlm.node_name) + // @@protoc_insertion_point(field_get:iot_idl.SAlmCltCfmAlm.node_name) return *node_name_; } inline void SAlmCltCfmAlm::set_node_name(const ::std::string& value) { @@ -4378,7 +4378,7 @@ inline void SAlmCltCfmAlm::set_node_name(const ::std::string& value) { node_name_ = new ::std::string; } node_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmCltCfmAlm.node_name) + // @@protoc_insertion_point(field_set:iot_idl.SAlmCltCfmAlm.node_name) } inline void SAlmCltCfmAlm::set_node_name(const char* value) { set_has_node_name(); @@ -4386,7 +4386,7 @@ inline void SAlmCltCfmAlm::set_node_name(const char* value) { node_name_ = new ::std::string; } node_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmCltCfmAlm.node_name) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmCltCfmAlm.node_name) } inline void SAlmCltCfmAlm::set_node_name(const char* value, size_t size) { set_has_node_name(); @@ -4394,14 +4394,14 @@ inline void SAlmCltCfmAlm::set_node_name(const char* value, size_t size) { node_name_ = new ::std::string; } node_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmCltCfmAlm.node_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmCltCfmAlm.node_name) } inline ::std::string* SAlmCltCfmAlm::mutable_node_name() { set_has_node_name(); if (node_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { node_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmCltCfmAlm.node_name) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmCltCfmAlm.node_name) return node_name_; } inline ::std::string* SAlmCltCfmAlm::release_node_name() { @@ -4425,7 +4425,7 @@ inline void SAlmCltCfmAlm::set_allocated_node_name(::std::string* node_name) { clear_has_node_name(); node_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmCltCfmAlm.node_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmCltCfmAlm.node_name) } // required int32 user_id = 2; @@ -4443,13 +4443,13 @@ inline void SAlmCltCfmAlm::clear_user_id() { clear_has_user_id(); } inline ::google::protobuf::int32 SAlmCltCfmAlm::user_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmCltCfmAlm.user_id) + // @@protoc_insertion_point(field_get:iot_idl.SAlmCltCfmAlm.user_id) return user_id_; } inline void SAlmCltCfmAlm::set_user_id(::google::protobuf::int32 value) { set_has_user_id(); user_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmCltCfmAlm.user_id) + // @@protoc_insertion_point(field_set:iot_idl.SAlmCltCfmAlm.user_id) } // required int64 confirm_time = 3; @@ -4467,13 +4467,13 @@ inline void SAlmCltCfmAlm::clear_confirm_time() { clear_has_confirm_time(); } inline ::google::protobuf::int64 SAlmCltCfmAlm::confirm_time() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmCltCfmAlm.confirm_time) + // @@protoc_insertion_point(field_get:iot_idl.SAlmCltCfmAlm.confirm_time) return confirm_time_; } inline void SAlmCltCfmAlm::set_confirm_time(::google::protobuf::int64 value) { set_has_confirm_time(); confirm_time_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmCltCfmAlm.confirm_time) + // @@protoc_insertion_point(field_set:iot_idl.SAlmCltCfmAlm.confirm_time) } // required int32 alm_type = 4; @@ -4491,13 +4491,13 @@ inline void SAlmCltCfmAlm::clear_alm_type() { clear_has_alm_type(); } inline ::google::protobuf::int32 SAlmCltCfmAlm::alm_type() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmCltCfmAlm.alm_type) + // @@protoc_insertion_point(field_get:iot_idl.SAlmCltCfmAlm.alm_type) return alm_type_; } inline void SAlmCltCfmAlm::set_alm_type(::google::protobuf::int32 value) { set_has_alm_type(); alm_type_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmCltCfmAlm.alm_type) + // @@protoc_insertion_point(field_set:iot_idl.SAlmCltCfmAlm.alm_type) } // required int32 domain_id = 5; @@ -4515,13 +4515,13 @@ inline void SAlmCltCfmAlm::clear_domain_id() { clear_has_domain_id(); } inline ::google::protobuf::int32 SAlmCltCfmAlm::domain_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmCltCfmAlm.domain_id) + // @@protoc_insertion_point(field_get:iot_idl.SAlmCltCfmAlm.domain_id) return domain_id_; } inline void SAlmCltCfmAlm::set_domain_id(::google::protobuf::int32 value) { set_has_domain_id(); domain_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmCltCfmAlm.domain_id) + // @@protoc_insertion_point(field_set:iot_idl.SAlmCltCfmAlm.domain_id) } // required int32 app_id = 6; @@ -4539,13 +4539,13 @@ inline void SAlmCltCfmAlm::clear_app_id() { clear_has_app_id(); } inline ::google::protobuf::int32 SAlmCltCfmAlm::app_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmCltCfmAlm.app_id) + // @@protoc_insertion_point(field_get:iot_idl.SAlmCltCfmAlm.app_id) return app_id_; } inline void SAlmCltCfmAlm::set_app_id(::google::protobuf::int32 value) { set_has_app_id(); app_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmCltCfmAlm.app_id) + // @@protoc_insertion_point(field_set:iot_idl.SAlmCltCfmAlm.app_id) } // repeated int64 time_stamp = 7; @@ -4556,25 +4556,25 @@ inline void SAlmCltCfmAlm::clear_time_stamp() { time_stamp_.Clear(); } inline ::google::protobuf::int64 SAlmCltCfmAlm::time_stamp(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmCltCfmAlm.time_stamp) + // @@protoc_insertion_point(field_get:iot_idl.SAlmCltCfmAlm.time_stamp) return time_stamp_.Get(index); } inline void SAlmCltCfmAlm::set_time_stamp(int index, ::google::protobuf::int64 value) { time_stamp_.Set(index, value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmCltCfmAlm.time_stamp) + // @@protoc_insertion_point(field_set:iot_idl.SAlmCltCfmAlm.time_stamp) } inline void SAlmCltCfmAlm::add_time_stamp(::google::protobuf::int64 value) { time_stamp_.Add(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.SAlmCltCfmAlm.time_stamp) + // @@protoc_insertion_point(field_add:iot_idl.SAlmCltCfmAlm.time_stamp) } inline const ::google::protobuf::RepeatedField< ::google::protobuf::int64 >& SAlmCltCfmAlm::time_stamp() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SAlmCltCfmAlm.time_stamp) + // @@protoc_insertion_point(field_list:iot_idl.SAlmCltCfmAlm.time_stamp) return time_stamp_; } inline ::google::protobuf::RepeatedField< ::google::protobuf::int64 >* SAlmCltCfmAlm::mutable_time_stamp() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SAlmCltCfmAlm.time_stamp) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SAlmCltCfmAlm.time_stamp) return &time_stamp_; } @@ -4586,49 +4586,49 @@ inline void SAlmCltCfmAlm::clear_uuid_base64() { uuid_base64_.Clear(); } inline const ::std::string& SAlmCltCfmAlm::uuid_base64(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmCltCfmAlm.uuid_base64) + // @@protoc_insertion_point(field_get:iot_idl.SAlmCltCfmAlm.uuid_base64) return uuid_base64_.Get(index); } inline ::std::string* SAlmCltCfmAlm::mutable_uuid_base64(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmCltCfmAlm.uuid_base64) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmCltCfmAlm.uuid_base64) return uuid_base64_.Mutable(index); } inline void SAlmCltCfmAlm::set_uuid_base64(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmCltCfmAlm.uuid_base64) + // @@protoc_insertion_point(field_set:iot_idl.SAlmCltCfmAlm.uuid_base64) uuid_base64_.Mutable(index)->assign(value); } inline void SAlmCltCfmAlm::set_uuid_base64(int index, const char* value) { uuid_base64_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmCltCfmAlm.uuid_base64) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmCltCfmAlm.uuid_base64) } inline void SAlmCltCfmAlm::set_uuid_base64(int index, const char* value, size_t size) { uuid_base64_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmCltCfmAlm.uuid_base64) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmCltCfmAlm.uuid_base64) } inline ::std::string* SAlmCltCfmAlm::add_uuid_base64() { return uuid_base64_.Add(); } inline void SAlmCltCfmAlm::add_uuid_base64(const ::std::string& value) { uuid_base64_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.SAlmCltCfmAlm.uuid_base64) + // @@protoc_insertion_point(field_add:iot_idl.SAlmCltCfmAlm.uuid_base64) } inline void SAlmCltCfmAlm::add_uuid_base64(const char* value) { uuid_base64_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.SAlmCltCfmAlm.uuid_base64) + // @@protoc_insertion_point(field_add_char:iot_idl.SAlmCltCfmAlm.uuid_base64) } inline void SAlmCltCfmAlm::add_uuid_base64(const char* value, size_t size) { uuid_base64_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.SAlmCltCfmAlm.uuid_base64) + // @@protoc_insertion_point(field_add_pointer:iot_idl.SAlmCltCfmAlm.uuid_base64) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& SAlmCltCfmAlm::uuid_base64() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SAlmCltCfmAlm.uuid_base64) + // @@protoc_insertion_point(field_list:iot_idl.SAlmCltCfmAlm.uuid_base64) return uuid_base64_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* SAlmCltCfmAlm::mutable_uuid_base64() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SAlmCltCfmAlm.uuid_base64) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SAlmCltCfmAlm.uuid_base64) return &uuid_base64_; } @@ -4640,49 +4640,49 @@ inline void SAlmCltCfmAlm::clear_key_id_tag() { key_id_tag_.Clear(); } inline const ::std::string& SAlmCltCfmAlm::key_id_tag(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmCltCfmAlm.key_id_tag) + // @@protoc_insertion_point(field_get:iot_idl.SAlmCltCfmAlm.key_id_tag) return key_id_tag_.Get(index); } inline ::std::string* SAlmCltCfmAlm::mutable_key_id_tag(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmCltCfmAlm.key_id_tag) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmCltCfmAlm.key_id_tag) return key_id_tag_.Mutable(index); } inline void SAlmCltCfmAlm::set_key_id_tag(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmCltCfmAlm.key_id_tag) + // @@protoc_insertion_point(field_set:iot_idl.SAlmCltCfmAlm.key_id_tag) key_id_tag_.Mutable(index)->assign(value); } inline void SAlmCltCfmAlm::set_key_id_tag(int index, const char* value) { key_id_tag_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmCltCfmAlm.key_id_tag) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmCltCfmAlm.key_id_tag) } inline void SAlmCltCfmAlm::set_key_id_tag(int index, const char* value, size_t size) { key_id_tag_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmCltCfmAlm.key_id_tag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmCltCfmAlm.key_id_tag) } inline ::std::string* SAlmCltCfmAlm::add_key_id_tag() { return key_id_tag_.Add(); } inline void SAlmCltCfmAlm::add_key_id_tag(const ::std::string& value) { key_id_tag_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.SAlmCltCfmAlm.key_id_tag) + // @@protoc_insertion_point(field_add:iot_idl.SAlmCltCfmAlm.key_id_tag) } inline void SAlmCltCfmAlm::add_key_id_tag(const char* value) { key_id_tag_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.SAlmCltCfmAlm.key_id_tag) + // @@protoc_insertion_point(field_add_char:iot_idl.SAlmCltCfmAlm.key_id_tag) } inline void SAlmCltCfmAlm::add_key_id_tag(const char* value, size_t size) { key_id_tag_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.SAlmCltCfmAlm.key_id_tag) + // @@protoc_insertion_point(field_add_pointer:iot_idl.SAlmCltCfmAlm.key_id_tag) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& SAlmCltCfmAlm::key_id_tag() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SAlmCltCfmAlm.key_id_tag) + // @@protoc_insertion_point(field_list:iot_idl.SAlmCltCfmAlm.key_id_tag) return key_id_tag_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* SAlmCltCfmAlm::mutable_key_id_tag() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SAlmCltCfmAlm.key_id_tag) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SAlmCltCfmAlm.key_id_tag) return &key_id_tag_; } @@ -4705,13 +4705,13 @@ inline void SAlmCltDelAlm::clear_domain_id() { clear_has_domain_id(); } inline ::google::protobuf::int32 SAlmCltDelAlm::domain_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmCltDelAlm.domain_id) + // @@protoc_insertion_point(field_get:iot_idl.SAlmCltDelAlm.domain_id) return domain_id_; } inline void SAlmCltDelAlm::set_domain_id(::google::protobuf::int32 value) { set_has_domain_id(); domain_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmCltDelAlm.domain_id) + // @@protoc_insertion_point(field_set:iot_idl.SAlmCltDelAlm.domain_id) } // repeated string uuid_base64 = 2; @@ -4722,49 +4722,49 @@ inline void SAlmCltDelAlm::clear_uuid_base64() { uuid_base64_.Clear(); } inline const ::std::string& SAlmCltDelAlm::uuid_base64(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmCltDelAlm.uuid_base64) + // @@protoc_insertion_point(field_get:iot_idl.SAlmCltDelAlm.uuid_base64) return uuid_base64_.Get(index); } inline ::std::string* SAlmCltDelAlm::mutable_uuid_base64(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmCltDelAlm.uuid_base64) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmCltDelAlm.uuid_base64) return uuid_base64_.Mutable(index); } inline void SAlmCltDelAlm::set_uuid_base64(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmCltDelAlm.uuid_base64) + // @@protoc_insertion_point(field_set:iot_idl.SAlmCltDelAlm.uuid_base64) uuid_base64_.Mutable(index)->assign(value); } inline void SAlmCltDelAlm::set_uuid_base64(int index, const char* value) { uuid_base64_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmCltDelAlm.uuid_base64) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmCltDelAlm.uuid_base64) } inline void SAlmCltDelAlm::set_uuid_base64(int index, const char* value, size_t size) { uuid_base64_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmCltDelAlm.uuid_base64) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmCltDelAlm.uuid_base64) } inline ::std::string* SAlmCltDelAlm::add_uuid_base64() { return uuid_base64_.Add(); } inline void SAlmCltDelAlm::add_uuid_base64(const ::std::string& value) { uuid_base64_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.SAlmCltDelAlm.uuid_base64) + // @@protoc_insertion_point(field_add:iot_idl.SAlmCltDelAlm.uuid_base64) } inline void SAlmCltDelAlm::add_uuid_base64(const char* value) { uuid_base64_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.SAlmCltDelAlm.uuid_base64) + // @@protoc_insertion_point(field_add_char:iot_idl.SAlmCltDelAlm.uuid_base64) } inline void SAlmCltDelAlm::add_uuid_base64(const char* value, size_t size) { uuid_base64_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.SAlmCltDelAlm.uuid_base64) + // @@protoc_insertion_point(field_add_pointer:iot_idl.SAlmCltDelAlm.uuid_base64) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& SAlmCltDelAlm::uuid_base64() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SAlmCltDelAlm.uuid_base64) + // @@protoc_insertion_point(field_list:iot_idl.SAlmCltDelAlm.uuid_base64) return uuid_base64_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* SAlmCltDelAlm::mutable_uuid_base64() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SAlmCltDelAlm.uuid_base64) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SAlmCltDelAlm.uuid_base64) return &uuid_base64_; } @@ -4780,49 +4780,49 @@ inline void SAlmCltReleaseAlm::clear_uuid_base64() { uuid_base64_.Clear(); } inline const ::std::string& SAlmCltReleaseAlm::uuid_base64(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmCltReleaseAlm.uuid_base64) + // @@protoc_insertion_point(field_get:iot_idl.SAlmCltReleaseAlm.uuid_base64) return uuid_base64_.Get(index); } inline ::std::string* SAlmCltReleaseAlm::mutable_uuid_base64(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmCltReleaseAlm.uuid_base64) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmCltReleaseAlm.uuid_base64) return uuid_base64_.Mutable(index); } inline void SAlmCltReleaseAlm::set_uuid_base64(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmCltReleaseAlm.uuid_base64) + // @@protoc_insertion_point(field_set:iot_idl.SAlmCltReleaseAlm.uuid_base64) uuid_base64_.Mutable(index)->assign(value); } inline void SAlmCltReleaseAlm::set_uuid_base64(int index, const char* value) { uuid_base64_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmCltReleaseAlm.uuid_base64) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmCltReleaseAlm.uuid_base64) } inline void SAlmCltReleaseAlm::set_uuid_base64(int index, const char* value, size_t size) { uuid_base64_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmCltReleaseAlm.uuid_base64) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmCltReleaseAlm.uuid_base64) } inline ::std::string* SAlmCltReleaseAlm::add_uuid_base64() { return uuid_base64_.Add(); } inline void SAlmCltReleaseAlm::add_uuid_base64(const ::std::string& value) { uuid_base64_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.SAlmCltReleaseAlm.uuid_base64) + // @@protoc_insertion_point(field_add:iot_idl.SAlmCltReleaseAlm.uuid_base64) } inline void SAlmCltReleaseAlm::add_uuid_base64(const char* value) { uuid_base64_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.SAlmCltReleaseAlm.uuid_base64) + // @@protoc_insertion_point(field_add_char:iot_idl.SAlmCltReleaseAlm.uuid_base64) } inline void SAlmCltReleaseAlm::add_uuid_base64(const char* value, size_t size) { uuid_base64_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.SAlmCltReleaseAlm.uuid_base64) + // @@protoc_insertion_point(field_add_pointer:iot_idl.SAlmCltReleaseAlm.uuid_base64) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& SAlmCltReleaseAlm::uuid_base64() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SAlmCltReleaseAlm.uuid_base64) + // @@protoc_insertion_point(field_list:iot_idl.SAlmCltReleaseAlm.uuid_base64) return uuid_base64_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* SAlmCltReleaseAlm::mutable_uuid_base64() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SAlmCltReleaseAlm.uuid_base64) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SAlmCltReleaseAlm.uuid_base64) return &uuid_base64_; } @@ -4847,7 +4847,7 @@ inline void SAlmCltLinkWave2Alm::clear_wave_file() { clear_has_wave_file(); } inline const ::std::string& SAlmCltLinkWave2Alm::wave_file() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmCltLinkWave2Alm.wave_file) + // @@protoc_insertion_point(field_get:iot_idl.SAlmCltLinkWave2Alm.wave_file) return *wave_file_; } inline void SAlmCltLinkWave2Alm::set_wave_file(const ::std::string& value) { @@ -4856,7 +4856,7 @@ inline void SAlmCltLinkWave2Alm::set_wave_file(const ::std::string& value) { wave_file_ = new ::std::string; } wave_file_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmCltLinkWave2Alm.wave_file) + // @@protoc_insertion_point(field_set:iot_idl.SAlmCltLinkWave2Alm.wave_file) } inline void SAlmCltLinkWave2Alm::set_wave_file(const char* value) { set_has_wave_file(); @@ -4864,7 +4864,7 @@ inline void SAlmCltLinkWave2Alm::set_wave_file(const char* value) { wave_file_ = new ::std::string; } wave_file_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmCltLinkWave2Alm.wave_file) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmCltLinkWave2Alm.wave_file) } inline void SAlmCltLinkWave2Alm::set_wave_file(const char* value, size_t size) { set_has_wave_file(); @@ -4872,14 +4872,14 @@ inline void SAlmCltLinkWave2Alm::set_wave_file(const char* value, size_t size) { wave_file_ = new ::std::string; } wave_file_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmCltLinkWave2Alm.wave_file) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmCltLinkWave2Alm.wave_file) } inline ::std::string* SAlmCltLinkWave2Alm::mutable_wave_file() { set_has_wave_file(); if (wave_file_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { wave_file_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmCltLinkWave2Alm.wave_file) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmCltLinkWave2Alm.wave_file) return wave_file_; } inline ::std::string* SAlmCltLinkWave2Alm::release_wave_file() { @@ -4903,7 +4903,7 @@ inline void SAlmCltLinkWave2Alm::set_allocated_wave_file(::std::string* wave_fil clear_has_wave_file(); wave_file_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAlmCltLinkWave2Alm.wave_file) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAlmCltLinkWave2Alm.wave_file) } // repeated string uuid_base64 = 2; @@ -4914,49 +4914,49 @@ inline void SAlmCltLinkWave2Alm::clear_uuid_base64() { uuid_base64_.Clear(); } inline const ::std::string& SAlmCltLinkWave2Alm::uuid_base64(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAlmCltLinkWave2Alm.uuid_base64) + // @@protoc_insertion_point(field_get:iot_idl.SAlmCltLinkWave2Alm.uuid_base64) return uuid_base64_.Get(index); } inline ::std::string* SAlmCltLinkWave2Alm::mutable_uuid_base64(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAlmCltLinkWave2Alm.uuid_base64) + // @@protoc_insertion_point(field_mutable:iot_idl.SAlmCltLinkWave2Alm.uuid_base64) return uuid_base64_.Mutable(index); } inline void SAlmCltLinkWave2Alm::set_uuid_base64(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.SAlmCltLinkWave2Alm.uuid_base64) + // @@protoc_insertion_point(field_set:iot_idl.SAlmCltLinkWave2Alm.uuid_base64) uuid_base64_.Mutable(index)->assign(value); } inline void SAlmCltLinkWave2Alm::set_uuid_base64(int index, const char* value) { uuid_base64_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAlmCltLinkWave2Alm.uuid_base64) + // @@protoc_insertion_point(field_set_char:iot_idl.SAlmCltLinkWave2Alm.uuid_base64) } inline void SAlmCltLinkWave2Alm::set_uuid_base64(int index, const char* value, size_t size) { uuid_base64_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAlmCltLinkWave2Alm.uuid_base64) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAlmCltLinkWave2Alm.uuid_base64) } inline ::std::string* SAlmCltLinkWave2Alm::add_uuid_base64() { return uuid_base64_.Add(); } inline void SAlmCltLinkWave2Alm::add_uuid_base64(const ::std::string& value) { uuid_base64_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.SAlmCltLinkWave2Alm.uuid_base64) + // @@protoc_insertion_point(field_add:iot_idl.SAlmCltLinkWave2Alm.uuid_base64) } inline void SAlmCltLinkWave2Alm::add_uuid_base64(const char* value) { uuid_base64_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.SAlmCltLinkWave2Alm.uuid_base64) + // @@protoc_insertion_point(field_add_char:iot_idl.SAlmCltLinkWave2Alm.uuid_base64) } inline void SAlmCltLinkWave2Alm::add_uuid_base64(const char* value, size_t size) { uuid_base64_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.SAlmCltLinkWave2Alm.uuid_base64) + // @@protoc_insertion_point(field_add_pointer:iot_idl.SAlmCltLinkWave2Alm.uuid_base64) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& SAlmCltLinkWave2Alm::uuid_base64() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SAlmCltLinkWave2Alm.uuid_base64) + // @@protoc_insertion_point(field_list:iot_idl.SAlmCltLinkWave2Alm.uuid_base64) return uuid_base64_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* SAlmCltLinkWave2Alm::mutable_uuid_base64() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SAlmCltLinkWave2Alm.uuid_base64) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SAlmCltLinkWave2Alm.uuid_base64) return &uuid_base64_; } @@ -4979,13 +4979,13 @@ inline void SEvtInfoToEvtClt::clear_alm_type() { clear_has_alm_type(); } inline ::google::protobuf::int32 SEvtInfoToEvtClt::alm_type() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtInfoToEvtClt.alm_type) + // @@protoc_insertion_point(field_get:iot_idl.SEvtInfoToEvtClt.alm_type) return alm_type_; } inline void SEvtInfoToEvtClt::set_alm_type(::google::protobuf::int32 value) { set_has_alm_type(); alm_type_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SEvtInfoToEvtClt.alm_type) + // @@protoc_insertion_point(field_set:iot_idl.SEvtInfoToEvtClt.alm_type) } // required int32 alm_status = 2; @@ -5003,13 +5003,13 @@ inline void SEvtInfoToEvtClt::clear_alm_status() { clear_has_alm_status(); } inline ::google::protobuf::int32 SEvtInfoToEvtClt::alm_status() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtInfoToEvtClt.alm_status) + // @@protoc_insertion_point(field_get:iot_idl.SEvtInfoToEvtClt.alm_status) return alm_status_; } inline void SEvtInfoToEvtClt::set_alm_status(::google::protobuf::int32 value) { set_has_alm_status(); alm_status_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SEvtInfoToEvtClt.alm_status) + // @@protoc_insertion_point(field_set:iot_idl.SEvtInfoToEvtClt.alm_status) } // required int64 time_stamp = 3; @@ -5027,13 +5027,13 @@ inline void SEvtInfoToEvtClt::clear_time_stamp() { clear_has_time_stamp(); } inline ::google::protobuf::int64 SEvtInfoToEvtClt::time_stamp() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtInfoToEvtClt.time_stamp) + // @@protoc_insertion_point(field_get:iot_idl.SEvtInfoToEvtClt.time_stamp) return time_stamp_; } inline void SEvtInfoToEvtClt::set_time_stamp(::google::protobuf::int64 value) { set_has_time_stamp(); time_stamp_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SEvtInfoToEvtClt.time_stamp) + // @@protoc_insertion_point(field_set:iot_idl.SEvtInfoToEvtClt.time_stamp) } // required int32 domain_id = 4; @@ -5051,13 +5051,13 @@ inline void SEvtInfoToEvtClt::clear_domain_id() { clear_has_domain_id(); } inline ::google::protobuf::int32 SEvtInfoToEvtClt::domain_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtInfoToEvtClt.domain_id) + // @@protoc_insertion_point(field_get:iot_idl.SEvtInfoToEvtClt.domain_id) return domain_id_; } inline void SEvtInfoToEvtClt::set_domain_id(::google::protobuf::int32 value) { set_has_domain_id(); domain_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SEvtInfoToEvtClt.domain_id) + // @@protoc_insertion_point(field_set:iot_idl.SEvtInfoToEvtClt.domain_id) } // required int32 location_id = 5; @@ -5075,13 +5075,13 @@ inline void SEvtInfoToEvtClt::clear_location_id() { clear_has_location_id(); } inline ::google::protobuf::int32 SEvtInfoToEvtClt::location_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtInfoToEvtClt.location_id) + // @@protoc_insertion_point(field_get:iot_idl.SEvtInfoToEvtClt.location_id) return location_id_; } inline void SEvtInfoToEvtClt::set_location_id(::google::protobuf::int32 value) { set_has_location_id(); location_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SEvtInfoToEvtClt.location_id) + // @@protoc_insertion_point(field_set:iot_idl.SEvtInfoToEvtClt.location_id) } // required int32 app_id = 6; @@ -5099,13 +5099,13 @@ inline void SEvtInfoToEvtClt::clear_app_id() { clear_has_app_id(); } inline ::google::protobuf::int32 SEvtInfoToEvtClt::app_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtInfoToEvtClt.app_id) + // @@protoc_insertion_point(field_get:iot_idl.SEvtInfoToEvtClt.app_id) return app_id_; } inline void SEvtInfoToEvtClt::set_app_id(::google::protobuf::int32 value) { set_has_app_id(); app_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SEvtInfoToEvtClt.app_id) + // @@protoc_insertion_point(field_set:iot_idl.SEvtInfoToEvtClt.app_id) } // required int32 priority = 7; @@ -5123,13 +5123,13 @@ inline void SEvtInfoToEvtClt::clear_priority() { clear_has_priority(); } inline ::google::protobuf::int32 SEvtInfoToEvtClt::priority() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtInfoToEvtClt.priority) + // @@protoc_insertion_point(field_get:iot_idl.SEvtInfoToEvtClt.priority) return priority_; } inline void SEvtInfoToEvtClt::set_priority(::google::protobuf::int32 value) { set_has_priority(); priority_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SEvtInfoToEvtClt.priority) + // @@protoc_insertion_point(field_set:iot_idl.SEvtInfoToEvtClt.priority) } // required string uuid_base64 = 8; @@ -5149,7 +5149,7 @@ inline void SEvtInfoToEvtClt::clear_uuid_base64() { clear_has_uuid_base64(); } inline const ::std::string& SEvtInfoToEvtClt::uuid_base64() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtInfoToEvtClt.uuid_base64) + // @@protoc_insertion_point(field_get:iot_idl.SEvtInfoToEvtClt.uuid_base64) return *uuid_base64_; } inline void SEvtInfoToEvtClt::set_uuid_base64(const ::std::string& value) { @@ -5158,7 +5158,7 @@ inline void SEvtInfoToEvtClt::set_uuid_base64(const ::std::string& value) { uuid_base64_ = new ::std::string; } uuid_base64_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SEvtInfoToEvtClt.uuid_base64) + // @@protoc_insertion_point(field_set:iot_idl.SEvtInfoToEvtClt.uuid_base64) } inline void SEvtInfoToEvtClt::set_uuid_base64(const char* value) { set_has_uuid_base64(); @@ -5166,7 +5166,7 @@ inline void SEvtInfoToEvtClt::set_uuid_base64(const char* value) { uuid_base64_ = new ::std::string; } uuid_base64_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SEvtInfoToEvtClt.uuid_base64) + // @@protoc_insertion_point(field_set_char:iot_idl.SEvtInfoToEvtClt.uuid_base64) } inline void SEvtInfoToEvtClt::set_uuid_base64(const char* value, size_t size) { set_has_uuid_base64(); @@ -5174,14 +5174,14 @@ inline void SEvtInfoToEvtClt::set_uuid_base64(const char* value, size_t size) { uuid_base64_ = new ::std::string; } uuid_base64_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SEvtInfoToEvtClt.uuid_base64) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SEvtInfoToEvtClt.uuid_base64) } inline ::std::string* SEvtInfoToEvtClt::mutable_uuid_base64() { set_has_uuid_base64(); if (uuid_base64_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { uuid_base64_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SEvtInfoToEvtClt.uuid_base64) + // @@protoc_insertion_point(field_mutable:iot_idl.SEvtInfoToEvtClt.uuid_base64) return uuid_base64_; } inline ::std::string* SEvtInfoToEvtClt::release_uuid_base64() { @@ -5205,7 +5205,7 @@ inline void SEvtInfoToEvtClt::set_allocated_uuid_base64(::std::string* uuid_base clear_has_uuid_base64(); uuid_base64_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SEvtInfoToEvtClt.uuid_base64) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SEvtInfoToEvtClt.uuid_base64) } // required string content = 9; @@ -5225,7 +5225,7 @@ inline void SEvtInfoToEvtClt::clear_content() { clear_has_content(); } inline const ::std::string& SEvtInfoToEvtClt::content() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtInfoToEvtClt.content) + // @@protoc_insertion_point(field_get:iot_idl.SEvtInfoToEvtClt.content) return *content_; } inline void SEvtInfoToEvtClt::set_content(const ::std::string& value) { @@ -5234,7 +5234,7 @@ inline void SEvtInfoToEvtClt::set_content(const ::std::string& value) { content_ = new ::std::string; } content_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SEvtInfoToEvtClt.content) + // @@protoc_insertion_point(field_set:iot_idl.SEvtInfoToEvtClt.content) } inline void SEvtInfoToEvtClt::set_content(const char* value) { set_has_content(); @@ -5242,7 +5242,7 @@ inline void SEvtInfoToEvtClt::set_content(const char* value) { content_ = new ::std::string; } content_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SEvtInfoToEvtClt.content) + // @@protoc_insertion_point(field_set_char:iot_idl.SEvtInfoToEvtClt.content) } inline void SEvtInfoToEvtClt::set_content(const char* value, size_t size) { set_has_content(); @@ -5250,14 +5250,14 @@ inline void SEvtInfoToEvtClt::set_content(const char* value, size_t size) { content_ = new ::std::string; } content_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SEvtInfoToEvtClt.content) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SEvtInfoToEvtClt.content) } inline ::std::string* SEvtInfoToEvtClt::mutable_content() { set_has_content(); if (content_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { content_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SEvtInfoToEvtClt.content) + // @@protoc_insertion_point(field_mutable:iot_idl.SEvtInfoToEvtClt.content) return content_; } inline ::std::string* SEvtInfoToEvtClt::release_content() { @@ -5281,7 +5281,7 @@ inline void SEvtInfoToEvtClt::set_allocated_content(::std::string* content) { clear_has_content(); content_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SEvtInfoToEvtClt.content) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SEvtInfoToEvtClt.content) } // optional int32 sub_system = 10; @@ -5299,13 +5299,13 @@ inline void SEvtInfoToEvtClt::clear_sub_system() { clear_has_sub_system(); } inline ::google::protobuf::int32 SEvtInfoToEvtClt::sub_system() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtInfoToEvtClt.sub_system) + // @@protoc_insertion_point(field_get:iot_idl.SEvtInfoToEvtClt.sub_system) return sub_system_; } inline void SEvtInfoToEvtClt::set_sub_system(::google::protobuf::int32 value) { set_has_sub_system(); sub_system_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SEvtInfoToEvtClt.sub_system) + // @@protoc_insertion_point(field_set:iot_idl.SEvtInfoToEvtClt.sub_system) } // optional int32 dev_type = 11; @@ -5323,13 +5323,13 @@ inline void SEvtInfoToEvtClt::clear_dev_type() { clear_has_dev_type(); } inline ::google::protobuf::int32 SEvtInfoToEvtClt::dev_type() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtInfoToEvtClt.dev_type) + // @@protoc_insertion_point(field_get:iot_idl.SEvtInfoToEvtClt.dev_type) return dev_type_; } inline void SEvtInfoToEvtClt::set_dev_type(::google::protobuf::int32 value) { set_has_dev_type(); dev_type_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SEvtInfoToEvtClt.dev_type) + // @@protoc_insertion_point(field_set:iot_idl.SEvtInfoToEvtClt.dev_type) } // optional int32 region_id = 12; @@ -5347,16 +5347,16 @@ inline void SEvtInfoToEvtClt::clear_region_id() { clear_has_region_id(); } inline ::google::protobuf::int32 SEvtInfoToEvtClt::region_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtInfoToEvtClt.region_id) + // @@protoc_insertion_point(field_get:iot_idl.SEvtInfoToEvtClt.region_id) return region_id_; } inline void SEvtInfoToEvtClt::set_region_id(::google::protobuf::int32 value) { set_has_region_id(); region_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SEvtInfoToEvtClt.region_id) + // @@protoc_insertion_point(field_set:iot_idl.SEvtInfoToEvtClt.region_id) } -// optional .kbd_idlfile.enAlmLogicState logic_state = 13; +// optional .iot_idl.enAlmLogicState logic_state = 13; inline bool SEvtInfoToEvtClt::has_logic_state() const { return (_has_bits_[0] & 0x00001000u) != 0; } @@ -5370,15 +5370,15 @@ inline void SEvtInfoToEvtClt::clear_logic_state() { logic_state_ = 0; clear_has_logic_state(); } -inline ::kbd_idlfile::enAlmLogicState SEvtInfoToEvtClt::logic_state() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtInfoToEvtClt.logic_state) - return static_cast< ::kbd_idlfile::enAlmLogicState >(logic_state_); +inline ::iot_idl::enAlmLogicState SEvtInfoToEvtClt::logic_state() const { + // @@protoc_insertion_point(field_get:iot_idl.SEvtInfoToEvtClt.logic_state) + return static_cast< ::iot_idl::enAlmLogicState >(logic_state_); } -inline void SEvtInfoToEvtClt::set_logic_state(::kbd_idlfile::enAlmLogicState value) { - assert(::kbd_idlfile::enAlmLogicState_IsValid(value)); +inline void SEvtInfoToEvtClt::set_logic_state(::iot_idl::enAlmLogicState value) { + assert(::iot_idl::enAlmLogicState_IsValid(value)); set_has_logic_state(); logic_state_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SEvtInfoToEvtClt.logic_state) + // @@protoc_insertion_point(field_set:iot_idl.SEvtInfoToEvtClt.logic_state) } // optional string dev_group_tag = 14; @@ -5398,7 +5398,7 @@ inline void SEvtInfoToEvtClt::clear_dev_group_tag() { clear_has_dev_group_tag(); } inline const ::std::string& SEvtInfoToEvtClt::dev_group_tag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtInfoToEvtClt.dev_group_tag) + // @@protoc_insertion_point(field_get:iot_idl.SEvtInfoToEvtClt.dev_group_tag) return *dev_group_tag_; } inline void SEvtInfoToEvtClt::set_dev_group_tag(const ::std::string& value) { @@ -5407,7 +5407,7 @@ inline void SEvtInfoToEvtClt::set_dev_group_tag(const ::std::string& value) { dev_group_tag_ = new ::std::string; } dev_group_tag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SEvtInfoToEvtClt.dev_group_tag) + // @@protoc_insertion_point(field_set:iot_idl.SEvtInfoToEvtClt.dev_group_tag) } inline void SEvtInfoToEvtClt::set_dev_group_tag(const char* value) { set_has_dev_group_tag(); @@ -5415,7 +5415,7 @@ inline void SEvtInfoToEvtClt::set_dev_group_tag(const char* value) { dev_group_tag_ = new ::std::string; } dev_group_tag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SEvtInfoToEvtClt.dev_group_tag) + // @@protoc_insertion_point(field_set_char:iot_idl.SEvtInfoToEvtClt.dev_group_tag) } inline void SEvtInfoToEvtClt::set_dev_group_tag(const char* value, size_t size) { set_has_dev_group_tag(); @@ -5423,14 +5423,14 @@ inline void SEvtInfoToEvtClt::set_dev_group_tag(const char* value, size_t size) dev_group_tag_ = new ::std::string; } dev_group_tag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SEvtInfoToEvtClt.dev_group_tag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SEvtInfoToEvtClt.dev_group_tag) } inline ::std::string* SEvtInfoToEvtClt::mutable_dev_group_tag() { set_has_dev_group_tag(); if (dev_group_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { dev_group_tag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SEvtInfoToEvtClt.dev_group_tag) + // @@protoc_insertion_point(field_mutable:iot_idl.SEvtInfoToEvtClt.dev_group_tag) return dev_group_tag_; } inline ::std::string* SEvtInfoToEvtClt::release_dev_group_tag() { @@ -5454,7 +5454,7 @@ inline void SEvtInfoToEvtClt::set_allocated_dev_group_tag(::std::string* dev_gro clear_has_dev_group_tag(); dev_group_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SEvtInfoToEvtClt.dev_group_tag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SEvtInfoToEvtClt.dev_group_tag) } // optional string key_id_tag = 15; @@ -5474,7 +5474,7 @@ inline void SEvtInfoToEvtClt::clear_key_id_tag() { clear_has_key_id_tag(); } inline const ::std::string& SEvtInfoToEvtClt::key_id_tag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtInfoToEvtClt.key_id_tag) + // @@protoc_insertion_point(field_get:iot_idl.SEvtInfoToEvtClt.key_id_tag) return *key_id_tag_; } inline void SEvtInfoToEvtClt::set_key_id_tag(const ::std::string& value) { @@ -5483,7 +5483,7 @@ inline void SEvtInfoToEvtClt::set_key_id_tag(const ::std::string& value) { key_id_tag_ = new ::std::string; } key_id_tag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SEvtInfoToEvtClt.key_id_tag) + // @@protoc_insertion_point(field_set:iot_idl.SEvtInfoToEvtClt.key_id_tag) } inline void SEvtInfoToEvtClt::set_key_id_tag(const char* value) { set_has_key_id_tag(); @@ -5491,7 +5491,7 @@ inline void SEvtInfoToEvtClt::set_key_id_tag(const char* value) { key_id_tag_ = new ::std::string; } key_id_tag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SEvtInfoToEvtClt.key_id_tag) + // @@protoc_insertion_point(field_set_char:iot_idl.SEvtInfoToEvtClt.key_id_tag) } inline void SEvtInfoToEvtClt::set_key_id_tag(const char* value, size_t size) { set_has_key_id_tag(); @@ -5499,14 +5499,14 @@ inline void SEvtInfoToEvtClt::set_key_id_tag(const char* value, size_t size) { key_id_tag_ = new ::std::string; } key_id_tag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SEvtInfoToEvtClt.key_id_tag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SEvtInfoToEvtClt.key_id_tag) } inline ::std::string* SEvtInfoToEvtClt::mutable_key_id_tag() { set_has_key_id_tag(); if (key_id_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { key_id_tag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SEvtInfoToEvtClt.key_id_tag) + // @@protoc_insertion_point(field_mutable:iot_idl.SEvtInfoToEvtClt.key_id_tag) return key_id_tag_; } inline ::std::string* SEvtInfoToEvtClt::release_key_id_tag() { @@ -5530,7 +5530,7 @@ inline void SEvtInfoToEvtClt::set_allocated_key_id_tag(::std::string* key_id_tag clear_has_key_id_tag(); key_id_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SEvtInfoToEvtClt.key_id_tag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SEvtInfoToEvtClt.key_id_tag) } // optional string wave_file = 16; @@ -5550,7 +5550,7 @@ inline void SEvtInfoToEvtClt::clear_wave_file() { clear_has_wave_file(); } inline const ::std::string& SEvtInfoToEvtClt::wave_file() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtInfoToEvtClt.wave_file) + // @@protoc_insertion_point(field_get:iot_idl.SEvtInfoToEvtClt.wave_file) return *wave_file_; } inline void SEvtInfoToEvtClt::set_wave_file(const ::std::string& value) { @@ -5559,7 +5559,7 @@ inline void SEvtInfoToEvtClt::set_wave_file(const ::std::string& value) { wave_file_ = new ::std::string; } wave_file_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SEvtInfoToEvtClt.wave_file) + // @@protoc_insertion_point(field_set:iot_idl.SEvtInfoToEvtClt.wave_file) } inline void SEvtInfoToEvtClt::set_wave_file(const char* value) { set_has_wave_file(); @@ -5567,7 +5567,7 @@ inline void SEvtInfoToEvtClt::set_wave_file(const char* value) { wave_file_ = new ::std::string; } wave_file_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SEvtInfoToEvtClt.wave_file) + // @@protoc_insertion_point(field_set_char:iot_idl.SEvtInfoToEvtClt.wave_file) } inline void SEvtInfoToEvtClt::set_wave_file(const char* value, size_t size) { set_has_wave_file(); @@ -5575,14 +5575,14 @@ inline void SEvtInfoToEvtClt::set_wave_file(const char* value, size_t size) { wave_file_ = new ::std::string; } wave_file_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SEvtInfoToEvtClt.wave_file) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SEvtInfoToEvtClt.wave_file) } inline ::std::string* SEvtInfoToEvtClt::mutable_wave_file() { set_has_wave_file(); if (wave_file_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { wave_file_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SEvtInfoToEvtClt.wave_file) + // @@protoc_insertion_point(field_mutable:iot_idl.SEvtInfoToEvtClt.wave_file) return wave_file_; } inline ::std::string* SEvtInfoToEvtClt::release_wave_file() { @@ -5606,66 +5606,66 @@ inline void SEvtInfoToEvtClt::set_allocated_wave_file(::std::string* wave_file) clear_has_wave_file(); wave_file_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SEvtInfoToEvtClt.wave_file) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SEvtInfoToEvtClt.wave_file) } // ------------------------------------------------------------------- // SEvtCltAddEvt -// repeated .kbd_idlfile.SEvtInfoToEvtClt evt_info = 1; +// repeated .iot_idl.SEvtInfoToEvtClt evt_info = 1; inline int SEvtCltAddEvt::evt_info_size() const { return evt_info_.size(); } inline void SEvtCltAddEvt::clear_evt_info() { evt_info_.Clear(); } -inline const ::kbd_idlfile::SEvtInfoToEvtClt& SEvtCltAddEvt::evt_info(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SEvtCltAddEvt.evt_info) +inline const ::iot_idl::SEvtInfoToEvtClt& SEvtCltAddEvt::evt_info(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SEvtCltAddEvt.evt_info) return evt_info_.Get(index); } -inline ::kbd_idlfile::SEvtInfoToEvtClt* SEvtCltAddEvt::mutable_evt_info(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SEvtCltAddEvt.evt_info) +inline ::iot_idl::SEvtInfoToEvtClt* SEvtCltAddEvt::mutable_evt_info(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SEvtCltAddEvt.evt_info) return evt_info_.Mutable(index); } -inline ::kbd_idlfile::SEvtInfoToEvtClt* SEvtCltAddEvt::add_evt_info() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SEvtCltAddEvt.evt_info) +inline ::iot_idl::SEvtInfoToEvtClt* SEvtCltAddEvt::add_evt_info() { + // @@protoc_insertion_point(field_add:iot_idl.SEvtCltAddEvt.evt_info) return evt_info_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SEvtInfoToEvtClt >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SEvtInfoToEvtClt >& SEvtCltAddEvt::evt_info() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SEvtCltAddEvt.evt_info) + // @@protoc_insertion_point(field_list:iot_idl.SEvtCltAddEvt.evt_info) return evt_info_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SEvtInfoToEvtClt >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SEvtInfoToEvtClt >* SEvtCltAddEvt::mutable_evt_info() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SEvtCltAddEvt.evt_info) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SEvtCltAddEvt.evt_info) return &evt_info_; } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::enAlmMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enAlmMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enAlmMsgType>() { - return ::kbd_idlfile::enAlmMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enAlmMsgType>() { + return ::iot_idl::enAlmMsgType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::enAlmStyle> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enAlmStyle> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enAlmStyle>() { - return ::kbd_idlfile::enAlmStyle_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enAlmStyle>() { + return ::iot_idl::enAlmStyle_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::enAlmLogicState> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enAlmLogicState> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enAlmLogicState>() { - return ::kbd_idlfile::enAlmLogicState_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enAlmLogicState>() { + return ::iot_idl::enAlmLogicState_descriptor(); } } // namespace google diff --git a/platform/src/idl_files/AlarmMessage.proto b/platform/src/idl_files/AlarmMessage.proto index fb7885a5..a98a4956 100644 --- a/platform/src/idl_files/AlarmMessage.proto +++ b/platform/src/idl_files/AlarmMessage.proto @@ -5,7 +5,7 @@ //======================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; // 缩写说明： // Alm : Alarm diff --git a/platform/src/idl_files/BioIdentifyMsg.pb.cc b/platform/src/idl_files/BioIdentifyMsg.pb.cc index 39fd6b85..60eec64f 100644 --- a/platform/src/idl_files/BioIdentifyMsg.pb.cc +++ b/platform/src/idl_files/BioIdentifyMsg.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -82,7 +82,7 @@ void protobuf_AddDesc_BioIdentifyMsg_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\024BioIdentifyMsg.proto\022\013kbd_idlfile\"F\n\014S" + "\n\024BioIdentifyMsg.proto\022\013iot_idl\"F\n\014S" "BisIdResult\022\017\n\007user_id\030\001 \002(\005\022\023\n\013acs_dev_" "tag\030\002 \002(\t\022\020\n\010pic_data\030\003 \001(\014*l\n\014EnBisMsgT" "ype\022\027\n\023MT_BIS_START_ID_REQ\020\001\022\027\n\023MT_BIS_S" @@ -129,7 +129,7 @@ const int SBisIdResult::kPicDataFieldNumber; SBisIdResult::SBisIdResult() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SBisIdResult) + // @@protoc_insertion_point(constructor:iot_idl.SBisIdResult) } void SBisIdResult::InitAsDefaultInstance() { @@ -139,7 +139,7 @@ SBisIdResult::SBisIdResult(const SBisIdResult& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SBisIdResult) + // @@protoc_insertion_point(copy_constructor:iot_idl.SBisIdResult) } void SBisIdResult::SharedCtor() { @@ -152,7 +152,7 @@ void SBisIdResult::SharedCtor() { } SBisIdResult::~SBisIdResult() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SBisIdResult) + // @@protoc_insertion_point(destructor:iot_idl.SBisIdResult) SharedDtor(); } @@ -210,7 +210,7 @@ bool SBisIdResult::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SBisIdResult) + // @@protoc_insertion_point(parse_start:iot_idl.SBisIdResult) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -274,17 +274,17 @@ bool SBisIdResult::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SBisIdResult) + // @@protoc_insertion_point(parse_success:iot_idl.SBisIdResult) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SBisIdResult) + // @@protoc_insertion_point(parse_failure:iot_idl.SBisIdResult) return false; #undef DO_ } void SBisIdResult::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SBisIdResult) + // @@protoc_insertion_point(serialize_start:iot_idl.SBisIdResult) // required int32 user_id = 1; if (has_user_id()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->user_id(), output); @@ -310,12 +310,12 @@ void SBisIdResult::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SBisIdResult) + // @@protoc_insertion_point(serialize_end:iot_idl.SBisIdResult) } ::google::protobuf::uint8* SBisIdResult::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SBisIdResult) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SBisIdResult) // required int32 user_id = 1; if (has_user_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->user_id(), target); @@ -343,7 +343,7 @@ void SBisIdResult::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SBisIdResult) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SBisIdResult) return target; } @@ -452,6 +452,6 @@ void SBisIdResult::Swap(SBisIdResult* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/platform/src/idl_files/BioIdentifyMsg.pb.h b/platform/src/idl_files/BioIdentifyMsg.pb.h index e4fe05ed..521769db 100644 --- a/platform/src/idl_files/BioIdentifyMsg.pb.h +++ b/platform/src/idl_files/BioIdentifyMsg.pb.h @@ -27,7 +27,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { // Internal implementation detail -- do not call these. void IDL_FILES_EXPORT protobuf_AddDesc_BioIdentifyMsg_2eproto(); @@ -143,7 +143,7 @@ class IDL_FILES_EXPORT SBisIdResult : public ::google::protobuf::Message { inline ::std::string* release_pic_data(); inline void set_allocated_pic_data(::std::string* pic_data); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SBisIdResult) + // @@protoc_insertion_point(class_scope:iot_idl.SBisIdResult) private: inline void set_has_user_id(); inline void clear_has_user_id(); @@ -188,13 +188,13 @@ inline void SBisIdResult::clear_user_id() { clear_has_user_id(); } inline ::google::protobuf::int32 SBisIdResult::user_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SBisIdResult.user_id) + // @@protoc_insertion_point(field_get:iot_idl.SBisIdResult.user_id) return user_id_; } inline void SBisIdResult::set_user_id(::google::protobuf::int32 value) { set_has_user_id(); user_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SBisIdResult.user_id) + // @@protoc_insertion_point(field_set:iot_idl.SBisIdResult.user_id) } // required string acs_dev_tag = 2; @@ -214,7 +214,7 @@ inline void SBisIdResult::clear_acs_dev_tag() { clear_has_acs_dev_tag(); } inline const ::std::string& SBisIdResult::acs_dev_tag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SBisIdResult.acs_dev_tag) + // @@protoc_insertion_point(field_get:iot_idl.SBisIdResult.acs_dev_tag) return *acs_dev_tag_; } inline void SBisIdResult::set_acs_dev_tag(const ::std::string& value) { @@ -223,7 +223,7 @@ inline void SBisIdResult::set_acs_dev_tag(const ::std::string& value) { acs_dev_tag_ = new ::std::string; } acs_dev_tag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SBisIdResult.acs_dev_tag) + // @@protoc_insertion_point(field_set:iot_idl.SBisIdResult.acs_dev_tag) } inline void SBisIdResult::set_acs_dev_tag(const char* value) { set_has_acs_dev_tag(); @@ -231,7 +231,7 @@ inline void SBisIdResult::set_acs_dev_tag(const char* value) { acs_dev_tag_ = new ::std::string; } acs_dev_tag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SBisIdResult.acs_dev_tag) + // @@protoc_insertion_point(field_set_char:iot_idl.SBisIdResult.acs_dev_tag) } inline void SBisIdResult::set_acs_dev_tag(const char* value, size_t size) { set_has_acs_dev_tag(); @@ -239,14 +239,14 @@ inline void SBisIdResult::set_acs_dev_tag(const char* value, size_t size) { acs_dev_tag_ = new ::std::string; } acs_dev_tag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SBisIdResult.acs_dev_tag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SBisIdResult.acs_dev_tag) } inline ::std::string* SBisIdResult::mutable_acs_dev_tag() { set_has_acs_dev_tag(); if (acs_dev_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { acs_dev_tag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SBisIdResult.acs_dev_tag) + // @@protoc_insertion_point(field_mutable:iot_idl.SBisIdResult.acs_dev_tag) return acs_dev_tag_; } inline ::std::string* SBisIdResult::release_acs_dev_tag() { @@ -270,7 +270,7 @@ inline void SBisIdResult::set_allocated_acs_dev_tag(::std::string* acs_dev_tag) clear_has_acs_dev_tag(); acs_dev_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SBisIdResult.acs_dev_tag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SBisIdResult.acs_dev_tag) } // optional bytes pic_data = 3; @@ -290,7 +290,7 @@ inline void SBisIdResult::clear_pic_data() { clear_has_pic_data(); } inline const ::std::string& SBisIdResult::pic_data() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SBisIdResult.pic_data) + // @@protoc_insertion_point(field_get:iot_idl.SBisIdResult.pic_data) return *pic_data_; } inline void SBisIdResult::set_pic_data(const ::std::string& value) { @@ -299,7 +299,7 @@ inline void SBisIdResult::set_pic_data(const ::std::string& value) { pic_data_ = new ::std::string; } pic_data_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SBisIdResult.pic_data) + // @@protoc_insertion_point(field_set:iot_idl.SBisIdResult.pic_data) } inline void SBisIdResult::set_pic_data(const char* value) { set_has_pic_data(); @@ -307,7 +307,7 @@ inline void SBisIdResult::set_pic_data(const char* value) { pic_data_ = new ::std::string; } pic_data_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SBisIdResult.pic_data) + // @@protoc_insertion_point(field_set_char:iot_idl.SBisIdResult.pic_data) } inline void SBisIdResult::set_pic_data(const void* value, size_t size) { set_has_pic_data(); @@ -315,14 +315,14 @@ inline void SBisIdResult::set_pic_data(const void* value, size_t size) { pic_data_ = new ::std::string; } pic_data_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SBisIdResult.pic_data) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SBisIdResult.pic_data) } inline ::std::string* SBisIdResult::mutable_pic_data() { set_has_pic_data(); if (pic_data_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { pic_data_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SBisIdResult.pic_data) + // @@protoc_insertion_point(field_mutable:iot_idl.SBisIdResult.pic_data) return pic_data_; } inline ::std::string* SBisIdResult::release_pic_data() { @@ -346,22 +346,22 @@ inline void SBisIdResult::set_allocated_pic_data(::std::string* pic_data) { clear_has_pic_data(); pic_data_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SBisIdResult.pic_data) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SBisIdResult.pic_data) } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::EnBisMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::EnBisMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::EnBisMsgType>() { - return ::kbd_idlfile::EnBisMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::EnBisMsgType>() { + return ::iot_idl::EnBisMsgType_descriptor(); } } // namespace google diff --git a/platform/src/idl_files/BioIdentifyMsg.proto b/platform/src/idl_files/BioIdentifyMsg.proto index 3ad37d42..01d92a47 100644 --- a/platform/src/idl_files/BioIdentifyMsg.proto +++ b/platform/src/idl_files/BioIdentifyMsg.proto @@ -5,7 +5,7 @@ //======================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; // 用到了SVariable // import "Public.proto"; diff --git a/platform/src/idl_files/DataProcMessage.pb.cc b/platform/src/idl_files/DataProcMessage.pb.cc index 3cb8534e..d48bc2b6 100644 --- a/platform/src/idl_files/DataProcMessage.pb.cc +++ b/platform/src/idl_files/DataProcMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -341,18 +341,18 @@ void protobuf_AddDesc_DataProcMessage_2eproto() { already_here = true; GOOGLE_PROTOBUF_VERIFY_VERSION; - ::kbd_idlfile::protobuf_AddDesc_Public_2eproto(); + ::iot_idl::protobuf_AddDesc_Public_2eproto(); ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\025DataProcMessage.proto\022\013kbd_idlfile\032\014Pu" + "\n\025DataProcMessage.proto\022\013iot_idl\032\014Pu" "blic.proto\"E\n\rSDpcdaSubInfo\022\020\n\010tab_name\030" "\001 \002(\t\022\020\n\010tag_name\030\002 \002(\t\022\020\n\010col_name\030\003 \002(" "\t\"h\n\014SDpcdaSubPkg\022+\n\007add_sub\030\001 \003(\0132\032.kbd" "_idlfile.SDpcdaSubInfo\022+\n\007del_sub\030\002 \003(\0132" - "\032.kbd_idlfile.SDpcdaSubInfo\"\\\n\tSPointMsg" + "\032.iot_idl.SDpcdaSubInfo\"\\\n\tSPointMsg" "\022\020\n\010nDominId\030\001 \002(\005\022\016\n\006nAppId\030\002 \002(\005\022\016\n\006sT" "able\030\003 \002(\t\022\014\n\004sKey\030\004 \002(\t\022\017\n\007sColumn\030\005 \002(" "\t\"<\n\020SPointMsgPackage\022(\n\010PointMsg\030\001 \003(\0132" - "\026.kbd_idlfile.SPointMsg\"9\n\020SRealTimePkgH" + "\026.iot_idl.SPointMsg\"9\n\020SRealTimePkgH" "ead\022\021\n\tstrSrcTag\030\001 \002(\t\022\022\n\nnTimeStamp\030\002 \002" "(\003\"\232\001\n\017SAiRealTimeData\022\021\n\tnLocation\030\001 \002(" "\005\022\022\n\nnSubSystem\030\002 \002(\005\022\024\n\014strTableName\030\003 " @@ -373,13 +373,13 @@ void protobuf_AddDesc_DataProcMessage_2eproto() { "eRealTimeData\022\024\n\014strTableName\030\001 \002(\t\022\022\n\ns" "trTagName\030\002 \002(\t\022\025\n\rstrColumnName\030\003 \002(\t\022\021" "\n\tnLocation\030\004 \001(\005\022\022\n\nnSubSystem\030\005 \001(\005\022(\n" - "\010varValue\030\006 \002(\0132\026.kbd_idlfile.SVariable\"" + "\010varValue\030\006 \002(\0132\026.iot_idl.SVariable\"" "\260\002\n\020SRealTimeDataPkg\022-\n\006stHead\030\001 \002(\0132\035.k" "bd_idlfile.SRealTimePkgHead\022-\n\007stAiRtd\030\002" - " \003(\0132\034.kbd_idlfile.SAiRealTimeData\022-\n\007st" - "PiRtd\030\003 \003(\0132\034.kbd_idlfile.SPiRealTimeDat" - "a\022-\n\007stDiRtd\030\004 \003(\0132\034.kbd_idlfile.SDiReal" - "TimeData\022-\n\007stMiRtd\030\005 \003(\0132\034.kbd_idlfile." + " \003(\0132\034.iot_idl.SAiRealTimeData\022-\n\007st" + "PiRtd\030\003 \003(\0132\034.iot_idl.SPiRealTimeDat" + "a\022-\n\007stDiRtd\030\004 \003(\0132\034.iot_idl.SDiReal" + "TimeData\022-\n\007stMiRtd\030\005 \003(\0132\034.iot_idl." "SMiRealTimeData\0221\n\010stTblRtd\030\006 \003(\0132\037.kbd_" "idlfile.STableRealTimeData*\261\001\n\021enDataPro" "cMessage\022\027\n\023MT_DPCDA_APP2DP_CHG\020\001\022\033\n\027MT_" @@ -450,7 +450,7 @@ const int SDpcdaSubInfo::kColNameFieldNumber; SDpcdaSubInfo::SDpcdaSubInfo() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SDpcdaSubInfo) + // @@protoc_insertion_point(constructor:iot_idl.SDpcdaSubInfo) } void SDpcdaSubInfo::InitAsDefaultInstance() { @@ -460,7 +460,7 @@ SDpcdaSubInfo::SDpcdaSubInfo(const SDpcdaSubInfo& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SDpcdaSubInfo) + // @@protoc_insertion_point(copy_constructor:iot_idl.SDpcdaSubInfo) } void SDpcdaSubInfo::SharedCtor() { @@ -473,7 +473,7 @@ void SDpcdaSubInfo::SharedCtor() { } SDpcdaSubInfo::~SDpcdaSubInfo() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SDpcdaSubInfo) + // @@protoc_insertion_point(destructor:iot_idl.SDpcdaSubInfo) SharedDtor(); } @@ -538,7 +538,7 @@ bool SDpcdaSubInfo::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SDpcdaSubInfo) + // @@protoc_insertion_point(parse_start:iot_idl.SDpcdaSubInfo) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -608,17 +608,17 @@ bool SDpcdaSubInfo::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SDpcdaSubInfo) + // @@protoc_insertion_point(parse_success:iot_idl.SDpcdaSubInfo) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SDpcdaSubInfo) + // @@protoc_insertion_point(parse_failure:iot_idl.SDpcdaSubInfo) return false; #undef DO_ } void SDpcdaSubInfo::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SDpcdaSubInfo) + // @@protoc_insertion_point(serialize_start:iot_idl.SDpcdaSubInfo) // required string tab_name = 1; if (has_tab_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -653,12 +653,12 @@ void SDpcdaSubInfo::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SDpcdaSubInfo) + // @@protoc_insertion_point(serialize_end:iot_idl.SDpcdaSubInfo) } ::google::protobuf::uint8* SDpcdaSubInfo::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SDpcdaSubInfo) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SDpcdaSubInfo) // required string tab_name = 1; if (has_tab_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -696,7 +696,7 @@ void SDpcdaSubInfo::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SDpcdaSubInfo) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SDpcdaSubInfo) return target; } @@ -813,7 +813,7 @@ const int SDpcdaSubPkg::kDelSubFieldNumber; SDpcdaSubPkg::SDpcdaSubPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SDpcdaSubPkg) + // @@protoc_insertion_point(constructor:iot_idl.SDpcdaSubPkg) } void SDpcdaSubPkg::InitAsDefaultInstance() { @@ -823,7 +823,7 @@ SDpcdaSubPkg::SDpcdaSubPkg(const SDpcdaSubPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SDpcdaSubPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SDpcdaSubPkg) } void SDpcdaSubPkg::SharedCtor() { @@ -832,7 +832,7 @@ void SDpcdaSubPkg::SharedCtor() { } SDpcdaSubPkg::~SDpcdaSubPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SDpcdaSubPkg) + // @@protoc_insertion_point(destructor:iot_idl.SDpcdaSubPkg) SharedDtor(); } @@ -873,13 +873,13 @@ bool SDpcdaSubPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SDpcdaSubPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SDpcdaSubPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated .kbd_idlfile.SDpcdaSubInfo add_sub = 1; + // repeated .iot_idl.SDpcdaSubInfo add_sub = 1; case 1: { if (tag == 10) { parse_add_sub: @@ -893,7 +893,7 @@ bool SDpcdaSubPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SDpcdaSubInfo del_sub = 2; + // repeated .iot_idl.SDpcdaSubInfo del_sub = 2; case 2: { if (tag == 18) { parse_del_sub: @@ -921,24 +921,24 @@ bool SDpcdaSubPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SDpcdaSubPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SDpcdaSubPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SDpcdaSubPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SDpcdaSubPkg) return false; #undef DO_ } void SDpcdaSubPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SDpcdaSubPkg) - // repeated .kbd_idlfile.SDpcdaSubInfo add_sub = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SDpcdaSubPkg) + // repeated .iot_idl.SDpcdaSubInfo add_sub = 1; for (int i = 0; i < this->add_sub_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->add_sub(i), output); } - // repeated .kbd_idlfile.SDpcdaSubInfo del_sub = 2; + // repeated .iot_idl.SDpcdaSubInfo del_sub = 2; for (int i = 0; i < this->del_sub_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->del_sub(i), output); @@ -948,20 +948,20 @@ void SDpcdaSubPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SDpcdaSubPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SDpcdaSubPkg) } ::google::protobuf::uint8* SDpcdaSubPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SDpcdaSubPkg) - // repeated .kbd_idlfile.SDpcdaSubInfo add_sub = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SDpcdaSubPkg) + // repeated .iot_idl.SDpcdaSubInfo add_sub = 1; for (int i = 0; i < this->add_sub_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->add_sub(i), target); } - // repeated .kbd_idlfile.SDpcdaSubInfo del_sub = 2; + // repeated .iot_idl.SDpcdaSubInfo del_sub = 2; for (int i = 0; i < this->del_sub_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -972,14 +972,14 @@ void SDpcdaSubPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SDpcdaSubPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SDpcdaSubPkg) return target; } int SDpcdaSubPkg::ByteSize() const { int total_size = 0; - // repeated .kbd_idlfile.SDpcdaSubInfo add_sub = 1; + // repeated .iot_idl.SDpcdaSubInfo add_sub = 1; total_size += 1 * this->add_sub_size(); for (int i = 0; i < this->add_sub_size(); i++) { total_size += @@ -987,7 +987,7 @@ int SDpcdaSubPkg::ByteSize() const { this->add_sub(i)); } - // repeated .kbd_idlfile.SDpcdaSubInfo del_sub = 2; + // repeated .iot_idl.SDpcdaSubInfo del_sub = 2; total_size += 1 * this->del_sub_size(); for (int i = 0; i < this->del_sub_size(); i++) { total_size += @@ -1076,7 +1076,7 @@ const int SPointMsg::kSColumnFieldNumber; SPointMsg::SPointMsg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SPointMsg) + // @@protoc_insertion_point(constructor:iot_idl.SPointMsg) } void SPointMsg::InitAsDefaultInstance() { @@ -1086,7 +1086,7 @@ SPointMsg::SPointMsg(const SPointMsg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SPointMsg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SPointMsg) } void SPointMsg::SharedCtor() { @@ -1101,7 +1101,7 @@ void SPointMsg::SharedCtor() { } SPointMsg::~SPointMsg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SPointMsg) + // @@protoc_insertion_point(destructor:iot_idl.SPointMsg) SharedDtor(); } @@ -1181,7 +1181,7 @@ bool SPointMsg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SPointMsg) + // @@protoc_insertion_point(parse_start:iot_idl.SPointMsg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1281,17 +1281,17 @@ bool SPointMsg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SPointMsg) + // @@protoc_insertion_point(parse_success:iot_idl.SPointMsg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SPointMsg) + // @@protoc_insertion_point(parse_failure:iot_idl.SPointMsg) return false; #undef DO_ } void SPointMsg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SPointMsg) + // @@protoc_insertion_point(serialize_start:iot_idl.SPointMsg) // required int32 nDominId = 1; if (has_ndominid()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->ndominid(), output); @@ -1336,12 +1336,12 @@ void SPointMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SPointMsg) + // @@protoc_insertion_point(serialize_end:iot_idl.SPointMsg) } ::google::protobuf::uint8* SPointMsg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SPointMsg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SPointMsg) // required int32 nDominId = 1; if (has_ndominid()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->ndominid(), target); @@ -1389,7 +1389,7 @@ void SPointMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SPointMsg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SPointMsg) return target; } @@ -1527,7 +1527,7 @@ const int SPointMsgPackage::kPointMsgFieldNumber; SPointMsgPackage::SPointMsgPackage() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SPointMsgPackage) + // @@protoc_insertion_point(constructor:iot_idl.SPointMsgPackage) } void SPointMsgPackage::InitAsDefaultInstance() { @@ -1537,7 +1537,7 @@ SPointMsgPackage::SPointMsgPackage(const SPointMsgPackage& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SPointMsgPackage) + // @@protoc_insertion_point(copy_constructor:iot_idl.SPointMsgPackage) } void SPointMsgPackage::SharedCtor() { @@ -1546,7 +1546,7 @@ void SPointMsgPackage::SharedCtor() { } SPointMsgPackage::~SPointMsgPackage() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SPointMsgPackage) + // @@protoc_insertion_point(destructor:iot_idl.SPointMsgPackage) SharedDtor(); } @@ -1586,13 +1586,13 @@ bool SPointMsgPackage::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SPointMsgPackage) + // @@protoc_insertion_point(parse_start:iot_idl.SPointMsgPackage) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated .kbd_idlfile.SPointMsg PointMsg = 1; + // repeated .iot_idl.SPointMsg PointMsg = 1; case 1: { if (tag == 10) { parse_PointMsg: @@ -1620,18 +1620,18 @@ bool SPointMsgPackage::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SPointMsgPackage) + // @@protoc_insertion_point(parse_success:iot_idl.SPointMsgPackage) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SPointMsgPackage) + // @@protoc_insertion_point(parse_failure:iot_idl.SPointMsgPackage) return false; #undef DO_ } void SPointMsgPackage::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SPointMsgPackage) - // repeated .kbd_idlfile.SPointMsg PointMsg = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SPointMsgPackage) + // repeated .iot_idl.SPointMsg PointMsg = 1; for (int i = 0; i < this->pointmsg_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->pointmsg(i), output); @@ -1641,13 +1641,13 @@ void SPointMsgPackage::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SPointMsgPackage) + // @@protoc_insertion_point(serialize_end:iot_idl.SPointMsgPackage) } ::google::protobuf::uint8* SPointMsgPackage::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SPointMsgPackage) - // repeated .kbd_idlfile.SPointMsg PointMsg = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SPointMsgPackage) + // repeated .iot_idl.SPointMsg PointMsg = 1; for (int i = 0; i < this->pointmsg_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1658,14 +1658,14 @@ void SPointMsgPackage::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SPointMsgPackage) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SPointMsgPackage) return target; } int SPointMsgPackage::ByteSize() const { int total_size = 0; - // repeated .kbd_idlfile.SPointMsg PointMsg = 1; + // repeated .iot_idl.SPointMsg PointMsg = 1; total_size += 1 * this->pointmsg_size(); for (int i = 0; i < this->pointmsg_size(); i++) { total_size += @@ -1748,7 +1748,7 @@ const int SRealTimePkgHead::kNTimeStampFieldNumber; SRealTimePkgHead::SRealTimePkgHead() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SRealTimePkgHead) + // @@protoc_insertion_point(constructor:iot_idl.SRealTimePkgHead) } void SRealTimePkgHead::InitAsDefaultInstance() { @@ -1758,7 +1758,7 @@ SRealTimePkgHead::SRealTimePkgHead(const SRealTimePkgHead& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SRealTimePkgHead) + // @@protoc_insertion_point(copy_constructor:iot_idl.SRealTimePkgHead) } void SRealTimePkgHead::SharedCtor() { @@ -1770,7 +1770,7 @@ void SRealTimePkgHead::SharedCtor() { } SRealTimePkgHead::~SRealTimePkgHead() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SRealTimePkgHead) + // @@protoc_insertion_point(destructor:iot_idl.SRealTimePkgHead) SharedDtor(); } @@ -1820,7 +1820,7 @@ bool SRealTimePkgHead::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SRealTimePkgHead) + // @@protoc_insertion_point(parse_start:iot_idl.SRealTimePkgHead) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1871,17 +1871,17 @@ bool SRealTimePkgHead::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SRealTimePkgHead) + // @@protoc_insertion_point(parse_success:iot_idl.SRealTimePkgHead) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SRealTimePkgHead) + // @@protoc_insertion_point(parse_failure:iot_idl.SRealTimePkgHead) return false; #undef DO_ } void SRealTimePkgHead::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SRealTimePkgHead) + // @@protoc_insertion_point(serialize_start:iot_idl.SRealTimePkgHead) // required string strSrcTag = 1; if (has_strsrctag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1901,12 +1901,12 @@ void SRealTimePkgHead::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SRealTimePkgHead) + // @@protoc_insertion_point(serialize_end:iot_idl.SRealTimePkgHead) } ::google::protobuf::uint8* SRealTimePkgHead::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SRealTimePkgHead) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SRealTimePkgHead) // required string strSrcTag = 1; if (has_strsrctag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1927,7 +1927,7 @@ void SRealTimePkgHead::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SRealTimePkgHead) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SRealTimePkgHead) return target; } @@ -2038,7 +2038,7 @@ const int SAiRealTimeData::kUStatusFieldNumber; SAiRealTimeData::SAiRealTimeData() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SAiRealTimeData) + // @@protoc_insertion_point(constructor:iot_idl.SAiRealTimeData) } void SAiRealTimeData::InitAsDefaultInstance() { @@ -2048,7 +2048,7 @@ SAiRealTimeData::SAiRealTimeData(const SAiRealTimeData& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SAiRealTimeData) + // @@protoc_insertion_point(copy_constructor:iot_idl.SAiRealTimeData) } void SAiRealTimeData::SharedCtor() { @@ -2065,7 +2065,7 @@ void SAiRealTimeData::SharedCtor() { } SAiRealTimeData::~SAiRealTimeData() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SAiRealTimeData) + // @@protoc_insertion_point(destructor:iot_idl.SAiRealTimeData) SharedDtor(); } @@ -2146,7 +2146,7 @@ bool SAiRealTimeData::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SAiRealTimeData) + // @@protoc_insertion_point(parse_start:iot_idl.SAiRealTimeData) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2276,17 +2276,17 @@ bool SAiRealTimeData::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SAiRealTimeData) + // @@protoc_insertion_point(parse_success:iot_idl.SAiRealTimeData) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SAiRealTimeData) + // @@protoc_insertion_point(parse_failure:iot_idl.SAiRealTimeData) return false; #undef DO_ } void SAiRealTimeData::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SAiRealTimeData) + // @@protoc_insertion_point(serialize_start:iot_idl.SAiRealTimeData) // required int32 nLocation = 1; if (has_nlocation()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->nlocation(), output); @@ -2341,12 +2341,12 @@ void SAiRealTimeData::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SAiRealTimeData) + // @@protoc_insertion_point(serialize_end:iot_idl.SAiRealTimeData) } ::google::protobuf::uint8* SAiRealTimeData::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SAiRealTimeData) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SAiRealTimeData) // required int32 nLocation = 1; if (has_nlocation()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->nlocation(), target); @@ -2404,7 +2404,7 @@ void SAiRealTimeData::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SAiRealTimeData) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SAiRealTimeData) return target; } @@ -2568,7 +2568,7 @@ const int SPiRealTimeData::kUStatusFieldNumber; SPiRealTimeData::SPiRealTimeData() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SPiRealTimeData) + // @@protoc_insertion_point(constructor:iot_idl.SPiRealTimeData) } void SPiRealTimeData::InitAsDefaultInstance() { @@ -2578,7 +2578,7 @@ SPiRealTimeData::SPiRealTimeData(const SPiRealTimeData& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SPiRealTimeData) + // @@protoc_insertion_point(copy_constructor:iot_idl.SPiRealTimeData) } void SPiRealTimeData::SharedCtor() { @@ -2595,7 +2595,7 @@ void SPiRealTimeData::SharedCtor() { } SPiRealTimeData::~SPiRealTimeData() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SPiRealTimeData) + // @@protoc_insertion_point(destructor:iot_idl.SPiRealTimeData) SharedDtor(); } @@ -2676,7 +2676,7 @@ bool SPiRealTimeData::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SPiRealTimeData) + // @@protoc_insertion_point(parse_start:iot_idl.SPiRealTimeData) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2806,17 +2806,17 @@ bool SPiRealTimeData::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SPiRealTimeData) + // @@protoc_insertion_point(parse_success:iot_idl.SPiRealTimeData) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SPiRealTimeData) + // @@protoc_insertion_point(parse_failure:iot_idl.SPiRealTimeData) return false; #undef DO_ } void SPiRealTimeData::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SPiRealTimeData) + // @@protoc_insertion_point(serialize_start:iot_idl.SPiRealTimeData) // required int32 nLocation = 1; if (has_nlocation()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->nlocation(), output); @@ -2871,12 +2871,12 @@ void SPiRealTimeData::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SPiRealTimeData) + // @@protoc_insertion_point(serialize_end:iot_idl.SPiRealTimeData) } ::google::protobuf::uint8* SPiRealTimeData::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SPiRealTimeData) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SPiRealTimeData) // required int32 nLocation = 1; if (has_nlocation()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->nlocation(), target); @@ -2934,7 +2934,7 @@ void SPiRealTimeData::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SPiRealTimeData) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SPiRealTimeData) return target; } @@ -3098,7 +3098,7 @@ const int SDiRealTimeData::kUStatusFieldNumber; SDiRealTimeData::SDiRealTimeData() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SDiRealTimeData) + // @@protoc_insertion_point(constructor:iot_idl.SDiRealTimeData) } void SDiRealTimeData::InitAsDefaultInstance() { @@ -3108,7 +3108,7 @@ SDiRealTimeData::SDiRealTimeData(const SDiRealTimeData& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SDiRealTimeData) + // @@protoc_insertion_point(copy_constructor:iot_idl.SDiRealTimeData) } void SDiRealTimeData::SharedCtor() { @@ -3125,7 +3125,7 @@ void SDiRealTimeData::SharedCtor() { } SDiRealTimeData::~SDiRealTimeData() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SDiRealTimeData) + // @@protoc_insertion_point(destructor:iot_idl.SDiRealTimeData) SharedDtor(); } @@ -3206,7 +3206,7 @@ bool SDiRealTimeData::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SDiRealTimeData) + // @@protoc_insertion_point(parse_start:iot_idl.SDiRealTimeData) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -3336,17 +3336,17 @@ bool SDiRealTimeData::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SDiRealTimeData) + // @@protoc_insertion_point(parse_success:iot_idl.SDiRealTimeData) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SDiRealTimeData) + // @@protoc_insertion_point(parse_failure:iot_idl.SDiRealTimeData) return false; #undef DO_ } void SDiRealTimeData::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SDiRealTimeData) + // @@protoc_insertion_point(serialize_start:iot_idl.SDiRealTimeData) // required int32 nLocation = 1; if (has_nlocation()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->nlocation(), output); @@ -3401,12 +3401,12 @@ void SDiRealTimeData::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SDiRealTimeData) + // @@protoc_insertion_point(serialize_end:iot_idl.SDiRealTimeData) } ::google::protobuf::uint8* SDiRealTimeData::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SDiRealTimeData) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SDiRealTimeData) // required int32 nLocation = 1; if (has_nlocation()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->nlocation(), target); @@ -3464,7 +3464,7 @@ void SDiRealTimeData::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SDiRealTimeData) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SDiRealTimeData) return target; } @@ -3630,7 +3630,7 @@ const int SMiRealTimeData::kUStatusFieldNumber; SMiRealTimeData::SMiRealTimeData() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SMiRealTimeData) + // @@protoc_insertion_point(constructor:iot_idl.SMiRealTimeData) } void SMiRealTimeData::InitAsDefaultInstance() { @@ -3640,7 +3640,7 @@ SMiRealTimeData::SMiRealTimeData(const SMiRealTimeData& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SMiRealTimeData) + // @@protoc_insertion_point(copy_constructor:iot_idl.SMiRealTimeData) } void SMiRealTimeData::SharedCtor() { @@ -3657,7 +3657,7 @@ void SMiRealTimeData::SharedCtor() { } SMiRealTimeData::~SMiRealTimeData() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SMiRealTimeData) + // @@protoc_insertion_point(destructor:iot_idl.SMiRealTimeData) SharedDtor(); } @@ -3738,7 +3738,7 @@ bool SMiRealTimeData::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SMiRealTimeData) + // @@protoc_insertion_point(parse_start:iot_idl.SMiRealTimeData) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -3868,17 +3868,17 @@ bool SMiRealTimeData::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SMiRealTimeData) + // @@protoc_insertion_point(parse_success:iot_idl.SMiRealTimeData) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SMiRealTimeData) + // @@protoc_insertion_point(parse_failure:iot_idl.SMiRealTimeData) return false; #undef DO_ } void SMiRealTimeData::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SMiRealTimeData) + // @@protoc_insertion_point(serialize_start:iot_idl.SMiRealTimeData) // required int32 nLocation = 1; if (has_nlocation()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->nlocation(), output); @@ -3933,12 +3933,12 @@ void SMiRealTimeData::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SMiRealTimeData) + // @@protoc_insertion_point(serialize_end:iot_idl.SMiRealTimeData) } ::google::protobuf::uint8* SMiRealTimeData::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SMiRealTimeData) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SMiRealTimeData) // required int32 nLocation = 1; if (has_nlocation()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->nlocation(), target); @@ -3996,7 +3996,7 @@ void SMiRealTimeData::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SMiRealTimeData) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SMiRealTimeData) return target; } @@ -4161,18 +4161,18 @@ const int STableRealTimeData::kVarValueFieldNumber; STableRealTimeData::STableRealTimeData() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.STableRealTimeData) + // @@protoc_insertion_point(constructor:iot_idl.STableRealTimeData) } void STableRealTimeData::InitAsDefaultInstance() { - varvalue_ = const_cast< ::kbd_idlfile::SVariable*>(&::kbd_idlfile::SVariable::default_instance()); + varvalue_ = const_cast< ::iot_idl::SVariable*>(&::iot_idl::SVariable::default_instance()); } STableRealTimeData::STableRealTimeData(const STableRealTimeData& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.STableRealTimeData) + // @@protoc_insertion_point(copy_constructor:iot_idl.STableRealTimeData) } void STableRealTimeData::SharedCtor() { @@ -4188,7 +4188,7 @@ void STableRealTimeData::SharedCtor() { } STableRealTimeData::~STableRealTimeData() { - // @@protoc_insertion_point(destructor:kbd_idlfile.STableRealTimeData) + // @@protoc_insertion_point(destructor:iot_idl.STableRealTimeData) SharedDtor(); } @@ -4257,7 +4257,7 @@ void STableRealTimeData::Clear() { } } if (has_varvalue()) { - if (varvalue_ != NULL) varvalue_->::kbd_idlfile::SVariable::Clear(); + if (varvalue_ != NULL) varvalue_->::iot_idl::SVariable::Clear(); } } @@ -4272,7 +4272,7 @@ bool STableRealTimeData::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.STableRealTimeData) + // @@protoc_insertion_point(parse_start:iot_idl.STableRealTimeData) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -4358,7 +4358,7 @@ bool STableRealTimeData::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.SVariable varValue = 6; + // required .iot_idl.SVariable varValue = 6; case 6: { if (tag == 50) { parse_varValue: @@ -4385,17 +4385,17 @@ bool STableRealTimeData::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.STableRealTimeData) + // @@protoc_insertion_point(parse_success:iot_idl.STableRealTimeData) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.STableRealTimeData) + // @@protoc_insertion_point(parse_failure:iot_idl.STableRealTimeData) return false; #undef DO_ } void STableRealTimeData::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.STableRealTimeData) + // @@protoc_insertion_point(serialize_start:iot_idl.STableRealTimeData) // required string strTableName = 1; if (has_strtablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4436,7 +4436,7 @@ void STableRealTimeData::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(5, this->nsubsystem(), output); } - // required .kbd_idlfile.SVariable varValue = 6; + // required .iot_idl.SVariable varValue = 6; if (has_varvalue()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 6, this->varvalue(), output); @@ -4446,12 +4446,12 @@ void STableRealTimeData::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.STableRealTimeData) + // @@protoc_insertion_point(serialize_end:iot_idl.STableRealTimeData) } ::google::protobuf::uint8* STableRealTimeData::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.STableRealTimeData) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.STableRealTimeData) // required string strTableName = 1; if (has_strtablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4495,7 +4495,7 @@ void STableRealTimeData::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(5, this->nsubsystem(), target); } - // required .kbd_idlfile.SVariable varValue = 6; + // required .iot_idl.SVariable varValue = 6; if (has_varvalue()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -4506,7 +4506,7 @@ void STableRealTimeData::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.STableRealTimeData) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.STableRealTimeData) return target; } @@ -4549,7 +4549,7 @@ int STableRealTimeData::ByteSize() const { this->nsubsystem()); } - // required .kbd_idlfile.SVariable varValue = 6; + // required .iot_idl.SVariable varValue = 6; if (has_varvalue()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -4599,7 +4599,7 @@ void STableRealTimeData::MergeFrom(const STableRealTimeData& from) { set_nsubsystem(from.nsubsystem()); } if (from.has_varvalue()) { - mutable_varvalue()->::kbd_idlfile::SVariable::MergeFrom(from.varvalue()); + mutable_varvalue()->::iot_idl::SVariable::MergeFrom(from.varvalue()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -4663,18 +4663,18 @@ const int SRealTimeDataPkg::kStTblRtdFieldNumber; SRealTimeDataPkg::SRealTimeDataPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SRealTimeDataPkg) + // @@protoc_insertion_point(constructor:iot_idl.SRealTimeDataPkg) } void SRealTimeDataPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SRealTimePkgHead*>(&::kbd_idlfile::SRealTimePkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SRealTimePkgHead*>(&::iot_idl::SRealTimePkgHead::default_instance()); } SRealTimeDataPkg::SRealTimeDataPkg(const SRealTimeDataPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SRealTimeDataPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SRealTimeDataPkg) } void SRealTimeDataPkg::SharedCtor() { @@ -4684,7 +4684,7 @@ void SRealTimeDataPkg::SharedCtor() { } SRealTimeDataPkg::~SRealTimeDataPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SRealTimeDataPkg) + // @@protoc_insertion_point(destructor:iot_idl.SRealTimeDataPkg) SharedDtor(); } @@ -4717,7 +4717,7 @@ SRealTimeDataPkg* SRealTimeDataPkg::New() const { void SRealTimeDataPkg::Clear() { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SRealTimePkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SRealTimePkgHead::Clear(); } stairtd_.Clear(); stpirtd_.Clear(); @@ -4732,13 +4732,13 @@ bool SRealTimeDataPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SRealTimeDataPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SRealTimeDataPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SRealTimePkgHead stHead = 1; + // required .iot_idl.SRealTimePkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -4750,7 +4750,7 @@ bool SRealTimeDataPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SAiRealTimeData stAiRtd = 2; + // repeated .iot_idl.SAiRealTimeData stAiRtd = 2; case 2: { if (tag == 18) { parse_stAiRtd: @@ -4764,7 +4764,7 @@ bool SRealTimeDataPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SPiRealTimeData stPiRtd = 3; + // repeated .iot_idl.SPiRealTimeData stPiRtd = 3; case 3: { if (tag == 26) { parse_stPiRtd: @@ -4778,7 +4778,7 @@ bool SRealTimeDataPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SDiRealTimeData stDiRtd = 4; + // repeated .iot_idl.SDiRealTimeData stDiRtd = 4; case 4: { if (tag == 34) { parse_stDiRtd: @@ -4792,7 +4792,7 @@ bool SRealTimeDataPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SMiRealTimeData stMiRtd = 5; + // repeated .iot_idl.SMiRealTimeData stMiRtd = 5; case 5: { if (tag == 42) { parse_stMiRtd: @@ -4806,7 +4806,7 @@ bool SRealTimeDataPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.STableRealTimeData stTblRtd = 6; + // repeated .iot_idl.STableRealTimeData stTblRtd = 6; case 6: { if (tag == 50) { parse_stTblRtd: @@ -4834,48 +4834,48 @@ bool SRealTimeDataPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SRealTimeDataPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SRealTimeDataPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SRealTimeDataPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SRealTimeDataPkg) return false; #undef DO_ } void SRealTimeDataPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SRealTimeDataPkg) - // required .kbd_idlfile.SRealTimePkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SRealTimeDataPkg) + // required .iot_idl.SRealTimePkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); } - // repeated .kbd_idlfile.SAiRealTimeData stAiRtd = 2; + // repeated .iot_idl.SAiRealTimeData stAiRtd = 2; for (int i = 0; i < this->stairtd_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->stairtd(i), output); } - // repeated .kbd_idlfile.SPiRealTimeData stPiRtd = 3; + // repeated .iot_idl.SPiRealTimeData stPiRtd = 3; for (int i = 0; i < this->stpirtd_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->stpirtd(i), output); } - // repeated .kbd_idlfile.SDiRealTimeData stDiRtd = 4; + // repeated .iot_idl.SDiRealTimeData stDiRtd = 4; for (int i = 0; i < this->stdirtd_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->stdirtd(i), output); } - // repeated .kbd_idlfile.SMiRealTimeData stMiRtd = 5; + // repeated .iot_idl.SMiRealTimeData stMiRtd = 5; for (int i = 0; i < this->stmirtd_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 5, this->stmirtd(i), output); } - // repeated .kbd_idlfile.STableRealTimeData stTblRtd = 6; + // repeated .iot_idl.STableRealTimeData stTblRtd = 6; for (int i = 0; i < this->sttblrtd_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 6, this->sttblrtd(i), output); @@ -4885,48 +4885,48 @@ void SRealTimeDataPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SRealTimeDataPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SRealTimeDataPkg) } ::google::protobuf::uint8* SRealTimeDataPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SRealTimeDataPkg) - // required .kbd_idlfile.SRealTimePkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SRealTimeDataPkg) + // required .iot_idl.SRealTimePkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->sthead(), target); } - // repeated .kbd_idlfile.SAiRealTimeData stAiRtd = 2; + // repeated .iot_idl.SAiRealTimeData stAiRtd = 2; for (int i = 0; i < this->stairtd_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->stairtd(i), target); } - // repeated .kbd_idlfile.SPiRealTimeData stPiRtd = 3; + // repeated .iot_idl.SPiRealTimeData stPiRtd = 3; for (int i = 0; i < this->stpirtd_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 3, this->stpirtd(i), target); } - // repeated .kbd_idlfile.SDiRealTimeData stDiRtd = 4; + // repeated .iot_idl.SDiRealTimeData stDiRtd = 4; for (int i = 0; i < this->stdirtd_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 4, this->stdirtd(i), target); } - // repeated .kbd_idlfile.SMiRealTimeData stMiRtd = 5; + // repeated .iot_idl.SMiRealTimeData stMiRtd = 5; for (int i = 0; i < this->stmirtd_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 5, this->stmirtd(i), target); } - // repeated .kbd_idlfile.STableRealTimeData stTblRtd = 6; + // repeated .iot_idl.STableRealTimeData stTblRtd = 6; for (int i = 0; i < this->sttblrtd_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -4937,7 +4937,7 @@ void SRealTimeDataPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SRealTimeDataPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SRealTimeDataPkg) return target; } @@ -4945,7 +4945,7 @@ int SRealTimeDataPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SRealTimePkgHead stHead = 1; + // required .iot_idl.SRealTimePkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -4953,7 +4953,7 @@ int SRealTimeDataPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SAiRealTimeData stAiRtd = 2; + // repeated .iot_idl.SAiRealTimeData stAiRtd = 2; total_size += 1 * this->stairtd_size(); for (int i = 0; i < this->stairtd_size(); i++) { total_size += @@ -4961,7 +4961,7 @@ int SRealTimeDataPkg::ByteSize() const { this->stairtd(i)); } - // repeated .kbd_idlfile.SPiRealTimeData stPiRtd = 3; + // repeated .iot_idl.SPiRealTimeData stPiRtd = 3; total_size += 1 * this->stpirtd_size(); for (int i = 0; i < this->stpirtd_size(); i++) { total_size += @@ -4969,7 +4969,7 @@ int SRealTimeDataPkg::ByteSize() const { this->stpirtd(i)); } - // repeated .kbd_idlfile.SDiRealTimeData stDiRtd = 4; + // repeated .iot_idl.SDiRealTimeData stDiRtd = 4; total_size += 1 * this->stdirtd_size(); for (int i = 0; i < this->stdirtd_size(); i++) { total_size += @@ -4977,7 +4977,7 @@ int SRealTimeDataPkg::ByteSize() const { this->stdirtd(i)); } - // repeated .kbd_idlfile.SMiRealTimeData stMiRtd = 5; + // repeated .iot_idl.SMiRealTimeData stMiRtd = 5; total_size += 1 * this->stmirtd_size(); for (int i = 0; i < this->stmirtd_size(); i++) { total_size += @@ -4985,7 +4985,7 @@ int SRealTimeDataPkg::ByteSize() const { this->stmirtd(i)); } - // repeated .kbd_idlfile.STableRealTimeData stTblRtd = 6; + // repeated .iot_idl.STableRealTimeData stTblRtd = 6; total_size += 1 * this->sttblrtd_size(); for (int i = 0; i < this->sttblrtd_size(); i++) { total_size += @@ -5025,7 +5025,7 @@ void SRealTimeDataPkg::MergeFrom(const SRealTimeDataPkg& from) { sttblrtd_.MergeFrom(from.sttblrtd_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SRealTimePkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SRealTimePkgHead::MergeFrom(from.sthead()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -5082,6 +5082,6 @@ void SRealTimeDataPkg::Swap(SRealTimeDataPkg* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/platform/src/idl_files/DataProcMessage.pb.h b/platform/src/idl_files/DataProcMessage.pb.h index 33f2a363..4c34cca3 100644 --- a/platform/src/idl_files/DataProcMessage.pb.h +++ b/platform/src/idl_files/DataProcMessage.pb.h @@ -28,7 +28,7 @@ #include "Public.pb.h" // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { // Internal implementation detail -- do not call these. void IDL_FILES_EXPORT protobuf_AddDesc_DataProcMessage_2eproto(); @@ -161,7 +161,7 @@ class IDL_FILES_EXPORT SDpcdaSubInfo : public ::google::protobuf::Message { inline ::std::string* release_col_name(); inline void set_allocated_col_name(::std::string* col_name); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SDpcdaSubInfo) + // @@protoc_insertion_point(class_scope:iot_idl.SDpcdaSubInfo) private: inline void set_has_tab_name(); inline void clear_has_tab_name(); @@ -239,39 +239,39 @@ class IDL_FILES_EXPORT SDpcdaSubPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // repeated .kbd_idlfile.SDpcdaSubInfo add_sub = 1; + // repeated .iot_idl.SDpcdaSubInfo add_sub = 1; inline int add_sub_size() const; inline void clear_add_sub(); static const int kAddSubFieldNumber = 1; - inline const ::kbd_idlfile::SDpcdaSubInfo& add_sub(int index) const; - inline ::kbd_idlfile::SDpcdaSubInfo* mutable_add_sub(int index); - inline ::kbd_idlfile::SDpcdaSubInfo* add_add_sub(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SDpcdaSubInfo >& + inline const ::iot_idl::SDpcdaSubInfo& add_sub(int index) const; + inline ::iot_idl::SDpcdaSubInfo* mutable_add_sub(int index); + inline ::iot_idl::SDpcdaSubInfo* add_add_sub(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SDpcdaSubInfo >& add_sub() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SDpcdaSubInfo >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SDpcdaSubInfo >* mutable_add_sub(); - // repeated .kbd_idlfile.SDpcdaSubInfo del_sub = 2; + // repeated .iot_idl.SDpcdaSubInfo del_sub = 2; inline int del_sub_size() const; inline void clear_del_sub(); static const int kDelSubFieldNumber = 2; - inline const ::kbd_idlfile::SDpcdaSubInfo& del_sub(int index) const; - inline ::kbd_idlfile::SDpcdaSubInfo* mutable_del_sub(int index); - inline ::kbd_idlfile::SDpcdaSubInfo* add_del_sub(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SDpcdaSubInfo >& + inline const ::iot_idl::SDpcdaSubInfo& del_sub(int index) const; + inline ::iot_idl::SDpcdaSubInfo* mutable_del_sub(int index); + inline ::iot_idl::SDpcdaSubInfo* add_del_sub(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SDpcdaSubInfo >& del_sub() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SDpcdaSubInfo >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SDpcdaSubInfo >* mutable_del_sub(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SDpcdaSubPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SDpcdaSubPkg) private: ::google::protobuf::UnknownFieldSet _unknown_fields_; ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SDpcdaSubInfo > add_sub_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SDpcdaSubInfo > del_sub_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SDpcdaSubInfo > add_sub_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SDpcdaSubInfo > del_sub_; friend void IDL_FILES_EXPORT protobuf_AddDesc_DataProcMessage_2eproto(); friend void protobuf_AssignDesc_DataProcMessage_2eproto(); friend void protobuf_ShutdownFile_DataProcMessage_2eproto(); @@ -384,7 +384,7 @@ class IDL_FILES_EXPORT SPointMsg : public ::google::protobuf::Message { inline ::std::string* release_scolumn(); inline void set_allocated_scolumn(::std::string* scolumn); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SPointMsg) + // @@protoc_insertion_point(class_scope:iot_idl.SPointMsg) private: inline void set_has_ndominid(); inline void clear_has_ndominid(); @@ -468,26 +468,26 @@ class IDL_FILES_EXPORT SPointMsgPackage : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // repeated .kbd_idlfile.SPointMsg PointMsg = 1; + // repeated .iot_idl.SPointMsg PointMsg = 1; inline int pointmsg_size() const; inline void clear_pointmsg(); static const int kPointMsgFieldNumber = 1; - inline const ::kbd_idlfile::SPointMsg& pointmsg(int index) const; - inline ::kbd_idlfile::SPointMsg* mutable_pointmsg(int index); - inline ::kbd_idlfile::SPointMsg* add_pointmsg(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SPointMsg >& + inline const ::iot_idl::SPointMsg& pointmsg(int index) const; + inline ::iot_idl::SPointMsg* mutable_pointmsg(int index); + inline ::iot_idl::SPointMsg* add_pointmsg(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SPointMsg >& pointmsg() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SPointMsg >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SPointMsg >* mutable_pointmsg(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SPointMsgPackage) + // @@protoc_insertion_point(class_scope:iot_idl.SPointMsgPackage) private: ::google::protobuf::UnknownFieldSet _unknown_fields_; ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SPointMsg > pointmsg_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SPointMsg > pointmsg_; friend void IDL_FILES_EXPORT protobuf_AddDesc_DataProcMessage_2eproto(); friend void protobuf_AssignDesc_DataProcMessage_2eproto(); friend void protobuf_ShutdownFile_DataProcMessage_2eproto(); @@ -569,7 +569,7 @@ class IDL_FILES_EXPORT SRealTimePkgHead : public ::google::protobuf::Message { inline ::google::protobuf::int64 ntimestamp() const; inline void set_ntimestamp(::google::protobuf::int64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SRealTimePkgHead) + // @@protoc_insertion_point(class_scope:iot_idl.SRealTimePkgHead) private: inline void set_has_strsrctag(); inline void clear_has_strsrctag(); @@ -708,7 +708,7 @@ class IDL_FILES_EXPORT SAiRealTimeData : public ::google::protobuf::Message { inline ::google::protobuf::uint32 ustatus() const; inline void set_ustatus(::google::protobuf::uint32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SAiRealTimeData) + // @@protoc_insertion_point(class_scope:iot_idl.SAiRealTimeData) private: inline void set_has_nlocation(); inline void clear_has_nlocation(); @@ -862,7 +862,7 @@ class IDL_FILES_EXPORT SPiRealTimeData : public ::google::protobuf::Message { inline ::google::protobuf::uint32 ustatus() const; inline void set_ustatus(::google::protobuf::uint32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SPiRealTimeData) + // @@protoc_insertion_point(class_scope:iot_idl.SPiRealTimeData) private: inline void set_has_nlocation(); inline void clear_has_nlocation(); @@ -1016,7 +1016,7 @@ class IDL_FILES_EXPORT SDiRealTimeData : public ::google::protobuf::Message { inline ::google::protobuf::uint32 ustatus() const; inline void set_ustatus(::google::protobuf::uint32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SDiRealTimeData) + // @@protoc_insertion_point(class_scope:iot_idl.SDiRealTimeData) private: inline void set_has_nlocation(); inline void clear_has_nlocation(); @@ -1170,7 +1170,7 @@ class IDL_FILES_EXPORT SMiRealTimeData : public ::google::protobuf::Message { inline ::google::protobuf::uint32 ustatus() const; inline void set_ustatus(::google::protobuf::uint32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SMiRealTimeData) + // @@protoc_insertion_point(class_scope:iot_idl.SMiRealTimeData) private: inline void set_has_nlocation(); inline void clear_has_nlocation(); @@ -1310,16 +1310,16 @@ class IDL_FILES_EXPORT STableRealTimeData : public ::google::protobuf::Message { inline ::google::protobuf::int32 nsubsystem() const; inline void set_nsubsystem(::google::protobuf::int32 value); - // required .kbd_idlfile.SVariable varValue = 6; + // required .iot_idl.SVariable varValue = 6; inline bool has_varvalue() const; inline void clear_varvalue(); static const int kVarValueFieldNumber = 6; - inline const ::kbd_idlfile::SVariable& varvalue() const; - inline ::kbd_idlfile::SVariable* mutable_varvalue(); - inline ::kbd_idlfile::SVariable* release_varvalue(); - inline void set_allocated_varvalue(::kbd_idlfile::SVariable* varvalue); + inline const ::iot_idl::SVariable& varvalue() const; + inline ::iot_idl::SVariable* mutable_varvalue(); + inline ::iot_idl::SVariable* release_varvalue(); + inline void set_allocated_varvalue(::iot_idl::SVariable* varvalue); - // @@protoc_insertion_point(class_scope:kbd_idlfile.STableRealTimeData) + // @@protoc_insertion_point(class_scope:iot_idl.STableRealTimeData) private: inline void set_has_strtablename(); inline void clear_has_strtablename(); @@ -1343,7 +1343,7 @@ class IDL_FILES_EXPORT STableRealTimeData : public ::google::protobuf::Message { ::std::string* strcolumnname_; ::google::protobuf::int32 nlocation_; ::google::protobuf::int32 nsubsystem_; - ::kbd_idlfile::SVariable* varvalue_; + ::iot_idl::SVariable* varvalue_; friend void IDL_FILES_EXPORT protobuf_AddDesc_DataProcMessage_2eproto(); friend void protobuf_AssignDesc_DataProcMessage_2eproto(); friend void protobuf_ShutdownFile_DataProcMessage_2eproto(); @@ -1406,76 +1406,76 @@ class IDL_FILES_EXPORT SRealTimeDataPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SRealTimePkgHead stHead = 1; + // required .iot_idl.SRealTimePkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SRealTimePkgHead& sthead() const; - inline ::kbd_idlfile::SRealTimePkgHead* mutable_sthead(); - inline ::kbd_idlfile::SRealTimePkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SRealTimePkgHead* sthead); + inline const ::iot_idl::SRealTimePkgHead& sthead() const; + inline ::iot_idl::SRealTimePkgHead* mutable_sthead(); + inline ::iot_idl::SRealTimePkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SRealTimePkgHead* sthead); - // repeated .kbd_idlfile.SAiRealTimeData stAiRtd = 2; + // repeated .iot_idl.SAiRealTimeData stAiRtd = 2; inline int stairtd_size() const; inline void clear_stairtd(); static const int kStAiRtdFieldNumber = 2; - inline const ::kbd_idlfile::SAiRealTimeData& stairtd(int index) const; - inline ::kbd_idlfile::SAiRealTimeData* mutable_stairtd(int index); - inline ::kbd_idlfile::SAiRealTimeData* add_stairtd(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAiRealTimeData >& + inline const ::iot_idl::SAiRealTimeData& stairtd(int index) const; + inline ::iot_idl::SAiRealTimeData* mutable_stairtd(int index); + inline ::iot_idl::SAiRealTimeData* add_stairtd(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SAiRealTimeData >& stairtd() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAiRealTimeData >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SAiRealTimeData >* mutable_stairtd(); - // repeated .kbd_idlfile.SPiRealTimeData stPiRtd = 3; + // repeated .iot_idl.SPiRealTimeData stPiRtd = 3; inline int stpirtd_size() const; inline void clear_stpirtd(); static const int kStPiRtdFieldNumber = 3; - inline const ::kbd_idlfile::SPiRealTimeData& stpirtd(int index) const; - inline ::kbd_idlfile::SPiRealTimeData* mutable_stpirtd(int index); - inline ::kbd_idlfile::SPiRealTimeData* add_stpirtd(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SPiRealTimeData >& + inline const ::iot_idl::SPiRealTimeData& stpirtd(int index) const; + inline ::iot_idl::SPiRealTimeData* mutable_stpirtd(int index); + inline ::iot_idl::SPiRealTimeData* add_stpirtd(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SPiRealTimeData >& stpirtd() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SPiRealTimeData >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SPiRealTimeData >* mutable_stpirtd(); - // repeated .kbd_idlfile.SDiRealTimeData stDiRtd = 4; + // repeated .iot_idl.SDiRealTimeData stDiRtd = 4; inline int stdirtd_size() const; inline void clear_stdirtd(); static const int kStDiRtdFieldNumber = 4; - inline const ::kbd_idlfile::SDiRealTimeData& stdirtd(int index) const; - inline ::kbd_idlfile::SDiRealTimeData* mutable_stdirtd(int index); - inline ::kbd_idlfile::SDiRealTimeData* add_stdirtd(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SDiRealTimeData >& + inline const ::iot_idl::SDiRealTimeData& stdirtd(int index) const; + inline ::iot_idl::SDiRealTimeData* mutable_stdirtd(int index); + inline ::iot_idl::SDiRealTimeData* add_stdirtd(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SDiRealTimeData >& stdirtd() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SDiRealTimeData >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SDiRealTimeData >* mutable_stdirtd(); - // repeated .kbd_idlfile.SMiRealTimeData stMiRtd = 5; + // repeated .iot_idl.SMiRealTimeData stMiRtd = 5; inline int stmirtd_size() const; inline void clear_stmirtd(); static const int kStMiRtdFieldNumber = 5; - inline const ::kbd_idlfile::SMiRealTimeData& stmirtd(int index) const; - inline ::kbd_idlfile::SMiRealTimeData* mutable_stmirtd(int index); - inline ::kbd_idlfile::SMiRealTimeData* add_stmirtd(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SMiRealTimeData >& + inline const ::iot_idl::SMiRealTimeData& stmirtd(int index) const; + inline ::iot_idl::SMiRealTimeData* mutable_stmirtd(int index); + inline ::iot_idl::SMiRealTimeData* add_stmirtd(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SMiRealTimeData >& stmirtd() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SMiRealTimeData >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SMiRealTimeData >* mutable_stmirtd(); - // repeated .kbd_idlfile.STableRealTimeData stTblRtd = 6; + // repeated .iot_idl.STableRealTimeData stTblRtd = 6; inline int sttblrtd_size() const; inline void clear_sttblrtd(); static const int kStTblRtdFieldNumber = 6; - inline const ::kbd_idlfile::STableRealTimeData& sttblrtd(int index) const; - inline ::kbd_idlfile::STableRealTimeData* mutable_sttblrtd(int index); - inline ::kbd_idlfile::STableRealTimeData* add_sttblrtd(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::STableRealTimeData >& + inline const ::iot_idl::STableRealTimeData& sttblrtd(int index) const; + inline ::iot_idl::STableRealTimeData* mutable_sttblrtd(int index); + inline ::iot_idl::STableRealTimeData* add_sttblrtd(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::STableRealTimeData >& sttblrtd() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::STableRealTimeData >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::STableRealTimeData >* mutable_sttblrtd(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SRealTimeDataPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SRealTimeDataPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -1484,12 +1484,12 @@ class IDL_FILES_EXPORT SRealTimeDataPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SRealTimePkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAiRealTimeData > stairtd_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SPiRealTimeData > stpirtd_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SDiRealTimeData > stdirtd_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SMiRealTimeData > stmirtd_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::STableRealTimeData > sttblrtd_; + ::iot_idl::SRealTimePkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SAiRealTimeData > stairtd_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SPiRealTimeData > stpirtd_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SDiRealTimeData > stdirtd_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SMiRealTimeData > stmirtd_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::STableRealTimeData > sttblrtd_; friend void IDL_FILES_EXPORT protobuf_AddDesc_DataProcMessage_2eproto(); friend void protobuf_AssignDesc_DataProcMessage_2eproto(); friend void protobuf_ShutdownFile_DataProcMessage_2eproto(); @@ -1521,7 +1521,7 @@ inline void SDpcdaSubInfo::clear_tab_name() { clear_has_tab_name(); } inline const ::std::string& SDpcdaSubInfo::tab_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SDpcdaSubInfo.tab_name) + // @@protoc_insertion_point(field_get:iot_idl.SDpcdaSubInfo.tab_name) return *tab_name_; } inline void SDpcdaSubInfo::set_tab_name(const ::std::string& value) { @@ -1530,7 +1530,7 @@ inline void SDpcdaSubInfo::set_tab_name(const ::std::string& value) { tab_name_ = new ::std::string; } tab_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SDpcdaSubInfo.tab_name) + // @@protoc_insertion_point(field_set:iot_idl.SDpcdaSubInfo.tab_name) } inline void SDpcdaSubInfo::set_tab_name(const char* value) { set_has_tab_name(); @@ -1538,7 +1538,7 @@ inline void SDpcdaSubInfo::set_tab_name(const char* value) { tab_name_ = new ::std::string; } tab_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SDpcdaSubInfo.tab_name) + // @@protoc_insertion_point(field_set_char:iot_idl.SDpcdaSubInfo.tab_name) } inline void SDpcdaSubInfo::set_tab_name(const char* value, size_t size) { set_has_tab_name(); @@ -1546,14 +1546,14 @@ inline void SDpcdaSubInfo::set_tab_name(const char* value, size_t size) { tab_name_ = new ::std::string; } tab_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SDpcdaSubInfo.tab_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SDpcdaSubInfo.tab_name) } inline ::std::string* SDpcdaSubInfo::mutable_tab_name() { set_has_tab_name(); if (tab_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { tab_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SDpcdaSubInfo.tab_name) + // @@protoc_insertion_point(field_mutable:iot_idl.SDpcdaSubInfo.tab_name) return tab_name_; } inline ::std::string* SDpcdaSubInfo::release_tab_name() { @@ -1577,7 +1577,7 @@ inline void SDpcdaSubInfo::set_allocated_tab_name(::std::string* tab_name) { clear_has_tab_name(); tab_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SDpcdaSubInfo.tab_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SDpcdaSubInfo.tab_name) } // required string tag_name = 2; @@ -1597,7 +1597,7 @@ inline void SDpcdaSubInfo::clear_tag_name() { clear_has_tag_name(); } inline const ::std::string& SDpcdaSubInfo::tag_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SDpcdaSubInfo.tag_name) + // @@protoc_insertion_point(field_get:iot_idl.SDpcdaSubInfo.tag_name) return *tag_name_; } inline void SDpcdaSubInfo::set_tag_name(const ::std::string& value) { @@ -1606,7 +1606,7 @@ inline void SDpcdaSubInfo::set_tag_name(const ::std::string& value) { tag_name_ = new ::std::string; } tag_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SDpcdaSubInfo.tag_name) + // @@protoc_insertion_point(field_set:iot_idl.SDpcdaSubInfo.tag_name) } inline void SDpcdaSubInfo::set_tag_name(const char* value) { set_has_tag_name(); @@ -1614,7 +1614,7 @@ inline void SDpcdaSubInfo::set_tag_name(const char* value) { tag_name_ = new ::std::string; } tag_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SDpcdaSubInfo.tag_name) + // @@protoc_insertion_point(field_set_char:iot_idl.SDpcdaSubInfo.tag_name) } inline void SDpcdaSubInfo::set_tag_name(const char* value, size_t size) { set_has_tag_name(); @@ -1622,14 +1622,14 @@ inline void SDpcdaSubInfo::set_tag_name(const char* value, size_t size) { tag_name_ = new ::std::string; } tag_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SDpcdaSubInfo.tag_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SDpcdaSubInfo.tag_name) } inline ::std::string* SDpcdaSubInfo::mutable_tag_name() { set_has_tag_name(); if (tag_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { tag_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SDpcdaSubInfo.tag_name) + // @@protoc_insertion_point(field_mutable:iot_idl.SDpcdaSubInfo.tag_name) return tag_name_; } inline ::std::string* SDpcdaSubInfo::release_tag_name() { @@ -1653,7 +1653,7 @@ inline void SDpcdaSubInfo::set_allocated_tag_name(::std::string* tag_name) { clear_has_tag_name(); tag_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SDpcdaSubInfo.tag_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SDpcdaSubInfo.tag_name) } // required string col_name = 3; @@ -1673,7 +1673,7 @@ inline void SDpcdaSubInfo::clear_col_name() { clear_has_col_name(); } inline const ::std::string& SDpcdaSubInfo::col_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SDpcdaSubInfo.col_name) + // @@protoc_insertion_point(field_get:iot_idl.SDpcdaSubInfo.col_name) return *col_name_; } inline void SDpcdaSubInfo::set_col_name(const ::std::string& value) { @@ -1682,7 +1682,7 @@ inline void SDpcdaSubInfo::set_col_name(const ::std::string& value) { col_name_ = new ::std::string; } col_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SDpcdaSubInfo.col_name) + // @@protoc_insertion_point(field_set:iot_idl.SDpcdaSubInfo.col_name) } inline void SDpcdaSubInfo::set_col_name(const char* value) { set_has_col_name(); @@ -1690,7 +1690,7 @@ inline void SDpcdaSubInfo::set_col_name(const char* value) { col_name_ = new ::std::string; } col_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SDpcdaSubInfo.col_name) + // @@protoc_insertion_point(field_set_char:iot_idl.SDpcdaSubInfo.col_name) } inline void SDpcdaSubInfo::set_col_name(const char* value, size_t size) { set_has_col_name(); @@ -1698,14 +1698,14 @@ inline void SDpcdaSubInfo::set_col_name(const char* value, size_t size) { col_name_ = new ::std::string; } col_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SDpcdaSubInfo.col_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SDpcdaSubInfo.col_name) } inline ::std::string* SDpcdaSubInfo::mutable_col_name() { set_has_col_name(); if (col_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { col_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SDpcdaSubInfo.col_name) + // @@protoc_insertion_point(field_mutable:iot_idl.SDpcdaSubInfo.col_name) return col_name_; } inline ::std::string* SDpcdaSubInfo::release_col_name() { @@ -1729,70 +1729,70 @@ inline void SDpcdaSubInfo::set_allocated_col_name(::std::string* col_name) { clear_has_col_name(); col_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SDpcdaSubInfo.col_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SDpcdaSubInfo.col_name) } // ------------------------------------------------------------------- // SDpcdaSubPkg -// repeated .kbd_idlfile.SDpcdaSubInfo add_sub = 1; +// repeated .iot_idl.SDpcdaSubInfo add_sub = 1; inline int SDpcdaSubPkg::add_sub_size() const { return add_sub_.size(); } inline void SDpcdaSubPkg::clear_add_sub() { add_sub_.Clear(); } -inline const ::kbd_idlfile::SDpcdaSubInfo& SDpcdaSubPkg::add_sub(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SDpcdaSubPkg.add_sub) +inline const ::iot_idl::SDpcdaSubInfo& SDpcdaSubPkg::add_sub(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SDpcdaSubPkg.add_sub) return add_sub_.Get(index); } -inline ::kbd_idlfile::SDpcdaSubInfo* SDpcdaSubPkg::mutable_add_sub(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SDpcdaSubPkg.add_sub) +inline ::iot_idl::SDpcdaSubInfo* SDpcdaSubPkg::mutable_add_sub(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SDpcdaSubPkg.add_sub) return add_sub_.Mutable(index); } -inline ::kbd_idlfile::SDpcdaSubInfo* SDpcdaSubPkg::add_add_sub() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SDpcdaSubPkg.add_sub) +inline ::iot_idl::SDpcdaSubInfo* SDpcdaSubPkg::add_add_sub() { + // @@protoc_insertion_point(field_add:iot_idl.SDpcdaSubPkg.add_sub) return add_sub_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SDpcdaSubInfo >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SDpcdaSubInfo >& SDpcdaSubPkg::add_sub() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SDpcdaSubPkg.add_sub) + // @@protoc_insertion_point(field_list:iot_idl.SDpcdaSubPkg.add_sub) return add_sub_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SDpcdaSubInfo >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SDpcdaSubInfo >* SDpcdaSubPkg::mutable_add_sub() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SDpcdaSubPkg.add_sub) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SDpcdaSubPkg.add_sub) return &add_sub_; } -// repeated .kbd_idlfile.SDpcdaSubInfo del_sub = 2; +// repeated .iot_idl.SDpcdaSubInfo del_sub = 2; inline int SDpcdaSubPkg::del_sub_size() const { return del_sub_.size(); } inline void SDpcdaSubPkg::clear_del_sub() { del_sub_.Clear(); } -inline const ::kbd_idlfile::SDpcdaSubInfo& SDpcdaSubPkg::del_sub(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SDpcdaSubPkg.del_sub) +inline const ::iot_idl::SDpcdaSubInfo& SDpcdaSubPkg::del_sub(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SDpcdaSubPkg.del_sub) return del_sub_.Get(index); } -inline ::kbd_idlfile::SDpcdaSubInfo* SDpcdaSubPkg::mutable_del_sub(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SDpcdaSubPkg.del_sub) +inline ::iot_idl::SDpcdaSubInfo* SDpcdaSubPkg::mutable_del_sub(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SDpcdaSubPkg.del_sub) return del_sub_.Mutable(index); } -inline ::kbd_idlfile::SDpcdaSubInfo* SDpcdaSubPkg::add_del_sub() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SDpcdaSubPkg.del_sub) +inline ::iot_idl::SDpcdaSubInfo* SDpcdaSubPkg::add_del_sub() { + // @@protoc_insertion_point(field_add:iot_idl.SDpcdaSubPkg.del_sub) return del_sub_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SDpcdaSubInfo >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SDpcdaSubInfo >& SDpcdaSubPkg::del_sub() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SDpcdaSubPkg.del_sub) + // @@protoc_insertion_point(field_list:iot_idl.SDpcdaSubPkg.del_sub) return del_sub_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SDpcdaSubInfo >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SDpcdaSubInfo >* SDpcdaSubPkg::mutable_del_sub() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SDpcdaSubPkg.del_sub) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SDpcdaSubPkg.del_sub) return &del_sub_; } @@ -1815,13 +1815,13 @@ inline void SPointMsg::clear_ndominid() { clear_has_ndominid(); } inline ::google::protobuf::int32 SPointMsg::ndominid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SPointMsg.nDominId) + // @@protoc_insertion_point(field_get:iot_idl.SPointMsg.nDominId) return ndominid_; } inline void SPointMsg::set_ndominid(::google::protobuf::int32 value) { set_has_ndominid(); ndominid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SPointMsg.nDominId) + // @@protoc_insertion_point(field_set:iot_idl.SPointMsg.nDominId) } // required int32 nAppId = 2; @@ -1839,13 +1839,13 @@ inline void SPointMsg::clear_nappid() { clear_has_nappid(); } inline ::google::protobuf::int32 SPointMsg::nappid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SPointMsg.nAppId) + // @@protoc_insertion_point(field_get:iot_idl.SPointMsg.nAppId) return nappid_; } inline void SPointMsg::set_nappid(::google::protobuf::int32 value) { set_has_nappid(); nappid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SPointMsg.nAppId) + // @@protoc_insertion_point(field_set:iot_idl.SPointMsg.nAppId) } // required string sTable = 3; @@ -1865,7 +1865,7 @@ inline void SPointMsg::clear_stable() { clear_has_stable(); } inline const ::std::string& SPointMsg::stable() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SPointMsg.sTable) + // @@protoc_insertion_point(field_get:iot_idl.SPointMsg.sTable) return *stable_; } inline void SPointMsg::set_stable(const ::std::string& value) { @@ -1874,7 +1874,7 @@ inline void SPointMsg::set_stable(const ::std::string& value) { stable_ = new ::std::string; } stable_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SPointMsg.sTable) + // @@protoc_insertion_point(field_set:iot_idl.SPointMsg.sTable) } inline void SPointMsg::set_stable(const char* value) { set_has_stable(); @@ -1882,7 +1882,7 @@ inline void SPointMsg::set_stable(const char* value) { stable_ = new ::std::string; } stable_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SPointMsg.sTable) + // @@protoc_insertion_point(field_set_char:iot_idl.SPointMsg.sTable) } inline void SPointMsg::set_stable(const char* value, size_t size) { set_has_stable(); @@ -1890,14 +1890,14 @@ inline void SPointMsg::set_stable(const char* value, size_t size) { stable_ = new ::std::string; } stable_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SPointMsg.sTable) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SPointMsg.sTable) } inline ::std::string* SPointMsg::mutable_stable() { set_has_stable(); if (stable_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { stable_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SPointMsg.sTable) + // @@protoc_insertion_point(field_mutable:iot_idl.SPointMsg.sTable) return stable_; } inline ::std::string* SPointMsg::release_stable() { @@ -1921,7 +1921,7 @@ inline void SPointMsg::set_allocated_stable(::std::string* stable) { clear_has_stable(); stable_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SPointMsg.sTable) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SPointMsg.sTable) } // required string sKey = 4; @@ -1941,7 +1941,7 @@ inline void SPointMsg::clear_skey() { clear_has_skey(); } inline const ::std::string& SPointMsg::skey() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SPointMsg.sKey) + // @@protoc_insertion_point(field_get:iot_idl.SPointMsg.sKey) return *skey_; } inline void SPointMsg::set_skey(const ::std::string& value) { @@ -1950,7 +1950,7 @@ inline void SPointMsg::set_skey(const ::std::string& value) { skey_ = new ::std::string; } skey_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SPointMsg.sKey) + // @@protoc_insertion_point(field_set:iot_idl.SPointMsg.sKey) } inline void SPointMsg::set_skey(const char* value) { set_has_skey(); @@ -1958,7 +1958,7 @@ inline void SPointMsg::set_skey(const char* value) { skey_ = new ::std::string; } skey_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SPointMsg.sKey) + // @@protoc_insertion_point(field_set_char:iot_idl.SPointMsg.sKey) } inline void SPointMsg::set_skey(const char* value, size_t size) { set_has_skey(); @@ -1966,14 +1966,14 @@ inline void SPointMsg::set_skey(const char* value, size_t size) { skey_ = new ::std::string; } skey_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SPointMsg.sKey) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SPointMsg.sKey) } inline ::std::string* SPointMsg::mutable_skey() { set_has_skey(); if (skey_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { skey_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SPointMsg.sKey) + // @@protoc_insertion_point(field_mutable:iot_idl.SPointMsg.sKey) return skey_; } inline ::std::string* SPointMsg::release_skey() { @@ -1997,7 +1997,7 @@ inline void SPointMsg::set_allocated_skey(::std::string* skey) { clear_has_skey(); skey_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SPointMsg.sKey) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SPointMsg.sKey) } // required string sColumn = 5; @@ -2017,7 +2017,7 @@ inline void SPointMsg::clear_scolumn() { clear_has_scolumn(); } inline const ::std::string& SPointMsg::scolumn() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SPointMsg.sColumn) + // @@protoc_insertion_point(field_get:iot_idl.SPointMsg.sColumn) return *scolumn_; } inline void SPointMsg::set_scolumn(const ::std::string& value) { @@ -2026,7 +2026,7 @@ inline void SPointMsg::set_scolumn(const ::std::string& value) { scolumn_ = new ::std::string; } scolumn_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SPointMsg.sColumn) + // @@protoc_insertion_point(field_set:iot_idl.SPointMsg.sColumn) } inline void SPointMsg::set_scolumn(const char* value) { set_has_scolumn(); @@ -2034,7 +2034,7 @@ inline void SPointMsg::set_scolumn(const char* value) { scolumn_ = new ::std::string; } scolumn_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SPointMsg.sColumn) + // @@protoc_insertion_point(field_set_char:iot_idl.SPointMsg.sColumn) } inline void SPointMsg::set_scolumn(const char* value, size_t size) { set_has_scolumn(); @@ -2042,14 +2042,14 @@ inline void SPointMsg::set_scolumn(const char* value, size_t size) { scolumn_ = new ::std::string; } scolumn_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SPointMsg.sColumn) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SPointMsg.sColumn) } inline ::std::string* SPointMsg::mutable_scolumn() { set_has_scolumn(); if (scolumn_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { scolumn_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SPointMsg.sColumn) + // @@protoc_insertion_point(field_mutable:iot_idl.SPointMsg.sColumn) return scolumn_; } inline ::std::string* SPointMsg::release_scolumn() { @@ -2073,40 +2073,40 @@ inline void SPointMsg::set_allocated_scolumn(::std::string* scolumn) { clear_has_scolumn(); scolumn_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SPointMsg.sColumn) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SPointMsg.sColumn) } // ------------------------------------------------------------------- // SPointMsgPackage -// repeated .kbd_idlfile.SPointMsg PointMsg = 1; +// repeated .iot_idl.SPointMsg PointMsg = 1; inline int SPointMsgPackage::pointmsg_size() const { return pointmsg_.size(); } inline void SPointMsgPackage::clear_pointmsg() { pointmsg_.Clear(); } -inline const ::kbd_idlfile::SPointMsg& SPointMsgPackage::pointmsg(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SPointMsgPackage.PointMsg) +inline const ::iot_idl::SPointMsg& SPointMsgPackage::pointmsg(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SPointMsgPackage.PointMsg) return pointmsg_.Get(index); } -inline ::kbd_idlfile::SPointMsg* SPointMsgPackage::mutable_pointmsg(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SPointMsgPackage.PointMsg) +inline ::iot_idl::SPointMsg* SPointMsgPackage::mutable_pointmsg(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SPointMsgPackage.PointMsg) return pointmsg_.Mutable(index); } -inline ::kbd_idlfile::SPointMsg* SPointMsgPackage::add_pointmsg() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SPointMsgPackage.PointMsg) +inline ::iot_idl::SPointMsg* SPointMsgPackage::add_pointmsg() { + // @@protoc_insertion_point(field_add:iot_idl.SPointMsgPackage.PointMsg) return pointmsg_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SPointMsg >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SPointMsg >& SPointMsgPackage::pointmsg() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SPointMsgPackage.PointMsg) + // @@protoc_insertion_point(field_list:iot_idl.SPointMsgPackage.PointMsg) return pointmsg_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SPointMsg >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SPointMsg >* SPointMsgPackage::mutable_pointmsg() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SPointMsgPackage.PointMsg) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SPointMsgPackage.PointMsg) return &pointmsg_; } @@ -2131,7 +2131,7 @@ inline void SRealTimePkgHead::clear_strsrctag() { clear_has_strsrctag(); } inline const ::std::string& SRealTimePkgHead::strsrctag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRealTimePkgHead.strSrcTag) + // @@protoc_insertion_point(field_get:iot_idl.SRealTimePkgHead.strSrcTag) return *strsrctag_; } inline void SRealTimePkgHead::set_strsrctag(const ::std::string& value) { @@ -2140,7 +2140,7 @@ inline void SRealTimePkgHead::set_strsrctag(const ::std::string& value) { strsrctag_ = new ::std::string; } strsrctag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SRealTimePkgHead.strSrcTag) + // @@protoc_insertion_point(field_set:iot_idl.SRealTimePkgHead.strSrcTag) } inline void SRealTimePkgHead::set_strsrctag(const char* value) { set_has_strsrctag(); @@ -2148,7 +2148,7 @@ inline void SRealTimePkgHead::set_strsrctag(const char* value) { strsrctag_ = new ::std::string; } strsrctag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SRealTimePkgHead.strSrcTag) + // @@protoc_insertion_point(field_set_char:iot_idl.SRealTimePkgHead.strSrcTag) } inline void SRealTimePkgHead::set_strsrctag(const char* value, size_t size) { set_has_strsrctag(); @@ -2156,14 +2156,14 @@ inline void SRealTimePkgHead::set_strsrctag(const char* value, size_t size) { strsrctag_ = new ::std::string; } strsrctag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SRealTimePkgHead.strSrcTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SRealTimePkgHead.strSrcTag) } inline ::std::string* SRealTimePkgHead::mutable_strsrctag() { set_has_strsrctag(); if (strsrctag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strsrctag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SRealTimePkgHead.strSrcTag) + // @@protoc_insertion_point(field_mutable:iot_idl.SRealTimePkgHead.strSrcTag) return strsrctag_; } inline ::std::string* SRealTimePkgHead::release_strsrctag() { @@ -2187,7 +2187,7 @@ inline void SRealTimePkgHead::set_allocated_strsrctag(::std::string* strsrctag) clear_has_strsrctag(); strsrctag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SRealTimePkgHead.strSrcTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SRealTimePkgHead.strSrcTag) } // required int64 nTimeStamp = 2; @@ -2205,13 +2205,13 @@ inline void SRealTimePkgHead::clear_ntimestamp() { clear_has_ntimestamp(); } inline ::google::protobuf::int64 SRealTimePkgHead::ntimestamp() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRealTimePkgHead.nTimeStamp) + // @@protoc_insertion_point(field_get:iot_idl.SRealTimePkgHead.nTimeStamp) return ntimestamp_; } inline void SRealTimePkgHead::set_ntimestamp(::google::protobuf::int64 value) { set_has_ntimestamp(); ntimestamp_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SRealTimePkgHead.nTimeStamp) + // @@protoc_insertion_point(field_set:iot_idl.SRealTimePkgHead.nTimeStamp) } // ------------------------------------------------------------------- @@ -2233,13 +2233,13 @@ inline void SAiRealTimeData::clear_nlocation() { clear_has_nlocation(); } inline ::google::protobuf::int32 SAiRealTimeData::nlocation() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAiRealTimeData.nLocation) + // @@protoc_insertion_point(field_get:iot_idl.SAiRealTimeData.nLocation) return nlocation_; } inline void SAiRealTimeData::set_nlocation(::google::protobuf::int32 value) { set_has_nlocation(); nlocation_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAiRealTimeData.nLocation) + // @@protoc_insertion_point(field_set:iot_idl.SAiRealTimeData.nLocation) } // required int32 nSubSystem = 2; @@ -2257,13 +2257,13 @@ inline void SAiRealTimeData::clear_nsubsystem() { clear_has_nsubsystem(); } inline ::google::protobuf::int32 SAiRealTimeData::nsubsystem() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAiRealTimeData.nSubSystem) + // @@protoc_insertion_point(field_get:iot_idl.SAiRealTimeData.nSubSystem) return nsubsystem_; } inline void SAiRealTimeData::set_nsubsystem(::google::protobuf::int32 value) { set_has_nsubsystem(); nsubsystem_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAiRealTimeData.nSubSystem) + // @@protoc_insertion_point(field_set:iot_idl.SAiRealTimeData.nSubSystem) } // required string strTableName = 3; @@ -2283,7 +2283,7 @@ inline void SAiRealTimeData::clear_strtablename() { clear_has_strtablename(); } inline const ::std::string& SAiRealTimeData::strtablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAiRealTimeData.strTableName) + // @@protoc_insertion_point(field_get:iot_idl.SAiRealTimeData.strTableName) return *strtablename_; } inline void SAiRealTimeData::set_strtablename(const ::std::string& value) { @@ -2292,7 +2292,7 @@ inline void SAiRealTimeData::set_strtablename(const ::std::string& value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAiRealTimeData.strTableName) + // @@protoc_insertion_point(field_set:iot_idl.SAiRealTimeData.strTableName) } inline void SAiRealTimeData::set_strtablename(const char* value) { set_has_strtablename(); @@ -2300,7 +2300,7 @@ inline void SAiRealTimeData::set_strtablename(const char* value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAiRealTimeData.strTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SAiRealTimeData.strTableName) } inline void SAiRealTimeData::set_strtablename(const char* value, size_t size) { set_has_strtablename(); @@ -2308,14 +2308,14 @@ inline void SAiRealTimeData::set_strtablename(const char* value, size_t size) { strtablename_ = new ::std::string; } strtablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAiRealTimeData.strTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAiRealTimeData.strTableName) } inline ::std::string* SAiRealTimeData::mutable_strtablename() { set_has_strtablename(); if (strtablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAiRealTimeData.strTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SAiRealTimeData.strTableName) return strtablename_; } inline ::std::string* SAiRealTimeData::release_strtablename() { @@ -2339,7 +2339,7 @@ inline void SAiRealTimeData::set_allocated_strtablename(::std::string* strtablen clear_has_strtablename(); strtablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAiRealTimeData.strTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAiRealTimeData.strTableName) } // required string strTagName = 4; @@ -2359,7 +2359,7 @@ inline void SAiRealTimeData::clear_strtagname() { clear_has_strtagname(); } inline const ::std::string& SAiRealTimeData::strtagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAiRealTimeData.strTagName) + // @@protoc_insertion_point(field_get:iot_idl.SAiRealTimeData.strTagName) return *strtagname_; } inline void SAiRealTimeData::set_strtagname(const ::std::string& value) { @@ -2368,7 +2368,7 @@ inline void SAiRealTimeData::set_strtagname(const ::std::string& value) { strtagname_ = new ::std::string; } strtagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAiRealTimeData.strTagName) + // @@protoc_insertion_point(field_set:iot_idl.SAiRealTimeData.strTagName) } inline void SAiRealTimeData::set_strtagname(const char* value) { set_has_strtagname(); @@ -2376,7 +2376,7 @@ inline void SAiRealTimeData::set_strtagname(const char* value) { strtagname_ = new ::std::string; } strtagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAiRealTimeData.strTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SAiRealTimeData.strTagName) } inline void SAiRealTimeData::set_strtagname(const char* value, size_t size) { set_has_strtagname(); @@ -2384,14 +2384,14 @@ inline void SAiRealTimeData::set_strtagname(const char* value, size_t size) { strtagname_ = new ::std::string; } strtagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAiRealTimeData.strTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAiRealTimeData.strTagName) } inline ::std::string* SAiRealTimeData::mutable_strtagname() { set_has_strtagname(); if (strtagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAiRealTimeData.strTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SAiRealTimeData.strTagName) return strtagname_; } inline ::std::string* SAiRealTimeData::release_strtagname() { @@ -2415,7 +2415,7 @@ inline void SAiRealTimeData::set_allocated_strtagname(::std::string* strtagname) clear_has_strtagname(); strtagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAiRealTimeData.strTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAiRealTimeData.strTagName) } // required string strColumnName = 5; @@ -2435,7 +2435,7 @@ inline void SAiRealTimeData::clear_strcolumnname() { clear_has_strcolumnname(); } inline const ::std::string& SAiRealTimeData::strcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SAiRealTimeData.strColumnName) return *strcolumnname_; } inline void SAiRealTimeData::set_strcolumnname(const ::std::string& value) { @@ -2444,7 +2444,7 @@ inline void SAiRealTimeData::set_strcolumnname(const ::std::string& value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SAiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SAiRealTimeData.strColumnName) } inline void SAiRealTimeData::set_strcolumnname(const char* value) { set_has_strcolumnname(); @@ -2452,7 +2452,7 @@ inline void SAiRealTimeData::set_strcolumnname(const char* value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SAiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SAiRealTimeData.strColumnName) } inline void SAiRealTimeData::set_strcolumnname(const char* value, size_t size) { set_has_strcolumnname(); @@ -2460,14 +2460,14 @@ inline void SAiRealTimeData::set_strcolumnname(const char* value, size_t size) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SAiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SAiRealTimeData.strColumnName) } inline ::std::string* SAiRealTimeData::mutable_strcolumnname() { set_has_strcolumnname(); if (strcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SAiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SAiRealTimeData.strColumnName) return strcolumnname_; } inline ::std::string* SAiRealTimeData::release_strcolumnname() { @@ -2491,7 +2491,7 @@ inline void SAiRealTimeData::set_allocated_strcolumnname(::std::string* strcolum clear_has_strcolumnname(); strcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SAiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SAiRealTimeData.strColumnName) } // required float fValue = 6; @@ -2509,13 +2509,13 @@ inline void SAiRealTimeData::clear_fvalue() { clear_has_fvalue(); } inline float SAiRealTimeData::fvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAiRealTimeData.fValue) + // @@protoc_insertion_point(field_get:iot_idl.SAiRealTimeData.fValue) return fvalue_; } inline void SAiRealTimeData::set_fvalue(float value) { set_has_fvalue(); fvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAiRealTimeData.fValue) + // @@protoc_insertion_point(field_set:iot_idl.SAiRealTimeData.fValue) } // required uint32 uStatus = 7; @@ -2533,13 +2533,13 @@ inline void SAiRealTimeData::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SAiRealTimeData::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAiRealTimeData.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SAiRealTimeData.uStatus) return ustatus_; } inline void SAiRealTimeData::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAiRealTimeData.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SAiRealTimeData.uStatus) } // ------------------------------------------------------------------- @@ -2561,13 +2561,13 @@ inline void SPiRealTimeData::clear_nlocation() { clear_has_nlocation(); } inline ::google::protobuf::int32 SPiRealTimeData::nlocation() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SPiRealTimeData.nLocation) + // @@protoc_insertion_point(field_get:iot_idl.SPiRealTimeData.nLocation) return nlocation_; } inline void SPiRealTimeData::set_nlocation(::google::protobuf::int32 value) { set_has_nlocation(); nlocation_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SPiRealTimeData.nLocation) + // @@protoc_insertion_point(field_set:iot_idl.SPiRealTimeData.nLocation) } // required int32 nSubSystem = 2; @@ -2585,13 +2585,13 @@ inline void SPiRealTimeData::clear_nsubsystem() { clear_has_nsubsystem(); } inline ::google::protobuf::int32 SPiRealTimeData::nsubsystem() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SPiRealTimeData.nSubSystem) + // @@protoc_insertion_point(field_get:iot_idl.SPiRealTimeData.nSubSystem) return nsubsystem_; } inline void SPiRealTimeData::set_nsubsystem(::google::protobuf::int32 value) { set_has_nsubsystem(); nsubsystem_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SPiRealTimeData.nSubSystem) + // @@protoc_insertion_point(field_set:iot_idl.SPiRealTimeData.nSubSystem) } // required string strTableName = 3; @@ -2611,7 +2611,7 @@ inline void SPiRealTimeData::clear_strtablename() { clear_has_strtablename(); } inline const ::std::string& SPiRealTimeData::strtablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SPiRealTimeData.strTableName) + // @@protoc_insertion_point(field_get:iot_idl.SPiRealTimeData.strTableName) return *strtablename_; } inline void SPiRealTimeData::set_strtablename(const ::std::string& value) { @@ -2620,7 +2620,7 @@ inline void SPiRealTimeData::set_strtablename(const ::std::string& value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SPiRealTimeData.strTableName) + // @@protoc_insertion_point(field_set:iot_idl.SPiRealTimeData.strTableName) } inline void SPiRealTimeData::set_strtablename(const char* value) { set_has_strtablename(); @@ -2628,7 +2628,7 @@ inline void SPiRealTimeData::set_strtablename(const char* value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SPiRealTimeData.strTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SPiRealTimeData.strTableName) } inline void SPiRealTimeData::set_strtablename(const char* value, size_t size) { set_has_strtablename(); @@ -2636,14 +2636,14 @@ inline void SPiRealTimeData::set_strtablename(const char* value, size_t size) { strtablename_ = new ::std::string; } strtablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SPiRealTimeData.strTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SPiRealTimeData.strTableName) } inline ::std::string* SPiRealTimeData::mutable_strtablename() { set_has_strtablename(); if (strtablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SPiRealTimeData.strTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SPiRealTimeData.strTableName) return strtablename_; } inline ::std::string* SPiRealTimeData::release_strtablename() { @@ -2667,7 +2667,7 @@ inline void SPiRealTimeData::set_allocated_strtablename(::std::string* strtablen clear_has_strtablename(); strtablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SPiRealTimeData.strTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SPiRealTimeData.strTableName) } // required string strTagName = 4; @@ -2687,7 +2687,7 @@ inline void SPiRealTimeData::clear_strtagname() { clear_has_strtagname(); } inline const ::std::string& SPiRealTimeData::strtagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SPiRealTimeData.strTagName) + // @@protoc_insertion_point(field_get:iot_idl.SPiRealTimeData.strTagName) return *strtagname_; } inline void SPiRealTimeData::set_strtagname(const ::std::string& value) { @@ -2696,7 +2696,7 @@ inline void SPiRealTimeData::set_strtagname(const ::std::string& value) { strtagname_ = new ::std::string; } strtagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SPiRealTimeData.strTagName) + // @@protoc_insertion_point(field_set:iot_idl.SPiRealTimeData.strTagName) } inline void SPiRealTimeData::set_strtagname(const char* value) { set_has_strtagname(); @@ -2704,7 +2704,7 @@ inline void SPiRealTimeData::set_strtagname(const char* value) { strtagname_ = new ::std::string; } strtagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SPiRealTimeData.strTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SPiRealTimeData.strTagName) } inline void SPiRealTimeData::set_strtagname(const char* value, size_t size) { set_has_strtagname(); @@ -2712,14 +2712,14 @@ inline void SPiRealTimeData::set_strtagname(const char* value, size_t size) { strtagname_ = new ::std::string; } strtagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SPiRealTimeData.strTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SPiRealTimeData.strTagName) } inline ::std::string* SPiRealTimeData::mutable_strtagname() { set_has_strtagname(); if (strtagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SPiRealTimeData.strTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SPiRealTimeData.strTagName) return strtagname_; } inline ::std::string* SPiRealTimeData::release_strtagname() { @@ -2743,7 +2743,7 @@ inline void SPiRealTimeData::set_allocated_strtagname(::std::string* strtagname) clear_has_strtagname(); strtagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SPiRealTimeData.strTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SPiRealTimeData.strTagName) } // required string strColumnName = 5; @@ -2763,7 +2763,7 @@ inline void SPiRealTimeData::clear_strcolumnname() { clear_has_strcolumnname(); } inline const ::std::string& SPiRealTimeData::strcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SPiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SPiRealTimeData.strColumnName) return *strcolumnname_; } inline void SPiRealTimeData::set_strcolumnname(const ::std::string& value) { @@ -2772,7 +2772,7 @@ inline void SPiRealTimeData::set_strcolumnname(const ::std::string& value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SPiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SPiRealTimeData.strColumnName) } inline void SPiRealTimeData::set_strcolumnname(const char* value) { set_has_strcolumnname(); @@ -2780,7 +2780,7 @@ inline void SPiRealTimeData::set_strcolumnname(const char* value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SPiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SPiRealTimeData.strColumnName) } inline void SPiRealTimeData::set_strcolumnname(const char* value, size_t size) { set_has_strcolumnname(); @@ -2788,14 +2788,14 @@ inline void SPiRealTimeData::set_strcolumnname(const char* value, size_t size) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SPiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SPiRealTimeData.strColumnName) } inline ::std::string* SPiRealTimeData::mutable_strcolumnname() { set_has_strcolumnname(); if (strcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SPiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SPiRealTimeData.strColumnName) return strcolumnname_; } inline ::std::string* SPiRealTimeData::release_strcolumnname() { @@ -2819,7 +2819,7 @@ inline void SPiRealTimeData::set_allocated_strcolumnname(::std::string* strcolum clear_has_strcolumnname(); strcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SPiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SPiRealTimeData.strColumnName) } // required double dValue = 6; @@ -2837,13 +2837,13 @@ inline void SPiRealTimeData::clear_dvalue() { clear_has_dvalue(); } inline double SPiRealTimeData::dvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SPiRealTimeData.dValue) + // @@protoc_insertion_point(field_get:iot_idl.SPiRealTimeData.dValue) return dvalue_; } inline void SPiRealTimeData::set_dvalue(double value) { set_has_dvalue(); dvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SPiRealTimeData.dValue) + // @@protoc_insertion_point(field_set:iot_idl.SPiRealTimeData.dValue) } // required uint32 uStatus = 7; @@ -2861,13 +2861,13 @@ inline void SPiRealTimeData::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SPiRealTimeData::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SPiRealTimeData.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SPiRealTimeData.uStatus) return ustatus_; } inline void SPiRealTimeData::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SPiRealTimeData.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SPiRealTimeData.uStatus) } // ------------------------------------------------------------------- @@ -2889,13 +2889,13 @@ inline void SDiRealTimeData::clear_nlocation() { clear_has_nlocation(); } inline ::google::protobuf::int32 SDiRealTimeData::nlocation() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SDiRealTimeData.nLocation) + // @@protoc_insertion_point(field_get:iot_idl.SDiRealTimeData.nLocation) return nlocation_; } inline void SDiRealTimeData::set_nlocation(::google::protobuf::int32 value) { set_has_nlocation(); nlocation_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SDiRealTimeData.nLocation) + // @@protoc_insertion_point(field_set:iot_idl.SDiRealTimeData.nLocation) } // required int32 nSubSystem = 2; @@ -2913,13 +2913,13 @@ inline void SDiRealTimeData::clear_nsubsystem() { clear_has_nsubsystem(); } inline ::google::protobuf::int32 SDiRealTimeData::nsubsystem() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SDiRealTimeData.nSubSystem) + // @@protoc_insertion_point(field_get:iot_idl.SDiRealTimeData.nSubSystem) return nsubsystem_; } inline void SDiRealTimeData::set_nsubsystem(::google::protobuf::int32 value) { set_has_nsubsystem(); nsubsystem_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SDiRealTimeData.nSubSystem) + // @@protoc_insertion_point(field_set:iot_idl.SDiRealTimeData.nSubSystem) } // required string strTableName = 3; @@ -2939,7 +2939,7 @@ inline void SDiRealTimeData::clear_strtablename() { clear_has_strtablename(); } inline const ::std::string& SDiRealTimeData::strtablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SDiRealTimeData.strTableName) + // @@protoc_insertion_point(field_get:iot_idl.SDiRealTimeData.strTableName) return *strtablename_; } inline void SDiRealTimeData::set_strtablename(const ::std::string& value) { @@ -2948,7 +2948,7 @@ inline void SDiRealTimeData::set_strtablename(const ::std::string& value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SDiRealTimeData.strTableName) + // @@protoc_insertion_point(field_set:iot_idl.SDiRealTimeData.strTableName) } inline void SDiRealTimeData::set_strtablename(const char* value) { set_has_strtablename(); @@ -2956,7 +2956,7 @@ inline void SDiRealTimeData::set_strtablename(const char* value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SDiRealTimeData.strTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SDiRealTimeData.strTableName) } inline void SDiRealTimeData::set_strtablename(const char* value, size_t size) { set_has_strtablename(); @@ -2964,14 +2964,14 @@ inline void SDiRealTimeData::set_strtablename(const char* value, size_t size) { strtablename_ = new ::std::string; } strtablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SDiRealTimeData.strTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SDiRealTimeData.strTableName) } inline ::std::string* SDiRealTimeData::mutable_strtablename() { set_has_strtablename(); if (strtablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SDiRealTimeData.strTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SDiRealTimeData.strTableName) return strtablename_; } inline ::std::string* SDiRealTimeData::release_strtablename() { @@ -2995,7 +2995,7 @@ inline void SDiRealTimeData::set_allocated_strtablename(::std::string* strtablen clear_has_strtablename(); strtablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SDiRealTimeData.strTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SDiRealTimeData.strTableName) } // required string strTagName = 4; @@ -3015,7 +3015,7 @@ inline void SDiRealTimeData::clear_strtagname() { clear_has_strtagname(); } inline const ::std::string& SDiRealTimeData::strtagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SDiRealTimeData.strTagName) + // @@protoc_insertion_point(field_get:iot_idl.SDiRealTimeData.strTagName) return *strtagname_; } inline void SDiRealTimeData::set_strtagname(const ::std::string& value) { @@ -3024,7 +3024,7 @@ inline void SDiRealTimeData::set_strtagname(const ::std::string& value) { strtagname_ = new ::std::string; } strtagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SDiRealTimeData.strTagName) + // @@protoc_insertion_point(field_set:iot_idl.SDiRealTimeData.strTagName) } inline void SDiRealTimeData::set_strtagname(const char* value) { set_has_strtagname(); @@ -3032,7 +3032,7 @@ inline void SDiRealTimeData::set_strtagname(const char* value) { strtagname_ = new ::std::string; } strtagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SDiRealTimeData.strTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SDiRealTimeData.strTagName) } inline void SDiRealTimeData::set_strtagname(const char* value, size_t size) { set_has_strtagname(); @@ -3040,14 +3040,14 @@ inline void SDiRealTimeData::set_strtagname(const char* value, size_t size) { strtagname_ = new ::std::string; } strtagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SDiRealTimeData.strTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SDiRealTimeData.strTagName) } inline ::std::string* SDiRealTimeData::mutable_strtagname() { set_has_strtagname(); if (strtagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SDiRealTimeData.strTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SDiRealTimeData.strTagName) return strtagname_; } inline ::std::string* SDiRealTimeData::release_strtagname() { @@ -3071,7 +3071,7 @@ inline void SDiRealTimeData::set_allocated_strtagname(::std::string* strtagname) clear_has_strtagname(); strtagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SDiRealTimeData.strTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SDiRealTimeData.strTagName) } // required string strColumnName = 5; @@ -3091,7 +3091,7 @@ inline void SDiRealTimeData::clear_strcolumnname() { clear_has_strcolumnname(); } inline const ::std::string& SDiRealTimeData::strcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SDiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SDiRealTimeData.strColumnName) return *strcolumnname_; } inline void SDiRealTimeData::set_strcolumnname(const ::std::string& value) { @@ -3100,7 +3100,7 @@ inline void SDiRealTimeData::set_strcolumnname(const ::std::string& value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SDiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SDiRealTimeData.strColumnName) } inline void SDiRealTimeData::set_strcolumnname(const char* value) { set_has_strcolumnname(); @@ -3108,7 +3108,7 @@ inline void SDiRealTimeData::set_strcolumnname(const char* value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SDiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SDiRealTimeData.strColumnName) } inline void SDiRealTimeData::set_strcolumnname(const char* value, size_t size) { set_has_strcolumnname(); @@ -3116,14 +3116,14 @@ inline void SDiRealTimeData::set_strcolumnname(const char* value, size_t size) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SDiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SDiRealTimeData.strColumnName) } inline ::std::string* SDiRealTimeData::mutable_strcolumnname() { set_has_strcolumnname(); if (strcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SDiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SDiRealTimeData.strColumnName) return strcolumnname_; } inline ::std::string* SDiRealTimeData::release_strcolumnname() { @@ -3147,7 +3147,7 @@ inline void SDiRealTimeData::set_allocated_strcolumnname(::std::string* strcolum clear_has_strcolumnname(); strcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SDiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SDiRealTimeData.strColumnName) } // required int32 nValue = 6; @@ -3165,13 +3165,13 @@ inline void SDiRealTimeData::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int32 SDiRealTimeData::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SDiRealTimeData.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SDiRealTimeData.nValue) return nvalue_; } inline void SDiRealTimeData::set_nvalue(::google::protobuf::int32 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SDiRealTimeData.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SDiRealTimeData.nValue) } // required uint32 uStatus = 7; @@ -3189,13 +3189,13 @@ inline void SDiRealTimeData::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SDiRealTimeData::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SDiRealTimeData.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SDiRealTimeData.uStatus) return ustatus_; } inline void SDiRealTimeData::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SDiRealTimeData.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SDiRealTimeData.uStatus) } // ------------------------------------------------------------------- @@ -3217,13 +3217,13 @@ inline void SMiRealTimeData::clear_nlocation() { clear_has_nlocation(); } inline ::google::protobuf::int32 SMiRealTimeData::nlocation() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SMiRealTimeData.nLocation) + // @@protoc_insertion_point(field_get:iot_idl.SMiRealTimeData.nLocation) return nlocation_; } inline void SMiRealTimeData::set_nlocation(::google::protobuf::int32 value) { set_has_nlocation(); nlocation_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SMiRealTimeData.nLocation) + // @@protoc_insertion_point(field_set:iot_idl.SMiRealTimeData.nLocation) } // required int32 nSubSystem = 2; @@ -3241,13 +3241,13 @@ inline void SMiRealTimeData::clear_nsubsystem() { clear_has_nsubsystem(); } inline ::google::protobuf::int32 SMiRealTimeData::nsubsystem() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SMiRealTimeData.nSubSystem) + // @@protoc_insertion_point(field_get:iot_idl.SMiRealTimeData.nSubSystem) return nsubsystem_; } inline void SMiRealTimeData::set_nsubsystem(::google::protobuf::int32 value) { set_has_nsubsystem(); nsubsystem_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SMiRealTimeData.nSubSystem) + // @@protoc_insertion_point(field_set:iot_idl.SMiRealTimeData.nSubSystem) } // required string strTableName = 3; @@ -3267,7 +3267,7 @@ inline void SMiRealTimeData::clear_strtablename() { clear_has_strtablename(); } inline const ::std::string& SMiRealTimeData::strtablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SMiRealTimeData.strTableName) + // @@protoc_insertion_point(field_get:iot_idl.SMiRealTimeData.strTableName) return *strtablename_; } inline void SMiRealTimeData::set_strtablename(const ::std::string& value) { @@ -3276,7 +3276,7 @@ inline void SMiRealTimeData::set_strtablename(const ::std::string& value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SMiRealTimeData.strTableName) + // @@protoc_insertion_point(field_set:iot_idl.SMiRealTimeData.strTableName) } inline void SMiRealTimeData::set_strtablename(const char* value) { set_has_strtablename(); @@ -3284,7 +3284,7 @@ inline void SMiRealTimeData::set_strtablename(const char* value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SMiRealTimeData.strTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SMiRealTimeData.strTableName) } inline void SMiRealTimeData::set_strtablename(const char* value, size_t size) { set_has_strtablename(); @@ -3292,14 +3292,14 @@ inline void SMiRealTimeData::set_strtablename(const char* value, size_t size) { strtablename_ = new ::std::string; } strtablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SMiRealTimeData.strTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SMiRealTimeData.strTableName) } inline ::std::string* SMiRealTimeData::mutable_strtablename() { set_has_strtablename(); if (strtablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SMiRealTimeData.strTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SMiRealTimeData.strTableName) return strtablename_; } inline ::std::string* SMiRealTimeData::release_strtablename() { @@ -3323,7 +3323,7 @@ inline void SMiRealTimeData::set_allocated_strtablename(::std::string* strtablen clear_has_strtablename(); strtablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SMiRealTimeData.strTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SMiRealTimeData.strTableName) } // required string strTagName = 4; @@ -3343,7 +3343,7 @@ inline void SMiRealTimeData::clear_strtagname() { clear_has_strtagname(); } inline const ::std::string& SMiRealTimeData::strtagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SMiRealTimeData.strTagName) + // @@protoc_insertion_point(field_get:iot_idl.SMiRealTimeData.strTagName) return *strtagname_; } inline void SMiRealTimeData::set_strtagname(const ::std::string& value) { @@ -3352,7 +3352,7 @@ inline void SMiRealTimeData::set_strtagname(const ::std::string& value) { strtagname_ = new ::std::string; } strtagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SMiRealTimeData.strTagName) + // @@protoc_insertion_point(field_set:iot_idl.SMiRealTimeData.strTagName) } inline void SMiRealTimeData::set_strtagname(const char* value) { set_has_strtagname(); @@ -3360,7 +3360,7 @@ inline void SMiRealTimeData::set_strtagname(const char* value) { strtagname_ = new ::std::string; } strtagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SMiRealTimeData.strTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SMiRealTimeData.strTagName) } inline void SMiRealTimeData::set_strtagname(const char* value, size_t size) { set_has_strtagname(); @@ -3368,14 +3368,14 @@ inline void SMiRealTimeData::set_strtagname(const char* value, size_t size) { strtagname_ = new ::std::string; } strtagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SMiRealTimeData.strTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SMiRealTimeData.strTagName) } inline ::std::string* SMiRealTimeData::mutable_strtagname() { set_has_strtagname(); if (strtagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SMiRealTimeData.strTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SMiRealTimeData.strTagName) return strtagname_; } inline ::std::string* SMiRealTimeData::release_strtagname() { @@ -3399,7 +3399,7 @@ inline void SMiRealTimeData::set_allocated_strtagname(::std::string* strtagname) clear_has_strtagname(); strtagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SMiRealTimeData.strTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SMiRealTimeData.strTagName) } // required string strColumnName = 5; @@ -3419,7 +3419,7 @@ inline void SMiRealTimeData::clear_strcolumnname() { clear_has_strcolumnname(); } inline const ::std::string& SMiRealTimeData::strcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SMiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SMiRealTimeData.strColumnName) return *strcolumnname_; } inline void SMiRealTimeData::set_strcolumnname(const ::std::string& value) { @@ -3428,7 +3428,7 @@ inline void SMiRealTimeData::set_strcolumnname(const ::std::string& value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SMiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SMiRealTimeData.strColumnName) } inline void SMiRealTimeData::set_strcolumnname(const char* value) { set_has_strcolumnname(); @@ -3436,7 +3436,7 @@ inline void SMiRealTimeData::set_strcolumnname(const char* value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SMiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SMiRealTimeData.strColumnName) } inline void SMiRealTimeData::set_strcolumnname(const char* value, size_t size) { set_has_strcolumnname(); @@ -3444,14 +3444,14 @@ inline void SMiRealTimeData::set_strcolumnname(const char* value, size_t size) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SMiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SMiRealTimeData.strColumnName) } inline ::std::string* SMiRealTimeData::mutable_strcolumnname() { set_has_strcolumnname(); if (strcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SMiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SMiRealTimeData.strColumnName) return strcolumnname_; } inline ::std::string* SMiRealTimeData::release_strcolumnname() { @@ -3475,7 +3475,7 @@ inline void SMiRealTimeData::set_allocated_strcolumnname(::std::string* strcolum clear_has_strcolumnname(); strcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SMiRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SMiRealTimeData.strColumnName) } // required int32 nValue = 6; @@ -3493,13 +3493,13 @@ inline void SMiRealTimeData::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int32 SMiRealTimeData::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SMiRealTimeData.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SMiRealTimeData.nValue) return nvalue_; } inline void SMiRealTimeData::set_nvalue(::google::protobuf::int32 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SMiRealTimeData.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SMiRealTimeData.nValue) } // required uint32 uStatus = 7; @@ -3517,13 +3517,13 @@ inline void SMiRealTimeData::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SMiRealTimeData::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SMiRealTimeData.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SMiRealTimeData.uStatus) return ustatus_; } inline void SMiRealTimeData::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SMiRealTimeData.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SMiRealTimeData.uStatus) } // ------------------------------------------------------------------- @@ -3547,7 +3547,7 @@ inline void STableRealTimeData::clear_strtablename() { clear_has_strtablename(); } inline const ::std::string& STableRealTimeData::strtablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.STableRealTimeData.strTableName) + // @@protoc_insertion_point(field_get:iot_idl.STableRealTimeData.strTableName) return *strtablename_; } inline void STableRealTimeData::set_strtablename(const ::std::string& value) { @@ -3556,7 +3556,7 @@ inline void STableRealTimeData::set_strtablename(const ::std::string& value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.STableRealTimeData.strTableName) + // @@protoc_insertion_point(field_set:iot_idl.STableRealTimeData.strTableName) } inline void STableRealTimeData::set_strtablename(const char* value) { set_has_strtablename(); @@ -3564,7 +3564,7 @@ inline void STableRealTimeData::set_strtablename(const char* value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.STableRealTimeData.strTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.STableRealTimeData.strTableName) } inline void STableRealTimeData::set_strtablename(const char* value, size_t size) { set_has_strtablename(); @@ -3572,14 +3572,14 @@ inline void STableRealTimeData::set_strtablename(const char* value, size_t size) strtablename_ = new ::std::string; } strtablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.STableRealTimeData.strTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.STableRealTimeData.strTableName) } inline ::std::string* STableRealTimeData::mutable_strtablename() { set_has_strtablename(); if (strtablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.STableRealTimeData.strTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.STableRealTimeData.strTableName) return strtablename_; } inline ::std::string* STableRealTimeData::release_strtablename() { @@ -3603,7 +3603,7 @@ inline void STableRealTimeData::set_allocated_strtablename(::std::string* strtab clear_has_strtablename(); strtablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.STableRealTimeData.strTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.STableRealTimeData.strTableName) } // required string strTagName = 2; @@ -3623,7 +3623,7 @@ inline void STableRealTimeData::clear_strtagname() { clear_has_strtagname(); } inline const ::std::string& STableRealTimeData::strtagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.STableRealTimeData.strTagName) + // @@protoc_insertion_point(field_get:iot_idl.STableRealTimeData.strTagName) return *strtagname_; } inline void STableRealTimeData::set_strtagname(const ::std::string& value) { @@ -3632,7 +3632,7 @@ inline void STableRealTimeData::set_strtagname(const ::std::string& value) { strtagname_ = new ::std::string; } strtagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.STableRealTimeData.strTagName) + // @@protoc_insertion_point(field_set:iot_idl.STableRealTimeData.strTagName) } inline void STableRealTimeData::set_strtagname(const char* value) { set_has_strtagname(); @@ -3640,7 +3640,7 @@ inline void STableRealTimeData::set_strtagname(const char* value) { strtagname_ = new ::std::string; } strtagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.STableRealTimeData.strTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.STableRealTimeData.strTagName) } inline void STableRealTimeData::set_strtagname(const char* value, size_t size) { set_has_strtagname(); @@ -3648,14 +3648,14 @@ inline void STableRealTimeData::set_strtagname(const char* value, size_t size) { strtagname_ = new ::std::string; } strtagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.STableRealTimeData.strTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.STableRealTimeData.strTagName) } inline ::std::string* STableRealTimeData::mutable_strtagname() { set_has_strtagname(); if (strtagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.STableRealTimeData.strTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.STableRealTimeData.strTagName) return strtagname_; } inline ::std::string* STableRealTimeData::release_strtagname() { @@ -3679,7 +3679,7 @@ inline void STableRealTimeData::set_allocated_strtagname(::std::string* strtagna clear_has_strtagname(); strtagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.STableRealTimeData.strTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.STableRealTimeData.strTagName) } // required string strColumnName = 3; @@ -3699,7 +3699,7 @@ inline void STableRealTimeData::clear_strcolumnname() { clear_has_strcolumnname(); } inline const ::std::string& STableRealTimeData::strcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.STableRealTimeData.strColumnName) + // @@protoc_insertion_point(field_get:iot_idl.STableRealTimeData.strColumnName) return *strcolumnname_; } inline void STableRealTimeData::set_strcolumnname(const ::std::string& value) { @@ -3708,7 +3708,7 @@ inline void STableRealTimeData::set_strcolumnname(const ::std::string& value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.STableRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set:iot_idl.STableRealTimeData.strColumnName) } inline void STableRealTimeData::set_strcolumnname(const char* value) { set_has_strcolumnname(); @@ -3716,7 +3716,7 @@ inline void STableRealTimeData::set_strcolumnname(const char* value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.STableRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.STableRealTimeData.strColumnName) } inline void STableRealTimeData::set_strcolumnname(const char* value, size_t size) { set_has_strcolumnname(); @@ -3724,14 +3724,14 @@ inline void STableRealTimeData::set_strcolumnname(const char* value, size_t size strcolumnname_ = new ::std::string; } strcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.STableRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.STableRealTimeData.strColumnName) } inline ::std::string* STableRealTimeData::mutable_strcolumnname() { set_has_strcolumnname(); if (strcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.STableRealTimeData.strColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.STableRealTimeData.strColumnName) return strcolumnname_; } inline ::std::string* STableRealTimeData::release_strcolumnname() { @@ -3755,7 +3755,7 @@ inline void STableRealTimeData::set_allocated_strcolumnname(::std::string* strco clear_has_strcolumnname(); strcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.STableRealTimeData.strColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.STableRealTimeData.strColumnName) } // optional int32 nLocation = 4; @@ -3773,13 +3773,13 @@ inline void STableRealTimeData::clear_nlocation() { clear_has_nlocation(); } inline ::google::protobuf::int32 STableRealTimeData::nlocation() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.STableRealTimeData.nLocation) + // @@protoc_insertion_point(field_get:iot_idl.STableRealTimeData.nLocation) return nlocation_; } inline void STableRealTimeData::set_nlocation(::google::protobuf::int32 value) { set_has_nlocation(); nlocation_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.STableRealTimeData.nLocation) + // @@protoc_insertion_point(field_set:iot_idl.STableRealTimeData.nLocation) } // optional int32 nSubSystem = 5; @@ -3797,16 +3797,16 @@ inline void STableRealTimeData::clear_nsubsystem() { clear_has_nsubsystem(); } inline ::google::protobuf::int32 STableRealTimeData::nsubsystem() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.STableRealTimeData.nSubSystem) + // @@protoc_insertion_point(field_get:iot_idl.STableRealTimeData.nSubSystem) return nsubsystem_; } inline void STableRealTimeData::set_nsubsystem(::google::protobuf::int32 value) { set_has_nsubsystem(); nsubsystem_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.STableRealTimeData.nSubSystem) + // @@protoc_insertion_point(field_set:iot_idl.STableRealTimeData.nSubSystem) } -// required .kbd_idlfile.SVariable varValue = 6; +// required .iot_idl.SVariable varValue = 6; inline bool STableRealTimeData::has_varvalue() const { return (_has_bits_[0] & 0x00000020u) != 0; } @@ -3817,26 +3817,26 @@ inline void STableRealTimeData::clear_has_varvalue() { _has_bits_[0] &= ~0x00000020u; } inline void STableRealTimeData::clear_varvalue() { - if (varvalue_ != NULL) varvalue_->::kbd_idlfile::SVariable::Clear(); + if (varvalue_ != NULL) varvalue_->::iot_idl::SVariable::Clear(); clear_has_varvalue(); } -inline const ::kbd_idlfile::SVariable& STableRealTimeData::varvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.STableRealTimeData.varValue) +inline const ::iot_idl::SVariable& STableRealTimeData::varvalue() const { + // @@protoc_insertion_point(field_get:iot_idl.STableRealTimeData.varValue) return varvalue_ != NULL ? *varvalue_ : *default_instance_->varvalue_; } -inline ::kbd_idlfile::SVariable* STableRealTimeData::mutable_varvalue() { +inline ::iot_idl::SVariable* STableRealTimeData::mutable_varvalue() { set_has_varvalue(); - if (varvalue_ == NULL) varvalue_ = new ::kbd_idlfile::SVariable; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.STableRealTimeData.varValue) + if (varvalue_ == NULL) varvalue_ = new ::iot_idl::SVariable; + // @@protoc_insertion_point(field_mutable:iot_idl.STableRealTimeData.varValue) return varvalue_; } -inline ::kbd_idlfile::SVariable* STableRealTimeData::release_varvalue() { +inline ::iot_idl::SVariable* STableRealTimeData::release_varvalue() { clear_has_varvalue(); - ::kbd_idlfile::SVariable* temp = varvalue_; + ::iot_idl::SVariable* temp = varvalue_; varvalue_ = NULL; return temp; } -inline void STableRealTimeData::set_allocated_varvalue(::kbd_idlfile::SVariable* varvalue) { +inline void STableRealTimeData::set_allocated_varvalue(::iot_idl::SVariable* varvalue) { delete varvalue_; varvalue_ = varvalue; if (varvalue) { @@ -3844,14 +3844,14 @@ inline void STableRealTimeData::set_allocated_varvalue(::kbd_idlfile::SVariable* } else { clear_has_varvalue(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.STableRealTimeData.varValue) + // @@protoc_insertion_point(field_set_allocated:iot_idl.STableRealTimeData.varValue) } // ------------------------------------------------------------------- // SRealTimeDataPkg -// required .kbd_idlfile.SRealTimePkgHead stHead = 1; +// required .iot_idl.SRealTimePkgHead stHead = 1; inline bool SRealTimeDataPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -3862,26 +3862,26 @@ inline void SRealTimeDataPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SRealTimeDataPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SRealTimePkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SRealTimePkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SRealTimePkgHead& SRealTimeDataPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRealTimeDataPkg.stHead) +inline const ::iot_idl::SRealTimePkgHead& SRealTimeDataPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SRealTimeDataPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SRealTimePkgHead* SRealTimeDataPkg::mutable_sthead() { +inline ::iot_idl::SRealTimePkgHead* SRealTimeDataPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SRealTimePkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SRealTimeDataPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SRealTimePkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SRealTimeDataPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SRealTimePkgHead* SRealTimeDataPkg::release_sthead() { +inline ::iot_idl::SRealTimePkgHead* SRealTimeDataPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SRealTimePkgHead* temp = sthead_; + ::iot_idl::SRealTimePkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SRealTimeDataPkg::set_allocated_sthead(::kbd_idlfile::SRealTimePkgHead* sthead) { +inline void SRealTimeDataPkg::set_allocated_sthead(::iot_idl::SRealTimePkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -3889,172 +3889,172 @@ inline void SRealTimeDataPkg::set_allocated_sthead(::kbd_idlfile::SRealTimePkgHe } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SRealTimeDataPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SRealTimeDataPkg.stHead) } -// repeated .kbd_idlfile.SAiRealTimeData stAiRtd = 2; +// repeated .iot_idl.SAiRealTimeData stAiRtd = 2; inline int SRealTimeDataPkg::stairtd_size() const { return stairtd_.size(); } inline void SRealTimeDataPkg::clear_stairtd() { stairtd_.Clear(); } -inline const ::kbd_idlfile::SAiRealTimeData& SRealTimeDataPkg::stairtd(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRealTimeDataPkg.stAiRtd) +inline const ::iot_idl::SAiRealTimeData& SRealTimeDataPkg::stairtd(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SRealTimeDataPkg.stAiRtd) return stairtd_.Get(index); } -inline ::kbd_idlfile::SAiRealTimeData* SRealTimeDataPkg::mutable_stairtd(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SRealTimeDataPkg.stAiRtd) +inline ::iot_idl::SAiRealTimeData* SRealTimeDataPkg::mutable_stairtd(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SRealTimeDataPkg.stAiRtd) return stairtd_.Mutable(index); } -inline ::kbd_idlfile::SAiRealTimeData* SRealTimeDataPkg::add_stairtd() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SRealTimeDataPkg.stAiRtd) +inline ::iot_idl::SAiRealTimeData* SRealTimeDataPkg::add_stairtd() { + // @@protoc_insertion_point(field_add:iot_idl.SRealTimeDataPkg.stAiRtd) return stairtd_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAiRealTimeData >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SAiRealTimeData >& SRealTimeDataPkg::stairtd() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SRealTimeDataPkg.stAiRtd) + // @@protoc_insertion_point(field_list:iot_idl.SRealTimeDataPkg.stAiRtd) return stairtd_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAiRealTimeData >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SAiRealTimeData >* SRealTimeDataPkg::mutable_stairtd() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SRealTimeDataPkg.stAiRtd) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SRealTimeDataPkg.stAiRtd) return &stairtd_; } -// repeated .kbd_idlfile.SPiRealTimeData stPiRtd = 3; +// repeated .iot_idl.SPiRealTimeData stPiRtd = 3; inline int SRealTimeDataPkg::stpirtd_size() const { return stpirtd_.size(); } inline void SRealTimeDataPkg::clear_stpirtd() { stpirtd_.Clear(); } -inline const ::kbd_idlfile::SPiRealTimeData& SRealTimeDataPkg::stpirtd(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRealTimeDataPkg.stPiRtd) +inline const ::iot_idl::SPiRealTimeData& SRealTimeDataPkg::stpirtd(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SRealTimeDataPkg.stPiRtd) return stpirtd_.Get(index); } -inline ::kbd_idlfile::SPiRealTimeData* SRealTimeDataPkg::mutable_stpirtd(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SRealTimeDataPkg.stPiRtd) +inline ::iot_idl::SPiRealTimeData* SRealTimeDataPkg::mutable_stpirtd(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SRealTimeDataPkg.stPiRtd) return stpirtd_.Mutable(index); } -inline ::kbd_idlfile::SPiRealTimeData* SRealTimeDataPkg::add_stpirtd() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SRealTimeDataPkg.stPiRtd) +inline ::iot_idl::SPiRealTimeData* SRealTimeDataPkg::add_stpirtd() { + // @@protoc_insertion_point(field_add:iot_idl.SRealTimeDataPkg.stPiRtd) return stpirtd_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SPiRealTimeData >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SPiRealTimeData >& SRealTimeDataPkg::stpirtd() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SRealTimeDataPkg.stPiRtd) + // @@protoc_insertion_point(field_list:iot_idl.SRealTimeDataPkg.stPiRtd) return stpirtd_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SPiRealTimeData >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SPiRealTimeData >* SRealTimeDataPkg::mutable_stpirtd() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SRealTimeDataPkg.stPiRtd) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SRealTimeDataPkg.stPiRtd) return &stpirtd_; } -// repeated .kbd_idlfile.SDiRealTimeData stDiRtd = 4; +// repeated .iot_idl.SDiRealTimeData stDiRtd = 4; inline int SRealTimeDataPkg::stdirtd_size() const { return stdirtd_.size(); } inline void SRealTimeDataPkg::clear_stdirtd() { stdirtd_.Clear(); } -inline const ::kbd_idlfile::SDiRealTimeData& SRealTimeDataPkg::stdirtd(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRealTimeDataPkg.stDiRtd) +inline const ::iot_idl::SDiRealTimeData& SRealTimeDataPkg::stdirtd(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SRealTimeDataPkg.stDiRtd) return stdirtd_.Get(index); } -inline ::kbd_idlfile::SDiRealTimeData* SRealTimeDataPkg::mutable_stdirtd(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SRealTimeDataPkg.stDiRtd) +inline ::iot_idl::SDiRealTimeData* SRealTimeDataPkg::mutable_stdirtd(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SRealTimeDataPkg.stDiRtd) return stdirtd_.Mutable(index); } -inline ::kbd_idlfile::SDiRealTimeData* SRealTimeDataPkg::add_stdirtd() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SRealTimeDataPkg.stDiRtd) +inline ::iot_idl::SDiRealTimeData* SRealTimeDataPkg::add_stdirtd() { + // @@protoc_insertion_point(field_add:iot_idl.SRealTimeDataPkg.stDiRtd) return stdirtd_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SDiRealTimeData >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SDiRealTimeData >& SRealTimeDataPkg::stdirtd() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SRealTimeDataPkg.stDiRtd) + // @@protoc_insertion_point(field_list:iot_idl.SRealTimeDataPkg.stDiRtd) return stdirtd_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SDiRealTimeData >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SDiRealTimeData >* SRealTimeDataPkg::mutable_stdirtd() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SRealTimeDataPkg.stDiRtd) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SRealTimeDataPkg.stDiRtd) return &stdirtd_; } -// repeated .kbd_idlfile.SMiRealTimeData stMiRtd = 5; +// repeated .iot_idl.SMiRealTimeData stMiRtd = 5; inline int SRealTimeDataPkg::stmirtd_size() const { return stmirtd_.size(); } inline void SRealTimeDataPkg::clear_stmirtd() { stmirtd_.Clear(); } -inline const ::kbd_idlfile::SMiRealTimeData& SRealTimeDataPkg::stmirtd(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRealTimeDataPkg.stMiRtd) +inline const ::iot_idl::SMiRealTimeData& SRealTimeDataPkg::stmirtd(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SRealTimeDataPkg.stMiRtd) return stmirtd_.Get(index); } -inline ::kbd_idlfile::SMiRealTimeData* SRealTimeDataPkg::mutable_stmirtd(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SRealTimeDataPkg.stMiRtd) +inline ::iot_idl::SMiRealTimeData* SRealTimeDataPkg::mutable_stmirtd(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SRealTimeDataPkg.stMiRtd) return stmirtd_.Mutable(index); } -inline ::kbd_idlfile::SMiRealTimeData* SRealTimeDataPkg::add_stmirtd() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SRealTimeDataPkg.stMiRtd) +inline ::iot_idl::SMiRealTimeData* SRealTimeDataPkg::add_stmirtd() { + // @@protoc_insertion_point(field_add:iot_idl.SRealTimeDataPkg.stMiRtd) return stmirtd_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SMiRealTimeData >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SMiRealTimeData >& SRealTimeDataPkg::stmirtd() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SRealTimeDataPkg.stMiRtd) + // @@protoc_insertion_point(field_list:iot_idl.SRealTimeDataPkg.stMiRtd) return stmirtd_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SMiRealTimeData >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SMiRealTimeData >* SRealTimeDataPkg::mutable_stmirtd() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SRealTimeDataPkg.stMiRtd) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SRealTimeDataPkg.stMiRtd) return &stmirtd_; } -// repeated .kbd_idlfile.STableRealTimeData stTblRtd = 6; +// repeated .iot_idl.STableRealTimeData stTblRtd = 6; inline int SRealTimeDataPkg::sttblrtd_size() const { return sttblrtd_.size(); } inline void SRealTimeDataPkg::clear_sttblrtd() { sttblrtd_.Clear(); } -inline const ::kbd_idlfile::STableRealTimeData& SRealTimeDataPkg::sttblrtd(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRealTimeDataPkg.stTblRtd) +inline const ::iot_idl::STableRealTimeData& SRealTimeDataPkg::sttblrtd(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SRealTimeDataPkg.stTblRtd) return sttblrtd_.Get(index); } -inline ::kbd_idlfile::STableRealTimeData* SRealTimeDataPkg::mutable_sttblrtd(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SRealTimeDataPkg.stTblRtd) +inline ::iot_idl::STableRealTimeData* SRealTimeDataPkg::mutable_sttblrtd(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SRealTimeDataPkg.stTblRtd) return sttblrtd_.Mutable(index); } -inline ::kbd_idlfile::STableRealTimeData* SRealTimeDataPkg::add_sttblrtd() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SRealTimeDataPkg.stTblRtd) +inline ::iot_idl::STableRealTimeData* SRealTimeDataPkg::add_sttblrtd() { + // @@protoc_insertion_point(field_add:iot_idl.SRealTimeDataPkg.stTblRtd) return sttblrtd_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::STableRealTimeData >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::STableRealTimeData >& SRealTimeDataPkg::sttblrtd() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SRealTimeDataPkg.stTblRtd) + // @@protoc_insertion_point(field_list:iot_idl.SRealTimeDataPkg.stTblRtd) return sttblrtd_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::STableRealTimeData >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::STableRealTimeData >* SRealTimeDataPkg::mutable_sttblrtd() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SRealTimeDataPkg.stTblRtd) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SRealTimeDataPkg.stTblRtd) return &sttblrtd_; } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::enDataProcMessage> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enDataProcMessage> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enDataProcMessage>() { - return ::kbd_idlfile::enDataProcMessage_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enDataProcMessage>() { + return ::iot_idl::enDataProcMessage_descriptor(); } } // namespace google diff --git a/platform/src/idl_files/DataProcMessage.proto b/platform/src/idl_files/DataProcMessage.proto index b6fb4c5e..527aacdd 100644 --- a/platform/src/idl_files/DataProcMessage.proto +++ b/platform/src/idl_files/DataProcMessage.proto @@ -6,7 +6,7 @@ syntax="proto2"; import "Public.proto"; -package kbd_idlfile; +package iot_idl; // 缩写说明： // DPCDA : Data Process Change Data API 数据处理服务变化数据（订阅、发布）接口 diff --git a/platform/src/idl_files/DbSaveMessage.pb.cc b/platform/src/idl_files/DbSaveMessage.pb.cc index c18e5eee..189057d0 100644 --- a/platform/src/idl_files/DbSaveMessage.pb.cc +++ b/platform/src/idl_files/DbSaveMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -304,49 +304,49 @@ void protobuf_AddDesc_DbSaveMessage_2eproto() { already_here = true; GOOGLE_PROTOBUF_VERIFY_VERSION; - ::kbd_idlfile::protobuf_AddDesc_Public_2eproto(); + ::iot_idl::protobuf_AddDesc_Public_2eproto(); ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\023DbSaveMessage.proto\022\013kbd_idlfile\032\014Publ" + "\n\023DbSaveMessage.proto\022\013iot_idl\032\014Publ" "ic.proto\"\264\001\n\013DbCondition\022.\n\007enLogic\030\001 \001(" - "\0162\035.kbd_idlfile.ENConditionLogic\0224\n\nenRe" - "lation\030\002 \002(\0162 .kbd_idlfile.ENConditionRe" + "\0162\035.iot_idl.ENConditionLogic\0224\n\nenRe" + "lation\030\002 \002(\0162 .iot_idl.ENConditionRe" "lation\022\025\n\rstrColumnName\030\003 \002(\t\022(\n\010msgValu" - "e\030\004 \002(\0132\026.kbd_idlfile.SVariable\"\216\001\n\017DbCo" + "e\030\004 \002(\0132\026.iot_idl.SVariable\"\216\001\n\017DbCo" "nditionHead\022.\n\007enLogic\030\001 \001(\0162\035.kbd_idlfi" "le.ENConditionLogic\0224\n\nenRelation\030\002 \002(\0162" - " .kbd_idlfile.ENConditionRelation\022\025\n\rstr" + " .iot_idl.ENConditionRelation\022\025\n\rstr" "ColumnName\030\003 \002(\t\"8\n\014DbValueArray\022(\n\010msgV" - "alue\030\001 \003(\0132\026.kbd_idlfile.SVariable\"P\n\rDb" + "alue\030\001 \003(\0132\026.iot_idl.SVariable\"P\n\rDb" "UpdateValue\022\025\n\rstrColumnName\030\001 \002(\t\022(\n\010ms" - "gValue\030\002 \002(\0132\026.kbd_idlfile.SVariable\"\231\001\n" + "gValue\030\002 \002(\0132\026.iot_idl.SVariable\"\231\001\n" "\010DbInsert\0222\n\014enSaveAction\030\001 \002(\0162\034.kbd_id" "lfile.enDssSaveAction\022\024\n\014strTableName\030\002 " "\002(\t\022\025\n\rstrColumnName\030\003 \003(\t\022,\n\tmsgRecord\030" - "\004 \003(\0132\031.kbd_idlfile.DbValueArray\"\210\001\n\010DbR" + "\004 \003(\0132\031.iot_idl.DbValueArray\"\210\001\n\010DbR" "emove\0222\n\014enSaveAction\030\001 \002(\0162\034.kbd_idlfil" "e.enDssSaveAction\022\024\n\014strTableName\030\002 \002(\t\022" - "2\n\020msgCondtionArray\030\003 \003(\0132\030.kbd_idlfile." + "2\n\020msgCondtionArray\030\003 \003(\0132\030.iot_idl." "DbCondition\"\307\001\n\rDbRemoveMulti\0222\n\014enSaveA" - "ction\030\001 \002(\0162\034.kbd_idlfile.enDssSaveActio" + "ction\030\001 \002(\0162\034.iot_idl.enDssSaveActio" "n\022\024\n\014strTableName\030\002 \002(\t\0226\n\020msgConditionH" - "ead\030\003 \003(\0132\034.kbd_idlfile.DbConditionHead\022" - "4\n\021msgConditionValue\030\004 \003(\0132\031.kbd_idlfile" + "ead\030\003 \003(\0132\034.iot_idl.DbConditionHead\022" + "4\n\021msgConditionValue\030\004 \003(\0132\031.iot_idl" ".DbValueArray\"\270\001\n\010DbUpdate\0222\n\014enSaveActi" - "on\030\001 \002(\0162\034.kbd_idlfile.enDssSaveAction\022\024" + "on\030\001 \002(\0162\034.iot_idl.enDssSaveAction\022\024" "\n\014strTableName\030\002 \002(\t\0222\n\016msgUpdateValue\030\003" - " \003(\0132\032.kbd_idlfile.DbUpdateValue\022.\n\014msgC" - "ondition\030\004 \003(\0132\030.kbd_idlfile.DbCondition" + " \003(\0132\032.iot_idl.DbUpdateValue\022.\n\014msgC" + "ondition\030\004 \003(\0132\030.iot_idl.DbCondition" "\"\373\001\n\rDbUpdateMulti\0222\n\014enSaveAction\030\001 \002(\016" - "2\034.kbd_idlfile.enDssSaveAction\022\024\n\014strTab" + "2\034.iot_idl.enDssSaveAction\022\024\n\014strTab" "leName\030\002 \002(\t\0222\n\016msgUpdateValue\030\003 \003(\0132\032.k" "bd_idlfile.DbUpdateValue\0226\n\020msgCondition" - "Head\030\004 \003(\0132\034.kbd_idlfile.DbConditionHead" + "Head\030\004 \003(\0132\034.iot_idl.DbConditionHead" "\0224\n\021msgConditionValue\030\005 \003(\0132\031.kbd_idlfil" "e.DbValueArray\"\361\001\n\tDbRequest\022(\n\tmsgInser" - "t\030\001 \001(\0132\025.kbd_idlfile.DbInsert\022(\n\tmsgRem" - "ove\030\002 \001(\0132\025.kbd_idlfile.DbRemove\0222\n\016msgR" - "emoveMulti\030\003 \001(\0132\032.kbd_idlfile.DbRemoveM" - "ulti\022(\n\tmsgUpdate\030\004 \001(\0132\025.kbd_idlfile.Db" + "t\030\001 \001(\0132\025.iot_idl.DbInsert\022(\n\tmsgRem" + "ove\030\002 \001(\0132\025.iot_idl.DbRemove\0222\n\016msgR" + "emoveMulti\030\003 \001(\0132\032.iot_idl.DbRemoveM" + "ulti\022(\n\tmsgUpdate\030\004 \001(\0132\025.iot_idl.Db" "Update\0222\n\016msgUpdateMulti\030\005 \001(\0132\032.kbd_idl" "file.DbUpdateMulti*\267\001\n\014enDssMsgType\022\031\n\025M" "T_DSS_APP2SRV_INSERT\020\n\022\031\n\025MT_DSS_APP2SRV" @@ -434,18 +434,18 @@ const int DbCondition::kMsgValueFieldNumber; DbCondition::DbCondition() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.DbCondition) + // @@protoc_insertion_point(constructor:iot_idl.DbCondition) } void DbCondition::InitAsDefaultInstance() { - msgvalue_ = const_cast< ::kbd_idlfile::SVariable*>(&::kbd_idlfile::SVariable::default_instance()); + msgvalue_ = const_cast< ::iot_idl::SVariable*>(&::iot_idl::SVariable::default_instance()); } DbCondition::DbCondition(const DbCondition& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.DbCondition) + // @@protoc_insertion_point(copy_constructor:iot_idl.DbCondition) } void DbCondition::SharedCtor() { @@ -459,7 +459,7 @@ void DbCondition::SharedCtor() { } DbCondition::~DbCondition() { - // @@protoc_insertion_point(destructor:kbd_idlfile.DbCondition) + // @@protoc_insertion_point(destructor:iot_idl.DbCondition) SharedDtor(); } @@ -512,7 +512,7 @@ void DbCondition::Clear() { } } if (has_msgvalue()) { - if (msgvalue_ != NULL) msgvalue_->::kbd_idlfile::SVariable::Clear(); + if (msgvalue_ != NULL) msgvalue_->::iot_idl::SVariable::Clear(); } } @@ -527,21 +527,21 @@ bool DbCondition::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.DbCondition) + // @@protoc_insertion_point(parse_start:iot_idl.DbCondition) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional .kbd_idlfile.ENConditionLogic enLogic = 1; + // optional .iot_idl.ENConditionLogic enLogic = 1; case 1: { if (tag == 8) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::ENConditionLogic_IsValid(value)) { - set_enlogic(static_cast< ::kbd_idlfile::ENConditionLogic >(value)); + if (::iot_idl::ENConditionLogic_IsValid(value)) { + set_enlogic(static_cast< ::iot_idl::ENConditionLogic >(value)); } else { mutable_unknown_fields()->AddVarint(1, value); } @@ -552,7 +552,7 @@ bool DbCondition::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.ENConditionRelation enRelation = 2; + // required .iot_idl.ENConditionRelation enRelation = 2; case 2: { if (tag == 16) { parse_enRelation: @@ -560,8 +560,8 @@ bool DbCondition::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::ENConditionRelation_IsValid(value)) { - set_enrelation(static_cast< ::kbd_idlfile::ENConditionRelation >(value)); + if (::iot_idl::ENConditionRelation_IsValid(value)) { + set_enrelation(static_cast< ::iot_idl::ENConditionRelation >(value)); } else { mutable_unknown_fields()->AddVarint(2, value); } @@ -589,7 +589,7 @@ bool DbCondition::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.SVariable msgValue = 4; + // required .iot_idl.SVariable msgValue = 4; case 4: { if (tag == 34) { parse_msgValue: @@ -616,24 +616,24 @@ bool DbCondition::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.DbCondition) + // @@protoc_insertion_point(parse_success:iot_idl.DbCondition) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.DbCondition) + // @@protoc_insertion_point(parse_failure:iot_idl.DbCondition) return false; #undef DO_ } void DbCondition::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.DbCondition) - // optional .kbd_idlfile.ENConditionLogic enLogic = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.DbCondition) + // optional .iot_idl.ENConditionLogic enLogic = 1; if (has_enlogic()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 1, this->enlogic(), output); } - // required .kbd_idlfile.ENConditionRelation enRelation = 2; + // required .iot_idl.ENConditionRelation enRelation = 2; if (has_enrelation()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 2, this->enrelation(), output); @@ -649,7 +649,7 @@ void DbCondition::SerializeWithCachedSizes( 3, this->strcolumnname(), output); } - // required .kbd_idlfile.SVariable msgValue = 4; + // required .iot_idl.SVariable msgValue = 4; if (has_msgvalue()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->msgvalue(), output); @@ -659,19 +659,19 @@ void DbCondition::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.DbCondition) + // @@protoc_insertion_point(serialize_end:iot_idl.DbCondition) } ::google::protobuf::uint8* DbCondition::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.DbCondition) - // optional .kbd_idlfile.ENConditionLogic enLogic = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.DbCondition) + // optional .iot_idl.ENConditionLogic enLogic = 1; if (has_enlogic()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 1, this->enlogic(), target); } - // required .kbd_idlfile.ENConditionRelation enRelation = 2; + // required .iot_idl.ENConditionRelation enRelation = 2; if (has_enrelation()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 2, this->enrelation(), target); @@ -688,7 +688,7 @@ void DbCondition::SerializeWithCachedSizes( 3, this->strcolumnname(), target); } - // required .kbd_idlfile.SVariable msgValue = 4; + // required .iot_idl.SVariable msgValue = 4; if (has_msgvalue()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -699,7 +699,7 @@ void DbCondition::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.DbCondition) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.DbCondition) return target; } @@ -707,13 +707,13 @@ int DbCondition::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // optional .kbd_idlfile.ENConditionLogic enLogic = 1; + // optional .iot_idl.ENConditionLogic enLogic = 1; if (has_enlogic()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->enlogic()); } - // required .kbd_idlfile.ENConditionRelation enRelation = 2; + // required .iot_idl.ENConditionRelation enRelation = 2; if (has_enrelation()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->enrelation()); @@ -726,7 +726,7 @@ int DbCondition::ByteSize() const { this->strcolumnname()); } - // required .kbd_idlfile.SVariable msgValue = 4; + // required .iot_idl.SVariable msgValue = 4; if (has_msgvalue()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -770,7 +770,7 @@ void DbCondition::MergeFrom(const DbCondition& from) { set_strcolumnname(from.strcolumnname()); } if (from.has_msgvalue()) { - mutable_msgvalue()->::kbd_idlfile::SVariable::MergeFrom(from.msgvalue()); + mutable_msgvalue()->::iot_idl::SVariable::MergeFrom(from.msgvalue()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -829,7 +829,7 @@ const int DbConditionHead::kStrColumnNameFieldNumber; DbConditionHead::DbConditionHead() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.DbConditionHead) + // @@protoc_insertion_point(constructor:iot_idl.DbConditionHead) } void DbConditionHead::InitAsDefaultInstance() { @@ -839,7 +839,7 @@ DbConditionHead::DbConditionHead(const DbConditionHead& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.DbConditionHead) + // @@protoc_insertion_point(copy_constructor:iot_idl.DbConditionHead) } void DbConditionHead::SharedCtor() { @@ -852,7 +852,7 @@ void DbConditionHead::SharedCtor() { } DbConditionHead::~DbConditionHead() { - // @@protoc_insertion_point(destructor:kbd_idlfile.DbConditionHead) + // @@protoc_insertion_point(destructor:iot_idl.DbConditionHead) SharedDtor(); } @@ -916,21 +916,21 @@ bool DbConditionHead::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.DbConditionHead) + // @@protoc_insertion_point(parse_start:iot_idl.DbConditionHead) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional .kbd_idlfile.ENConditionLogic enLogic = 1; + // optional .iot_idl.ENConditionLogic enLogic = 1; case 1: { if (tag == 8) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::ENConditionLogic_IsValid(value)) { - set_enlogic(static_cast< ::kbd_idlfile::ENConditionLogic >(value)); + if (::iot_idl::ENConditionLogic_IsValid(value)) { + set_enlogic(static_cast< ::iot_idl::ENConditionLogic >(value)); } else { mutable_unknown_fields()->AddVarint(1, value); } @@ -941,7 +941,7 @@ bool DbConditionHead::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.ENConditionRelation enRelation = 2; + // required .iot_idl.ENConditionRelation enRelation = 2; case 2: { if (tag == 16) { parse_enRelation: @@ -949,8 +949,8 @@ bool DbConditionHead::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::ENConditionRelation_IsValid(value)) { - set_enrelation(static_cast< ::kbd_idlfile::ENConditionRelation >(value)); + if (::iot_idl::ENConditionRelation_IsValid(value)) { + set_enrelation(static_cast< ::iot_idl::ENConditionRelation >(value)); } else { mutable_unknown_fields()->AddVarint(2, value); } @@ -992,24 +992,24 @@ bool DbConditionHead::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.DbConditionHead) + // @@protoc_insertion_point(parse_success:iot_idl.DbConditionHead) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.DbConditionHead) + // @@protoc_insertion_point(parse_failure:iot_idl.DbConditionHead) return false; #undef DO_ } void DbConditionHead::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.DbConditionHead) - // optional .kbd_idlfile.ENConditionLogic enLogic = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.DbConditionHead) + // optional .iot_idl.ENConditionLogic enLogic = 1; if (has_enlogic()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 1, this->enlogic(), output); } - // required .kbd_idlfile.ENConditionRelation enRelation = 2; + // required .iot_idl.ENConditionRelation enRelation = 2; if (has_enrelation()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 2, this->enrelation(), output); @@ -1029,19 +1029,19 @@ void DbConditionHead::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.DbConditionHead) + // @@protoc_insertion_point(serialize_end:iot_idl.DbConditionHead) } ::google::protobuf::uint8* DbConditionHead::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.DbConditionHead) - // optional .kbd_idlfile.ENConditionLogic enLogic = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.DbConditionHead) + // optional .iot_idl.ENConditionLogic enLogic = 1; if (has_enlogic()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 1, this->enlogic(), target); } - // required .kbd_idlfile.ENConditionRelation enRelation = 2; + // required .iot_idl.ENConditionRelation enRelation = 2; if (has_enrelation()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 2, this->enrelation(), target); @@ -1062,7 +1062,7 @@ void DbConditionHead::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.DbConditionHead) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.DbConditionHead) return target; } @@ -1070,13 +1070,13 @@ int DbConditionHead::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // optional .kbd_idlfile.ENConditionLogic enLogic = 1; + // optional .iot_idl.ENConditionLogic enLogic = 1; if (has_enlogic()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->enlogic()); } - // required .kbd_idlfile.ENConditionRelation enRelation = 2; + // required .iot_idl.ENConditionRelation enRelation = 2; if (has_enrelation()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->enrelation()); @@ -1176,7 +1176,7 @@ const int DbValueArray::kMsgValueFieldNumber; DbValueArray::DbValueArray() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.DbValueArray) + // @@protoc_insertion_point(constructor:iot_idl.DbValueArray) } void DbValueArray::InitAsDefaultInstance() { @@ -1186,7 +1186,7 @@ DbValueArray::DbValueArray(const DbValueArray& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.DbValueArray) + // @@protoc_insertion_point(copy_constructor:iot_idl.DbValueArray) } void DbValueArray::SharedCtor() { @@ -1195,7 +1195,7 @@ void DbValueArray::SharedCtor() { } DbValueArray::~DbValueArray() { - // @@protoc_insertion_point(destructor:kbd_idlfile.DbValueArray) + // @@protoc_insertion_point(destructor:iot_idl.DbValueArray) SharedDtor(); } @@ -1235,13 +1235,13 @@ bool DbValueArray::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.DbValueArray) + // @@protoc_insertion_point(parse_start:iot_idl.DbValueArray) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated .kbd_idlfile.SVariable msgValue = 1; + // repeated .iot_idl.SVariable msgValue = 1; case 1: { if (tag == 10) { parse_msgValue: @@ -1269,18 +1269,18 @@ bool DbValueArray::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.DbValueArray) + // @@protoc_insertion_point(parse_success:iot_idl.DbValueArray) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.DbValueArray) + // @@protoc_insertion_point(parse_failure:iot_idl.DbValueArray) return false; #undef DO_ } void DbValueArray::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.DbValueArray) - // repeated .kbd_idlfile.SVariable msgValue = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.DbValueArray) + // repeated .iot_idl.SVariable msgValue = 1; for (int i = 0; i < this->msgvalue_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->msgvalue(i), output); @@ -1290,13 +1290,13 @@ void DbValueArray::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.DbValueArray) + // @@protoc_insertion_point(serialize_end:iot_idl.DbValueArray) } ::google::protobuf::uint8* DbValueArray::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.DbValueArray) - // repeated .kbd_idlfile.SVariable msgValue = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.DbValueArray) + // repeated .iot_idl.SVariable msgValue = 1; for (int i = 0; i < this->msgvalue_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1307,14 +1307,14 @@ void DbValueArray::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.DbValueArray) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.DbValueArray) return target; } int DbValueArray::ByteSize() const { int total_size = 0; - // repeated .kbd_idlfile.SVariable msgValue = 1; + // repeated .iot_idl.SVariable msgValue = 1; total_size += 1 * this->msgvalue_size(); for (int i = 0; i < this->msgvalue_size(); i++) { total_size += @@ -1397,18 +1397,18 @@ const int DbUpdateValue::kMsgValueFieldNumber; DbUpdateValue::DbUpdateValue() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.DbUpdateValue) + // @@protoc_insertion_point(constructor:iot_idl.DbUpdateValue) } void DbUpdateValue::InitAsDefaultInstance() { - msgvalue_ = const_cast< ::kbd_idlfile::SVariable*>(&::kbd_idlfile::SVariable::default_instance()); + msgvalue_ = const_cast< ::iot_idl::SVariable*>(&::iot_idl::SVariable::default_instance()); } DbUpdateValue::DbUpdateValue(const DbUpdateValue& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.DbUpdateValue) + // @@protoc_insertion_point(copy_constructor:iot_idl.DbUpdateValue) } void DbUpdateValue::SharedCtor() { @@ -1420,7 +1420,7 @@ void DbUpdateValue::SharedCtor() { } DbUpdateValue::~DbUpdateValue() { - // @@protoc_insertion_point(destructor:kbd_idlfile.DbUpdateValue) + // @@protoc_insertion_point(destructor:iot_idl.DbUpdateValue) SharedDtor(); } @@ -1462,7 +1462,7 @@ void DbUpdateValue::Clear() { } } if (has_msgvalue()) { - if (msgvalue_ != NULL) msgvalue_->::kbd_idlfile::SVariable::Clear(); + if (msgvalue_ != NULL) msgvalue_->::iot_idl::SVariable::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -1473,7 +1473,7 @@ bool DbUpdateValue::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.DbUpdateValue) + // @@protoc_insertion_point(parse_start:iot_idl.DbUpdateValue) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1495,7 +1495,7 @@ bool DbUpdateValue::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.SVariable msgValue = 2; + // required .iot_idl.SVariable msgValue = 2; case 2: { if (tag == 18) { parse_msgValue: @@ -1522,17 +1522,17 @@ bool DbUpdateValue::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.DbUpdateValue) + // @@protoc_insertion_point(parse_success:iot_idl.DbUpdateValue) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.DbUpdateValue) + // @@protoc_insertion_point(parse_failure:iot_idl.DbUpdateValue) return false; #undef DO_ } void DbUpdateValue::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.DbUpdateValue) + // @@protoc_insertion_point(serialize_start:iot_idl.DbUpdateValue) // required string strColumnName = 1; if (has_strcolumnname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1543,7 +1543,7 @@ void DbUpdateValue::SerializeWithCachedSizes( 1, this->strcolumnname(), output); } - // required .kbd_idlfile.SVariable msgValue = 2; + // required .iot_idl.SVariable msgValue = 2; if (has_msgvalue()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->msgvalue(), output); @@ -1553,12 +1553,12 @@ void DbUpdateValue::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.DbUpdateValue) + // @@protoc_insertion_point(serialize_end:iot_idl.DbUpdateValue) } ::google::protobuf::uint8* DbUpdateValue::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.DbUpdateValue) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.DbUpdateValue) // required string strColumnName = 1; if (has_strcolumnname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1570,7 +1570,7 @@ void DbUpdateValue::SerializeWithCachedSizes( 1, this->strcolumnname(), target); } - // required .kbd_idlfile.SVariable msgValue = 2; + // required .iot_idl.SVariable msgValue = 2; if (has_msgvalue()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1581,7 +1581,7 @@ void DbUpdateValue::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.DbUpdateValue) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.DbUpdateValue) return target; } @@ -1596,7 +1596,7 @@ int DbUpdateValue::ByteSize() const { this->strcolumnname()); } - // required .kbd_idlfile.SVariable msgValue = 2; + // required .iot_idl.SVariable msgValue = 2; if (has_msgvalue()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -1634,7 +1634,7 @@ void DbUpdateValue::MergeFrom(const DbUpdateValue& from) { set_strcolumnname(from.strcolumnname()); } if (from.has_msgvalue()) { - mutable_msgvalue()->::kbd_idlfile::SVariable::MergeFrom(from.msgvalue()); + mutable_msgvalue()->::iot_idl::SVariable::MergeFrom(from.msgvalue()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -1692,7 +1692,7 @@ const int DbInsert::kMsgRecordFieldNumber; DbInsert::DbInsert() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.DbInsert) + // @@protoc_insertion_point(constructor:iot_idl.DbInsert) } void DbInsert::InitAsDefaultInstance() { @@ -1702,7 +1702,7 @@ DbInsert::DbInsert(const DbInsert& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.DbInsert) + // @@protoc_insertion_point(copy_constructor:iot_idl.DbInsert) } void DbInsert::SharedCtor() { @@ -1714,7 +1714,7 @@ void DbInsert::SharedCtor() { } DbInsert::~DbInsert() { - // @@protoc_insertion_point(destructor:kbd_idlfile.DbInsert) + // @@protoc_insertion_point(destructor:iot_idl.DbInsert) SharedDtor(); } @@ -1766,21 +1766,21 @@ bool DbInsert::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.DbInsert) + // @@protoc_insertion_point(parse_start:iot_idl.DbInsert) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // required .iot_idl.enDssSaveAction enSaveAction = 1; case 1: { if (tag == 8) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::enDssSaveAction_IsValid(value)) { - set_ensaveaction(static_cast< ::kbd_idlfile::enDssSaveAction >(value)); + if (::iot_idl::enDssSaveAction_IsValid(value)) { + set_ensaveaction(static_cast< ::iot_idl::enDssSaveAction >(value)); } else { mutable_unknown_fields()->AddVarint(1, value); } @@ -1827,7 +1827,7 @@ bool DbInsert::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.DbValueArray msgRecord = 4; + // repeated .iot_idl.DbValueArray msgRecord = 4; case 4: { if (tag == 34) { parse_msgRecord: @@ -1855,18 +1855,18 @@ bool DbInsert::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.DbInsert) + // @@protoc_insertion_point(parse_success:iot_idl.DbInsert) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.DbInsert) + // @@protoc_insertion_point(parse_failure:iot_idl.DbInsert) return false; #undef DO_ } void DbInsert::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.DbInsert) - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.DbInsert) + // required .iot_idl.enDssSaveAction enSaveAction = 1; if (has_ensaveaction()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 1, this->ensaveaction(), output); @@ -1892,7 +1892,7 @@ void DbInsert::SerializeWithCachedSizes( 3, this->strcolumnname(i), output); } - // repeated .kbd_idlfile.DbValueArray msgRecord = 4; + // repeated .iot_idl.DbValueArray msgRecord = 4; for (int i = 0; i < this->msgrecord_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->msgrecord(i), output); @@ -1902,13 +1902,13 @@ void DbInsert::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.DbInsert) + // @@protoc_insertion_point(serialize_end:iot_idl.DbInsert) } ::google::protobuf::uint8* DbInsert::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.DbInsert) - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.DbInsert) + // required .iot_idl.enDssSaveAction enSaveAction = 1; if (has_ensaveaction()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 1, this->ensaveaction(), target); @@ -1935,7 +1935,7 @@ void DbInsert::SerializeWithCachedSizes( WriteStringToArray(3, this->strcolumnname(i), target); } - // repeated .kbd_idlfile.DbValueArray msgRecord = 4; + // repeated .iot_idl.DbValueArray msgRecord = 4; for (int i = 0; i < this->msgrecord_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1946,7 +1946,7 @@ void DbInsert::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.DbInsert) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.DbInsert) return target; } @@ -1954,7 +1954,7 @@ int DbInsert::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // required .iot_idl.enDssSaveAction enSaveAction = 1; if (has_ensaveaction()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->ensaveaction()); @@ -1975,7 +1975,7 @@ int DbInsert::ByteSize() const { this->strcolumnname(i)); } - // repeated .kbd_idlfile.DbValueArray msgRecord = 4; + // repeated .iot_idl.DbValueArray msgRecord = 4; total_size += 1 * this->msgrecord_size(); for (int i = 0; i < this->msgrecord_size(); i++) { total_size += @@ -2072,7 +2072,7 @@ const int DbRemove::kMsgCondtionArrayFieldNumber; DbRemove::DbRemove() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.DbRemove) + // @@protoc_insertion_point(constructor:iot_idl.DbRemove) } void DbRemove::InitAsDefaultInstance() { @@ -2082,7 +2082,7 @@ DbRemove::DbRemove(const DbRemove& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.DbRemove) + // @@protoc_insertion_point(copy_constructor:iot_idl.DbRemove) } void DbRemove::SharedCtor() { @@ -2094,7 +2094,7 @@ void DbRemove::SharedCtor() { } DbRemove::~DbRemove() { - // @@protoc_insertion_point(destructor:kbd_idlfile.DbRemove) + // @@protoc_insertion_point(destructor:iot_idl.DbRemove) SharedDtor(); } @@ -2145,21 +2145,21 @@ bool DbRemove::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.DbRemove) + // @@protoc_insertion_point(parse_start:iot_idl.DbRemove) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // required .iot_idl.enDssSaveAction enSaveAction = 1; case 1: { if (tag == 8) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::enDssSaveAction_IsValid(value)) { - set_ensaveaction(static_cast< ::kbd_idlfile::enDssSaveAction >(value)); + if (::iot_idl::enDssSaveAction_IsValid(value)) { + set_ensaveaction(static_cast< ::iot_idl::enDssSaveAction >(value)); } else { mutable_unknown_fields()->AddVarint(1, value); } @@ -2187,7 +2187,7 @@ bool DbRemove::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.DbCondition msgCondtionArray = 3; + // repeated .iot_idl.DbCondition msgCondtionArray = 3; case 3: { if (tag == 26) { parse_msgCondtionArray: @@ -2215,18 +2215,18 @@ bool DbRemove::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.DbRemove) + // @@protoc_insertion_point(parse_success:iot_idl.DbRemove) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.DbRemove) + // @@protoc_insertion_point(parse_failure:iot_idl.DbRemove) return false; #undef DO_ } void DbRemove::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.DbRemove) - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.DbRemove) + // required .iot_idl.enDssSaveAction enSaveAction = 1; if (has_ensaveaction()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 1, this->ensaveaction(), output); @@ -2242,7 +2242,7 @@ void DbRemove::SerializeWithCachedSizes( 2, this->strtablename(), output); } - // repeated .kbd_idlfile.DbCondition msgCondtionArray = 3; + // repeated .iot_idl.DbCondition msgCondtionArray = 3; for (int i = 0; i < this->msgcondtionarray_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->msgcondtionarray(i), output); @@ -2252,13 +2252,13 @@ void DbRemove::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.DbRemove) + // @@protoc_insertion_point(serialize_end:iot_idl.DbRemove) } ::google::protobuf::uint8* DbRemove::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.DbRemove) - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.DbRemove) + // required .iot_idl.enDssSaveAction enSaveAction = 1; if (has_ensaveaction()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 1, this->ensaveaction(), target); @@ -2275,7 +2275,7 @@ void DbRemove::SerializeWithCachedSizes( 2, this->strtablename(), target); } - // repeated .kbd_idlfile.DbCondition msgCondtionArray = 3; + // repeated .iot_idl.DbCondition msgCondtionArray = 3; for (int i = 0; i < this->msgcondtionarray_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -2286,7 +2286,7 @@ void DbRemove::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.DbRemove) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.DbRemove) return target; } @@ -2294,7 +2294,7 @@ int DbRemove::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // required .iot_idl.enDssSaveAction enSaveAction = 1; if (has_ensaveaction()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->ensaveaction()); @@ -2308,7 +2308,7 @@ int DbRemove::ByteSize() const { } } - // repeated .kbd_idlfile.DbCondition msgCondtionArray = 3; + // repeated .iot_idl.DbCondition msgCondtionArray = 3; total_size += 1 * this->msgcondtionarray_size(); for (int i = 0; i < this->msgcondtionarray_size(); i++) { total_size += @@ -2404,7 +2404,7 @@ const int DbRemoveMulti::kMsgConditionValueFieldNumber; DbRemoveMulti::DbRemoveMulti() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.DbRemoveMulti) + // @@protoc_insertion_point(constructor:iot_idl.DbRemoveMulti) } void DbRemoveMulti::InitAsDefaultInstance() { @@ -2414,7 +2414,7 @@ DbRemoveMulti::DbRemoveMulti(const DbRemoveMulti& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.DbRemoveMulti) + // @@protoc_insertion_point(copy_constructor:iot_idl.DbRemoveMulti) } void DbRemoveMulti::SharedCtor() { @@ -2426,7 +2426,7 @@ void DbRemoveMulti::SharedCtor() { } DbRemoveMulti::~DbRemoveMulti() { - // @@protoc_insertion_point(destructor:kbd_idlfile.DbRemoveMulti) + // @@protoc_insertion_point(destructor:iot_idl.DbRemoveMulti) SharedDtor(); } @@ -2478,21 +2478,21 @@ bool DbRemoveMulti::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.DbRemoveMulti) + // @@protoc_insertion_point(parse_start:iot_idl.DbRemoveMulti) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // required .iot_idl.enDssSaveAction enSaveAction = 1; case 1: { if (tag == 8) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::enDssSaveAction_IsValid(value)) { - set_ensaveaction(static_cast< ::kbd_idlfile::enDssSaveAction >(value)); + if (::iot_idl::enDssSaveAction_IsValid(value)) { + set_ensaveaction(static_cast< ::iot_idl::enDssSaveAction >(value)); } else { mutable_unknown_fields()->AddVarint(1, value); } @@ -2520,7 +2520,7 @@ bool DbRemoveMulti::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.DbConditionHead msgConditionHead = 3; + // repeated .iot_idl.DbConditionHead msgConditionHead = 3; case 3: { if (tag == 26) { parse_msgConditionHead: @@ -2534,7 +2534,7 @@ bool DbRemoveMulti::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.DbValueArray msgConditionValue = 4; + // repeated .iot_idl.DbValueArray msgConditionValue = 4; case 4: { if (tag == 34) { parse_msgConditionValue: @@ -2562,18 +2562,18 @@ bool DbRemoveMulti::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.DbRemoveMulti) + // @@protoc_insertion_point(parse_success:iot_idl.DbRemoveMulti) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.DbRemoveMulti) + // @@protoc_insertion_point(parse_failure:iot_idl.DbRemoveMulti) return false; #undef DO_ } void DbRemoveMulti::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.DbRemoveMulti) - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.DbRemoveMulti) + // required .iot_idl.enDssSaveAction enSaveAction = 1; if (has_ensaveaction()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 1, this->ensaveaction(), output); @@ -2589,13 +2589,13 @@ void DbRemoveMulti::SerializeWithCachedSizes( 2, this->strtablename(), output); } - // repeated .kbd_idlfile.DbConditionHead msgConditionHead = 3; + // repeated .iot_idl.DbConditionHead msgConditionHead = 3; for (int i = 0; i < this->msgconditionhead_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->msgconditionhead(i), output); } - // repeated .kbd_idlfile.DbValueArray msgConditionValue = 4; + // repeated .iot_idl.DbValueArray msgConditionValue = 4; for (int i = 0; i < this->msgconditionvalue_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->msgconditionvalue(i), output); @@ -2605,13 +2605,13 @@ void DbRemoveMulti::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.DbRemoveMulti) + // @@protoc_insertion_point(serialize_end:iot_idl.DbRemoveMulti) } ::google::protobuf::uint8* DbRemoveMulti::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.DbRemoveMulti) - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.DbRemoveMulti) + // required .iot_idl.enDssSaveAction enSaveAction = 1; if (has_ensaveaction()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 1, this->ensaveaction(), target); @@ -2628,14 +2628,14 @@ void DbRemoveMulti::SerializeWithCachedSizes( 2, this->strtablename(), target); } - // repeated .kbd_idlfile.DbConditionHead msgConditionHead = 3; + // repeated .iot_idl.DbConditionHead msgConditionHead = 3; for (int i = 0; i < this->msgconditionhead_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 3, this->msgconditionhead(i), target); } - // repeated .kbd_idlfile.DbValueArray msgConditionValue = 4; + // repeated .iot_idl.DbValueArray msgConditionValue = 4; for (int i = 0; i < this->msgconditionvalue_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -2646,7 +2646,7 @@ void DbRemoveMulti::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.DbRemoveMulti) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.DbRemoveMulti) return target; } @@ -2654,7 +2654,7 @@ int DbRemoveMulti::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // required .iot_idl.enDssSaveAction enSaveAction = 1; if (has_ensaveaction()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->ensaveaction()); @@ -2668,7 +2668,7 @@ int DbRemoveMulti::ByteSize() const { } } - // repeated .kbd_idlfile.DbConditionHead msgConditionHead = 3; + // repeated .iot_idl.DbConditionHead msgConditionHead = 3; total_size += 1 * this->msgconditionhead_size(); for (int i = 0; i < this->msgconditionhead_size(); i++) { total_size += @@ -2676,7 +2676,7 @@ int DbRemoveMulti::ByteSize() const { this->msgconditionhead(i)); } - // repeated .kbd_idlfile.DbValueArray msgConditionValue = 4; + // repeated .iot_idl.DbValueArray msgConditionValue = 4; total_size += 1 * this->msgconditionvalue_size(); for (int i = 0; i < this->msgconditionvalue_size(); i++) { total_size += @@ -2775,7 +2775,7 @@ const int DbUpdate::kMsgConditionFieldNumber; DbUpdate::DbUpdate() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.DbUpdate) + // @@protoc_insertion_point(constructor:iot_idl.DbUpdate) } void DbUpdate::InitAsDefaultInstance() { @@ -2785,7 +2785,7 @@ DbUpdate::DbUpdate(const DbUpdate& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.DbUpdate) + // @@protoc_insertion_point(copy_constructor:iot_idl.DbUpdate) } void DbUpdate::SharedCtor() { @@ -2797,7 +2797,7 @@ void DbUpdate::SharedCtor() { } DbUpdate::~DbUpdate() { - // @@protoc_insertion_point(destructor:kbd_idlfile.DbUpdate) + // @@protoc_insertion_point(destructor:iot_idl.DbUpdate) SharedDtor(); } @@ -2849,21 +2849,21 @@ bool DbUpdate::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.DbUpdate) + // @@protoc_insertion_point(parse_start:iot_idl.DbUpdate) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // required .iot_idl.enDssSaveAction enSaveAction = 1; case 1: { if (tag == 8) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::enDssSaveAction_IsValid(value)) { - set_ensaveaction(static_cast< ::kbd_idlfile::enDssSaveAction >(value)); + if (::iot_idl::enDssSaveAction_IsValid(value)) { + set_ensaveaction(static_cast< ::iot_idl::enDssSaveAction >(value)); } else { mutable_unknown_fields()->AddVarint(1, value); } @@ -2891,7 +2891,7 @@ bool DbUpdate::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.DbUpdateValue msgUpdateValue = 3; + // repeated .iot_idl.DbUpdateValue msgUpdateValue = 3; case 3: { if (tag == 26) { parse_msgUpdateValue: @@ -2905,7 +2905,7 @@ bool DbUpdate::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.DbCondition msgCondition = 4; + // repeated .iot_idl.DbCondition msgCondition = 4; case 4: { if (tag == 34) { parse_msgCondition: @@ -2933,18 +2933,18 @@ bool DbUpdate::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.DbUpdate) + // @@protoc_insertion_point(parse_success:iot_idl.DbUpdate) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.DbUpdate) + // @@protoc_insertion_point(parse_failure:iot_idl.DbUpdate) return false; #undef DO_ } void DbUpdate::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.DbUpdate) - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.DbUpdate) + // required .iot_idl.enDssSaveAction enSaveAction = 1; if (has_ensaveaction()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 1, this->ensaveaction(), output); @@ -2960,13 +2960,13 @@ void DbUpdate::SerializeWithCachedSizes( 2, this->strtablename(), output); } - // repeated .kbd_idlfile.DbUpdateValue msgUpdateValue = 3; + // repeated .iot_idl.DbUpdateValue msgUpdateValue = 3; for (int i = 0; i < this->msgupdatevalue_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->msgupdatevalue(i), output); } - // repeated .kbd_idlfile.DbCondition msgCondition = 4; + // repeated .iot_idl.DbCondition msgCondition = 4; for (int i = 0; i < this->msgcondition_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->msgcondition(i), output); @@ -2976,13 +2976,13 @@ void DbUpdate::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.DbUpdate) + // @@protoc_insertion_point(serialize_end:iot_idl.DbUpdate) } ::google::protobuf::uint8* DbUpdate::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.DbUpdate) - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.DbUpdate) + // required .iot_idl.enDssSaveAction enSaveAction = 1; if (has_ensaveaction()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 1, this->ensaveaction(), target); @@ -2999,14 +2999,14 @@ void DbUpdate::SerializeWithCachedSizes( 2, this->strtablename(), target); } - // repeated .kbd_idlfile.DbUpdateValue msgUpdateValue = 3; + // repeated .iot_idl.DbUpdateValue msgUpdateValue = 3; for (int i = 0; i < this->msgupdatevalue_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 3, this->msgupdatevalue(i), target); } - // repeated .kbd_idlfile.DbCondition msgCondition = 4; + // repeated .iot_idl.DbCondition msgCondition = 4; for (int i = 0; i < this->msgcondition_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -3017,7 +3017,7 @@ void DbUpdate::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.DbUpdate) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.DbUpdate) return target; } @@ -3025,7 +3025,7 @@ int DbUpdate::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // required .iot_idl.enDssSaveAction enSaveAction = 1; if (has_ensaveaction()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->ensaveaction()); @@ -3039,7 +3039,7 @@ int DbUpdate::ByteSize() const { } } - // repeated .kbd_idlfile.DbUpdateValue msgUpdateValue = 3; + // repeated .iot_idl.DbUpdateValue msgUpdateValue = 3; total_size += 1 * this->msgupdatevalue_size(); for (int i = 0; i < this->msgupdatevalue_size(); i++) { total_size += @@ -3047,7 +3047,7 @@ int DbUpdate::ByteSize() const { this->msgupdatevalue(i)); } - // repeated .kbd_idlfile.DbCondition msgCondition = 4; + // repeated .iot_idl.DbCondition msgCondition = 4; total_size += 1 * this->msgcondition_size(); for (int i = 0; i < this->msgcondition_size(); i++) { total_size += @@ -3147,7 +3147,7 @@ const int DbUpdateMulti::kMsgConditionValueFieldNumber; DbUpdateMulti::DbUpdateMulti() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.DbUpdateMulti) + // @@protoc_insertion_point(constructor:iot_idl.DbUpdateMulti) } void DbUpdateMulti::InitAsDefaultInstance() { @@ -3157,7 +3157,7 @@ DbUpdateMulti::DbUpdateMulti(const DbUpdateMulti& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.DbUpdateMulti) + // @@protoc_insertion_point(copy_constructor:iot_idl.DbUpdateMulti) } void DbUpdateMulti::SharedCtor() { @@ -3169,7 +3169,7 @@ void DbUpdateMulti::SharedCtor() { } DbUpdateMulti::~DbUpdateMulti() { - // @@protoc_insertion_point(destructor:kbd_idlfile.DbUpdateMulti) + // @@protoc_insertion_point(destructor:iot_idl.DbUpdateMulti) SharedDtor(); } @@ -3222,21 +3222,21 @@ bool DbUpdateMulti::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.DbUpdateMulti) + // @@protoc_insertion_point(parse_start:iot_idl.DbUpdateMulti) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // required .iot_idl.enDssSaveAction enSaveAction = 1; case 1: { if (tag == 8) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::enDssSaveAction_IsValid(value)) { - set_ensaveaction(static_cast< ::kbd_idlfile::enDssSaveAction >(value)); + if (::iot_idl::enDssSaveAction_IsValid(value)) { + set_ensaveaction(static_cast< ::iot_idl::enDssSaveAction >(value)); } else { mutable_unknown_fields()->AddVarint(1, value); } @@ -3264,7 +3264,7 @@ bool DbUpdateMulti::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.DbUpdateValue msgUpdateValue = 3; + // repeated .iot_idl.DbUpdateValue msgUpdateValue = 3; case 3: { if (tag == 26) { parse_msgUpdateValue: @@ -3278,7 +3278,7 @@ bool DbUpdateMulti::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.DbConditionHead msgConditionHead = 4; + // repeated .iot_idl.DbConditionHead msgConditionHead = 4; case 4: { if (tag == 34) { parse_msgConditionHead: @@ -3292,7 +3292,7 @@ bool DbUpdateMulti::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.DbValueArray msgConditionValue = 5; + // repeated .iot_idl.DbValueArray msgConditionValue = 5; case 5: { if (tag == 42) { parse_msgConditionValue: @@ -3320,18 +3320,18 @@ bool DbUpdateMulti::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.DbUpdateMulti) + // @@protoc_insertion_point(parse_success:iot_idl.DbUpdateMulti) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.DbUpdateMulti) + // @@protoc_insertion_point(parse_failure:iot_idl.DbUpdateMulti) return false; #undef DO_ } void DbUpdateMulti::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.DbUpdateMulti) - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.DbUpdateMulti) + // required .iot_idl.enDssSaveAction enSaveAction = 1; if (has_ensaveaction()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 1, this->ensaveaction(), output); @@ -3347,19 +3347,19 @@ void DbUpdateMulti::SerializeWithCachedSizes( 2, this->strtablename(), output); } - // repeated .kbd_idlfile.DbUpdateValue msgUpdateValue = 3; + // repeated .iot_idl.DbUpdateValue msgUpdateValue = 3; for (int i = 0; i < this->msgupdatevalue_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->msgupdatevalue(i), output); } - // repeated .kbd_idlfile.DbConditionHead msgConditionHead = 4; + // repeated .iot_idl.DbConditionHead msgConditionHead = 4; for (int i = 0; i < this->msgconditionhead_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->msgconditionhead(i), output); } - // repeated .kbd_idlfile.DbValueArray msgConditionValue = 5; + // repeated .iot_idl.DbValueArray msgConditionValue = 5; for (int i = 0; i < this->msgconditionvalue_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 5, this->msgconditionvalue(i), output); @@ -3369,13 +3369,13 @@ void DbUpdateMulti::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.DbUpdateMulti) + // @@protoc_insertion_point(serialize_end:iot_idl.DbUpdateMulti) } ::google::protobuf::uint8* DbUpdateMulti::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.DbUpdateMulti) - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.DbUpdateMulti) + // required .iot_idl.enDssSaveAction enSaveAction = 1; if (has_ensaveaction()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 1, this->ensaveaction(), target); @@ -3392,21 +3392,21 @@ void DbUpdateMulti::SerializeWithCachedSizes( 2, this->strtablename(), target); } - // repeated .kbd_idlfile.DbUpdateValue msgUpdateValue = 3; + // repeated .iot_idl.DbUpdateValue msgUpdateValue = 3; for (int i = 0; i < this->msgupdatevalue_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 3, this->msgupdatevalue(i), target); } - // repeated .kbd_idlfile.DbConditionHead msgConditionHead = 4; + // repeated .iot_idl.DbConditionHead msgConditionHead = 4; for (int i = 0; i < this->msgconditionhead_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 4, this->msgconditionhead(i), target); } - // repeated .kbd_idlfile.DbValueArray msgConditionValue = 5; + // repeated .iot_idl.DbValueArray msgConditionValue = 5; for (int i = 0; i < this->msgconditionvalue_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -3417,7 +3417,7 @@ void DbUpdateMulti::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.DbUpdateMulti) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.DbUpdateMulti) return target; } @@ -3425,7 +3425,7 @@ int DbUpdateMulti::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // required .iot_idl.enDssSaveAction enSaveAction = 1; if (has_ensaveaction()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->ensaveaction()); @@ -3439,7 +3439,7 @@ int DbUpdateMulti::ByteSize() const { } } - // repeated .kbd_idlfile.DbUpdateValue msgUpdateValue = 3; + // repeated .iot_idl.DbUpdateValue msgUpdateValue = 3; total_size += 1 * this->msgupdatevalue_size(); for (int i = 0; i < this->msgupdatevalue_size(); i++) { total_size += @@ -3447,7 +3447,7 @@ int DbUpdateMulti::ByteSize() const { this->msgupdatevalue(i)); } - // repeated .kbd_idlfile.DbConditionHead msgConditionHead = 4; + // repeated .iot_idl.DbConditionHead msgConditionHead = 4; total_size += 1 * this->msgconditionhead_size(); for (int i = 0; i < this->msgconditionhead_size(); i++) { total_size += @@ -3455,7 +3455,7 @@ int DbUpdateMulti::ByteSize() const { this->msgconditionhead(i)); } - // repeated .kbd_idlfile.DbValueArray msgConditionValue = 5; + // repeated .iot_idl.DbValueArray msgConditionValue = 5; total_size += 1 * this->msgconditionvalue_size(); for (int i = 0; i < this->msgconditionvalue_size(); i++) { total_size += @@ -3558,22 +3558,22 @@ const int DbRequest::kMsgUpdateMultiFieldNumber; DbRequest::DbRequest() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.DbRequest) + // @@protoc_insertion_point(constructor:iot_idl.DbRequest) } void DbRequest::InitAsDefaultInstance() { - msginsert_ = const_cast< ::kbd_idlfile::DbInsert*>(&::kbd_idlfile::DbInsert::default_instance()); - msgremove_ = const_cast< ::kbd_idlfile::DbRemove*>(&::kbd_idlfile::DbRemove::default_instance()); - msgremovemulti_ = const_cast< ::kbd_idlfile::DbRemoveMulti*>(&::kbd_idlfile::DbRemoveMulti::default_instance()); - msgupdate_ = const_cast< ::kbd_idlfile::DbUpdate*>(&::kbd_idlfile::DbUpdate::default_instance()); - msgupdatemulti_ = const_cast< ::kbd_idlfile::DbUpdateMulti*>(&::kbd_idlfile::DbUpdateMulti::default_instance()); + msginsert_ = const_cast< ::iot_idl::DbInsert*>(&::iot_idl::DbInsert::default_instance()); + msgremove_ = const_cast< ::iot_idl::DbRemove*>(&::iot_idl::DbRemove::default_instance()); + msgremovemulti_ = const_cast< ::iot_idl::DbRemoveMulti*>(&::iot_idl::DbRemoveMulti::default_instance()); + msgupdate_ = const_cast< ::iot_idl::DbUpdate*>(&::iot_idl::DbUpdate::default_instance()); + msgupdatemulti_ = const_cast< ::iot_idl::DbUpdateMulti*>(&::iot_idl::DbUpdateMulti::default_instance()); } DbRequest::DbRequest(const DbRequest& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.DbRequest) + // @@protoc_insertion_point(copy_constructor:iot_idl.DbRequest) } void DbRequest::SharedCtor() { @@ -3587,7 +3587,7 @@ void DbRequest::SharedCtor() { } DbRequest::~DbRequest() { - // @@protoc_insertion_point(destructor:kbd_idlfile.DbRequest) + // @@protoc_insertion_point(destructor:iot_idl.DbRequest) SharedDtor(); } @@ -3625,19 +3625,19 @@ DbRequest* DbRequest::New() const { void DbRequest::Clear() { if (_has_bits_[0 / 32] & 31) { if (has_msginsert()) { - if (msginsert_ != NULL) msginsert_->::kbd_idlfile::DbInsert::Clear(); + if (msginsert_ != NULL) msginsert_->::iot_idl::DbInsert::Clear(); } if (has_msgremove()) { - if (msgremove_ != NULL) msgremove_->::kbd_idlfile::DbRemove::Clear(); + if (msgremove_ != NULL) msgremove_->::iot_idl::DbRemove::Clear(); } if (has_msgremovemulti()) { - if (msgremovemulti_ != NULL) msgremovemulti_->::kbd_idlfile::DbRemoveMulti::Clear(); + if (msgremovemulti_ != NULL) msgremovemulti_->::iot_idl::DbRemoveMulti::Clear(); } if (has_msgupdate()) { - if (msgupdate_ != NULL) msgupdate_->::kbd_idlfile::DbUpdate::Clear(); + if (msgupdate_ != NULL) msgupdate_->::iot_idl::DbUpdate::Clear(); } if (has_msgupdatemulti()) { - if (msgupdatemulti_ != NULL) msgupdatemulti_->::kbd_idlfile::DbUpdateMulti::Clear(); + if (msgupdatemulti_ != NULL) msgupdatemulti_->::iot_idl::DbUpdateMulti::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -3648,13 +3648,13 @@ bool DbRequest::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.DbRequest) + // @@protoc_insertion_point(parse_start:iot_idl.DbRequest) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional .kbd_idlfile.DbInsert msgInsert = 1; + // optional .iot_idl.DbInsert msgInsert = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -3666,7 +3666,7 @@ bool DbRequest::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.DbRemove msgRemove = 2; + // optional .iot_idl.DbRemove msgRemove = 2; case 2: { if (tag == 18) { parse_msgRemove: @@ -3679,7 +3679,7 @@ bool DbRequest::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.DbRemoveMulti msgRemoveMulti = 3; + // optional .iot_idl.DbRemoveMulti msgRemoveMulti = 3; case 3: { if (tag == 26) { parse_msgRemoveMulti: @@ -3692,7 +3692,7 @@ bool DbRequest::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.DbUpdate msgUpdate = 4; + // optional .iot_idl.DbUpdate msgUpdate = 4; case 4: { if (tag == 34) { parse_msgUpdate: @@ -3705,7 +3705,7 @@ bool DbRequest::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.DbUpdateMulti msgUpdateMulti = 5; + // optional .iot_idl.DbUpdateMulti msgUpdateMulti = 5; case 5: { if (tag == 42) { parse_msgUpdateMulti: @@ -3732,42 +3732,42 @@ bool DbRequest::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.DbRequest) + // @@protoc_insertion_point(parse_success:iot_idl.DbRequest) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.DbRequest) + // @@protoc_insertion_point(parse_failure:iot_idl.DbRequest) return false; #undef DO_ } void DbRequest::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.DbRequest) - // optional .kbd_idlfile.DbInsert msgInsert = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.DbRequest) + // optional .iot_idl.DbInsert msgInsert = 1; if (has_msginsert()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->msginsert(), output); } - // optional .kbd_idlfile.DbRemove msgRemove = 2; + // optional .iot_idl.DbRemove msgRemove = 2; if (has_msgremove()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->msgremove(), output); } - // optional .kbd_idlfile.DbRemoveMulti msgRemoveMulti = 3; + // optional .iot_idl.DbRemoveMulti msgRemoveMulti = 3; if (has_msgremovemulti()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->msgremovemulti(), output); } - // optional .kbd_idlfile.DbUpdate msgUpdate = 4; + // optional .iot_idl.DbUpdate msgUpdate = 4; if (has_msgupdate()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->msgupdate(), output); } - // optional .kbd_idlfile.DbUpdateMulti msgUpdateMulti = 5; + // optional .iot_idl.DbUpdateMulti msgUpdateMulti = 5; if (has_msgupdatemulti()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 5, this->msgupdatemulti(), output); @@ -3777,41 +3777,41 @@ void DbRequest::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.DbRequest) + // @@protoc_insertion_point(serialize_end:iot_idl.DbRequest) } ::google::protobuf::uint8* DbRequest::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.DbRequest) - // optional .kbd_idlfile.DbInsert msgInsert = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.DbRequest) + // optional .iot_idl.DbInsert msgInsert = 1; if (has_msginsert()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->msginsert(), target); } - // optional .kbd_idlfile.DbRemove msgRemove = 2; + // optional .iot_idl.DbRemove msgRemove = 2; if (has_msgremove()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->msgremove(), target); } - // optional .kbd_idlfile.DbRemoveMulti msgRemoveMulti = 3; + // optional .iot_idl.DbRemoveMulti msgRemoveMulti = 3; if (has_msgremovemulti()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 3, this->msgremovemulti(), target); } - // optional .kbd_idlfile.DbUpdate msgUpdate = 4; + // optional .iot_idl.DbUpdate msgUpdate = 4; if (has_msgupdate()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 4, this->msgupdate(), target); } - // optional .kbd_idlfile.DbUpdateMulti msgUpdateMulti = 5; + // optional .iot_idl.DbUpdateMulti msgUpdateMulti = 5; if (has_msgupdatemulti()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -3822,7 +3822,7 @@ void DbRequest::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.DbRequest) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.DbRequest) return target; } @@ -3830,35 +3830,35 @@ int DbRequest::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // optional .kbd_idlfile.DbInsert msgInsert = 1; + // optional .iot_idl.DbInsert msgInsert = 1; if (has_msginsert()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->msginsert()); } - // optional .kbd_idlfile.DbRemove msgRemove = 2; + // optional .iot_idl.DbRemove msgRemove = 2; if (has_msgremove()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->msgremove()); } - // optional .kbd_idlfile.DbRemoveMulti msgRemoveMulti = 3; + // optional .iot_idl.DbRemoveMulti msgRemoveMulti = 3; if (has_msgremovemulti()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->msgremovemulti()); } - // optional .kbd_idlfile.DbUpdate msgUpdate = 4; + // optional .iot_idl.DbUpdate msgUpdate = 4; if (has_msgupdate()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->msgupdate()); } - // optional .kbd_idlfile.DbUpdateMulti msgUpdateMulti = 5; + // optional .iot_idl.DbUpdateMulti msgUpdateMulti = 5; if (has_msgupdatemulti()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -3893,19 +3893,19 @@ void DbRequest::MergeFrom(const DbRequest& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_msginsert()) { - mutable_msginsert()->::kbd_idlfile::DbInsert::MergeFrom(from.msginsert()); + mutable_msginsert()->::iot_idl::DbInsert::MergeFrom(from.msginsert()); } if (from.has_msgremove()) { - mutable_msgremove()->::kbd_idlfile::DbRemove::MergeFrom(from.msgremove()); + mutable_msgremove()->::iot_idl::DbRemove::MergeFrom(from.msgremove()); } if (from.has_msgremovemulti()) { - mutable_msgremovemulti()->::kbd_idlfile::DbRemoveMulti::MergeFrom(from.msgremovemulti()); + mutable_msgremovemulti()->::iot_idl::DbRemoveMulti::MergeFrom(from.msgremovemulti()); } if (from.has_msgupdate()) { - mutable_msgupdate()->::kbd_idlfile::DbUpdate::MergeFrom(from.msgupdate()); + mutable_msgupdate()->::iot_idl::DbUpdate::MergeFrom(from.msgupdate()); } if (from.has_msgupdatemulti()) { - mutable_msgupdatemulti()->::kbd_idlfile::DbUpdateMulti::MergeFrom(from.msgupdatemulti()); + mutable_msgupdatemulti()->::iot_idl::DbUpdateMulti::MergeFrom(from.msgupdatemulti()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -3967,6 +3967,6 @@ void DbRequest::Swap(DbRequest* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/platform/src/idl_files/DbSaveMessage.pb.h b/platform/src/idl_files/DbSaveMessage.pb.h index 0e04a644..25e26043 100644 --- a/platform/src/idl_files/DbSaveMessage.pb.h +++ b/platform/src/idl_files/DbSaveMessage.pb.h @@ -28,7 +28,7 @@ #include "Public.pb.h" // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { // Internal implementation detail -- do not call these. void IDL_FILES_EXPORT protobuf_AddDesc_DbSaveMessage_2eproto(); @@ -145,19 +145,19 @@ class IDL_FILES_EXPORT DbCondition : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // optional .kbd_idlfile.ENConditionLogic enLogic = 1; + // optional .iot_idl.ENConditionLogic enLogic = 1; inline bool has_enlogic() const; inline void clear_enlogic(); static const int kEnLogicFieldNumber = 1; - inline ::kbd_idlfile::ENConditionLogic enlogic() const; - inline void set_enlogic(::kbd_idlfile::ENConditionLogic value); + inline ::iot_idl::ENConditionLogic enlogic() const; + inline void set_enlogic(::iot_idl::ENConditionLogic value); - // required .kbd_idlfile.ENConditionRelation enRelation = 2; + // required .iot_idl.ENConditionRelation enRelation = 2; inline bool has_enrelation() const; inline void clear_enrelation(); static const int kEnRelationFieldNumber = 2; - inline ::kbd_idlfile::ENConditionRelation enrelation() const; - inline void set_enrelation(::kbd_idlfile::ENConditionRelation value); + inline ::iot_idl::ENConditionRelation enrelation() const; + inline void set_enrelation(::iot_idl::ENConditionRelation value); // required string strColumnName = 3; inline bool has_strcolumnname() const; @@ -171,16 +171,16 @@ class IDL_FILES_EXPORT DbCondition : public ::google::protobuf::Message { inline ::std::string* release_strcolumnname(); inline void set_allocated_strcolumnname(::std::string* strcolumnname); - // required .kbd_idlfile.SVariable msgValue = 4; + // required .iot_idl.SVariable msgValue = 4; inline bool has_msgvalue() const; inline void clear_msgvalue(); static const int kMsgValueFieldNumber = 4; - inline const ::kbd_idlfile::SVariable& msgvalue() const; - inline ::kbd_idlfile::SVariable* mutable_msgvalue(); - inline ::kbd_idlfile::SVariable* release_msgvalue(); - inline void set_allocated_msgvalue(::kbd_idlfile::SVariable* msgvalue); + inline const ::iot_idl::SVariable& msgvalue() const; + inline ::iot_idl::SVariable* mutable_msgvalue(); + inline ::iot_idl::SVariable* release_msgvalue(); + inline void set_allocated_msgvalue(::iot_idl::SVariable* msgvalue); - // @@protoc_insertion_point(class_scope:kbd_idlfile.DbCondition) + // @@protoc_insertion_point(class_scope:iot_idl.DbCondition) private: inline void set_has_enlogic(); inline void clear_has_enlogic(); @@ -198,7 +198,7 @@ class IDL_FILES_EXPORT DbCondition : public ::google::protobuf::Message { int enlogic_; int enrelation_; ::std::string* strcolumnname_; - ::kbd_idlfile::SVariable* msgvalue_; + ::iot_idl::SVariable* msgvalue_; friend void IDL_FILES_EXPORT protobuf_AddDesc_DbSaveMessage_2eproto(); friend void protobuf_AssignDesc_DbSaveMessage_2eproto(); friend void protobuf_ShutdownFile_DbSaveMessage_2eproto(); @@ -261,19 +261,19 @@ class IDL_FILES_EXPORT DbConditionHead : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // optional .kbd_idlfile.ENConditionLogic enLogic = 1; + // optional .iot_idl.ENConditionLogic enLogic = 1; inline bool has_enlogic() const; inline void clear_enlogic(); static const int kEnLogicFieldNumber = 1; - inline ::kbd_idlfile::ENConditionLogic enlogic() const; - inline void set_enlogic(::kbd_idlfile::ENConditionLogic value); + inline ::iot_idl::ENConditionLogic enlogic() const; + inline void set_enlogic(::iot_idl::ENConditionLogic value); - // required .kbd_idlfile.ENConditionRelation enRelation = 2; + // required .iot_idl.ENConditionRelation enRelation = 2; inline bool has_enrelation() const; inline void clear_enrelation(); static const int kEnRelationFieldNumber = 2; - inline ::kbd_idlfile::ENConditionRelation enrelation() const; - inline void set_enrelation(::kbd_idlfile::ENConditionRelation value); + inline ::iot_idl::ENConditionRelation enrelation() const; + inline void set_enrelation(::iot_idl::ENConditionRelation value); // required string strColumnName = 3; inline bool has_strcolumnname() const; @@ -287,7 +287,7 @@ class IDL_FILES_EXPORT DbConditionHead : public ::google::protobuf::Message { inline ::std::string* release_strcolumnname(); inline void set_allocated_strcolumnname(::std::string* strcolumnname); - // @@protoc_insertion_point(class_scope:kbd_idlfile.DbConditionHead) + // @@protoc_insertion_point(class_scope:iot_idl.DbConditionHead) private: inline void set_has_enlogic(); inline void clear_has_enlogic(); @@ -365,26 +365,26 @@ class IDL_FILES_EXPORT DbValueArray : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // repeated .kbd_idlfile.SVariable msgValue = 1; + // repeated .iot_idl.SVariable msgValue = 1; inline int msgvalue_size() const; inline void clear_msgvalue(); static const int kMsgValueFieldNumber = 1; - inline const ::kbd_idlfile::SVariable& msgvalue(int index) const; - inline ::kbd_idlfile::SVariable* mutable_msgvalue(int index); - inline ::kbd_idlfile::SVariable* add_msgvalue(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVariable >& + inline const ::iot_idl::SVariable& msgvalue(int index) const; + inline ::iot_idl::SVariable* mutable_msgvalue(int index); + inline ::iot_idl::SVariable* add_msgvalue(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SVariable >& msgvalue() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVariable >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SVariable >* mutable_msgvalue(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.DbValueArray) + // @@protoc_insertion_point(class_scope:iot_idl.DbValueArray) private: ::google::protobuf::UnknownFieldSet _unknown_fields_; ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVariable > msgvalue_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SVariable > msgvalue_; friend void IDL_FILES_EXPORT protobuf_AddDesc_DbSaveMessage_2eproto(); friend void protobuf_AssignDesc_DbSaveMessage_2eproto(); friend void protobuf_ShutdownFile_DbSaveMessage_2eproto(); @@ -459,16 +459,16 @@ class IDL_FILES_EXPORT DbUpdateValue : public ::google::protobuf::Message { inline ::std::string* release_strcolumnname(); inline void set_allocated_strcolumnname(::std::string* strcolumnname); - // required .kbd_idlfile.SVariable msgValue = 2; + // required .iot_idl.SVariable msgValue = 2; inline bool has_msgvalue() const; inline void clear_msgvalue(); static const int kMsgValueFieldNumber = 2; - inline const ::kbd_idlfile::SVariable& msgvalue() const; - inline ::kbd_idlfile::SVariable* mutable_msgvalue(); - inline ::kbd_idlfile::SVariable* release_msgvalue(); - inline void set_allocated_msgvalue(::kbd_idlfile::SVariable* msgvalue); + inline const ::iot_idl::SVariable& msgvalue() const; + inline ::iot_idl::SVariable* mutable_msgvalue(); + inline ::iot_idl::SVariable* release_msgvalue(); + inline void set_allocated_msgvalue(::iot_idl::SVariable* msgvalue); - // @@protoc_insertion_point(class_scope:kbd_idlfile.DbUpdateValue) + // @@protoc_insertion_point(class_scope:iot_idl.DbUpdateValue) private: inline void set_has_strcolumnname(); inline void clear_has_strcolumnname(); @@ -480,7 +480,7 @@ class IDL_FILES_EXPORT DbUpdateValue : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::std::string* strcolumnname_; - ::kbd_idlfile::SVariable* msgvalue_; + ::iot_idl::SVariable* msgvalue_; friend void IDL_FILES_EXPORT protobuf_AddDesc_DbSaveMessage_2eproto(); friend void protobuf_AssignDesc_DbSaveMessage_2eproto(); friend void protobuf_ShutdownFile_DbSaveMessage_2eproto(); @@ -543,12 +543,12 @@ class IDL_FILES_EXPORT DbInsert : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // required .iot_idl.enDssSaveAction enSaveAction = 1; inline bool has_ensaveaction() const; inline void clear_ensaveaction(); static const int kEnSaveActionFieldNumber = 1; - inline ::kbd_idlfile::enDssSaveAction ensaveaction() const; - inline void set_ensaveaction(::kbd_idlfile::enDssSaveAction value); + inline ::iot_idl::enDssSaveAction ensaveaction() const; + inline void set_ensaveaction(::iot_idl::enDssSaveAction value); // required string strTableName = 2; inline bool has_strtablename() const; @@ -578,19 +578,19 @@ class IDL_FILES_EXPORT DbInsert : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& strcolumnname() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_strcolumnname(); - // repeated .kbd_idlfile.DbValueArray msgRecord = 4; + // repeated .iot_idl.DbValueArray msgRecord = 4; inline int msgrecord_size() const; inline void clear_msgrecord(); static const int kMsgRecordFieldNumber = 4; - inline const ::kbd_idlfile::DbValueArray& msgrecord(int index) const; - inline ::kbd_idlfile::DbValueArray* mutable_msgrecord(int index); - inline ::kbd_idlfile::DbValueArray* add_msgrecord(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbValueArray >& + inline const ::iot_idl::DbValueArray& msgrecord(int index) const; + inline ::iot_idl::DbValueArray* mutable_msgrecord(int index); + inline ::iot_idl::DbValueArray* add_msgrecord(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbValueArray >& msgrecord() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbValueArray >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbValueArray >* mutable_msgrecord(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.DbInsert) + // @@protoc_insertion_point(class_scope:iot_idl.DbInsert) private: inline void set_has_ensaveaction(); inline void clear_has_ensaveaction(); @@ -603,7 +603,7 @@ class IDL_FILES_EXPORT DbInsert : public ::google::protobuf::Message { mutable int _cached_size_; ::std::string* strtablename_; ::google::protobuf::RepeatedPtrField< ::std::string> strcolumnname_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbValueArray > msgrecord_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::DbValueArray > msgrecord_; int ensaveaction_; friend void IDL_FILES_EXPORT protobuf_AddDesc_DbSaveMessage_2eproto(); friend void protobuf_AssignDesc_DbSaveMessage_2eproto(); @@ -667,12 +667,12 @@ class IDL_FILES_EXPORT DbRemove : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // required .iot_idl.enDssSaveAction enSaveAction = 1; inline bool has_ensaveaction() const; inline void clear_ensaveaction(); static const int kEnSaveActionFieldNumber = 1; - inline ::kbd_idlfile::enDssSaveAction ensaveaction() const; - inline void set_ensaveaction(::kbd_idlfile::enDssSaveAction value); + inline ::iot_idl::enDssSaveAction ensaveaction() const; + inline void set_ensaveaction(::iot_idl::enDssSaveAction value); // required string strTableName = 2; inline bool has_strtablename() const; @@ -686,19 +686,19 @@ class IDL_FILES_EXPORT DbRemove : public ::google::protobuf::Message { inline ::std::string* release_strtablename(); inline void set_allocated_strtablename(::std::string* strtablename); - // repeated .kbd_idlfile.DbCondition msgCondtionArray = 3; + // repeated .iot_idl.DbCondition msgCondtionArray = 3; inline int msgcondtionarray_size() const; inline void clear_msgcondtionarray(); static const int kMsgCondtionArrayFieldNumber = 3; - inline const ::kbd_idlfile::DbCondition& msgcondtionarray(int index) const; - inline ::kbd_idlfile::DbCondition* mutable_msgcondtionarray(int index); - inline ::kbd_idlfile::DbCondition* add_msgcondtionarray(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbCondition >& + inline const ::iot_idl::DbCondition& msgcondtionarray(int index) const; + inline ::iot_idl::DbCondition* mutable_msgcondtionarray(int index); + inline ::iot_idl::DbCondition* add_msgcondtionarray(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbCondition >& msgcondtionarray() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbCondition >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbCondition >* mutable_msgcondtionarray(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.DbRemove) + // @@protoc_insertion_point(class_scope:iot_idl.DbRemove) private: inline void set_has_ensaveaction(); inline void clear_has_ensaveaction(); @@ -710,7 +710,7 @@ class IDL_FILES_EXPORT DbRemove : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::std::string* strtablename_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbCondition > msgcondtionarray_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::DbCondition > msgcondtionarray_; int ensaveaction_; friend void IDL_FILES_EXPORT protobuf_AddDesc_DbSaveMessage_2eproto(); friend void protobuf_AssignDesc_DbSaveMessage_2eproto(); @@ -774,12 +774,12 @@ class IDL_FILES_EXPORT DbRemoveMulti : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // required .iot_idl.enDssSaveAction enSaveAction = 1; inline bool has_ensaveaction() const; inline void clear_ensaveaction(); static const int kEnSaveActionFieldNumber = 1; - inline ::kbd_idlfile::enDssSaveAction ensaveaction() const; - inline void set_ensaveaction(::kbd_idlfile::enDssSaveAction value); + inline ::iot_idl::enDssSaveAction ensaveaction() const; + inline void set_ensaveaction(::iot_idl::enDssSaveAction value); // required string strTableName = 2; inline bool has_strtablename() const; @@ -793,31 +793,31 @@ class IDL_FILES_EXPORT DbRemoveMulti : public ::google::protobuf::Message { inline ::std::string* release_strtablename(); inline void set_allocated_strtablename(::std::string* strtablename); - // repeated .kbd_idlfile.DbConditionHead msgConditionHead = 3; + // repeated .iot_idl.DbConditionHead msgConditionHead = 3; inline int msgconditionhead_size() const; inline void clear_msgconditionhead(); static const int kMsgConditionHeadFieldNumber = 3; - inline const ::kbd_idlfile::DbConditionHead& msgconditionhead(int index) const; - inline ::kbd_idlfile::DbConditionHead* mutable_msgconditionhead(int index); - inline ::kbd_idlfile::DbConditionHead* add_msgconditionhead(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbConditionHead >& + inline const ::iot_idl::DbConditionHead& msgconditionhead(int index) const; + inline ::iot_idl::DbConditionHead* mutable_msgconditionhead(int index); + inline ::iot_idl::DbConditionHead* add_msgconditionhead(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbConditionHead >& msgconditionhead() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbConditionHead >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbConditionHead >* mutable_msgconditionhead(); - // repeated .kbd_idlfile.DbValueArray msgConditionValue = 4; + // repeated .iot_idl.DbValueArray msgConditionValue = 4; inline int msgconditionvalue_size() const; inline void clear_msgconditionvalue(); static const int kMsgConditionValueFieldNumber = 4; - inline const ::kbd_idlfile::DbValueArray& msgconditionvalue(int index) const; - inline ::kbd_idlfile::DbValueArray* mutable_msgconditionvalue(int index); - inline ::kbd_idlfile::DbValueArray* add_msgconditionvalue(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbValueArray >& + inline const ::iot_idl::DbValueArray& msgconditionvalue(int index) const; + inline ::iot_idl::DbValueArray* mutable_msgconditionvalue(int index); + inline ::iot_idl::DbValueArray* add_msgconditionvalue(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbValueArray >& msgconditionvalue() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbValueArray >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbValueArray >* mutable_msgconditionvalue(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.DbRemoveMulti) + // @@protoc_insertion_point(class_scope:iot_idl.DbRemoveMulti) private: inline void set_has_ensaveaction(); inline void clear_has_ensaveaction(); @@ -829,8 +829,8 @@ class IDL_FILES_EXPORT DbRemoveMulti : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::std::string* strtablename_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbConditionHead > msgconditionhead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbValueArray > msgconditionvalue_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::DbConditionHead > msgconditionhead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::DbValueArray > msgconditionvalue_; int ensaveaction_; friend void IDL_FILES_EXPORT protobuf_AddDesc_DbSaveMessage_2eproto(); friend void protobuf_AssignDesc_DbSaveMessage_2eproto(); @@ -894,12 +894,12 @@ class IDL_FILES_EXPORT DbUpdate : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // required .iot_idl.enDssSaveAction enSaveAction = 1; inline bool has_ensaveaction() const; inline void clear_ensaveaction(); static const int kEnSaveActionFieldNumber = 1; - inline ::kbd_idlfile::enDssSaveAction ensaveaction() const; - inline void set_ensaveaction(::kbd_idlfile::enDssSaveAction value); + inline ::iot_idl::enDssSaveAction ensaveaction() const; + inline void set_ensaveaction(::iot_idl::enDssSaveAction value); // required string strTableName = 2; inline bool has_strtablename() const; @@ -913,31 +913,31 @@ class IDL_FILES_EXPORT DbUpdate : public ::google::protobuf::Message { inline ::std::string* release_strtablename(); inline void set_allocated_strtablename(::std::string* strtablename); - // repeated .kbd_idlfile.DbUpdateValue msgUpdateValue = 3; + // repeated .iot_idl.DbUpdateValue msgUpdateValue = 3; inline int msgupdatevalue_size() const; inline void clear_msgupdatevalue(); static const int kMsgUpdateValueFieldNumber = 3; - inline const ::kbd_idlfile::DbUpdateValue& msgupdatevalue(int index) const; - inline ::kbd_idlfile::DbUpdateValue* mutable_msgupdatevalue(int index); - inline ::kbd_idlfile::DbUpdateValue* add_msgupdatevalue(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbUpdateValue >& + inline const ::iot_idl::DbUpdateValue& msgupdatevalue(int index) const; + inline ::iot_idl::DbUpdateValue* mutable_msgupdatevalue(int index); + inline ::iot_idl::DbUpdateValue* add_msgupdatevalue(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbUpdateValue >& msgupdatevalue() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbUpdateValue >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbUpdateValue >* mutable_msgupdatevalue(); - // repeated .kbd_idlfile.DbCondition msgCondition = 4; + // repeated .iot_idl.DbCondition msgCondition = 4; inline int msgcondition_size() const; inline void clear_msgcondition(); static const int kMsgConditionFieldNumber = 4; - inline const ::kbd_idlfile::DbCondition& msgcondition(int index) const; - inline ::kbd_idlfile::DbCondition* mutable_msgcondition(int index); - inline ::kbd_idlfile::DbCondition* add_msgcondition(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbCondition >& + inline const ::iot_idl::DbCondition& msgcondition(int index) const; + inline ::iot_idl::DbCondition* mutable_msgcondition(int index); + inline ::iot_idl::DbCondition* add_msgcondition(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbCondition >& msgcondition() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbCondition >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbCondition >* mutable_msgcondition(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.DbUpdate) + // @@protoc_insertion_point(class_scope:iot_idl.DbUpdate) private: inline void set_has_ensaveaction(); inline void clear_has_ensaveaction(); @@ -949,8 +949,8 @@ class IDL_FILES_EXPORT DbUpdate : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::std::string* strtablename_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbUpdateValue > msgupdatevalue_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbCondition > msgcondition_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::DbUpdateValue > msgupdatevalue_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::DbCondition > msgcondition_; int ensaveaction_; friend void IDL_FILES_EXPORT protobuf_AddDesc_DbSaveMessage_2eproto(); friend void protobuf_AssignDesc_DbSaveMessage_2eproto(); @@ -1014,12 +1014,12 @@ class IDL_FILES_EXPORT DbUpdateMulti : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.enDssSaveAction enSaveAction = 1; + // required .iot_idl.enDssSaveAction enSaveAction = 1; inline bool has_ensaveaction() const; inline void clear_ensaveaction(); static const int kEnSaveActionFieldNumber = 1; - inline ::kbd_idlfile::enDssSaveAction ensaveaction() const; - inline void set_ensaveaction(::kbd_idlfile::enDssSaveAction value); + inline ::iot_idl::enDssSaveAction ensaveaction() const; + inline void set_ensaveaction(::iot_idl::enDssSaveAction value); // required string strTableName = 2; inline bool has_strtablename() const; @@ -1033,43 +1033,43 @@ class IDL_FILES_EXPORT DbUpdateMulti : public ::google::protobuf::Message { inline ::std::string* release_strtablename(); inline void set_allocated_strtablename(::std::string* strtablename); - // repeated .kbd_idlfile.DbUpdateValue msgUpdateValue = 3; + // repeated .iot_idl.DbUpdateValue msgUpdateValue = 3; inline int msgupdatevalue_size() const; inline void clear_msgupdatevalue(); static const int kMsgUpdateValueFieldNumber = 3; - inline const ::kbd_idlfile::DbUpdateValue& msgupdatevalue(int index) const; - inline ::kbd_idlfile::DbUpdateValue* mutable_msgupdatevalue(int index); - inline ::kbd_idlfile::DbUpdateValue* add_msgupdatevalue(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbUpdateValue >& + inline const ::iot_idl::DbUpdateValue& msgupdatevalue(int index) const; + inline ::iot_idl::DbUpdateValue* mutable_msgupdatevalue(int index); + inline ::iot_idl::DbUpdateValue* add_msgupdatevalue(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbUpdateValue >& msgupdatevalue() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbUpdateValue >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbUpdateValue >* mutable_msgupdatevalue(); - // repeated .kbd_idlfile.DbConditionHead msgConditionHead = 4; + // repeated .iot_idl.DbConditionHead msgConditionHead = 4; inline int msgconditionhead_size() const; inline void clear_msgconditionhead(); static const int kMsgConditionHeadFieldNumber = 4; - inline const ::kbd_idlfile::DbConditionHead& msgconditionhead(int index) const; - inline ::kbd_idlfile::DbConditionHead* mutable_msgconditionhead(int index); - inline ::kbd_idlfile::DbConditionHead* add_msgconditionhead(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbConditionHead >& + inline const ::iot_idl::DbConditionHead& msgconditionhead(int index) const; + inline ::iot_idl::DbConditionHead* mutable_msgconditionhead(int index); + inline ::iot_idl::DbConditionHead* add_msgconditionhead(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbConditionHead >& msgconditionhead() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbConditionHead >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbConditionHead >* mutable_msgconditionhead(); - // repeated .kbd_idlfile.DbValueArray msgConditionValue = 5; + // repeated .iot_idl.DbValueArray msgConditionValue = 5; inline int msgconditionvalue_size() const; inline void clear_msgconditionvalue(); static const int kMsgConditionValueFieldNumber = 5; - inline const ::kbd_idlfile::DbValueArray& msgconditionvalue(int index) const; - inline ::kbd_idlfile::DbValueArray* mutable_msgconditionvalue(int index); - inline ::kbd_idlfile::DbValueArray* add_msgconditionvalue(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbValueArray >& + inline const ::iot_idl::DbValueArray& msgconditionvalue(int index) const; + inline ::iot_idl::DbValueArray* mutable_msgconditionvalue(int index); + inline ::iot_idl::DbValueArray* add_msgconditionvalue(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbValueArray >& msgconditionvalue() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbValueArray >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbValueArray >* mutable_msgconditionvalue(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.DbUpdateMulti) + // @@protoc_insertion_point(class_scope:iot_idl.DbUpdateMulti) private: inline void set_has_ensaveaction(); inline void clear_has_ensaveaction(); @@ -1081,9 +1081,9 @@ class IDL_FILES_EXPORT DbUpdateMulti : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::std::string* strtablename_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbUpdateValue > msgupdatevalue_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbConditionHead > msgconditionhead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbValueArray > msgconditionvalue_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::DbUpdateValue > msgupdatevalue_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::DbConditionHead > msgconditionhead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::DbValueArray > msgconditionvalue_; int ensaveaction_; friend void IDL_FILES_EXPORT protobuf_AddDesc_DbSaveMessage_2eproto(); friend void protobuf_AssignDesc_DbSaveMessage_2eproto(); @@ -1147,52 +1147,52 @@ class IDL_FILES_EXPORT DbRequest : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // optional .kbd_idlfile.DbInsert msgInsert = 1; + // optional .iot_idl.DbInsert msgInsert = 1; inline bool has_msginsert() const; inline void clear_msginsert(); static const int kMsgInsertFieldNumber = 1; - inline const ::kbd_idlfile::DbInsert& msginsert() const; - inline ::kbd_idlfile::DbInsert* mutable_msginsert(); - inline ::kbd_idlfile::DbInsert* release_msginsert(); - inline void set_allocated_msginsert(::kbd_idlfile::DbInsert* msginsert); + inline const ::iot_idl::DbInsert& msginsert() const; + inline ::iot_idl::DbInsert* mutable_msginsert(); + inline ::iot_idl::DbInsert* release_msginsert(); + inline void set_allocated_msginsert(::iot_idl::DbInsert* msginsert); - // optional .kbd_idlfile.DbRemove msgRemove = 2; + // optional .iot_idl.DbRemove msgRemove = 2; inline bool has_msgremove() const; inline void clear_msgremove(); static const int kMsgRemoveFieldNumber = 2; - inline const ::kbd_idlfile::DbRemove& msgremove() const; - inline ::kbd_idlfile::DbRemove* mutable_msgremove(); - inline ::kbd_idlfile::DbRemove* release_msgremove(); - inline void set_allocated_msgremove(::kbd_idlfile::DbRemove* msgremove); + inline const ::iot_idl::DbRemove& msgremove() const; + inline ::iot_idl::DbRemove* mutable_msgremove(); + inline ::iot_idl::DbRemove* release_msgremove(); + inline void set_allocated_msgremove(::iot_idl::DbRemove* msgremove); - // optional .kbd_idlfile.DbRemoveMulti msgRemoveMulti = 3; + // optional .iot_idl.DbRemoveMulti msgRemoveMulti = 3; inline bool has_msgremovemulti() const; inline void clear_msgremovemulti(); static const int kMsgRemoveMultiFieldNumber = 3; - inline const ::kbd_idlfile::DbRemoveMulti& msgremovemulti() const; - inline ::kbd_idlfile::DbRemoveMulti* mutable_msgremovemulti(); - inline ::kbd_idlfile::DbRemoveMulti* release_msgremovemulti(); - inline void set_allocated_msgremovemulti(::kbd_idlfile::DbRemoveMulti* msgremovemulti); + inline const ::iot_idl::DbRemoveMulti& msgremovemulti() const; + inline ::iot_idl::DbRemoveMulti* mutable_msgremovemulti(); + inline ::iot_idl::DbRemoveMulti* release_msgremovemulti(); + inline void set_allocated_msgremovemulti(::iot_idl::DbRemoveMulti* msgremovemulti); - // optional .kbd_idlfile.DbUpdate msgUpdate = 4; + // optional .iot_idl.DbUpdate msgUpdate = 4; inline bool has_msgupdate() const; inline void clear_msgupdate(); static const int kMsgUpdateFieldNumber = 4; - inline const ::kbd_idlfile::DbUpdate& msgupdate() const; - inline ::kbd_idlfile::DbUpdate* mutable_msgupdate(); - inline ::kbd_idlfile::DbUpdate* release_msgupdate(); - inline void set_allocated_msgupdate(::kbd_idlfile::DbUpdate* msgupdate); + inline const ::iot_idl::DbUpdate& msgupdate() const; + inline ::iot_idl::DbUpdate* mutable_msgupdate(); + inline ::iot_idl::DbUpdate* release_msgupdate(); + inline void set_allocated_msgupdate(::iot_idl::DbUpdate* msgupdate); - // optional .kbd_idlfile.DbUpdateMulti msgUpdateMulti = 5; + // optional .iot_idl.DbUpdateMulti msgUpdateMulti = 5; inline bool has_msgupdatemulti() const; inline void clear_msgupdatemulti(); static const int kMsgUpdateMultiFieldNumber = 5; - inline const ::kbd_idlfile::DbUpdateMulti& msgupdatemulti() const; - inline ::kbd_idlfile::DbUpdateMulti* mutable_msgupdatemulti(); - inline ::kbd_idlfile::DbUpdateMulti* release_msgupdatemulti(); - inline void set_allocated_msgupdatemulti(::kbd_idlfile::DbUpdateMulti* msgupdatemulti); + inline const ::iot_idl::DbUpdateMulti& msgupdatemulti() const; + inline ::iot_idl::DbUpdateMulti* mutable_msgupdatemulti(); + inline ::iot_idl::DbUpdateMulti* release_msgupdatemulti(); + inline void set_allocated_msgupdatemulti(::iot_idl::DbUpdateMulti* msgupdatemulti); - // @@protoc_insertion_point(class_scope:kbd_idlfile.DbRequest) + // @@protoc_insertion_point(class_scope:iot_idl.DbRequest) private: inline void set_has_msginsert(); inline void clear_has_msginsert(); @@ -1209,11 +1209,11 @@ class IDL_FILES_EXPORT DbRequest : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::DbInsert* msginsert_; - ::kbd_idlfile::DbRemove* msgremove_; - ::kbd_idlfile::DbRemoveMulti* msgremovemulti_; - ::kbd_idlfile::DbUpdate* msgupdate_; - ::kbd_idlfile::DbUpdateMulti* msgupdatemulti_; + ::iot_idl::DbInsert* msginsert_; + ::iot_idl::DbRemove* msgremove_; + ::iot_idl::DbRemoveMulti* msgremovemulti_; + ::iot_idl::DbUpdate* msgupdate_; + ::iot_idl::DbUpdateMulti* msgupdatemulti_; friend void IDL_FILES_EXPORT protobuf_AddDesc_DbSaveMessage_2eproto(); friend void protobuf_AssignDesc_DbSaveMessage_2eproto(); friend void protobuf_ShutdownFile_DbSaveMessage_2eproto(); @@ -1228,7 +1228,7 @@ class IDL_FILES_EXPORT DbRequest : public ::google::protobuf::Message { // DbCondition -// optional .kbd_idlfile.ENConditionLogic enLogic = 1; +// optional .iot_idl.ENConditionLogic enLogic = 1; inline bool DbCondition::has_enlogic() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -1242,18 +1242,18 @@ inline void DbCondition::clear_enlogic() { enlogic_ = 0; clear_has_enlogic(); } -inline ::kbd_idlfile::ENConditionLogic DbCondition::enlogic() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbCondition.enLogic) - return static_cast< ::kbd_idlfile::ENConditionLogic >(enlogic_); +inline ::iot_idl::ENConditionLogic DbCondition::enlogic() const { + // @@protoc_insertion_point(field_get:iot_idl.DbCondition.enLogic) + return static_cast< ::iot_idl::ENConditionLogic >(enlogic_); } -inline void DbCondition::set_enlogic(::kbd_idlfile::ENConditionLogic value) { - assert(::kbd_idlfile::ENConditionLogic_IsValid(value)); +inline void DbCondition::set_enlogic(::iot_idl::ENConditionLogic value) { + assert(::iot_idl::ENConditionLogic_IsValid(value)); set_has_enlogic(); enlogic_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DbCondition.enLogic) + // @@protoc_insertion_point(field_set:iot_idl.DbCondition.enLogic) } -// required .kbd_idlfile.ENConditionRelation enRelation = 2; +// required .iot_idl.ENConditionRelation enRelation = 2; inline bool DbCondition::has_enrelation() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -1267,15 +1267,15 @@ inline void DbCondition::clear_enrelation() { enrelation_ = 0; clear_has_enrelation(); } -inline ::kbd_idlfile::ENConditionRelation DbCondition::enrelation() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbCondition.enRelation) - return static_cast< ::kbd_idlfile::ENConditionRelation >(enrelation_); +inline ::iot_idl::ENConditionRelation DbCondition::enrelation() const { + // @@protoc_insertion_point(field_get:iot_idl.DbCondition.enRelation) + return static_cast< ::iot_idl::ENConditionRelation >(enrelation_); } -inline void DbCondition::set_enrelation(::kbd_idlfile::ENConditionRelation value) { - assert(::kbd_idlfile::ENConditionRelation_IsValid(value)); +inline void DbCondition::set_enrelation(::iot_idl::ENConditionRelation value) { + assert(::iot_idl::ENConditionRelation_IsValid(value)); set_has_enrelation(); enrelation_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DbCondition.enRelation) + // @@protoc_insertion_point(field_set:iot_idl.DbCondition.enRelation) } // required string strColumnName = 3; @@ -1295,7 +1295,7 @@ inline void DbCondition::clear_strcolumnname() { clear_has_strcolumnname(); } inline const ::std::string& DbCondition::strcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbCondition.strColumnName) + // @@protoc_insertion_point(field_get:iot_idl.DbCondition.strColumnName) return *strcolumnname_; } inline void DbCondition::set_strcolumnname(const ::std::string& value) { @@ -1304,7 +1304,7 @@ inline void DbCondition::set_strcolumnname(const ::std::string& value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.DbCondition.strColumnName) + // @@protoc_insertion_point(field_set:iot_idl.DbCondition.strColumnName) } inline void DbCondition::set_strcolumnname(const char* value) { set_has_strcolumnname(); @@ -1312,7 +1312,7 @@ inline void DbCondition::set_strcolumnname(const char* value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.DbCondition.strColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.DbCondition.strColumnName) } inline void DbCondition::set_strcolumnname(const char* value, size_t size) { set_has_strcolumnname(); @@ -1320,14 +1320,14 @@ inline void DbCondition::set_strcolumnname(const char* value, size_t size) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.DbCondition.strColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.DbCondition.strColumnName) } inline ::std::string* DbCondition::mutable_strcolumnname() { set_has_strcolumnname(); if (strcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbCondition.strColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.DbCondition.strColumnName) return strcolumnname_; } inline ::std::string* DbCondition::release_strcolumnname() { @@ -1351,10 +1351,10 @@ inline void DbCondition::set_allocated_strcolumnname(::std::string* strcolumnnam clear_has_strcolumnname(); strcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DbCondition.strColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DbCondition.strColumnName) } -// required .kbd_idlfile.SVariable msgValue = 4; +// required .iot_idl.SVariable msgValue = 4; inline bool DbCondition::has_msgvalue() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -1365,26 +1365,26 @@ inline void DbCondition::clear_has_msgvalue() { _has_bits_[0] &= ~0x00000008u; } inline void DbCondition::clear_msgvalue() { - if (msgvalue_ != NULL) msgvalue_->::kbd_idlfile::SVariable::Clear(); + if (msgvalue_ != NULL) msgvalue_->::iot_idl::SVariable::Clear(); clear_has_msgvalue(); } -inline const ::kbd_idlfile::SVariable& DbCondition::msgvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbCondition.msgValue) +inline const ::iot_idl::SVariable& DbCondition::msgvalue() const { + // @@protoc_insertion_point(field_get:iot_idl.DbCondition.msgValue) return msgvalue_ != NULL ? *msgvalue_ : *default_instance_->msgvalue_; } -inline ::kbd_idlfile::SVariable* DbCondition::mutable_msgvalue() { +inline ::iot_idl::SVariable* DbCondition::mutable_msgvalue() { set_has_msgvalue(); - if (msgvalue_ == NULL) msgvalue_ = new ::kbd_idlfile::SVariable; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbCondition.msgValue) + if (msgvalue_ == NULL) msgvalue_ = new ::iot_idl::SVariable; + // @@protoc_insertion_point(field_mutable:iot_idl.DbCondition.msgValue) return msgvalue_; } -inline ::kbd_idlfile::SVariable* DbCondition::release_msgvalue() { +inline ::iot_idl::SVariable* DbCondition::release_msgvalue() { clear_has_msgvalue(); - ::kbd_idlfile::SVariable* temp = msgvalue_; + ::iot_idl::SVariable* temp = msgvalue_; msgvalue_ = NULL; return temp; } -inline void DbCondition::set_allocated_msgvalue(::kbd_idlfile::SVariable* msgvalue) { +inline void DbCondition::set_allocated_msgvalue(::iot_idl::SVariable* msgvalue) { delete msgvalue_; msgvalue_ = msgvalue; if (msgvalue) { @@ -1392,14 +1392,14 @@ inline void DbCondition::set_allocated_msgvalue(::kbd_idlfile::SVariable* msgval } else { clear_has_msgvalue(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DbCondition.msgValue) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DbCondition.msgValue) } // ------------------------------------------------------------------- // DbConditionHead -// optional .kbd_idlfile.ENConditionLogic enLogic = 1; +// optional .iot_idl.ENConditionLogic enLogic = 1; inline bool DbConditionHead::has_enlogic() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -1413,18 +1413,18 @@ inline void DbConditionHead::clear_enlogic() { enlogic_ = 0; clear_has_enlogic(); } -inline ::kbd_idlfile::ENConditionLogic DbConditionHead::enlogic() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbConditionHead.enLogic) - return static_cast< ::kbd_idlfile::ENConditionLogic >(enlogic_); +inline ::iot_idl::ENConditionLogic DbConditionHead::enlogic() const { + // @@protoc_insertion_point(field_get:iot_idl.DbConditionHead.enLogic) + return static_cast< ::iot_idl::ENConditionLogic >(enlogic_); } -inline void DbConditionHead::set_enlogic(::kbd_idlfile::ENConditionLogic value) { - assert(::kbd_idlfile::ENConditionLogic_IsValid(value)); +inline void DbConditionHead::set_enlogic(::iot_idl::ENConditionLogic value) { + assert(::iot_idl::ENConditionLogic_IsValid(value)); set_has_enlogic(); enlogic_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DbConditionHead.enLogic) + // @@protoc_insertion_point(field_set:iot_idl.DbConditionHead.enLogic) } -// required .kbd_idlfile.ENConditionRelation enRelation = 2; +// required .iot_idl.ENConditionRelation enRelation = 2; inline bool DbConditionHead::has_enrelation() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -1438,15 +1438,15 @@ inline void DbConditionHead::clear_enrelation() { enrelation_ = 0; clear_has_enrelation(); } -inline ::kbd_idlfile::ENConditionRelation DbConditionHead::enrelation() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbConditionHead.enRelation) - return static_cast< ::kbd_idlfile::ENConditionRelation >(enrelation_); +inline ::iot_idl::ENConditionRelation DbConditionHead::enrelation() const { + // @@protoc_insertion_point(field_get:iot_idl.DbConditionHead.enRelation) + return static_cast< ::iot_idl::ENConditionRelation >(enrelation_); } -inline void DbConditionHead::set_enrelation(::kbd_idlfile::ENConditionRelation value) { - assert(::kbd_idlfile::ENConditionRelation_IsValid(value)); +inline void DbConditionHead::set_enrelation(::iot_idl::ENConditionRelation value) { + assert(::iot_idl::ENConditionRelation_IsValid(value)); set_has_enrelation(); enrelation_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DbConditionHead.enRelation) + // @@protoc_insertion_point(field_set:iot_idl.DbConditionHead.enRelation) } // required string strColumnName = 3; @@ -1466,7 +1466,7 @@ inline void DbConditionHead::clear_strcolumnname() { clear_has_strcolumnname(); } inline const ::std::string& DbConditionHead::strcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbConditionHead.strColumnName) + // @@protoc_insertion_point(field_get:iot_idl.DbConditionHead.strColumnName) return *strcolumnname_; } inline void DbConditionHead::set_strcolumnname(const ::std::string& value) { @@ -1475,7 +1475,7 @@ inline void DbConditionHead::set_strcolumnname(const ::std::string& value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.DbConditionHead.strColumnName) + // @@protoc_insertion_point(field_set:iot_idl.DbConditionHead.strColumnName) } inline void DbConditionHead::set_strcolumnname(const char* value) { set_has_strcolumnname(); @@ -1483,7 +1483,7 @@ inline void DbConditionHead::set_strcolumnname(const char* value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.DbConditionHead.strColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.DbConditionHead.strColumnName) } inline void DbConditionHead::set_strcolumnname(const char* value, size_t size) { set_has_strcolumnname(); @@ -1491,14 +1491,14 @@ inline void DbConditionHead::set_strcolumnname(const char* value, size_t size) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.DbConditionHead.strColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.DbConditionHead.strColumnName) } inline ::std::string* DbConditionHead::mutable_strcolumnname() { set_has_strcolumnname(); if (strcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbConditionHead.strColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.DbConditionHead.strColumnName) return strcolumnname_; } inline ::std::string* DbConditionHead::release_strcolumnname() { @@ -1522,40 +1522,40 @@ inline void DbConditionHead::set_allocated_strcolumnname(::std::string* strcolum clear_has_strcolumnname(); strcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DbConditionHead.strColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DbConditionHead.strColumnName) } // ------------------------------------------------------------------- // DbValueArray -// repeated .kbd_idlfile.SVariable msgValue = 1; +// repeated .iot_idl.SVariable msgValue = 1; inline int DbValueArray::msgvalue_size() const { return msgvalue_.size(); } inline void DbValueArray::clear_msgvalue() { msgvalue_.Clear(); } -inline const ::kbd_idlfile::SVariable& DbValueArray::msgvalue(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbValueArray.msgValue) +inline const ::iot_idl::SVariable& DbValueArray::msgvalue(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.DbValueArray.msgValue) return msgvalue_.Get(index); } -inline ::kbd_idlfile::SVariable* DbValueArray::mutable_msgvalue(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbValueArray.msgValue) +inline ::iot_idl::SVariable* DbValueArray::mutable_msgvalue(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.DbValueArray.msgValue) return msgvalue_.Mutable(index); } -inline ::kbd_idlfile::SVariable* DbValueArray::add_msgvalue() { - // @@protoc_insertion_point(field_add:kbd_idlfile.DbValueArray.msgValue) +inline ::iot_idl::SVariable* DbValueArray::add_msgvalue() { + // @@protoc_insertion_point(field_add:iot_idl.DbValueArray.msgValue) return msgvalue_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVariable >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SVariable >& DbValueArray::msgvalue() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.DbValueArray.msgValue) + // @@protoc_insertion_point(field_list:iot_idl.DbValueArray.msgValue) return msgvalue_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVariable >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SVariable >* DbValueArray::mutable_msgvalue() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.DbValueArray.msgValue) + // @@protoc_insertion_point(field_mutable_list:iot_idl.DbValueArray.msgValue) return &msgvalue_; } @@ -1580,7 +1580,7 @@ inline void DbUpdateValue::clear_strcolumnname() { clear_has_strcolumnname(); } inline const ::std::string& DbUpdateValue::strcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbUpdateValue.strColumnName) + // @@protoc_insertion_point(field_get:iot_idl.DbUpdateValue.strColumnName) return *strcolumnname_; } inline void DbUpdateValue::set_strcolumnname(const ::std::string& value) { @@ -1589,7 +1589,7 @@ inline void DbUpdateValue::set_strcolumnname(const ::std::string& value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.DbUpdateValue.strColumnName) + // @@protoc_insertion_point(field_set:iot_idl.DbUpdateValue.strColumnName) } inline void DbUpdateValue::set_strcolumnname(const char* value) { set_has_strcolumnname(); @@ -1597,7 +1597,7 @@ inline void DbUpdateValue::set_strcolumnname(const char* value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.DbUpdateValue.strColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.DbUpdateValue.strColumnName) } inline void DbUpdateValue::set_strcolumnname(const char* value, size_t size) { set_has_strcolumnname(); @@ -1605,14 +1605,14 @@ inline void DbUpdateValue::set_strcolumnname(const char* value, size_t size) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.DbUpdateValue.strColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.DbUpdateValue.strColumnName) } inline ::std::string* DbUpdateValue::mutable_strcolumnname() { set_has_strcolumnname(); if (strcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbUpdateValue.strColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.DbUpdateValue.strColumnName) return strcolumnname_; } inline ::std::string* DbUpdateValue::release_strcolumnname() { @@ -1636,10 +1636,10 @@ inline void DbUpdateValue::set_allocated_strcolumnname(::std::string* strcolumnn clear_has_strcolumnname(); strcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DbUpdateValue.strColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DbUpdateValue.strColumnName) } -// required .kbd_idlfile.SVariable msgValue = 2; +// required .iot_idl.SVariable msgValue = 2; inline bool DbUpdateValue::has_msgvalue() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -1650,26 +1650,26 @@ inline void DbUpdateValue::clear_has_msgvalue() { _has_bits_[0] &= ~0x00000002u; } inline void DbUpdateValue::clear_msgvalue() { - if (msgvalue_ != NULL) msgvalue_->::kbd_idlfile::SVariable::Clear(); + if (msgvalue_ != NULL) msgvalue_->::iot_idl::SVariable::Clear(); clear_has_msgvalue(); } -inline const ::kbd_idlfile::SVariable& DbUpdateValue::msgvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbUpdateValue.msgValue) +inline const ::iot_idl::SVariable& DbUpdateValue::msgvalue() const { + // @@protoc_insertion_point(field_get:iot_idl.DbUpdateValue.msgValue) return msgvalue_ != NULL ? *msgvalue_ : *default_instance_->msgvalue_; } -inline ::kbd_idlfile::SVariable* DbUpdateValue::mutable_msgvalue() { +inline ::iot_idl::SVariable* DbUpdateValue::mutable_msgvalue() { set_has_msgvalue(); - if (msgvalue_ == NULL) msgvalue_ = new ::kbd_idlfile::SVariable; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbUpdateValue.msgValue) + if (msgvalue_ == NULL) msgvalue_ = new ::iot_idl::SVariable; + // @@protoc_insertion_point(field_mutable:iot_idl.DbUpdateValue.msgValue) return msgvalue_; } -inline ::kbd_idlfile::SVariable* DbUpdateValue::release_msgvalue() { +inline ::iot_idl::SVariable* DbUpdateValue::release_msgvalue() { clear_has_msgvalue(); - ::kbd_idlfile::SVariable* temp = msgvalue_; + ::iot_idl::SVariable* temp = msgvalue_; msgvalue_ = NULL; return temp; } -inline void DbUpdateValue::set_allocated_msgvalue(::kbd_idlfile::SVariable* msgvalue) { +inline void DbUpdateValue::set_allocated_msgvalue(::iot_idl::SVariable* msgvalue) { delete msgvalue_; msgvalue_ = msgvalue; if (msgvalue) { @@ -1677,14 +1677,14 @@ inline void DbUpdateValue::set_allocated_msgvalue(::kbd_idlfile::SVariable* msgv } else { clear_has_msgvalue(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DbUpdateValue.msgValue) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DbUpdateValue.msgValue) } // ------------------------------------------------------------------- // DbInsert -// required .kbd_idlfile.enDssSaveAction enSaveAction = 1; +// required .iot_idl.enDssSaveAction enSaveAction = 1; inline bool DbInsert::has_ensaveaction() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -1698,15 +1698,15 @@ inline void DbInsert::clear_ensaveaction() { ensaveaction_ = 0; clear_has_ensaveaction(); } -inline ::kbd_idlfile::enDssSaveAction DbInsert::ensaveaction() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbInsert.enSaveAction) - return static_cast< ::kbd_idlfile::enDssSaveAction >(ensaveaction_); +inline ::iot_idl::enDssSaveAction DbInsert::ensaveaction() const { + // @@protoc_insertion_point(field_get:iot_idl.DbInsert.enSaveAction) + return static_cast< ::iot_idl::enDssSaveAction >(ensaveaction_); } -inline void DbInsert::set_ensaveaction(::kbd_idlfile::enDssSaveAction value) { - assert(::kbd_idlfile::enDssSaveAction_IsValid(value)); +inline void DbInsert::set_ensaveaction(::iot_idl::enDssSaveAction value) { + assert(::iot_idl::enDssSaveAction_IsValid(value)); set_has_ensaveaction(); ensaveaction_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DbInsert.enSaveAction) + // @@protoc_insertion_point(field_set:iot_idl.DbInsert.enSaveAction) } // required string strTableName = 2; @@ -1726,7 +1726,7 @@ inline void DbInsert::clear_strtablename() { clear_has_strtablename(); } inline const ::std::string& DbInsert::strtablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbInsert.strTableName) + // @@protoc_insertion_point(field_get:iot_idl.DbInsert.strTableName) return *strtablename_; } inline void DbInsert::set_strtablename(const ::std::string& value) { @@ -1735,7 +1735,7 @@ inline void DbInsert::set_strtablename(const ::std::string& value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.DbInsert.strTableName) + // @@protoc_insertion_point(field_set:iot_idl.DbInsert.strTableName) } inline void DbInsert::set_strtablename(const char* value) { set_has_strtablename(); @@ -1743,7 +1743,7 @@ inline void DbInsert::set_strtablename(const char* value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.DbInsert.strTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.DbInsert.strTableName) } inline void DbInsert::set_strtablename(const char* value, size_t size) { set_has_strtablename(); @@ -1751,14 +1751,14 @@ inline void DbInsert::set_strtablename(const char* value, size_t size) { strtablename_ = new ::std::string; } strtablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.DbInsert.strTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.DbInsert.strTableName) } inline ::std::string* DbInsert::mutable_strtablename() { set_has_strtablename(); if (strtablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbInsert.strTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.DbInsert.strTableName) return strtablename_; } inline ::std::string* DbInsert::release_strtablename() { @@ -1782,7 +1782,7 @@ inline void DbInsert::set_allocated_strtablename(::std::string* strtablename) { clear_has_strtablename(); strtablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DbInsert.strTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DbInsert.strTableName) } // repeated string strColumnName = 3; @@ -1793,79 +1793,79 @@ inline void DbInsert::clear_strcolumnname() { strcolumnname_.Clear(); } inline const ::std::string& DbInsert::strcolumnname(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbInsert.strColumnName) + // @@protoc_insertion_point(field_get:iot_idl.DbInsert.strColumnName) return strcolumnname_.Get(index); } inline ::std::string* DbInsert::mutable_strcolumnname(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbInsert.strColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.DbInsert.strColumnName) return strcolumnname_.Mutable(index); } inline void DbInsert::set_strcolumnname(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.DbInsert.strColumnName) + // @@protoc_insertion_point(field_set:iot_idl.DbInsert.strColumnName) strcolumnname_.Mutable(index)->assign(value); } inline void DbInsert::set_strcolumnname(int index, const char* value) { strcolumnname_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.DbInsert.strColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.DbInsert.strColumnName) } inline void DbInsert::set_strcolumnname(int index, const char* value, size_t size) { strcolumnname_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.DbInsert.strColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.DbInsert.strColumnName) } inline ::std::string* DbInsert::add_strcolumnname() { return strcolumnname_.Add(); } inline void DbInsert::add_strcolumnname(const ::std::string& value) { strcolumnname_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.DbInsert.strColumnName) + // @@protoc_insertion_point(field_add:iot_idl.DbInsert.strColumnName) } inline void DbInsert::add_strcolumnname(const char* value) { strcolumnname_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.DbInsert.strColumnName) + // @@protoc_insertion_point(field_add_char:iot_idl.DbInsert.strColumnName) } inline void DbInsert::add_strcolumnname(const char* value, size_t size) { strcolumnname_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.DbInsert.strColumnName) + // @@protoc_insertion_point(field_add_pointer:iot_idl.DbInsert.strColumnName) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& DbInsert::strcolumnname() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.DbInsert.strColumnName) + // @@protoc_insertion_point(field_list:iot_idl.DbInsert.strColumnName) return strcolumnname_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* DbInsert::mutable_strcolumnname() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.DbInsert.strColumnName) + // @@protoc_insertion_point(field_mutable_list:iot_idl.DbInsert.strColumnName) return &strcolumnname_; } -// repeated .kbd_idlfile.DbValueArray msgRecord = 4; +// repeated .iot_idl.DbValueArray msgRecord = 4; inline int DbInsert::msgrecord_size() const { return msgrecord_.size(); } inline void DbInsert::clear_msgrecord() { msgrecord_.Clear(); } -inline const ::kbd_idlfile::DbValueArray& DbInsert::msgrecord(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbInsert.msgRecord) +inline const ::iot_idl::DbValueArray& DbInsert::msgrecord(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.DbInsert.msgRecord) return msgrecord_.Get(index); } -inline ::kbd_idlfile::DbValueArray* DbInsert::mutable_msgrecord(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbInsert.msgRecord) +inline ::iot_idl::DbValueArray* DbInsert::mutable_msgrecord(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.DbInsert.msgRecord) return msgrecord_.Mutable(index); } -inline ::kbd_idlfile::DbValueArray* DbInsert::add_msgrecord() { - // @@protoc_insertion_point(field_add:kbd_idlfile.DbInsert.msgRecord) +inline ::iot_idl::DbValueArray* DbInsert::add_msgrecord() { + // @@protoc_insertion_point(field_add:iot_idl.DbInsert.msgRecord) return msgrecord_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbValueArray >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbValueArray >& DbInsert::msgrecord() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.DbInsert.msgRecord) + // @@protoc_insertion_point(field_list:iot_idl.DbInsert.msgRecord) return msgrecord_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbValueArray >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbValueArray >* DbInsert::mutable_msgrecord() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.DbInsert.msgRecord) + // @@protoc_insertion_point(field_mutable_list:iot_idl.DbInsert.msgRecord) return &msgrecord_; } @@ -1873,7 +1873,7 @@ DbInsert::mutable_msgrecord() { // DbRemove -// required .kbd_idlfile.enDssSaveAction enSaveAction = 1; +// required .iot_idl.enDssSaveAction enSaveAction = 1; inline bool DbRemove::has_ensaveaction() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -1887,15 +1887,15 @@ inline void DbRemove::clear_ensaveaction() { ensaveaction_ = 0; clear_has_ensaveaction(); } -inline ::kbd_idlfile::enDssSaveAction DbRemove::ensaveaction() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbRemove.enSaveAction) - return static_cast< ::kbd_idlfile::enDssSaveAction >(ensaveaction_); +inline ::iot_idl::enDssSaveAction DbRemove::ensaveaction() const { + // @@protoc_insertion_point(field_get:iot_idl.DbRemove.enSaveAction) + return static_cast< ::iot_idl::enDssSaveAction >(ensaveaction_); } -inline void DbRemove::set_ensaveaction(::kbd_idlfile::enDssSaveAction value) { - assert(::kbd_idlfile::enDssSaveAction_IsValid(value)); +inline void DbRemove::set_ensaveaction(::iot_idl::enDssSaveAction value) { + assert(::iot_idl::enDssSaveAction_IsValid(value)); set_has_ensaveaction(); ensaveaction_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DbRemove.enSaveAction) + // @@protoc_insertion_point(field_set:iot_idl.DbRemove.enSaveAction) } // required string strTableName = 2; @@ -1915,7 +1915,7 @@ inline void DbRemove::clear_strtablename() { clear_has_strtablename(); } inline const ::std::string& DbRemove::strtablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbRemove.strTableName) + // @@protoc_insertion_point(field_get:iot_idl.DbRemove.strTableName) return *strtablename_; } inline void DbRemove::set_strtablename(const ::std::string& value) { @@ -1924,7 +1924,7 @@ inline void DbRemove::set_strtablename(const ::std::string& value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.DbRemove.strTableName) + // @@protoc_insertion_point(field_set:iot_idl.DbRemove.strTableName) } inline void DbRemove::set_strtablename(const char* value) { set_has_strtablename(); @@ -1932,7 +1932,7 @@ inline void DbRemove::set_strtablename(const char* value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.DbRemove.strTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.DbRemove.strTableName) } inline void DbRemove::set_strtablename(const char* value, size_t size) { set_has_strtablename(); @@ -1940,14 +1940,14 @@ inline void DbRemove::set_strtablename(const char* value, size_t size) { strtablename_ = new ::std::string; } strtablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.DbRemove.strTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.DbRemove.strTableName) } inline ::std::string* DbRemove::mutable_strtablename() { set_has_strtablename(); if (strtablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbRemove.strTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.DbRemove.strTableName) return strtablename_; } inline ::std::string* DbRemove::release_strtablename() { @@ -1971,36 +1971,36 @@ inline void DbRemove::set_allocated_strtablename(::std::string* strtablename) { clear_has_strtablename(); strtablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DbRemove.strTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DbRemove.strTableName) } -// repeated .kbd_idlfile.DbCondition msgCondtionArray = 3; +// repeated .iot_idl.DbCondition msgCondtionArray = 3; inline int DbRemove::msgcondtionarray_size() const { return msgcondtionarray_.size(); } inline void DbRemove::clear_msgcondtionarray() { msgcondtionarray_.Clear(); } -inline const ::kbd_idlfile::DbCondition& DbRemove::msgcondtionarray(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbRemove.msgCondtionArray) +inline const ::iot_idl::DbCondition& DbRemove::msgcondtionarray(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.DbRemove.msgCondtionArray) return msgcondtionarray_.Get(index); } -inline ::kbd_idlfile::DbCondition* DbRemove::mutable_msgcondtionarray(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbRemove.msgCondtionArray) +inline ::iot_idl::DbCondition* DbRemove::mutable_msgcondtionarray(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.DbRemove.msgCondtionArray) return msgcondtionarray_.Mutable(index); } -inline ::kbd_idlfile::DbCondition* DbRemove::add_msgcondtionarray() { - // @@protoc_insertion_point(field_add:kbd_idlfile.DbRemove.msgCondtionArray) +inline ::iot_idl::DbCondition* DbRemove::add_msgcondtionarray() { + // @@protoc_insertion_point(field_add:iot_idl.DbRemove.msgCondtionArray) return msgcondtionarray_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbCondition >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbCondition >& DbRemove::msgcondtionarray() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.DbRemove.msgCondtionArray) + // @@protoc_insertion_point(field_list:iot_idl.DbRemove.msgCondtionArray) return msgcondtionarray_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbCondition >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbCondition >* DbRemove::mutable_msgcondtionarray() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.DbRemove.msgCondtionArray) + // @@protoc_insertion_point(field_mutable_list:iot_idl.DbRemove.msgCondtionArray) return &msgcondtionarray_; } @@ -2008,7 +2008,7 @@ DbRemove::mutable_msgcondtionarray() { // DbRemoveMulti -// required .kbd_idlfile.enDssSaveAction enSaveAction = 1; +// required .iot_idl.enDssSaveAction enSaveAction = 1; inline bool DbRemoveMulti::has_ensaveaction() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -2022,15 +2022,15 @@ inline void DbRemoveMulti::clear_ensaveaction() { ensaveaction_ = 0; clear_has_ensaveaction(); } -inline ::kbd_idlfile::enDssSaveAction DbRemoveMulti::ensaveaction() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbRemoveMulti.enSaveAction) - return static_cast< ::kbd_idlfile::enDssSaveAction >(ensaveaction_); +inline ::iot_idl::enDssSaveAction DbRemoveMulti::ensaveaction() const { + // @@protoc_insertion_point(field_get:iot_idl.DbRemoveMulti.enSaveAction) + return static_cast< ::iot_idl::enDssSaveAction >(ensaveaction_); } -inline void DbRemoveMulti::set_ensaveaction(::kbd_idlfile::enDssSaveAction value) { - assert(::kbd_idlfile::enDssSaveAction_IsValid(value)); +inline void DbRemoveMulti::set_ensaveaction(::iot_idl::enDssSaveAction value) { + assert(::iot_idl::enDssSaveAction_IsValid(value)); set_has_ensaveaction(); ensaveaction_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DbRemoveMulti.enSaveAction) + // @@protoc_insertion_point(field_set:iot_idl.DbRemoveMulti.enSaveAction) } // required string strTableName = 2; @@ -2050,7 +2050,7 @@ inline void DbRemoveMulti::clear_strtablename() { clear_has_strtablename(); } inline const ::std::string& DbRemoveMulti::strtablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbRemoveMulti.strTableName) + // @@protoc_insertion_point(field_get:iot_idl.DbRemoveMulti.strTableName) return *strtablename_; } inline void DbRemoveMulti::set_strtablename(const ::std::string& value) { @@ -2059,7 +2059,7 @@ inline void DbRemoveMulti::set_strtablename(const ::std::string& value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.DbRemoveMulti.strTableName) + // @@protoc_insertion_point(field_set:iot_idl.DbRemoveMulti.strTableName) } inline void DbRemoveMulti::set_strtablename(const char* value) { set_has_strtablename(); @@ -2067,7 +2067,7 @@ inline void DbRemoveMulti::set_strtablename(const char* value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.DbRemoveMulti.strTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.DbRemoveMulti.strTableName) } inline void DbRemoveMulti::set_strtablename(const char* value, size_t size) { set_has_strtablename(); @@ -2075,14 +2075,14 @@ inline void DbRemoveMulti::set_strtablename(const char* value, size_t size) { strtablename_ = new ::std::string; } strtablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.DbRemoveMulti.strTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.DbRemoveMulti.strTableName) } inline ::std::string* DbRemoveMulti::mutable_strtablename() { set_has_strtablename(); if (strtablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbRemoveMulti.strTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.DbRemoveMulti.strTableName) return strtablename_; } inline ::std::string* DbRemoveMulti::release_strtablename() { @@ -2106,66 +2106,66 @@ inline void DbRemoveMulti::set_allocated_strtablename(::std::string* strtablenam clear_has_strtablename(); strtablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DbRemoveMulti.strTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DbRemoveMulti.strTableName) } -// repeated .kbd_idlfile.DbConditionHead msgConditionHead = 3; +// repeated .iot_idl.DbConditionHead msgConditionHead = 3; inline int DbRemoveMulti::msgconditionhead_size() const { return msgconditionhead_.size(); } inline void DbRemoveMulti::clear_msgconditionhead() { msgconditionhead_.Clear(); } -inline const ::kbd_idlfile::DbConditionHead& DbRemoveMulti::msgconditionhead(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbRemoveMulti.msgConditionHead) +inline const ::iot_idl::DbConditionHead& DbRemoveMulti::msgconditionhead(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.DbRemoveMulti.msgConditionHead) return msgconditionhead_.Get(index); } -inline ::kbd_idlfile::DbConditionHead* DbRemoveMulti::mutable_msgconditionhead(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbRemoveMulti.msgConditionHead) +inline ::iot_idl::DbConditionHead* DbRemoveMulti::mutable_msgconditionhead(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.DbRemoveMulti.msgConditionHead) return msgconditionhead_.Mutable(index); } -inline ::kbd_idlfile::DbConditionHead* DbRemoveMulti::add_msgconditionhead() { - // @@protoc_insertion_point(field_add:kbd_idlfile.DbRemoveMulti.msgConditionHead) +inline ::iot_idl::DbConditionHead* DbRemoveMulti::add_msgconditionhead() { + // @@protoc_insertion_point(field_add:iot_idl.DbRemoveMulti.msgConditionHead) return msgconditionhead_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbConditionHead >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbConditionHead >& DbRemoveMulti::msgconditionhead() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.DbRemoveMulti.msgConditionHead) + // @@protoc_insertion_point(field_list:iot_idl.DbRemoveMulti.msgConditionHead) return msgconditionhead_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbConditionHead >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbConditionHead >* DbRemoveMulti::mutable_msgconditionhead() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.DbRemoveMulti.msgConditionHead) + // @@protoc_insertion_point(field_mutable_list:iot_idl.DbRemoveMulti.msgConditionHead) return &msgconditionhead_; } -// repeated .kbd_idlfile.DbValueArray msgConditionValue = 4; +// repeated .iot_idl.DbValueArray msgConditionValue = 4; inline int DbRemoveMulti::msgconditionvalue_size() const { return msgconditionvalue_.size(); } inline void DbRemoveMulti::clear_msgconditionvalue() { msgconditionvalue_.Clear(); } -inline const ::kbd_idlfile::DbValueArray& DbRemoveMulti::msgconditionvalue(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbRemoveMulti.msgConditionValue) +inline const ::iot_idl::DbValueArray& DbRemoveMulti::msgconditionvalue(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.DbRemoveMulti.msgConditionValue) return msgconditionvalue_.Get(index); } -inline ::kbd_idlfile::DbValueArray* DbRemoveMulti::mutable_msgconditionvalue(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbRemoveMulti.msgConditionValue) +inline ::iot_idl::DbValueArray* DbRemoveMulti::mutable_msgconditionvalue(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.DbRemoveMulti.msgConditionValue) return msgconditionvalue_.Mutable(index); } -inline ::kbd_idlfile::DbValueArray* DbRemoveMulti::add_msgconditionvalue() { - // @@protoc_insertion_point(field_add:kbd_idlfile.DbRemoveMulti.msgConditionValue) +inline ::iot_idl::DbValueArray* DbRemoveMulti::add_msgconditionvalue() { + // @@protoc_insertion_point(field_add:iot_idl.DbRemoveMulti.msgConditionValue) return msgconditionvalue_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbValueArray >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbValueArray >& DbRemoveMulti::msgconditionvalue() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.DbRemoveMulti.msgConditionValue) + // @@protoc_insertion_point(field_list:iot_idl.DbRemoveMulti.msgConditionValue) return msgconditionvalue_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbValueArray >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbValueArray >* DbRemoveMulti::mutable_msgconditionvalue() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.DbRemoveMulti.msgConditionValue) + // @@protoc_insertion_point(field_mutable_list:iot_idl.DbRemoveMulti.msgConditionValue) return &msgconditionvalue_; } @@ -2173,7 +2173,7 @@ DbRemoveMulti::mutable_msgconditionvalue() { // DbUpdate -// required .kbd_idlfile.enDssSaveAction enSaveAction = 1; +// required .iot_idl.enDssSaveAction enSaveAction = 1; inline bool DbUpdate::has_ensaveaction() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -2187,15 +2187,15 @@ inline void DbUpdate::clear_ensaveaction() { ensaveaction_ = 0; clear_has_ensaveaction(); } -inline ::kbd_idlfile::enDssSaveAction DbUpdate::ensaveaction() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbUpdate.enSaveAction) - return static_cast< ::kbd_idlfile::enDssSaveAction >(ensaveaction_); +inline ::iot_idl::enDssSaveAction DbUpdate::ensaveaction() const { + // @@protoc_insertion_point(field_get:iot_idl.DbUpdate.enSaveAction) + return static_cast< ::iot_idl::enDssSaveAction >(ensaveaction_); } -inline void DbUpdate::set_ensaveaction(::kbd_idlfile::enDssSaveAction value) { - assert(::kbd_idlfile::enDssSaveAction_IsValid(value)); +inline void DbUpdate::set_ensaveaction(::iot_idl::enDssSaveAction value) { + assert(::iot_idl::enDssSaveAction_IsValid(value)); set_has_ensaveaction(); ensaveaction_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DbUpdate.enSaveAction) + // @@protoc_insertion_point(field_set:iot_idl.DbUpdate.enSaveAction) } // required string strTableName = 2; @@ -2215,7 +2215,7 @@ inline void DbUpdate::clear_strtablename() { clear_has_strtablename(); } inline const ::std::string& DbUpdate::strtablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbUpdate.strTableName) + // @@protoc_insertion_point(field_get:iot_idl.DbUpdate.strTableName) return *strtablename_; } inline void DbUpdate::set_strtablename(const ::std::string& value) { @@ -2224,7 +2224,7 @@ inline void DbUpdate::set_strtablename(const ::std::string& value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.DbUpdate.strTableName) + // @@protoc_insertion_point(field_set:iot_idl.DbUpdate.strTableName) } inline void DbUpdate::set_strtablename(const char* value) { set_has_strtablename(); @@ -2232,7 +2232,7 @@ inline void DbUpdate::set_strtablename(const char* value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.DbUpdate.strTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.DbUpdate.strTableName) } inline void DbUpdate::set_strtablename(const char* value, size_t size) { set_has_strtablename(); @@ -2240,14 +2240,14 @@ inline void DbUpdate::set_strtablename(const char* value, size_t size) { strtablename_ = new ::std::string; } strtablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.DbUpdate.strTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.DbUpdate.strTableName) } inline ::std::string* DbUpdate::mutable_strtablename() { set_has_strtablename(); if (strtablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbUpdate.strTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.DbUpdate.strTableName) return strtablename_; } inline ::std::string* DbUpdate::release_strtablename() { @@ -2271,66 +2271,66 @@ inline void DbUpdate::set_allocated_strtablename(::std::string* strtablename) { clear_has_strtablename(); strtablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DbUpdate.strTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DbUpdate.strTableName) } -// repeated .kbd_idlfile.DbUpdateValue msgUpdateValue = 3; +// repeated .iot_idl.DbUpdateValue msgUpdateValue = 3; inline int DbUpdate::msgupdatevalue_size() const { return msgupdatevalue_.size(); } inline void DbUpdate::clear_msgupdatevalue() { msgupdatevalue_.Clear(); } -inline const ::kbd_idlfile::DbUpdateValue& DbUpdate::msgupdatevalue(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbUpdate.msgUpdateValue) +inline const ::iot_idl::DbUpdateValue& DbUpdate::msgupdatevalue(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.DbUpdate.msgUpdateValue) return msgupdatevalue_.Get(index); } -inline ::kbd_idlfile::DbUpdateValue* DbUpdate::mutable_msgupdatevalue(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbUpdate.msgUpdateValue) +inline ::iot_idl::DbUpdateValue* DbUpdate::mutable_msgupdatevalue(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.DbUpdate.msgUpdateValue) return msgupdatevalue_.Mutable(index); } -inline ::kbd_idlfile::DbUpdateValue* DbUpdate::add_msgupdatevalue() { - // @@protoc_insertion_point(field_add:kbd_idlfile.DbUpdate.msgUpdateValue) +inline ::iot_idl::DbUpdateValue* DbUpdate::add_msgupdatevalue() { + // @@protoc_insertion_point(field_add:iot_idl.DbUpdate.msgUpdateValue) return msgupdatevalue_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbUpdateValue >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbUpdateValue >& DbUpdate::msgupdatevalue() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.DbUpdate.msgUpdateValue) + // @@protoc_insertion_point(field_list:iot_idl.DbUpdate.msgUpdateValue) return msgupdatevalue_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbUpdateValue >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbUpdateValue >* DbUpdate::mutable_msgupdatevalue() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.DbUpdate.msgUpdateValue) + // @@protoc_insertion_point(field_mutable_list:iot_idl.DbUpdate.msgUpdateValue) return &msgupdatevalue_; } -// repeated .kbd_idlfile.DbCondition msgCondition = 4; +// repeated .iot_idl.DbCondition msgCondition = 4; inline int DbUpdate::msgcondition_size() const { return msgcondition_.size(); } inline void DbUpdate::clear_msgcondition() { msgcondition_.Clear(); } -inline const ::kbd_idlfile::DbCondition& DbUpdate::msgcondition(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbUpdate.msgCondition) +inline const ::iot_idl::DbCondition& DbUpdate::msgcondition(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.DbUpdate.msgCondition) return msgcondition_.Get(index); } -inline ::kbd_idlfile::DbCondition* DbUpdate::mutable_msgcondition(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbUpdate.msgCondition) +inline ::iot_idl::DbCondition* DbUpdate::mutable_msgcondition(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.DbUpdate.msgCondition) return msgcondition_.Mutable(index); } -inline ::kbd_idlfile::DbCondition* DbUpdate::add_msgcondition() { - // @@protoc_insertion_point(field_add:kbd_idlfile.DbUpdate.msgCondition) +inline ::iot_idl::DbCondition* DbUpdate::add_msgcondition() { + // @@protoc_insertion_point(field_add:iot_idl.DbUpdate.msgCondition) return msgcondition_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbCondition >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbCondition >& DbUpdate::msgcondition() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.DbUpdate.msgCondition) + // @@protoc_insertion_point(field_list:iot_idl.DbUpdate.msgCondition) return msgcondition_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbCondition >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbCondition >* DbUpdate::mutable_msgcondition() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.DbUpdate.msgCondition) + // @@protoc_insertion_point(field_mutable_list:iot_idl.DbUpdate.msgCondition) return &msgcondition_; } @@ -2338,7 +2338,7 @@ DbUpdate::mutable_msgcondition() { // DbUpdateMulti -// required .kbd_idlfile.enDssSaveAction enSaveAction = 1; +// required .iot_idl.enDssSaveAction enSaveAction = 1; inline bool DbUpdateMulti::has_ensaveaction() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -2352,15 +2352,15 @@ inline void DbUpdateMulti::clear_ensaveaction() { ensaveaction_ = 0; clear_has_ensaveaction(); } -inline ::kbd_idlfile::enDssSaveAction DbUpdateMulti::ensaveaction() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbUpdateMulti.enSaveAction) - return static_cast< ::kbd_idlfile::enDssSaveAction >(ensaveaction_); +inline ::iot_idl::enDssSaveAction DbUpdateMulti::ensaveaction() const { + // @@protoc_insertion_point(field_get:iot_idl.DbUpdateMulti.enSaveAction) + return static_cast< ::iot_idl::enDssSaveAction >(ensaveaction_); } -inline void DbUpdateMulti::set_ensaveaction(::kbd_idlfile::enDssSaveAction value) { - assert(::kbd_idlfile::enDssSaveAction_IsValid(value)); +inline void DbUpdateMulti::set_ensaveaction(::iot_idl::enDssSaveAction value) { + assert(::iot_idl::enDssSaveAction_IsValid(value)); set_has_ensaveaction(); ensaveaction_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DbUpdateMulti.enSaveAction) + // @@protoc_insertion_point(field_set:iot_idl.DbUpdateMulti.enSaveAction) } // required string strTableName = 2; @@ -2380,7 +2380,7 @@ inline void DbUpdateMulti::clear_strtablename() { clear_has_strtablename(); } inline const ::std::string& DbUpdateMulti::strtablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbUpdateMulti.strTableName) + // @@protoc_insertion_point(field_get:iot_idl.DbUpdateMulti.strTableName) return *strtablename_; } inline void DbUpdateMulti::set_strtablename(const ::std::string& value) { @@ -2389,7 +2389,7 @@ inline void DbUpdateMulti::set_strtablename(const ::std::string& value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.DbUpdateMulti.strTableName) + // @@protoc_insertion_point(field_set:iot_idl.DbUpdateMulti.strTableName) } inline void DbUpdateMulti::set_strtablename(const char* value) { set_has_strtablename(); @@ -2397,7 +2397,7 @@ inline void DbUpdateMulti::set_strtablename(const char* value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.DbUpdateMulti.strTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.DbUpdateMulti.strTableName) } inline void DbUpdateMulti::set_strtablename(const char* value, size_t size) { set_has_strtablename(); @@ -2405,14 +2405,14 @@ inline void DbUpdateMulti::set_strtablename(const char* value, size_t size) { strtablename_ = new ::std::string; } strtablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.DbUpdateMulti.strTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.DbUpdateMulti.strTableName) } inline ::std::string* DbUpdateMulti::mutable_strtablename() { set_has_strtablename(); if (strtablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbUpdateMulti.strTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.DbUpdateMulti.strTableName) return strtablename_; } inline ::std::string* DbUpdateMulti::release_strtablename() { @@ -2436,96 +2436,96 @@ inline void DbUpdateMulti::set_allocated_strtablename(::std::string* strtablenam clear_has_strtablename(); strtablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DbUpdateMulti.strTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DbUpdateMulti.strTableName) } -// repeated .kbd_idlfile.DbUpdateValue msgUpdateValue = 3; +// repeated .iot_idl.DbUpdateValue msgUpdateValue = 3; inline int DbUpdateMulti::msgupdatevalue_size() const { return msgupdatevalue_.size(); } inline void DbUpdateMulti::clear_msgupdatevalue() { msgupdatevalue_.Clear(); } -inline const ::kbd_idlfile::DbUpdateValue& DbUpdateMulti::msgupdatevalue(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbUpdateMulti.msgUpdateValue) +inline const ::iot_idl::DbUpdateValue& DbUpdateMulti::msgupdatevalue(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.DbUpdateMulti.msgUpdateValue) return msgupdatevalue_.Get(index); } -inline ::kbd_idlfile::DbUpdateValue* DbUpdateMulti::mutable_msgupdatevalue(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbUpdateMulti.msgUpdateValue) +inline ::iot_idl::DbUpdateValue* DbUpdateMulti::mutable_msgupdatevalue(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.DbUpdateMulti.msgUpdateValue) return msgupdatevalue_.Mutable(index); } -inline ::kbd_idlfile::DbUpdateValue* DbUpdateMulti::add_msgupdatevalue() { - // @@protoc_insertion_point(field_add:kbd_idlfile.DbUpdateMulti.msgUpdateValue) +inline ::iot_idl::DbUpdateValue* DbUpdateMulti::add_msgupdatevalue() { + // @@protoc_insertion_point(field_add:iot_idl.DbUpdateMulti.msgUpdateValue) return msgupdatevalue_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbUpdateValue >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbUpdateValue >& DbUpdateMulti::msgupdatevalue() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.DbUpdateMulti.msgUpdateValue) + // @@protoc_insertion_point(field_list:iot_idl.DbUpdateMulti.msgUpdateValue) return msgupdatevalue_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbUpdateValue >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbUpdateValue >* DbUpdateMulti::mutable_msgupdatevalue() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.DbUpdateMulti.msgUpdateValue) + // @@protoc_insertion_point(field_mutable_list:iot_idl.DbUpdateMulti.msgUpdateValue) return &msgupdatevalue_; } -// repeated .kbd_idlfile.DbConditionHead msgConditionHead = 4; +// repeated .iot_idl.DbConditionHead msgConditionHead = 4; inline int DbUpdateMulti::msgconditionhead_size() const { return msgconditionhead_.size(); } inline void DbUpdateMulti::clear_msgconditionhead() { msgconditionhead_.Clear(); } -inline const ::kbd_idlfile::DbConditionHead& DbUpdateMulti::msgconditionhead(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbUpdateMulti.msgConditionHead) +inline const ::iot_idl::DbConditionHead& DbUpdateMulti::msgconditionhead(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.DbUpdateMulti.msgConditionHead) return msgconditionhead_.Get(index); } -inline ::kbd_idlfile::DbConditionHead* DbUpdateMulti::mutable_msgconditionhead(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbUpdateMulti.msgConditionHead) +inline ::iot_idl::DbConditionHead* DbUpdateMulti::mutable_msgconditionhead(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.DbUpdateMulti.msgConditionHead) return msgconditionhead_.Mutable(index); } -inline ::kbd_idlfile::DbConditionHead* DbUpdateMulti::add_msgconditionhead() { - // @@protoc_insertion_point(field_add:kbd_idlfile.DbUpdateMulti.msgConditionHead) +inline ::iot_idl::DbConditionHead* DbUpdateMulti::add_msgconditionhead() { + // @@protoc_insertion_point(field_add:iot_idl.DbUpdateMulti.msgConditionHead) return msgconditionhead_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbConditionHead >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbConditionHead >& DbUpdateMulti::msgconditionhead() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.DbUpdateMulti.msgConditionHead) + // @@protoc_insertion_point(field_list:iot_idl.DbUpdateMulti.msgConditionHead) return msgconditionhead_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbConditionHead >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbConditionHead >* DbUpdateMulti::mutable_msgconditionhead() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.DbUpdateMulti.msgConditionHead) + // @@protoc_insertion_point(field_mutable_list:iot_idl.DbUpdateMulti.msgConditionHead) return &msgconditionhead_; } -// repeated .kbd_idlfile.DbValueArray msgConditionValue = 5; +// repeated .iot_idl.DbValueArray msgConditionValue = 5; inline int DbUpdateMulti::msgconditionvalue_size() const { return msgconditionvalue_.size(); } inline void DbUpdateMulti::clear_msgconditionvalue() { msgconditionvalue_.Clear(); } -inline const ::kbd_idlfile::DbValueArray& DbUpdateMulti::msgconditionvalue(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbUpdateMulti.msgConditionValue) +inline const ::iot_idl::DbValueArray& DbUpdateMulti::msgconditionvalue(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.DbUpdateMulti.msgConditionValue) return msgconditionvalue_.Get(index); } -inline ::kbd_idlfile::DbValueArray* DbUpdateMulti::mutable_msgconditionvalue(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbUpdateMulti.msgConditionValue) +inline ::iot_idl::DbValueArray* DbUpdateMulti::mutable_msgconditionvalue(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.DbUpdateMulti.msgConditionValue) return msgconditionvalue_.Mutable(index); } -inline ::kbd_idlfile::DbValueArray* DbUpdateMulti::add_msgconditionvalue() { - // @@protoc_insertion_point(field_add:kbd_idlfile.DbUpdateMulti.msgConditionValue) +inline ::iot_idl::DbValueArray* DbUpdateMulti::add_msgconditionvalue() { + // @@protoc_insertion_point(field_add:iot_idl.DbUpdateMulti.msgConditionValue) return msgconditionvalue_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbValueArray >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DbValueArray >& DbUpdateMulti::msgconditionvalue() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.DbUpdateMulti.msgConditionValue) + // @@protoc_insertion_point(field_list:iot_idl.DbUpdateMulti.msgConditionValue) return msgconditionvalue_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DbValueArray >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DbValueArray >* DbUpdateMulti::mutable_msgconditionvalue() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.DbUpdateMulti.msgConditionValue) + // @@protoc_insertion_point(field_mutable_list:iot_idl.DbUpdateMulti.msgConditionValue) return &msgconditionvalue_; } @@ -2533,7 +2533,7 @@ DbUpdateMulti::mutable_msgconditionvalue() { // DbRequest -// optional .kbd_idlfile.DbInsert msgInsert = 1; +// optional .iot_idl.DbInsert msgInsert = 1; inline bool DbRequest::has_msginsert() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -2544,26 +2544,26 @@ inline void DbRequest::clear_has_msginsert() { _has_bits_[0] &= ~0x00000001u; } inline void DbRequest::clear_msginsert() { - if (msginsert_ != NULL) msginsert_->::kbd_idlfile::DbInsert::Clear(); + if (msginsert_ != NULL) msginsert_->::iot_idl::DbInsert::Clear(); clear_has_msginsert(); } -inline const ::kbd_idlfile::DbInsert& DbRequest::msginsert() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbRequest.msgInsert) +inline const ::iot_idl::DbInsert& DbRequest::msginsert() const { + // @@protoc_insertion_point(field_get:iot_idl.DbRequest.msgInsert) return msginsert_ != NULL ? *msginsert_ : *default_instance_->msginsert_; } -inline ::kbd_idlfile::DbInsert* DbRequest::mutable_msginsert() { +inline ::iot_idl::DbInsert* DbRequest::mutable_msginsert() { set_has_msginsert(); - if (msginsert_ == NULL) msginsert_ = new ::kbd_idlfile::DbInsert; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbRequest.msgInsert) + if (msginsert_ == NULL) msginsert_ = new ::iot_idl::DbInsert; + // @@protoc_insertion_point(field_mutable:iot_idl.DbRequest.msgInsert) return msginsert_; } -inline ::kbd_idlfile::DbInsert* DbRequest::release_msginsert() { +inline ::iot_idl::DbInsert* DbRequest::release_msginsert() { clear_has_msginsert(); - ::kbd_idlfile::DbInsert* temp = msginsert_; + ::iot_idl::DbInsert* temp = msginsert_; msginsert_ = NULL; return temp; } -inline void DbRequest::set_allocated_msginsert(::kbd_idlfile::DbInsert* msginsert) { +inline void DbRequest::set_allocated_msginsert(::iot_idl::DbInsert* msginsert) { delete msginsert_; msginsert_ = msginsert; if (msginsert) { @@ -2571,10 +2571,10 @@ inline void DbRequest::set_allocated_msginsert(::kbd_idlfile::DbInsert* msginser } else { clear_has_msginsert(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DbRequest.msgInsert) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DbRequest.msgInsert) } -// optional .kbd_idlfile.DbRemove msgRemove = 2; +// optional .iot_idl.DbRemove msgRemove = 2; inline bool DbRequest::has_msgremove() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -2585,26 +2585,26 @@ inline void DbRequest::clear_has_msgremove() { _has_bits_[0] &= ~0x00000002u; } inline void DbRequest::clear_msgremove() { - if (msgremove_ != NULL) msgremove_->::kbd_idlfile::DbRemove::Clear(); + if (msgremove_ != NULL) msgremove_->::iot_idl::DbRemove::Clear(); clear_has_msgremove(); } -inline const ::kbd_idlfile::DbRemove& DbRequest::msgremove() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbRequest.msgRemove) +inline const ::iot_idl::DbRemove& DbRequest::msgremove() const { + // @@protoc_insertion_point(field_get:iot_idl.DbRequest.msgRemove) return msgremove_ != NULL ? *msgremove_ : *default_instance_->msgremove_; } -inline ::kbd_idlfile::DbRemove* DbRequest::mutable_msgremove() { +inline ::iot_idl::DbRemove* DbRequest::mutable_msgremove() { set_has_msgremove(); - if (msgremove_ == NULL) msgremove_ = new ::kbd_idlfile::DbRemove; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbRequest.msgRemove) + if (msgremove_ == NULL) msgremove_ = new ::iot_idl::DbRemove; + // @@protoc_insertion_point(field_mutable:iot_idl.DbRequest.msgRemove) return msgremove_; } -inline ::kbd_idlfile::DbRemove* DbRequest::release_msgremove() { +inline ::iot_idl::DbRemove* DbRequest::release_msgremove() { clear_has_msgremove(); - ::kbd_idlfile::DbRemove* temp = msgremove_; + ::iot_idl::DbRemove* temp = msgremove_; msgremove_ = NULL; return temp; } -inline void DbRequest::set_allocated_msgremove(::kbd_idlfile::DbRemove* msgremove) { +inline void DbRequest::set_allocated_msgremove(::iot_idl::DbRemove* msgremove) { delete msgremove_; msgremove_ = msgremove; if (msgremove) { @@ -2612,10 +2612,10 @@ inline void DbRequest::set_allocated_msgremove(::kbd_idlfile::DbRemove* msgremov } else { clear_has_msgremove(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DbRequest.msgRemove) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DbRequest.msgRemove) } -// optional .kbd_idlfile.DbRemoveMulti msgRemoveMulti = 3; +// optional .iot_idl.DbRemoveMulti msgRemoveMulti = 3; inline bool DbRequest::has_msgremovemulti() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -2626,26 +2626,26 @@ inline void DbRequest::clear_has_msgremovemulti() { _has_bits_[0] &= ~0x00000004u; } inline void DbRequest::clear_msgremovemulti() { - if (msgremovemulti_ != NULL) msgremovemulti_->::kbd_idlfile::DbRemoveMulti::Clear(); + if (msgremovemulti_ != NULL) msgremovemulti_->::iot_idl::DbRemoveMulti::Clear(); clear_has_msgremovemulti(); } -inline const ::kbd_idlfile::DbRemoveMulti& DbRequest::msgremovemulti() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbRequest.msgRemoveMulti) +inline const ::iot_idl::DbRemoveMulti& DbRequest::msgremovemulti() const { + // @@protoc_insertion_point(field_get:iot_idl.DbRequest.msgRemoveMulti) return msgremovemulti_ != NULL ? *msgremovemulti_ : *default_instance_->msgremovemulti_; } -inline ::kbd_idlfile::DbRemoveMulti* DbRequest::mutable_msgremovemulti() { +inline ::iot_idl::DbRemoveMulti* DbRequest::mutable_msgremovemulti() { set_has_msgremovemulti(); - if (msgremovemulti_ == NULL) msgremovemulti_ = new ::kbd_idlfile::DbRemoveMulti; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbRequest.msgRemoveMulti) + if (msgremovemulti_ == NULL) msgremovemulti_ = new ::iot_idl::DbRemoveMulti; + // @@protoc_insertion_point(field_mutable:iot_idl.DbRequest.msgRemoveMulti) return msgremovemulti_; } -inline ::kbd_idlfile::DbRemoveMulti* DbRequest::release_msgremovemulti() { +inline ::iot_idl::DbRemoveMulti* DbRequest::release_msgremovemulti() { clear_has_msgremovemulti(); - ::kbd_idlfile::DbRemoveMulti* temp = msgremovemulti_; + ::iot_idl::DbRemoveMulti* temp = msgremovemulti_; msgremovemulti_ = NULL; return temp; } -inline void DbRequest::set_allocated_msgremovemulti(::kbd_idlfile::DbRemoveMulti* msgremovemulti) { +inline void DbRequest::set_allocated_msgremovemulti(::iot_idl::DbRemoveMulti* msgremovemulti) { delete msgremovemulti_; msgremovemulti_ = msgremovemulti; if (msgremovemulti) { @@ -2653,10 +2653,10 @@ inline void DbRequest::set_allocated_msgremovemulti(::kbd_idlfile::DbRemoveMulti } else { clear_has_msgremovemulti(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DbRequest.msgRemoveMulti) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DbRequest.msgRemoveMulti) } -// optional .kbd_idlfile.DbUpdate msgUpdate = 4; +// optional .iot_idl.DbUpdate msgUpdate = 4; inline bool DbRequest::has_msgupdate() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -2667,26 +2667,26 @@ inline void DbRequest::clear_has_msgupdate() { _has_bits_[0] &= ~0x00000008u; } inline void DbRequest::clear_msgupdate() { - if (msgupdate_ != NULL) msgupdate_->::kbd_idlfile::DbUpdate::Clear(); + if (msgupdate_ != NULL) msgupdate_->::iot_idl::DbUpdate::Clear(); clear_has_msgupdate(); } -inline const ::kbd_idlfile::DbUpdate& DbRequest::msgupdate() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbRequest.msgUpdate) +inline const ::iot_idl::DbUpdate& DbRequest::msgupdate() const { + // @@protoc_insertion_point(field_get:iot_idl.DbRequest.msgUpdate) return msgupdate_ != NULL ? *msgupdate_ : *default_instance_->msgupdate_; } -inline ::kbd_idlfile::DbUpdate* DbRequest::mutable_msgupdate() { +inline ::iot_idl::DbUpdate* DbRequest::mutable_msgupdate() { set_has_msgupdate(); - if (msgupdate_ == NULL) msgupdate_ = new ::kbd_idlfile::DbUpdate; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbRequest.msgUpdate) + if (msgupdate_ == NULL) msgupdate_ = new ::iot_idl::DbUpdate; + // @@protoc_insertion_point(field_mutable:iot_idl.DbRequest.msgUpdate) return msgupdate_; } -inline ::kbd_idlfile::DbUpdate* DbRequest::release_msgupdate() { +inline ::iot_idl::DbUpdate* DbRequest::release_msgupdate() { clear_has_msgupdate(); - ::kbd_idlfile::DbUpdate* temp = msgupdate_; + ::iot_idl::DbUpdate* temp = msgupdate_; msgupdate_ = NULL; return temp; } -inline void DbRequest::set_allocated_msgupdate(::kbd_idlfile::DbUpdate* msgupdate) { +inline void DbRequest::set_allocated_msgupdate(::iot_idl::DbUpdate* msgupdate) { delete msgupdate_; msgupdate_ = msgupdate; if (msgupdate) { @@ -2694,10 +2694,10 @@ inline void DbRequest::set_allocated_msgupdate(::kbd_idlfile::DbUpdate* msgupdat } else { clear_has_msgupdate(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DbRequest.msgUpdate) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DbRequest.msgUpdate) } -// optional .kbd_idlfile.DbUpdateMulti msgUpdateMulti = 5; +// optional .iot_idl.DbUpdateMulti msgUpdateMulti = 5; inline bool DbRequest::has_msgupdatemulti() const { return (_has_bits_[0] & 0x00000010u) != 0; } @@ -2708,26 +2708,26 @@ inline void DbRequest::clear_has_msgupdatemulti() { _has_bits_[0] &= ~0x00000010u; } inline void DbRequest::clear_msgupdatemulti() { - if (msgupdatemulti_ != NULL) msgupdatemulti_->::kbd_idlfile::DbUpdateMulti::Clear(); + if (msgupdatemulti_ != NULL) msgupdatemulti_->::iot_idl::DbUpdateMulti::Clear(); clear_has_msgupdatemulti(); } -inline const ::kbd_idlfile::DbUpdateMulti& DbRequest::msgupdatemulti() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DbRequest.msgUpdateMulti) +inline const ::iot_idl::DbUpdateMulti& DbRequest::msgupdatemulti() const { + // @@protoc_insertion_point(field_get:iot_idl.DbRequest.msgUpdateMulti) return msgupdatemulti_ != NULL ? *msgupdatemulti_ : *default_instance_->msgupdatemulti_; } -inline ::kbd_idlfile::DbUpdateMulti* DbRequest::mutable_msgupdatemulti() { +inline ::iot_idl::DbUpdateMulti* DbRequest::mutable_msgupdatemulti() { set_has_msgupdatemulti(); - if (msgupdatemulti_ == NULL) msgupdatemulti_ = new ::kbd_idlfile::DbUpdateMulti; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DbRequest.msgUpdateMulti) + if (msgupdatemulti_ == NULL) msgupdatemulti_ = new ::iot_idl::DbUpdateMulti; + // @@protoc_insertion_point(field_mutable:iot_idl.DbRequest.msgUpdateMulti) return msgupdatemulti_; } -inline ::kbd_idlfile::DbUpdateMulti* DbRequest::release_msgupdatemulti() { +inline ::iot_idl::DbUpdateMulti* DbRequest::release_msgupdatemulti() { clear_has_msgupdatemulti(); - ::kbd_idlfile::DbUpdateMulti* temp = msgupdatemulti_; + ::iot_idl::DbUpdateMulti* temp = msgupdatemulti_; msgupdatemulti_ = NULL; return temp; } -inline void DbRequest::set_allocated_msgupdatemulti(::kbd_idlfile::DbUpdateMulti* msgupdatemulti) { +inline void DbRequest::set_allocated_msgupdatemulti(::iot_idl::DbUpdateMulti* msgupdatemulti) { delete msgupdatemulti_; msgupdatemulti_ = msgupdatemulti; if (msgupdatemulti) { @@ -2735,27 +2735,27 @@ inline void DbRequest::set_allocated_msgupdatemulti(::kbd_idlfile::DbUpdateMulti } else { clear_has_msgupdatemulti(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DbRequest.msgUpdateMulti) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DbRequest.msgUpdateMulti) } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::enDssMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enDssMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enDssMsgType>() { - return ::kbd_idlfile::enDssMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enDssMsgType>() { + return ::iot_idl::enDssMsgType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::enDssSaveAction> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enDssSaveAction> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enDssSaveAction>() { - return ::kbd_idlfile::enDssSaveAction_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enDssSaveAction>() { + return ::iot_idl::enDssSaveAction_descriptor(); } } // namespace google diff --git a/platform/src/idl_files/DbSaveMessage.proto b/platform/src/idl_files/DbSaveMessage.proto index 2e37d5c2..4f258926 100644 --- a/platform/src/idl_files/DbSaveMessage.proto +++ b/platform/src/idl_files/DbSaveMessage.proto @@ -5,7 +5,7 @@ //======================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; // 用到了SVariable import "Public.proto"; diff --git a/platform/src/idl_files/FBD.pb.cc b/platform/src/idl_files/FBD.pb.cc index b3d0a8c3..a953a7ad 100644 --- a/platform/src/idl_files/FBD.pb.cc +++ b/platform/src/idl_files/FBD.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -131,14 +131,14 @@ void protobuf_AddDesc_FBD_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\tFBD.proto\022\013kbd_idlfile\"]\n\rSFBDDebugDat" + "\n\tFBD.proto\022\013iot_idl\"]\n\rSFBDDebugDat" "a\022\025\n\rsInstanceName\030\001 \002(\t\022\025\n\rnOutPortInde" "x\030\002 \002(\005\022\016\n\006sValue\030\003 \002(\t\022\016\n\006nValid\030\004 \002(\005\"" ":\n\020SFBDDebugRequest\022\020\n\010nGroupId\030\001 \002(\005\022\024\n" "\014sDiagramName\030\002 \002(\t\"\202\001\n\021SFBDDebugRespons" "e\022\020\n\010nGroupId\030\001 \002(\005\022\024\n\014sDiagramName\030\002 \002(" "\t\022\027\n\017nLastUpdateTime\030\003 \002(\003\022,\n\010vecBlock\030\004" - " \003(\0132\032.kbd_idlfile.SFBDDebugData*>\n\014enFb" + " \003(\0132\032.iot_idl.SFBDDebugData*>\n\014enFb" "dMsgType\022\026\n\022MT_FBD_E2S_DBG_REQ\020\001\022\026\n\022MT_F" "BD_S2E_DBG_REP\020\002", 376); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( @@ -185,7 +185,7 @@ const int SFBDDebugData::kNValidFieldNumber; SFBDDebugData::SFBDDebugData() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFBDDebugData) + // @@protoc_insertion_point(constructor:iot_idl.SFBDDebugData) } void SFBDDebugData::InitAsDefaultInstance() { @@ -195,7 +195,7 @@ SFBDDebugData::SFBDDebugData(const SFBDDebugData& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFBDDebugData) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFBDDebugData) } void SFBDDebugData::SharedCtor() { @@ -209,7 +209,7 @@ void SFBDDebugData::SharedCtor() { } SFBDDebugData::~SFBDDebugData() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFBDDebugData) + // @@protoc_insertion_point(destructor:iot_idl.SFBDDebugData) SharedDtor(); } @@ -281,7 +281,7 @@ bool SFBDDebugData::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFBDDebugData) + // @@protoc_insertion_point(parse_start:iot_idl.SFBDDebugData) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -364,17 +364,17 @@ bool SFBDDebugData::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFBDDebugData) + // @@protoc_insertion_point(parse_success:iot_idl.SFBDDebugData) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFBDDebugData) + // @@protoc_insertion_point(parse_failure:iot_idl.SFBDDebugData) return false; #undef DO_ } void SFBDDebugData::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFBDDebugData) + // @@protoc_insertion_point(serialize_start:iot_idl.SFBDDebugData) // required string sInstanceName = 1; if (has_sinstancename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -409,12 +409,12 @@ void SFBDDebugData::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFBDDebugData) + // @@protoc_insertion_point(serialize_end:iot_idl.SFBDDebugData) } ::google::protobuf::uint8* SFBDDebugData::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFBDDebugData) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFBDDebugData) // required string sInstanceName = 1; if (has_sinstancename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -451,7 +451,7 @@ void SFBDDebugData::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFBDDebugData) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFBDDebugData) return target; } @@ -579,7 +579,7 @@ const int SFBDDebugRequest::kSDiagramNameFieldNumber; SFBDDebugRequest::SFBDDebugRequest() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFBDDebugRequest) + // @@protoc_insertion_point(constructor:iot_idl.SFBDDebugRequest) } void SFBDDebugRequest::InitAsDefaultInstance() { @@ -589,7 +589,7 @@ SFBDDebugRequest::SFBDDebugRequest(const SFBDDebugRequest& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFBDDebugRequest) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFBDDebugRequest) } void SFBDDebugRequest::SharedCtor() { @@ -601,7 +601,7 @@ void SFBDDebugRequest::SharedCtor() { } SFBDDebugRequest::~SFBDDebugRequest() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFBDDebugRequest) + // @@protoc_insertion_point(destructor:iot_idl.SFBDDebugRequest) SharedDtor(); } @@ -651,7 +651,7 @@ bool SFBDDebugRequest::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFBDDebugRequest) + // @@protoc_insertion_point(parse_start:iot_idl.SFBDDebugRequest) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -702,17 +702,17 @@ bool SFBDDebugRequest::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFBDDebugRequest) + // @@protoc_insertion_point(parse_success:iot_idl.SFBDDebugRequest) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFBDDebugRequest) + // @@protoc_insertion_point(parse_failure:iot_idl.SFBDDebugRequest) return false; #undef DO_ } void SFBDDebugRequest::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFBDDebugRequest) + // @@protoc_insertion_point(serialize_start:iot_idl.SFBDDebugRequest) // required int32 nGroupId = 1; if (has_ngroupid()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->ngroupid(), output); @@ -732,12 +732,12 @@ void SFBDDebugRequest::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFBDDebugRequest) + // @@protoc_insertion_point(serialize_end:iot_idl.SFBDDebugRequest) } ::google::protobuf::uint8* SFBDDebugRequest::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFBDDebugRequest) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFBDDebugRequest) // required int32 nGroupId = 1; if (has_ngroupid()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->ngroupid(), target); @@ -758,7 +758,7 @@ void SFBDDebugRequest::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFBDDebugRequest) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFBDDebugRequest) return target; } @@ -866,7 +866,7 @@ const int SFBDDebugResponse::kVecBlockFieldNumber; SFBDDebugResponse::SFBDDebugResponse() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFBDDebugResponse) + // @@protoc_insertion_point(constructor:iot_idl.SFBDDebugResponse) } void SFBDDebugResponse::InitAsDefaultInstance() { @@ -876,7 +876,7 @@ SFBDDebugResponse::SFBDDebugResponse(const SFBDDebugResponse& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFBDDebugResponse) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFBDDebugResponse) } void SFBDDebugResponse::SharedCtor() { @@ -889,7 +889,7 @@ void SFBDDebugResponse::SharedCtor() { } SFBDDebugResponse::~SFBDDebugResponse() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFBDDebugResponse) + // @@protoc_insertion_point(destructor:iot_idl.SFBDDebugResponse) SharedDtor(); } @@ -941,7 +941,7 @@ bool SFBDDebugResponse::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFBDDebugResponse) + // @@protoc_insertion_point(parse_start:iot_idl.SFBDDebugResponse) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -993,7 +993,7 @@ bool SFBDDebugResponse::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFBDDebugData vecBlock = 4; + // repeated .iot_idl.SFBDDebugData vecBlock = 4; case 4: { if (tag == 34) { parse_vecBlock: @@ -1021,17 +1021,17 @@ bool SFBDDebugResponse::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFBDDebugResponse) + // @@protoc_insertion_point(parse_success:iot_idl.SFBDDebugResponse) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFBDDebugResponse) + // @@protoc_insertion_point(parse_failure:iot_idl.SFBDDebugResponse) return false; #undef DO_ } void SFBDDebugResponse::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFBDDebugResponse) + // @@protoc_insertion_point(serialize_start:iot_idl.SFBDDebugResponse) // required int32 nGroupId = 1; if (has_ngroupid()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->ngroupid(), output); @@ -1052,7 +1052,7 @@ void SFBDDebugResponse::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt64(3, this->nlastupdatetime(), output); } - // repeated .kbd_idlfile.SFBDDebugData vecBlock = 4; + // repeated .iot_idl.SFBDDebugData vecBlock = 4; for (int i = 0; i < this->vecblock_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->vecblock(i), output); @@ -1062,12 +1062,12 @@ void SFBDDebugResponse::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFBDDebugResponse) + // @@protoc_insertion_point(serialize_end:iot_idl.SFBDDebugResponse) } ::google::protobuf::uint8* SFBDDebugResponse::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFBDDebugResponse) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFBDDebugResponse) // required int32 nGroupId = 1; if (has_ngroupid()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->ngroupid(), target); @@ -1089,7 +1089,7 @@ void SFBDDebugResponse::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(3, this->nlastupdatetime(), target); } - // repeated .kbd_idlfile.SFBDDebugData vecBlock = 4; + // repeated .iot_idl.SFBDDebugData vecBlock = 4; for (int i = 0; i < this->vecblock_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1100,7 +1100,7 @@ void SFBDDebugResponse::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFBDDebugResponse) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFBDDebugResponse) return target; } @@ -1130,7 +1130,7 @@ int SFBDDebugResponse::ByteSize() const { } } - // repeated .kbd_idlfile.SFBDDebugData vecBlock = 4; + // repeated .iot_idl.SFBDDebugData vecBlock = 4; total_size += 1 * this->vecblock_size(); for (int i = 0; i < this->vecblock_size(); i++) { total_size += @@ -1220,6 +1220,6 @@ void SFBDDebugResponse::Swap(SFBDDebugResponse* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/platform/src/idl_files/FBD.pb.h b/platform/src/idl_files/FBD.pb.h index cead17c5..fa578514 100644 --- a/platform/src/idl_files/FBD.pb.h +++ b/platform/src/idl_files/FBD.pb.h @@ -27,7 +27,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { // Internal implementation detail -- do not call these. void IDL_FILES_EXPORT protobuf_AddDesc_FBD_2eproto(); @@ -150,7 +150,7 @@ class IDL_FILES_EXPORT SFBDDebugData : public ::google::protobuf::Message { inline ::google::protobuf::int32 nvalid() const; inline void set_nvalid(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFBDDebugData) + // @@protoc_insertion_point(class_scope:iot_idl.SFBDDebugData) private: inline void set_has_sinstancename(); inline void clear_has_sinstancename(); @@ -250,7 +250,7 @@ class IDL_FILES_EXPORT SFBDDebugRequest : public ::google::protobuf::Message { inline ::std::string* release_sdiagramname(); inline void set_allocated_sdiagramname(::std::string* sdiagramname); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFBDDebugRequest) + // @@protoc_insertion_point(class_scope:iot_idl.SFBDDebugRequest) private: inline void set_has_ngroupid(); inline void clear_has_ngroupid(); @@ -351,19 +351,19 @@ class IDL_FILES_EXPORT SFBDDebugResponse : public ::google::protobuf::Message { inline ::google::protobuf::int64 nlastupdatetime() const; inline void set_nlastupdatetime(::google::protobuf::int64 value); - // repeated .kbd_idlfile.SFBDDebugData vecBlock = 4; + // repeated .iot_idl.SFBDDebugData vecBlock = 4; inline int vecblock_size() const; inline void clear_vecblock(); static const int kVecBlockFieldNumber = 4; - inline const ::kbd_idlfile::SFBDDebugData& vecblock(int index) const; - inline ::kbd_idlfile::SFBDDebugData* mutable_vecblock(int index); - inline ::kbd_idlfile::SFBDDebugData* add_vecblock(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFBDDebugData >& + inline const ::iot_idl::SFBDDebugData& vecblock(int index) const; + inline ::iot_idl::SFBDDebugData* mutable_vecblock(int index); + inline ::iot_idl::SFBDDebugData* add_vecblock(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFBDDebugData >& vecblock() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFBDDebugData >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFBDDebugData >* mutable_vecblock(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFBDDebugResponse) + // @@protoc_insertion_point(class_scope:iot_idl.SFBDDebugResponse) private: inline void set_has_ngroupid(); inline void clear_has_ngroupid(); @@ -378,7 +378,7 @@ class IDL_FILES_EXPORT SFBDDebugResponse : public ::google::protobuf::Message { mutable int _cached_size_; ::std::string* sdiagramname_; ::google::protobuf::int64 nlastupdatetime_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFBDDebugData > vecblock_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFBDDebugData > vecblock_; ::google::protobuf::int32 ngroupid_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FBD_2eproto(); friend void protobuf_AssignDesc_FBD_2eproto(); @@ -411,7 +411,7 @@ inline void SFBDDebugData::clear_sinstancename() { clear_has_sinstancename(); } inline const ::std::string& SFBDDebugData::sinstancename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFBDDebugData.sInstanceName) + // @@protoc_insertion_point(field_get:iot_idl.SFBDDebugData.sInstanceName) return *sinstancename_; } inline void SFBDDebugData::set_sinstancename(const ::std::string& value) { @@ -420,7 +420,7 @@ inline void SFBDDebugData::set_sinstancename(const ::std::string& value) { sinstancename_ = new ::std::string; } sinstancename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFBDDebugData.sInstanceName) + // @@protoc_insertion_point(field_set:iot_idl.SFBDDebugData.sInstanceName) } inline void SFBDDebugData::set_sinstancename(const char* value) { set_has_sinstancename(); @@ -428,7 +428,7 @@ inline void SFBDDebugData::set_sinstancename(const char* value) { sinstancename_ = new ::std::string; } sinstancename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFBDDebugData.sInstanceName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFBDDebugData.sInstanceName) } inline void SFBDDebugData::set_sinstancename(const char* value, size_t size) { set_has_sinstancename(); @@ -436,14 +436,14 @@ inline void SFBDDebugData::set_sinstancename(const char* value, size_t size) { sinstancename_ = new ::std::string; } sinstancename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFBDDebugData.sInstanceName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFBDDebugData.sInstanceName) } inline ::std::string* SFBDDebugData::mutable_sinstancename() { set_has_sinstancename(); if (sinstancename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { sinstancename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFBDDebugData.sInstanceName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFBDDebugData.sInstanceName) return sinstancename_; } inline ::std::string* SFBDDebugData::release_sinstancename() { @@ -467,7 +467,7 @@ inline void SFBDDebugData::set_allocated_sinstancename(::std::string* sinstancen clear_has_sinstancename(); sinstancename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFBDDebugData.sInstanceName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFBDDebugData.sInstanceName) } // required int32 nOutPortIndex = 2; @@ -485,13 +485,13 @@ inline void SFBDDebugData::clear_noutportindex() { clear_has_noutportindex(); } inline ::google::protobuf::int32 SFBDDebugData::noutportindex() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFBDDebugData.nOutPortIndex) + // @@protoc_insertion_point(field_get:iot_idl.SFBDDebugData.nOutPortIndex) return noutportindex_; } inline void SFBDDebugData::set_noutportindex(::google::protobuf::int32 value) { set_has_noutportindex(); noutportindex_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFBDDebugData.nOutPortIndex) + // @@protoc_insertion_point(field_set:iot_idl.SFBDDebugData.nOutPortIndex) } // required string sValue = 3; @@ -511,7 +511,7 @@ inline void SFBDDebugData::clear_svalue() { clear_has_svalue(); } inline const ::std::string& SFBDDebugData::svalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFBDDebugData.sValue) + // @@protoc_insertion_point(field_get:iot_idl.SFBDDebugData.sValue) return *svalue_; } inline void SFBDDebugData::set_svalue(const ::std::string& value) { @@ -520,7 +520,7 @@ inline void SFBDDebugData::set_svalue(const ::std::string& value) { svalue_ = new ::std::string; } svalue_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFBDDebugData.sValue) + // @@protoc_insertion_point(field_set:iot_idl.SFBDDebugData.sValue) } inline void SFBDDebugData::set_svalue(const char* value) { set_has_svalue(); @@ -528,7 +528,7 @@ inline void SFBDDebugData::set_svalue(const char* value) { svalue_ = new ::std::string; } svalue_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFBDDebugData.sValue) + // @@protoc_insertion_point(field_set_char:iot_idl.SFBDDebugData.sValue) } inline void SFBDDebugData::set_svalue(const char* value, size_t size) { set_has_svalue(); @@ -536,14 +536,14 @@ inline void SFBDDebugData::set_svalue(const char* value, size_t size) { svalue_ = new ::std::string; } svalue_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFBDDebugData.sValue) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFBDDebugData.sValue) } inline ::std::string* SFBDDebugData::mutable_svalue() { set_has_svalue(); if (svalue_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { svalue_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFBDDebugData.sValue) + // @@protoc_insertion_point(field_mutable:iot_idl.SFBDDebugData.sValue) return svalue_; } inline ::std::string* SFBDDebugData::release_svalue() { @@ -567,7 +567,7 @@ inline void SFBDDebugData::set_allocated_svalue(::std::string* svalue) { clear_has_svalue(); svalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFBDDebugData.sValue) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFBDDebugData.sValue) } // required int32 nValid = 4; @@ -585,13 +585,13 @@ inline void SFBDDebugData::clear_nvalid() { clear_has_nvalid(); } inline ::google::protobuf::int32 SFBDDebugData::nvalid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFBDDebugData.nValid) + // @@protoc_insertion_point(field_get:iot_idl.SFBDDebugData.nValid) return nvalid_; } inline void SFBDDebugData::set_nvalid(::google::protobuf::int32 value) { set_has_nvalid(); nvalid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFBDDebugData.nValid) + // @@protoc_insertion_point(field_set:iot_idl.SFBDDebugData.nValid) } // ------------------------------------------------------------------- @@ -613,13 +613,13 @@ inline void SFBDDebugRequest::clear_ngroupid() { clear_has_ngroupid(); } inline ::google::protobuf::int32 SFBDDebugRequest::ngroupid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFBDDebugRequest.nGroupId) + // @@protoc_insertion_point(field_get:iot_idl.SFBDDebugRequest.nGroupId) return ngroupid_; } inline void SFBDDebugRequest::set_ngroupid(::google::protobuf::int32 value) { set_has_ngroupid(); ngroupid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFBDDebugRequest.nGroupId) + // @@protoc_insertion_point(field_set:iot_idl.SFBDDebugRequest.nGroupId) } // required string sDiagramName = 2; @@ -639,7 +639,7 @@ inline void SFBDDebugRequest::clear_sdiagramname() { clear_has_sdiagramname(); } inline const ::std::string& SFBDDebugRequest::sdiagramname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFBDDebugRequest.sDiagramName) + // @@protoc_insertion_point(field_get:iot_idl.SFBDDebugRequest.sDiagramName) return *sdiagramname_; } inline void SFBDDebugRequest::set_sdiagramname(const ::std::string& value) { @@ -648,7 +648,7 @@ inline void SFBDDebugRequest::set_sdiagramname(const ::std::string& value) { sdiagramname_ = new ::std::string; } sdiagramname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFBDDebugRequest.sDiagramName) + // @@protoc_insertion_point(field_set:iot_idl.SFBDDebugRequest.sDiagramName) } inline void SFBDDebugRequest::set_sdiagramname(const char* value) { set_has_sdiagramname(); @@ -656,7 +656,7 @@ inline void SFBDDebugRequest::set_sdiagramname(const char* value) { sdiagramname_ = new ::std::string; } sdiagramname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFBDDebugRequest.sDiagramName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFBDDebugRequest.sDiagramName) } inline void SFBDDebugRequest::set_sdiagramname(const char* value, size_t size) { set_has_sdiagramname(); @@ -664,14 +664,14 @@ inline void SFBDDebugRequest::set_sdiagramname(const char* value, size_t size) { sdiagramname_ = new ::std::string; } sdiagramname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFBDDebugRequest.sDiagramName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFBDDebugRequest.sDiagramName) } inline ::std::string* SFBDDebugRequest::mutable_sdiagramname() { set_has_sdiagramname(); if (sdiagramname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { sdiagramname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFBDDebugRequest.sDiagramName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFBDDebugRequest.sDiagramName) return sdiagramname_; } inline ::std::string* SFBDDebugRequest::release_sdiagramname() { @@ -695,7 +695,7 @@ inline void SFBDDebugRequest::set_allocated_sdiagramname(::std::string* sdiagram clear_has_sdiagramname(); sdiagramname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFBDDebugRequest.sDiagramName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFBDDebugRequest.sDiagramName) } // ------------------------------------------------------------------- @@ -717,13 +717,13 @@ inline void SFBDDebugResponse::clear_ngroupid() { clear_has_ngroupid(); } inline ::google::protobuf::int32 SFBDDebugResponse::ngroupid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFBDDebugResponse.nGroupId) + // @@protoc_insertion_point(field_get:iot_idl.SFBDDebugResponse.nGroupId) return ngroupid_; } inline void SFBDDebugResponse::set_ngroupid(::google::protobuf::int32 value) { set_has_ngroupid(); ngroupid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFBDDebugResponse.nGroupId) + // @@protoc_insertion_point(field_set:iot_idl.SFBDDebugResponse.nGroupId) } // required string sDiagramName = 2; @@ -743,7 +743,7 @@ inline void SFBDDebugResponse::clear_sdiagramname() { clear_has_sdiagramname(); } inline const ::std::string& SFBDDebugResponse::sdiagramname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFBDDebugResponse.sDiagramName) + // @@protoc_insertion_point(field_get:iot_idl.SFBDDebugResponse.sDiagramName) return *sdiagramname_; } inline void SFBDDebugResponse::set_sdiagramname(const ::std::string& value) { @@ -752,7 +752,7 @@ inline void SFBDDebugResponse::set_sdiagramname(const ::std::string& value) { sdiagramname_ = new ::std::string; } sdiagramname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFBDDebugResponse.sDiagramName) + // @@protoc_insertion_point(field_set:iot_idl.SFBDDebugResponse.sDiagramName) } inline void SFBDDebugResponse::set_sdiagramname(const char* value) { set_has_sdiagramname(); @@ -760,7 +760,7 @@ inline void SFBDDebugResponse::set_sdiagramname(const char* value) { sdiagramname_ = new ::std::string; } sdiagramname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFBDDebugResponse.sDiagramName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFBDDebugResponse.sDiagramName) } inline void SFBDDebugResponse::set_sdiagramname(const char* value, size_t size) { set_has_sdiagramname(); @@ -768,14 +768,14 @@ inline void SFBDDebugResponse::set_sdiagramname(const char* value, size_t size) sdiagramname_ = new ::std::string; } sdiagramname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFBDDebugResponse.sDiagramName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFBDDebugResponse.sDiagramName) } inline ::std::string* SFBDDebugResponse::mutable_sdiagramname() { set_has_sdiagramname(); if (sdiagramname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { sdiagramname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFBDDebugResponse.sDiagramName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFBDDebugResponse.sDiagramName) return sdiagramname_; } inline ::std::string* SFBDDebugResponse::release_sdiagramname() { @@ -799,7 +799,7 @@ inline void SFBDDebugResponse::set_allocated_sdiagramname(::std::string* sdiagra clear_has_sdiagramname(); sdiagramname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFBDDebugResponse.sDiagramName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFBDDebugResponse.sDiagramName) } // required int64 nLastUpdateTime = 3; @@ -817,58 +817,58 @@ inline void SFBDDebugResponse::clear_nlastupdatetime() { clear_has_nlastupdatetime(); } inline ::google::protobuf::int64 SFBDDebugResponse::nlastupdatetime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFBDDebugResponse.nLastUpdateTime) + // @@protoc_insertion_point(field_get:iot_idl.SFBDDebugResponse.nLastUpdateTime) return nlastupdatetime_; } inline void SFBDDebugResponse::set_nlastupdatetime(::google::protobuf::int64 value) { set_has_nlastupdatetime(); nlastupdatetime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFBDDebugResponse.nLastUpdateTime) + // @@protoc_insertion_point(field_set:iot_idl.SFBDDebugResponse.nLastUpdateTime) } -// repeated .kbd_idlfile.SFBDDebugData vecBlock = 4; +// repeated .iot_idl.SFBDDebugData vecBlock = 4; inline int SFBDDebugResponse::vecblock_size() const { return vecblock_.size(); } inline void SFBDDebugResponse::clear_vecblock() { vecblock_.Clear(); } -inline const ::kbd_idlfile::SFBDDebugData& SFBDDebugResponse::vecblock(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFBDDebugResponse.vecBlock) +inline const ::iot_idl::SFBDDebugData& SFBDDebugResponse::vecblock(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFBDDebugResponse.vecBlock) return vecblock_.Get(index); } -inline ::kbd_idlfile::SFBDDebugData* SFBDDebugResponse::mutable_vecblock(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFBDDebugResponse.vecBlock) +inline ::iot_idl::SFBDDebugData* SFBDDebugResponse::mutable_vecblock(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFBDDebugResponse.vecBlock) return vecblock_.Mutable(index); } -inline ::kbd_idlfile::SFBDDebugData* SFBDDebugResponse::add_vecblock() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFBDDebugResponse.vecBlock) +inline ::iot_idl::SFBDDebugData* SFBDDebugResponse::add_vecblock() { + // @@protoc_insertion_point(field_add:iot_idl.SFBDDebugResponse.vecBlock) return vecblock_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFBDDebugData >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFBDDebugData >& SFBDDebugResponse::vecblock() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFBDDebugResponse.vecBlock) + // @@protoc_insertion_point(field_list:iot_idl.SFBDDebugResponse.vecBlock) return vecblock_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFBDDebugData >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFBDDebugData >* SFBDDebugResponse::mutable_vecblock() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFBDDebugResponse.vecBlock) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFBDDebugResponse.vecBlock) return &vecblock_; } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::enFbdMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enFbdMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enFbdMsgType>() { - return ::kbd_idlfile::enFbdMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enFbdMsgType>() { + return ::iot_idl::enFbdMsgType_descriptor(); } } // namespace google diff --git a/platform/src/idl_files/FBD.proto b/platform/src/idl_files/FBD.proto index cae5ee0b..99296fd0 100644 --- a/platform/src/idl_files/FBD.proto +++ b/platform/src/idl_files/FBD.proto @@ -5,7 +5,7 @@ //====================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; // 消息类型枚举 diff --git a/platform/src/idl_files/FesMessage.pb.cc b/platform/src/idl_files/FesMessage.pb.cc index 28117520..7e0c6863 100644 --- a/platform/src/idl_files/FesMessage.pb.cc +++ b/platform/src/idl_files/FesMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -1286,7 +1286,7 @@ void protobuf_AddDesc_FesMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\020FesMessage.proto\022\013kbd_idlfile\"\212\001\n\017SFes" + "\n\020FesMessage.proto\022\013iot_idl\"\212\001\n\017SFes" "RealPkgHead\022\024\n\014strFesSource\030\001 \002(\t\022\024\n\014nPa" "ckageType\030\002 \002(\005\022\020\n\010nDataNum\030\003 \002(\005\022\023\n\013ulM" "essageID\030\004 \002(\004\022\021\n\tnResPara1\030\005 \001(\005\022\021\n\tnRe" @@ -1298,11 +1298,11 @@ void protobuf_AddDesc_FesMessage_2eproto() { "\001 \002(\t\022\030\n\020strAppColumnName\030\002 \002(\t\022\025\n\rstrAp" "pTagName\030\003 \002(\t\022\017\n\007uStatus\030\004 \002(\r\022\016\n\006fValu" "e\030\005 \002(\002\"p\n\017SFesChangeAiPkg\022,\n\006stHead\030\001 \002" - "(\0132\034.kbd_idlfile.SFesRealPkgHead\022/\n\010stAi" - "Data\030\002 \003(\0132\035.kbd_idlfile.SFesAiDataWithT" + "(\0132\034.iot_idl.SFesRealPkgHead\022/\n\010stAi" + "Data\030\002 \003(\0132\035.iot_idl.SFesAiDataWithT" "m\"\203\001\n\017SFesUpdateAiPkg\022,\n\006stHead\030\001 \002(\0132\034." - "kbd_idlfile.SFesRealPkgHead\0222\n\010stAiData\030" - "\002 \003(\0132 .kbd_idlfile.SFesAiDataWithoutTm\022" + "iot_idl.SFesRealPkgHead\0222\n\010stAiData\030" + "\002 \003(\0132 .iot_idl.SFesAiDataWithoutTm\022" "\016\n\006ulTime\030\003 \002(\004\"\215\001\n\020SFesDiDataWithTm\022\027\n\017" "strAppTableName\030\001 \002(\t\022\030\n\020strAppColumnNam" "e\030\002 \002(\t\022\025\n\rstrAppTagName\030\003 \002(\t\022\017\n\007uStatu" @@ -1311,11 +1311,11 @@ void protobuf_AddDesc_FesMessage_2eproto() { "me\030\001 \002(\t\022\030\n\020strAppColumnName\030\002 \002(\t\022\025\n\rst" "rAppTagName\030\003 \002(\t\022\017\n\007uStatus\030\004 \002(\r\022\016\n\006nV" "alue\030\005 \002(\005\"p\n\017SFesChangeDiPkg\022,\n\006stHead\030" - "\001 \002(\0132\034.kbd_idlfile.SFesRealPkgHead\022/\n\010s" - "tDiData\030\002 \003(\0132\035.kbd_idlfile.SFesDiDataWi" + "\001 \002(\0132\034.iot_idl.SFesRealPkgHead\022/\n\010s" + "tDiData\030\002 \003(\0132\035.iot_idl.SFesDiDataWi" "thTm\"\203\001\n\017SFesUpdateDiPkg\022,\n\006stHead\030\001 \002(\013" - "2\034.kbd_idlfile.SFesRealPkgHead\0222\n\010stDiDa" - "ta\030\002 \003(\0132 .kbd_idlfile.SFesDiDataWithout" + "2\034.iot_idl.SFesRealPkgHead\0222\n\010stDiDa" + "ta\030\002 \003(\0132 .iot_idl.SFesDiDataWithout" "Tm\022\016\n\006ulTime\030\003 \002(\004\"\215\001\n\020SFesPiDataWithTm\022" "\027\n\017strAppTableName\030\001 \002(\t\022\030\n\020strAppColumn" "Name\030\002 \002(\t\022\025\n\rstrAppTagName\030\003 \002(\t\022\017\n\007uSt" @@ -1324,11 +1324,11 @@ void protobuf_AddDesc_FesMessage_2eproto() { "eName\030\001 \002(\t\022\030\n\020strAppColumnName\030\002 \002(\t\022\025\n" "\rstrAppTagName\030\003 \002(\t\022\017\n\007uStatus\030\004 \002(\r\022\016\n" "\006nValue\030\005 \002(\003\"p\n\017SFesChangePiPkg\022,\n\006stHe" - "ad\030\001 \002(\0132\034.kbd_idlfile.SFesRealPkgHead\022/" - "\n\010stPiData\030\002 \003(\0132\035.kbd_idlfile.SFesPiDat" + "ad\030\001 \002(\0132\034.iot_idl.SFesRealPkgHead\022/" + "\n\010stPiData\030\002 \003(\0132\035.iot_idl.SFesPiDat" "aWithTm\"\203\001\n\017SFesUpdatePiPkg\022,\n\006stHead\030\001 " - "\002(\0132\034.kbd_idlfile.SFesRealPkgHead\0222\n\010stP" - "iData\030\002 \003(\0132 .kbd_idlfile.SFesPiDataWith" + "\002(\0132\034.iot_idl.SFesRealPkgHead\0222\n\010stP" + "iData\030\002 \003(\0132 .iot_idl.SFesPiDataWith" "outTm\022\016\n\006ulTime\030\003 \002(\004\"\215\001\n\020SFesMiDataWith" "Tm\022\027\n\017strAppTableName\030\001 \002(\t\022\030\n\020strAppCol" "umnName\030\002 \002(\t\022\025\n\rstrAppTagName\030\003 \002(\t\022\017\n\007" @@ -1337,11 +1337,11 @@ void protobuf_AddDesc_FesMessage_2eproto() { "ableName\030\001 \002(\t\022\030\n\020strAppColumnName\030\002 \002(\t" "\022\025\n\rstrAppTagName\030\003 \002(\t\022\017\n\007uStatus\030\004 \002(\r" "\022\016\n\006nValue\030\005 \002(\005\"p\n\017SFesChangeMiPkg\022,\n\006s" - "tHead\030\001 \002(\0132\034.kbd_idlfile.SFesRealPkgHea" - "d\022/\n\010stMiData\030\002 \003(\0132\035.kbd_idlfile.SFesMi" + "tHead\030\001 \002(\0132\034.iot_idl.SFesRealPkgHea" + "d\022/\n\010stMiData\030\002 \003(\0132\035.iot_idl.SFesMi" "DataWithTm\"\203\001\n\017SFesUpdateMiPkg\022,\n\006stHead" - "\030\001 \002(\0132\034.kbd_idlfile.SFesRealPkgHead\0222\n\010" - "stMiData\030\002 \003(\0132 .kbd_idlfile.SFesMiDataW" + "\030\001 \002(\0132\034.iot_idl.SFesRealPkgHead\0222\n\010" + "stMiData\030\002 \003(\0132 .iot_idl.SFesMiDataW" "ithoutTm\022\016\n\006ulTime\030\003 \002(\004\"\375\001\n\020SFesDoReque" "stPkg\022\024\n\014strSourceTag\030\001 \002(\t\022\027\n\017strAppTab" "leName\030\002 \002(\t\022\030\n\020strAppColumnName\030\003 \002(\t\022\025" @@ -1374,31 +1374,31 @@ void protobuf_AddDesc_FesMessage_2eproto() { "\022\025\n\rstrAppTagName\030\003 \002(\t\022\030\n\020strAppColumnN" "ame\030\004 \002(\t\022\022\n\nstrRtuName\030\005 \002(\t\022\016\n\006nDevId\030" "\006 \001(\005\022\020\n\010nDataLen\030\007 \001(\005\0225\n\016seqCustCmdDat" - "a\030\010 \003(\0132\035.kbd_idlfile.SFesCustCmdQueue\"\232" + "a\030\010 \003(\0132\035.iot_idl.SFesCustCmdQueue\"\232" "\002\n\023SFesCustCmdReplyPkg\022\024\n\014strSourceTag\030\001" " \002(\t\022\027\n\017strAppTableName\030\002 \002(\t\022\025\n\rstrAppT" "agName\030\004 \002(\t\022\030\n\020strAppColumnName\030\003 \002(\t\022\022" "\n\nstrRtuName\030\005 \002(\t\022\016\n\006nDevId\030\006 \001(\005\022\017\n\007nS" "tatus\030\007 \001(\005\022\020\n\010nDataLen\030\010 \001(\005\0225\n\016seqCust" - "CmdData\030\t \003(\0132\035.kbd_idlfile.SFesCustCmdQ" + "CmdData\030\t \003(\0132\035.iot_idl.SFesCustCmdQ" "ueue\022\017\n\007nResult\030\n \002(\005\022\024\n\014strRetResult\030\013 " "\001(\t\"F\n\016SConstSetQueue\022\022\n\nstrTagName\030\001 \002(" "\t\022\020\n\010nConstID\030\002 \002(\005\022\016\n\006nValue\030\003 \002(\005\"u\n\026S" "FesConstSetRequestPkg\022\016\n\006nRtuNo\030\001 \002(\005\022\016\n" "\006nDevId\030\002 \002(\005\022\014\n\004nNum\030\003 \002(\005\022-\n\010seqValue\030" - "\004 \003(\0132\033.kbd_idlfile.SConstSetQueue\"\220\001\n\025S" + "\004 \003(\0132\033.iot_idl.SConstSetQueue\"\220\001\n\025S" "FesConstReadReplyPkg\022\016\n\006nRtuNo\030\001 \002(\005\022\016\n\006" "nDevId\030\002 \002(\005\022\022\n\nnRetStatus\030\003 \002(\005\022-\n\010seqV" - "alue\030\004 \003(\0132\033.kbd_idlfile.SConstSetQueue\022" + "alue\030\004 \003(\0132\033.iot_idl.SConstSetQueue\022" "\024\n\014strRetResult\030\005 \001(\t\"X\n\022SFesChanStatusI" "nfo\022\017\n\007nChanNo\030\001 \002(\005\022\017\n\007uStatus\030\002 \002(\r\022\020\n" "\010fErrRate\030\003 \002(\002\022\016\n\006ulTime\030\004 \002(\004\"x\n\021SFesC" "hanStatusPkg\022,\n\006stHead\030\001 \002(\0132\034.kbd_idlfi" "le.SFesRealPkgHead\0225\n\014stChanStatus\030\002 \003(\013" - "2\037.kbd_idlfile.SFesChanStatusInfo\"D\n\021SFe" + "2\037.iot_idl.SFesChanStatusInfo\"D\n\021SFe" "sRTUStatusInfo\022\016\n\006nRtuNo\030\001 \002(\005\022\017\n\007uStatu" "s\030\002 \002(\r\022\016\n\006ulTime\030\003 \002(\004\"u\n\020SFesRTUStatus" - "Pkg\022,\n\006stHead\030\001 \002(\0132\034.kbd_idlfile.SFesRe" + "Pkg\022,\n\006stHead\030\001 \002(\0132\034.iot_idl.SFesRe" "alPkgHead\0223\n\013stRtuStatus\030\002 \003(\0132\036.kbd_idl" "file.SFesRTUStatusInfo\"\243\001\n\020SFesSoeEventI" "nfo\022\027\n\017strAppTableName\030\001 \002(\t\022\030\n\020strAppCo" @@ -1410,14 +1410,14 @@ void protobuf_AddDesc_FesMessage_2eproto() { "\"Z\n\020SFesRTUEventInfo\022\021\n\tstrRtuTag\030\001 \002(\t\022" "\017\n\007uStatus\030\002 \002(\r\022\022\n\nnCurChanNo\030\003 \002(\005\022\016\n\006" "ulTime\030\004 \002(\004\"r\n\017SFesSoeEventPkg\022,\n\006stHea" - "d\030\001 \002(\0132\034.kbd_idlfile.SFesRealPkgHead\0221\n" - "\nstSoeEvent\030\002 \003(\0132\035.kbd_idlfile.SFesSoeE" + "d\030\001 \002(\0132\034.iot_idl.SFesRealPkgHead\0221\n" + "\nstSoeEvent\030\002 \003(\0132\035.iot_idl.SFesSoeE" "ventInfo\"u\n\020SFesChanEventPkg\022,\n\006stHead\030\001" - " \002(\0132\034.kbd_idlfile.SFesRealPkgHead\0223\n\013st" - "ChanEvent\030\002 \003(\0132\036.kbd_idlfile.SFesChanEv" + " \002(\0132\034.iot_idl.SFesRealPkgHead\0223\n\013st" + "ChanEvent\030\002 \003(\0132\036.iot_idl.SFesChanEv" "entInfo\"r\n\017SFesRTUEventPkg\022,\n\006stHead\030\001 \002" - "(\0132\034.kbd_idlfile.SFesRealPkgHead\0221\n\nstRt" - "uEvent\030\002 \003(\0132\035.kbd_idlfile.SFesRTUEventI" + "(\0132\034.iot_idl.SFesRealPkgHead\0221\n\nstRt" + "uEvent\030\002 \003(\0132\035.iot_idl.SFesRTUEventI" "nfo\"P\n\013SFesAiValue\022\020\n\010nPointNo\030\001 \002(\005\022\016\n\006" "fValue\030\002 \002(\002\022\017\n\007uStatus\030\003 \002(\r\022\016\n\006ulTime\030" "\004 \002(\004\"P\n\013SFesDiValue\022\020\n\010nPointNo\030\001 \002(\005\022\016" @@ -1427,26 +1427,26 @@ void protobuf_AddDesc_FesMessage_2eproto() { "ime\030\004 \002(\004\"P\n\013SFesMiValue\022\020\n\010nPointNo\030\001 \002" "(\005\022\016\n\006nValue\030\002 \002(\005\022\017\n\007uStatus\030\003 \002(\r\022\016\n\006u" "lTime\030\004 \002(\004\"O\n\017SFesValueReqPkg\022,\n\006stHead" - "\030\001 \002(\0132\034.kbd_idlfile.SFesRealPkgHead\022\016\n\006" + "\030\001 \002(\0132\034.iot_idl.SFesRealPkgHead\022\016\n\006" "nRtuNo\030\002 \002(\005\"\177\n\022SFesAiValueRespPkg\022,\n\006st" - "Head\030\001 \002(\0132\034.kbd_idlfile.SFesRealPkgHead" + "Head\030\001 \002(\0132\034.iot_idl.SFesRealPkgHead" "\022\016\n\006nRtuNo\030\002 \002(\005\022+\n\tstAiValue\030\003 \003(\0132\030.kb" "d_idlfile.SFesAiValue\"\177\n\022SFesDiValueResp" - "Pkg\022,\n\006stHead\030\001 \002(\0132\034.kbd_idlfile.SFesRe" + "Pkg\022,\n\006stHead\030\001 \002(\0132\034.iot_idl.SFesRe" "alPkgHead\022\016\n\006nRtuNo\030\002 \002(\005\022+\n\tstDiValue\030\003" - " \003(\0132\030.kbd_idlfile.SFesDiValue\"\177\n\022SFesPi" + " \003(\0132\030.iot_idl.SFesDiValue\"\177\n\022SFesPi" "ValueRespPkg\022,\n\006stHead\030\001 \002(\0132\034.kbd_idlfi" "le.SFesRealPkgHead\022\016\n\006nRtuNo\030\002 \002(\005\022+\n\tst" - "PiValue\030\003 \003(\0132\030.kbd_idlfile.SFesPiValue\"" + "PiValue\030\003 \003(\0132\030.iot_idl.SFesPiValue\"" "\177\n\022SFesMiValueRespPkg\022,\n\006stHead\030\001 \002(\0132\034." - "kbd_idlfile.SFesRealPkgHead\022\016\n\006nRtuNo\030\002 " - "\002(\005\022+\n\tstMiValue\030\003 \003(\0132\030.kbd_idlfile.SFe" + "iot_idl.SFesRealPkgHead\022\016\n\006nRtuNo\030\002 " + "\002(\005\022+\n\tstMiValue\030\003 \003(\0132\030.iot_idl.SFe" "sMiValue\"}\n\017SFesVirtualData\022\021\n\tstrRtuTag" "\030\001 \002(\t\022\023\n\013strPointTag\030\002 \002(\t\022\022\n\nnPointTyp" "e\030\003 \002(\005\022\016\n\006nOrder\030\004 \002(\005\022\016\n\006fValue\030\005 \002(\002\022" "\016\n\006ulTime\030\006 \002(\004\"v\n\030SFesChangeVirtualData" - "Pkg\022,\n\006stHead\030\001 \002(\0132\034.kbd_idlfile.SFesRe" - "alPkgHead\022,\n\006stData\030\002 \003(\0132\034.kbd_idlfile." + "Pkg\022,\n\006stHead\030\001 \002(\0132\034.iot_idl.SFesRe" + "alPkgHead\022,\n\006stData\030\002 \003(\0132\034.iot_idl." "SFesVirtualData*\350\n\n\014enFesMsgType\022\024\n\020MT_F" "ES_DI_CHANGE\020\001\022\024\n\020MT_FES_DI_UPDATE\020\002\022\021\n\r" "MT_FES_DI_SOE\020\003\022\024\n\020MT_FES_AI_CHANGE\020\004\022\024\n" @@ -1671,7 +1671,7 @@ const int SFesRealPkgHead::kNResPara2FieldNumber; SFesRealPkgHead::SFesRealPkgHead() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesRealPkgHead) + // @@protoc_insertion_point(constructor:iot_idl.SFesRealPkgHead) } void SFesRealPkgHead::InitAsDefaultInstance() { @@ -1681,7 +1681,7 @@ SFesRealPkgHead::SFesRealPkgHead(const SFesRealPkgHead& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesRealPkgHead) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesRealPkgHead) } void SFesRealPkgHead::SharedCtor() { @@ -1697,7 +1697,7 @@ void SFesRealPkgHead::SharedCtor() { } SFesRealPkgHead::~SFesRealPkgHead() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesRealPkgHead) + // @@protoc_insertion_point(destructor:iot_idl.SFesRealPkgHead) SharedDtor(); } @@ -1761,7 +1761,7 @@ bool SFesRealPkgHead::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesRealPkgHead) + // @@protoc_insertion_point(parse_start:iot_idl.SFesRealPkgHead) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1872,17 +1872,17 @@ bool SFesRealPkgHead::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesRealPkgHead) + // @@protoc_insertion_point(parse_success:iot_idl.SFesRealPkgHead) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesRealPkgHead) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesRealPkgHead) return false; #undef DO_ } void SFesRealPkgHead::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesRealPkgHead) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesRealPkgHead) // required string strFesSource = 1; if (has_strfessource()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1922,12 +1922,12 @@ void SFesRealPkgHead::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesRealPkgHead) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesRealPkgHead) } ::google::protobuf::uint8* SFesRealPkgHead::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesRealPkgHead) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesRealPkgHead) // required string strFesSource = 1; if (has_strfessource()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1968,7 +1968,7 @@ void SFesRealPkgHead::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesRealPkgHead) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesRealPkgHead) return target; } @@ -2122,7 +2122,7 @@ const int SFesAiDataWithTm::kUlTimeFieldNumber; SFesAiDataWithTm::SFesAiDataWithTm() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesAiDataWithTm) + // @@protoc_insertion_point(constructor:iot_idl.SFesAiDataWithTm) } void SFesAiDataWithTm::InitAsDefaultInstance() { @@ -2132,7 +2132,7 @@ SFesAiDataWithTm::SFesAiDataWithTm(const SFesAiDataWithTm& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesAiDataWithTm) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesAiDataWithTm) } void SFesAiDataWithTm::SharedCtor() { @@ -2148,7 +2148,7 @@ void SFesAiDataWithTm::SharedCtor() { } SFesAiDataWithTm::~SFesAiDataWithTm() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesAiDataWithTm) + // @@protoc_insertion_point(destructor:iot_idl.SFesAiDataWithTm) SharedDtor(); } @@ -2228,7 +2228,7 @@ bool SFesAiDataWithTm::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesAiDataWithTm) + // @@protoc_insertion_point(parse_start:iot_idl.SFesAiDataWithTm) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2343,17 +2343,17 @@ bool SFesAiDataWithTm::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesAiDataWithTm) + // @@protoc_insertion_point(parse_success:iot_idl.SFesAiDataWithTm) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesAiDataWithTm) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesAiDataWithTm) return false; #undef DO_ } void SFesAiDataWithTm::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesAiDataWithTm) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesAiDataWithTm) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2403,12 +2403,12 @@ void SFesAiDataWithTm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesAiDataWithTm) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesAiDataWithTm) } ::google::protobuf::uint8* SFesAiDataWithTm::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesAiDataWithTm) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesAiDataWithTm) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2461,7 +2461,7 @@ void SFesAiDataWithTm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesAiDataWithTm) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesAiDataWithTm) return target; } @@ -2612,7 +2612,7 @@ const int SFesAiDataWithoutTm::kFValueFieldNumber; SFesAiDataWithoutTm::SFesAiDataWithoutTm() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesAiDataWithoutTm) + // @@protoc_insertion_point(constructor:iot_idl.SFesAiDataWithoutTm) } void SFesAiDataWithoutTm::InitAsDefaultInstance() { @@ -2622,7 +2622,7 @@ SFesAiDataWithoutTm::SFesAiDataWithoutTm(const SFesAiDataWithoutTm& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesAiDataWithoutTm) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesAiDataWithoutTm) } void SFesAiDataWithoutTm::SharedCtor() { @@ -2637,7 +2637,7 @@ void SFesAiDataWithoutTm::SharedCtor() { } SFesAiDataWithoutTm::~SFesAiDataWithoutTm() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesAiDataWithoutTm) + // @@protoc_insertion_point(destructor:iot_idl.SFesAiDataWithoutTm) SharedDtor(); } @@ -2717,7 +2717,7 @@ bool SFesAiDataWithoutTm::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesAiDataWithoutTm) + // @@protoc_insertion_point(parse_start:iot_idl.SFesAiDataWithoutTm) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2817,17 +2817,17 @@ bool SFesAiDataWithoutTm::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesAiDataWithoutTm) + // @@protoc_insertion_point(parse_success:iot_idl.SFesAiDataWithoutTm) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesAiDataWithoutTm) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesAiDataWithoutTm) return false; #undef DO_ } void SFesAiDataWithoutTm::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesAiDataWithoutTm) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesAiDataWithoutTm) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2872,12 +2872,12 @@ void SFesAiDataWithoutTm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesAiDataWithoutTm) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesAiDataWithoutTm) } ::google::protobuf::uint8* SFesAiDataWithoutTm::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesAiDataWithoutTm) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesAiDataWithoutTm) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2925,7 +2925,7 @@ void SFesAiDataWithoutTm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesAiDataWithoutTm) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesAiDataWithoutTm) return target; } @@ -3062,18 +3062,18 @@ const int SFesChangeAiPkg::kStAiDataFieldNumber; SFesChangeAiPkg::SFesChangeAiPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesChangeAiPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesChangeAiPkg) } void SFesChangeAiPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesChangeAiPkg::SFesChangeAiPkg(const SFesChangeAiPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesChangeAiPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesChangeAiPkg) } void SFesChangeAiPkg::SharedCtor() { @@ -3083,7 +3083,7 @@ void SFesChangeAiPkg::SharedCtor() { } SFesChangeAiPkg::~SFesChangeAiPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesChangeAiPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesChangeAiPkg) SharedDtor(); } @@ -3116,7 +3116,7 @@ SFesChangeAiPkg* SFesChangeAiPkg::New() const { void SFesChangeAiPkg::Clear() { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } staidata_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -3127,13 +3127,13 @@ bool SFesChangeAiPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesChangeAiPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesChangeAiPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -3145,7 +3145,7 @@ bool SFesChangeAiPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesAiDataWithTm stAiData = 2; + // repeated .iot_idl.SFesAiDataWithTm stAiData = 2; case 2: { if (tag == 18) { parse_stAiData: @@ -3173,24 +3173,24 @@ bool SFesChangeAiPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesChangeAiPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesChangeAiPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesChangeAiPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesChangeAiPkg) return false; #undef DO_ } void SFesChangeAiPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesChangeAiPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesChangeAiPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); } - // repeated .kbd_idlfile.SFesAiDataWithTm stAiData = 2; + // repeated .iot_idl.SFesAiDataWithTm stAiData = 2; for (int i = 0; i < this->staidata_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->staidata(i), output); @@ -3200,20 +3200,20 @@ void SFesChangeAiPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesChangeAiPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesChangeAiPkg) } ::google::protobuf::uint8* SFesChangeAiPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesChangeAiPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesChangeAiPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->sthead(), target); } - // repeated .kbd_idlfile.SFesAiDataWithTm stAiData = 2; + // repeated .iot_idl.SFesAiDataWithTm stAiData = 2; for (int i = 0; i < this->staidata_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -3224,7 +3224,7 @@ void SFesChangeAiPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesChangeAiPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesChangeAiPkg) return target; } @@ -3232,7 +3232,7 @@ int SFesChangeAiPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -3240,7 +3240,7 @@ int SFesChangeAiPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesAiDataWithTm stAiData = 2; + // repeated .iot_idl.SFesAiDataWithTm stAiData = 2; total_size += 1 * this->staidata_size(); for (int i = 0; i < this->staidata_size(); i++) { total_size += @@ -3276,7 +3276,7 @@ void SFesChangeAiPkg::MergeFrom(const SFesChangeAiPkg& from) { staidata_.MergeFrom(from.staidata_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -3334,18 +3334,18 @@ const int SFesUpdateAiPkg::kUlTimeFieldNumber; SFesUpdateAiPkg::SFesUpdateAiPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesUpdateAiPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesUpdateAiPkg) } void SFesUpdateAiPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesUpdateAiPkg::SFesUpdateAiPkg(const SFesUpdateAiPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesUpdateAiPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesUpdateAiPkg) } void SFesUpdateAiPkg::SharedCtor() { @@ -3356,7 +3356,7 @@ void SFesUpdateAiPkg::SharedCtor() { } SFesUpdateAiPkg::~SFesUpdateAiPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesUpdateAiPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesUpdateAiPkg) SharedDtor(); } @@ -3390,7 +3390,7 @@ SFesUpdateAiPkg* SFesUpdateAiPkg::New() const { void SFesUpdateAiPkg::Clear() { if (_has_bits_[0 / 32] & 5) { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } ultime_ = GOOGLE_ULONGLONG(0); } @@ -3403,13 +3403,13 @@ bool SFesUpdateAiPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesUpdateAiPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesUpdateAiPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -3421,7 +3421,7 @@ bool SFesUpdateAiPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesAiDataWithoutTm stAiData = 2; + // repeated .iot_idl.SFesAiDataWithoutTm stAiData = 2; case 2: { if (tag == 18) { parse_stAiData: @@ -3464,24 +3464,24 @@ bool SFesUpdateAiPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesUpdateAiPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesUpdateAiPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesUpdateAiPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesUpdateAiPkg) return false; #undef DO_ } void SFesUpdateAiPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesUpdateAiPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesUpdateAiPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); } - // repeated .kbd_idlfile.SFesAiDataWithoutTm stAiData = 2; + // repeated .iot_idl.SFesAiDataWithoutTm stAiData = 2; for (int i = 0; i < this->staidata_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->staidata(i), output); @@ -3496,20 +3496,20 @@ void SFesUpdateAiPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesUpdateAiPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesUpdateAiPkg) } ::google::protobuf::uint8* SFesUpdateAiPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesUpdateAiPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesUpdateAiPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->sthead(), target); } - // repeated .kbd_idlfile.SFesAiDataWithoutTm stAiData = 2; + // repeated .iot_idl.SFesAiDataWithoutTm stAiData = 2; for (int i = 0; i < this->staidata_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -3525,7 +3525,7 @@ void SFesUpdateAiPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesUpdateAiPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesUpdateAiPkg) return target; } @@ -3533,7 +3533,7 @@ int SFesUpdateAiPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -3548,7 +3548,7 @@ int SFesUpdateAiPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesAiDataWithoutTm stAiData = 2; + // repeated .iot_idl.SFesAiDataWithoutTm stAiData = 2; total_size += 1 * this->staidata_size(); for (int i = 0; i < this->staidata_size(); i++) { total_size += @@ -3584,7 +3584,7 @@ void SFesUpdateAiPkg::MergeFrom(const SFesUpdateAiPkg& from) { staidata_.MergeFrom(from.staidata_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } if (from.has_ultime()) { set_ultime(from.ultime()); @@ -3649,7 +3649,7 @@ const int SFesDiDataWithTm::kUlTimeFieldNumber; SFesDiDataWithTm::SFesDiDataWithTm() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesDiDataWithTm) + // @@protoc_insertion_point(constructor:iot_idl.SFesDiDataWithTm) } void SFesDiDataWithTm::InitAsDefaultInstance() { @@ -3659,7 +3659,7 @@ SFesDiDataWithTm::SFesDiDataWithTm(const SFesDiDataWithTm& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesDiDataWithTm) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesDiDataWithTm) } void SFesDiDataWithTm::SharedCtor() { @@ -3675,7 +3675,7 @@ void SFesDiDataWithTm::SharedCtor() { } SFesDiDataWithTm::~SFesDiDataWithTm() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesDiDataWithTm) + // @@protoc_insertion_point(destructor:iot_idl.SFesDiDataWithTm) SharedDtor(); } @@ -3755,7 +3755,7 @@ bool SFesDiDataWithTm::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesDiDataWithTm) + // @@protoc_insertion_point(parse_start:iot_idl.SFesDiDataWithTm) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -3870,17 +3870,17 @@ bool SFesDiDataWithTm::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesDiDataWithTm) + // @@protoc_insertion_point(parse_success:iot_idl.SFesDiDataWithTm) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesDiDataWithTm) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesDiDataWithTm) return false; #undef DO_ } void SFesDiDataWithTm::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesDiDataWithTm) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesDiDataWithTm) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -3930,12 +3930,12 @@ void SFesDiDataWithTm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesDiDataWithTm) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesDiDataWithTm) } ::google::protobuf::uint8* SFesDiDataWithTm::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesDiDataWithTm) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesDiDataWithTm) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -3988,7 +3988,7 @@ void SFesDiDataWithTm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesDiDataWithTm) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesDiDataWithTm) return target; } @@ -4141,7 +4141,7 @@ const int SFesDiDataWithoutTm::kNValueFieldNumber; SFesDiDataWithoutTm::SFesDiDataWithoutTm() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesDiDataWithoutTm) + // @@protoc_insertion_point(constructor:iot_idl.SFesDiDataWithoutTm) } void SFesDiDataWithoutTm::InitAsDefaultInstance() { @@ -4151,7 +4151,7 @@ SFesDiDataWithoutTm::SFesDiDataWithoutTm(const SFesDiDataWithoutTm& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesDiDataWithoutTm) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesDiDataWithoutTm) } void SFesDiDataWithoutTm::SharedCtor() { @@ -4166,7 +4166,7 @@ void SFesDiDataWithoutTm::SharedCtor() { } SFesDiDataWithoutTm::~SFesDiDataWithoutTm() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesDiDataWithoutTm) + // @@protoc_insertion_point(destructor:iot_idl.SFesDiDataWithoutTm) SharedDtor(); } @@ -4246,7 +4246,7 @@ bool SFesDiDataWithoutTm::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesDiDataWithoutTm) + // @@protoc_insertion_point(parse_start:iot_idl.SFesDiDataWithoutTm) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -4346,17 +4346,17 @@ bool SFesDiDataWithoutTm::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesDiDataWithoutTm) + // @@protoc_insertion_point(parse_success:iot_idl.SFesDiDataWithoutTm) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesDiDataWithoutTm) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesDiDataWithoutTm) return false; #undef DO_ } void SFesDiDataWithoutTm::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesDiDataWithoutTm) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesDiDataWithoutTm) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4401,12 +4401,12 @@ void SFesDiDataWithoutTm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesDiDataWithoutTm) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesDiDataWithoutTm) } ::google::protobuf::uint8* SFesDiDataWithoutTm::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesDiDataWithoutTm) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesDiDataWithoutTm) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4454,7 +4454,7 @@ void SFesDiDataWithoutTm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesDiDataWithoutTm) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesDiDataWithoutTm) return target; } @@ -4593,18 +4593,18 @@ const int SFesChangeDiPkg::kStDiDataFieldNumber; SFesChangeDiPkg::SFesChangeDiPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesChangeDiPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesChangeDiPkg) } void SFesChangeDiPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesChangeDiPkg::SFesChangeDiPkg(const SFesChangeDiPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesChangeDiPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesChangeDiPkg) } void SFesChangeDiPkg::SharedCtor() { @@ -4614,7 +4614,7 @@ void SFesChangeDiPkg::SharedCtor() { } SFesChangeDiPkg::~SFesChangeDiPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesChangeDiPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesChangeDiPkg) SharedDtor(); } @@ -4647,7 +4647,7 @@ SFesChangeDiPkg* SFesChangeDiPkg::New() const { void SFesChangeDiPkg::Clear() { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } stdidata_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -4658,13 +4658,13 @@ bool SFesChangeDiPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesChangeDiPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesChangeDiPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -4676,7 +4676,7 @@ bool SFesChangeDiPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesDiDataWithTm stDiData = 2; + // repeated .iot_idl.SFesDiDataWithTm stDiData = 2; case 2: { if (tag == 18) { parse_stDiData: @@ -4704,24 +4704,24 @@ bool SFesChangeDiPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesChangeDiPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesChangeDiPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesChangeDiPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesChangeDiPkg) return false; #undef DO_ } void SFesChangeDiPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesChangeDiPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesChangeDiPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); } - // repeated .kbd_idlfile.SFesDiDataWithTm stDiData = 2; + // repeated .iot_idl.SFesDiDataWithTm stDiData = 2; for (int i = 0; i < this->stdidata_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->stdidata(i), output); @@ -4731,20 +4731,20 @@ void SFesChangeDiPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesChangeDiPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesChangeDiPkg) } ::google::protobuf::uint8* SFesChangeDiPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesChangeDiPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesChangeDiPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->sthead(), target); } - // repeated .kbd_idlfile.SFesDiDataWithTm stDiData = 2; + // repeated .iot_idl.SFesDiDataWithTm stDiData = 2; for (int i = 0; i < this->stdidata_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -4755,7 +4755,7 @@ void SFesChangeDiPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesChangeDiPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesChangeDiPkg) return target; } @@ -4763,7 +4763,7 @@ int SFesChangeDiPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -4771,7 +4771,7 @@ int SFesChangeDiPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesDiDataWithTm stDiData = 2; + // repeated .iot_idl.SFesDiDataWithTm stDiData = 2; total_size += 1 * this->stdidata_size(); for (int i = 0; i < this->stdidata_size(); i++) { total_size += @@ -4807,7 +4807,7 @@ void SFesChangeDiPkg::MergeFrom(const SFesChangeDiPkg& from) { stdidata_.MergeFrom(from.stdidata_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -4865,18 +4865,18 @@ const int SFesUpdateDiPkg::kUlTimeFieldNumber; SFesUpdateDiPkg::SFesUpdateDiPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesUpdateDiPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesUpdateDiPkg) } void SFesUpdateDiPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesUpdateDiPkg::SFesUpdateDiPkg(const SFesUpdateDiPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesUpdateDiPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesUpdateDiPkg) } void SFesUpdateDiPkg::SharedCtor() { @@ -4887,7 +4887,7 @@ void SFesUpdateDiPkg::SharedCtor() { } SFesUpdateDiPkg::~SFesUpdateDiPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesUpdateDiPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesUpdateDiPkg) SharedDtor(); } @@ -4921,7 +4921,7 @@ SFesUpdateDiPkg* SFesUpdateDiPkg::New() const { void SFesUpdateDiPkg::Clear() { if (_has_bits_[0 / 32] & 5) { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } ultime_ = GOOGLE_ULONGLONG(0); } @@ -4934,13 +4934,13 @@ bool SFesUpdateDiPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesUpdateDiPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesUpdateDiPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -4952,7 +4952,7 @@ bool SFesUpdateDiPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesDiDataWithoutTm stDiData = 2; + // repeated .iot_idl.SFesDiDataWithoutTm stDiData = 2; case 2: { if (tag == 18) { parse_stDiData: @@ -4995,24 +4995,24 @@ bool SFesUpdateDiPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesUpdateDiPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesUpdateDiPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesUpdateDiPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesUpdateDiPkg) return false; #undef DO_ } void SFesUpdateDiPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesUpdateDiPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesUpdateDiPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); } - // repeated .kbd_idlfile.SFesDiDataWithoutTm stDiData = 2; + // repeated .iot_idl.SFesDiDataWithoutTm stDiData = 2; for (int i = 0; i < this->stdidata_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->stdidata(i), output); @@ -5027,20 +5027,20 @@ void SFesUpdateDiPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesUpdateDiPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesUpdateDiPkg) } ::google::protobuf::uint8* SFesUpdateDiPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesUpdateDiPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesUpdateDiPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->sthead(), target); } - // repeated .kbd_idlfile.SFesDiDataWithoutTm stDiData = 2; + // repeated .iot_idl.SFesDiDataWithoutTm stDiData = 2; for (int i = 0; i < this->stdidata_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -5056,7 +5056,7 @@ void SFesUpdateDiPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesUpdateDiPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesUpdateDiPkg) return target; } @@ -5064,7 +5064,7 @@ int SFesUpdateDiPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -5079,7 +5079,7 @@ int SFesUpdateDiPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesDiDataWithoutTm stDiData = 2; + // repeated .iot_idl.SFesDiDataWithoutTm stDiData = 2; total_size += 1 * this->stdidata_size(); for (int i = 0; i < this->stdidata_size(); i++) { total_size += @@ -5115,7 +5115,7 @@ void SFesUpdateDiPkg::MergeFrom(const SFesUpdateDiPkg& from) { stdidata_.MergeFrom(from.stdidata_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } if (from.has_ultime()) { set_ultime(from.ultime()); @@ -5180,7 +5180,7 @@ const int SFesPiDataWithTm::kUlTimeFieldNumber; SFesPiDataWithTm::SFesPiDataWithTm() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesPiDataWithTm) + // @@protoc_insertion_point(constructor:iot_idl.SFesPiDataWithTm) } void SFesPiDataWithTm::InitAsDefaultInstance() { @@ -5190,7 +5190,7 @@ SFesPiDataWithTm::SFesPiDataWithTm(const SFesPiDataWithTm& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesPiDataWithTm) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesPiDataWithTm) } void SFesPiDataWithTm::SharedCtor() { @@ -5206,7 +5206,7 @@ void SFesPiDataWithTm::SharedCtor() { } SFesPiDataWithTm::~SFesPiDataWithTm() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesPiDataWithTm) + // @@protoc_insertion_point(destructor:iot_idl.SFesPiDataWithTm) SharedDtor(); } @@ -5286,7 +5286,7 @@ bool SFesPiDataWithTm::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesPiDataWithTm) + // @@protoc_insertion_point(parse_start:iot_idl.SFesPiDataWithTm) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -5401,17 +5401,17 @@ bool SFesPiDataWithTm::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesPiDataWithTm) + // @@protoc_insertion_point(parse_success:iot_idl.SFesPiDataWithTm) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesPiDataWithTm) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesPiDataWithTm) return false; #undef DO_ } void SFesPiDataWithTm::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesPiDataWithTm) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesPiDataWithTm) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -5461,12 +5461,12 @@ void SFesPiDataWithTm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesPiDataWithTm) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesPiDataWithTm) } ::google::protobuf::uint8* SFesPiDataWithTm::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesPiDataWithTm) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesPiDataWithTm) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -5519,7 +5519,7 @@ void SFesPiDataWithTm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesPiDataWithTm) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesPiDataWithTm) return target; } @@ -5672,7 +5672,7 @@ const int SFesPiDataWithoutTm::kNValueFieldNumber; SFesPiDataWithoutTm::SFesPiDataWithoutTm() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesPiDataWithoutTm) + // @@protoc_insertion_point(constructor:iot_idl.SFesPiDataWithoutTm) } void SFesPiDataWithoutTm::InitAsDefaultInstance() { @@ -5682,7 +5682,7 @@ SFesPiDataWithoutTm::SFesPiDataWithoutTm(const SFesPiDataWithoutTm& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesPiDataWithoutTm) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesPiDataWithoutTm) } void SFesPiDataWithoutTm::SharedCtor() { @@ -5697,7 +5697,7 @@ void SFesPiDataWithoutTm::SharedCtor() { } SFesPiDataWithoutTm::~SFesPiDataWithoutTm() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesPiDataWithoutTm) + // @@protoc_insertion_point(destructor:iot_idl.SFesPiDataWithoutTm) SharedDtor(); } @@ -5777,7 +5777,7 @@ bool SFesPiDataWithoutTm::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesPiDataWithoutTm) + // @@protoc_insertion_point(parse_start:iot_idl.SFesPiDataWithoutTm) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -5877,17 +5877,17 @@ bool SFesPiDataWithoutTm::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesPiDataWithoutTm) + // @@protoc_insertion_point(parse_success:iot_idl.SFesPiDataWithoutTm) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesPiDataWithoutTm) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesPiDataWithoutTm) return false; #undef DO_ } void SFesPiDataWithoutTm::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesPiDataWithoutTm) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesPiDataWithoutTm) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -5932,12 +5932,12 @@ void SFesPiDataWithoutTm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesPiDataWithoutTm) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesPiDataWithoutTm) } ::google::protobuf::uint8* SFesPiDataWithoutTm::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesPiDataWithoutTm) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesPiDataWithoutTm) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -5985,7 +5985,7 @@ void SFesPiDataWithoutTm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesPiDataWithoutTm) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesPiDataWithoutTm) return target; } @@ -6124,18 +6124,18 @@ const int SFesChangePiPkg::kStPiDataFieldNumber; SFesChangePiPkg::SFesChangePiPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesChangePiPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesChangePiPkg) } void SFesChangePiPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesChangePiPkg::SFesChangePiPkg(const SFesChangePiPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesChangePiPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesChangePiPkg) } void SFesChangePiPkg::SharedCtor() { @@ -6145,7 +6145,7 @@ void SFesChangePiPkg::SharedCtor() { } SFesChangePiPkg::~SFesChangePiPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesChangePiPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesChangePiPkg) SharedDtor(); } @@ -6178,7 +6178,7 @@ SFesChangePiPkg* SFesChangePiPkg::New() const { void SFesChangePiPkg::Clear() { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } stpidata_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -6189,13 +6189,13 @@ bool SFesChangePiPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesChangePiPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesChangePiPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -6207,7 +6207,7 @@ bool SFesChangePiPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesPiDataWithTm stPiData = 2; + // repeated .iot_idl.SFesPiDataWithTm stPiData = 2; case 2: { if (tag == 18) { parse_stPiData: @@ -6235,24 +6235,24 @@ bool SFesChangePiPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesChangePiPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesChangePiPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesChangePiPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesChangePiPkg) return false; #undef DO_ } void SFesChangePiPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesChangePiPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesChangePiPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); } - // repeated .kbd_idlfile.SFesPiDataWithTm stPiData = 2; + // repeated .iot_idl.SFesPiDataWithTm stPiData = 2; for (int i = 0; i < this->stpidata_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->stpidata(i), output); @@ -6262,20 +6262,20 @@ void SFesChangePiPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesChangePiPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesChangePiPkg) } ::google::protobuf::uint8* SFesChangePiPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesChangePiPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesChangePiPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->sthead(), target); } - // repeated .kbd_idlfile.SFesPiDataWithTm stPiData = 2; + // repeated .iot_idl.SFesPiDataWithTm stPiData = 2; for (int i = 0; i < this->stpidata_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -6286,7 +6286,7 @@ void SFesChangePiPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesChangePiPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesChangePiPkg) return target; } @@ -6294,7 +6294,7 @@ int SFesChangePiPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -6302,7 +6302,7 @@ int SFesChangePiPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesPiDataWithTm stPiData = 2; + // repeated .iot_idl.SFesPiDataWithTm stPiData = 2; total_size += 1 * this->stpidata_size(); for (int i = 0; i < this->stpidata_size(); i++) { total_size += @@ -6338,7 +6338,7 @@ void SFesChangePiPkg::MergeFrom(const SFesChangePiPkg& from) { stpidata_.MergeFrom(from.stpidata_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -6396,18 +6396,18 @@ const int SFesUpdatePiPkg::kUlTimeFieldNumber; SFesUpdatePiPkg::SFesUpdatePiPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesUpdatePiPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesUpdatePiPkg) } void SFesUpdatePiPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesUpdatePiPkg::SFesUpdatePiPkg(const SFesUpdatePiPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesUpdatePiPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesUpdatePiPkg) } void SFesUpdatePiPkg::SharedCtor() { @@ -6418,7 +6418,7 @@ void SFesUpdatePiPkg::SharedCtor() { } SFesUpdatePiPkg::~SFesUpdatePiPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesUpdatePiPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesUpdatePiPkg) SharedDtor(); } @@ -6452,7 +6452,7 @@ SFesUpdatePiPkg* SFesUpdatePiPkg::New() const { void SFesUpdatePiPkg::Clear() { if (_has_bits_[0 / 32] & 5) { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } ultime_ = GOOGLE_ULONGLONG(0); } @@ -6465,13 +6465,13 @@ bool SFesUpdatePiPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesUpdatePiPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesUpdatePiPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -6483,7 +6483,7 @@ bool SFesUpdatePiPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesPiDataWithoutTm stPiData = 2; + // repeated .iot_idl.SFesPiDataWithoutTm stPiData = 2; case 2: { if (tag == 18) { parse_stPiData: @@ -6526,24 +6526,24 @@ bool SFesUpdatePiPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesUpdatePiPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesUpdatePiPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesUpdatePiPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesUpdatePiPkg) return false; #undef DO_ } void SFesUpdatePiPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesUpdatePiPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesUpdatePiPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); } - // repeated .kbd_idlfile.SFesPiDataWithoutTm stPiData = 2; + // repeated .iot_idl.SFesPiDataWithoutTm stPiData = 2; for (int i = 0; i < this->stpidata_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->stpidata(i), output); @@ -6558,20 +6558,20 @@ void SFesUpdatePiPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesUpdatePiPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesUpdatePiPkg) } ::google::protobuf::uint8* SFesUpdatePiPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesUpdatePiPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesUpdatePiPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->sthead(), target); } - // repeated .kbd_idlfile.SFesPiDataWithoutTm stPiData = 2; + // repeated .iot_idl.SFesPiDataWithoutTm stPiData = 2; for (int i = 0; i < this->stpidata_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -6587,7 +6587,7 @@ void SFesUpdatePiPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesUpdatePiPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesUpdatePiPkg) return target; } @@ -6595,7 +6595,7 @@ int SFesUpdatePiPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -6610,7 +6610,7 @@ int SFesUpdatePiPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesPiDataWithoutTm stPiData = 2; + // repeated .iot_idl.SFesPiDataWithoutTm stPiData = 2; total_size += 1 * this->stpidata_size(); for (int i = 0; i < this->stpidata_size(); i++) { total_size += @@ -6646,7 +6646,7 @@ void SFesUpdatePiPkg::MergeFrom(const SFesUpdatePiPkg& from) { stpidata_.MergeFrom(from.stpidata_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } if (from.has_ultime()) { set_ultime(from.ultime()); @@ -6711,7 +6711,7 @@ const int SFesMiDataWithTm::kUlTimeFieldNumber; SFesMiDataWithTm::SFesMiDataWithTm() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesMiDataWithTm) + // @@protoc_insertion_point(constructor:iot_idl.SFesMiDataWithTm) } void SFesMiDataWithTm::InitAsDefaultInstance() { @@ -6721,7 +6721,7 @@ SFesMiDataWithTm::SFesMiDataWithTm(const SFesMiDataWithTm& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesMiDataWithTm) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesMiDataWithTm) } void SFesMiDataWithTm::SharedCtor() { @@ -6737,7 +6737,7 @@ void SFesMiDataWithTm::SharedCtor() { } SFesMiDataWithTm::~SFesMiDataWithTm() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesMiDataWithTm) + // @@protoc_insertion_point(destructor:iot_idl.SFesMiDataWithTm) SharedDtor(); } @@ -6817,7 +6817,7 @@ bool SFesMiDataWithTm::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesMiDataWithTm) + // @@protoc_insertion_point(parse_start:iot_idl.SFesMiDataWithTm) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -6932,17 +6932,17 @@ bool SFesMiDataWithTm::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesMiDataWithTm) + // @@protoc_insertion_point(parse_success:iot_idl.SFesMiDataWithTm) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesMiDataWithTm) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesMiDataWithTm) return false; #undef DO_ } void SFesMiDataWithTm::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesMiDataWithTm) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesMiDataWithTm) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -6992,12 +6992,12 @@ void SFesMiDataWithTm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesMiDataWithTm) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesMiDataWithTm) } ::google::protobuf::uint8* SFesMiDataWithTm::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesMiDataWithTm) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesMiDataWithTm) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -7050,7 +7050,7 @@ void SFesMiDataWithTm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesMiDataWithTm) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesMiDataWithTm) return target; } @@ -7203,7 +7203,7 @@ const int SFesMiDataWithoutTm::kNValueFieldNumber; SFesMiDataWithoutTm::SFesMiDataWithoutTm() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesMiDataWithoutTm) + // @@protoc_insertion_point(constructor:iot_idl.SFesMiDataWithoutTm) } void SFesMiDataWithoutTm::InitAsDefaultInstance() { @@ -7213,7 +7213,7 @@ SFesMiDataWithoutTm::SFesMiDataWithoutTm(const SFesMiDataWithoutTm& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesMiDataWithoutTm) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesMiDataWithoutTm) } void SFesMiDataWithoutTm::SharedCtor() { @@ -7228,7 +7228,7 @@ void SFesMiDataWithoutTm::SharedCtor() { } SFesMiDataWithoutTm::~SFesMiDataWithoutTm() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesMiDataWithoutTm) + // @@protoc_insertion_point(destructor:iot_idl.SFesMiDataWithoutTm) SharedDtor(); } @@ -7308,7 +7308,7 @@ bool SFesMiDataWithoutTm::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesMiDataWithoutTm) + // @@protoc_insertion_point(parse_start:iot_idl.SFesMiDataWithoutTm) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -7408,17 +7408,17 @@ bool SFesMiDataWithoutTm::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesMiDataWithoutTm) + // @@protoc_insertion_point(parse_success:iot_idl.SFesMiDataWithoutTm) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesMiDataWithoutTm) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesMiDataWithoutTm) return false; #undef DO_ } void SFesMiDataWithoutTm::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesMiDataWithoutTm) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesMiDataWithoutTm) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -7463,12 +7463,12 @@ void SFesMiDataWithoutTm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesMiDataWithoutTm) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesMiDataWithoutTm) } ::google::protobuf::uint8* SFesMiDataWithoutTm::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesMiDataWithoutTm) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesMiDataWithoutTm) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -7516,7 +7516,7 @@ void SFesMiDataWithoutTm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesMiDataWithoutTm) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesMiDataWithoutTm) return target; } @@ -7655,18 +7655,18 @@ const int SFesChangeMiPkg::kStMiDataFieldNumber; SFesChangeMiPkg::SFesChangeMiPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesChangeMiPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesChangeMiPkg) } void SFesChangeMiPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesChangeMiPkg::SFesChangeMiPkg(const SFesChangeMiPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesChangeMiPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesChangeMiPkg) } void SFesChangeMiPkg::SharedCtor() { @@ -7676,7 +7676,7 @@ void SFesChangeMiPkg::SharedCtor() { } SFesChangeMiPkg::~SFesChangeMiPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesChangeMiPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesChangeMiPkg) SharedDtor(); } @@ -7709,7 +7709,7 @@ SFesChangeMiPkg* SFesChangeMiPkg::New() const { void SFesChangeMiPkg::Clear() { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } stmidata_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -7720,13 +7720,13 @@ bool SFesChangeMiPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesChangeMiPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesChangeMiPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -7738,7 +7738,7 @@ bool SFesChangeMiPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesMiDataWithTm stMiData = 2; + // repeated .iot_idl.SFesMiDataWithTm stMiData = 2; case 2: { if (tag == 18) { parse_stMiData: @@ -7766,24 +7766,24 @@ bool SFesChangeMiPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesChangeMiPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesChangeMiPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesChangeMiPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesChangeMiPkg) return false; #undef DO_ } void SFesChangeMiPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesChangeMiPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesChangeMiPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); } - // repeated .kbd_idlfile.SFesMiDataWithTm stMiData = 2; + // repeated .iot_idl.SFesMiDataWithTm stMiData = 2; for (int i = 0; i < this->stmidata_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->stmidata(i), output); @@ -7793,20 +7793,20 @@ void SFesChangeMiPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesChangeMiPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesChangeMiPkg) } ::google::protobuf::uint8* SFesChangeMiPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesChangeMiPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesChangeMiPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->sthead(), target); } - // repeated .kbd_idlfile.SFesMiDataWithTm stMiData = 2; + // repeated .iot_idl.SFesMiDataWithTm stMiData = 2; for (int i = 0; i < this->stmidata_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -7817,7 +7817,7 @@ void SFesChangeMiPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesChangeMiPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesChangeMiPkg) return target; } @@ -7825,7 +7825,7 @@ int SFesChangeMiPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -7833,7 +7833,7 @@ int SFesChangeMiPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesMiDataWithTm stMiData = 2; + // repeated .iot_idl.SFesMiDataWithTm stMiData = 2; total_size += 1 * this->stmidata_size(); for (int i = 0; i < this->stmidata_size(); i++) { total_size += @@ -7869,7 +7869,7 @@ void SFesChangeMiPkg::MergeFrom(const SFesChangeMiPkg& from) { stmidata_.MergeFrom(from.stmidata_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -7927,18 +7927,18 @@ const int SFesUpdateMiPkg::kUlTimeFieldNumber; SFesUpdateMiPkg::SFesUpdateMiPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesUpdateMiPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesUpdateMiPkg) } void SFesUpdateMiPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesUpdateMiPkg::SFesUpdateMiPkg(const SFesUpdateMiPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesUpdateMiPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesUpdateMiPkg) } void SFesUpdateMiPkg::SharedCtor() { @@ -7949,7 +7949,7 @@ void SFesUpdateMiPkg::SharedCtor() { } SFesUpdateMiPkg::~SFesUpdateMiPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesUpdateMiPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesUpdateMiPkg) SharedDtor(); } @@ -7983,7 +7983,7 @@ SFesUpdateMiPkg* SFesUpdateMiPkg::New() const { void SFesUpdateMiPkg::Clear() { if (_has_bits_[0 / 32] & 5) { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } ultime_ = GOOGLE_ULONGLONG(0); } @@ -7996,13 +7996,13 @@ bool SFesUpdateMiPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesUpdateMiPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesUpdateMiPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -8014,7 +8014,7 @@ bool SFesUpdateMiPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesMiDataWithoutTm stMiData = 2; + // repeated .iot_idl.SFesMiDataWithoutTm stMiData = 2; case 2: { if (tag == 18) { parse_stMiData: @@ -8057,24 +8057,24 @@ bool SFesUpdateMiPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesUpdateMiPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesUpdateMiPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesUpdateMiPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesUpdateMiPkg) return false; #undef DO_ } void SFesUpdateMiPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesUpdateMiPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesUpdateMiPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); } - // repeated .kbd_idlfile.SFesMiDataWithoutTm stMiData = 2; + // repeated .iot_idl.SFesMiDataWithoutTm stMiData = 2; for (int i = 0; i < this->stmidata_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->stmidata(i), output); @@ -8089,20 +8089,20 @@ void SFesUpdateMiPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesUpdateMiPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesUpdateMiPkg) } ::google::protobuf::uint8* SFesUpdateMiPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesUpdateMiPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesUpdateMiPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->sthead(), target); } - // repeated .kbd_idlfile.SFesMiDataWithoutTm stMiData = 2; + // repeated .iot_idl.SFesMiDataWithoutTm stMiData = 2; for (int i = 0; i < this->stmidata_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -8118,7 +8118,7 @@ void SFesUpdateMiPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesUpdateMiPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesUpdateMiPkg) return target; } @@ -8126,7 +8126,7 @@ int SFesUpdateMiPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -8141,7 +8141,7 @@ int SFesUpdateMiPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesMiDataWithoutTm stMiData = 2; + // repeated .iot_idl.SFesMiDataWithoutTm stMiData = 2; total_size += 1 * this->stmidata_size(); for (int i = 0; i < this->stmidata_size(); i++) { total_size += @@ -8177,7 +8177,7 @@ void SFesUpdateMiPkg::MergeFrom(const SFesUpdateMiPkg& from) { stmidata_.MergeFrom(from.stmidata_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } if (from.has_ultime()) { set_ultime(from.ultime()); @@ -8248,7 +8248,7 @@ const int SFesDoRequestPkg::kStrParaFieldNumber; SFesDoRequestPkg::SFesDoRequestPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesDoRequestPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesDoRequestPkg) } void SFesDoRequestPkg::InitAsDefaultInstance() { @@ -8258,7 +8258,7 @@ SFesDoRequestPkg::SFesDoRequestPkg(const SFesDoRequestPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesDoRequestPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesDoRequestPkg) } void SFesDoRequestPkg::SharedCtor() { @@ -8280,7 +8280,7 @@ void SFesDoRequestPkg::SharedCtor() { } SFesDoRequestPkg::~SFesDoRequestPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesDoRequestPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesDoRequestPkg) SharedDtor(); } @@ -8389,7 +8389,7 @@ bool SFesDoRequestPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesDoRequestPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesDoRequestPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -8600,17 +8600,17 @@ bool SFesDoRequestPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesDoRequestPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesDoRequestPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesDoRequestPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesDoRequestPkg) return false; #undef DO_ } void SFesDoRequestPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesDoRequestPkg) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesDoRequestPkg) // required string strSourceTag = 1; if (has_strsourcetag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -8705,12 +8705,12 @@ void SFesDoRequestPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesDoRequestPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesDoRequestPkg) } ::google::protobuf::uint8* SFesDoRequestPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesDoRequestPkg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesDoRequestPkg) // required string strSourceTag = 1; if (has_strsourcetag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -8811,7 +8811,7 @@ void SFesDoRequestPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesDoRequestPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesDoRequestPkg) return target; } @@ -9040,7 +9040,7 @@ const int SFesAoRequestPkg::kStrParaFieldNumber; SFesAoRequestPkg::SFesAoRequestPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesAoRequestPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesAoRequestPkg) } void SFesAoRequestPkg::InitAsDefaultInstance() { @@ -9050,7 +9050,7 @@ SFesAoRequestPkg::SFesAoRequestPkg(const SFesAoRequestPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesAoRequestPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesAoRequestPkg) } void SFesAoRequestPkg::SharedCtor() { @@ -9073,7 +9073,7 @@ void SFesAoRequestPkg::SharedCtor() { } SFesAoRequestPkg::~SFesAoRequestPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesAoRequestPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesAoRequestPkg) SharedDtor(); } @@ -9181,7 +9181,7 @@ bool SFesAoRequestPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesAoRequestPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesAoRequestPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -9407,17 +9407,17 @@ bool SFesAoRequestPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesAoRequestPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesAoRequestPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesAoRequestPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesAoRequestPkg) return false; #undef DO_ } void SFesAoRequestPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesAoRequestPkg) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesAoRequestPkg) // required string strSourceTag = 1; if (has_strsourcetag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -9517,12 +9517,12 @@ void SFesAoRequestPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesAoRequestPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesAoRequestPkg) } ::google::protobuf::uint8* SFesAoRequestPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesAoRequestPkg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesAoRequestPkg) // required string strSourceTag = 1; if (has_strsourcetag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -9628,7 +9628,7 @@ void SFesAoRequestPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesAoRequestPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesAoRequestPkg) return target; } @@ -9866,7 +9866,7 @@ const int SFesMoRequestPkg::kStrParaFieldNumber; SFesMoRequestPkg::SFesMoRequestPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesMoRequestPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesMoRequestPkg) } void SFesMoRequestPkg::InitAsDefaultInstance() { @@ -9876,7 +9876,7 @@ SFesMoRequestPkg::SFesMoRequestPkg(const SFesMoRequestPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesMoRequestPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesMoRequestPkg) } void SFesMoRequestPkg::SharedCtor() { @@ -9899,7 +9899,7 @@ void SFesMoRequestPkg::SharedCtor() { } SFesMoRequestPkg::~SFesMoRequestPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesMoRequestPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesMoRequestPkg) SharedDtor(); } @@ -10007,7 +10007,7 @@ bool SFesMoRequestPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesMoRequestPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesMoRequestPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -10233,17 +10233,17 @@ bool SFesMoRequestPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesMoRequestPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesMoRequestPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesMoRequestPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesMoRequestPkg) return false; #undef DO_ } void SFesMoRequestPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesMoRequestPkg) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesMoRequestPkg) // required string strSourceTag = 1; if (has_strsourcetag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -10343,12 +10343,12 @@ void SFesMoRequestPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesMoRequestPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesMoRequestPkg) } ::google::protobuf::uint8* SFesMoRequestPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesMoRequestPkg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesMoRequestPkg) // required string strSourceTag = 1; if (has_strsourcetag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -10454,7 +10454,7 @@ void SFesMoRequestPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesMoRequestPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesMoRequestPkg) return target; } @@ -10690,7 +10690,7 @@ const int SFesCtrlReplyPkg::kStrParaFieldNumber; SFesCtrlReplyPkg::SFesCtrlReplyPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesCtrlReplyPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesCtrlReplyPkg) } void SFesCtrlReplyPkg::InitAsDefaultInstance() { @@ -10700,7 +10700,7 @@ SFesCtrlReplyPkg::SFesCtrlReplyPkg(const SFesCtrlReplyPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesCtrlReplyPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesCtrlReplyPkg) } void SFesCtrlReplyPkg::SharedCtor() { @@ -10719,7 +10719,7 @@ void SFesCtrlReplyPkg::SharedCtor() { } SFesCtrlReplyPkg::~SFesCtrlReplyPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesCtrlReplyPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesCtrlReplyPkg) SharedDtor(); } @@ -10815,7 +10815,7 @@ bool SFesCtrlReplyPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesCtrlReplyPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesCtrlReplyPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -10979,17 +10979,17 @@ bool SFesCtrlReplyPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesCtrlReplyPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesCtrlReplyPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesCtrlReplyPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesCtrlReplyPkg) return false; #undef DO_ } void SFesCtrlReplyPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesCtrlReplyPkg) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesCtrlReplyPkg) // required string strSourceTag = 1; if (has_strsourcetag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -11064,12 +11064,12 @@ void SFesCtrlReplyPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesCtrlReplyPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesCtrlReplyPkg) } ::google::protobuf::uint8* SFesCtrlReplyPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesCtrlReplyPkg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesCtrlReplyPkg) // required string strSourceTag = 1; if (has_strsourcetag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -11149,7 +11149,7 @@ void SFesCtrlReplyPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesCtrlReplyPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesCtrlReplyPkg) return target; } @@ -11334,7 +11334,7 @@ const int SFesCustCmdQueue::kStrKeyValueFieldNumber; SFesCustCmdQueue::SFesCustCmdQueue() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesCustCmdQueue) + // @@protoc_insertion_point(constructor:iot_idl.SFesCustCmdQueue) } void SFesCustCmdQueue::InitAsDefaultInstance() { @@ -11344,7 +11344,7 @@ SFesCustCmdQueue::SFesCustCmdQueue(const SFesCustCmdQueue& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesCustCmdQueue) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesCustCmdQueue) } void SFesCustCmdQueue::SharedCtor() { @@ -11356,7 +11356,7 @@ void SFesCustCmdQueue::SharedCtor() { } SFesCustCmdQueue::~SFesCustCmdQueue() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesCustCmdQueue) + // @@protoc_insertion_point(destructor:iot_idl.SFesCustCmdQueue) SharedDtor(); } @@ -11413,7 +11413,7 @@ bool SFesCustCmdQueue::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesCustCmdQueue) + // @@protoc_insertion_point(parse_start:iot_idl.SFesCustCmdQueue) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -11466,17 +11466,17 @@ bool SFesCustCmdQueue::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesCustCmdQueue) + // @@protoc_insertion_point(parse_success:iot_idl.SFesCustCmdQueue) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesCustCmdQueue) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesCustCmdQueue) return false; #undef DO_ } void SFesCustCmdQueue::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesCustCmdQueue) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesCustCmdQueue) // required string strKeyName = 1; if (has_strkeyname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -11501,12 +11501,12 @@ void SFesCustCmdQueue::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesCustCmdQueue) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesCustCmdQueue) } ::google::protobuf::uint8* SFesCustCmdQueue::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesCustCmdQueue) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesCustCmdQueue) // required string strKeyName = 1; if (has_strkeyname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -11533,7 +11533,7 @@ void SFesCustCmdQueue::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesCustCmdQueue) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesCustCmdQueue) return target; } @@ -11645,7 +11645,7 @@ const int SFesCustCmdRequestPkg::kSeqCustCmdDataFieldNumber; SFesCustCmdRequestPkg::SFesCustCmdRequestPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesCustCmdRequestPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesCustCmdRequestPkg) } void SFesCustCmdRequestPkg::InitAsDefaultInstance() { @@ -11655,7 +11655,7 @@ SFesCustCmdRequestPkg::SFesCustCmdRequestPkg(const SFesCustCmdRequestPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesCustCmdRequestPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesCustCmdRequestPkg) } void SFesCustCmdRequestPkg::SharedCtor() { @@ -11672,7 +11672,7 @@ void SFesCustCmdRequestPkg::SharedCtor() { } SFesCustCmdRequestPkg::~SFesCustCmdRequestPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesCustCmdRequestPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesCustCmdRequestPkg) SharedDtor(); } @@ -11769,7 +11769,7 @@ bool SFesCustCmdRequestPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesCustCmdRequestPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesCustCmdRequestPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -11889,7 +11889,7 @@ bool SFesCustCmdRequestPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesCustCmdQueue seqCustCmdData = 8; + // repeated .iot_idl.SFesCustCmdQueue seqCustCmdData = 8; case 8: { if (tag == 66) { parse_seqCustCmdData: @@ -11917,17 +11917,17 @@ bool SFesCustCmdRequestPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesCustCmdRequestPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesCustCmdRequestPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesCustCmdRequestPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesCustCmdRequestPkg) return false; #undef DO_ } void SFesCustCmdRequestPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesCustCmdRequestPkg) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesCustCmdRequestPkg) // required string strSourceTag = 1; if (has_strsourcetag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -11988,7 +11988,7 @@ void SFesCustCmdRequestPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(7, this->ndatalen(), output); } - // repeated .kbd_idlfile.SFesCustCmdQueue seqCustCmdData = 8; + // repeated .iot_idl.SFesCustCmdQueue seqCustCmdData = 8; for (int i = 0; i < this->seqcustcmddata_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 8, this->seqcustcmddata(i), output); @@ -11998,12 +11998,12 @@ void SFesCustCmdRequestPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesCustCmdRequestPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesCustCmdRequestPkg) } ::google::protobuf::uint8* SFesCustCmdRequestPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesCustCmdRequestPkg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesCustCmdRequestPkg) // required string strSourceTag = 1; if (has_strsourcetag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -12069,7 +12069,7 @@ void SFesCustCmdRequestPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(7, this->ndatalen(), target); } - // repeated .kbd_idlfile.SFesCustCmdQueue seqCustCmdData = 8; + // repeated .iot_idl.SFesCustCmdQueue seqCustCmdData = 8; for (int i = 0; i < this->seqcustcmddata_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -12080,7 +12080,7 @@ void SFesCustCmdRequestPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesCustCmdRequestPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesCustCmdRequestPkg) return target; } @@ -12138,7 +12138,7 @@ int SFesCustCmdRequestPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesCustCmdQueue seqCustCmdData = 8; + // repeated .iot_idl.SFesCustCmdQueue seqCustCmdData = 8; total_size += 1 * this->seqcustcmddata_size(); for (int i = 0; i < this->seqcustcmddata_size(); i++) { total_size += @@ -12261,7 +12261,7 @@ const int SFesCustCmdReplyPkg::kStrRetResultFieldNumber; SFesCustCmdReplyPkg::SFesCustCmdReplyPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesCustCmdReplyPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesCustCmdReplyPkg) } void SFesCustCmdReplyPkg::InitAsDefaultInstance() { @@ -12271,7 +12271,7 @@ SFesCustCmdReplyPkg::SFesCustCmdReplyPkg(const SFesCustCmdReplyPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesCustCmdReplyPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesCustCmdReplyPkg) } void SFesCustCmdReplyPkg::SharedCtor() { @@ -12291,7 +12291,7 @@ void SFesCustCmdReplyPkg::SharedCtor() { } SFesCustCmdReplyPkg::~SFesCustCmdReplyPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesCustCmdReplyPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesCustCmdReplyPkg) SharedDtor(); } @@ -12400,7 +12400,7 @@ bool SFesCustCmdReplyPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesCustCmdReplyPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesCustCmdReplyPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -12535,7 +12535,7 @@ bool SFesCustCmdReplyPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesCustCmdQueue seqCustCmdData = 9; + // repeated .iot_idl.SFesCustCmdQueue seqCustCmdData = 9; case 9: { if (tag == 74) { parse_seqCustCmdData: @@ -12595,17 +12595,17 @@ bool SFesCustCmdReplyPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesCustCmdReplyPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesCustCmdReplyPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesCustCmdReplyPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesCustCmdReplyPkg) return false; #undef DO_ } void SFesCustCmdReplyPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesCustCmdReplyPkg) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesCustCmdReplyPkg) // required string strSourceTag = 1; if (has_strsourcetag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -12671,7 +12671,7 @@ void SFesCustCmdReplyPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(8, this->ndatalen(), output); } - // repeated .kbd_idlfile.SFesCustCmdQueue seqCustCmdData = 9; + // repeated .iot_idl.SFesCustCmdQueue seqCustCmdData = 9; for (int i = 0; i < this->seqcustcmddata_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 9, this->seqcustcmddata(i), output); @@ -12696,12 +12696,12 @@ void SFesCustCmdReplyPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesCustCmdReplyPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesCustCmdReplyPkg) } ::google::protobuf::uint8* SFesCustCmdReplyPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesCustCmdReplyPkg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesCustCmdReplyPkg) // required string strSourceTag = 1; if (has_strsourcetag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -12772,7 +12772,7 @@ void SFesCustCmdReplyPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(8, this->ndatalen(), target); } - // repeated .kbd_idlfile.SFesCustCmdQueue seqCustCmdData = 9; + // repeated .iot_idl.SFesCustCmdQueue seqCustCmdData = 9; for (int i = 0; i < this->seqcustcmddata_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -12799,7 +12799,7 @@ void SFesCustCmdReplyPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesCustCmdReplyPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesCustCmdReplyPkg) return target; } @@ -12880,7 +12880,7 @@ int SFesCustCmdReplyPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesCustCmdQueue seqCustCmdData = 9; + // repeated .iot_idl.SFesCustCmdQueue seqCustCmdData = 9; total_size += 1 * this->seqcustcmddata_size(); for (int i = 0; i < this->seqcustcmddata_size(); i++) { total_size += @@ -13009,7 +13009,7 @@ const int SConstSetQueue::kNValueFieldNumber; SConstSetQueue::SConstSetQueue() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SConstSetQueue) + // @@protoc_insertion_point(constructor:iot_idl.SConstSetQueue) } void SConstSetQueue::InitAsDefaultInstance() { @@ -13019,7 +13019,7 @@ SConstSetQueue::SConstSetQueue(const SConstSetQueue& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SConstSetQueue) + // @@protoc_insertion_point(copy_constructor:iot_idl.SConstSetQueue) } void SConstSetQueue::SharedCtor() { @@ -13032,7 +13032,7 @@ void SConstSetQueue::SharedCtor() { } SConstSetQueue::~SConstSetQueue() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SConstSetQueue) + // @@protoc_insertion_point(destructor:iot_idl.SConstSetQueue) SharedDtor(); } @@ -13096,7 +13096,7 @@ bool SConstSetQueue::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SConstSetQueue) + // @@protoc_insertion_point(parse_start:iot_idl.SConstSetQueue) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -13162,17 +13162,17 @@ bool SConstSetQueue::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SConstSetQueue) + // @@protoc_insertion_point(parse_success:iot_idl.SConstSetQueue) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SConstSetQueue) + // @@protoc_insertion_point(parse_failure:iot_idl.SConstSetQueue) return false; #undef DO_ } void SConstSetQueue::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SConstSetQueue) + // @@protoc_insertion_point(serialize_start:iot_idl.SConstSetQueue) // required string strTagName = 1; if (has_strtagname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -13197,12 +13197,12 @@ void SConstSetQueue::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SConstSetQueue) + // @@protoc_insertion_point(serialize_end:iot_idl.SConstSetQueue) } ::google::protobuf::uint8* SConstSetQueue::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SConstSetQueue) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SConstSetQueue) // required string strTagName = 1; if (has_strtagname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -13228,7 +13228,7 @@ void SConstSetQueue::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SConstSetQueue) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SConstSetQueue) return target; } @@ -13347,7 +13347,7 @@ const int SFesConstSetRequestPkg::kSeqValueFieldNumber; SFesConstSetRequestPkg::SFesConstSetRequestPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesConstSetRequestPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesConstSetRequestPkg) } void SFesConstSetRequestPkg::InitAsDefaultInstance() { @@ -13357,7 +13357,7 @@ SFesConstSetRequestPkg::SFesConstSetRequestPkg(const SFesConstSetRequestPkg& fro : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesConstSetRequestPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesConstSetRequestPkg) } void SFesConstSetRequestPkg::SharedCtor() { @@ -13369,7 +13369,7 @@ void SFesConstSetRequestPkg::SharedCtor() { } SFesConstSetRequestPkg::~SFesConstSetRequestPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesConstSetRequestPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesConstSetRequestPkg) SharedDtor(); } @@ -13427,7 +13427,7 @@ bool SFesConstSetRequestPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesConstSetRequestPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesConstSetRequestPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -13477,7 +13477,7 @@ bool SFesConstSetRequestPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SConstSetQueue seqValue = 4; + // repeated .iot_idl.SConstSetQueue seqValue = 4; case 4: { if (tag == 34) { parse_seqValue: @@ -13505,17 +13505,17 @@ bool SFesConstSetRequestPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesConstSetRequestPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesConstSetRequestPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesConstSetRequestPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesConstSetRequestPkg) return false; #undef DO_ } void SFesConstSetRequestPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesConstSetRequestPkg) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesConstSetRequestPkg) // required int32 nRtuNo = 1; if (has_nrtuno()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->nrtuno(), output); @@ -13531,7 +13531,7 @@ void SFesConstSetRequestPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->nnum(), output); } - // repeated .kbd_idlfile.SConstSetQueue seqValue = 4; + // repeated .iot_idl.SConstSetQueue seqValue = 4; for (int i = 0; i < this->seqvalue_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->seqvalue(i), output); @@ -13541,12 +13541,12 @@ void SFesConstSetRequestPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesConstSetRequestPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesConstSetRequestPkg) } ::google::protobuf::uint8* SFesConstSetRequestPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesConstSetRequestPkg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesConstSetRequestPkg) // required int32 nRtuNo = 1; if (has_nrtuno()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->nrtuno(), target); @@ -13562,7 +13562,7 @@ void SFesConstSetRequestPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->nnum(), target); } - // repeated .kbd_idlfile.SConstSetQueue seqValue = 4; + // repeated .iot_idl.SConstSetQueue seqValue = 4; for (int i = 0; i < this->seqvalue_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -13573,7 +13573,7 @@ void SFesConstSetRequestPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesConstSetRequestPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesConstSetRequestPkg) return target; } @@ -13603,7 +13603,7 @@ int SFesConstSetRequestPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SConstSetQueue seqValue = 4; + // repeated .iot_idl.SConstSetQueue seqValue = 4; total_size += 1 * this->seqvalue_size(); for (int i = 0; i < this->seqvalue_size(); i++) { total_size += @@ -13704,7 +13704,7 @@ const int SFesConstReadReplyPkg::kStrRetResultFieldNumber; SFesConstReadReplyPkg::SFesConstReadReplyPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesConstReadReplyPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesConstReadReplyPkg) } void SFesConstReadReplyPkg::InitAsDefaultInstance() { @@ -13714,7 +13714,7 @@ SFesConstReadReplyPkg::SFesConstReadReplyPkg(const SFesConstReadReplyPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesConstReadReplyPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesConstReadReplyPkg) } void SFesConstReadReplyPkg::SharedCtor() { @@ -13728,7 +13728,7 @@ void SFesConstReadReplyPkg::SharedCtor() { } SFesConstReadReplyPkg::~SFesConstReadReplyPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesConstReadReplyPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesConstReadReplyPkg) SharedDtor(); } @@ -13794,7 +13794,7 @@ bool SFesConstReadReplyPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesConstReadReplyPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesConstReadReplyPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -13844,7 +13844,7 @@ bool SFesConstReadReplyPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SConstSetQueue seqValue = 4; + // repeated .iot_idl.SConstSetQueue seqValue = 4; case 4: { if (tag == 34) { parse_seqValue: @@ -13889,17 +13889,17 @@ bool SFesConstReadReplyPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesConstReadReplyPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesConstReadReplyPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesConstReadReplyPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesConstReadReplyPkg) return false; #undef DO_ } void SFesConstReadReplyPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesConstReadReplyPkg) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesConstReadReplyPkg) // required int32 nRtuNo = 1; if (has_nrtuno()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->nrtuno(), output); @@ -13915,7 +13915,7 @@ void SFesConstReadReplyPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->nretstatus(), output); } - // repeated .kbd_idlfile.SConstSetQueue seqValue = 4; + // repeated .iot_idl.SConstSetQueue seqValue = 4; for (int i = 0; i < this->seqvalue_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->seqvalue(i), output); @@ -13935,12 +13935,12 @@ void SFesConstReadReplyPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesConstReadReplyPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesConstReadReplyPkg) } ::google::protobuf::uint8* SFesConstReadReplyPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesConstReadReplyPkg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesConstReadReplyPkg) // required int32 nRtuNo = 1; if (has_nrtuno()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->nrtuno(), target); @@ -13956,7 +13956,7 @@ void SFesConstReadReplyPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->nretstatus(), target); } - // repeated .kbd_idlfile.SConstSetQueue seqValue = 4; + // repeated .iot_idl.SConstSetQueue seqValue = 4; for (int i = 0; i < this->seqvalue_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -13978,7 +13978,7 @@ void SFesConstReadReplyPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesConstReadReplyPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesConstReadReplyPkg) return target; } @@ -14015,7 +14015,7 @@ int SFesConstReadReplyPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SConstSetQueue seqValue = 4; + // repeated .iot_idl.SConstSetQueue seqValue = 4; total_size += 1 * this->seqvalue_size(); for (int i = 0; i < this->seqvalue_size(); i++) { total_size += @@ -14119,7 +14119,7 @@ const int SFesChanStatusInfo::kUlTimeFieldNumber; SFesChanStatusInfo::SFesChanStatusInfo() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesChanStatusInfo) + // @@protoc_insertion_point(constructor:iot_idl.SFesChanStatusInfo) } void SFesChanStatusInfo::InitAsDefaultInstance() { @@ -14129,7 +14129,7 @@ SFesChanStatusInfo::SFesChanStatusInfo(const SFesChanStatusInfo& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesChanStatusInfo) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesChanStatusInfo) } void SFesChanStatusInfo::SharedCtor() { @@ -14142,7 +14142,7 @@ void SFesChanStatusInfo::SharedCtor() { } SFesChanStatusInfo::~SFesChanStatusInfo() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesChanStatusInfo) + // @@protoc_insertion_point(destructor:iot_idl.SFesChanStatusInfo) SharedDtor(); } @@ -14196,7 +14196,7 @@ bool SFesChanStatusInfo::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesChanStatusInfo) + // @@protoc_insertion_point(parse_start:iot_idl.SFesChanStatusInfo) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -14275,17 +14275,17 @@ bool SFesChanStatusInfo::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesChanStatusInfo) + // @@protoc_insertion_point(parse_success:iot_idl.SFesChanStatusInfo) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesChanStatusInfo) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesChanStatusInfo) return false; #undef DO_ } void SFesChanStatusInfo::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesChanStatusInfo) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesChanStatusInfo) // required int32 nChanNo = 1; if (has_nchanno()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->nchanno(), output); @@ -14310,12 +14310,12 @@ void SFesChanStatusInfo::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesChanStatusInfo) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesChanStatusInfo) } ::google::protobuf::uint8* SFesChanStatusInfo::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesChanStatusInfo) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesChanStatusInfo) // required int32 nChanNo = 1; if (has_nchanno()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->nchanno(), target); @@ -14340,7 +14340,7 @@ void SFesChanStatusInfo::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesChanStatusInfo) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesChanStatusInfo) return target; } @@ -14466,18 +14466,18 @@ const int SFesChanStatusPkg::kStChanStatusFieldNumber; SFesChanStatusPkg::SFesChanStatusPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesChanStatusPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesChanStatusPkg) } void SFesChanStatusPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesChanStatusPkg::SFesChanStatusPkg(const SFesChanStatusPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesChanStatusPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesChanStatusPkg) } void SFesChanStatusPkg::SharedCtor() { @@ -14487,7 +14487,7 @@ void SFesChanStatusPkg::SharedCtor() { } SFesChanStatusPkg::~SFesChanStatusPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesChanStatusPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesChanStatusPkg) SharedDtor(); } @@ -14520,7 +14520,7 @@ SFesChanStatusPkg* SFesChanStatusPkg::New() const { void SFesChanStatusPkg::Clear() { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } stchanstatus_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -14531,13 +14531,13 @@ bool SFesChanStatusPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesChanStatusPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesChanStatusPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -14549,7 +14549,7 @@ bool SFesChanStatusPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesChanStatusInfo stChanStatus = 2; + // repeated .iot_idl.SFesChanStatusInfo stChanStatus = 2; case 2: { if (tag == 18) { parse_stChanStatus: @@ -14577,24 +14577,24 @@ bool SFesChanStatusPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesChanStatusPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesChanStatusPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesChanStatusPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesChanStatusPkg) return false; #undef DO_ } void SFesChanStatusPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesChanStatusPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesChanStatusPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); } - // repeated .kbd_idlfile.SFesChanStatusInfo stChanStatus = 2; + // repeated .iot_idl.SFesChanStatusInfo stChanStatus = 2; for (int i = 0; i < this->stchanstatus_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->stchanstatus(i), output); @@ -14604,20 +14604,20 @@ void SFesChanStatusPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesChanStatusPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesChanStatusPkg) } ::google::protobuf::uint8* SFesChanStatusPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesChanStatusPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesChanStatusPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->sthead(), target); } - // repeated .kbd_idlfile.SFesChanStatusInfo stChanStatus = 2; + // repeated .iot_idl.SFesChanStatusInfo stChanStatus = 2; for (int i = 0; i < this->stchanstatus_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -14628,7 +14628,7 @@ void SFesChanStatusPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesChanStatusPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesChanStatusPkg) return target; } @@ -14636,7 +14636,7 @@ int SFesChanStatusPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -14644,7 +14644,7 @@ int SFesChanStatusPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesChanStatusInfo stChanStatus = 2; + // repeated .iot_idl.SFesChanStatusInfo stChanStatus = 2; total_size += 1 * this->stchanstatus_size(); for (int i = 0; i < this->stchanstatus_size(); i++) { total_size += @@ -14680,7 +14680,7 @@ void SFesChanStatusPkg::MergeFrom(const SFesChanStatusPkg& from) { stchanstatus_.MergeFrom(from.stchanstatus_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -14738,7 +14738,7 @@ const int SFesRTUStatusInfo::kUlTimeFieldNumber; SFesRTUStatusInfo::SFesRTUStatusInfo() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesRTUStatusInfo) + // @@protoc_insertion_point(constructor:iot_idl.SFesRTUStatusInfo) } void SFesRTUStatusInfo::InitAsDefaultInstance() { @@ -14748,7 +14748,7 @@ SFesRTUStatusInfo::SFesRTUStatusInfo(const SFesRTUStatusInfo& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesRTUStatusInfo) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesRTUStatusInfo) } void SFesRTUStatusInfo::SharedCtor() { @@ -14760,7 +14760,7 @@ void SFesRTUStatusInfo::SharedCtor() { } SFesRTUStatusInfo::~SFesRTUStatusInfo() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesRTUStatusInfo) + // @@protoc_insertion_point(destructor:iot_idl.SFesRTUStatusInfo) SharedDtor(); } @@ -14814,7 +14814,7 @@ bool SFesRTUStatusInfo::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesRTUStatusInfo) + // @@protoc_insertion_point(parse_start:iot_idl.SFesRTUStatusInfo) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -14878,17 +14878,17 @@ bool SFesRTUStatusInfo::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesRTUStatusInfo) + // @@protoc_insertion_point(parse_success:iot_idl.SFesRTUStatusInfo) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesRTUStatusInfo) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesRTUStatusInfo) return false; #undef DO_ } void SFesRTUStatusInfo::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesRTUStatusInfo) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesRTUStatusInfo) // required int32 nRtuNo = 1; if (has_nrtuno()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->nrtuno(), output); @@ -14908,12 +14908,12 @@ void SFesRTUStatusInfo::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesRTUStatusInfo) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesRTUStatusInfo) } ::google::protobuf::uint8* SFesRTUStatusInfo::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesRTUStatusInfo) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesRTUStatusInfo) // required int32 nRtuNo = 1; if (has_nrtuno()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->nrtuno(), target); @@ -14933,7 +14933,7 @@ void SFesRTUStatusInfo::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesRTUStatusInfo) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesRTUStatusInfo) return target; } @@ -15050,18 +15050,18 @@ const int SFesRTUStatusPkg::kStRtuStatusFieldNumber; SFesRTUStatusPkg::SFesRTUStatusPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesRTUStatusPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesRTUStatusPkg) } void SFesRTUStatusPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesRTUStatusPkg::SFesRTUStatusPkg(const SFesRTUStatusPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesRTUStatusPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesRTUStatusPkg) } void SFesRTUStatusPkg::SharedCtor() { @@ -15071,7 +15071,7 @@ void SFesRTUStatusPkg::SharedCtor() { } SFesRTUStatusPkg::~SFesRTUStatusPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesRTUStatusPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesRTUStatusPkg) SharedDtor(); } @@ -15104,7 +15104,7 @@ SFesRTUStatusPkg* SFesRTUStatusPkg::New() const { void SFesRTUStatusPkg::Clear() { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } strtustatus_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -15115,13 +15115,13 @@ bool SFesRTUStatusPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesRTUStatusPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesRTUStatusPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -15133,7 +15133,7 @@ bool SFesRTUStatusPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesRTUStatusInfo stRtuStatus = 2; + // repeated .iot_idl.SFesRTUStatusInfo stRtuStatus = 2; case 2: { if (tag == 18) { parse_stRtuStatus: @@ -15161,24 +15161,24 @@ bool SFesRTUStatusPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesRTUStatusPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesRTUStatusPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesRTUStatusPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesRTUStatusPkg) return false; #undef DO_ } void SFesRTUStatusPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesRTUStatusPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesRTUStatusPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); } - // repeated .kbd_idlfile.SFesRTUStatusInfo stRtuStatus = 2; + // repeated .iot_idl.SFesRTUStatusInfo stRtuStatus = 2; for (int i = 0; i < this->strtustatus_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->strtustatus(i), output); @@ -15188,20 +15188,20 @@ void SFesRTUStatusPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesRTUStatusPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesRTUStatusPkg) } ::google::protobuf::uint8* SFesRTUStatusPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesRTUStatusPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesRTUStatusPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->sthead(), target); } - // repeated .kbd_idlfile.SFesRTUStatusInfo stRtuStatus = 2; + // repeated .iot_idl.SFesRTUStatusInfo stRtuStatus = 2; for (int i = 0; i < this->strtustatus_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -15212,7 +15212,7 @@ void SFesRTUStatusPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesRTUStatusPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesRTUStatusPkg) return target; } @@ -15220,7 +15220,7 @@ int SFesRTUStatusPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -15228,7 +15228,7 @@ int SFesRTUStatusPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesRTUStatusInfo stRtuStatus = 2; + // repeated .iot_idl.SFesRTUStatusInfo stRtuStatus = 2; total_size += 1 * this->strtustatus_size(); for (int i = 0; i < this->strtustatus_size(); i++) { total_size += @@ -15264,7 +15264,7 @@ void SFesRTUStatusPkg::MergeFrom(const SFesRTUStatusPkg& from) { strtustatus_.MergeFrom(from.strtustatus_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -15326,7 +15326,7 @@ const int SFesSoeEventInfo::kStrFaultDescFieldNumber; SFesSoeEventInfo::SFesSoeEventInfo() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesSoeEventInfo) + // @@protoc_insertion_point(constructor:iot_idl.SFesSoeEventInfo) } void SFesSoeEventInfo::InitAsDefaultInstance() { @@ -15336,7 +15336,7 @@ SFesSoeEventInfo::SFesSoeEventInfo(const SFesSoeEventInfo& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesSoeEventInfo) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesSoeEventInfo) } void SFesSoeEventInfo::SharedCtor() { @@ -15353,7 +15353,7 @@ void SFesSoeEventInfo::SharedCtor() { } SFesSoeEventInfo::~SFesSoeEventInfo() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesSoeEventInfo) + // @@protoc_insertion_point(destructor:iot_idl.SFesSoeEventInfo) SharedDtor(); } @@ -15441,7 +15441,7 @@ bool SFesSoeEventInfo::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesSoeEventInfo) + // @@protoc_insertion_point(parse_start:iot_idl.SFesSoeEventInfo) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -15573,17 +15573,17 @@ bool SFesSoeEventInfo::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesSoeEventInfo) + // @@protoc_insertion_point(parse_success:iot_idl.SFesSoeEventInfo) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesSoeEventInfo) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesSoeEventInfo) return false; #undef DO_ } void SFesSoeEventInfo::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesSoeEventInfo) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesSoeEventInfo) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -15643,12 +15643,12 @@ void SFesSoeEventInfo::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesSoeEventInfo) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesSoeEventInfo) } ::google::protobuf::uint8* SFesSoeEventInfo::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesSoeEventInfo) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesSoeEventInfo) // required string strAppTableName = 1; if (has_strapptablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -15712,7 +15712,7 @@ void SFesSoeEventInfo::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesSoeEventInfo) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesSoeEventInfo) return target; } @@ -15875,7 +15875,7 @@ const int SFesChanEventInfo::kUlTimeFieldNumber; SFesChanEventInfo::SFesChanEventInfo() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesChanEventInfo) + // @@protoc_insertion_point(constructor:iot_idl.SFesChanEventInfo) } void SFesChanEventInfo::InitAsDefaultInstance() { @@ -15885,7 +15885,7 @@ SFesChanEventInfo::SFesChanEventInfo(const SFesChanEventInfo& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesChanEventInfo) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesChanEventInfo) } void SFesChanEventInfo::SharedCtor() { @@ -15899,7 +15899,7 @@ void SFesChanEventInfo::SharedCtor() { } SFesChanEventInfo::~SFesChanEventInfo() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesChanEventInfo) + // @@protoc_insertion_point(destructor:iot_idl.SFesChanEventInfo) SharedDtor(); } @@ -15963,7 +15963,7 @@ bool SFesChanEventInfo::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesChanEventInfo) + // @@protoc_insertion_point(parse_start:iot_idl.SFesChanEventInfo) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -16044,17 +16044,17 @@ bool SFesChanEventInfo::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesChanEventInfo) + // @@protoc_insertion_point(parse_success:iot_idl.SFesChanEventInfo) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesChanEventInfo) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesChanEventInfo) return false; #undef DO_ } void SFesChanEventInfo::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesChanEventInfo) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesChanEventInfo) // required string strChanTag = 1; if (has_strchantag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -16084,12 +16084,12 @@ void SFesChanEventInfo::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesChanEventInfo) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesChanEventInfo) } ::google::protobuf::uint8* SFesChanEventInfo::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesChanEventInfo) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesChanEventInfo) // required string strChanTag = 1; if (has_strchantag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -16120,7 +16120,7 @@ void SFesChanEventInfo::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesChanEventInfo) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesChanEventInfo) return target; } @@ -16248,7 +16248,7 @@ const int SFesRTUEventInfo::kUlTimeFieldNumber; SFesRTUEventInfo::SFesRTUEventInfo() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesRTUEventInfo) + // @@protoc_insertion_point(constructor:iot_idl.SFesRTUEventInfo) } void SFesRTUEventInfo::InitAsDefaultInstance() { @@ -16258,7 +16258,7 @@ SFesRTUEventInfo::SFesRTUEventInfo(const SFesRTUEventInfo& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesRTUEventInfo) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesRTUEventInfo) } void SFesRTUEventInfo::SharedCtor() { @@ -16272,7 +16272,7 @@ void SFesRTUEventInfo::SharedCtor() { } SFesRTUEventInfo::~SFesRTUEventInfo() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesRTUEventInfo) + // @@protoc_insertion_point(destructor:iot_idl.SFesRTUEventInfo) SharedDtor(); } @@ -16336,7 +16336,7 @@ bool SFesRTUEventInfo::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesRTUEventInfo) + // @@protoc_insertion_point(parse_start:iot_idl.SFesRTUEventInfo) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -16417,17 +16417,17 @@ bool SFesRTUEventInfo::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesRTUEventInfo) + // @@protoc_insertion_point(parse_success:iot_idl.SFesRTUEventInfo) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesRTUEventInfo) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesRTUEventInfo) return false; #undef DO_ } void SFesRTUEventInfo::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesRTUEventInfo) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesRTUEventInfo) // required string strRtuTag = 1; if (has_strrtutag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -16457,12 +16457,12 @@ void SFesRTUEventInfo::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesRTUEventInfo) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesRTUEventInfo) } ::google::protobuf::uint8* SFesRTUEventInfo::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesRTUEventInfo) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesRTUEventInfo) // required string strRtuTag = 1; if (has_strrtutag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -16493,7 +16493,7 @@ void SFesRTUEventInfo::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesRTUEventInfo) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesRTUEventInfo) return target; } @@ -16621,18 +16621,18 @@ const int SFesSoeEventPkg::kStSoeEventFieldNumber; SFesSoeEventPkg::SFesSoeEventPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesSoeEventPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesSoeEventPkg) } void SFesSoeEventPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesSoeEventPkg::SFesSoeEventPkg(const SFesSoeEventPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesSoeEventPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesSoeEventPkg) } void SFesSoeEventPkg::SharedCtor() { @@ -16642,7 +16642,7 @@ void SFesSoeEventPkg::SharedCtor() { } SFesSoeEventPkg::~SFesSoeEventPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesSoeEventPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesSoeEventPkg) SharedDtor(); } @@ -16675,7 +16675,7 @@ SFesSoeEventPkg* SFesSoeEventPkg::New() const { void SFesSoeEventPkg::Clear() { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } stsoeevent_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -16686,13 +16686,13 @@ bool SFesSoeEventPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesSoeEventPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesSoeEventPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -16704,7 +16704,7 @@ bool SFesSoeEventPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesSoeEventInfo stSoeEvent = 2; + // repeated .iot_idl.SFesSoeEventInfo stSoeEvent = 2; case 2: { if (tag == 18) { parse_stSoeEvent: @@ -16732,24 +16732,24 @@ bool SFesSoeEventPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesSoeEventPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesSoeEventPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesSoeEventPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesSoeEventPkg) return false; #undef DO_ } void SFesSoeEventPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesSoeEventPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesSoeEventPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); } - // repeated .kbd_idlfile.SFesSoeEventInfo stSoeEvent = 2; + // repeated .iot_idl.SFesSoeEventInfo stSoeEvent = 2; for (int i = 0; i < this->stsoeevent_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->stsoeevent(i), output); @@ -16759,20 +16759,20 @@ void SFesSoeEventPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesSoeEventPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesSoeEventPkg) } ::google::protobuf::uint8* SFesSoeEventPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesSoeEventPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesSoeEventPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->sthead(), target); } - // repeated .kbd_idlfile.SFesSoeEventInfo stSoeEvent = 2; + // repeated .iot_idl.SFesSoeEventInfo stSoeEvent = 2; for (int i = 0; i < this->stsoeevent_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -16783,7 +16783,7 @@ void SFesSoeEventPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesSoeEventPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesSoeEventPkg) return target; } @@ -16791,7 +16791,7 @@ int SFesSoeEventPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -16799,7 +16799,7 @@ int SFesSoeEventPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesSoeEventInfo stSoeEvent = 2; + // repeated .iot_idl.SFesSoeEventInfo stSoeEvent = 2; total_size += 1 * this->stsoeevent_size(); for (int i = 0; i < this->stsoeevent_size(); i++) { total_size += @@ -16835,7 +16835,7 @@ void SFesSoeEventPkg::MergeFrom(const SFesSoeEventPkg& from) { stsoeevent_.MergeFrom(from.stsoeevent_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -16892,18 +16892,18 @@ const int SFesChanEventPkg::kStChanEventFieldNumber; SFesChanEventPkg::SFesChanEventPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesChanEventPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesChanEventPkg) } void SFesChanEventPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesChanEventPkg::SFesChanEventPkg(const SFesChanEventPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesChanEventPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesChanEventPkg) } void SFesChanEventPkg::SharedCtor() { @@ -16913,7 +16913,7 @@ void SFesChanEventPkg::SharedCtor() { } SFesChanEventPkg::~SFesChanEventPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesChanEventPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesChanEventPkg) SharedDtor(); } @@ -16946,7 +16946,7 @@ SFesChanEventPkg* SFesChanEventPkg::New() const { void SFesChanEventPkg::Clear() { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } stchanevent_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -16957,13 +16957,13 @@ bool SFesChanEventPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesChanEventPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesChanEventPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -16975,7 +16975,7 @@ bool SFesChanEventPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesChanEventInfo stChanEvent = 2; + // repeated .iot_idl.SFesChanEventInfo stChanEvent = 2; case 2: { if (tag == 18) { parse_stChanEvent: @@ -17003,24 +17003,24 @@ bool SFesChanEventPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesChanEventPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesChanEventPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesChanEventPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesChanEventPkg) return false; #undef DO_ } void SFesChanEventPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesChanEventPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesChanEventPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); } - // repeated .kbd_idlfile.SFesChanEventInfo stChanEvent = 2; + // repeated .iot_idl.SFesChanEventInfo stChanEvent = 2; for (int i = 0; i < this->stchanevent_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->stchanevent(i), output); @@ -17030,20 +17030,20 @@ void SFesChanEventPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesChanEventPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesChanEventPkg) } ::google::protobuf::uint8* SFesChanEventPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesChanEventPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesChanEventPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->sthead(), target); } - // repeated .kbd_idlfile.SFesChanEventInfo stChanEvent = 2; + // repeated .iot_idl.SFesChanEventInfo stChanEvent = 2; for (int i = 0; i < this->stchanevent_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -17054,7 +17054,7 @@ void SFesChanEventPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesChanEventPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesChanEventPkg) return target; } @@ -17062,7 +17062,7 @@ int SFesChanEventPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -17070,7 +17070,7 @@ int SFesChanEventPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesChanEventInfo stChanEvent = 2; + // repeated .iot_idl.SFesChanEventInfo stChanEvent = 2; total_size += 1 * this->stchanevent_size(); for (int i = 0; i < this->stchanevent_size(); i++) { total_size += @@ -17106,7 +17106,7 @@ void SFesChanEventPkg::MergeFrom(const SFesChanEventPkg& from) { stchanevent_.MergeFrom(from.stchanevent_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -17163,18 +17163,18 @@ const int SFesRTUEventPkg::kStRtuEventFieldNumber; SFesRTUEventPkg::SFesRTUEventPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesRTUEventPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesRTUEventPkg) } void SFesRTUEventPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesRTUEventPkg::SFesRTUEventPkg(const SFesRTUEventPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesRTUEventPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesRTUEventPkg) } void SFesRTUEventPkg::SharedCtor() { @@ -17184,7 +17184,7 @@ void SFesRTUEventPkg::SharedCtor() { } SFesRTUEventPkg::~SFesRTUEventPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesRTUEventPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesRTUEventPkg) SharedDtor(); } @@ -17217,7 +17217,7 @@ SFesRTUEventPkg* SFesRTUEventPkg::New() const { void SFesRTUEventPkg::Clear() { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } strtuevent_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -17228,13 +17228,13 @@ bool SFesRTUEventPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesRTUEventPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesRTUEventPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -17246,7 +17246,7 @@ bool SFesRTUEventPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesRTUEventInfo stRtuEvent = 2; + // repeated .iot_idl.SFesRTUEventInfo stRtuEvent = 2; case 2: { if (tag == 18) { parse_stRtuEvent: @@ -17274,24 +17274,24 @@ bool SFesRTUEventPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesRTUEventPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesRTUEventPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesRTUEventPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesRTUEventPkg) return false; #undef DO_ } void SFesRTUEventPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesRTUEventPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesRTUEventPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); } - // repeated .kbd_idlfile.SFesRTUEventInfo stRtuEvent = 2; + // repeated .iot_idl.SFesRTUEventInfo stRtuEvent = 2; for (int i = 0; i < this->strtuevent_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->strtuevent(i), output); @@ -17301,20 +17301,20 @@ void SFesRTUEventPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesRTUEventPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesRTUEventPkg) } ::google::protobuf::uint8* SFesRTUEventPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesRTUEventPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesRTUEventPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->sthead(), target); } - // repeated .kbd_idlfile.SFesRTUEventInfo stRtuEvent = 2; + // repeated .iot_idl.SFesRTUEventInfo stRtuEvent = 2; for (int i = 0; i < this->strtuevent_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -17325,7 +17325,7 @@ void SFesRTUEventPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesRTUEventPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesRTUEventPkg) return target; } @@ -17333,7 +17333,7 @@ int SFesRTUEventPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -17341,7 +17341,7 @@ int SFesRTUEventPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesRTUEventInfo stRtuEvent = 2; + // repeated .iot_idl.SFesRTUEventInfo stRtuEvent = 2; total_size += 1 * this->strtuevent_size(); for (int i = 0; i < this->strtuevent_size(); i++) { total_size += @@ -17377,7 +17377,7 @@ void SFesRTUEventPkg::MergeFrom(const SFesRTUEventPkg& from) { strtuevent_.MergeFrom(from.strtuevent_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -17436,7 +17436,7 @@ const int SFesAiValue::kUlTimeFieldNumber; SFesAiValue::SFesAiValue() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesAiValue) + // @@protoc_insertion_point(constructor:iot_idl.SFesAiValue) } void SFesAiValue::InitAsDefaultInstance() { @@ -17446,7 +17446,7 @@ SFesAiValue::SFesAiValue(const SFesAiValue& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesAiValue) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesAiValue) } void SFesAiValue::SharedCtor() { @@ -17459,7 +17459,7 @@ void SFesAiValue::SharedCtor() { } SFesAiValue::~SFesAiValue() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesAiValue) + // @@protoc_insertion_point(destructor:iot_idl.SFesAiValue) SharedDtor(); } @@ -17513,7 +17513,7 @@ bool SFesAiValue::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesAiValue) + // @@protoc_insertion_point(parse_start:iot_idl.SFesAiValue) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -17592,17 +17592,17 @@ bool SFesAiValue::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesAiValue) + // @@protoc_insertion_point(parse_success:iot_idl.SFesAiValue) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesAiValue) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesAiValue) return false; #undef DO_ } void SFesAiValue::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesAiValue) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesAiValue) // required int32 nPointNo = 1; if (has_npointno()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->npointno(), output); @@ -17627,12 +17627,12 @@ void SFesAiValue::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesAiValue) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesAiValue) } ::google::protobuf::uint8* SFesAiValue::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesAiValue) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesAiValue) // required int32 nPointNo = 1; if (has_npointno()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->npointno(), target); @@ -17657,7 +17657,7 @@ void SFesAiValue::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesAiValue) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesAiValue) return target; } @@ -17785,7 +17785,7 @@ const int SFesDiValue::kUlTimeFieldNumber; SFesDiValue::SFesDiValue() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesDiValue) + // @@protoc_insertion_point(constructor:iot_idl.SFesDiValue) } void SFesDiValue::InitAsDefaultInstance() { @@ -17795,7 +17795,7 @@ SFesDiValue::SFesDiValue(const SFesDiValue& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesDiValue) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesDiValue) } void SFesDiValue::SharedCtor() { @@ -17808,7 +17808,7 @@ void SFesDiValue::SharedCtor() { } SFesDiValue::~SFesDiValue() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesDiValue) + // @@protoc_insertion_point(destructor:iot_idl.SFesDiValue) SharedDtor(); } @@ -17862,7 +17862,7 @@ bool SFesDiValue::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesDiValue) + // @@protoc_insertion_point(parse_start:iot_idl.SFesDiValue) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -17941,17 +17941,17 @@ bool SFesDiValue::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesDiValue) + // @@protoc_insertion_point(parse_success:iot_idl.SFesDiValue) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesDiValue) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesDiValue) return false; #undef DO_ } void SFesDiValue::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesDiValue) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesDiValue) // required int32 nPointNo = 1; if (has_npointno()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->npointno(), output); @@ -17976,12 +17976,12 @@ void SFesDiValue::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesDiValue) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesDiValue) } ::google::protobuf::uint8* SFesDiValue::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesDiValue) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesDiValue) // required int32 nPointNo = 1; if (has_npointno()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->npointno(), target); @@ -18006,7 +18006,7 @@ void SFesDiValue::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesDiValue) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesDiValue) return target; } @@ -18136,7 +18136,7 @@ const int SFesPiValue::kUlTimeFieldNumber; SFesPiValue::SFesPiValue() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesPiValue) + // @@protoc_insertion_point(constructor:iot_idl.SFesPiValue) } void SFesPiValue::InitAsDefaultInstance() { @@ -18146,7 +18146,7 @@ SFesPiValue::SFesPiValue(const SFesPiValue& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesPiValue) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesPiValue) } void SFesPiValue::SharedCtor() { @@ -18159,7 +18159,7 @@ void SFesPiValue::SharedCtor() { } SFesPiValue::~SFesPiValue() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesPiValue) + // @@protoc_insertion_point(destructor:iot_idl.SFesPiValue) SharedDtor(); } @@ -18213,7 +18213,7 @@ bool SFesPiValue::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesPiValue) + // @@protoc_insertion_point(parse_start:iot_idl.SFesPiValue) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -18292,17 +18292,17 @@ bool SFesPiValue::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesPiValue) + // @@protoc_insertion_point(parse_success:iot_idl.SFesPiValue) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesPiValue) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesPiValue) return false; #undef DO_ } void SFesPiValue::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesPiValue) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesPiValue) // required int32 nPointNo = 1; if (has_npointno()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->npointno(), output); @@ -18327,12 +18327,12 @@ void SFesPiValue::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesPiValue) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesPiValue) } ::google::protobuf::uint8* SFesPiValue::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesPiValue) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesPiValue) // required int32 nPointNo = 1; if (has_npointno()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->npointno(), target); @@ -18357,7 +18357,7 @@ void SFesPiValue::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesPiValue) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesPiValue) return target; } @@ -18487,7 +18487,7 @@ const int SFesMiValue::kUlTimeFieldNumber; SFesMiValue::SFesMiValue() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesMiValue) + // @@protoc_insertion_point(constructor:iot_idl.SFesMiValue) } void SFesMiValue::InitAsDefaultInstance() { @@ -18497,7 +18497,7 @@ SFesMiValue::SFesMiValue(const SFesMiValue& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesMiValue) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesMiValue) } void SFesMiValue::SharedCtor() { @@ -18510,7 +18510,7 @@ void SFesMiValue::SharedCtor() { } SFesMiValue::~SFesMiValue() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesMiValue) + // @@protoc_insertion_point(destructor:iot_idl.SFesMiValue) SharedDtor(); } @@ -18564,7 +18564,7 @@ bool SFesMiValue::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesMiValue) + // @@protoc_insertion_point(parse_start:iot_idl.SFesMiValue) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -18643,17 +18643,17 @@ bool SFesMiValue::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesMiValue) + // @@protoc_insertion_point(parse_success:iot_idl.SFesMiValue) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesMiValue) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesMiValue) return false; #undef DO_ } void SFesMiValue::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesMiValue) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesMiValue) // required int32 nPointNo = 1; if (has_npointno()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->npointno(), output); @@ -18678,12 +18678,12 @@ void SFesMiValue::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesMiValue) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesMiValue) } ::google::protobuf::uint8* SFesMiValue::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesMiValue) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesMiValue) // required int32 nPointNo = 1; if (has_npointno()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->npointno(), target); @@ -18708,7 +18708,7 @@ void SFesMiValue::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesMiValue) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesMiValue) return target; } @@ -18836,18 +18836,18 @@ const int SFesValueReqPkg::kNRtuNoFieldNumber; SFesValueReqPkg::SFesValueReqPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesValueReqPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesValueReqPkg) } void SFesValueReqPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesValueReqPkg::SFesValueReqPkg(const SFesValueReqPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesValueReqPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesValueReqPkg) } void SFesValueReqPkg::SharedCtor() { @@ -18858,7 +18858,7 @@ void SFesValueReqPkg::SharedCtor() { } SFesValueReqPkg::~SFesValueReqPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesValueReqPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesValueReqPkg) SharedDtor(); } @@ -18892,7 +18892,7 @@ SFesValueReqPkg* SFesValueReqPkg::New() const { void SFesValueReqPkg::Clear() { if (_has_bits_[0 / 32] & 3) { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } nrtuno_ = 0; } @@ -18904,13 +18904,13 @@ bool SFesValueReqPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesValueReqPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesValueReqPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -18951,18 +18951,18 @@ bool SFesValueReqPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesValueReqPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesValueReqPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesValueReqPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesValueReqPkg) return false; #undef DO_ } void SFesValueReqPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesValueReqPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesValueReqPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); @@ -18977,13 +18977,13 @@ void SFesValueReqPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesValueReqPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesValueReqPkg) } ::google::protobuf::uint8* SFesValueReqPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesValueReqPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesValueReqPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -18999,7 +18999,7 @@ void SFesValueReqPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesValueReqPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesValueReqPkg) return target; } @@ -19007,7 +19007,7 @@ int SFesValueReqPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -19049,7 +19049,7 @@ void SFesValueReqPkg::MergeFrom(const SFesValueReqPkg& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } if (from.has_nrtuno()) { set_nrtuno(from.nrtuno()); @@ -19109,18 +19109,18 @@ const int SFesAiValueRespPkg::kStAiValueFieldNumber; SFesAiValueRespPkg::SFesAiValueRespPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesAiValueRespPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesAiValueRespPkg) } void SFesAiValueRespPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesAiValueRespPkg::SFesAiValueRespPkg(const SFesAiValueRespPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesAiValueRespPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesAiValueRespPkg) } void SFesAiValueRespPkg::SharedCtor() { @@ -19131,7 +19131,7 @@ void SFesAiValueRespPkg::SharedCtor() { } SFesAiValueRespPkg::~SFesAiValueRespPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesAiValueRespPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesAiValueRespPkg) SharedDtor(); } @@ -19165,7 +19165,7 @@ SFesAiValueRespPkg* SFesAiValueRespPkg::New() const { void SFesAiValueRespPkg::Clear() { if (_has_bits_[0 / 32] & 3) { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } nrtuno_ = 0; } @@ -19178,13 +19178,13 @@ bool SFesAiValueRespPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesAiValueRespPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesAiValueRespPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -19211,7 +19211,7 @@ bool SFesAiValueRespPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesAiValue stAiValue = 3; + // repeated .iot_idl.SFesAiValue stAiValue = 3; case 3: { if (tag == 26) { parse_stAiValue: @@ -19239,18 +19239,18 @@ bool SFesAiValueRespPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesAiValueRespPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesAiValueRespPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesAiValueRespPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesAiValueRespPkg) return false; #undef DO_ } void SFesAiValueRespPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesAiValueRespPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesAiValueRespPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); @@ -19261,7 +19261,7 @@ void SFesAiValueRespPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->nrtuno(), output); } - // repeated .kbd_idlfile.SFesAiValue stAiValue = 3; + // repeated .iot_idl.SFesAiValue stAiValue = 3; for (int i = 0; i < this->staivalue_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->staivalue(i), output); @@ -19271,13 +19271,13 @@ void SFesAiValueRespPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesAiValueRespPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesAiValueRespPkg) } ::google::protobuf::uint8* SFesAiValueRespPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesAiValueRespPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesAiValueRespPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -19289,7 +19289,7 @@ void SFesAiValueRespPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->nrtuno(), target); } - // repeated .kbd_idlfile.SFesAiValue stAiValue = 3; + // repeated .iot_idl.SFesAiValue stAiValue = 3; for (int i = 0; i < this->staivalue_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -19300,7 +19300,7 @@ void SFesAiValueRespPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesAiValueRespPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesAiValueRespPkg) return target; } @@ -19308,7 +19308,7 @@ int SFesAiValueRespPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -19323,7 +19323,7 @@ int SFesAiValueRespPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesAiValue stAiValue = 3; + // repeated .iot_idl.SFesAiValue stAiValue = 3; total_size += 1 * this->staivalue_size(); for (int i = 0; i < this->staivalue_size(); i++) { total_size += @@ -19359,7 +19359,7 @@ void SFesAiValueRespPkg::MergeFrom(const SFesAiValueRespPkg& from) { staivalue_.MergeFrom(from.staivalue_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } if (from.has_nrtuno()) { set_nrtuno(from.nrtuno()); @@ -19421,18 +19421,18 @@ const int SFesDiValueRespPkg::kStDiValueFieldNumber; SFesDiValueRespPkg::SFesDiValueRespPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesDiValueRespPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesDiValueRespPkg) } void SFesDiValueRespPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesDiValueRespPkg::SFesDiValueRespPkg(const SFesDiValueRespPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesDiValueRespPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesDiValueRespPkg) } void SFesDiValueRespPkg::SharedCtor() { @@ -19443,7 +19443,7 @@ void SFesDiValueRespPkg::SharedCtor() { } SFesDiValueRespPkg::~SFesDiValueRespPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesDiValueRespPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesDiValueRespPkg) SharedDtor(); } @@ -19477,7 +19477,7 @@ SFesDiValueRespPkg* SFesDiValueRespPkg::New() const { void SFesDiValueRespPkg::Clear() { if (_has_bits_[0 / 32] & 3) { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } nrtuno_ = 0; } @@ -19490,13 +19490,13 @@ bool SFesDiValueRespPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesDiValueRespPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesDiValueRespPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -19523,7 +19523,7 @@ bool SFesDiValueRespPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesDiValue stDiValue = 3; + // repeated .iot_idl.SFesDiValue stDiValue = 3; case 3: { if (tag == 26) { parse_stDiValue: @@ -19551,18 +19551,18 @@ bool SFesDiValueRespPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesDiValueRespPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesDiValueRespPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesDiValueRespPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesDiValueRespPkg) return false; #undef DO_ } void SFesDiValueRespPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesDiValueRespPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesDiValueRespPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); @@ -19573,7 +19573,7 @@ void SFesDiValueRespPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->nrtuno(), output); } - // repeated .kbd_idlfile.SFesDiValue stDiValue = 3; + // repeated .iot_idl.SFesDiValue stDiValue = 3; for (int i = 0; i < this->stdivalue_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->stdivalue(i), output); @@ -19583,13 +19583,13 @@ void SFesDiValueRespPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesDiValueRespPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesDiValueRespPkg) } ::google::protobuf::uint8* SFesDiValueRespPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesDiValueRespPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesDiValueRespPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -19601,7 +19601,7 @@ void SFesDiValueRespPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->nrtuno(), target); } - // repeated .kbd_idlfile.SFesDiValue stDiValue = 3; + // repeated .iot_idl.SFesDiValue stDiValue = 3; for (int i = 0; i < this->stdivalue_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -19612,7 +19612,7 @@ void SFesDiValueRespPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesDiValueRespPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesDiValueRespPkg) return target; } @@ -19620,7 +19620,7 @@ int SFesDiValueRespPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -19635,7 +19635,7 @@ int SFesDiValueRespPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesDiValue stDiValue = 3; + // repeated .iot_idl.SFesDiValue stDiValue = 3; total_size += 1 * this->stdivalue_size(); for (int i = 0; i < this->stdivalue_size(); i++) { total_size += @@ -19671,7 +19671,7 @@ void SFesDiValueRespPkg::MergeFrom(const SFesDiValueRespPkg& from) { stdivalue_.MergeFrom(from.stdivalue_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } if (from.has_nrtuno()) { set_nrtuno(from.nrtuno()); @@ -19733,18 +19733,18 @@ const int SFesPiValueRespPkg::kStPiValueFieldNumber; SFesPiValueRespPkg::SFesPiValueRespPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesPiValueRespPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesPiValueRespPkg) } void SFesPiValueRespPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesPiValueRespPkg::SFesPiValueRespPkg(const SFesPiValueRespPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesPiValueRespPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesPiValueRespPkg) } void SFesPiValueRespPkg::SharedCtor() { @@ -19755,7 +19755,7 @@ void SFesPiValueRespPkg::SharedCtor() { } SFesPiValueRespPkg::~SFesPiValueRespPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesPiValueRespPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesPiValueRespPkg) SharedDtor(); } @@ -19789,7 +19789,7 @@ SFesPiValueRespPkg* SFesPiValueRespPkg::New() const { void SFesPiValueRespPkg::Clear() { if (_has_bits_[0 / 32] & 3) { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } nrtuno_ = 0; } @@ -19802,13 +19802,13 @@ bool SFesPiValueRespPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesPiValueRespPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesPiValueRespPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -19835,7 +19835,7 @@ bool SFesPiValueRespPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesPiValue stPiValue = 3; + // repeated .iot_idl.SFesPiValue stPiValue = 3; case 3: { if (tag == 26) { parse_stPiValue: @@ -19863,18 +19863,18 @@ bool SFesPiValueRespPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesPiValueRespPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesPiValueRespPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesPiValueRespPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesPiValueRespPkg) return false; #undef DO_ } void SFesPiValueRespPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesPiValueRespPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesPiValueRespPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); @@ -19885,7 +19885,7 @@ void SFesPiValueRespPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->nrtuno(), output); } - // repeated .kbd_idlfile.SFesPiValue stPiValue = 3; + // repeated .iot_idl.SFesPiValue stPiValue = 3; for (int i = 0; i < this->stpivalue_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->stpivalue(i), output); @@ -19895,13 +19895,13 @@ void SFesPiValueRespPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesPiValueRespPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesPiValueRespPkg) } ::google::protobuf::uint8* SFesPiValueRespPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesPiValueRespPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesPiValueRespPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -19913,7 +19913,7 @@ void SFesPiValueRespPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->nrtuno(), target); } - // repeated .kbd_idlfile.SFesPiValue stPiValue = 3; + // repeated .iot_idl.SFesPiValue stPiValue = 3; for (int i = 0; i < this->stpivalue_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -19924,7 +19924,7 @@ void SFesPiValueRespPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesPiValueRespPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesPiValueRespPkg) return target; } @@ -19932,7 +19932,7 @@ int SFesPiValueRespPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -19947,7 +19947,7 @@ int SFesPiValueRespPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesPiValue stPiValue = 3; + // repeated .iot_idl.SFesPiValue stPiValue = 3; total_size += 1 * this->stpivalue_size(); for (int i = 0; i < this->stpivalue_size(); i++) { total_size += @@ -19983,7 +19983,7 @@ void SFesPiValueRespPkg::MergeFrom(const SFesPiValueRespPkg& from) { stpivalue_.MergeFrom(from.stpivalue_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } if (from.has_nrtuno()) { set_nrtuno(from.nrtuno()); @@ -20045,18 +20045,18 @@ const int SFesMiValueRespPkg::kStMiValueFieldNumber; SFesMiValueRespPkg::SFesMiValueRespPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesMiValueRespPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesMiValueRespPkg) } void SFesMiValueRespPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesMiValueRespPkg::SFesMiValueRespPkg(const SFesMiValueRespPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesMiValueRespPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesMiValueRespPkg) } void SFesMiValueRespPkg::SharedCtor() { @@ -20067,7 +20067,7 @@ void SFesMiValueRespPkg::SharedCtor() { } SFesMiValueRespPkg::~SFesMiValueRespPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesMiValueRespPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesMiValueRespPkg) SharedDtor(); } @@ -20101,7 +20101,7 @@ SFesMiValueRespPkg* SFesMiValueRespPkg::New() const { void SFesMiValueRespPkg::Clear() { if (_has_bits_[0 / 32] & 3) { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } nrtuno_ = 0; } @@ -20114,13 +20114,13 @@ bool SFesMiValueRespPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesMiValueRespPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesMiValueRespPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -20147,7 +20147,7 @@ bool SFesMiValueRespPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesMiValue stMiValue = 3; + // repeated .iot_idl.SFesMiValue stMiValue = 3; case 3: { if (tag == 26) { parse_stMiValue: @@ -20175,18 +20175,18 @@ bool SFesMiValueRespPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesMiValueRespPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesMiValueRespPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesMiValueRespPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesMiValueRespPkg) return false; #undef DO_ } void SFesMiValueRespPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesMiValueRespPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesMiValueRespPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); @@ -20197,7 +20197,7 @@ void SFesMiValueRespPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->nrtuno(), output); } - // repeated .kbd_idlfile.SFesMiValue stMiValue = 3; + // repeated .iot_idl.SFesMiValue stMiValue = 3; for (int i = 0; i < this->stmivalue_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->stmivalue(i), output); @@ -20207,13 +20207,13 @@ void SFesMiValueRespPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesMiValueRespPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesMiValueRespPkg) } ::google::protobuf::uint8* SFesMiValueRespPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesMiValueRespPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesMiValueRespPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -20225,7 +20225,7 @@ void SFesMiValueRespPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->nrtuno(), target); } - // repeated .kbd_idlfile.SFesMiValue stMiValue = 3; + // repeated .iot_idl.SFesMiValue stMiValue = 3; for (int i = 0; i < this->stmivalue_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -20236,7 +20236,7 @@ void SFesMiValueRespPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesMiValueRespPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesMiValueRespPkg) return target; } @@ -20244,7 +20244,7 @@ int SFesMiValueRespPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -20259,7 +20259,7 @@ int SFesMiValueRespPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesMiValue stMiValue = 3; + // repeated .iot_idl.SFesMiValue stMiValue = 3; total_size += 1 * this->stmivalue_size(); for (int i = 0; i < this->stmivalue_size(); i++) { total_size += @@ -20295,7 +20295,7 @@ void SFesMiValueRespPkg::MergeFrom(const SFesMiValueRespPkg& from) { stmivalue_.MergeFrom(from.stmivalue_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } if (from.has_nrtuno()) { set_nrtuno(from.nrtuno()); @@ -20360,7 +20360,7 @@ const int SFesVirtualData::kUlTimeFieldNumber; SFesVirtualData::SFesVirtualData() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesVirtualData) + // @@protoc_insertion_point(constructor:iot_idl.SFesVirtualData) } void SFesVirtualData::InitAsDefaultInstance() { @@ -20370,7 +20370,7 @@ SFesVirtualData::SFesVirtualData(const SFesVirtualData& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesVirtualData) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesVirtualData) } void SFesVirtualData::SharedCtor() { @@ -20386,7 +20386,7 @@ void SFesVirtualData::SharedCtor() { } SFesVirtualData::~SFesVirtualData() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesVirtualData) + // @@protoc_insertion_point(destructor:iot_idl.SFesVirtualData) SharedDtor(); } @@ -20458,7 +20458,7 @@ bool SFesVirtualData::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesVirtualData) + // @@protoc_insertion_point(parse_start:iot_idl.SFesVirtualData) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -20571,17 +20571,17 @@ bool SFesVirtualData::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesVirtualData) + // @@protoc_insertion_point(parse_success:iot_idl.SFesVirtualData) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesVirtualData) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesVirtualData) return false; #undef DO_ } void SFesVirtualData::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesVirtualData) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesVirtualData) // required string strRtuTag = 1; if (has_strrtutag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -20626,12 +20626,12 @@ void SFesVirtualData::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesVirtualData) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesVirtualData) } ::google::protobuf::uint8* SFesVirtualData::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesVirtualData) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesVirtualData) // required string strRtuTag = 1; if (has_strrtutag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -20678,7 +20678,7 @@ void SFesVirtualData::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesVirtualData) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesVirtualData) return target; } @@ -20826,18 +20826,18 @@ const int SFesChangeVirtualDataPkg::kStDataFieldNumber; SFesChangeVirtualDataPkg::SFesChangeVirtualDataPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesChangeVirtualDataPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesChangeVirtualDataPkg) } void SFesChangeVirtualDataPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesRealPkgHead*>(&::kbd_idlfile::SFesRealPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesRealPkgHead*>(&::iot_idl::SFesRealPkgHead::default_instance()); } SFesChangeVirtualDataPkg::SFesChangeVirtualDataPkg(const SFesChangeVirtualDataPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesChangeVirtualDataPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesChangeVirtualDataPkg) } void SFesChangeVirtualDataPkg::SharedCtor() { @@ -20847,7 +20847,7 @@ void SFesChangeVirtualDataPkg::SharedCtor() { } SFesChangeVirtualDataPkg::~SFesChangeVirtualDataPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesChangeVirtualDataPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesChangeVirtualDataPkg) SharedDtor(); } @@ -20880,7 +20880,7 @@ SFesChangeVirtualDataPkg* SFesChangeVirtualDataPkg::New() const { void SFesChangeVirtualDataPkg::Clear() { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); } stdata_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -20891,13 +20891,13 @@ bool SFesChangeVirtualDataPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesChangeVirtualDataPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesChangeVirtualDataPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -20909,7 +20909,7 @@ bool SFesChangeVirtualDataPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesVirtualData stData = 2; + // repeated .iot_idl.SFesVirtualData stData = 2; case 2: { if (tag == 18) { parse_stData: @@ -20937,24 +20937,24 @@ bool SFesChangeVirtualDataPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesChangeVirtualDataPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesChangeVirtualDataPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesChangeVirtualDataPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesChangeVirtualDataPkg) return false; #undef DO_ } void SFesChangeVirtualDataPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesChangeVirtualDataPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesChangeVirtualDataPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); } - // repeated .kbd_idlfile.SFesVirtualData stData = 2; + // repeated .iot_idl.SFesVirtualData stData = 2; for (int i = 0; i < this->stdata_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->stdata(i), output); @@ -20964,20 +20964,20 @@ void SFesChangeVirtualDataPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesChangeVirtualDataPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesChangeVirtualDataPkg) } ::google::protobuf::uint8* SFesChangeVirtualDataPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesChangeVirtualDataPkg) - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesChangeVirtualDataPkg) + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->sthead(), target); } - // repeated .kbd_idlfile.SFesVirtualData stData = 2; + // repeated .iot_idl.SFesVirtualData stData = 2; for (int i = 0; i < this->stdata_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -20988,7 +20988,7 @@ void SFesChangeVirtualDataPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesChangeVirtualDataPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesChangeVirtualDataPkg) return target; } @@ -20996,7 +20996,7 @@ int SFesChangeVirtualDataPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -21004,7 +21004,7 @@ int SFesChangeVirtualDataPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesVirtualData stData = 2; + // repeated .iot_idl.SFesVirtualData stData = 2; total_size += 1 * this->stdata_size(); for (int i = 0; i < this->stdata_size(); i++) { total_size += @@ -21040,7 +21040,7 @@ void SFesChangeVirtualDataPkg::MergeFrom(const SFesChangeVirtualDataPkg& from) { stdata_.MergeFrom(from.stdata_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesRealPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesRealPkgHead::MergeFrom(from.sthead()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -21089,6 +21089,6 @@ void SFesChangeVirtualDataPkg::Swap(SFesChangeVirtualDataPkg* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/platform/src/idl_files/FesMessage.pb.h b/platform/src/idl_files/FesMessage.pb.h index cf21eb23..6f4cfa52 100644 --- a/platform/src/idl_files/FesMessage.pb.h +++ b/platform/src/idl_files/FesMessage.pb.h @@ -27,7 +27,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { // Internal implementation detail -- do not call these. void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); @@ -256,7 +256,7 @@ class IDL_FILES_EXPORT SFesRealPkgHead : public ::google::protobuf::Message { inline ::google::protobuf::int32 nrespara2() const; inline void set_nrespara2(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesRealPkgHead) + // @@protoc_insertion_point(class_scope:iot_idl.SFesRealPkgHead) private: inline void set_has_strfessource(); inline void clear_has_strfessource(); @@ -400,7 +400,7 @@ class IDL_FILES_EXPORT SFesAiDataWithTm : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesAiDataWithTm) + // @@protoc_insertion_point(class_scope:iot_idl.SFesAiDataWithTm) private: inline void set_has_strapptablename(); inline void clear_has_strapptablename(); @@ -537,7 +537,7 @@ class IDL_FILES_EXPORT SFesAiDataWithoutTm : public ::google::protobuf::Message inline float fvalue() const; inline void set_fvalue(float value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesAiDataWithoutTm) + // @@protoc_insertion_point(class_scope:iot_idl.SFesAiDataWithoutTm) private: inline void set_has_strapptablename(); inline void clear_has_strapptablename(); @@ -621,28 +621,28 @@ class IDL_FILES_EXPORT SFesChangeAiPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); - // repeated .kbd_idlfile.SFesAiDataWithTm stAiData = 2; + // repeated .iot_idl.SFesAiDataWithTm stAiData = 2; inline int staidata_size() const; inline void clear_staidata(); static const int kStAiDataFieldNumber = 2; - inline const ::kbd_idlfile::SFesAiDataWithTm& staidata(int index) const; - inline ::kbd_idlfile::SFesAiDataWithTm* mutable_staidata(int index); - inline ::kbd_idlfile::SFesAiDataWithTm* add_staidata(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesAiDataWithTm >& + inline const ::iot_idl::SFesAiDataWithTm& staidata(int index) const; + inline ::iot_idl::SFesAiDataWithTm* mutable_staidata(int index); + inline ::iot_idl::SFesAiDataWithTm* add_staidata(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAiDataWithTm >& staidata() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesAiDataWithTm >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAiDataWithTm >* mutable_staidata(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesChangeAiPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesChangeAiPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -651,8 +651,8 @@ class IDL_FILES_EXPORT SFesChangeAiPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesAiDataWithTm > staidata_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAiDataWithTm > staidata_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); friend void protobuf_ShutdownFile_FesMessage_2eproto(); @@ -715,25 +715,25 @@ class IDL_FILES_EXPORT SFesUpdateAiPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); - // repeated .kbd_idlfile.SFesAiDataWithoutTm stAiData = 2; + // repeated .iot_idl.SFesAiDataWithoutTm stAiData = 2; inline int staidata_size() const; inline void clear_staidata(); static const int kStAiDataFieldNumber = 2; - inline const ::kbd_idlfile::SFesAiDataWithoutTm& staidata(int index) const; - inline ::kbd_idlfile::SFesAiDataWithoutTm* mutable_staidata(int index); - inline ::kbd_idlfile::SFesAiDataWithoutTm* add_staidata(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesAiDataWithoutTm >& + inline const ::iot_idl::SFesAiDataWithoutTm& staidata(int index) const; + inline ::iot_idl::SFesAiDataWithoutTm* mutable_staidata(int index); + inline ::iot_idl::SFesAiDataWithoutTm* add_staidata(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAiDataWithoutTm >& staidata() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesAiDataWithoutTm >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAiDataWithoutTm >* mutable_staidata(); // required uint64 ulTime = 3; @@ -743,7 +743,7 @@ class IDL_FILES_EXPORT SFesUpdateAiPkg : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesUpdateAiPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesUpdateAiPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -754,8 +754,8 @@ class IDL_FILES_EXPORT SFesUpdateAiPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesAiDataWithoutTm > staidata_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAiDataWithoutTm > staidata_; ::google::protobuf::uint64 ultime_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); @@ -876,7 +876,7 @@ class IDL_FILES_EXPORT SFesDiDataWithTm : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesDiDataWithTm) + // @@protoc_insertion_point(class_scope:iot_idl.SFesDiDataWithTm) private: inline void set_has_strapptablename(); inline void clear_has_strapptablename(); @@ -1013,7 +1013,7 @@ class IDL_FILES_EXPORT SFesDiDataWithoutTm : public ::google::protobuf::Message inline ::google::protobuf::int32 nvalue() const; inline void set_nvalue(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesDiDataWithoutTm) + // @@protoc_insertion_point(class_scope:iot_idl.SFesDiDataWithoutTm) private: inline void set_has_strapptablename(); inline void clear_has_strapptablename(); @@ -1097,28 +1097,28 @@ class IDL_FILES_EXPORT SFesChangeDiPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); - // repeated .kbd_idlfile.SFesDiDataWithTm stDiData = 2; + // repeated .iot_idl.SFesDiDataWithTm stDiData = 2; inline int stdidata_size() const; inline void clear_stdidata(); static const int kStDiDataFieldNumber = 2; - inline const ::kbd_idlfile::SFesDiDataWithTm& stdidata(int index) const; - inline ::kbd_idlfile::SFesDiDataWithTm* mutable_stdidata(int index); - inline ::kbd_idlfile::SFesDiDataWithTm* add_stdidata(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesDiDataWithTm >& + inline const ::iot_idl::SFesDiDataWithTm& stdidata(int index) const; + inline ::iot_idl::SFesDiDataWithTm* mutable_stdidata(int index); + inline ::iot_idl::SFesDiDataWithTm* add_stdidata(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDiDataWithTm >& stdidata() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesDiDataWithTm >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDiDataWithTm >* mutable_stdidata(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesChangeDiPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesChangeDiPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -1127,8 +1127,8 @@ class IDL_FILES_EXPORT SFesChangeDiPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesDiDataWithTm > stdidata_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDiDataWithTm > stdidata_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); friend void protobuf_ShutdownFile_FesMessage_2eproto(); @@ -1191,25 +1191,25 @@ class IDL_FILES_EXPORT SFesUpdateDiPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); - // repeated .kbd_idlfile.SFesDiDataWithoutTm stDiData = 2; + // repeated .iot_idl.SFesDiDataWithoutTm stDiData = 2; inline int stdidata_size() const; inline void clear_stdidata(); static const int kStDiDataFieldNumber = 2; - inline const ::kbd_idlfile::SFesDiDataWithoutTm& stdidata(int index) const; - inline ::kbd_idlfile::SFesDiDataWithoutTm* mutable_stdidata(int index); - inline ::kbd_idlfile::SFesDiDataWithoutTm* add_stdidata(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesDiDataWithoutTm >& + inline const ::iot_idl::SFesDiDataWithoutTm& stdidata(int index) const; + inline ::iot_idl::SFesDiDataWithoutTm* mutable_stdidata(int index); + inline ::iot_idl::SFesDiDataWithoutTm* add_stdidata(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDiDataWithoutTm >& stdidata() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesDiDataWithoutTm >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDiDataWithoutTm >* mutable_stdidata(); // required uint64 ulTime = 3; @@ -1219,7 +1219,7 @@ class IDL_FILES_EXPORT SFesUpdateDiPkg : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesUpdateDiPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesUpdateDiPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -1230,8 +1230,8 @@ class IDL_FILES_EXPORT SFesUpdateDiPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesDiDataWithoutTm > stdidata_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDiDataWithoutTm > stdidata_; ::google::protobuf::uint64 ultime_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); @@ -1352,7 +1352,7 @@ class IDL_FILES_EXPORT SFesPiDataWithTm : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesPiDataWithTm) + // @@protoc_insertion_point(class_scope:iot_idl.SFesPiDataWithTm) private: inline void set_has_strapptablename(); inline void clear_has_strapptablename(); @@ -1489,7 +1489,7 @@ class IDL_FILES_EXPORT SFesPiDataWithoutTm : public ::google::protobuf::Message inline ::google::protobuf::int64 nvalue() const; inline void set_nvalue(::google::protobuf::int64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesPiDataWithoutTm) + // @@protoc_insertion_point(class_scope:iot_idl.SFesPiDataWithoutTm) private: inline void set_has_strapptablename(); inline void clear_has_strapptablename(); @@ -1573,28 +1573,28 @@ class IDL_FILES_EXPORT SFesChangePiPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); - // repeated .kbd_idlfile.SFesPiDataWithTm stPiData = 2; + // repeated .iot_idl.SFesPiDataWithTm stPiData = 2; inline int stpidata_size() const; inline void clear_stpidata(); static const int kStPiDataFieldNumber = 2; - inline const ::kbd_idlfile::SFesPiDataWithTm& stpidata(int index) const; - inline ::kbd_idlfile::SFesPiDataWithTm* mutable_stpidata(int index); - inline ::kbd_idlfile::SFesPiDataWithTm* add_stpidata(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesPiDataWithTm >& + inline const ::iot_idl::SFesPiDataWithTm& stpidata(int index) const; + inline ::iot_idl::SFesPiDataWithTm* mutable_stpidata(int index); + inline ::iot_idl::SFesPiDataWithTm* add_stpidata(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesPiDataWithTm >& stpidata() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesPiDataWithTm >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesPiDataWithTm >* mutable_stpidata(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesChangePiPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesChangePiPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -1603,8 +1603,8 @@ class IDL_FILES_EXPORT SFesChangePiPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesPiDataWithTm > stpidata_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesPiDataWithTm > stpidata_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); friend void protobuf_ShutdownFile_FesMessage_2eproto(); @@ -1667,25 +1667,25 @@ class IDL_FILES_EXPORT SFesUpdatePiPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); - // repeated .kbd_idlfile.SFesPiDataWithoutTm stPiData = 2; + // repeated .iot_idl.SFesPiDataWithoutTm stPiData = 2; inline int stpidata_size() const; inline void clear_stpidata(); static const int kStPiDataFieldNumber = 2; - inline const ::kbd_idlfile::SFesPiDataWithoutTm& stpidata(int index) const; - inline ::kbd_idlfile::SFesPiDataWithoutTm* mutable_stpidata(int index); - inline ::kbd_idlfile::SFesPiDataWithoutTm* add_stpidata(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesPiDataWithoutTm >& + inline const ::iot_idl::SFesPiDataWithoutTm& stpidata(int index) const; + inline ::iot_idl::SFesPiDataWithoutTm* mutable_stpidata(int index); + inline ::iot_idl::SFesPiDataWithoutTm* add_stpidata(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesPiDataWithoutTm >& stpidata() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesPiDataWithoutTm >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesPiDataWithoutTm >* mutable_stpidata(); // required uint64 ulTime = 3; @@ -1695,7 +1695,7 @@ class IDL_FILES_EXPORT SFesUpdatePiPkg : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesUpdatePiPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesUpdatePiPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -1706,8 +1706,8 @@ class IDL_FILES_EXPORT SFesUpdatePiPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesPiDataWithoutTm > stpidata_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesPiDataWithoutTm > stpidata_; ::google::protobuf::uint64 ultime_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); @@ -1828,7 +1828,7 @@ class IDL_FILES_EXPORT SFesMiDataWithTm : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesMiDataWithTm) + // @@protoc_insertion_point(class_scope:iot_idl.SFesMiDataWithTm) private: inline void set_has_strapptablename(); inline void clear_has_strapptablename(); @@ -1965,7 +1965,7 @@ class IDL_FILES_EXPORT SFesMiDataWithoutTm : public ::google::protobuf::Message inline ::google::protobuf::int32 nvalue() const; inline void set_nvalue(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesMiDataWithoutTm) + // @@protoc_insertion_point(class_scope:iot_idl.SFesMiDataWithoutTm) private: inline void set_has_strapptablename(); inline void clear_has_strapptablename(); @@ -2049,28 +2049,28 @@ class IDL_FILES_EXPORT SFesChangeMiPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); - // repeated .kbd_idlfile.SFesMiDataWithTm stMiData = 2; + // repeated .iot_idl.SFesMiDataWithTm stMiData = 2; inline int stmidata_size() const; inline void clear_stmidata(); static const int kStMiDataFieldNumber = 2; - inline const ::kbd_idlfile::SFesMiDataWithTm& stmidata(int index) const; - inline ::kbd_idlfile::SFesMiDataWithTm* mutable_stmidata(int index); - inline ::kbd_idlfile::SFesMiDataWithTm* add_stmidata(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesMiDataWithTm >& + inline const ::iot_idl::SFesMiDataWithTm& stmidata(int index) const; + inline ::iot_idl::SFesMiDataWithTm* mutable_stmidata(int index); + inline ::iot_idl::SFesMiDataWithTm* add_stmidata(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMiDataWithTm >& stmidata() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesMiDataWithTm >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMiDataWithTm >* mutable_stmidata(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesChangeMiPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesChangeMiPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -2079,8 +2079,8 @@ class IDL_FILES_EXPORT SFesChangeMiPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesMiDataWithTm > stmidata_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMiDataWithTm > stmidata_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); friend void protobuf_ShutdownFile_FesMessage_2eproto(); @@ -2143,25 +2143,25 @@ class IDL_FILES_EXPORT SFesUpdateMiPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); - // repeated .kbd_idlfile.SFesMiDataWithoutTm stMiData = 2; + // repeated .iot_idl.SFesMiDataWithoutTm stMiData = 2; inline int stmidata_size() const; inline void clear_stmidata(); static const int kStMiDataFieldNumber = 2; - inline const ::kbd_idlfile::SFesMiDataWithoutTm& stmidata(int index) const; - inline ::kbd_idlfile::SFesMiDataWithoutTm* mutable_stmidata(int index); - inline ::kbd_idlfile::SFesMiDataWithoutTm* add_stmidata(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesMiDataWithoutTm >& + inline const ::iot_idl::SFesMiDataWithoutTm& stmidata(int index) const; + inline ::iot_idl::SFesMiDataWithoutTm* mutable_stmidata(int index); + inline ::iot_idl::SFesMiDataWithoutTm* add_stmidata(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMiDataWithoutTm >& stmidata() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesMiDataWithoutTm >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMiDataWithoutTm >* mutable_stmidata(); // required uint64 ulTime = 3; @@ -2171,7 +2171,7 @@ class IDL_FILES_EXPORT SFesUpdateMiPkg : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesUpdateMiPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesUpdateMiPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -2182,8 +2182,8 @@ class IDL_FILES_EXPORT SFesUpdateMiPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesMiDataWithoutTm > stmidata_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMiDataWithoutTm > stmidata_; ::google::protobuf::uint64 ultime_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); @@ -2361,7 +2361,7 @@ class IDL_FILES_EXPORT SFesDoRequestPkg : public ::google::protobuf::Message { inline ::std::string* release_strpara(); inline void set_allocated_strpara(::std::string* strpara); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesDoRequestPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesDoRequestPkg) private: inline void set_has_strsourcetag(); inline void clear_has_strsourcetag(); @@ -2587,7 +2587,7 @@ class IDL_FILES_EXPORT SFesAoRequestPkg : public ::google::protobuf::Message { inline ::std::string* release_strpara(); inline void set_allocated_strpara(::std::string* strpara); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesAoRequestPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesAoRequestPkg) private: inline void set_has_strsourcetag(); inline void clear_has_strsourcetag(); @@ -2816,7 +2816,7 @@ class IDL_FILES_EXPORT SFesMoRequestPkg : public ::google::protobuf::Message { inline ::std::string* release_strpara(); inline void set_allocated_strpara(::std::string* strpara); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesMoRequestPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesMoRequestPkg) private: inline void set_has_strsourcetag(); inline void clear_has_strsourcetag(); @@ -3012,7 +3012,7 @@ class IDL_FILES_EXPORT SFesCtrlReplyPkg : public ::google::protobuf::Message { inline ::std::string* release_strpara(); inline void set_allocated_strpara(::std::string* strpara); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesCtrlReplyPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesCtrlReplyPkg) private: inline void set_has_strsourcetag(); inline void clear_has_strsourcetag(); @@ -3132,7 +3132,7 @@ class IDL_FILES_EXPORT SFesCustCmdQueue : public ::google::protobuf::Message { inline ::std::string* release_strkeyvalue(); inline void set_allocated_strkeyvalue(::std::string* strkeyvalue); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesCustCmdQueue) + // @@protoc_insertion_point(class_scope:iot_idl.SFesCustCmdQueue) private: inline void set_has_strkeyname(); inline void clear_has_strkeyname(); @@ -3281,19 +3281,19 @@ class IDL_FILES_EXPORT SFesCustCmdRequestPkg : public ::google::protobuf::Messag inline ::google::protobuf::int32 ndatalen() const; inline void set_ndatalen(::google::protobuf::int32 value); - // repeated .kbd_idlfile.SFesCustCmdQueue seqCustCmdData = 8; + // repeated .iot_idl.SFesCustCmdQueue seqCustCmdData = 8; inline int seqcustcmddata_size() const; inline void clear_seqcustcmddata(); static const int kSeqCustCmdDataFieldNumber = 8; - inline const ::kbd_idlfile::SFesCustCmdQueue& seqcustcmddata(int index) const; - inline ::kbd_idlfile::SFesCustCmdQueue* mutable_seqcustcmddata(int index); - inline ::kbd_idlfile::SFesCustCmdQueue* add_seqcustcmddata(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesCustCmdQueue >& + inline const ::iot_idl::SFesCustCmdQueue& seqcustcmddata(int index) const; + inline ::iot_idl::SFesCustCmdQueue* mutable_seqcustcmddata(int index); + inline ::iot_idl::SFesCustCmdQueue* add_seqcustcmddata(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesCustCmdQueue >& seqcustcmddata() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesCustCmdQueue >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesCustCmdQueue >* mutable_seqcustcmddata(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesCustCmdRequestPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesCustCmdRequestPkg) private: inline void set_has_strsourcetag(); inline void clear_has_strsourcetag(); @@ -3321,7 +3321,7 @@ class IDL_FILES_EXPORT SFesCustCmdRequestPkg : public ::google::protobuf::Messag ::std::string* strrtuname_; ::google::protobuf::int32 ndevid_; ::google::protobuf::int32 ndatalen_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesCustCmdQueue > seqcustcmddata_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesCustCmdQueue > seqcustcmddata_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); friend void protobuf_ShutdownFile_FesMessage_2eproto(); @@ -3465,16 +3465,16 @@ class IDL_FILES_EXPORT SFesCustCmdReplyPkg : public ::google::protobuf::Message inline ::google::protobuf::int32 ndatalen() const; inline void set_ndatalen(::google::protobuf::int32 value); - // repeated .kbd_idlfile.SFesCustCmdQueue seqCustCmdData = 9; + // repeated .iot_idl.SFesCustCmdQueue seqCustCmdData = 9; inline int seqcustcmddata_size() const; inline void clear_seqcustcmddata(); static const int kSeqCustCmdDataFieldNumber = 9; - inline const ::kbd_idlfile::SFesCustCmdQueue& seqcustcmddata(int index) const; - inline ::kbd_idlfile::SFesCustCmdQueue* mutable_seqcustcmddata(int index); - inline ::kbd_idlfile::SFesCustCmdQueue* add_seqcustcmddata(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesCustCmdQueue >& + inline const ::iot_idl::SFesCustCmdQueue& seqcustcmddata(int index) const; + inline ::iot_idl::SFesCustCmdQueue* mutable_seqcustcmddata(int index); + inline ::iot_idl::SFesCustCmdQueue* add_seqcustcmddata(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesCustCmdQueue >& seqcustcmddata() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesCustCmdQueue >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesCustCmdQueue >* mutable_seqcustcmddata(); // required int32 nResult = 10; @@ -3496,7 +3496,7 @@ class IDL_FILES_EXPORT SFesCustCmdReplyPkg : public ::google::protobuf::Message inline ::std::string* release_strretresult(); inline void set_allocated_strretresult(::std::string* strretresult); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesCustCmdReplyPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesCustCmdReplyPkg) private: inline void set_has_strsourcetag(); inline void clear_has_strsourcetag(); @@ -3530,7 +3530,7 @@ class IDL_FILES_EXPORT SFesCustCmdReplyPkg : public ::google::protobuf::Message ::std::string* strrtuname_; ::google::protobuf::int32 ndevid_; ::google::protobuf::int32 nstatus_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesCustCmdQueue > seqcustcmddata_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesCustCmdQueue > seqcustcmddata_; ::google::protobuf::int32 ndatalen_; ::google::protobuf::int32 nresult_; ::std::string* strretresult_; @@ -3622,7 +3622,7 @@ class IDL_FILES_EXPORT SConstSetQueue : public ::google::protobuf::Message { inline ::google::protobuf::int32 nvalue() const; inline void set_nvalue(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SConstSetQueue) + // @@protoc_insertion_point(class_scope:iot_idl.SConstSetQueue) private: inline void set_has_strtagname(); inline void clear_has_strtagname(); @@ -3721,19 +3721,19 @@ class IDL_FILES_EXPORT SFesConstSetRequestPkg : public ::google::protobuf::Messa inline ::google::protobuf::int32 nnum() const; inline void set_nnum(::google::protobuf::int32 value); - // repeated .kbd_idlfile.SConstSetQueue seqValue = 4; + // repeated .iot_idl.SConstSetQueue seqValue = 4; inline int seqvalue_size() const; inline void clear_seqvalue(); static const int kSeqValueFieldNumber = 4; - inline const ::kbd_idlfile::SConstSetQueue& seqvalue(int index) const; - inline ::kbd_idlfile::SConstSetQueue* mutable_seqvalue(int index); - inline ::kbd_idlfile::SConstSetQueue* add_seqvalue(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SConstSetQueue >& + inline const ::iot_idl::SConstSetQueue& seqvalue(int index) const; + inline ::iot_idl::SConstSetQueue* mutable_seqvalue(int index); + inline ::iot_idl::SConstSetQueue* add_seqvalue(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SConstSetQueue >& seqvalue() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SConstSetQueue >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SConstSetQueue >* mutable_seqvalue(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesConstSetRequestPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesConstSetRequestPkg) private: inline void set_has_nrtuno(); inline void clear_has_nrtuno(); @@ -3748,7 +3748,7 @@ class IDL_FILES_EXPORT SFesConstSetRequestPkg : public ::google::protobuf::Messa mutable int _cached_size_; ::google::protobuf::int32 nrtuno_; ::google::protobuf::int32 ndevid_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SConstSetQueue > seqvalue_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SConstSetQueue > seqvalue_; ::google::protobuf::int32 nnum_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); @@ -3833,16 +3833,16 @@ class IDL_FILES_EXPORT SFesConstReadReplyPkg : public ::google::protobuf::Messag inline ::google::protobuf::int32 nretstatus() const; inline void set_nretstatus(::google::protobuf::int32 value); - // repeated .kbd_idlfile.SConstSetQueue seqValue = 4; + // repeated .iot_idl.SConstSetQueue seqValue = 4; inline int seqvalue_size() const; inline void clear_seqvalue(); static const int kSeqValueFieldNumber = 4; - inline const ::kbd_idlfile::SConstSetQueue& seqvalue(int index) const; - inline ::kbd_idlfile::SConstSetQueue* mutable_seqvalue(int index); - inline ::kbd_idlfile::SConstSetQueue* add_seqvalue(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SConstSetQueue >& + inline const ::iot_idl::SConstSetQueue& seqvalue(int index) const; + inline ::iot_idl::SConstSetQueue* mutable_seqvalue(int index); + inline ::iot_idl::SConstSetQueue* add_seqvalue(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SConstSetQueue >& seqvalue() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SConstSetQueue >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SConstSetQueue >* mutable_seqvalue(); // optional string strRetResult = 5; @@ -3857,7 +3857,7 @@ class IDL_FILES_EXPORT SFesConstReadReplyPkg : public ::google::protobuf::Messag inline ::std::string* release_strretresult(); inline void set_allocated_strretresult(::std::string* strretresult); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesConstReadReplyPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesConstReadReplyPkg) private: inline void set_has_nrtuno(); inline void clear_has_nrtuno(); @@ -3874,7 +3874,7 @@ class IDL_FILES_EXPORT SFesConstReadReplyPkg : public ::google::protobuf::Messag mutable int _cached_size_; ::google::protobuf::int32 nrtuno_; ::google::protobuf::int32 ndevid_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SConstSetQueue > seqvalue_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SConstSetQueue > seqvalue_; ::std::string* strretresult_; ::google::protobuf::int32 nretstatus_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); @@ -3967,7 +3967,7 @@ class IDL_FILES_EXPORT SFesChanStatusInfo : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesChanStatusInfo) + // @@protoc_insertion_point(class_scope:iot_idl.SFesChanStatusInfo) private: inline void set_has_nchanno(); inline void clear_has_nchanno(); @@ -4048,28 +4048,28 @@ class IDL_FILES_EXPORT SFesChanStatusPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); - // repeated .kbd_idlfile.SFesChanStatusInfo stChanStatus = 2; + // repeated .iot_idl.SFesChanStatusInfo stChanStatus = 2; inline int stchanstatus_size() const; inline void clear_stchanstatus(); static const int kStChanStatusFieldNumber = 2; - inline const ::kbd_idlfile::SFesChanStatusInfo& stchanstatus(int index) const; - inline ::kbd_idlfile::SFesChanStatusInfo* mutable_stchanstatus(int index); - inline ::kbd_idlfile::SFesChanStatusInfo* add_stchanstatus(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesChanStatusInfo >& + inline const ::iot_idl::SFesChanStatusInfo& stchanstatus(int index) const; + inline ::iot_idl::SFesChanStatusInfo* mutable_stchanstatus(int index); + inline ::iot_idl::SFesChanStatusInfo* add_stchanstatus(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesChanStatusInfo >& stchanstatus() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesChanStatusInfo >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesChanStatusInfo >* mutable_stchanstatus(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesChanStatusPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesChanStatusPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -4078,8 +4078,8 @@ class IDL_FILES_EXPORT SFesChanStatusPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesChanStatusInfo > stchanstatus_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesChanStatusInfo > stchanstatus_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); friend void protobuf_ShutdownFile_FesMessage_2eproto(); @@ -4163,7 +4163,7 @@ class IDL_FILES_EXPORT SFesRTUStatusInfo : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesRTUStatusInfo) + // @@protoc_insertion_point(class_scope:iot_idl.SFesRTUStatusInfo) private: inline void set_has_nrtuno(); inline void clear_has_nrtuno(); @@ -4241,28 +4241,28 @@ class IDL_FILES_EXPORT SFesRTUStatusPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); - // repeated .kbd_idlfile.SFesRTUStatusInfo stRtuStatus = 2; + // repeated .iot_idl.SFesRTUStatusInfo stRtuStatus = 2; inline int strtustatus_size() const; inline void clear_strtustatus(); static const int kStRtuStatusFieldNumber = 2; - inline const ::kbd_idlfile::SFesRTUStatusInfo& strtustatus(int index) const; - inline ::kbd_idlfile::SFesRTUStatusInfo* mutable_strtustatus(int index); - inline ::kbd_idlfile::SFesRTUStatusInfo* add_strtustatus(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesRTUStatusInfo >& + inline const ::iot_idl::SFesRTUStatusInfo& strtustatus(int index) const; + inline ::iot_idl::SFesRTUStatusInfo* mutable_strtustatus(int index); + inline ::iot_idl::SFesRTUStatusInfo* add_strtustatus(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesRTUStatusInfo >& strtustatus() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesRTUStatusInfo >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesRTUStatusInfo >* mutable_strtustatus(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesRTUStatusPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesRTUStatusPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -4271,8 +4271,8 @@ class IDL_FILES_EXPORT SFesRTUStatusPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesRTUStatusInfo > strtustatus_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesRTUStatusInfo > strtustatus_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); friend void protobuf_ShutdownFile_FesMessage_2eproto(); @@ -4404,7 +4404,7 @@ class IDL_FILES_EXPORT SFesSoeEventInfo : public ::google::protobuf::Message { inline ::std::string* release_strfaultdesc(); inline void set_allocated_strfaultdesc(::std::string* strfaultdesc); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesSoeEventInfo) + // @@protoc_insertion_point(class_scope:iot_idl.SFesSoeEventInfo) private: inline void set_has_strapptablename(); inline void clear_has_strapptablename(); @@ -4527,7 +4527,7 @@ class IDL_FILES_EXPORT SFesChanEventInfo : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesChanEventInfo) + // @@protoc_insertion_point(class_scope:iot_idl.SFesChanEventInfo) private: inline void set_has_strchantag(); inline void clear_has_strchantag(); @@ -4641,7 +4641,7 @@ class IDL_FILES_EXPORT SFesRTUEventInfo : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesRTUEventInfo) + // @@protoc_insertion_point(class_scope:iot_idl.SFesRTUEventInfo) private: inline void set_has_strrtutag(); inline void clear_has_strrtutag(); @@ -4722,28 +4722,28 @@ class IDL_FILES_EXPORT SFesSoeEventPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); - // repeated .kbd_idlfile.SFesSoeEventInfo stSoeEvent = 2; + // repeated .iot_idl.SFesSoeEventInfo stSoeEvent = 2; inline int stsoeevent_size() const; inline void clear_stsoeevent(); static const int kStSoeEventFieldNumber = 2; - inline const ::kbd_idlfile::SFesSoeEventInfo& stsoeevent(int index) const; - inline ::kbd_idlfile::SFesSoeEventInfo* mutable_stsoeevent(int index); - inline ::kbd_idlfile::SFesSoeEventInfo* add_stsoeevent(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesSoeEventInfo >& + inline const ::iot_idl::SFesSoeEventInfo& stsoeevent(int index) const; + inline ::iot_idl::SFesSoeEventInfo* mutable_stsoeevent(int index); + inline ::iot_idl::SFesSoeEventInfo* add_stsoeevent(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesSoeEventInfo >& stsoeevent() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesSoeEventInfo >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesSoeEventInfo >* mutable_stsoeevent(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesSoeEventPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesSoeEventPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -4752,8 +4752,8 @@ class IDL_FILES_EXPORT SFesSoeEventPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesSoeEventInfo > stsoeevent_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesSoeEventInfo > stsoeevent_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); friend void protobuf_ShutdownFile_FesMessage_2eproto(); @@ -4816,28 +4816,28 @@ class IDL_FILES_EXPORT SFesChanEventPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); - // repeated .kbd_idlfile.SFesChanEventInfo stChanEvent = 2; + // repeated .iot_idl.SFesChanEventInfo stChanEvent = 2; inline int stchanevent_size() const; inline void clear_stchanevent(); static const int kStChanEventFieldNumber = 2; - inline const ::kbd_idlfile::SFesChanEventInfo& stchanevent(int index) const; - inline ::kbd_idlfile::SFesChanEventInfo* mutable_stchanevent(int index); - inline ::kbd_idlfile::SFesChanEventInfo* add_stchanevent(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesChanEventInfo >& + inline const ::iot_idl::SFesChanEventInfo& stchanevent(int index) const; + inline ::iot_idl::SFesChanEventInfo* mutable_stchanevent(int index); + inline ::iot_idl::SFesChanEventInfo* add_stchanevent(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesChanEventInfo >& stchanevent() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesChanEventInfo >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesChanEventInfo >* mutable_stchanevent(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesChanEventPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesChanEventPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -4846,8 +4846,8 @@ class IDL_FILES_EXPORT SFesChanEventPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesChanEventInfo > stchanevent_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesChanEventInfo > stchanevent_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); friend void protobuf_ShutdownFile_FesMessage_2eproto(); @@ -4910,28 +4910,28 @@ class IDL_FILES_EXPORT SFesRTUEventPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); - // repeated .kbd_idlfile.SFesRTUEventInfo stRtuEvent = 2; + // repeated .iot_idl.SFesRTUEventInfo stRtuEvent = 2; inline int strtuevent_size() const; inline void clear_strtuevent(); static const int kStRtuEventFieldNumber = 2; - inline const ::kbd_idlfile::SFesRTUEventInfo& strtuevent(int index) const; - inline ::kbd_idlfile::SFesRTUEventInfo* mutable_strtuevent(int index); - inline ::kbd_idlfile::SFesRTUEventInfo* add_strtuevent(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesRTUEventInfo >& + inline const ::iot_idl::SFesRTUEventInfo& strtuevent(int index) const; + inline ::iot_idl::SFesRTUEventInfo* mutable_strtuevent(int index); + inline ::iot_idl::SFesRTUEventInfo* add_strtuevent(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesRTUEventInfo >& strtuevent() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesRTUEventInfo >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesRTUEventInfo >* mutable_strtuevent(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesRTUEventPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesRTUEventPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -4940,8 +4940,8 @@ class IDL_FILES_EXPORT SFesRTUEventPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesRTUEventInfo > strtuevent_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesRTUEventInfo > strtuevent_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); friend void protobuf_ShutdownFile_FesMessage_2eproto(); @@ -5032,7 +5032,7 @@ class IDL_FILES_EXPORT SFesAiValue : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesAiValue) + // @@protoc_insertion_point(class_scope:iot_idl.SFesAiValue) private: inline void set_has_npointno(); inline void clear_has_npointno(); @@ -5141,7 +5141,7 @@ class IDL_FILES_EXPORT SFesDiValue : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesDiValue) + // @@protoc_insertion_point(class_scope:iot_idl.SFesDiValue) private: inline void set_has_npointno(); inline void clear_has_npointno(); @@ -5250,7 +5250,7 @@ class IDL_FILES_EXPORT SFesPiValue : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesPiValue) + // @@protoc_insertion_point(class_scope:iot_idl.SFesPiValue) private: inline void set_has_npointno(); inline void clear_has_npointno(); @@ -5359,7 +5359,7 @@ class IDL_FILES_EXPORT SFesMiValue : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesMiValue) + // @@protoc_insertion_point(class_scope:iot_idl.SFesMiValue) private: inline void set_has_npointno(); inline void clear_has_npointno(); @@ -5440,14 +5440,14 @@ class IDL_FILES_EXPORT SFesValueReqPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); // required int32 nRtuNo = 2; inline bool has_nrtuno() const; @@ -5456,7 +5456,7 @@ class IDL_FILES_EXPORT SFesValueReqPkg : public ::google::protobuf::Message { inline ::google::protobuf::int32 nrtuno() const; inline void set_nrtuno(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesValueReqPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesValueReqPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -5467,7 +5467,7 @@ class IDL_FILES_EXPORT SFesValueReqPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; + ::iot_idl::SFesRealPkgHead* sthead_; ::google::protobuf::int32 nrtuno_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); @@ -5531,14 +5531,14 @@ class IDL_FILES_EXPORT SFesAiValueRespPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); // required int32 nRtuNo = 2; inline bool has_nrtuno() const; @@ -5547,19 +5547,19 @@ class IDL_FILES_EXPORT SFesAiValueRespPkg : public ::google::protobuf::Message { inline ::google::protobuf::int32 nrtuno() const; inline void set_nrtuno(::google::protobuf::int32 value); - // repeated .kbd_idlfile.SFesAiValue stAiValue = 3; + // repeated .iot_idl.SFesAiValue stAiValue = 3; inline int staivalue_size() const; inline void clear_staivalue(); static const int kStAiValueFieldNumber = 3; - inline const ::kbd_idlfile::SFesAiValue& staivalue(int index) const; - inline ::kbd_idlfile::SFesAiValue* mutable_staivalue(int index); - inline ::kbd_idlfile::SFesAiValue* add_staivalue(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesAiValue >& + inline const ::iot_idl::SFesAiValue& staivalue(int index) const; + inline ::iot_idl::SFesAiValue* mutable_staivalue(int index); + inline ::iot_idl::SFesAiValue* add_staivalue(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAiValue >& staivalue() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesAiValue >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAiValue >* mutable_staivalue(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesAiValueRespPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesAiValueRespPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -5570,8 +5570,8 @@ class IDL_FILES_EXPORT SFesAiValueRespPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesAiValue > staivalue_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAiValue > staivalue_; ::google::protobuf::int32 nrtuno_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); @@ -5635,14 +5635,14 @@ class IDL_FILES_EXPORT SFesDiValueRespPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); // required int32 nRtuNo = 2; inline bool has_nrtuno() const; @@ -5651,19 +5651,19 @@ class IDL_FILES_EXPORT SFesDiValueRespPkg : public ::google::protobuf::Message { inline ::google::protobuf::int32 nrtuno() const; inline void set_nrtuno(::google::protobuf::int32 value); - // repeated .kbd_idlfile.SFesDiValue stDiValue = 3; + // repeated .iot_idl.SFesDiValue stDiValue = 3; inline int stdivalue_size() const; inline void clear_stdivalue(); static const int kStDiValueFieldNumber = 3; - inline const ::kbd_idlfile::SFesDiValue& stdivalue(int index) const; - inline ::kbd_idlfile::SFesDiValue* mutable_stdivalue(int index); - inline ::kbd_idlfile::SFesDiValue* add_stdivalue(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesDiValue >& + inline const ::iot_idl::SFesDiValue& stdivalue(int index) const; + inline ::iot_idl::SFesDiValue* mutable_stdivalue(int index); + inline ::iot_idl::SFesDiValue* add_stdivalue(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDiValue >& stdivalue() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesDiValue >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDiValue >* mutable_stdivalue(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesDiValueRespPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesDiValueRespPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -5674,8 +5674,8 @@ class IDL_FILES_EXPORT SFesDiValueRespPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesDiValue > stdivalue_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDiValue > stdivalue_; ::google::protobuf::int32 nrtuno_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); @@ -5739,14 +5739,14 @@ class IDL_FILES_EXPORT SFesPiValueRespPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); // required int32 nRtuNo = 2; inline bool has_nrtuno() const; @@ -5755,19 +5755,19 @@ class IDL_FILES_EXPORT SFesPiValueRespPkg : public ::google::protobuf::Message { inline ::google::protobuf::int32 nrtuno() const; inline void set_nrtuno(::google::protobuf::int32 value); - // repeated .kbd_idlfile.SFesPiValue stPiValue = 3; + // repeated .iot_idl.SFesPiValue stPiValue = 3; inline int stpivalue_size() const; inline void clear_stpivalue(); static const int kStPiValueFieldNumber = 3; - inline const ::kbd_idlfile::SFesPiValue& stpivalue(int index) const; - inline ::kbd_idlfile::SFesPiValue* mutable_stpivalue(int index); - inline ::kbd_idlfile::SFesPiValue* add_stpivalue(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesPiValue >& + inline const ::iot_idl::SFesPiValue& stpivalue(int index) const; + inline ::iot_idl::SFesPiValue* mutable_stpivalue(int index); + inline ::iot_idl::SFesPiValue* add_stpivalue(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesPiValue >& stpivalue() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesPiValue >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesPiValue >* mutable_stpivalue(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesPiValueRespPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesPiValueRespPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -5778,8 +5778,8 @@ class IDL_FILES_EXPORT SFesPiValueRespPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesPiValue > stpivalue_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesPiValue > stpivalue_; ::google::protobuf::int32 nrtuno_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); @@ -5843,14 +5843,14 @@ class IDL_FILES_EXPORT SFesMiValueRespPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); // required int32 nRtuNo = 2; inline bool has_nrtuno() const; @@ -5859,19 +5859,19 @@ class IDL_FILES_EXPORT SFesMiValueRespPkg : public ::google::protobuf::Message { inline ::google::protobuf::int32 nrtuno() const; inline void set_nrtuno(::google::protobuf::int32 value); - // repeated .kbd_idlfile.SFesMiValue stMiValue = 3; + // repeated .iot_idl.SFesMiValue stMiValue = 3; inline int stmivalue_size() const; inline void clear_stmivalue(); static const int kStMiValueFieldNumber = 3; - inline const ::kbd_idlfile::SFesMiValue& stmivalue(int index) const; - inline ::kbd_idlfile::SFesMiValue* mutable_stmivalue(int index); - inline ::kbd_idlfile::SFesMiValue* add_stmivalue(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesMiValue >& + inline const ::iot_idl::SFesMiValue& stmivalue(int index) const; + inline ::iot_idl::SFesMiValue* mutable_stmivalue(int index); + inline ::iot_idl::SFesMiValue* add_stmivalue(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMiValue >& stmivalue() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesMiValue >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMiValue >* mutable_stmivalue(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesMiValueRespPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesMiValueRespPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -5882,8 +5882,8 @@ class IDL_FILES_EXPORT SFesMiValueRespPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesMiValue > stmivalue_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMiValue > stmivalue_; ::google::protobuf::int32 nrtuno_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); @@ -5999,7 +5999,7 @@ class IDL_FILES_EXPORT SFesVirtualData : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesVirtualData) + // @@protoc_insertion_point(class_scope:iot_idl.SFesVirtualData) private: inline void set_has_strrtutag(); inline void clear_has_strrtutag(); @@ -6086,28 +6086,28 @@ class IDL_FILES_EXPORT SFesChangeVirtualDataPkg : public ::google::protobuf::Mes // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesRealPkgHead stHead = 1; + // required .iot_idl.SFesRealPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesRealPkgHead& sthead() const; - inline ::kbd_idlfile::SFesRealPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesRealPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead); + inline const ::iot_idl::SFesRealPkgHead& sthead() const; + inline ::iot_idl::SFesRealPkgHead* mutable_sthead(); + inline ::iot_idl::SFesRealPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead); - // repeated .kbd_idlfile.SFesVirtualData stData = 2; + // repeated .iot_idl.SFesVirtualData stData = 2; inline int stdata_size() const; inline void clear_stdata(); static const int kStDataFieldNumber = 2; - inline const ::kbd_idlfile::SFesVirtualData& stdata(int index) const; - inline ::kbd_idlfile::SFesVirtualData* mutable_stdata(int index); - inline ::kbd_idlfile::SFesVirtualData* add_stdata(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesVirtualData >& + inline const ::iot_idl::SFesVirtualData& stdata(int index) const; + inline ::iot_idl::SFesVirtualData* mutable_stdata(int index); + inline ::iot_idl::SFesVirtualData* add_stdata(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesVirtualData >& stdata() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesVirtualData >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesVirtualData >* mutable_stdata(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesChangeVirtualDataPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesChangeVirtualDataPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -6116,8 +6116,8 @@ class IDL_FILES_EXPORT SFesChangeVirtualDataPkg : public ::google::protobuf::Mes ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesRealPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesVirtualData > stdata_; + ::iot_idl::SFesRealPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesVirtualData > stdata_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); friend void protobuf_ShutdownFile_FesMessage_2eproto(); @@ -6149,7 +6149,7 @@ inline void SFesRealPkgHead::clear_strfessource() { clear_has_strfessource(); } inline const ::std::string& SFesRealPkgHead::strfessource() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRealPkgHead.strFesSource) + // @@protoc_insertion_point(field_get:iot_idl.SFesRealPkgHead.strFesSource) return *strfessource_; } inline void SFesRealPkgHead::set_strfessource(const ::std::string& value) { @@ -6158,7 +6158,7 @@ inline void SFesRealPkgHead::set_strfessource(const ::std::string& value) { strfessource_ = new ::std::string; } strfessource_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesRealPkgHead.strFesSource) + // @@protoc_insertion_point(field_set:iot_idl.SFesRealPkgHead.strFesSource) } inline void SFesRealPkgHead::set_strfessource(const char* value) { set_has_strfessource(); @@ -6166,7 +6166,7 @@ inline void SFesRealPkgHead::set_strfessource(const char* value) { strfessource_ = new ::std::string; } strfessource_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesRealPkgHead.strFesSource) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesRealPkgHead.strFesSource) } inline void SFesRealPkgHead::set_strfessource(const char* value, size_t size) { set_has_strfessource(); @@ -6174,14 +6174,14 @@ inline void SFesRealPkgHead::set_strfessource(const char* value, size_t size) { strfessource_ = new ::std::string; } strfessource_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesRealPkgHead.strFesSource) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesRealPkgHead.strFesSource) } inline ::std::string* SFesRealPkgHead::mutable_strfessource() { set_has_strfessource(); if (strfessource_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strfessource_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesRealPkgHead.strFesSource) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesRealPkgHead.strFesSource) return strfessource_; } inline ::std::string* SFesRealPkgHead::release_strfessource() { @@ -6205,7 +6205,7 @@ inline void SFesRealPkgHead::set_allocated_strfessource(::std::string* strfessou clear_has_strfessource(); strfessource_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesRealPkgHead.strFesSource) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesRealPkgHead.strFesSource) } // required int32 nPackageType = 2; @@ -6223,13 +6223,13 @@ inline void SFesRealPkgHead::clear_npackagetype() { clear_has_npackagetype(); } inline ::google::protobuf::int32 SFesRealPkgHead::npackagetype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRealPkgHead.nPackageType) + // @@protoc_insertion_point(field_get:iot_idl.SFesRealPkgHead.nPackageType) return npackagetype_; } inline void SFesRealPkgHead::set_npackagetype(::google::protobuf::int32 value) { set_has_npackagetype(); npackagetype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesRealPkgHead.nPackageType) + // @@protoc_insertion_point(field_set:iot_idl.SFesRealPkgHead.nPackageType) } // required int32 nDataNum = 3; @@ -6247,13 +6247,13 @@ inline void SFesRealPkgHead::clear_ndatanum() { clear_has_ndatanum(); } inline ::google::protobuf::int32 SFesRealPkgHead::ndatanum() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRealPkgHead.nDataNum) + // @@protoc_insertion_point(field_get:iot_idl.SFesRealPkgHead.nDataNum) return ndatanum_; } inline void SFesRealPkgHead::set_ndatanum(::google::protobuf::int32 value) { set_has_ndatanum(); ndatanum_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesRealPkgHead.nDataNum) + // @@protoc_insertion_point(field_set:iot_idl.SFesRealPkgHead.nDataNum) } // required uint64 ulMessageID = 4; @@ -6271,13 +6271,13 @@ inline void SFesRealPkgHead::clear_ulmessageid() { clear_has_ulmessageid(); } inline ::google::protobuf::uint64 SFesRealPkgHead::ulmessageid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRealPkgHead.ulMessageID) + // @@protoc_insertion_point(field_get:iot_idl.SFesRealPkgHead.ulMessageID) return ulmessageid_; } inline void SFesRealPkgHead::set_ulmessageid(::google::protobuf::uint64 value) { set_has_ulmessageid(); ulmessageid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesRealPkgHead.ulMessageID) + // @@protoc_insertion_point(field_set:iot_idl.SFesRealPkgHead.ulMessageID) } // optional int32 nResPara1 = 5; @@ -6295,13 +6295,13 @@ inline void SFesRealPkgHead::clear_nrespara1() { clear_has_nrespara1(); } inline ::google::protobuf::int32 SFesRealPkgHead::nrespara1() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRealPkgHead.nResPara1) + // @@protoc_insertion_point(field_get:iot_idl.SFesRealPkgHead.nResPara1) return nrespara1_; } inline void SFesRealPkgHead::set_nrespara1(::google::protobuf::int32 value) { set_has_nrespara1(); nrespara1_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesRealPkgHead.nResPara1) + // @@protoc_insertion_point(field_set:iot_idl.SFesRealPkgHead.nResPara1) } // optional int32 nResPara2 = 6; @@ -6319,13 +6319,13 @@ inline void SFesRealPkgHead::clear_nrespara2() { clear_has_nrespara2(); } inline ::google::protobuf::int32 SFesRealPkgHead::nrespara2() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRealPkgHead.nResPara2) + // @@protoc_insertion_point(field_get:iot_idl.SFesRealPkgHead.nResPara2) return nrespara2_; } inline void SFesRealPkgHead::set_nrespara2(::google::protobuf::int32 value) { set_has_nrespara2(); nrespara2_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesRealPkgHead.nResPara2) + // @@protoc_insertion_point(field_set:iot_idl.SFesRealPkgHead.nResPara2) } // ------------------------------------------------------------------- @@ -6349,7 +6349,7 @@ inline void SFesAiDataWithTm::clear_strapptablename() { clear_has_strapptablename(); } inline const ::std::string& SFesAiDataWithTm::strapptablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_get:iot_idl.SFesAiDataWithTm.strAppTableName) return *strapptablename_; } inline void SFesAiDataWithTm::set_strapptablename(const ::std::string& value) { @@ -6358,7 +6358,7 @@ inline void SFesAiDataWithTm::set_strapptablename(const ::std::string& value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_set:iot_idl.SFesAiDataWithTm.strAppTableName) } inline void SFesAiDataWithTm::set_strapptablename(const char* value) { set_has_strapptablename(); @@ -6366,7 +6366,7 @@ inline void SFesAiDataWithTm::set_strapptablename(const char* value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesAiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesAiDataWithTm.strAppTableName) } inline void SFesAiDataWithTm::set_strapptablename(const char* value, size_t size) { set_has_strapptablename(); @@ -6374,14 +6374,14 @@ inline void SFesAiDataWithTm::set_strapptablename(const char* value, size_t size strapptablename_ = new ::std::string; } strapptablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesAiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesAiDataWithTm.strAppTableName) } inline ::std::string* SFesAiDataWithTm::mutable_strapptablename() { set_has_strapptablename(); if (strapptablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesAiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesAiDataWithTm.strAppTableName) return strapptablename_; } inline ::std::string* SFesAiDataWithTm::release_strapptablename() { @@ -6405,7 +6405,7 @@ inline void SFesAiDataWithTm::set_allocated_strapptablename(::std::string* strap clear_has_strapptablename(); strapptablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesAiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesAiDataWithTm.strAppTableName) } // required string strAppColumnName = 2; @@ -6425,7 +6425,7 @@ inline void SFesAiDataWithTm::clear_strappcolumnname() { clear_has_strappcolumnname(); } inline const ::std::string& SFesAiDataWithTm::strappcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SFesAiDataWithTm.strAppColumnName) return *strappcolumnname_; } inline void SFesAiDataWithTm::set_strappcolumnname(const ::std::string& value) { @@ -6434,7 +6434,7 @@ inline void SFesAiDataWithTm::set_strappcolumnname(const ::std::string& value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SFesAiDataWithTm.strAppColumnName) } inline void SFesAiDataWithTm::set_strappcolumnname(const char* value) { set_has_strappcolumnname(); @@ -6442,7 +6442,7 @@ inline void SFesAiDataWithTm::set_strappcolumnname(const char* value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesAiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesAiDataWithTm.strAppColumnName) } inline void SFesAiDataWithTm::set_strappcolumnname(const char* value, size_t size) { set_has_strappcolumnname(); @@ -6450,14 +6450,14 @@ inline void SFesAiDataWithTm::set_strappcolumnname(const char* value, size_t siz strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesAiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesAiDataWithTm.strAppColumnName) } inline ::std::string* SFesAiDataWithTm::mutable_strappcolumnname() { set_has_strappcolumnname(); if (strappcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strappcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesAiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesAiDataWithTm.strAppColumnName) return strappcolumnname_; } inline ::std::string* SFesAiDataWithTm::release_strappcolumnname() { @@ -6481,7 +6481,7 @@ inline void SFesAiDataWithTm::set_allocated_strappcolumnname(::std::string* stra clear_has_strappcolumnname(); strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesAiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesAiDataWithTm.strAppColumnName) } // required string strAppTagName = 3; @@ -6501,7 +6501,7 @@ inline void SFesAiDataWithTm::clear_strapptagname() { clear_has_strapptagname(); } inline const ::std::string& SFesAiDataWithTm::strapptagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_get:iot_idl.SFesAiDataWithTm.strAppTagName) return *strapptagname_; } inline void SFesAiDataWithTm::set_strapptagname(const ::std::string& value) { @@ -6510,7 +6510,7 @@ inline void SFesAiDataWithTm::set_strapptagname(const ::std::string& value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_set:iot_idl.SFesAiDataWithTm.strAppTagName) } inline void SFesAiDataWithTm::set_strapptagname(const char* value) { set_has_strapptagname(); @@ -6518,7 +6518,7 @@ inline void SFesAiDataWithTm::set_strapptagname(const char* value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesAiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesAiDataWithTm.strAppTagName) } inline void SFesAiDataWithTm::set_strapptagname(const char* value, size_t size) { set_has_strapptagname(); @@ -6526,14 +6526,14 @@ inline void SFesAiDataWithTm::set_strapptagname(const char* value, size_t size) strapptagname_ = new ::std::string; } strapptagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesAiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesAiDataWithTm.strAppTagName) } inline ::std::string* SFesAiDataWithTm::mutable_strapptagname() { set_has_strapptagname(); if (strapptagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesAiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesAiDataWithTm.strAppTagName) return strapptagname_; } inline ::std::string* SFesAiDataWithTm::release_strapptagname() { @@ -6557,7 +6557,7 @@ inline void SFesAiDataWithTm::set_allocated_strapptagname(::std::string* strappt clear_has_strapptagname(); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesAiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesAiDataWithTm.strAppTagName) } // required uint32 uStatus = 4; @@ -6575,13 +6575,13 @@ inline void SFesAiDataWithTm::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesAiDataWithTm::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiDataWithTm.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesAiDataWithTm.uStatus) return ustatus_; } inline void SFesAiDataWithTm::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAiDataWithTm.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesAiDataWithTm.uStatus) } // required float fValue = 5; @@ -6599,13 +6599,13 @@ inline void SFesAiDataWithTm::clear_fvalue() { clear_has_fvalue(); } inline float SFesAiDataWithTm::fvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiDataWithTm.fValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesAiDataWithTm.fValue) return fvalue_; } inline void SFesAiDataWithTm::set_fvalue(float value) { set_has_fvalue(); fvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAiDataWithTm.fValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesAiDataWithTm.fValue) } // required uint64 ulTime = 6; @@ -6623,13 +6623,13 @@ inline void SFesAiDataWithTm::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesAiDataWithTm::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiDataWithTm.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesAiDataWithTm.ulTime) return ultime_; } inline void SFesAiDataWithTm::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAiDataWithTm.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesAiDataWithTm.ulTime) } // ------------------------------------------------------------------- @@ -6653,7 +6653,7 @@ inline void SFesAiDataWithoutTm::clear_strapptablename() { clear_has_strapptablename(); } inline const ::std::string& SFesAiDataWithoutTm::strapptablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_get:iot_idl.SFesAiDataWithoutTm.strAppTableName) return *strapptablename_; } inline void SFesAiDataWithoutTm::set_strapptablename(const ::std::string& value) { @@ -6662,7 +6662,7 @@ inline void SFesAiDataWithoutTm::set_strapptablename(const ::std::string& value) strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_set:iot_idl.SFesAiDataWithoutTm.strAppTableName) } inline void SFesAiDataWithoutTm::set_strapptablename(const char* value) { set_has_strapptablename(); @@ -6670,7 +6670,7 @@ inline void SFesAiDataWithoutTm::set_strapptablename(const char* value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesAiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesAiDataWithoutTm.strAppTableName) } inline void SFesAiDataWithoutTm::set_strapptablename(const char* value, size_t size) { set_has_strapptablename(); @@ -6678,14 +6678,14 @@ inline void SFesAiDataWithoutTm::set_strapptablename(const char* value, size_t s strapptablename_ = new ::std::string; } strapptablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesAiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesAiDataWithoutTm.strAppTableName) } inline ::std::string* SFesAiDataWithoutTm::mutable_strapptablename() { set_has_strapptablename(); if (strapptablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesAiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesAiDataWithoutTm.strAppTableName) return strapptablename_; } inline ::std::string* SFesAiDataWithoutTm::release_strapptablename() { @@ -6709,7 +6709,7 @@ inline void SFesAiDataWithoutTm::set_allocated_strapptablename(::std::string* st clear_has_strapptablename(); strapptablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesAiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesAiDataWithoutTm.strAppTableName) } // required string strAppColumnName = 2; @@ -6729,7 +6729,7 @@ inline void SFesAiDataWithoutTm::clear_strappcolumnname() { clear_has_strappcolumnname(); } inline const ::std::string& SFesAiDataWithoutTm::strappcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SFesAiDataWithoutTm.strAppColumnName) return *strappcolumnname_; } inline void SFesAiDataWithoutTm::set_strappcolumnname(const ::std::string& value) { @@ -6738,7 +6738,7 @@ inline void SFesAiDataWithoutTm::set_strappcolumnname(const ::std::string& value strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SFesAiDataWithoutTm.strAppColumnName) } inline void SFesAiDataWithoutTm::set_strappcolumnname(const char* value) { set_has_strappcolumnname(); @@ -6746,7 +6746,7 @@ inline void SFesAiDataWithoutTm::set_strappcolumnname(const char* value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesAiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesAiDataWithoutTm.strAppColumnName) } inline void SFesAiDataWithoutTm::set_strappcolumnname(const char* value, size_t size) { set_has_strappcolumnname(); @@ -6754,14 +6754,14 @@ inline void SFesAiDataWithoutTm::set_strappcolumnname(const char* value, size_t strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesAiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesAiDataWithoutTm.strAppColumnName) } inline ::std::string* SFesAiDataWithoutTm::mutable_strappcolumnname() { set_has_strappcolumnname(); if (strappcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strappcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesAiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesAiDataWithoutTm.strAppColumnName) return strappcolumnname_; } inline ::std::string* SFesAiDataWithoutTm::release_strappcolumnname() { @@ -6785,7 +6785,7 @@ inline void SFesAiDataWithoutTm::set_allocated_strappcolumnname(::std::string* s clear_has_strappcolumnname(); strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesAiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesAiDataWithoutTm.strAppColumnName) } // required string strAppTagName = 3; @@ -6805,7 +6805,7 @@ inline void SFesAiDataWithoutTm::clear_strapptagname() { clear_has_strapptagname(); } inline const ::std::string& SFesAiDataWithoutTm::strapptagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_get:iot_idl.SFesAiDataWithoutTm.strAppTagName) return *strapptagname_; } inline void SFesAiDataWithoutTm::set_strapptagname(const ::std::string& value) { @@ -6814,7 +6814,7 @@ inline void SFesAiDataWithoutTm::set_strapptagname(const ::std::string& value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_set:iot_idl.SFesAiDataWithoutTm.strAppTagName) } inline void SFesAiDataWithoutTm::set_strapptagname(const char* value) { set_has_strapptagname(); @@ -6822,7 +6822,7 @@ inline void SFesAiDataWithoutTm::set_strapptagname(const char* value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesAiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesAiDataWithoutTm.strAppTagName) } inline void SFesAiDataWithoutTm::set_strapptagname(const char* value, size_t size) { set_has_strapptagname(); @@ -6830,14 +6830,14 @@ inline void SFesAiDataWithoutTm::set_strapptagname(const char* value, size_t siz strapptagname_ = new ::std::string; } strapptagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesAiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesAiDataWithoutTm.strAppTagName) } inline ::std::string* SFesAiDataWithoutTm::mutable_strapptagname() { set_has_strapptagname(); if (strapptagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesAiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesAiDataWithoutTm.strAppTagName) return strapptagname_; } inline ::std::string* SFesAiDataWithoutTm::release_strapptagname() { @@ -6861,7 +6861,7 @@ inline void SFesAiDataWithoutTm::set_allocated_strapptagname(::std::string* stra clear_has_strapptagname(); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesAiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesAiDataWithoutTm.strAppTagName) } // required uint32 uStatus = 4; @@ -6879,13 +6879,13 @@ inline void SFesAiDataWithoutTm::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesAiDataWithoutTm::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiDataWithoutTm.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesAiDataWithoutTm.uStatus) return ustatus_; } inline void SFesAiDataWithoutTm::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAiDataWithoutTm.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesAiDataWithoutTm.uStatus) } // required float fValue = 5; @@ -6903,20 +6903,20 @@ inline void SFesAiDataWithoutTm::clear_fvalue() { clear_has_fvalue(); } inline float SFesAiDataWithoutTm::fvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiDataWithoutTm.fValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesAiDataWithoutTm.fValue) return fvalue_; } inline void SFesAiDataWithoutTm::set_fvalue(float value) { set_has_fvalue(); fvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAiDataWithoutTm.fValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesAiDataWithoutTm.fValue) } // ------------------------------------------------------------------- // SFesChangeAiPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesChangeAiPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -6927,26 +6927,26 @@ inline void SFesChangeAiPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesChangeAiPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesChangeAiPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChangeAiPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesChangeAiPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesChangeAiPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesChangeAiPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesChangeAiPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesChangeAiPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesChangeAiPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesChangeAiPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesChangeAiPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesChangeAiPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesChangeAiPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -6954,36 +6954,36 @@ inline void SFesChangeAiPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesChangeAiPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesChangeAiPkg.stHead) } -// repeated .kbd_idlfile.SFesAiDataWithTm stAiData = 2; +// repeated .iot_idl.SFesAiDataWithTm stAiData = 2; inline int SFesChangeAiPkg::staidata_size() const { return staidata_.size(); } inline void SFesChangeAiPkg::clear_staidata() { staidata_.Clear(); } -inline const ::kbd_idlfile::SFesAiDataWithTm& SFesChangeAiPkg::staidata(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChangeAiPkg.stAiData) +inline const ::iot_idl::SFesAiDataWithTm& SFesChangeAiPkg::staidata(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesChangeAiPkg.stAiData) return staidata_.Get(index); } -inline ::kbd_idlfile::SFesAiDataWithTm* SFesChangeAiPkg::mutable_staidata(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesChangeAiPkg.stAiData) +inline ::iot_idl::SFesAiDataWithTm* SFesChangeAiPkg::mutable_staidata(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesChangeAiPkg.stAiData) return staidata_.Mutable(index); } -inline ::kbd_idlfile::SFesAiDataWithTm* SFesChangeAiPkg::add_staidata() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesChangeAiPkg.stAiData) +inline ::iot_idl::SFesAiDataWithTm* SFesChangeAiPkg::add_staidata() { + // @@protoc_insertion_point(field_add:iot_idl.SFesChangeAiPkg.stAiData) return staidata_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesAiDataWithTm >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAiDataWithTm >& SFesChangeAiPkg::staidata() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesChangeAiPkg.stAiData) + // @@protoc_insertion_point(field_list:iot_idl.SFesChangeAiPkg.stAiData) return staidata_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesAiDataWithTm >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAiDataWithTm >* SFesChangeAiPkg::mutable_staidata() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesChangeAiPkg.stAiData) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesChangeAiPkg.stAiData) return &staidata_; } @@ -6991,7 +6991,7 @@ SFesChangeAiPkg::mutable_staidata() { // SFesUpdateAiPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesUpdateAiPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -7002,26 +7002,26 @@ inline void SFesUpdateAiPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesUpdateAiPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesUpdateAiPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesUpdateAiPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesUpdateAiPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesUpdateAiPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesUpdateAiPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesUpdateAiPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesUpdateAiPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesUpdateAiPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesUpdateAiPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesUpdateAiPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesUpdateAiPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesUpdateAiPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -7029,36 +7029,36 @@ inline void SFesUpdateAiPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesUpdateAiPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesUpdateAiPkg.stHead) } -// repeated .kbd_idlfile.SFesAiDataWithoutTm stAiData = 2; +// repeated .iot_idl.SFesAiDataWithoutTm stAiData = 2; inline int SFesUpdateAiPkg::staidata_size() const { return staidata_.size(); } inline void SFesUpdateAiPkg::clear_staidata() { staidata_.Clear(); } -inline const ::kbd_idlfile::SFesAiDataWithoutTm& SFesUpdateAiPkg::staidata(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesUpdateAiPkg.stAiData) +inline const ::iot_idl::SFesAiDataWithoutTm& SFesUpdateAiPkg::staidata(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesUpdateAiPkg.stAiData) return staidata_.Get(index); } -inline ::kbd_idlfile::SFesAiDataWithoutTm* SFesUpdateAiPkg::mutable_staidata(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesUpdateAiPkg.stAiData) +inline ::iot_idl::SFesAiDataWithoutTm* SFesUpdateAiPkg::mutable_staidata(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesUpdateAiPkg.stAiData) return staidata_.Mutable(index); } -inline ::kbd_idlfile::SFesAiDataWithoutTm* SFesUpdateAiPkg::add_staidata() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesUpdateAiPkg.stAiData) +inline ::iot_idl::SFesAiDataWithoutTm* SFesUpdateAiPkg::add_staidata() { + // @@protoc_insertion_point(field_add:iot_idl.SFesUpdateAiPkg.stAiData) return staidata_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesAiDataWithoutTm >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAiDataWithoutTm >& SFesUpdateAiPkg::staidata() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesUpdateAiPkg.stAiData) + // @@protoc_insertion_point(field_list:iot_idl.SFesUpdateAiPkg.stAiData) return staidata_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesAiDataWithoutTm >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAiDataWithoutTm >* SFesUpdateAiPkg::mutable_staidata() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesUpdateAiPkg.stAiData) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesUpdateAiPkg.stAiData) return &staidata_; } @@ -7077,13 +7077,13 @@ inline void SFesUpdateAiPkg::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesUpdateAiPkg::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesUpdateAiPkg.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesUpdateAiPkg.ulTime) return ultime_; } inline void SFesUpdateAiPkg::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesUpdateAiPkg.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesUpdateAiPkg.ulTime) } // ------------------------------------------------------------------- @@ -7107,7 +7107,7 @@ inline void SFesDiDataWithTm::clear_strapptablename() { clear_has_strapptablename(); } inline const ::std::string& SFesDiDataWithTm::strapptablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_get:iot_idl.SFesDiDataWithTm.strAppTableName) return *strapptablename_; } inline void SFesDiDataWithTm::set_strapptablename(const ::std::string& value) { @@ -7116,7 +7116,7 @@ inline void SFesDiDataWithTm::set_strapptablename(const ::std::string& value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_set:iot_idl.SFesDiDataWithTm.strAppTableName) } inline void SFesDiDataWithTm::set_strapptablename(const char* value) { set_has_strapptablename(); @@ -7124,7 +7124,7 @@ inline void SFesDiDataWithTm::set_strapptablename(const char* value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesDiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesDiDataWithTm.strAppTableName) } inline void SFesDiDataWithTm::set_strapptablename(const char* value, size_t size) { set_has_strapptablename(); @@ -7132,14 +7132,14 @@ inline void SFesDiDataWithTm::set_strapptablename(const char* value, size_t size strapptablename_ = new ::std::string; } strapptablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesDiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesDiDataWithTm.strAppTableName) } inline ::std::string* SFesDiDataWithTm::mutable_strapptablename() { set_has_strapptablename(); if (strapptablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesDiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesDiDataWithTm.strAppTableName) return strapptablename_; } inline ::std::string* SFesDiDataWithTm::release_strapptablename() { @@ -7163,7 +7163,7 @@ inline void SFesDiDataWithTm::set_allocated_strapptablename(::std::string* strap clear_has_strapptablename(); strapptablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesDiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesDiDataWithTm.strAppTableName) } // required string strAppColumnName = 2; @@ -7183,7 +7183,7 @@ inline void SFesDiDataWithTm::clear_strappcolumnname() { clear_has_strappcolumnname(); } inline const ::std::string& SFesDiDataWithTm::strappcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SFesDiDataWithTm.strAppColumnName) return *strappcolumnname_; } inline void SFesDiDataWithTm::set_strappcolumnname(const ::std::string& value) { @@ -7192,7 +7192,7 @@ inline void SFesDiDataWithTm::set_strappcolumnname(const ::std::string& value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SFesDiDataWithTm.strAppColumnName) } inline void SFesDiDataWithTm::set_strappcolumnname(const char* value) { set_has_strappcolumnname(); @@ -7200,7 +7200,7 @@ inline void SFesDiDataWithTm::set_strappcolumnname(const char* value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesDiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesDiDataWithTm.strAppColumnName) } inline void SFesDiDataWithTm::set_strappcolumnname(const char* value, size_t size) { set_has_strappcolumnname(); @@ -7208,14 +7208,14 @@ inline void SFesDiDataWithTm::set_strappcolumnname(const char* value, size_t siz strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesDiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesDiDataWithTm.strAppColumnName) } inline ::std::string* SFesDiDataWithTm::mutable_strappcolumnname() { set_has_strappcolumnname(); if (strappcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strappcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesDiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesDiDataWithTm.strAppColumnName) return strappcolumnname_; } inline ::std::string* SFesDiDataWithTm::release_strappcolumnname() { @@ -7239,7 +7239,7 @@ inline void SFesDiDataWithTm::set_allocated_strappcolumnname(::std::string* stra clear_has_strappcolumnname(); strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesDiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesDiDataWithTm.strAppColumnName) } // required string strAppTagName = 3; @@ -7259,7 +7259,7 @@ inline void SFesDiDataWithTm::clear_strapptagname() { clear_has_strapptagname(); } inline const ::std::string& SFesDiDataWithTm::strapptagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_get:iot_idl.SFesDiDataWithTm.strAppTagName) return *strapptagname_; } inline void SFesDiDataWithTm::set_strapptagname(const ::std::string& value) { @@ -7268,7 +7268,7 @@ inline void SFesDiDataWithTm::set_strapptagname(const ::std::string& value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_set:iot_idl.SFesDiDataWithTm.strAppTagName) } inline void SFesDiDataWithTm::set_strapptagname(const char* value) { set_has_strapptagname(); @@ -7276,7 +7276,7 @@ inline void SFesDiDataWithTm::set_strapptagname(const char* value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesDiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesDiDataWithTm.strAppTagName) } inline void SFesDiDataWithTm::set_strapptagname(const char* value, size_t size) { set_has_strapptagname(); @@ -7284,14 +7284,14 @@ inline void SFesDiDataWithTm::set_strapptagname(const char* value, size_t size) strapptagname_ = new ::std::string; } strapptagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesDiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesDiDataWithTm.strAppTagName) } inline ::std::string* SFesDiDataWithTm::mutable_strapptagname() { set_has_strapptagname(); if (strapptagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesDiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesDiDataWithTm.strAppTagName) return strapptagname_; } inline ::std::string* SFesDiDataWithTm::release_strapptagname() { @@ -7315,7 +7315,7 @@ inline void SFesDiDataWithTm::set_allocated_strapptagname(::std::string* strappt clear_has_strapptagname(); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesDiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesDiDataWithTm.strAppTagName) } // required uint32 uStatus = 4; @@ -7333,13 +7333,13 @@ inline void SFesDiDataWithTm::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesDiDataWithTm::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiDataWithTm.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesDiDataWithTm.uStatus) return ustatus_; } inline void SFesDiDataWithTm::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDiDataWithTm.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesDiDataWithTm.uStatus) } // required int32 nValue = 5; @@ -7357,13 +7357,13 @@ inline void SFesDiDataWithTm::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int32 SFesDiDataWithTm::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiDataWithTm.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesDiDataWithTm.nValue) return nvalue_; } inline void SFesDiDataWithTm::set_nvalue(::google::protobuf::int32 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDiDataWithTm.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesDiDataWithTm.nValue) } // required uint64 ulTime = 6; @@ -7381,13 +7381,13 @@ inline void SFesDiDataWithTm::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesDiDataWithTm::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiDataWithTm.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesDiDataWithTm.ulTime) return ultime_; } inline void SFesDiDataWithTm::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDiDataWithTm.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesDiDataWithTm.ulTime) } // ------------------------------------------------------------------- @@ -7411,7 +7411,7 @@ inline void SFesDiDataWithoutTm::clear_strapptablename() { clear_has_strapptablename(); } inline const ::std::string& SFesDiDataWithoutTm::strapptablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_get:iot_idl.SFesDiDataWithoutTm.strAppTableName) return *strapptablename_; } inline void SFesDiDataWithoutTm::set_strapptablename(const ::std::string& value) { @@ -7420,7 +7420,7 @@ inline void SFesDiDataWithoutTm::set_strapptablename(const ::std::string& value) strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_set:iot_idl.SFesDiDataWithoutTm.strAppTableName) } inline void SFesDiDataWithoutTm::set_strapptablename(const char* value) { set_has_strapptablename(); @@ -7428,7 +7428,7 @@ inline void SFesDiDataWithoutTm::set_strapptablename(const char* value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesDiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesDiDataWithoutTm.strAppTableName) } inline void SFesDiDataWithoutTm::set_strapptablename(const char* value, size_t size) { set_has_strapptablename(); @@ -7436,14 +7436,14 @@ inline void SFesDiDataWithoutTm::set_strapptablename(const char* value, size_t s strapptablename_ = new ::std::string; } strapptablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesDiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesDiDataWithoutTm.strAppTableName) } inline ::std::string* SFesDiDataWithoutTm::mutable_strapptablename() { set_has_strapptablename(); if (strapptablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesDiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesDiDataWithoutTm.strAppTableName) return strapptablename_; } inline ::std::string* SFesDiDataWithoutTm::release_strapptablename() { @@ -7467,7 +7467,7 @@ inline void SFesDiDataWithoutTm::set_allocated_strapptablename(::std::string* st clear_has_strapptablename(); strapptablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesDiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesDiDataWithoutTm.strAppTableName) } // required string strAppColumnName = 2; @@ -7487,7 +7487,7 @@ inline void SFesDiDataWithoutTm::clear_strappcolumnname() { clear_has_strappcolumnname(); } inline const ::std::string& SFesDiDataWithoutTm::strappcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SFesDiDataWithoutTm.strAppColumnName) return *strappcolumnname_; } inline void SFesDiDataWithoutTm::set_strappcolumnname(const ::std::string& value) { @@ -7496,7 +7496,7 @@ inline void SFesDiDataWithoutTm::set_strappcolumnname(const ::std::string& value strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SFesDiDataWithoutTm.strAppColumnName) } inline void SFesDiDataWithoutTm::set_strappcolumnname(const char* value) { set_has_strappcolumnname(); @@ -7504,7 +7504,7 @@ inline void SFesDiDataWithoutTm::set_strappcolumnname(const char* value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesDiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesDiDataWithoutTm.strAppColumnName) } inline void SFesDiDataWithoutTm::set_strappcolumnname(const char* value, size_t size) { set_has_strappcolumnname(); @@ -7512,14 +7512,14 @@ inline void SFesDiDataWithoutTm::set_strappcolumnname(const char* value, size_t strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesDiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesDiDataWithoutTm.strAppColumnName) } inline ::std::string* SFesDiDataWithoutTm::mutable_strappcolumnname() { set_has_strappcolumnname(); if (strappcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strappcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesDiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesDiDataWithoutTm.strAppColumnName) return strappcolumnname_; } inline ::std::string* SFesDiDataWithoutTm::release_strappcolumnname() { @@ -7543,7 +7543,7 @@ inline void SFesDiDataWithoutTm::set_allocated_strappcolumnname(::std::string* s clear_has_strappcolumnname(); strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesDiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesDiDataWithoutTm.strAppColumnName) } // required string strAppTagName = 3; @@ -7563,7 +7563,7 @@ inline void SFesDiDataWithoutTm::clear_strapptagname() { clear_has_strapptagname(); } inline const ::std::string& SFesDiDataWithoutTm::strapptagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_get:iot_idl.SFesDiDataWithoutTm.strAppTagName) return *strapptagname_; } inline void SFesDiDataWithoutTm::set_strapptagname(const ::std::string& value) { @@ -7572,7 +7572,7 @@ inline void SFesDiDataWithoutTm::set_strapptagname(const ::std::string& value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_set:iot_idl.SFesDiDataWithoutTm.strAppTagName) } inline void SFesDiDataWithoutTm::set_strapptagname(const char* value) { set_has_strapptagname(); @@ -7580,7 +7580,7 @@ inline void SFesDiDataWithoutTm::set_strapptagname(const char* value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesDiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesDiDataWithoutTm.strAppTagName) } inline void SFesDiDataWithoutTm::set_strapptagname(const char* value, size_t size) { set_has_strapptagname(); @@ -7588,14 +7588,14 @@ inline void SFesDiDataWithoutTm::set_strapptagname(const char* value, size_t siz strapptagname_ = new ::std::string; } strapptagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesDiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesDiDataWithoutTm.strAppTagName) } inline ::std::string* SFesDiDataWithoutTm::mutable_strapptagname() { set_has_strapptagname(); if (strapptagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesDiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesDiDataWithoutTm.strAppTagName) return strapptagname_; } inline ::std::string* SFesDiDataWithoutTm::release_strapptagname() { @@ -7619,7 +7619,7 @@ inline void SFesDiDataWithoutTm::set_allocated_strapptagname(::std::string* stra clear_has_strapptagname(); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesDiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesDiDataWithoutTm.strAppTagName) } // required uint32 uStatus = 4; @@ -7637,13 +7637,13 @@ inline void SFesDiDataWithoutTm::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesDiDataWithoutTm::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiDataWithoutTm.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesDiDataWithoutTm.uStatus) return ustatus_; } inline void SFesDiDataWithoutTm::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDiDataWithoutTm.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesDiDataWithoutTm.uStatus) } // required int32 nValue = 5; @@ -7661,20 +7661,20 @@ inline void SFesDiDataWithoutTm::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int32 SFesDiDataWithoutTm::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiDataWithoutTm.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesDiDataWithoutTm.nValue) return nvalue_; } inline void SFesDiDataWithoutTm::set_nvalue(::google::protobuf::int32 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDiDataWithoutTm.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesDiDataWithoutTm.nValue) } // ------------------------------------------------------------------- // SFesChangeDiPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesChangeDiPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -7685,26 +7685,26 @@ inline void SFesChangeDiPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesChangeDiPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesChangeDiPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChangeDiPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesChangeDiPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesChangeDiPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesChangeDiPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesChangeDiPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesChangeDiPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesChangeDiPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesChangeDiPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesChangeDiPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesChangeDiPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesChangeDiPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -7712,36 +7712,36 @@ inline void SFesChangeDiPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesChangeDiPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesChangeDiPkg.stHead) } -// repeated .kbd_idlfile.SFesDiDataWithTm stDiData = 2; +// repeated .iot_idl.SFesDiDataWithTm stDiData = 2; inline int SFesChangeDiPkg::stdidata_size() const { return stdidata_.size(); } inline void SFesChangeDiPkg::clear_stdidata() { stdidata_.Clear(); } -inline const ::kbd_idlfile::SFesDiDataWithTm& SFesChangeDiPkg::stdidata(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChangeDiPkg.stDiData) +inline const ::iot_idl::SFesDiDataWithTm& SFesChangeDiPkg::stdidata(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesChangeDiPkg.stDiData) return stdidata_.Get(index); } -inline ::kbd_idlfile::SFesDiDataWithTm* SFesChangeDiPkg::mutable_stdidata(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesChangeDiPkg.stDiData) +inline ::iot_idl::SFesDiDataWithTm* SFesChangeDiPkg::mutable_stdidata(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesChangeDiPkg.stDiData) return stdidata_.Mutable(index); } -inline ::kbd_idlfile::SFesDiDataWithTm* SFesChangeDiPkg::add_stdidata() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesChangeDiPkg.stDiData) +inline ::iot_idl::SFesDiDataWithTm* SFesChangeDiPkg::add_stdidata() { + // @@protoc_insertion_point(field_add:iot_idl.SFesChangeDiPkg.stDiData) return stdidata_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesDiDataWithTm >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDiDataWithTm >& SFesChangeDiPkg::stdidata() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesChangeDiPkg.stDiData) + // @@protoc_insertion_point(field_list:iot_idl.SFesChangeDiPkg.stDiData) return stdidata_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesDiDataWithTm >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDiDataWithTm >* SFesChangeDiPkg::mutable_stdidata() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesChangeDiPkg.stDiData) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesChangeDiPkg.stDiData) return &stdidata_; } @@ -7749,7 +7749,7 @@ SFesChangeDiPkg::mutable_stdidata() { // SFesUpdateDiPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesUpdateDiPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -7760,26 +7760,26 @@ inline void SFesUpdateDiPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesUpdateDiPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesUpdateDiPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesUpdateDiPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesUpdateDiPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesUpdateDiPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesUpdateDiPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesUpdateDiPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesUpdateDiPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesUpdateDiPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesUpdateDiPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesUpdateDiPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesUpdateDiPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesUpdateDiPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -7787,36 +7787,36 @@ inline void SFesUpdateDiPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesUpdateDiPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesUpdateDiPkg.stHead) } -// repeated .kbd_idlfile.SFesDiDataWithoutTm stDiData = 2; +// repeated .iot_idl.SFesDiDataWithoutTm stDiData = 2; inline int SFesUpdateDiPkg::stdidata_size() const { return stdidata_.size(); } inline void SFesUpdateDiPkg::clear_stdidata() { stdidata_.Clear(); } -inline const ::kbd_idlfile::SFesDiDataWithoutTm& SFesUpdateDiPkg::stdidata(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesUpdateDiPkg.stDiData) +inline const ::iot_idl::SFesDiDataWithoutTm& SFesUpdateDiPkg::stdidata(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesUpdateDiPkg.stDiData) return stdidata_.Get(index); } -inline ::kbd_idlfile::SFesDiDataWithoutTm* SFesUpdateDiPkg::mutable_stdidata(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesUpdateDiPkg.stDiData) +inline ::iot_idl::SFesDiDataWithoutTm* SFesUpdateDiPkg::mutable_stdidata(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesUpdateDiPkg.stDiData) return stdidata_.Mutable(index); } -inline ::kbd_idlfile::SFesDiDataWithoutTm* SFesUpdateDiPkg::add_stdidata() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesUpdateDiPkg.stDiData) +inline ::iot_idl::SFesDiDataWithoutTm* SFesUpdateDiPkg::add_stdidata() { + // @@protoc_insertion_point(field_add:iot_idl.SFesUpdateDiPkg.stDiData) return stdidata_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesDiDataWithoutTm >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDiDataWithoutTm >& SFesUpdateDiPkg::stdidata() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesUpdateDiPkg.stDiData) + // @@protoc_insertion_point(field_list:iot_idl.SFesUpdateDiPkg.stDiData) return stdidata_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesDiDataWithoutTm >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDiDataWithoutTm >* SFesUpdateDiPkg::mutable_stdidata() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesUpdateDiPkg.stDiData) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesUpdateDiPkg.stDiData) return &stdidata_; } @@ -7835,13 +7835,13 @@ inline void SFesUpdateDiPkg::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesUpdateDiPkg::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesUpdateDiPkg.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesUpdateDiPkg.ulTime) return ultime_; } inline void SFesUpdateDiPkg::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesUpdateDiPkg.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesUpdateDiPkg.ulTime) } // ------------------------------------------------------------------- @@ -7865,7 +7865,7 @@ inline void SFesPiDataWithTm::clear_strapptablename() { clear_has_strapptablename(); } inline const ::std::string& SFesPiDataWithTm::strapptablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_get:iot_idl.SFesPiDataWithTm.strAppTableName) return *strapptablename_; } inline void SFesPiDataWithTm::set_strapptablename(const ::std::string& value) { @@ -7874,7 +7874,7 @@ inline void SFesPiDataWithTm::set_strapptablename(const ::std::string& value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesPiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithTm.strAppTableName) } inline void SFesPiDataWithTm::set_strapptablename(const char* value) { set_has_strapptablename(); @@ -7882,7 +7882,7 @@ inline void SFesPiDataWithTm::set_strapptablename(const char* value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesPiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesPiDataWithTm.strAppTableName) } inline void SFesPiDataWithTm::set_strapptablename(const char* value, size_t size) { set_has_strapptablename(); @@ -7890,14 +7890,14 @@ inline void SFesPiDataWithTm::set_strapptablename(const char* value, size_t size strapptablename_ = new ::std::string; } strapptablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesPiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesPiDataWithTm.strAppTableName) } inline ::std::string* SFesPiDataWithTm::mutable_strapptablename() { set_has_strapptablename(); if (strapptablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesPiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesPiDataWithTm.strAppTableName) return strapptablename_; } inline ::std::string* SFesPiDataWithTm::release_strapptablename() { @@ -7921,7 +7921,7 @@ inline void SFesPiDataWithTm::set_allocated_strapptablename(::std::string* strap clear_has_strapptablename(); strapptablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesPiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesPiDataWithTm.strAppTableName) } // required string strAppColumnName = 2; @@ -7941,7 +7941,7 @@ inline void SFesPiDataWithTm::clear_strappcolumnname() { clear_has_strappcolumnname(); } inline const ::std::string& SFesPiDataWithTm::strappcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SFesPiDataWithTm.strAppColumnName) return *strappcolumnname_; } inline void SFesPiDataWithTm::set_strappcolumnname(const ::std::string& value) { @@ -7950,7 +7950,7 @@ inline void SFesPiDataWithTm::set_strappcolumnname(const ::std::string& value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesPiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithTm.strAppColumnName) } inline void SFesPiDataWithTm::set_strappcolumnname(const char* value) { set_has_strappcolumnname(); @@ -7958,7 +7958,7 @@ inline void SFesPiDataWithTm::set_strappcolumnname(const char* value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesPiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesPiDataWithTm.strAppColumnName) } inline void SFesPiDataWithTm::set_strappcolumnname(const char* value, size_t size) { set_has_strappcolumnname(); @@ -7966,14 +7966,14 @@ inline void SFesPiDataWithTm::set_strappcolumnname(const char* value, size_t siz strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesPiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesPiDataWithTm.strAppColumnName) } inline ::std::string* SFesPiDataWithTm::mutable_strappcolumnname() { set_has_strappcolumnname(); if (strappcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strappcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesPiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesPiDataWithTm.strAppColumnName) return strappcolumnname_; } inline ::std::string* SFesPiDataWithTm::release_strappcolumnname() { @@ -7997,7 +7997,7 @@ inline void SFesPiDataWithTm::set_allocated_strappcolumnname(::std::string* stra clear_has_strappcolumnname(); strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesPiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesPiDataWithTm.strAppColumnName) } // required string strAppTagName = 3; @@ -8017,7 +8017,7 @@ inline void SFesPiDataWithTm::clear_strapptagname() { clear_has_strapptagname(); } inline const ::std::string& SFesPiDataWithTm::strapptagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_get:iot_idl.SFesPiDataWithTm.strAppTagName) return *strapptagname_; } inline void SFesPiDataWithTm::set_strapptagname(const ::std::string& value) { @@ -8026,7 +8026,7 @@ inline void SFesPiDataWithTm::set_strapptagname(const ::std::string& value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesPiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithTm.strAppTagName) } inline void SFesPiDataWithTm::set_strapptagname(const char* value) { set_has_strapptagname(); @@ -8034,7 +8034,7 @@ inline void SFesPiDataWithTm::set_strapptagname(const char* value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesPiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesPiDataWithTm.strAppTagName) } inline void SFesPiDataWithTm::set_strapptagname(const char* value, size_t size) { set_has_strapptagname(); @@ -8042,14 +8042,14 @@ inline void SFesPiDataWithTm::set_strapptagname(const char* value, size_t size) strapptagname_ = new ::std::string; } strapptagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesPiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesPiDataWithTm.strAppTagName) } inline ::std::string* SFesPiDataWithTm::mutable_strapptagname() { set_has_strapptagname(); if (strapptagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesPiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesPiDataWithTm.strAppTagName) return strapptagname_; } inline ::std::string* SFesPiDataWithTm::release_strapptagname() { @@ -8073,7 +8073,7 @@ inline void SFesPiDataWithTm::set_allocated_strapptagname(::std::string* strappt clear_has_strapptagname(); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesPiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesPiDataWithTm.strAppTagName) } // required uint32 uStatus = 4; @@ -8091,13 +8091,13 @@ inline void SFesPiDataWithTm::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesPiDataWithTm::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiDataWithTm.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesPiDataWithTm.uStatus) return ustatus_; } inline void SFesPiDataWithTm::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesPiDataWithTm.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithTm.uStatus) } // required int64 nValue = 5; @@ -8115,13 +8115,13 @@ inline void SFesPiDataWithTm::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int64 SFesPiDataWithTm::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiDataWithTm.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesPiDataWithTm.nValue) return nvalue_; } inline void SFesPiDataWithTm::set_nvalue(::google::protobuf::int64 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesPiDataWithTm.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithTm.nValue) } // required uint64 ulTime = 6; @@ -8139,13 +8139,13 @@ inline void SFesPiDataWithTm::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesPiDataWithTm::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiDataWithTm.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesPiDataWithTm.ulTime) return ultime_; } inline void SFesPiDataWithTm::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesPiDataWithTm.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithTm.ulTime) } // ------------------------------------------------------------------- @@ -8169,7 +8169,7 @@ inline void SFesPiDataWithoutTm::clear_strapptablename() { clear_has_strapptablename(); } inline const ::std::string& SFesPiDataWithoutTm::strapptablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_get:iot_idl.SFesPiDataWithoutTm.strAppTableName) return *strapptablename_; } inline void SFesPiDataWithoutTm::set_strapptablename(const ::std::string& value) { @@ -8178,7 +8178,7 @@ inline void SFesPiDataWithoutTm::set_strapptablename(const ::std::string& value) strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesPiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithoutTm.strAppTableName) } inline void SFesPiDataWithoutTm::set_strapptablename(const char* value) { set_has_strapptablename(); @@ -8186,7 +8186,7 @@ inline void SFesPiDataWithoutTm::set_strapptablename(const char* value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesPiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesPiDataWithoutTm.strAppTableName) } inline void SFesPiDataWithoutTm::set_strapptablename(const char* value, size_t size) { set_has_strapptablename(); @@ -8194,14 +8194,14 @@ inline void SFesPiDataWithoutTm::set_strapptablename(const char* value, size_t s strapptablename_ = new ::std::string; } strapptablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesPiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesPiDataWithoutTm.strAppTableName) } inline ::std::string* SFesPiDataWithoutTm::mutable_strapptablename() { set_has_strapptablename(); if (strapptablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesPiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesPiDataWithoutTm.strAppTableName) return strapptablename_; } inline ::std::string* SFesPiDataWithoutTm::release_strapptablename() { @@ -8225,7 +8225,7 @@ inline void SFesPiDataWithoutTm::set_allocated_strapptablename(::std::string* st clear_has_strapptablename(); strapptablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesPiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesPiDataWithoutTm.strAppTableName) } // required string strAppColumnName = 2; @@ -8245,7 +8245,7 @@ inline void SFesPiDataWithoutTm::clear_strappcolumnname() { clear_has_strappcolumnname(); } inline const ::std::string& SFesPiDataWithoutTm::strappcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SFesPiDataWithoutTm.strAppColumnName) return *strappcolumnname_; } inline void SFesPiDataWithoutTm::set_strappcolumnname(const ::std::string& value) { @@ -8254,7 +8254,7 @@ inline void SFesPiDataWithoutTm::set_strappcolumnname(const ::std::string& value strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesPiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithoutTm.strAppColumnName) } inline void SFesPiDataWithoutTm::set_strappcolumnname(const char* value) { set_has_strappcolumnname(); @@ -8262,7 +8262,7 @@ inline void SFesPiDataWithoutTm::set_strappcolumnname(const char* value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesPiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesPiDataWithoutTm.strAppColumnName) } inline void SFesPiDataWithoutTm::set_strappcolumnname(const char* value, size_t size) { set_has_strappcolumnname(); @@ -8270,14 +8270,14 @@ inline void SFesPiDataWithoutTm::set_strappcolumnname(const char* value, size_t strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesPiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesPiDataWithoutTm.strAppColumnName) } inline ::std::string* SFesPiDataWithoutTm::mutable_strappcolumnname() { set_has_strappcolumnname(); if (strappcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strappcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesPiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesPiDataWithoutTm.strAppColumnName) return strappcolumnname_; } inline ::std::string* SFesPiDataWithoutTm::release_strappcolumnname() { @@ -8301,7 +8301,7 @@ inline void SFesPiDataWithoutTm::set_allocated_strappcolumnname(::std::string* s clear_has_strappcolumnname(); strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesPiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesPiDataWithoutTm.strAppColumnName) } // required string strAppTagName = 3; @@ -8321,7 +8321,7 @@ inline void SFesPiDataWithoutTm::clear_strapptagname() { clear_has_strapptagname(); } inline const ::std::string& SFesPiDataWithoutTm::strapptagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_get:iot_idl.SFesPiDataWithoutTm.strAppTagName) return *strapptagname_; } inline void SFesPiDataWithoutTm::set_strapptagname(const ::std::string& value) { @@ -8330,7 +8330,7 @@ inline void SFesPiDataWithoutTm::set_strapptagname(const ::std::string& value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesPiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithoutTm.strAppTagName) } inline void SFesPiDataWithoutTm::set_strapptagname(const char* value) { set_has_strapptagname(); @@ -8338,7 +8338,7 @@ inline void SFesPiDataWithoutTm::set_strapptagname(const char* value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesPiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesPiDataWithoutTm.strAppTagName) } inline void SFesPiDataWithoutTm::set_strapptagname(const char* value, size_t size) { set_has_strapptagname(); @@ -8346,14 +8346,14 @@ inline void SFesPiDataWithoutTm::set_strapptagname(const char* value, size_t siz strapptagname_ = new ::std::string; } strapptagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesPiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesPiDataWithoutTm.strAppTagName) } inline ::std::string* SFesPiDataWithoutTm::mutable_strapptagname() { set_has_strapptagname(); if (strapptagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesPiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesPiDataWithoutTm.strAppTagName) return strapptagname_; } inline ::std::string* SFesPiDataWithoutTm::release_strapptagname() { @@ -8377,7 +8377,7 @@ inline void SFesPiDataWithoutTm::set_allocated_strapptagname(::std::string* stra clear_has_strapptagname(); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesPiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesPiDataWithoutTm.strAppTagName) } // required uint32 uStatus = 4; @@ -8395,13 +8395,13 @@ inline void SFesPiDataWithoutTm::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesPiDataWithoutTm::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiDataWithoutTm.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesPiDataWithoutTm.uStatus) return ustatus_; } inline void SFesPiDataWithoutTm::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesPiDataWithoutTm.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithoutTm.uStatus) } // required int64 nValue = 5; @@ -8419,20 +8419,20 @@ inline void SFesPiDataWithoutTm::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int64 SFesPiDataWithoutTm::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiDataWithoutTm.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesPiDataWithoutTm.nValue) return nvalue_; } inline void SFesPiDataWithoutTm::set_nvalue(::google::protobuf::int64 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesPiDataWithoutTm.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithoutTm.nValue) } // ------------------------------------------------------------------- // SFesChangePiPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesChangePiPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -8443,26 +8443,26 @@ inline void SFesChangePiPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesChangePiPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesChangePiPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChangePiPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesChangePiPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesChangePiPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesChangePiPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesChangePiPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesChangePiPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesChangePiPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesChangePiPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesChangePiPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesChangePiPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesChangePiPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -8470,36 +8470,36 @@ inline void SFesChangePiPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesChangePiPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesChangePiPkg.stHead) } -// repeated .kbd_idlfile.SFesPiDataWithTm stPiData = 2; +// repeated .iot_idl.SFesPiDataWithTm stPiData = 2; inline int SFesChangePiPkg::stpidata_size() const { return stpidata_.size(); } inline void SFesChangePiPkg::clear_stpidata() { stpidata_.Clear(); } -inline const ::kbd_idlfile::SFesPiDataWithTm& SFesChangePiPkg::stpidata(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChangePiPkg.stPiData) +inline const ::iot_idl::SFesPiDataWithTm& SFesChangePiPkg::stpidata(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesChangePiPkg.stPiData) return stpidata_.Get(index); } -inline ::kbd_idlfile::SFesPiDataWithTm* SFesChangePiPkg::mutable_stpidata(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesChangePiPkg.stPiData) +inline ::iot_idl::SFesPiDataWithTm* SFesChangePiPkg::mutable_stpidata(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesChangePiPkg.stPiData) return stpidata_.Mutable(index); } -inline ::kbd_idlfile::SFesPiDataWithTm* SFesChangePiPkg::add_stpidata() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesChangePiPkg.stPiData) +inline ::iot_idl::SFesPiDataWithTm* SFesChangePiPkg::add_stpidata() { + // @@protoc_insertion_point(field_add:iot_idl.SFesChangePiPkg.stPiData) return stpidata_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesPiDataWithTm >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesPiDataWithTm >& SFesChangePiPkg::stpidata() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesChangePiPkg.stPiData) + // @@protoc_insertion_point(field_list:iot_idl.SFesChangePiPkg.stPiData) return stpidata_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesPiDataWithTm >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesPiDataWithTm >* SFesChangePiPkg::mutable_stpidata() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesChangePiPkg.stPiData) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesChangePiPkg.stPiData) return &stpidata_; } @@ -8507,7 +8507,7 @@ SFesChangePiPkg::mutable_stpidata() { // SFesUpdatePiPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesUpdatePiPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -8518,26 +8518,26 @@ inline void SFesUpdatePiPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesUpdatePiPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesUpdatePiPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesUpdatePiPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesUpdatePiPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesUpdatePiPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesUpdatePiPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesUpdatePiPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesUpdatePiPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesUpdatePiPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesUpdatePiPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesUpdatePiPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesUpdatePiPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesUpdatePiPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -8545,36 +8545,36 @@ inline void SFesUpdatePiPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesUpdatePiPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesUpdatePiPkg.stHead) } -// repeated .kbd_idlfile.SFesPiDataWithoutTm stPiData = 2; +// repeated .iot_idl.SFesPiDataWithoutTm stPiData = 2; inline int SFesUpdatePiPkg::stpidata_size() const { return stpidata_.size(); } inline void SFesUpdatePiPkg::clear_stpidata() { stpidata_.Clear(); } -inline const ::kbd_idlfile::SFesPiDataWithoutTm& SFesUpdatePiPkg::stpidata(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesUpdatePiPkg.stPiData) +inline const ::iot_idl::SFesPiDataWithoutTm& SFesUpdatePiPkg::stpidata(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesUpdatePiPkg.stPiData) return stpidata_.Get(index); } -inline ::kbd_idlfile::SFesPiDataWithoutTm* SFesUpdatePiPkg::mutable_stpidata(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesUpdatePiPkg.stPiData) +inline ::iot_idl::SFesPiDataWithoutTm* SFesUpdatePiPkg::mutable_stpidata(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesUpdatePiPkg.stPiData) return stpidata_.Mutable(index); } -inline ::kbd_idlfile::SFesPiDataWithoutTm* SFesUpdatePiPkg::add_stpidata() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesUpdatePiPkg.stPiData) +inline ::iot_idl::SFesPiDataWithoutTm* SFesUpdatePiPkg::add_stpidata() { + // @@protoc_insertion_point(field_add:iot_idl.SFesUpdatePiPkg.stPiData) return stpidata_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesPiDataWithoutTm >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesPiDataWithoutTm >& SFesUpdatePiPkg::stpidata() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesUpdatePiPkg.stPiData) + // @@protoc_insertion_point(field_list:iot_idl.SFesUpdatePiPkg.stPiData) return stpidata_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesPiDataWithoutTm >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesPiDataWithoutTm >* SFesUpdatePiPkg::mutable_stpidata() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesUpdatePiPkg.stPiData) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesUpdatePiPkg.stPiData) return &stpidata_; } @@ -8593,13 +8593,13 @@ inline void SFesUpdatePiPkg::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesUpdatePiPkg::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesUpdatePiPkg.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesUpdatePiPkg.ulTime) return ultime_; } inline void SFesUpdatePiPkg::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesUpdatePiPkg.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesUpdatePiPkg.ulTime) } // ------------------------------------------------------------------- @@ -8623,7 +8623,7 @@ inline void SFesMiDataWithTm::clear_strapptablename() { clear_has_strapptablename(); } inline const ::std::string& SFesMiDataWithTm::strapptablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_get:iot_idl.SFesMiDataWithTm.strAppTableName) return *strapptablename_; } inline void SFesMiDataWithTm::set_strapptablename(const ::std::string& value) { @@ -8632,7 +8632,7 @@ inline void SFesMiDataWithTm::set_strapptablename(const ::std::string& value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_set:iot_idl.SFesMiDataWithTm.strAppTableName) } inline void SFesMiDataWithTm::set_strapptablename(const char* value) { set_has_strapptablename(); @@ -8640,7 +8640,7 @@ inline void SFesMiDataWithTm::set_strapptablename(const char* value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesMiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesMiDataWithTm.strAppTableName) } inline void SFesMiDataWithTm::set_strapptablename(const char* value, size_t size) { set_has_strapptablename(); @@ -8648,14 +8648,14 @@ inline void SFesMiDataWithTm::set_strapptablename(const char* value, size_t size strapptablename_ = new ::std::string; } strapptablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesMiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesMiDataWithTm.strAppTableName) } inline ::std::string* SFesMiDataWithTm::mutable_strapptablename() { set_has_strapptablename(); if (strapptablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesMiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesMiDataWithTm.strAppTableName) return strapptablename_; } inline ::std::string* SFesMiDataWithTm::release_strapptablename() { @@ -8679,7 +8679,7 @@ inline void SFesMiDataWithTm::set_allocated_strapptablename(::std::string* strap clear_has_strapptablename(); strapptablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesMiDataWithTm.strAppTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesMiDataWithTm.strAppTableName) } // required string strAppColumnName = 2; @@ -8699,7 +8699,7 @@ inline void SFesMiDataWithTm::clear_strappcolumnname() { clear_has_strappcolumnname(); } inline const ::std::string& SFesMiDataWithTm::strappcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SFesMiDataWithTm.strAppColumnName) return *strappcolumnname_; } inline void SFesMiDataWithTm::set_strappcolumnname(const ::std::string& value) { @@ -8708,7 +8708,7 @@ inline void SFesMiDataWithTm::set_strappcolumnname(const ::std::string& value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SFesMiDataWithTm.strAppColumnName) } inline void SFesMiDataWithTm::set_strappcolumnname(const char* value) { set_has_strappcolumnname(); @@ -8716,7 +8716,7 @@ inline void SFesMiDataWithTm::set_strappcolumnname(const char* value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesMiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesMiDataWithTm.strAppColumnName) } inline void SFesMiDataWithTm::set_strappcolumnname(const char* value, size_t size) { set_has_strappcolumnname(); @@ -8724,14 +8724,14 @@ inline void SFesMiDataWithTm::set_strappcolumnname(const char* value, size_t siz strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesMiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesMiDataWithTm.strAppColumnName) } inline ::std::string* SFesMiDataWithTm::mutable_strappcolumnname() { set_has_strappcolumnname(); if (strappcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strappcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesMiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesMiDataWithTm.strAppColumnName) return strappcolumnname_; } inline ::std::string* SFesMiDataWithTm::release_strappcolumnname() { @@ -8755,7 +8755,7 @@ inline void SFesMiDataWithTm::set_allocated_strappcolumnname(::std::string* stra clear_has_strappcolumnname(); strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesMiDataWithTm.strAppColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesMiDataWithTm.strAppColumnName) } // required string strAppTagName = 3; @@ -8775,7 +8775,7 @@ inline void SFesMiDataWithTm::clear_strapptagname() { clear_has_strapptagname(); } inline const ::std::string& SFesMiDataWithTm::strapptagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_get:iot_idl.SFesMiDataWithTm.strAppTagName) return *strapptagname_; } inline void SFesMiDataWithTm::set_strapptagname(const ::std::string& value) { @@ -8784,7 +8784,7 @@ inline void SFesMiDataWithTm::set_strapptagname(const ::std::string& value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_set:iot_idl.SFesMiDataWithTm.strAppTagName) } inline void SFesMiDataWithTm::set_strapptagname(const char* value) { set_has_strapptagname(); @@ -8792,7 +8792,7 @@ inline void SFesMiDataWithTm::set_strapptagname(const char* value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesMiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesMiDataWithTm.strAppTagName) } inline void SFesMiDataWithTm::set_strapptagname(const char* value, size_t size) { set_has_strapptagname(); @@ -8800,14 +8800,14 @@ inline void SFesMiDataWithTm::set_strapptagname(const char* value, size_t size) strapptagname_ = new ::std::string; } strapptagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesMiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesMiDataWithTm.strAppTagName) } inline ::std::string* SFesMiDataWithTm::mutable_strapptagname() { set_has_strapptagname(); if (strapptagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesMiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesMiDataWithTm.strAppTagName) return strapptagname_; } inline ::std::string* SFesMiDataWithTm::release_strapptagname() { @@ -8831,7 +8831,7 @@ inline void SFesMiDataWithTm::set_allocated_strapptagname(::std::string* strappt clear_has_strapptagname(); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesMiDataWithTm.strAppTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesMiDataWithTm.strAppTagName) } // required uint32 uStatus = 4; @@ -8849,13 +8849,13 @@ inline void SFesMiDataWithTm::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesMiDataWithTm::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiDataWithTm.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesMiDataWithTm.uStatus) return ustatus_; } inline void SFesMiDataWithTm::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMiDataWithTm.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesMiDataWithTm.uStatus) } // required int32 nValue = 5; @@ -8873,13 +8873,13 @@ inline void SFesMiDataWithTm::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int32 SFesMiDataWithTm::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiDataWithTm.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesMiDataWithTm.nValue) return nvalue_; } inline void SFesMiDataWithTm::set_nvalue(::google::protobuf::int32 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMiDataWithTm.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesMiDataWithTm.nValue) } // required uint64 ulTime = 6; @@ -8897,13 +8897,13 @@ inline void SFesMiDataWithTm::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesMiDataWithTm::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiDataWithTm.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesMiDataWithTm.ulTime) return ultime_; } inline void SFesMiDataWithTm::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMiDataWithTm.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesMiDataWithTm.ulTime) } // ------------------------------------------------------------------- @@ -8927,7 +8927,7 @@ inline void SFesMiDataWithoutTm::clear_strapptablename() { clear_has_strapptablename(); } inline const ::std::string& SFesMiDataWithoutTm::strapptablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_get:iot_idl.SFesMiDataWithoutTm.strAppTableName) return *strapptablename_; } inline void SFesMiDataWithoutTm::set_strapptablename(const ::std::string& value) { @@ -8936,7 +8936,7 @@ inline void SFesMiDataWithoutTm::set_strapptablename(const ::std::string& value) strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_set:iot_idl.SFesMiDataWithoutTm.strAppTableName) } inline void SFesMiDataWithoutTm::set_strapptablename(const char* value) { set_has_strapptablename(); @@ -8944,7 +8944,7 @@ inline void SFesMiDataWithoutTm::set_strapptablename(const char* value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesMiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesMiDataWithoutTm.strAppTableName) } inline void SFesMiDataWithoutTm::set_strapptablename(const char* value, size_t size) { set_has_strapptablename(); @@ -8952,14 +8952,14 @@ inline void SFesMiDataWithoutTm::set_strapptablename(const char* value, size_t s strapptablename_ = new ::std::string; } strapptablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesMiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesMiDataWithoutTm.strAppTableName) } inline ::std::string* SFesMiDataWithoutTm::mutable_strapptablename() { set_has_strapptablename(); if (strapptablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesMiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesMiDataWithoutTm.strAppTableName) return strapptablename_; } inline ::std::string* SFesMiDataWithoutTm::release_strapptablename() { @@ -8983,7 +8983,7 @@ inline void SFesMiDataWithoutTm::set_allocated_strapptablename(::std::string* st clear_has_strapptablename(); strapptablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesMiDataWithoutTm.strAppTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesMiDataWithoutTm.strAppTableName) } // required string strAppColumnName = 2; @@ -9003,7 +9003,7 @@ inline void SFesMiDataWithoutTm::clear_strappcolumnname() { clear_has_strappcolumnname(); } inline const ::std::string& SFesMiDataWithoutTm::strappcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SFesMiDataWithoutTm.strAppColumnName) return *strappcolumnname_; } inline void SFesMiDataWithoutTm::set_strappcolumnname(const ::std::string& value) { @@ -9012,7 +9012,7 @@ inline void SFesMiDataWithoutTm::set_strappcolumnname(const ::std::string& value strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SFesMiDataWithoutTm.strAppColumnName) } inline void SFesMiDataWithoutTm::set_strappcolumnname(const char* value) { set_has_strappcolumnname(); @@ -9020,7 +9020,7 @@ inline void SFesMiDataWithoutTm::set_strappcolumnname(const char* value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesMiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesMiDataWithoutTm.strAppColumnName) } inline void SFesMiDataWithoutTm::set_strappcolumnname(const char* value, size_t size) { set_has_strappcolumnname(); @@ -9028,14 +9028,14 @@ inline void SFesMiDataWithoutTm::set_strappcolumnname(const char* value, size_t strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesMiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesMiDataWithoutTm.strAppColumnName) } inline ::std::string* SFesMiDataWithoutTm::mutable_strappcolumnname() { set_has_strappcolumnname(); if (strappcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strappcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesMiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesMiDataWithoutTm.strAppColumnName) return strappcolumnname_; } inline ::std::string* SFesMiDataWithoutTm::release_strappcolumnname() { @@ -9059,7 +9059,7 @@ inline void SFesMiDataWithoutTm::set_allocated_strappcolumnname(::std::string* s clear_has_strappcolumnname(); strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesMiDataWithoutTm.strAppColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesMiDataWithoutTm.strAppColumnName) } // required string strAppTagName = 3; @@ -9079,7 +9079,7 @@ inline void SFesMiDataWithoutTm::clear_strapptagname() { clear_has_strapptagname(); } inline const ::std::string& SFesMiDataWithoutTm::strapptagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_get:iot_idl.SFesMiDataWithoutTm.strAppTagName) return *strapptagname_; } inline void SFesMiDataWithoutTm::set_strapptagname(const ::std::string& value) { @@ -9088,7 +9088,7 @@ inline void SFesMiDataWithoutTm::set_strapptagname(const ::std::string& value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_set:iot_idl.SFesMiDataWithoutTm.strAppTagName) } inline void SFesMiDataWithoutTm::set_strapptagname(const char* value) { set_has_strapptagname(); @@ -9096,7 +9096,7 @@ inline void SFesMiDataWithoutTm::set_strapptagname(const char* value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesMiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesMiDataWithoutTm.strAppTagName) } inline void SFesMiDataWithoutTm::set_strapptagname(const char* value, size_t size) { set_has_strapptagname(); @@ -9104,14 +9104,14 @@ inline void SFesMiDataWithoutTm::set_strapptagname(const char* value, size_t siz strapptagname_ = new ::std::string; } strapptagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesMiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesMiDataWithoutTm.strAppTagName) } inline ::std::string* SFesMiDataWithoutTm::mutable_strapptagname() { set_has_strapptagname(); if (strapptagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesMiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesMiDataWithoutTm.strAppTagName) return strapptagname_; } inline ::std::string* SFesMiDataWithoutTm::release_strapptagname() { @@ -9135,7 +9135,7 @@ inline void SFesMiDataWithoutTm::set_allocated_strapptagname(::std::string* stra clear_has_strapptagname(); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesMiDataWithoutTm.strAppTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesMiDataWithoutTm.strAppTagName) } // required uint32 uStatus = 4; @@ -9153,13 +9153,13 @@ inline void SFesMiDataWithoutTm::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesMiDataWithoutTm::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiDataWithoutTm.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesMiDataWithoutTm.uStatus) return ustatus_; } inline void SFesMiDataWithoutTm::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMiDataWithoutTm.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesMiDataWithoutTm.uStatus) } // required int32 nValue = 5; @@ -9177,20 +9177,20 @@ inline void SFesMiDataWithoutTm::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int32 SFesMiDataWithoutTm::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiDataWithoutTm.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesMiDataWithoutTm.nValue) return nvalue_; } inline void SFesMiDataWithoutTm::set_nvalue(::google::protobuf::int32 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMiDataWithoutTm.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesMiDataWithoutTm.nValue) } // ------------------------------------------------------------------- // SFesChangeMiPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesChangeMiPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -9201,26 +9201,26 @@ inline void SFesChangeMiPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesChangeMiPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesChangeMiPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChangeMiPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesChangeMiPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesChangeMiPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesChangeMiPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesChangeMiPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesChangeMiPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesChangeMiPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesChangeMiPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesChangeMiPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesChangeMiPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesChangeMiPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -9228,36 +9228,36 @@ inline void SFesChangeMiPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesChangeMiPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesChangeMiPkg.stHead) } -// repeated .kbd_idlfile.SFesMiDataWithTm stMiData = 2; +// repeated .iot_idl.SFesMiDataWithTm stMiData = 2; inline int SFesChangeMiPkg::stmidata_size() const { return stmidata_.size(); } inline void SFesChangeMiPkg::clear_stmidata() { stmidata_.Clear(); } -inline const ::kbd_idlfile::SFesMiDataWithTm& SFesChangeMiPkg::stmidata(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChangeMiPkg.stMiData) +inline const ::iot_idl::SFesMiDataWithTm& SFesChangeMiPkg::stmidata(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesChangeMiPkg.stMiData) return stmidata_.Get(index); } -inline ::kbd_idlfile::SFesMiDataWithTm* SFesChangeMiPkg::mutable_stmidata(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesChangeMiPkg.stMiData) +inline ::iot_idl::SFesMiDataWithTm* SFesChangeMiPkg::mutable_stmidata(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesChangeMiPkg.stMiData) return stmidata_.Mutable(index); } -inline ::kbd_idlfile::SFesMiDataWithTm* SFesChangeMiPkg::add_stmidata() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesChangeMiPkg.stMiData) +inline ::iot_idl::SFesMiDataWithTm* SFesChangeMiPkg::add_stmidata() { + // @@protoc_insertion_point(field_add:iot_idl.SFesChangeMiPkg.stMiData) return stmidata_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesMiDataWithTm >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMiDataWithTm >& SFesChangeMiPkg::stmidata() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesChangeMiPkg.stMiData) + // @@protoc_insertion_point(field_list:iot_idl.SFesChangeMiPkg.stMiData) return stmidata_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesMiDataWithTm >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMiDataWithTm >* SFesChangeMiPkg::mutable_stmidata() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesChangeMiPkg.stMiData) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesChangeMiPkg.stMiData) return &stmidata_; } @@ -9265,7 +9265,7 @@ SFesChangeMiPkg::mutable_stmidata() { // SFesUpdateMiPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesUpdateMiPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -9276,26 +9276,26 @@ inline void SFesUpdateMiPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesUpdateMiPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesUpdateMiPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesUpdateMiPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesUpdateMiPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesUpdateMiPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesUpdateMiPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesUpdateMiPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesUpdateMiPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesUpdateMiPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesUpdateMiPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesUpdateMiPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesUpdateMiPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesUpdateMiPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -9303,36 +9303,36 @@ inline void SFesUpdateMiPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesUpdateMiPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesUpdateMiPkg.stHead) } -// repeated .kbd_idlfile.SFesMiDataWithoutTm stMiData = 2; +// repeated .iot_idl.SFesMiDataWithoutTm stMiData = 2; inline int SFesUpdateMiPkg::stmidata_size() const { return stmidata_.size(); } inline void SFesUpdateMiPkg::clear_stmidata() { stmidata_.Clear(); } -inline const ::kbd_idlfile::SFesMiDataWithoutTm& SFesUpdateMiPkg::stmidata(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesUpdateMiPkg.stMiData) +inline const ::iot_idl::SFesMiDataWithoutTm& SFesUpdateMiPkg::stmidata(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesUpdateMiPkg.stMiData) return stmidata_.Get(index); } -inline ::kbd_idlfile::SFesMiDataWithoutTm* SFesUpdateMiPkg::mutable_stmidata(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesUpdateMiPkg.stMiData) +inline ::iot_idl::SFesMiDataWithoutTm* SFesUpdateMiPkg::mutable_stmidata(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesUpdateMiPkg.stMiData) return stmidata_.Mutable(index); } -inline ::kbd_idlfile::SFesMiDataWithoutTm* SFesUpdateMiPkg::add_stmidata() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesUpdateMiPkg.stMiData) +inline ::iot_idl::SFesMiDataWithoutTm* SFesUpdateMiPkg::add_stmidata() { + // @@protoc_insertion_point(field_add:iot_idl.SFesUpdateMiPkg.stMiData) return stmidata_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesMiDataWithoutTm >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMiDataWithoutTm >& SFesUpdateMiPkg::stmidata() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesUpdateMiPkg.stMiData) + // @@protoc_insertion_point(field_list:iot_idl.SFesUpdateMiPkg.stMiData) return stmidata_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesMiDataWithoutTm >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMiDataWithoutTm >* SFesUpdateMiPkg::mutable_stmidata() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesUpdateMiPkg.stMiData) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesUpdateMiPkg.stMiData) return &stmidata_; } @@ -9351,13 +9351,13 @@ inline void SFesUpdateMiPkg::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesUpdateMiPkg::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesUpdateMiPkg.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesUpdateMiPkg.ulTime) return ultime_; } inline void SFesUpdateMiPkg::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesUpdateMiPkg.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesUpdateMiPkg.ulTime) } // ------------------------------------------------------------------- @@ -9381,7 +9381,7 @@ inline void SFesDoRequestPkg::clear_strsourcetag() { clear_has_strsourcetag(); } inline const ::std::string& SFesDoRequestPkg::strsourcetag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_get:iot_idl.SFesDoRequestPkg.strSourceTag) return *strsourcetag_; } inline void SFesDoRequestPkg::set_strsourcetag(const ::std::string& value) { @@ -9390,7 +9390,7 @@ inline void SFesDoRequestPkg::set_strsourcetag(const ::std::string& value) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_set:iot_idl.SFesDoRequestPkg.strSourceTag) } inline void SFesDoRequestPkg::set_strsourcetag(const char* value) { set_has_strsourcetag(); @@ -9398,7 +9398,7 @@ inline void SFesDoRequestPkg::set_strsourcetag(const char* value) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesDoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesDoRequestPkg.strSourceTag) } inline void SFesDoRequestPkg::set_strsourcetag(const char* value, size_t size) { set_has_strsourcetag(); @@ -9406,14 +9406,14 @@ inline void SFesDoRequestPkg::set_strsourcetag(const char* value, size_t size) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesDoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesDoRequestPkg.strSourceTag) } inline ::std::string* SFesDoRequestPkg::mutable_strsourcetag() { set_has_strsourcetag(); if (strsourcetag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strsourcetag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesDoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesDoRequestPkg.strSourceTag) return strsourcetag_; } inline ::std::string* SFesDoRequestPkg::release_strsourcetag() { @@ -9437,7 +9437,7 @@ inline void SFesDoRequestPkg::set_allocated_strsourcetag(::std::string* strsourc clear_has_strsourcetag(); strsourcetag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesDoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesDoRequestPkg.strSourceTag) } // required string strAppTableName = 2; @@ -9457,7 +9457,7 @@ inline void SFesDoRequestPkg::clear_strapptablename() { clear_has_strapptablename(); } inline const ::std::string& SFesDoRequestPkg::strapptablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_get:iot_idl.SFesDoRequestPkg.strAppTableName) return *strapptablename_; } inline void SFesDoRequestPkg::set_strapptablename(const ::std::string& value) { @@ -9466,7 +9466,7 @@ inline void SFesDoRequestPkg::set_strapptablename(const ::std::string& value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_set:iot_idl.SFesDoRequestPkg.strAppTableName) } inline void SFesDoRequestPkg::set_strapptablename(const char* value) { set_has_strapptablename(); @@ -9474,7 +9474,7 @@ inline void SFesDoRequestPkg::set_strapptablename(const char* value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesDoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesDoRequestPkg.strAppTableName) } inline void SFesDoRequestPkg::set_strapptablename(const char* value, size_t size) { set_has_strapptablename(); @@ -9482,14 +9482,14 @@ inline void SFesDoRequestPkg::set_strapptablename(const char* value, size_t size strapptablename_ = new ::std::string; } strapptablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesDoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesDoRequestPkg.strAppTableName) } inline ::std::string* SFesDoRequestPkg::mutable_strapptablename() { set_has_strapptablename(); if (strapptablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesDoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesDoRequestPkg.strAppTableName) return strapptablename_; } inline ::std::string* SFesDoRequestPkg::release_strapptablename() { @@ -9513,7 +9513,7 @@ inline void SFesDoRequestPkg::set_allocated_strapptablename(::std::string* strap clear_has_strapptablename(); strapptablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesDoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesDoRequestPkg.strAppTableName) } // required string strAppColumnName = 3; @@ -9533,7 +9533,7 @@ inline void SFesDoRequestPkg::clear_strappcolumnname() { clear_has_strappcolumnname(); } inline const ::std::string& SFesDoRequestPkg::strappcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SFesDoRequestPkg.strAppColumnName) return *strappcolumnname_; } inline void SFesDoRequestPkg::set_strappcolumnname(const ::std::string& value) { @@ -9542,7 +9542,7 @@ inline void SFesDoRequestPkg::set_strappcolumnname(const ::std::string& value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SFesDoRequestPkg.strAppColumnName) } inline void SFesDoRequestPkg::set_strappcolumnname(const char* value) { set_has_strappcolumnname(); @@ -9550,7 +9550,7 @@ inline void SFesDoRequestPkg::set_strappcolumnname(const char* value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesDoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesDoRequestPkg.strAppColumnName) } inline void SFesDoRequestPkg::set_strappcolumnname(const char* value, size_t size) { set_has_strappcolumnname(); @@ -9558,14 +9558,14 @@ inline void SFesDoRequestPkg::set_strappcolumnname(const char* value, size_t siz strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesDoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesDoRequestPkg.strAppColumnName) } inline ::std::string* SFesDoRequestPkg::mutable_strappcolumnname() { set_has_strappcolumnname(); if (strappcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strappcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesDoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesDoRequestPkg.strAppColumnName) return strappcolumnname_; } inline ::std::string* SFesDoRequestPkg::release_strappcolumnname() { @@ -9589,7 +9589,7 @@ inline void SFesDoRequestPkg::set_allocated_strappcolumnname(::std::string* stra clear_has_strappcolumnname(); strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesDoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesDoRequestPkg.strAppColumnName) } // required string strAppTagName = 4; @@ -9609,7 +9609,7 @@ inline void SFesDoRequestPkg::clear_strapptagname() { clear_has_strapptagname(); } inline const ::std::string& SFesDoRequestPkg::strapptagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_get:iot_idl.SFesDoRequestPkg.strAppTagName) return *strapptagname_; } inline void SFesDoRequestPkg::set_strapptagname(const ::std::string& value) { @@ -9618,7 +9618,7 @@ inline void SFesDoRequestPkg::set_strapptagname(const ::std::string& value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_set:iot_idl.SFesDoRequestPkg.strAppTagName) } inline void SFesDoRequestPkg::set_strapptagname(const char* value) { set_has_strapptagname(); @@ -9626,7 +9626,7 @@ inline void SFesDoRequestPkg::set_strapptagname(const char* value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesDoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesDoRequestPkg.strAppTagName) } inline void SFesDoRequestPkg::set_strapptagname(const char* value, size_t size) { set_has_strapptagname(); @@ -9634,14 +9634,14 @@ inline void SFesDoRequestPkg::set_strapptagname(const char* value, size_t size) strapptagname_ = new ::std::string; } strapptagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesDoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesDoRequestPkg.strAppTagName) } inline ::std::string* SFesDoRequestPkg::mutable_strapptagname() { set_has_strapptagname(); if (strapptagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesDoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesDoRequestPkg.strAppTagName) return strapptagname_; } inline ::std::string* SFesDoRequestPkg::release_strapptagname() { @@ -9665,7 +9665,7 @@ inline void SFesDoRequestPkg::set_allocated_strapptagname(::std::string* strappt clear_has_strapptagname(); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesDoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesDoRequestPkg.strAppTagName) } // required string strRtuName = 5; @@ -9685,7 +9685,7 @@ inline void SFesDoRequestPkg::clear_strrtuname() { clear_has_strrtuname(); } inline const ::std::string& SFesDoRequestPkg::strrtuname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_get:iot_idl.SFesDoRequestPkg.strRtuName) return *strrtuname_; } inline void SFesDoRequestPkg::set_strrtuname(const ::std::string& value) { @@ -9694,7 +9694,7 @@ inline void SFesDoRequestPkg::set_strrtuname(const ::std::string& value) { strrtuname_ = new ::std::string; } strrtuname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_set:iot_idl.SFesDoRequestPkg.strRtuName) } inline void SFesDoRequestPkg::set_strrtuname(const char* value) { set_has_strrtuname(); @@ -9702,7 +9702,7 @@ inline void SFesDoRequestPkg::set_strrtuname(const char* value) { strrtuname_ = new ::std::string; } strrtuname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesDoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesDoRequestPkg.strRtuName) } inline void SFesDoRequestPkg::set_strrtuname(const char* value, size_t size) { set_has_strrtuname(); @@ -9710,14 +9710,14 @@ inline void SFesDoRequestPkg::set_strrtuname(const char* value, size_t size) { strrtuname_ = new ::std::string; } strrtuname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesDoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesDoRequestPkg.strRtuName) } inline ::std::string* SFesDoRequestPkg::mutable_strrtuname() { set_has_strrtuname(); if (strrtuname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strrtuname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesDoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesDoRequestPkg.strRtuName) return strrtuname_; } inline ::std::string* SFesDoRequestPkg::release_strrtuname() { @@ -9741,7 +9741,7 @@ inline void SFesDoRequestPkg::set_allocated_strrtuname(::std::string* strrtuname clear_has_strrtuname(); strrtuname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesDoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesDoRequestPkg.strRtuName) } // required int32 nOrder = 6; @@ -9759,13 +9759,13 @@ inline void SFesDoRequestPkg::clear_norder() { clear_has_norder(); } inline ::google::protobuf::int32 SFesDoRequestPkg::norder() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDoRequestPkg.nOrder) + // @@protoc_insertion_point(field_get:iot_idl.SFesDoRequestPkg.nOrder) return norder_; } inline void SFesDoRequestPkg::set_norder(::google::protobuf::int32 value) { set_has_norder(); norder_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDoRequestPkg.nOrder) + // @@protoc_insertion_point(field_set:iot_idl.SFesDoRequestPkg.nOrder) } // required int32 nAction = 7; @@ -9783,13 +9783,13 @@ inline void SFesDoRequestPkg::clear_naction() { clear_has_naction(); } inline ::google::protobuf::int32 SFesDoRequestPkg::naction() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDoRequestPkg.nAction) + // @@protoc_insertion_point(field_get:iot_idl.SFesDoRequestPkg.nAction) return naction_; } inline void SFesDoRequestPkg::set_naction(::google::protobuf::int32 value) { set_has_naction(); naction_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDoRequestPkg.nAction) + // @@protoc_insertion_point(field_set:iot_idl.SFesDoRequestPkg.nAction) } // required int32 nIfTagtState = 9; @@ -9807,13 +9807,13 @@ inline void SFesDoRequestPkg::clear_niftagtstate() { clear_has_niftagtstate(); } inline ::google::protobuf::int32 SFesDoRequestPkg::niftagtstate() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDoRequestPkg.nIfTagtState) + // @@protoc_insertion_point(field_get:iot_idl.SFesDoRequestPkg.nIfTagtState) return niftagtstate_; } inline void SFesDoRequestPkg::set_niftagtstate(::google::protobuf::int32 value) { set_has_niftagtstate(); niftagtstate_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDoRequestPkg.nIfTagtState) + // @@protoc_insertion_point(field_set:iot_idl.SFesDoRequestPkg.nIfTagtState) } // optional int64 lPara1 = 10; @@ -9831,13 +9831,13 @@ inline void SFesDoRequestPkg::clear_lpara1() { clear_has_lpara1(); } inline ::google::protobuf::int64 SFesDoRequestPkg::lpara1() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDoRequestPkg.lPara1) + // @@protoc_insertion_point(field_get:iot_idl.SFesDoRequestPkg.lPara1) return lpara1_; } inline void SFesDoRequestPkg::set_lpara1(::google::protobuf::int64 value) { set_has_lpara1(); lpara1_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDoRequestPkg.lPara1) + // @@protoc_insertion_point(field_set:iot_idl.SFesDoRequestPkg.lPara1) } // optional int64 lPara2 = 11; @@ -9855,13 +9855,13 @@ inline void SFesDoRequestPkg::clear_lpara2() { clear_has_lpara2(); } inline ::google::protobuf::int64 SFesDoRequestPkg::lpara2() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDoRequestPkg.lPara2) + // @@protoc_insertion_point(field_get:iot_idl.SFesDoRequestPkg.lPara2) return lpara2_; } inline void SFesDoRequestPkg::set_lpara2(::google::protobuf::int64 value) { set_has_lpara2(); lpara2_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDoRequestPkg.lPara2) + // @@protoc_insertion_point(field_set:iot_idl.SFesDoRequestPkg.lPara2) } // optional float fPara = 12; @@ -9879,13 +9879,13 @@ inline void SFesDoRequestPkg::clear_fpara() { clear_has_fpara(); } inline float SFesDoRequestPkg::fpara() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDoRequestPkg.fPara) + // @@protoc_insertion_point(field_get:iot_idl.SFesDoRequestPkg.fPara) return fpara_; } inline void SFesDoRequestPkg::set_fpara(float value) { set_has_fpara(); fpara_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDoRequestPkg.fPara) + // @@protoc_insertion_point(field_set:iot_idl.SFesDoRequestPkg.fPara) } // optional string strPara = 13; @@ -9905,7 +9905,7 @@ inline void SFesDoRequestPkg::clear_strpara() { clear_has_strpara(); } inline const ::std::string& SFesDoRequestPkg::strpara() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDoRequestPkg.strPara) + // @@protoc_insertion_point(field_get:iot_idl.SFesDoRequestPkg.strPara) return *strpara_; } inline void SFesDoRequestPkg::set_strpara(const ::std::string& value) { @@ -9914,7 +9914,7 @@ inline void SFesDoRequestPkg::set_strpara(const ::std::string& value) { strpara_ = new ::std::string; } strpara_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDoRequestPkg.strPara) + // @@protoc_insertion_point(field_set:iot_idl.SFesDoRequestPkg.strPara) } inline void SFesDoRequestPkg::set_strpara(const char* value) { set_has_strpara(); @@ -9922,7 +9922,7 @@ inline void SFesDoRequestPkg::set_strpara(const char* value) { strpara_ = new ::std::string; } strpara_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesDoRequestPkg.strPara) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesDoRequestPkg.strPara) } inline void SFesDoRequestPkg::set_strpara(const char* value, size_t size) { set_has_strpara(); @@ -9930,14 +9930,14 @@ inline void SFesDoRequestPkg::set_strpara(const char* value, size_t size) { strpara_ = new ::std::string; } strpara_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesDoRequestPkg.strPara) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesDoRequestPkg.strPara) } inline ::std::string* SFesDoRequestPkg::mutable_strpara() { set_has_strpara(); if (strpara_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strpara_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesDoRequestPkg.strPara) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesDoRequestPkg.strPara) return strpara_; } inline ::std::string* SFesDoRequestPkg::release_strpara() { @@ -9961,7 +9961,7 @@ inline void SFesDoRequestPkg::set_allocated_strpara(::std::string* strpara) { clear_has_strpara(); strpara_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesDoRequestPkg.strPara) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesDoRequestPkg.strPara) } // ------------------------------------------------------------------- @@ -9985,7 +9985,7 @@ inline void SFesAoRequestPkg::clear_strsourcetag() { clear_has_strsourcetag(); } inline const ::std::string& SFesAoRequestPkg::strsourcetag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_get:iot_idl.SFesAoRequestPkg.strSourceTag) return *strsourcetag_; } inline void SFesAoRequestPkg::set_strsourcetag(const ::std::string& value) { @@ -9994,7 +9994,7 @@ inline void SFesAoRequestPkg::set_strsourcetag(const ::std::string& value) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_set:iot_idl.SFesAoRequestPkg.strSourceTag) } inline void SFesAoRequestPkg::set_strsourcetag(const char* value) { set_has_strsourcetag(); @@ -10002,7 +10002,7 @@ inline void SFesAoRequestPkg::set_strsourcetag(const char* value) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesAoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesAoRequestPkg.strSourceTag) } inline void SFesAoRequestPkg::set_strsourcetag(const char* value, size_t size) { set_has_strsourcetag(); @@ -10010,14 +10010,14 @@ inline void SFesAoRequestPkg::set_strsourcetag(const char* value, size_t size) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesAoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesAoRequestPkg.strSourceTag) } inline ::std::string* SFesAoRequestPkg::mutable_strsourcetag() { set_has_strsourcetag(); if (strsourcetag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strsourcetag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesAoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesAoRequestPkg.strSourceTag) return strsourcetag_; } inline ::std::string* SFesAoRequestPkg::release_strsourcetag() { @@ -10041,7 +10041,7 @@ inline void SFesAoRequestPkg::set_allocated_strsourcetag(::std::string* strsourc clear_has_strsourcetag(); strsourcetag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesAoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesAoRequestPkg.strSourceTag) } // required string strAppTableName = 2; @@ -10061,7 +10061,7 @@ inline void SFesAoRequestPkg::clear_strapptablename() { clear_has_strapptablename(); } inline const ::std::string& SFesAoRequestPkg::strapptablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_get:iot_idl.SFesAoRequestPkg.strAppTableName) return *strapptablename_; } inline void SFesAoRequestPkg::set_strapptablename(const ::std::string& value) { @@ -10070,7 +10070,7 @@ inline void SFesAoRequestPkg::set_strapptablename(const ::std::string& value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_set:iot_idl.SFesAoRequestPkg.strAppTableName) } inline void SFesAoRequestPkg::set_strapptablename(const char* value) { set_has_strapptablename(); @@ -10078,7 +10078,7 @@ inline void SFesAoRequestPkg::set_strapptablename(const char* value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesAoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesAoRequestPkg.strAppTableName) } inline void SFesAoRequestPkg::set_strapptablename(const char* value, size_t size) { set_has_strapptablename(); @@ -10086,14 +10086,14 @@ inline void SFesAoRequestPkg::set_strapptablename(const char* value, size_t size strapptablename_ = new ::std::string; } strapptablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesAoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesAoRequestPkg.strAppTableName) } inline ::std::string* SFesAoRequestPkg::mutable_strapptablename() { set_has_strapptablename(); if (strapptablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesAoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesAoRequestPkg.strAppTableName) return strapptablename_; } inline ::std::string* SFesAoRequestPkg::release_strapptablename() { @@ -10117,7 +10117,7 @@ inline void SFesAoRequestPkg::set_allocated_strapptablename(::std::string* strap clear_has_strapptablename(); strapptablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesAoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesAoRequestPkg.strAppTableName) } // required string strAppColumnName = 3; @@ -10137,7 +10137,7 @@ inline void SFesAoRequestPkg::clear_strappcolumnname() { clear_has_strappcolumnname(); } inline const ::std::string& SFesAoRequestPkg::strappcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SFesAoRequestPkg.strAppColumnName) return *strappcolumnname_; } inline void SFesAoRequestPkg::set_strappcolumnname(const ::std::string& value) { @@ -10146,7 +10146,7 @@ inline void SFesAoRequestPkg::set_strappcolumnname(const ::std::string& value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SFesAoRequestPkg.strAppColumnName) } inline void SFesAoRequestPkg::set_strappcolumnname(const char* value) { set_has_strappcolumnname(); @@ -10154,7 +10154,7 @@ inline void SFesAoRequestPkg::set_strappcolumnname(const char* value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesAoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesAoRequestPkg.strAppColumnName) } inline void SFesAoRequestPkg::set_strappcolumnname(const char* value, size_t size) { set_has_strappcolumnname(); @@ -10162,14 +10162,14 @@ inline void SFesAoRequestPkg::set_strappcolumnname(const char* value, size_t siz strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesAoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesAoRequestPkg.strAppColumnName) } inline ::std::string* SFesAoRequestPkg::mutable_strappcolumnname() { set_has_strappcolumnname(); if (strappcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strappcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesAoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesAoRequestPkg.strAppColumnName) return strappcolumnname_; } inline ::std::string* SFesAoRequestPkg::release_strappcolumnname() { @@ -10193,7 +10193,7 @@ inline void SFesAoRequestPkg::set_allocated_strappcolumnname(::std::string* stra clear_has_strappcolumnname(); strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesAoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesAoRequestPkg.strAppColumnName) } // required string strAppTagName = 4; @@ -10213,7 +10213,7 @@ inline void SFesAoRequestPkg::clear_strapptagname() { clear_has_strapptagname(); } inline const ::std::string& SFesAoRequestPkg::strapptagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_get:iot_idl.SFesAoRequestPkg.strAppTagName) return *strapptagname_; } inline void SFesAoRequestPkg::set_strapptagname(const ::std::string& value) { @@ -10222,7 +10222,7 @@ inline void SFesAoRequestPkg::set_strapptagname(const ::std::string& value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_set:iot_idl.SFesAoRequestPkg.strAppTagName) } inline void SFesAoRequestPkg::set_strapptagname(const char* value) { set_has_strapptagname(); @@ -10230,7 +10230,7 @@ inline void SFesAoRequestPkg::set_strapptagname(const char* value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesAoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesAoRequestPkg.strAppTagName) } inline void SFesAoRequestPkg::set_strapptagname(const char* value, size_t size) { set_has_strapptagname(); @@ -10238,14 +10238,14 @@ inline void SFesAoRequestPkg::set_strapptagname(const char* value, size_t size) strapptagname_ = new ::std::string; } strapptagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesAoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesAoRequestPkg.strAppTagName) } inline ::std::string* SFesAoRequestPkg::mutable_strapptagname() { set_has_strapptagname(); if (strapptagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesAoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesAoRequestPkg.strAppTagName) return strapptagname_; } inline ::std::string* SFesAoRequestPkg::release_strapptagname() { @@ -10269,7 +10269,7 @@ inline void SFesAoRequestPkg::set_allocated_strapptagname(::std::string* strappt clear_has_strapptagname(); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesAoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesAoRequestPkg.strAppTagName) } // required string strRtuName = 5; @@ -10289,7 +10289,7 @@ inline void SFesAoRequestPkg::clear_strrtuname() { clear_has_strrtuname(); } inline const ::std::string& SFesAoRequestPkg::strrtuname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_get:iot_idl.SFesAoRequestPkg.strRtuName) return *strrtuname_; } inline void SFesAoRequestPkg::set_strrtuname(const ::std::string& value) { @@ -10298,7 +10298,7 @@ inline void SFesAoRequestPkg::set_strrtuname(const ::std::string& value) { strrtuname_ = new ::std::string; } strrtuname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_set:iot_idl.SFesAoRequestPkg.strRtuName) } inline void SFesAoRequestPkg::set_strrtuname(const char* value) { set_has_strrtuname(); @@ -10306,7 +10306,7 @@ inline void SFesAoRequestPkg::set_strrtuname(const char* value) { strrtuname_ = new ::std::string; } strrtuname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesAoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesAoRequestPkg.strRtuName) } inline void SFesAoRequestPkg::set_strrtuname(const char* value, size_t size) { set_has_strrtuname(); @@ -10314,14 +10314,14 @@ inline void SFesAoRequestPkg::set_strrtuname(const char* value, size_t size) { strrtuname_ = new ::std::string; } strrtuname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesAoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesAoRequestPkg.strRtuName) } inline ::std::string* SFesAoRequestPkg::mutable_strrtuname() { set_has_strrtuname(); if (strrtuname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strrtuname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesAoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesAoRequestPkg.strRtuName) return strrtuname_; } inline ::std::string* SFesAoRequestPkg::release_strrtuname() { @@ -10345,7 +10345,7 @@ inline void SFesAoRequestPkg::set_allocated_strrtuname(::std::string* strrtuname clear_has_strrtuname(); strrtuname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesAoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesAoRequestPkg.strRtuName) } // required int32 nOrder = 6; @@ -10363,13 +10363,13 @@ inline void SFesAoRequestPkg::clear_norder() { clear_has_norder(); } inline ::google::protobuf::int32 SFesAoRequestPkg::norder() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAoRequestPkg.nOrder) + // @@protoc_insertion_point(field_get:iot_idl.SFesAoRequestPkg.nOrder) return norder_; } inline void SFesAoRequestPkg::set_norder(::google::protobuf::int32 value) { set_has_norder(); norder_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAoRequestPkg.nOrder) + // @@protoc_insertion_point(field_set:iot_idl.SFesAoRequestPkg.nOrder) } // required float fValue = 7; @@ -10387,13 +10387,13 @@ inline void SFesAoRequestPkg::clear_fvalue() { clear_has_fvalue(); } inline float SFesAoRequestPkg::fvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAoRequestPkg.fValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesAoRequestPkg.fValue) return fvalue_; } inline void SFesAoRequestPkg::set_fvalue(float value) { set_has_fvalue(); fvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAoRequestPkg.fValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesAoRequestPkg.fValue) } // required int32 nCtrlType = 8; @@ -10411,13 +10411,13 @@ inline void SFesAoRequestPkg::clear_nctrltype() { clear_has_nctrltype(); } inline ::google::protobuf::int32 SFesAoRequestPkg::nctrltype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAoRequestPkg.nCtrlType) + // @@protoc_insertion_point(field_get:iot_idl.SFesAoRequestPkg.nCtrlType) return nctrltype_; } inline void SFesAoRequestPkg::set_nctrltype(::google::protobuf::int32 value) { set_has_nctrltype(); nctrltype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAoRequestPkg.nCtrlType) + // @@protoc_insertion_point(field_set:iot_idl.SFesAoRequestPkg.nCtrlType) } // required int32 nIfTagtState = 9; @@ -10435,13 +10435,13 @@ inline void SFesAoRequestPkg::clear_niftagtstate() { clear_has_niftagtstate(); } inline ::google::protobuf::int32 SFesAoRequestPkg::niftagtstate() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAoRequestPkg.nIfTagtState) + // @@protoc_insertion_point(field_get:iot_idl.SFesAoRequestPkg.nIfTagtState) return niftagtstate_; } inline void SFesAoRequestPkg::set_niftagtstate(::google::protobuf::int32 value) { set_has_niftagtstate(); niftagtstate_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAoRequestPkg.nIfTagtState) + // @@protoc_insertion_point(field_set:iot_idl.SFesAoRequestPkg.nIfTagtState) } // optional int64 lPara1 = 10; @@ -10459,13 +10459,13 @@ inline void SFesAoRequestPkg::clear_lpara1() { clear_has_lpara1(); } inline ::google::protobuf::int64 SFesAoRequestPkg::lpara1() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAoRequestPkg.lPara1) + // @@protoc_insertion_point(field_get:iot_idl.SFesAoRequestPkg.lPara1) return lpara1_; } inline void SFesAoRequestPkg::set_lpara1(::google::protobuf::int64 value) { set_has_lpara1(); lpara1_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAoRequestPkg.lPara1) + // @@protoc_insertion_point(field_set:iot_idl.SFesAoRequestPkg.lPara1) } // optional int64 lPara2 = 11; @@ -10483,13 +10483,13 @@ inline void SFesAoRequestPkg::clear_lpara2() { clear_has_lpara2(); } inline ::google::protobuf::int64 SFesAoRequestPkg::lpara2() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAoRequestPkg.lPara2) + // @@protoc_insertion_point(field_get:iot_idl.SFesAoRequestPkg.lPara2) return lpara2_; } inline void SFesAoRequestPkg::set_lpara2(::google::protobuf::int64 value) { set_has_lpara2(); lpara2_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAoRequestPkg.lPara2) + // @@protoc_insertion_point(field_set:iot_idl.SFesAoRequestPkg.lPara2) } // optional float fPara = 12; @@ -10507,13 +10507,13 @@ inline void SFesAoRequestPkg::clear_fpara() { clear_has_fpara(); } inline float SFesAoRequestPkg::fpara() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAoRequestPkg.fPara) + // @@protoc_insertion_point(field_get:iot_idl.SFesAoRequestPkg.fPara) return fpara_; } inline void SFesAoRequestPkg::set_fpara(float value) { set_has_fpara(); fpara_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAoRequestPkg.fPara) + // @@protoc_insertion_point(field_set:iot_idl.SFesAoRequestPkg.fPara) } // optional string strPara = 13; @@ -10533,7 +10533,7 @@ inline void SFesAoRequestPkg::clear_strpara() { clear_has_strpara(); } inline const ::std::string& SFesAoRequestPkg::strpara() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAoRequestPkg.strPara) + // @@protoc_insertion_point(field_get:iot_idl.SFesAoRequestPkg.strPara) return *strpara_; } inline void SFesAoRequestPkg::set_strpara(const ::std::string& value) { @@ -10542,7 +10542,7 @@ inline void SFesAoRequestPkg::set_strpara(const ::std::string& value) { strpara_ = new ::std::string; } strpara_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAoRequestPkg.strPara) + // @@protoc_insertion_point(field_set:iot_idl.SFesAoRequestPkg.strPara) } inline void SFesAoRequestPkg::set_strpara(const char* value) { set_has_strpara(); @@ -10550,7 +10550,7 @@ inline void SFesAoRequestPkg::set_strpara(const char* value) { strpara_ = new ::std::string; } strpara_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesAoRequestPkg.strPara) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesAoRequestPkg.strPara) } inline void SFesAoRequestPkg::set_strpara(const char* value, size_t size) { set_has_strpara(); @@ -10558,14 +10558,14 @@ inline void SFesAoRequestPkg::set_strpara(const char* value, size_t size) { strpara_ = new ::std::string; } strpara_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesAoRequestPkg.strPara) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesAoRequestPkg.strPara) } inline ::std::string* SFesAoRequestPkg::mutable_strpara() { set_has_strpara(); if (strpara_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strpara_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesAoRequestPkg.strPara) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesAoRequestPkg.strPara) return strpara_; } inline ::std::string* SFesAoRequestPkg::release_strpara() { @@ -10589,7 +10589,7 @@ inline void SFesAoRequestPkg::set_allocated_strpara(::std::string* strpara) { clear_has_strpara(); strpara_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesAoRequestPkg.strPara) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesAoRequestPkg.strPara) } // ------------------------------------------------------------------- @@ -10613,7 +10613,7 @@ inline void SFesMoRequestPkg::clear_strsourcetag() { clear_has_strsourcetag(); } inline const ::std::string& SFesMoRequestPkg::strsourcetag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_get:iot_idl.SFesMoRequestPkg.strSourceTag) return *strsourcetag_; } inline void SFesMoRequestPkg::set_strsourcetag(const ::std::string& value) { @@ -10622,7 +10622,7 @@ inline void SFesMoRequestPkg::set_strsourcetag(const ::std::string& value) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_set:iot_idl.SFesMoRequestPkg.strSourceTag) } inline void SFesMoRequestPkg::set_strsourcetag(const char* value) { set_has_strsourcetag(); @@ -10630,7 +10630,7 @@ inline void SFesMoRequestPkg::set_strsourcetag(const char* value) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesMoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesMoRequestPkg.strSourceTag) } inline void SFesMoRequestPkg::set_strsourcetag(const char* value, size_t size) { set_has_strsourcetag(); @@ -10638,14 +10638,14 @@ inline void SFesMoRequestPkg::set_strsourcetag(const char* value, size_t size) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesMoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesMoRequestPkg.strSourceTag) } inline ::std::string* SFesMoRequestPkg::mutable_strsourcetag() { set_has_strsourcetag(); if (strsourcetag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strsourcetag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesMoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesMoRequestPkg.strSourceTag) return strsourcetag_; } inline ::std::string* SFesMoRequestPkg::release_strsourcetag() { @@ -10669,7 +10669,7 @@ inline void SFesMoRequestPkg::set_allocated_strsourcetag(::std::string* strsourc clear_has_strsourcetag(); strsourcetag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesMoRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesMoRequestPkg.strSourceTag) } // required string strAppTableName = 2; @@ -10689,7 +10689,7 @@ inline void SFesMoRequestPkg::clear_strapptablename() { clear_has_strapptablename(); } inline const ::std::string& SFesMoRequestPkg::strapptablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_get:iot_idl.SFesMoRequestPkg.strAppTableName) return *strapptablename_; } inline void SFesMoRequestPkg::set_strapptablename(const ::std::string& value) { @@ -10698,7 +10698,7 @@ inline void SFesMoRequestPkg::set_strapptablename(const ::std::string& value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_set:iot_idl.SFesMoRequestPkg.strAppTableName) } inline void SFesMoRequestPkg::set_strapptablename(const char* value) { set_has_strapptablename(); @@ -10706,7 +10706,7 @@ inline void SFesMoRequestPkg::set_strapptablename(const char* value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesMoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesMoRequestPkg.strAppTableName) } inline void SFesMoRequestPkg::set_strapptablename(const char* value, size_t size) { set_has_strapptablename(); @@ -10714,14 +10714,14 @@ inline void SFesMoRequestPkg::set_strapptablename(const char* value, size_t size strapptablename_ = new ::std::string; } strapptablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesMoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesMoRequestPkg.strAppTableName) } inline ::std::string* SFesMoRequestPkg::mutable_strapptablename() { set_has_strapptablename(); if (strapptablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesMoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesMoRequestPkg.strAppTableName) return strapptablename_; } inline ::std::string* SFesMoRequestPkg::release_strapptablename() { @@ -10745,7 +10745,7 @@ inline void SFesMoRequestPkg::set_allocated_strapptablename(::std::string* strap clear_has_strapptablename(); strapptablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesMoRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesMoRequestPkg.strAppTableName) } // required string strAppColumnName = 3; @@ -10765,7 +10765,7 @@ inline void SFesMoRequestPkg::clear_strappcolumnname() { clear_has_strappcolumnname(); } inline const ::std::string& SFesMoRequestPkg::strappcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SFesMoRequestPkg.strAppColumnName) return *strappcolumnname_; } inline void SFesMoRequestPkg::set_strappcolumnname(const ::std::string& value) { @@ -10774,7 +10774,7 @@ inline void SFesMoRequestPkg::set_strappcolumnname(const ::std::string& value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SFesMoRequestPkg.strAppColumnName) } inline void SFesMoRequestPkg::set_strappcolumnname(const char* value) { set_has_strappcolumnname(); @@ -10782,7 +10782,7 @@ inline void SFesMoRequestPkg::set_strappcolumnname(const char* value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesMoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesMoRequestPkg.strAppColumnName) } inline void SFesMoRequestPkg::set_strappcolumnname(const char* value, size_t size) { set_has_strappcolumnname(); @@ -10790,14 +10790,14 @@ inline void SFesMoRequestPkg::set_strappcolumnname(const char* value, size_t siz strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesMoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesMoRequestPkg.strAppColumnName) } inline ::std::string* SFesMoRequestPkg::mutable_strappcolumnname() { set_has_strappcolumnname(); if (strappcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strappcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesMoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesMoRequestPkg.strAppColumnName) return strappcolumnname_; } inline ::std::string* SFesMoRequestPkg::release_strappcolumnname() { @@ -10821,7 +10821,7 @@ inline void SFesMoRequestPkg::set_allocated_strappcolumnname(::std::string* stra clear_has_strappcolumnname(); strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesMoRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesMoRequestPkg.strAppColumnName) } // required string strAppTagName = 4; @@ -10841,7 +10841,7 @@ inline void SFesMoRequestPkg::clear_strapptagname() { clear_has_strapptagname(); } inline const ::std::string& SFesMoRequestPkg::strapptagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_get:iot_idl.SFesMoRequestPkg.strAppTagName) return *strapptagname_; } inline void SFesMoRequestPkg::set_strapptagname(const ::std::string& value) { @@ -10850,7 +10850,7 @@ inline void SFesMoRequestPkg::set_strapptagname(const ::std::string& value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_set:iot_idl.SFesMoRequestPkg.strAppTagName) } inline void SFesMoRequestPkg::set_strapptagname(const char* value) { set_has_strapptagname(); @@ -10858,7 +10858,7 @@ inline void SFesMoRequestPkg::set_strapptagname(const char* value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesMoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesMoRequestPkg.strAppTagName) } inline void SFesMoRequestPkg::set_strapptagname(const char* value, size_t size) { set_has_strapptagname(); @@ -10866,14 +10866,14 @@ inline void SFesMoRequestPkg::set_strapptagname(const char* value, size_t size) strapptagname_ = new ::std::string; } strapptagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesMoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesMoRequestPkg.strAppTagName) } inline ::std::string* SFesMoRequestPkg::mutable_strapptagname() { set_has_strapptagname(); if (strapptagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesMoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesMoRequestPkg.strAppTagName) return strapptagname_; } inline ::std::string* SFesMoRequestPkg::release_strapptagname() { @@ -10897,7 +10897,7 @@ inline void SFesMoRequestPkg::set_allocated_strapptagname(::std::string* strappt clear_has_strapptagname(); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesMoRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesMoRequestPkg.strAppTagName) } // required string strRtuName = 5; @@ -10917,7 +10917,7 @@ inline void SFesMoRequestPkg::clear_strrtuname() { clear_has_strrtuname(); } inline const ::std::string& SFesMoRequestPkg::strrtuname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_get:iot_idl.SFesMoRequestPkg.strRtuName) return *strrtuname_; } inline void SFesMoRequestPkg::set_strrtuname(const ::std::string& value) { @@ -10926,7 +10926,7 @@ inline void SFesMoRequestPkg::set_strrtuname(const ::std::string& value) { strrtuname_ = new ::std::string; } strrtuname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_set:iot_idl.SFesMoRequestPkg.strRtuName) } inline void SFesMoRequestPkg::set_strrtuname(const char* value) { set_has_strrtuname(); @@ -10934,7 +10934,7 @@ inline void SFesMoRequestPkg::set_strrtuname(const char* value) { strrtuname_ = new ::std::string; } strrtuname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesMoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesMoRequestPkg.strRtuName) } inline void SFesMoRequestPkg::set_strrtuname(const char* value, size_t size) { set_has_strrtuname(); @@ -10942,14 +10942,14 @@ inline void SFesMoRequestPkg::set_strrtuname(const char* value, size_t size) { strrtuname_ = new ::std::string; } strrtuname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesMoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesMoRequestPkg.strRtuName) } inline ::std::string* SFesMoRequestPkg::mutable_strrtuname() { set_has_strrtuname(); if (strrtuname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strrtuname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesMoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesMoRequestPkg.strRtuName) return strrtuname_; } inline ::std::string* SFesMoRequestPkg::release_strrtuname() { @@ -10973,7 +10973,7 @@ inline void SFesMoRequestPkg::set_allocated_strrtuname(::std::string* strrtuname clear_has_strrtuname(); strrtuname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesMoRequestPkg.strRtuName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesMoRequestPkg.strRtuName) } // required int32 nOrder = 6; @@ -10991,13 +10991,13 @@ inline void SFesMoRequestPkg::clear_norder() { clear_has_norder(); } inline ::google::protobuf::int32 SFesMoRequestPkg::norder() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMoRequestPkg.nOrder) + // @@protoc_insertion_point(field_get:iot_idl.SFesMoRequestPkg.nOrder) return norder_; } inline void SFesMoRequestPkg::set_norder(::google::protobuf::int32 value) { set_has_norder(); norder_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMoRequestPkg.nOrder) + // @@protoc_insertion_point(field_set:iot_idl.SFesMoRequestPkg.nOrder) } // required int32 nValue = 7; @@ -11015,13 +11015,13 @@ inline void SFesMoRequestPkg::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int32 SFesMoRequestPkg::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMoRequestPkg.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesMoRequestPkg.nValue) return nvalue_; } inline void SFesMoRequestPkg::set_nvalue(::google::protobuf::int32 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMoRequestPkg.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesMoRequestPkg.nValue) } // required int32 nCtrlType = 8; @@ -11039,13 +11039,13 @@ inline void SFesMoRequestPkg::clear_nctrltype() { clear_has_nctrltype(); } inline ::google::protobuf::int32 SFesMoRequestPkg::nctrltype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMoRequestPkg.nCtrlType) + // @@protoc_insertion_point(field_get:iot_idl.SFesMoRequestPkg.nCtrlType) return nctrltype_; } inline void SFesMoRequestPkg::set_nctrltype(::google::protobuf::int32 value) { set_has_nctrltype(); nctrltype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMoRequestPkg.nCtrlType) + // @@protoc_insertion_point(field_set:iot_idl.SFesMoRequestPkg.nCtrlType) } // required int32 nIfTagtState = 9; @@ -11063,13 +11063,13 @@ inline void SFesMoRequestPkg::clear_niftagtstate() { clear_has_niftagtstate(); } inline ::google::protobuf::int32 SFesMoRequestPkg::niftagtstate() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMoRequestPkg.nIfTagtState) + // @@protoc_insertion_point(field_get:iot_idl.SFesMoRequestPkg.nIfTagtState) return niftagtstate_; } inline void SFesMoRequestPkg::set_niftagtstate(::google::protobuf::int32 value) { set_has_niftagtstate(); niftagtstate_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMoRequestPkg.nIfTagtState) + // @@protoc_insertion_point(field_set:iot_idl.SFesMoRequestPkg.nIfTagtState) } // optional int64 lPara1 = 10; @@ -11087,13 +11087,13 @@ inline void SFesMoRequestPkg::clear_lpara1() { clear_has_lpara1(); } inline ::google::protobuf::int64 SFesMoRequestPkg::lpara1() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMoRequestPkg.lPara1) + // @@protoc_insertion_point(field_get:iot_idl.SFesMoRequestPkg.lPara1) return lpara1_; } inline void SFesMoRequestPkg::set_lpara1(::google::protobuf::int64 value) { set_has_lpara1(); lpara1_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMoRequestPkg.lPara1) + // @@protoc_insertion_point(field_set:iot_idl.SFesMoRequestPkg.lPara1) } // optional int64 lPara2 = 11; @@ -11111,13 +11111,13 @@ inline void SFesMoRequestPkg::clear_lpara2() { clear_has_lpara2(); } inline ::google::protobuf::int64 SFesMoRequestPkg::lpara2() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMoRequestPkg.lPara2) + // @@protoc_insertion_point(field_get:iot_idl.SFesMoRequestPkg.lPara2) return lpara2_; } inline void SFesMoRequestPkg::set_lpara2(::google::protobuf::int64 value) { set_has_lpara2(); lpara2_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMoRequestPkg.lPara2) + // @@protoc_insertion_point(field_set:iot_idl.SFesMoRequestPkg.lPara2) } // optional float fPara = 12; @@ -11135,13 +11135,13 @@ inline void SFesMoRequestPkg::clear_fpara() { clear_has_fpara(); } inline float SFesMoRequestPkg::fpara() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMoRequestPkg.fPara) + // @@protoc_insertion_point(field_get:iot_idl.SFesMoRequestPkg.fPara) return fpara_; } inline void SFesMoRequestPkg::set_fpara(float value) { set_has_fpara(); fpara_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMoRequestPkg.fPara) + // @@protoc_insertion_point(field_set:iot_idl.SFesMoRequestPkg.fPara) } // optional string strPara = 13; @@ -11161,7 +11161,7 @@ inline void SFesMoRequestPkg::clear_strpara() { clear_has_strpara(); } inline const ::std::string& SFesMoRequestPkg::strpara() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMoRequestPkg.strPara) + // @@protoc_insertion_point(field_get:iot_idl.SFesMoRequestPkg.strPara) return *strpara_; } inline void SFesMoRequestPkg::set_strpara(const ::std::string& value) { @@ -11170,7 +11170,7 @@ inline void SFesMoRequestPkg::set_strpara(const ::std::string& value) { strpara_ = new ::std::string; } strpara_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMoRequestPkg.strPara) + // @@protoc_insertion_point(field_set:iot_idl.SFesMoRequestPkg.strPara) } inline void SFesMoRequestPkg::set_strpara(const char* value) { set_has_strpara(); @@ -11178,7 +11178,7 @@ inline void SFesMoRequestPkg::set_strpara(const char* value) { strpara_ = new ::std::string; } strpara_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesMoRequestPkg.strPara) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesMoRequestPkg.strPara) } inline void SFesMoRequestPkg::set_strpara(const char* value, size_t size) { set_has_strpara(); @@ -11186,14 +11186,14 @@ inline void SFesMoRequestPkg::set_strpara(const char* value, size_t size) { strpara_ = new ::std::string; } strpara_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesMoRequestPkg.strPara) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesMoRequestPkg.strPara) } inline ::std::string* SFesMoRequestPkg::mutable_strpara() { set_has_strpara(); if (strpara_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strpara_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesMoRequestPkg.strPara) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesMoRequestPkg.strPara) return strpara_; } inline ::std::string* SFesMoRequestPkg::release_strpara() { @@ -11217,7 +11217,7 @@ inline void SFesMoRequestPkg::set_allocated_strpara(::std::string* strpara) { clear_has_strpara(); strpara_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesMoRequestPkg.strPara) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesMoRequestPkg.strPara) } // ------------------------------------------------------------------- @@ -11241,7 +11241,7 @@ inline void SFesCtrlReplyPkg::clear_strsourcetag() { clear_has_strsourcetag(); } inline const ::std::string& SFesCtrlReplyPkg::strsourcetag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCtrlReplyPkg.strSourceTag) + // @@protoc_insertion_point(field_get:iot_idl.SFesCtrlReplyPkg.strSourceTag) return *strsourcetag_; } inline void SFesCtrlReplyPkg::set_strsourcetag(const ::std::string& value) { @@ -11250,7 +11250,7 @@ inline void SFesCtrlReplyPkg::set_strsourcetag(const ::std::string& value) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCtrlReplyPkg.strSourceTag) + // @@protoc_insertion_point(field_set:iot_idl.SFesCtrlReplyPkg.strSourceTag) } inline void SFesCtrlReplyPkg::set_strsourcetag(const char* value) { set_has_strsourcetag(); @@ -11258,7 +11258,7 @@ inline void SFesCtrlReplyPkg::set_strsourcetag(const char* value) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCtrlReplyPkg.strSourceTag) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCtrlReplyPkg.strSourceTag) } inline void SFesCtrlReplyPkg::set_strsourcetag(const char* value, size_t size) { set_has_strsourcetag(); @@ -11266,14 +11266,14 @@ inline void SFesCtrlReplyPkg::set_strsourcetag(const char* value, size_t size) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCtrlReplyPkg.strSourceTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCtrlReplyPkg.strSourceTag) } inline ::std::string* SFesCtrlReplyPkg::mutable_strsourcetag() { set_has_strsourcetag(); if (strsourcetag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strsourcetag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCtrlReplyPkg.strSourceTag) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCtrlReplyPkg.strSourceTag) return strsourcetag_; } inline ::std::string* SFesCtrlReplyPkg::release_strsourcetag() { @@ -11297,7 +11297,7 @@ inline void SFesCtrlReplyPkg::set_allocated_strsourcetag(::std::string* strsourc clear_has_strsourcetag(); strsourcetag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCtrlReplyPkg.strSourceTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCtrlReplyPkg.strSourceTag) } // required string strAppTableName = 2; @@ -11317,7 +11317,7 @@ inline void SFesCtrlReplyPkg::clear_strapptablename() { clear_has_strapptablename(); } inline const ::std::string& SFesCtrlReplyPkg::strapptablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCtrlReplyPkg.strAppTableName) + // @@protoc_insertion_point(field_get:iot_idl.SFesCtrlReplyPkg.strAppTableName) return *strapptablename_; } inline void SFesCtrlReplyPkg::set_strapptablename(const ::std::string& value) { @@ -11326,7 +11326,7 @@ inline void SFesCtrlReplyPkg::set_strapptablename(const ::std::string& value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCtrlReplyPkg.strAppTableName) + // @@protoc_insertion_point(field_set:iot_idl.SFesCtrlReplyPkg.strAppTableName) } inline void SFesCtrlReplyPkg::set_strapptablename(const char* value) { set_has_strapptablename(); @@ -11334,7 +11334,7 @@ inline void SFesCtrlReplyPkg::set_strapptablename(const char* value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCtrlReplyPkg.strAppTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCtrlReplyPkg.strAppTableName) } inline void SFesCtrlReplyPkg::set_strapptablename(const char* value, size_t size) { set_has_strapptablename(); @@ -11342,14 +11342,14 @@ inline void SFesCtrlReplyPkg::set_strapptablename(const char* value, size_t size strapptablename_ = new ::std::string; } strapptablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCtrlReplyPkg.strAppTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCtrlReplyPkg.strAppTableName) } inline ::std::string* SFesCtrlReplyPkg::mutable_strapptablename() { set_has_strapptablename(); if (strapptablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCtrlReplyPkg.strAppTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCtrlReplyPkg.strAppTableName) return strapptablename_; } inline ::std::string* SFesCtrlReplyPkg::release_strapptablename() { @@ -11373,7 +11373,7 @@ inline void SFesCtrlReplyPkg::set_allocated_strapptablename(::std::string* strap clear_has_strapptablename(); strapptablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCtrlReplyPkg.strAppTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCtrlReplyPkg.strAppTableName) } // required string strAppColumnName = 3; @@ -11393,7 +11393,7 @@ inline void SFesCtrlReplyPkg::clear_strappcolumnname() { clear_has_strappcolumnname(); } inline const ::std::string& SFesCtrlReplyPkg::strappcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCtrlReplyPkg.strAppColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SFesCtrlReplyPkg.strAppColumnName) return *strappcolumnname_; } inline void SFesCtrlReplyPkg::set_strappcolumnname(const ::std::string& value) { @@ -11402,7 +11402,7 @@ inline void SFesCtrlReplyPkg::set_strappcolumnname(const ::std::string& value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCtrlReplyPkg.strAppColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SFesCtrlReplyPkg.strAppColumnName) } inline void SFesCtrlReplyPkg::set_strappcolumnname(const char* value) { set_has_strappcolumnname(); @@ -11410,7 +11410,7 @@ inline void SFesCtrlReplyPkg::set_strappcolumnname(const char* value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCtrlReplyPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCtrlReplyPkg.strAppColumnName) } inline void SFesCtrlReplyPkg::set_strappcolumnname(const char* value, size_t size) { set_has_strappcolumnname(); @@ -11418,14 +11418,14 @@ inline void SFesCtrlReplyPkg::set_strappcolumnname(const char* value, size_t siz strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCtrlReplyPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCtrlReplyPkg.strAppColumnName) } inline ::std::string* SFesCtrlReplyPkg::mutable_strappcolumnname() { set_has_strappcolumnname(); if (strappcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strappcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCtrlReplyPkg.strAppColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCtrlReplyPkg.strAppColumnName) return strappcolumnname_; } inline ::std::string* SFesCtrlReplyPkg::release_strappcolumnname() { @@ -11449,7 +11449,7 @@ inline void SFesCtrlReplyPkg::set_allocated_strappcolumnname(::std::string* stra clear_has_strappcolumnname(); strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCtrlReplyPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCtrlReplyPkg.strAppColumnName) } // required string strAppTagName = 4; @@ -11469,7 +11469,7 @@ inline void SFesCtrlReplyPkg::clear_strapptagname() { clear_has_strapptagname(); } inline const ::std::string& SFesCtrlReplyPkg::strapptagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCtrlReplyPkg.strAppTagName) + // @@protoc_insertion_point(field_get:iot_idl.SFesCtrlReplyPkg.strAppTagName) return *strapptagname_; } inline void SFesCtrlReplyPkg::set_strapptagname(const ::std::string& value) { @@ -11478,7 +11478,7 @@ inline void SFesCtrlReplyPkg::set_strapptagname(const ::std::string& value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCtrlReplyPkg.strAppTagName) + // @@protoc_insertion_point(field_set:iot_idl.SFesCtrlReplyPkg.strAppTagName) } inline void SFesCtrlReplyPkg::set_strapptagname(const char* value) { set_has_strapptagname(); @@ -11486,7 +11486,7 @@ inline void SFesCtrlReplyPkg::set_strapptagname(const char* value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCtrlReplyPkg.strAppTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCtrlReplyPkg.strAppTagName) } inline void SFesCtrlReplyPkg::set_strapptagname(const char* value, size_t size) { set_has_strapptagname(); @@ -11494,14 +11494,14 @@ inline void SFesCtrlReplyPkg::set_strapptagname(const char* value, size_t size) strapptagname_ = new ::std::string; } strapptagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCtrlReplyPkg.strAppTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCtrlReplyPkg.strAppTagName) } inline ::std::string* SFesCtrlReplyPkg::mutable_strapptagname() { set_has_strapptagname(); if (strapptagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCtrlReplyPkg.strAppTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCtrlReplyPkg.strAppTagName) return strapptagname_; } inline ::std::string* SFesCtrlReplyPkg::release_strapptagname() { @@ -11525,7 +11525,7 @@ inline void SFesCtrlReplyPkg::set_allocated_strapptagname(::std::string* strappt clear_has_strapptagname(); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCtrlReplyPkg.strAppTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCtrlReplyPkg.strAppTagName) } // required int32 nResult = 5; @@ -11543,13 +11543,13 @@ inline void SFesCtrlReplyPkg::clear_nresult() { clear_has_nresult(); } inline ::google::protobuf::int32 SFesCtrlReplyPkg::nresult() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCtrlReplyPkg.nResult) + // @@protoc_insertion_point(field_get:iot_idl.SFesCtrlReplyPkg.nResult) return nresult_; } inline void SFesCtrlReplyPkg::set_nresult(::google::protobuf::int32 value) { set_has_nresult(); nresult_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCtrlReplyPkg.nResult) + // @@protoc_insertion_point(field_set:iot_idl.SFesCtrlReplyPkg.nResult) } // optional int64 lPara1 = 10; @@ -11567,13 +11567,13 @@ inline void SFesCtrlReplyPkg::clear_lpara1() { clear_has_lpara1(); } inline ::google::protobuf::int64 SFesCtrlReplyPkg::lpara1() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCtrlReplyPkg.lPara1) + // @@protoc_insertion_point(field_get:iot_idl.SFesCtrlReplyPkg.lPara1) return lpara1_; } inline void SFesCtrlReplyPkg::set_lpara1(::google::protobuf::int64 value) { set_has_lpara1(); lpara1_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCtrlReplyPkg.lPara1) + // @@protoc_insertion_point(field_set:iot_idl.SFesCtrlReplyPkg.lPara1) } // optional int64 lPara2 = 11; @@ -11591,13 +11591,13 @@ inline void SFesCtrlReplyPkg::clear_lpara2() { clear_has_lpara2(); } inline ::google::protobuf::int64 SFesCtrlReplyPkg::lpara2() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCtrlReplyPkg.lPara2) + // @@protoc_insertion_point(field_get:iot_idl.SFesCtrlReplyPkg.lPara2) return lpara2_; } inline void SFesCtrlReplyPkg::set_lpara2(::google::protobuf::int64 value) { set_has_lpara2(); lpara2_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCtrlReplyPkg.lPara2) + // @@protoc_insertion_point(field_set:iot_idl.SFesCtrlReplyPkg.lPara2) } // optional float fPara = 12; @@ -11615,13 +11615,13 @@ inline void SFesCtrlReplyPkg::clear_fpara() { clear_has_fpara(); } inline float SFesCtrlReplyPkg::fpara() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCtrlReplyPkg.fPara) + // @@protoc_insertion_point(field_get:iot_idl.SFesCtrlReplyPkg.fPara) return fpara_; } inline void SFesCtrlReplyPkg::set_fpara(float value) { set_has_fpara(); fpara_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCtrlReplyPkg.fPara) + // @@protoc_insertion_point(field_set:iot_idl.SFesCtrlReplyPkg.fPara) } // optional string strPara = 13; @@ -11641,7 +11641,7 @@ inline void SFesCtrlReplyPkg::clear_strpara() { clear_has_strpara(); } inline const ::std::string& SFesCtrlReplyPkg::strpara() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCtrlReplyPkg.strPara) + // @@protoc_insertion_point(field_get:iot_idl.SFesCtrlReplyPkg.strPara) return *strpara_; } inline void SFesCtrlReplyPkg::set_strpara(const ::std::string& value) { @@ -11650,7 +11650,7 @@ inline void SFesCtrlReplyPkg::set_strpara(const ::std::string& value) { strpara_ = new ::std::string; } strpara_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCtrlReplyPkg.strPara) + // @@protoc_insertion_point(field_set:iot_idl.SFesCtrlReplyPkg.strPara) } inline void SFesCtrlReplyPkg::set_strpara(const char* value) { set_has_strpara(); @@ -11658,7 +11658,7 @@ inline void SFesCtrlReplyPkg::set_strpara(const char* value) { strpara_ = new ::std::string; } strpara_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCtrlReplyPkg.strPara) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCtrlReplyPkg.strPara) } inline void SFesCtrlReplyPkg::set_strpara(const char* value, size_t size) { set_has_strpara(); @@ -11666,14 +11666,14 @@ inline void SFesCtrlReplyPkg::set_strpara(const char* value, size_t size) { strpara_ = new ::std::string; } strpara_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCtrlReplyPkg.strPara) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCtrlReplyPkg.strPara) } inline ::std::string* SFesCtrlReplyPkg::mutable_strpara() { set_has_strpara(); if (strpara_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strpara_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCtrlReplyPkg.strPara) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCtrlReplyPkg.strPara) return strpara_; } inline ::std::string* SFesCtrlReplyPkg::release_strpara() { @@ -11697,7 +11697,7 @@ inline void SFesCtrlReplyPkg::set_allocated_strpara(::std::string* strpara) { clear_has_strpara(); strpara_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCtrlReplyPkg.strPara) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCtrlReplyPkg.strPara) } // ------------------------------------------------------------------- @@ -11721,7 +11721,7 @@ inline void SFesCustCmdQueue::clear_strkeyname() { clear_has_strkeyname(); } inline const ::std::string& SFesCustCmdQueue::strkeyname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdQueue.strKeyName) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdQueue.strKeyName) return *strkeyname_; } inline void SFesCustCmdQueue::set_strkeyname(const ::std::string& value) { @@ -11730,7 +11730,7 @@ inline void SFesCustCmdQueue::set_strkeyname(const ::std::string& value) { strkeyname_ = new ::std::string; } strkeyname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdQueue.strKeyName) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdQueue.strKeyName) } inline void SFesCustCmdQueue::set_strkeyname(const char* value) { set_has_strkeyname(); @@ -11738,7 +11738,7 @@ inline void SFesCustCmdQueue::set_strkeyname(const char* value) { strkeyname_ = new ::std::string; } strkeyname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCustCmdQueue.strKeyName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCustCmdQueue.strKeyName) } inline void SFesCustCmdQueue::set_strkeyname(const char* value, size_t size) { set_has_strkeyname(); @@ -11746,14 +11746,14 @@ inline void SFesCustCmdQueue::set_strkeyname(const char* value, size_t size) { strkeyname_ = new ::std::string; } strkeyname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCustCmdQueue.strKeyName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCustCmdQueue.strKeyName) } inline ::std::string* SFesCustCmdQueue::mutable_strkeyname() { set_has_strkeyname(); if (strkeyname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strkeyname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCustCmdQueue.strKeyName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCustCmdQueue.strKeyName) return strkeyname_; } inline ::std::string* SFesCustCmdQueue::release_strkeyname() { @@ -11777,7 +11777,7 @@ inline void SFesCustCmdQueue::set_allocated_strkeyname(::std::string* strkeyname clear_has_strkeyname(); strkeyname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCustCmdQueue.strKeyName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCustCmdQueue.strKeyName) } // required string strKeyValue = 2; @@ -11797,7 +11797,7 @@ inline void SFesCustCmdQueue::clear_strkeyvalue() { clear_has_strkeyvalue(); } inline const ::std::string& SFesCustCmdQueue::strkeyvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdQueue.strKeyValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdQueue.strKeyValue) return *strkeyvalue_; } inline void SFesCustCmdQueue::set_strkeyvalue(const ::std::string& value) { @@ -11806,7 +11806,7 @@ inline void SFesCustCmdQueue::set_strkeyvalue(const ::std::string& value) { strkeyvalue_ = new ::std::string; } strkeyvalue_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdQueue.strKeyValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdQueue.strKeyValue) } inline void SFesCustCmdQueue::set_strkeyvalue(const char* value) { set_has_strkeyvalue(); @@ -11814,7 +11814,7 @@ inline void SFesCustCmdQueue::set_strkeyvalue(const char* value) { strkeyvalue_ = new ::std::string; } strkeyvalue_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCustCmdQueue.strKeyValue) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCustCmdQueue.strKeyValue) } inline void SFesCustCmdQueue::set_strkeyvalue(const char* value, size_t size) { set_has_strkeyvalue(); @@ -11822,14 +11822,14 @@ inline void SFesCustCmdQueue::set_strkeyvalue(const char* value, size_t size) { strkeyvalue_ = new ::std::string; } strkeyvalue_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCustCmdQueue.strKeyValue) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCustCmdQueue.strKeyValue) } inline ::std::string* SFesCustCmdQueue::mutable_strkeyvalue() { set_has_strkeyvalue(); if (strkeyvalue_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strkeyvalue_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCustCmdQueue.strKeyValue) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCustCmdQueue.strKeyValue) return strkeyvalue_; } inline ::std::string* SFesCustCmdQueue::release_strkeyvalue() { @@ -11853,7 +11853,7 @@ inline void SFesCustCmdQueue::set_allocated_strkeyvalue(::std::string* strkeyval clear_has_strkeyvalue(); strkeyvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCustCmdQueue.strKeyValue) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCustCmdQueue.strKeyValue) } // ------------------------------------------------------------------- @@ -11877,7 +11877,7 @@ inline void SFesCustCmdRequestPkg::clear_strsourcetag() { clear_has_strsourcetag(); } inline const ::std::string& SFesCustCmdRequestPkg::strsourcetag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdRequestPkg.strSourceTag) return *strsourcetag_; } inline void SFesCustCmdRequestPkg::set_strsourcetag(const ::std::string& value) { @@ -11886,7 +11886,7 @@ inline void SFesCustCmdRequestPkg::set_strsourcetag(const ::std::string& value) strsourcetag_ = new ::std::string; } strsourcetag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdRequestPkg.strSourceTag) } inline void SFesCustCmdRequestPkg::set_strsourcetag(const char* value) { set_has_strsourcetag(); @@ -11894,7 +11894,7 @@ inline void SFesCustCmdRequestPkg::set_strsourcetag(const char* value) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCustCmdRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCustCmdRequestPkg.strSourceTag) } inline void SFesCustCmdRequestPkg::set_strsourcetag(const char* value, size_t size) { set_has_strsourcetag(); @@ -11902,14 +11902,14 @@ inline void SFesCustCmdRequestPkg::set_strsourcetag(const char* value, size_t si strsourcetag_ = new ::std::string; } strsourcetag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCustCmdRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCustCmdRequestPkg.strSourceTag) } inline ::std::string* SFesCustCmdRequestPkg::mutable_strsourcetag() { set_has_strsourcetag(); if (strsourcetag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strsourcetag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCustCmdRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCustCmdRequestPkg.strSourceTag) return strsourcetag_; } inline ::std::string* SFesCustCmdRequestPkg::release_strsourcetag() { @@ -11933,7 +11933,7 @@ inline void SFesCustCmdRequestPkg::set_allocated_strsourcetag(::std::string* str clear_has_strsourcetag(); strsourcetag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCustCmdRequestPkg.strSourceTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCustCmdRequestPkg.strSourceTag) } // required string strAppTableName = 2; @@ -11953,7 +11953,7 @@ inline void SFesCustCmdRequestPkg::clear_strapptablename() { clear_has_strapptablename(); } inline const ::std::string& SFesCustCmdRequestPkg::strapptablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdRequestPkg.strAppTableName) return *strapptablename_; } inline void SFesCustCmdRequestPkg::set_strapptablename(const ::std::string& value) { @@ -11962,7 +11962,7 @@ inline void SFesCustCmdRequestPkg::set_strapptablename(const ::std::string& valu strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdRequestPkg.strAppTableName) } inline void SFesCustCmdRequestPkg::set_strapptablename(const char* value) { set_has_strapptablename(); @@ -11970,7 +11970,7 @@ inline void SFesCustCmdRequestPkg::set_strapptablename(const char* value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCustCmdRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCustCmdRequestPkg.strAppTableName) } inline void SFesCustCmdRequestPkg::set_strapptablename(const char* value, size_t size) { set_has_strapptablename(); @@ -11978,14 +11978,14 @@ inline void SFesCustCmdRequestPkg::set_strapptablename(const char* value, size_t strapptablename_ = new ::std::string; } strapptablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCustCmdRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCustCmdRequestPkg.strAppTableName) } inline ::std::string* SFesCustCmdRequestPkg::mutable_strapptablename() { set_has_strapptablename(); if (strapptablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCustCmdRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCustCmdRequestPkg.strAppTableName) return strapptablename_; } inline ::std::string* SFesCustCmdRequestPkg::release_strapptablename() { @@ -12009,7 +12009,7 @@ inline void SFesCustCmdRequestPkg::set_allocated_strapptablename(::std::string* clear_has_strapptablename(); strapptablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCustCmdRequestPkg.strAppTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCustCmdRequestPkg.strAppTableName) } // required string strAppTagName = 3; @@ -12029,7 +12029,7 @@ inline void SFesCustCmdRequestPkg::clear_strapptagname() { clear_has_strapptagname(); } inline const ::std::string& SFesCustCmdRequestPkg::strapptagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdRequestPkg.strAppTagName) return *strapptagname_; } inline void SFesCustCmdRequestPkg::set_strapptagname(const ::std::string& value) { @@ -12038,7 +12038,7 @@ inline void SFesCustCmdRequestPkg::set_strapptagname(const ::std::string& value) strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdRequestPkg.strAppTagName) } inline void SFesCustCmdRequestPkg::set_strapptagname(const char* value) { set_has_strapptagname(); @@ -12046,7 +12046,7 @@ inline void SFesCustCmdRequestPkg::set_strapptagname(const char* value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCustCmdRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCustCmdRequestPkg.strAppTagName) } inline void SFesCustCmdRequestPkg::set_strapptagname(const char* value, size_t size) { set_has_strapptagname(); @@ -12054,14 +12054,14 @@ inline void SFesCustCmdRequestPkg::set_strapptagname(const char* value, size_t s strapptagname_ = new ::std::string; } strapptagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCustCmdRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCustCmdRequestPkg.strAppTagName) } inline ::std::string* SFesCustCmdRequestPkg::mutable_strapptagname() { set_has_strapptagname(); if (strapptagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCustCmdRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCustCmdRequestPkg.strAppTagName) return strapptagname_; } inline ::std::string* SFesCustCmdRequestPkg::release_strapptagname() { @@ -12085,7 +12085,7 @@ inline void SFesCustCmdRequestPkg::set_allocated_strapptagname(::std::string* st clear_has_strapptagname(); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCustCmdRequestPkg.strAppTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCustCmdRequestPkg.strAppTagName) } // required string strAppColumnName = 4; @@ -12105,7 +12105,7 @@ inline void SFesCustCmdRequestPkg::clear_strappcolumnname() { clear_has_strappcolumnname(); } inline const ::std::string& SFesCustCmdRequestPkg::strappcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdRequestPkg.strAppColumnName) return *strappcolumnname_; } inline void SFesCustCmdRequestPkg::set_strappcolumnname(const ::std::string& value) { @@ -12114,7 +12114,7 @@ inline void SFesCustCmdRequestPkg::set_strappcolumnname(const ::std::string& val strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdRequestPkg.strAppColumnName) } inline void SFesCustCmdRequestPkg::set_strappcolumnname(const char* value) { set_has_strappcolumnname(); @@ -12122,7 +12122,7 @@ inline void SFesCustCmdRequestPkg::set_strappcolumnname(const char* value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCustCmdRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCustCmdRequestPkg.strAppColumnName) } inline void SFesCustCmdRequestPkg::set_strappcolumnname(const char* value, size_t size) { set_has_strappcolumnname(); @@ -12130,14 +12130,14 @@ inline void SFesCustCmdRequestPkg::set_strappcolumnname(const char* value, size_ strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCustCmdRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCustCmdRequestPkg.strAppColumnName) } inline ::std::string* SFesCustCmdRequestPkg::mutable_strappcolumnname() { set_has_strappcolumnname(); if (strappcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strappcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCustCmdRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCustCmdRequestPkg.strAppColumnName) return strappcolumnname_; } inline ::std::string* SFesCustCmdRequestPkg::release_strappcolumnname() { @@ -12161,7 +12161,7 @@ inline void SFesCustCmdRequestPkg::set_allocated_strappcolumnname(::std::string* clear_has_strappcolumnname(); strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCustCmdRequestPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCustCmdRequestPkg.strAppColumnName) } // required string strRtuName = 5; @@ -12181,7 +12181,7 @@ inline void SFesCustCmdRequestPkg::clear_strrtuname() { clear_has_strrtuname(); } inline const ::std::string& SFesCustCmdRequestPkg::strrtuname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdRequestPkg.strRtuName) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdRequestPkg.strRtuName) return *strrtuname_; } inline void SFesCustCmdRequestPkg::set_strrtuname(const ::std::string& value) { @@ -12190,7 +12190,7 @@ inline void SFesCustCmdRequestPkg::set_strrtuname(const ::std::string& value) { strrtuname_ = new ::std::string; } strrtuname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdRequestPkg.strRtuName) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdRequestPkg.strRtuName) } inline void SFesCustCmdRequestPkg::set_strrtuname(const char* value) { set_has_strrtuname(); @@ -12198,7 +12198,7 @@ inline void SFesCustCmdRequestPkg::set_strrtuname(const char* value) { strrtuname_ = new ::std::string; } strrtuname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCustCmdRequestPkg.strRtuName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCustCmdRequestPkg.strRtuName) } inline void SFesCustCmdRequestPkg::set_strrtuname(const char* value, size_t size) { set_has_strrtuname(); @@ -12206,14 +12206,14 @@ inline void SFesCustCmdRequestPkg::set_strrtuname(const char* value, size_t size strrtuname_ = new ::std::string; } strrtuname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCustCmdRequestPkg.strRtuName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCustCmdRequestPkg.strRtuName) } inline ::std::string* SFesCustCmdRequestPkg::mutable_strrtuname() { set_has_strrtuname(); if (strrtuname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strrtuname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCustCmdRequestPkg.strRtuName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCustCmdRequestPkg.strRtuName) return strrtuname_; } inline ::std::string* SFesCustCmdRequestPkg::release_strrtuname() { @@ -12237,7 +12237,7 @@ inline void SFesCustCmdRequestPkg::set_allocated_strrtuname(::std::string* strrt clear_has_strrtuname(); strrtuname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCustCmdRequestPkg.strRtuName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCustCmdRequestPkg.strRtuName) } // optional int32 nDevId = 6; @@ -12255,13 +12255,13 @@ inline void SFesCustCmdRequestPkg::clear_ndevid() { clear_has_ndevid(); } inline ::google::protobuf::int32 SFesCustCmdRequestPkg::ndevid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdRequestPkg.nDevId) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdRequestPkg.nDevId) return ndevid_; } inline void SFesCustCmdRequestPkg::set_ndevid(::google::protobuf::int32 value) { set_has_ndevid(); ndevid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdRequestPkg.nDevId) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdRequestPkg.nDevId) } // optional int32 nDataLen = 7; @@ -12279,42 +12279,42 @@ inline void SFesCustCmdRequestPkg::clear_ndatalen() { clear_has_ndatalen(); } inline ::google::protobuf::int32 SFesCustCmdRequestPkg::ndatalen() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdRequestPkg.nDataLen) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdRequestPkg.nDataLen) return ndatalen_; } inline void SFesCustCmdRequestPkg::set_ndatalen(::google::protobuf::int32 value) { set_has_ndatalen(); ndatalen_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdRequestPkg.nDataLen) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdRequestPkg.nDataLen) } -// repeated .kbd_idlfile.SFesCustCmdQueue seqCustCmdData = 8; +// repeated .iot_idl.SFesCustCmdQueue seqCustCmdData = 8; inline int SFesCustCmdRequestPkg::seqcustcmddata_size() const { return seqcustcmddata_.size(); } inline void SFesCustCmdRequestPkg::clear_seqcustcmddata() { seqcustcmddata_.Clear(); } -inline const ::kbd_idlfile::SFesCustCmdQueue& SFesCustCmdRequestPkg::seqcustcmddata(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdRequestPkg.seqCustCmdData) +inline const ::iot_idl::SFesCustCmdQueue& SFesCustCmdRequestPkg::seqcustcmddata(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdRequestPkg.seqCustCmdData) return seqcustcmddata_.Get(index); } -inline ::kbd_idlfile::SFesCustCmdQueue* SFesCustCmdRequestPkg::mutable_seqcustcmddata(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCustCmdRequestPkg.seqCustCmdData) +inline ::iot_idl::SFesCustCmdQueue* SFesCustCmdRequestPkg::mutable_seqcustcmddata(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCustCmdRequestPkg.seqCustCmdData) return seqcustcmddata_.Mutable(index); } -inline ::kbd_idlfile::SFesCustCmdQueue* SFesCustCmdRequestPkg::add_seqcustcmddata() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesCustCmdRequestPkg.seqCustCmdData) +inline ::iot_idl::SFesCustCmdQueue* SFesCustCmdRequestPkg::add_seqcustcmddata() { + // @@protoc_insertion_point(field_add:iot_idl.SFesCustCmdRequestPkg.seqCustCmdData) return seqcustcmddata_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesCustCmdQueue >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesCustCmdQueue >& SFesCustCmdRequestPkg::seqcustcmddata() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesCustCmdRequestPkg.seqCustCmdData) + // @@protoc_insertion_point(field_list:iot_idl.SFesCustCmdRequestPkg.seqCustCmdData) return seqcustcmddata_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesCustCmdQueue >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesCustCmdQueue >* SFesCustCmdRequestPkg::mutable_seqcustcmddata() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesCustCmdRequestPkg.seqCustCmdData) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesCustCmdRequestPkg.seqCustCmdData) return &seqcustcmddata_; } @@ -12339,7 +12339,7 @@ inline void SFesCustCmdReplyPkg::clear_strsourcetag() { clear_has_strsourcetag(); } inline const ::std::string& SFesCustCmdReplyPkg::strsourcetag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdReplyPkg.strSourceTag) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdReplyPkg.strSourceTag) return *strsourcetag_; } inline void SFesCustCmdReplyPkg::set_strsourcetag(const ::std::string& value) { @@ -12348,7 +12348,7 @@ inline void SFesCustCmdReplyPkg::set_strsourcetag(const ::std::string& value) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdReplyPkg.strSourceTag) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdReplyPkg.strSourceTag) } inline void SFesCustCmdReplyPkg::set_strsourcetag(const char* value) { set_has_strsourcetag(); @@ -12356,7 +12356,7 @@ inline void SFesCustCmdReplyPkg::set_strsourcetag(const char* value) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCustCmdReplyPkg.strSourceTag) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCustCmdReplyPkg.strSourceTag) } inline void SFesCustCmdReplyPkg::set_strsourcetag(const char* value, size_t size) { set_has_strsourcetag(); @@ -12364,14 +12364,14 @@ inline void SFesCustCmdReplyPkg::set_strsourcetag(const char* value, size_t size strsourcetag_ = new ::std::string; } strsourcetag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCustCmdReplyPkg.strSourceTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCustCmdReplyPkg.strSourceTag) } inline ::std::string* SFesCustCmdReplyPkg::mutable_strsourcetag() { set_has_strsourcetag(); if (strsourcetag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strsourcetag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCustCmdReplyPkg.strSourceTag) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCustCmdReplyPkg.strSourceTag) return strsourcetag_; } inline ::std::string* SFesCustCmdReplyPkg::release_strsourcetag() { @@ -12395,7 +12395,7 @@ inline void SFesCustCmdReplyPkg::set_allocated_strsourcetag(::std::string* strso clear_has_strsourcetag(); strsourcetag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCustCmdReplyPkg.strSourceTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCustCmdReplyPkg.strSourceTag) } // required string strAppTableName = 2; @@ -12415,7 +12415,7 @@ inline void SFesCustCmdReplyPkg::clear_strapptablename() { clear_has_strapptablename(); } inline const ::std::string& SFesCustCmdReplyPkg::strapptablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdReplyPkg.strAppTableName) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdReplyPkg.strAppTableName) return *strapptablename_; } inline void SFesCustCmdReplyPkg::set_strapptablename(const ::std::string& value) { @@ -12424,7 +12424,7 @@ inline void SFesCustCmdReplyPkg::set_strapptablename(const ::std::string& value) strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdReplyPkg.strAppTableName) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdReplyPkg.strAppTableName) } inline void SFesCustCmdReplyPkg::set_strapptablename(const char* value) { set_has_strapptablename(); @@ -12432,7 +12432,7 @@ inline void SFesCustCmdReplyPkg::set_strapptablename(const char* value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCustCmdReplyPkg.strAppTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCustCmdReplyPkg.strAppTableName) } inline void SFesCustCmdReplyPkg::set_strapptablename(const char* value, size_t size) { set_has_strapptablename(); @@ -12440,14 +12440,14 @@ inline void SFesCustCmdReplyPkg::set_strapptablename(const char* value, size_t s strapptablename_ = new ::std::string; } strapptablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCustCmdReplyPkg.strAppTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCustCmdReplyPkg.strAppTableName) } inline ::std::string* SFesCustCmdReplyPkg::mutable_strapptablename() { set_has_strapptablename(); if (strapptablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCustCmdReplyPkg.strAppTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCustCmdReplyPkg.strAppTableName) return strapptablename_; } inline ::std::string* SFesCustCmdReplyPkg::release_strapptablename() { @@ -12471,7 +12471,7 @@ inline void SFesCustCmdReplyPkg::set_allocated_strapptablename(::std::string* st clear_has_strapptablename(); strapptablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCustCmdReplyPkg.strAppTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCustCmdReplyPkg.strAppTableName) } // required string strAppTagName = 4; @@ -12491,7 +12491,7 @@ inline void SFesCustCmdReplyPkg::clear_strapptagname() { clear_has_strapptagname(); } inline const ::std::string& SFesCustCmdReplyPkg::strapptagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdReplyPkg.strAppTagName) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdReplyPkg.strAppTagName) return *strapptagname_; } inline void SFesCustCmdReplyPkg::set_strapptagname(const ::std::string& value) { @@ -12500,7 +12500,7 @@ inline void SFesCustCmdReplyPkg::set_strapptagname(const ::std::string& value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdReplyPkg.strAppTagName) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdReplyPkg.strAppTagName) } inline void SFesCustCmdReplyPkg::set_strapptagname(const char* value) { set_has_strapptagname(); @@ -12508,7 +12508,7 @@ inline void SFesCustCmdReplyPkg::set_strapptagname(const char* value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCustCmdReplyPkg.strAppTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCustCmdReplyPkg.strAppTagName) } inline void SFesCustCmdReplyPkg::set_strapptagname(const char* value, size_t size) { set_has_strapptagname(); @@ -12516,14 +12516,14 @@ inline void SFesCustCmdReplyPkg::set_strapptagname(const char* value, size_t siz strapptagname_ = new ::std::string; } strapptagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCustCmdReplyPkg.strAppTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCustCmdReplyPkg.strAppTagName) } inline ::std::string* SFesCustCmdReplyPkg::mutable_strapptagname() { set_has_strapptagname(); if (strapptagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCustCmdReplyPkg.strAppTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCustCmdReplyPkg.strAppTagName) return strapptagname_; } inline ::std::string* SFesCustCmdReplyPkg::release_strapptagname() { @@ -12547,7 +12547,7 @@ inline void SFesCustCmdReplyPkg::set_allocated_strapptagname(::std::string* stra clear_has_strapptagname(); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCustCmdReplyPkg.strAppTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCustCmdReplyPkg.strAppTagName) } // required string strAppColumnName = 3; @@ -12567,7 +12567,7 @@ inline void SFesCustCmdReplyPkg::clear_strappcolumnname() { clear_has_strappcolumnname(); } inline const ::std::string& SFesCustCmdReplyPkg::strappcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdReplyPkg.strAppColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdReplyPkg.strAppColumnName) return *strappcolumnname_; } inline void SFesCustCmdReplyPkg::set_strappcolumnname(const ::std::string& value) { @@ -12576,7 +12576,7 @@ inline void SFesCustCmdReplyPkg::set_strappcolumnname(const ::std::string& value strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdReplyPkg.strAppColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdReplyPkg.strAppColumnName) } inline void SFesCustCmdReplyPkg::set_strappcolumnname(const char* value) { set_has_strappcolumnname(); @@ -12584,7 +12584,7 @@ inline void SFesCustCmdReplyPkg::set_strappcolumnname(const char* value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCustCmdReplyPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCustCmdReplyPkg.strAppColumnName) } inline void SFesCustCmdReplyPkg::set_strappcolumnname(const char* value, size_t size) { set_has_strappcolumnname(); @@ -12592,14 +12592,14 @@ inline void SFesCustCmdReplyPkg::set_strappcolumnname(const char* value, size_t strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCustCmdReplyPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCustCmdReplyPkg.strAppColumnName) } inline ::std::string* SFesCustCmdReplyPkg::mutable_strappcolumnname() { set_has_strappcolumnname(); if (strappcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strappcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCustCmdReplyPkg.strAppColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCustCmdReplyPkg.strAppColumnName) return strappcolumnname_; } inline ::std::string* SFesCustCmdReplyPkg::release_strappcolumnname() { @@ -12623,7 +12623,7 @@ inline void SFesCustCmdReplyPkg::set_allocated_strappcolumnname(::std::string* s clear_has_strappcolumnname(); strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCustCmdReplyPkg.strAppColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCustCmdReplyPkg.strAppColumnName) } // required string strRtuName = 5; @@ -12643,7 +12643,7 @@ inline void SFesCustCmdReplyPkg::clear_strrtuname() { clear_has_strrtuname(); } inline const ::std::string& SFesCustCmdReplyPkg::strrtuname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdReplyPkg.strRtuName) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdReplyPkg.strRtuName) return *strrtuname_; } inline void SFesCustCmdReplyPkg::set_strrtuname(const ::std::string& value) { @@ -12652,7 +12652,7 @@ inline void SFesCustCmdReplyPkg::set_strrtuname(const ::std::string& value) { strrtuname_ = new ::std::string; } strrtuname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdReplyPkg.strRtuName) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdReplyPkg.strRtuName) } inline void SFesCustCmdReplyPkg::set_strrtuname(const char* value) { set_has_strrtuname(); @@ -12660,7 +12660,7 @@ inline void SFesCustCmdReplyPkg::set_strrtuname(const char* value) { strrtuname_ = new ::std::string; } strrtuname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCustCmdReplyPkg.strRtuName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCustCmdReplyPkg.strRtuName) } inline void SFesCustCmdReplyPkg::set_strrtuname(const char* value, size_t size) { set_has_strrtuname(); @@ -12668,14 +12668,14 @@ inline void SFesCustCmdReplyPkg::set_strrtuname(const char* value, size_t size) strrtuname_ = new ::std::string; } strrtuname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCustCmdReplyPkg.strRtuName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCustCmdReplyPkg.strRtuName) } inline ::std::string* SFesCustCmdReplyPkg::mutable_strrtuname() { set_has_strrtuname(); if (strrtuname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strrtuname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCustCmdReplyPkg.strRtuName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCustCmdReplyPkg.strRtuName) return strrtuname_; } inline ::std::string* SFesCustCmdReplyPkg::release_strrtuname() { @@ -12699,7 +12699,7 @@ inline void SFesCustCmdReplyPkg::set_allocated_strrtuname(::std::string* strrtun clear_has_strrtuname(); strrtuname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCustCmdReplyPkg.strRtuName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCustCmdReplyPkg.strRtuName) } // optional int32 nDevId = 6; @@ -12717,13 +12717,13 @@ inline void SFesCustCmdReplyPkg::clear_ndevid() { clear_has_ndevid(); } inline ::google::protobuf::int32 SFesCustCmdReplyPkg::ndevid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdReplyPkg.nDevId) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdReplyPkg.nDevId) return ndevid_; } inline void SFesCustCmdReplyPkg::set_ndevid(::google::protobuf::int32 value) { set_has_ndevid(); ndevid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdReplyPkg.nDevId) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdReplyPkg.nDevId) } // optional int32 nStatus = 7; @@ -12741,13 +12741,13 @@ inline void SFesCustCmdReplyPkg::clear_nstatus() { clear_has_nstatus(); } inline ::google::protobuf::int32 SFesCustCmdReplyPkg::nstatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdReplyPkg.nStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdReplyPkg.nStatus) return nstatus_; } inline void SFesCustCmdReplyPkg::set_nstatus(::google::protobuf::int32 value) { set_has_nstatus(); nstatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdReplyPkg.nStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdReplyPkg.nStatus) } // optional int32 nDataLen = 8; @@ -12765,42 +12765,42 @@ inline void SFesCustCmdReplyPkg::clear_ndatalen() { clear_has_ndatalen(); } inline ::google::protobuf::int32 SFesCustCmdReplyPkg::ndatalen() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdReplyPkg.nDataLen) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdReplyPkg.nDataLen) return ndatalen_; } inline void SFesCustCmdReplyPkg::set_ndatalen(::google::protobuf::int32 value) { set_has_ndatalen(); ndatalen_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdReplyPkg.nDataLen) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdReplyPkg.nDataLen) } -// repeated .kbd_idlfile.SFesCustCmdQueue seqCustCmdData = 9; +// repeated .iot_idl.SFesCustCmdQueue seqCustCmdData = 9; inline int SFesCustCmdReplyPkg::seqcustcmddata_size() const { return seqcustcmddata_.size(); } inline void SFesCustCmdReplyPkg::clear_seqcustcmddata() { seqcustcmddata_.Clear(); } -inline const ::kbd_idlfile::SFesCustCmdQueue& SFesCustCmdReplyPkg::seqcustcmddata(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdReplyPkg.seqCustCmdData) +inline const ::iot_idl::SFesCustCmdQueue& SFesCustCmdReplyPkg::seqcustcmddata(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdReplyPkg.seqCustCmdData) return seqcustcmddata_.Get(index); } -inline ::kbd_idlfile::SFesCustCmdQueue* SFesCustCmdReplyPkg::mutable_seqcustcmddata(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCustCmdReplyPkg.seqCustCmdData) +inline ::iot_idl::SFesCustCmdQueue* SFesCustCmdReplyPkg::mutable_seqcustcmddata(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCustCmdReplyPkg.seqCustCmdData) return seqcustcmddata_.Mutable(index); } -inline ::kbd_idlfile::SFesCustCmdQueue* SFesCustCmdReplyPkg::add_seqcustcmddata() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesCustCmdReplyPkg.seqCustCmdData) +inline ::iot_idl::SFesCustCmdQueue* SFesCustCmdReplyPkg::add_seqcustcmddata() { + // @@protoc_insertion_point(field_add:iot_idl.SFesCustCmdReplyPkg.seqCustCmdData) return seqcustcmddata_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesCustCmdQueue >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesCustCmdQueue >& SFesCustCmdReplyPkg::seqcustcmddata() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesCustCmdReplyPkg.seqCustCmdData) + // @@protoc_insertion_point(field_list:iot_idl.SFesCustCmdReplyPkg.seqCustCmdData) return seqcustcmddata_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesCustCmdQueue >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesCustCmdQueue >* SFesCustCmdReplyPkg::mutable_seqcustcmddata() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesCustCmdReplyPkg.seqCustCmdData) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesCustCmdReplyPkg.seqCustCmdData) return &seqcustcmddata_; } @@ -12819,13 +12819,13 @@ inline void SFesCustCmdReplyPkg::clear_nresult() { clear_has_nresult(); } inline ::google::protobuf::int32 SFesCustCmdReplyPkg::nresult() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdReplyPkg.nResult) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdReplyPkg.nResult) return nresult_; } inline void SFesCustCmdReplyPkg::set_nresult(::google::protobuf::int32 value) { set_has_nresult(); nresult_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdReplyPkg.nResult) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdReplyPkg.nResult) } // optional string strRetResult = 11; @@ -12845,7 +12845,7 @@ inline void SFesCustCmdReplyPkg::clear_strretresult() { clear_has_strretresult(); } inline const ::std::string& SFesCustCmdReplyPkg::strretresult() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesCustCmdReplyPkg.strRetResult) + // @@protoc_insertion_point(field_get:iot_idl.SFesCustCmdReplyPkg.strRetResult) return *strretresult_; } inline void SFesCustCmdReplyPkg::set_strretresult(const ::std::string& value) { @@ -12854,7 +12854,7 @@ inline void SFesCustCmdReplyPkg::set_strretresult(const ::std::string& value) { strretresult_ = new ::std::string; } strretresult_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesCustCmdReplyPkg.strRetResult) + // @@protoc_insertion_point(field_set:iot_idl.SFesCustCmdReplyPkg.strRetResult) } inline void SFesCustCmdReplyPkg::set_strretresult(const char* value) { set_has_strretresult(); @@ -12862,7 +12862,7 @@ inline void SFesCustCmdReplyPkg::set_strretresult(const char* value) { strretresult_ = new ::std::string; } strretresult_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesCustCmdReplyPkg.strRetResult) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesCustCmdReplyPkg.strRetResult) } inline void SFesCustCmdReplyPkg::set_strretresult(const char* value, size_t size) { set_has_strretresult(); @@ -12870,14 +12870,14 @@ inline void SFesCustCmdReplyPkg::set_strretresult(const char* value, size_t size strretresult_ = new ::std::string; } strretresult_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesCustCmdReplyPkg.strRetResult) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesCustCmdReplyPkg.strRetResult) } inline ::std::string* SFesCustCmdReplyPkg::mutable_strretresult() { set_has_strretresult(); if (strretresult_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strretresult_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesCustCmdReplyPkg.strRetResult) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCustCmdReplyPkg.strRetResult) return strretresult_; } inline ::std::string* SFesCustCmdReplyPkg::release_strretresult() { @@ -12901,7 +12901,7 @@ inline void SFesCustCmdReplyPkg::set_allocated_strretresult(::std::string* strre clear_has_strretresult(); strretresult_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesCustCmdReplyPkg.strRetResult) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesCustCmdReplyPkg.strRetResult) } // ------------------------------------------------------------------- @@ -12925,7 +12925,7 @@ inline void SConstSetQueue::clear_strtagname() { clear_has_strtagname(); } inline const ::std::string& SConstSetQueue::strtagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SConstSetQueue.strTagName) + // @@protoc_insertion_point(field_get:iot_idl.SConstSetQueue.strTagName) return *strtagname_; } inline void SConstSetQueue::set_strtagname(const ::std::string& value) { @@ -12934,7 +12934,7 @@ inline void SConstSetQueue::set_strtagname(const ::std::string& value) { strtagname_ = new ::std::string; } strtagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SConstSetQueue.strTagName) + // @@protoc_insertion_point(field_set:iot_idl.SConstSetQueue.strTagName) } inline void SConstSetQueue::set_strtagname(const char* value) { set_has_strtagname(); @@ -12942,7 +12942,7 @@ inline void SConstSetQueue::set_strtagname(const char* value) { strtagname_ = new ::std::string; } strtagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SConstSetQueue.strTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SConstSetQueue.strTagName) } inline void SConstSetQueue::set_strtagname(const char* value, size_t size) { set_has_strtagname(); @@ -12950,14 +12950,14 @@ inline void SConstSetQueue::set_strtagname(const char* value, size_t size) { strtagname_ = new ::std::string; } strtagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SConstSetQueue.strTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SConstSetQueue.strTagName) } inline ::std::string* SConstSetQueue::mutable_strtagname() { set_has_strtagname(); if (strtagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SConstSetQueue.strTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SConstSetQueue.strTagName) return strtagname_; } inline ::std::string* SConstSetQueue::release_strtagname() { @@ -12981,7 +12981,7 @@ inline void SConstSetQueue::set_allocated_strtagname(::std::string* strtagname) clear_has_strtagname(); strtagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SConstSetQueue.strTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SConstSetQueue.strTagName) } // required int32 nConstID = 2; @@ -12999,13 +12999,13 @@ inline void SConstSetQueue::clear_nconstid() { clear_has_nconstid(); } inline ::google::protobuf::int32 SConstSetQueue::nconstid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SConstSetQueue.nConstID) + // @@protoc_insertion_point(field_get:iot_idl.SConstSetQueue.nConstID) return nconstid_; } inline void SConstSetQueue::set_nconstid(::google::protobuf::int32 value) { set_has_nconstid(); nconstid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SConstSetQueue.nConstID) + // @@protoc_insertion_point(field_set:iot_idl.SConstSetQueue.nConstID) } // required int32 nValue = 3; @@ -13023,13 +13023,13 @@ inline void SConstSetQueue::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int32 SConstSetQueue::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SConstSetQueue.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SConstSetQueue.nValue) return nvalue_; } inline void SConstSetQueue::set_nvalue(::google::protobuf::int32 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SConstSetQueue.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SConstSetQueue.nValue) } // ------------------------------------------------------------------- @@ -13051,13 +13051,13 @@ inline void SFesConstSetRequestPkg::clear_nrtuno() { clear_has_nrtuno(); } inline ::google::protobuf::int32 SFesConstSetRequestPkg::nrtuno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesConstSetRequestPkg.nRtuNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesConstSetRequestPkg.nRtuNo) return nrtuno_; } inline void SFesConstSetRequestPkg::set_nrtuno(::google::protobuf::int32 value) { set_has_nrtuno(); nrtuno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesConstSetRequestPkg.nRtuNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesConstSetRequestPkg.nRtuNo) } // required int32 nDevId = 2; @@ -13075,13 +13075,13 @@ inline void SFesConstSetRequestPkg::clear_ndevid() { clear_has_ndevid(); } inline ::google::protobuf::int32 SFesConstSetRequestPkg::ndevid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesConstSetRequestPkg.nDevId) + // @@protoc_insertion_point(field_get:iot_idl.SFesConstSetRequestPkg.nDevId) return ndevid_; } inline void SFesConstSetRequestPkg::set_ndevid(::google::protobuf::int32 value) { set_has_ndevid(); ndevid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesConstSetRequestPkg.nDevId) + // @@protoc_insertion_point(field_set:iot_idl.SFesConstSetRequestPkg.nDevId) } // required int32 nNum = 3; @@ -13099,42 +13099,42 @@ inline void SFesConstSetRequestPkg::clear_nnum() { clear_has_nnum(); } inline ::google::protobuf::int32 SFesConstSetRequestPkg::nnum() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesConstSetRequestPkg.nNum) + // @@protoc_insertion_point(field_get:iot_idl.SFesConstSetRequestPkg.nNum) return nnum_; } inline void SFesConstSetRequestPkg::set_nnum(::google::protobuf::int32 value) { set_has_nnum(); nnum_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesConstSetRequestPkg.nNum) + // @@protoc_insertion_point(field_set:iot_idl.SFesConstSetRequestPkg.nNum) } -// repeated .kbd_idlfile.SConstSetQueue seqValue = 4; +// repeated .iot_idl.SConstSetQueue seqValue = 4; inline int SFesConstSetRequestPkg::seqvalue_size() const { return seqvalue_.size(); } inline void SFesConstSetRequestPkg::clear_seqvalue() { seqvalue_.Clear(); } -inline const ::kbd_idlfile::SConstSetQueue& SFesConstSetRequestPkg::seqvalue(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesConstSetRequestPkg.seqValue) +inline const ::iot_idl::SConstSetQueue& SFesConstSetRequestPkg::seqvalue(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesConstSetRequestPkg.seqValue) return seqvalue_.Get(index); } -inline ::kbd_idlfile::SConstSetQueue* SFesConstSetRequestPkg::mutable_seqvalue(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesConstSetRequestPkg.seqValue) +inline ::iot_idl::SConstSetQueue* SFesConstSetRequestPkg::mutable_seqvalue(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesConstSetRequestPkg.seqValue) return seqvalue_.Mutable(index); } -inline ::kbd_idlfile::SConstSetQueue* SFesConstSetRequestPkg::add_seqvalue() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesConstSetRequestPkg.seqValue) +inline ::iot_idl::SConstSetQueue* SFesConstSetRequestPkg::add_seqvalue() { + // @@protoc_insertion_point(field_add:iot_idl.SFesConstSetRequestPkg.seqValue) return seqvalue_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SConstSetQueue >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SConstSetQueue >& SFesConstSetRequestPkg::seqvalue() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesConstSetRequestPkg.seqValue) + // @@protoc_insertion_point(field_list:iot_idl.SFesConstSetRequestPkg.seqValue) return seqvalue_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SConstSetQueue >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SConstSetQueue >* SFesConstSetRequestPkg::mutable_seqvalue() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesConstSetRequestPkg.seqValue) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesConstSetRequestPkg.seqValue) return &seqvalue_; } @@ -13157,13 +13157,13 @@ inline void SFesConstReadReplyPkg::clear_nrtuno() { clear_has_nrtuno(); } inline ::google::protobuf::int32 SFesConstReadReplyPkg::nrtuno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesConstReadReplyPkg.nRtuNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesConstReadReplyPkg.nRtuNo) return nrtuno_; } inline void SFesConstReadReplyPkg::set_nrtuno(::google::protobuf::int32 value) { set_has_nrtuno(); nrtuno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesConstReadReplyPkg.nRtuNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesConstReadReplyPkg.nRtuNo) } // required int32 nDevId = 2; @@ -13181,13 +13181,13 @@ inline void SFesConstReadReplyPkg::clear_ndevid() { clear_has_ndevid(); } inline ::google::protobuf::int32 SFesConstReadReplyPkg::ndevid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesConstReadReplyPkg.nDevId) + // @@protoc_insertion_point(field_get:iot_idl.SFesConstReadReplyPkg.nDevId) return ndevid_; } inline void SFesConstReadReplyPkg::set_ndevid(::google::protobuf::int32 value) { set_has_ndevid(); ndevid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesConstReadReplyPkg.nDevId) + // @@protoc_insertion_point(field_set:iot_idl.SFesConstReadReplyPkg.nDevId) } // required int32 nRetStatus = 3; @@ -13205,42 +13205,42 @@ inline void SFesConstReadReplyPkg::clear_nretstatus() { clear_has_nretstatus(); } inline ::google::protobuf::int32 SFesConstReadReplyPkg::nretstatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesConstReadReplyPkg.nRetStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesConstReadReplyPkg.nRetStatus) return nretstatus_; } inline void SFesConstReadReplyPkg::set_nretstatus(::google::protobuf::int32 value) { set_has_nretstatus(); nretstatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesConstReadReplyPkg.nRetStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesConstReadReplyPkg.nRetStatus) } -// repeated .kbd_idlfile.SConstSetQueue seqValue = 4; +// repeated .iot_idl.SConstSetQueue seqValue = 4; inline int SFesConstReadReplyPkg::seqvalue_size() const { return seqvalue_.size(); } inline void SFesConstReadReplyPkg::clear_seqvalue() { seqvalue_.Clear(); } -inline const ::kbd_idlfile::SConstSetQueue& SFesConstReadReplyPkg::seqvalue(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesConstReadReplyPkg.seqValue) +inline const ::iot_idl::SConstSetQueue& SFesConstReadReplyPkg::seqvalue(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesConstReadReplyPkg.seqValue) return seqvalue_.Get(index); } -inline ::kbd_idlfile::SConstSetQueue* SFesConstReadReplyPkg::mutable_seqvalue(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesConstReadReplyPkg.seqValue) +inline ::iot_idl::SConstSetQueue* SFesConstReadReplyPkg::mutable_seqvalue(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesConstReadReplyPkg.seqValue) return seqvalue_.Mutable(index); } -inline ::kbd_idlfile::SConstSetQueue* SFesConstReadReplyPkg::add_seqvalue() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesConstReadReplyPkg.seqValue) +inline ::iot_idl::SConstSetQueue* SFesConstReadReplyPkg::add_seqvalue() { + // @@protoc_insertion_point(field_add:iot_idl.SFesConstReadReplyPkg.seqValue) return seqvalue_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SConstSetQueue >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SConstSetQueue >& SFesConstReadReplyPkg::seqvalue() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesConstReadReplyPkg.seqValue) + // @@protoc_insertion_point(field_list:iot_idl.SFesConstReadReplyPkg.seqValue) return seqvalue_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SConstSetQueue >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SConstSetQueue >* SFesConstReadReplyPkg::mutable_seqvalue() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesConstReadReplyPkg.seqValue) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesConstReadReplyPkg.seqValue) return &seqvalue_; } @@ -13261,7 +13261,7 @@ inline void SFesConstReadReplyPkg::clear_strretresult() { clear_has_strretresult(); } inline const ::std::string& SFesConstReadReplyPkg::strretresult() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesConstReadReplyPkg.strRetResult) + // @@protoc_insertion_point(field_get:iot_idl.SFesConstReadReplyPkg.strRetResult) return *strretresult_; } inline void SFesConstReadReplyPkg::set_strretresult(const ::std::string& value) { @@ -13270,7 +13270,7 @@ inline void SFesConstReadReplyPkg::set_strretresult(const ::std::string& value) strretresult_ = new ::std::string; } strretresult_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesConstReadReplyPkg.strRetResult) + // @@protoc_insertion_point(field_set:iot_idl.SFesConstReadReplyPkg.strRetResult) } inline void SFesConstReadReplyPkg::set_strretresult(const char* value) { set_has_strretresult(); @@ -13278,7 +13278,7 @@ inline void SFesConstReadReplyPkg::set_strretresult(const char* value) { strretresult_ = new ::std::string; } strretresult_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesConstReadReplyPkg.strRetResult) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesConstReadReplyPkg.strRetResult) } inline void SFesConstReadReplyPkg::set_strretresult(const char* value, size_t size) { set_has_strretresult(); @@ -13286,14 +13286,14 @@ inline void SFesConstReadReplyPkg::set_strretresult(const char* value, size_t si strretresult_ = new ::std::string; } strretresult_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesConstReadReplyPkg.strRetResult) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesConstReadReplyPkg.strRetResult) } inline ::std::string* SFesConstReadReplyPkg::mutable_strretresult() { set_has_strretresult(); if (strretresult_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strretresult_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesConstReadReplyPkg.strRetResult) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesConstReadReplyPkg.strRetResult) return strretresult_; } inline ::std::string* SFesConstReadReplyPkg::release_strretresult() { @@ -13317,7 +13317,7 @@ inline void SFesConstReadReplyPkg::set_allocated_strretresult(::std::string* str clear_has_strretresult(); strretresult_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesConstReadReplyPkg.strRetResult) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesConstReadReplyPkg.strRetResult) } // ------------------------------------------------------------------- @@ -13339,13 +13339,13 @@ inline void SFesChanStatusInfo::clear_nchanno() { clear_has_nchanno(); } inline ::google::protobuf::int32 SFesChanStatusInfo::nchanno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChanStatusInfo.nChanNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesChanStatusInfo.nChanNo) return nchanno_; } inline void SFesChanStatusInfo::set_nchanno(::google::protobuf::int32 value) { set_has_nchanno(); nchanno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesChanStatusInfo.nChanNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesChanStatusInfo.nChanNo) } // required uint32 uStatus = 2; @@ -13363,13 +13363,13 @@ inline void SFesChanStatusInfo::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesChanStatusInfo::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChanStatusInfo.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesChanStatusInfo.uStatus) return ustatus_; } inline void SFesChanStatusInfo::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesChanStatusInfo.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesChanStatusInfo.uStatus) } // required float fErrRate = 3; @@ -13387,13 +13387,13 @@ inline void SFesChanStatusInfo::clear_ferrrate() { clear_has_ferrrate(); } inline float SFesChanStatusInfo::ferrrate() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChanStatusInfo.fErrRate) + // @@protoc_insertion_point(field_get:iot_idl.SFesChanStatusInfo.fErrRate) return ferrrate_; } inline void SFesChanStatusInfo::set_ferrrate(float value) { set_has_ferrrate(); ferrrate_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesChanStatusInfo.fErrRate) + // @@protoc_insertion_point(field_set:iot_idl.SFesChanStatusInfo.fErrRate) } // required uint64 ulTime = 4; @@ -13411,20 +13411,20 @@ inline void SFesChanStatusInfo::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesChanStatusInfo::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChanStatusInfo.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesChanStatusInfo.ulTime) return ultime_; } inline void SFesChanStatusInfo::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesChanStatusInfo.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesChanStatusInfo.ulTime) } // ------------------------------------------------------------------- // SFesChanStatusPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesChanStatusPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -13435,26 +13435,26 @@ inline void SFesChanStatusPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesChanStatusPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesChanStatusPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChanStatusPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesChanStatusPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesChanStatusPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesChanStatusPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesChanStatusPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesChanStatusPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesChanStatusPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesChanStatusPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesChanStatusPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesChanStatusPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesChanStatusPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -13462,36 +13462,36 @@ inline void SFesChanStatusPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHe } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesChanStatusPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesChanStatusPkg.stHead) } -// repeated .kbd_idlfile.SFesChanStatusInfo stChanStatus = 2; +// repeated .iot_idl.SFesChanStatusInfo stChanStatus = 2; inline int SFesChanStatusPkg::stchanstatus_size() const { return stchanstatus_.size(); } inline void SFesChanStatusPkg::clear_stchanstatus() { stchanstatus_.Clear(); } -inline const ::kbd_idlfile::SFesChanStatusInfo& SFesChanStatusPkg::stchanstatus(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChanStatusPkg.stChanStatus) +inline const ::iot_idl::SFesChanStatusInfo& SFesChanStatusPkg::stchanstatus(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesChanStatusPkg.stChanStatus) return stchanstatus_.Get(index); } -inline ::kbd_idlfile::SFesChanStatusInfo* SFesChanStatusPkg::mutable_stchanstatus(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesChanStatusPkg.stChanStatus) +inline ::iot_idl::SFesChanStatusInfo* SFesChanStatusPkg::mutable_stchanstatus(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesChanStatusPkg.stChanStatus) return stchanstatus_.Mutable(index); } -inline ::kbd_idlfile::SFesChanStatusInfo* SFesChanStatusPkg::add_stchanstatus() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesChanStatusPkg.stChanStatus) +inline ::iot_idl::SFesChanStatusInfo* SFesChanStatusPkg::add_stchanstatus() { + // @@protoc_insertion_point(field_add:iot_idl.SFesChanStatusPkg.stChanStatus) return stchanstatus_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesChanStatusInfo >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesChanStatusInfo >& SFesChanStatusPkg::stchanstatus() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesChanStatusPkg.stChanStatus) + // @@protoc_insertion_point(field_list:iot_idl.SFesChanStatusPkg.stChanStatus) return stchanstatus_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesChanStatusInfo >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesChanStatusInfo >* SFesChanStatusPkg::mutable_stchanstatus() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesChanStatusPkg.stChanStatus) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesChanStatusPkg.stChanStatus) return &stchanstatus_; } @@ -13514,13 +13514,13 @@ inline void SFesRTUStatusInfo::clear_nrtuno() { clear_has_nrtuno(); } inline ::google::protobuf::int32 SFesRTUStatusInfo::nrtuno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRTUStatusInfo.nRtuNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesRTUStatusInfo.nRtuNo) return nrtuno_; } inline void SFesRTUStatusInfo::set_nrtuno(::google::protobuf::int32 value) { set_has_nrtuno(); nrtuno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesRTUStatusInfo.nRtuNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesRTUStatusInfo.nRtuNo) } // required uint32 uStatus = 2; @@ -13538,13 +13538,13 @@ inline void SFesRTUStatusInfo::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesRTUStatusInfo::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRTUStatusInfo.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesRTUStatusInfo.uStatus) return ustatus_; } inline void SFesRTUStatusInfo::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesRTUStatusInfo.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesRTUStatusInfo.uStatus) } // required uint64 ulTime = 3; @@ -13562,20 +13562,20 @@ inline void SFesRTUStatusInfo::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesRTUStatusInfo::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRTUStatusInfo.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesRTUStatusInfo.ulTime) return ultime_; } inline void SFesRTUStatusInfo::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesRTUStatusInfo.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesRTUStatusInfo.ulTime) } // ------------------------------------------------------------------- // SFesRTUStatusPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesRTUStatusPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -13586,26 +13586,26 @@ inline void SFesRTUStatusPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesRTUStatusPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesRTUStatusPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRTUStatusPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesRTUStatusPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesRTUStatusPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesRTUStatusPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesRTUStatusPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesRTUStatusPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesRTUStatusPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesRTUStatusPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesRTUStatusPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesRTUStatusPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesRTUStatusPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -13613,36 +13613,36 @@ inline void SFesRTUStatusPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHea } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesRTUStatusPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesRTUStatusPkg.stHead) } -// repeated .kbd_idlfile.SFesRTUStatusInfo stRtuStatus = 2; +// repeated .iot_idl.SFesRTUStatusInfo stRtuStatus = 2; inline int SFesRTUStatusPkg::strtustatus_size() const { return strtustatus_.size(); } inline void SFesRTUStatusPkg::clear_strtustatus() { strtustatus_.Clear(); } -inline const ::kbd_idlfile::SFesRTUStatusInfo& SFesRTUStatusPkg::strtustatus(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRTUStatusPkg.stRtuStatus) +inline const ::iot_idl::SFesRTUStatusInfo& SFesRTUStatusPkg::strtustatus(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesRTUStatusPkg.stRtuStatus) return strtustatus_.Get(index); } -inline ::kbd_idlfile::SFesRTUStatusInfo* SFesRTUStatusPkg::mutable_strtustatus(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesRTUStatusPkg.stRtuStatus) +inline ::iot_idl::SFesRTUStatusInfo* SFesRTUStatusPkg::mutable_strtustatus(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesRTUStatusPkg.stRtuStatus) return strtustatus_.Mutable(index); } -inline ::kbd_idlfile::SFesRTUStatusInfo* SFesRTUStatusPkg::add_strtustatus() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesRTUStatusPkg.stRtuStatus) +inline ::iot_idl::SFesRTUStatusInfo* SFesRTUStatusPkg::add_strtustatus() { + // @@protoc_insertion_point(field_add:iot_idl.SFesRTUStatusPkg.stRtuStatus) return strtustatus_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesRTUStatusInfo >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesRTUStatusInfo >& SFesRTUStatusPkg::strtustatus() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesRTUStatusPkg.stRtuStatus) + // @@protoc_insertion_point(field_list:iot_idl.SFesRTUStatusPkg.stRtuStatus) return strtustatus_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesRTUStatusInfo >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesRTUStatusInfo >* SFesRTUStatusPkg::mutable_strtustatus() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesRTUStatusPkg.stRtuStatus) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesRTUStatusPkg.stRtuStatus) return &strtustatus_; } @@ -13667,7 +13667,7 @@ inline void SFesSoeEventInfo::clear_strapptablename() { clear_has_strapptablename(); } inline const ::std::string& SFesSoeEventInfo::strapptablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesSoeEventInfo.strAppTableName) + // @@protoc_insertion_point(field_get:iot_idl.SFesSoeEventInfo.strAppTableName) return *strapptablename_; } inline void SFesSoeEventInfo::set_strapptablename(const ::std::string& value) { @@ -13676,7 +13676,7 @@ inline void SFesSoeEventInfo::set_strapptablename(const ::std::string& value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesSoeEventInfo.strAppTableName) + // @@protoc_insertion_point(field_set:iot_idl.SFesSoeEventInfo.strAppTableName) } inline void SFesSoeEventInfo::set_strapptablename(const char* value) { set_has_strapptablename(); @@ -13684,7 +13684,7 @@ inline void SFesSoeEventInfo::set_strapptablename(const char* value) { strapptablename_ = new ::std::string; } strapptablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesSoeEventInfo.strAppTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesSoeEventInfo.strAppTableName) } inline void SFesSoeEventInfo::set_strapptablename(const char* value, size_t size) { set_has_strapptablename(); @@ -13692,14 +13692,14 @@ inline void SFesSoeEventInfo::set_strapptablename(const char* value, size_t size strapptablename_ = new ::std::string; } strapptablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesSoeEventInfo.strAppTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesSoeEventInfo.strAppTableName) } inline ::std::string* SFesSoeEventInfo::mutable_strapptablename() { set_has_strapptablename(); if (strapptablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesSoeEventInfo.strAppTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesSoeEventInfo.strAppTableName) return strapptablename_; } inline ::std::string* SFesSoeEventInfo::release_strapptablename() { @@ -13723,7 +13723,7 @@ inline void SFesSoeEventInfo::set_allocated_strapptablename(::std::string* strap clear_has_strapptablename(); strapptablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesSoeEventInfo.strAppTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesSoeEventInfo.strAppTableName) } // required string strAppColumnName = 2; @@ -13743,7 +13743,7 @@ inline void SFesSoeEventInfo::clear_strappcolumnname() { clear_has_strappcolumnname(); } inline const ::std::string& SFesSoeEventInfo::strappcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesSoeEventInfo.strAppColumnName) + // @@protoc_insertion_point(field_get:iot_idl.SFesSoeEventInfo.strAppColumnName) return *strappcolumnname_; } inline void SFesSoeEventInfo::set_strappcolumnname(const ::std::string& value) { @@ -13752,7 +13752,7 @@ inline void SFesSoeEventInfo::set_strappcolumnname(const ::std::string& value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesSoeEventInfo.strAppColumnName) + // @@protoc_insertion_point(field_set:iot_idl.SFesSoeEventInfo.strAppColumnName) } inline void SFesSoeEventInfo::set_strappcolumnname(const char* value) { set_has_strappcolumnname(); @@ -13760,7 +13760,7 @@ inline void SFesSoeEventInfo::set_strappcolumnname(const char* value) { strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesSoeEventInfo.strAppColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesSoeEventInfo.strAppColumnName) } inline void SFesSoeEventInfo::set_strappcolumnname(const char* value, size_t size) { set_has_strappcolumnname(); @@ -13768,14 +13768,14 @@ inline void SFesSoeEventInfo::set_strappcolumnname(const char* value, size_t siz strappcolumnname_ = new ::std::string; } strappcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesSoeEventInfo.strAppColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesSoeEventInfo.strAppColumnName) } inline ::std::string* SFesSoeEventInfo::mutable_strappcolumnname() { set_has_strappcolumnname(); if (strappcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strappcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesSoeEventInfo.strAppColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesSoeEventInfo.strAppColumnName) return strappcolumnname_; } inline ::std::string* SFesSoeEventInfo::release_strappcolumnname() { @@ -13799,7 +13799,7 @@ inline void SFesSoeEventInfo::set_allocated_strappcolumnname(::std::string* stra clear_has_strappcolumnname(); strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesSoeEventInfo.strAppColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesSoeEventInfo.strAppColumnName) } // required string strAppTagName = 3; @@ -13819,7 +13819,7 @@ inline void SFesSoeEventInfo::clear_strapptagname() { clear_has_strapptagname(); } inline const ::std::string& SFesSoeEventInfo::strapptagname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesSoeEventInfo.strAppTagName) + // @@protoc_insertion_point(field_get:iot_idl.SFesSoeEventInfo.strAppTagName) return *strapptagname_; } inline void SFesSoeEventInfo::set_strapptagname(const ::std::string& value) { @@ -13828,7 +13828,7 @@ inline void SFesSoeEventInfo::set_strapptagname(const ::std::string& value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesSoeEventInfo.strAppTagName) + // @@protoc_insertion_point(field_set:iot_idl.SFesSoeEventInfo.strAppTagName) } inline void SFesSoeEventInfo::set_strapptagname(const char* value) { set_has_strapptagname(); @@ -13836,7 +13836,7 @@ inline void SFesSoeEventInfo::set_strapptagname(const char* value) { strapptagname_ = new ::std::string; } strapptagname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesSoeEventInfo.strAppTagName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesSoeEventInfo.strAppTagName) } inline void SFesSoeEventInfo::set_strapptagname(const char* value, size_t size) { set_has_strapptagname(); @@ -13844,14 +13844,14 @@ inline void SFesSoeEventInfo::set_strapptagname(const char* value, size_t size) strapptagname_ = new ::std::string; } strapptagname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesSoeEventInfo.strAppTagName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesSoeEventInfo.strAppTagName) } inline ::std::string* SFesSoeEventInfo::mutable_strapptagname() { set_has_strapptagname(); if (strapptagname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptagname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesSoeEventInfo.strAppTagName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesSoeEventInfo.strAppTagName) return strapptagname_; } inline ::std::string* SFesSoeEventInfo::release_strapptagname() { @@ -13875,7 +13875,7 @@ inline void SFesSoeEventInfo::set_allocated_strapptagname(::std::string* strappt clear_has_strapptagname(); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesSoeEventInfo.strAppTagName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesSoeEventInfo.strAppTagName) } // required uint32 uStatus = 4; @@ -13893,13 +13893,13 @@ inline void SFesSoeEventInfo::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesSoeEventInfo::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesSoeEventInfo.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesSoeEventInfo.uStatus) return ustatus_; } inline void SFesSoeEventInfo::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesSoeEventInfo.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesSoeEventInfo.uStatus) } // required int32 nValue = 5; @@ -13917,13 +13917,13 @@ inline void SFesSoeEventInfo::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int32 SFesSoeEventInfo::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesSoeEventInfo.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesSoeEventInfo.nValue) return nvalue_; } inline void SFesSoeEventInfo::set_nvalue(::google::protobuf::int32 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesSoeEventInfo.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesSoeEventInfo.nValue) } // required uint64 ulTime = 6; @@ -13941,13 +13941,13 @@ inline void SFesSoeEventInfo::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesSoeEventInfo::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesSoeEventInfo.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesSoeEventInfo.ulTime) return ultime_; } inline void SFesSoeEventInfo::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesSoeEventInfo.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesSoeEventInfo.ulTime) } // optional string strFaultDesc = 7; @@ -13967,7 +13967,7 @@ inline void SFesSoeEventInfo::clear_strfaultdesc() { clear_has_strfaultdesc(); } inline const ::std::string& SFesSoeEventInfo::strfaultdesc() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesSoeEventInfo.strFaultDesc) + // @@protoc_insertion_point(field_get:iot_idl.SFesSoeEventInfo.strFaultDesc) return *strfaultdesc_; } inline void SFesSoeEventInfo::set_strfaultdesc(const ::std::string& value) { @@ -13976,7 +13976,7 @@ inline void SFesSoeEventInfo::set_strfaultdesc(const ::std::string& value) { strfaultdesc_ = new ::std::string; } strfaultdesc_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesSoeEventInfo.strFaultDesc) + // @@protoc_insertion_point(field_set:iot_idl.SFesSoeEventInfo.strFaultDesc) } inline void SFesSoeEventInfo::set_strfaultdesc(const char* value) { set_has_strfaultdesc(); @@ -13984,7 +13984,7 @@ inline void SFesSoeEventInfo::set_strfaultdesc(const char* value) { strfaultdesc_ = new ::std::string; } strfaultdesc_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesSoeEventInfo.strFaultDesc) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesSoeEventInfo.strFaultDesc) } inline void SFesSoeEventInfo::set_strfaultdesc(const char* value, size_t size) { set_has_strfaultdesc(); @@ -13992,14 +13992,14 @@ inline void SFesSoeEventInfo::set_strfaultdesc(const char* value, size_t size) { strfaultdesc_ = new ::std::string; } strfaultdesc_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesSoeEventInfo.strFaultDesc) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesSoeEventInfo.strFaultDesc) } inline ::std::string* SFesSoeEventInfo::mutable_strfaultdesc() { set_has_strfaultdesc(); if (strfaultdesc_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strfaultdesc_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesSoeEventInfo.strFaultDesc) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesSoeEventInfo.strFaultDesc) return strfaultdesc_; } inline ::std::string* SFesSoeEventInfo::release_strfaultdesc() { @@ -14023,7 +14023,7 @@ inline void SFesSoeEventInfo::set_allocated_strfaultdesc(::std::string* strfault clear_has_strfaultdesc(); strfaultdesc_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesSoeEventInfo.strFaultDesc) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesSoeEventInfo.strFaultDesc) } // ------------------------------------------------------------------- @@ -14047,7 +14047,7 @@ inline void SFesChanEventInfo::clear_strchantag() { clear_has_strchantag(); } inline const ::std::string& SFesChanEventInfo::strchantag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChanEventInfo.strChanTag) + // @@protoc_insertion_point(field_get:iot_idl.SFesChanEventInfo.strChanTag) return *strchantag_; } inline void SFesChanEventInfo::set_strchantag(const ::std::string& value) { @@ -14056,7 +14056,7 @@ inline void SFesChanEventInfo::set_strchantag(const ::std::string& value) { strchantag_ = new ::std::string; } strchantag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesChanEventInfo.strChanTag) + // @@protoc_insertion_point(field_set:iot_idl.SFesChanEventInfo.strChanTag) } inline void SFesChanEventInfo::set_strchantag(const char* value) { set_has_strchantag(); @@ -14064,7 +14064,7 @@ inline void SFesChanEventInfo::set_strchantag(const char* value) { strchantag_ = new ::std::string; } strchantag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesChanEventInfo.strChanTag) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesChanEventInfo.strChanTag) } inline void SFesChanEventInfo::set_strchantag(const char* value, size_t size) { set_has_strchantag(); @@ -14072,14 +14072,14 @@ inline void SFesChanEventInfo::set_strchantag(const char* value, size_t size) { strchantag_ = new ::std::string; } strchantag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesChanEventInfo.strChanTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesChanEventInfo.strChanTag) } inline ::std::string* SFesChanEventInfo::mutable_strchantag() { set_has_strchantag(); if (strchantag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strchantag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesChanEventInfo.strChanTag) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesChanEventInfo.strChanTag) return strchantag_; } inline ::std::string* SFesChanEventInfo::release_strchantag() { @@ -14103,7 +14103,7 @@ inline void SFesChanEventInfo::set_allocated_strchantag(::std::string* strchanta clear_has_strchantag(); strchantag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesChanEventInfo.strChanTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesChanEventInfo.strChanTag) } // required uint32 uStatus = 2; @@ -14121,13 +14121,13 @@ inline void SFesChanEventInfo::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesChanEventInfo::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChanEventInfo.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesChanEventInfo.uStatus) return ustatus_; } inline void SFesChanEventInfo::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesChanEventInfo.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesChanEventInfo.uStatus) } // required float fErrRate = 3; @@ -14145,13 +14145,13 @@ inline void SFesChanEventInfo::clear_ferrrate() { clear_has_ferrrate(); } inline float SFesChanEventInfo::ferrrate() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChanEventInfo.fErrRate) + // @@protoc_insertion_point(field_get:iot_idl.SFesChanEventInfo.fErrRate) return ferrrate_; } inline void SFesChanEventInfo::set_ferrrate(float value) { set_has_ferrrate(); ferrrate_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesChanEventInfo.fErrRate) + // @@protoc_insertion_point(field_set:iot_idl.SFesChanEventInfo.fErrRate) } // required uint64 ulTime = 4; @@ -14169,13 +14169,13 @@ inline void SFesChanEventInfo::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesChanEventInfo::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChanEventInfo.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesChanEventInfo.ulTime) return ultime_; } inline void SFesChanEventInfo::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesChanEventInfo.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesChanEventInfo.ulTime) } // ------------------------------------------------------------------- @@ -14199,7 +14199,7 @@ inline void SFesRTUEventInfo::clear_strrtutag() { clear_has_strrtutag(); } inline const ::std::string& SFesRTUEventInfo::strrtutag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRTUEventInfo.strRtuTag) + // @@protoc_insertion_point(field_get:iot_idl.SFesRTUEventInfo.strRtuTag) return *strrtutag_; } inline void SFesRTUEventInfo::set_strrtutag(const ::std::string& value) { @@ -14208,7 +14208,7 @@ inline void SFesRTUEventInfo::set_strrtutag(const ::std::string& value) { strrtutag_ = new ::std::string; } strrtutag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesRTUEventInfo.strRtuTag) + // @@protoc_insertion_point(field_set:iot_idl.SFesRTUEventInfo.strRtuTag) } inline void SFesRTUEventInfo::set_strrtutag(const char* value) { set_has_strrtutag(); @@ -14216,7 +14216,7 @@ inline void SFesRTUEventInfo::set_strrtutag(const char* value) { strrtutag_ = new ::std::string; } strrtutag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesRTUEventInfo.strRtuTag) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesRTUEventInfo.strRtuTag) } inline void SFesRTUEventInfo::set_strrtutag(const char* value, size_t size) { set_has_strrtutag(); @@ -14224,14 +14224,14 @@ inline void SFesRTUEventInfo::set_strrtutag(const char* value, size_t size) { strrtutag_ = new ::std::string; } strrtutag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesRTUEventInfo.strRtuTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesRTUEventInfo.strRtuTag) } inline ::std::string* SFesRTUEventInfo::mutable_strrtutag() { set_has_strrtutag(); if (strrtutag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strrtutag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesRTUEventInfo.strRtuTag) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesRTUEventInfo.strRtuTag) return strrtutag_; } inline ::std::string* SFesRTUEventInfo::release_strrtutag() { @@ -14255,7 +14255,7 @@ inline void SFesRTUEventInfo::set_allocated_strrtutag(::std::string* strrtutag) clear_has_strrtutag(); strrtutag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesRTUEventInfo.strRtuTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesRTUEventInfo.strRtuTag) } // required uint32 uStatus = 2; @@ -14273,13 +14273,13 @@ inline void SFesRTUEventInfo::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesRTUEventInfo::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRTUEventInfo.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesRTUEventInfo.uStatus) return ustatus_; } inline void SFesRTUEventInfo::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesRTUEventInfo.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesRTUEventInfo.uStatus) } // required int32 nCurChanNo = 3; @@ -14297,13 +14297,13 @@ inline void SFesRTUEventInfo::clear_ncurchanno() { clear_has_ncurchanno(); } inline ::google::protobuf::int32 SFesRTUEventInfo::ncurchanno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRTUEventInfo.nCurChanNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesRTUEventInfo.nCurChanNo) return ncurchanno_; } inline void SFesRTUEventInfo::set_ncurchanno(::google::protobuf::int32 value) { set_has_ncurchanno(); ncurchanno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesRTUEventInfo.nCurChanNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesRTUEventInfo.nCurChanNo) } // required uint64 ulTime = 4; @@ -14321,20 +14321,20 @@ inline void SFesRTUEventInfo::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesRTUEventInfo::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRTUEventInfo.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesRTUEventInfo.ulTime) return ultime_; } inline void SFesRTUEventInfo::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesRTUEventInfo.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesRTUEventInfo.ulTime) } // ------------------------------------------------------------------- // SFesSoeEventPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesSoeEventPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -14345,26 +14345,26 @@ inline void SFesSoeEventPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesSoeEventPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesSoeEventPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesSoeEventPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesSoeEventPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesSoeEventPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesSoeEventPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesSoeEventPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesSoeEventPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesSoeEventPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesSoeEventPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesSoeEventPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesSoeEventPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesSoeEventPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -14372,36 +14372,36 @@ inline void SFesSoeEventPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesSoeEventPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesSoeEventPkg.stHead) } -// repeated .kbd_idlfile.SFesSoeEventInfo stSoeEvent = 2; +// repeated .iot_idl.SFesSoeEventInfo stSoeEvent = 2; inline int SFesSoeEventPkg::stsoeevent_size() const { return stsoeevent_.size(); } inline void SFesSoeEventPkg::clear_stsoeevent() { stsoeevent_.Clear(); } -inline const ::kbd_idlfile::SFesSoeEventInfo& SFesSoeEventPkg::stsoeevent(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesSoeEventPkg.stSoeEvent) +inline const ::iot_idl::SFesSoeEventInfo& SFesSoeEventPkg::stsoeevent(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesSoeEventPkg.stSoeEvent) return stsoeevent_.Get(index); } -inline ::kbd_idlfile::SFesSoeEventInfo* SFesSoeEventPkg::mutable_stsoeevent(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesSoeEventPkg.stSoeEvent) +inline ::iot_idl::SFesSoeEventInfo* SFesSoeEventPkg::mutable_stsoeevent(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesSoeEventPkg.stSoeEvent) return stsoeevent_.Mutable(index); } -inline ::kbd_idlfile::SFesSoeEventInfo* SFesSoeEventPkg::add_stsoeevent() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesSoeEventPkg.stSoeEvent) +inline ::iot_idl::SFesSoeEventInfo* SFesSoeEventPkg::add_stsoeevent() { + // @@protoc_insertion_point(field_add:iot_idl.SFesSoeEventPkg.stSoeEvent) return stsoeevent_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesSoeEventInfo >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesSoeEventInfo >& SFesSoeEventPkg::stsoeevent() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesSoeEventPkg.stSoeEvent) + // @@protoc_insertion_point(field_list:iot_idl.SFesSoeEventPkg.stSoeEvent) return stsoeevent_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesSoeEventInfo >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesSoeEventInfo >* SFesSoeEventPkg::mutable_stsoeevent() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesSoeEventPkg.stSoeEvent) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesSoeEventPkg.stSoeEvent) return &stsoeevent_; } @@ -14409,7 +14409,7 @@ SFesSoeEventPkg::mutable_stsoeevent() { // SFesChanEventPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesChanEventPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -14420,26 +14420,26 @@ inline void SFesChanEventPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesChanEventPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesChanEventPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChanEventPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesChanEventPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesChanEventPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesChanEventPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesChanEventPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesChanEventPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesChanEventPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesChanEventPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesChanEventPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesChanEventPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesChanEventPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -14447,36 +14447,36 @@ inline void SFesChanEventPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHea } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesChanEventPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesChanEventPkg.stHead) } -// repeated .kbd_idlfile.SFesChanEventInfo stChanEvent = 2; +// repeated .iot_idl.SFesChanEventInfo stChanEvent = 2; inline int SFesChanEventPkg::stchanevent_size() const { return stchanevent_.size(); } inline void SFesChanEventPkg::clear_stchanevent() { stchanevent_.Clear(); } -inline const ::kbd_idlfile::SFesChanEventInfo& SFesChanEventPkg::stchanevent(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChanEventPkg.stChanEvent) +inline const ::iot_idl::SFesChanEventInfo& SFesChanEventPkg::stchanevent(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesChanEventPkg.stChanEvent) return stchanevent_.Get(index); } -inline ::kbd_idlfile::SFesChanEventInfo* SFesChanEventPkg::mutable_stchanevent(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesChanEventPkg.stChanEvent) +inline ::iot_idl::SFesChanEventInfo* SFesChanEventPkg::mutable_stchanevent(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesChanEventPkg.stChanEvent) return stchanevent_.Mutable(index); } -inline ::kbd_idlfile::SFesChanEventInfo* SFesChanEventPkg::add_stchanevent() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesChanEventPkg.stChanEvent) +inline ::iot_idl::SFesChanEventInfo* SFesChanEventPkg::add_stchanevent() { + // @@protoc_insertion_point(field_add:iot_idl.SFesChanEventPkg.stChanEvent) return stchanevent_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesChanEventInfo >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesChanEventInfo >& SFesChanEventPkg::stchanevent() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesChanEventPkg.stChanEvent) + // @@protoc_insertion_point(field_list:iot_idl.SFesChanEventPkg.stChanEvent) return stchanevent_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesChanEventInfo >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesChanEventInfo >* SFesChanEventPkg::mutable_stchanevent() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesChanEventPkg.stChanEvent) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesChanEventPkg.stChanEvent) return &stchanevent_; } @@ -14484,7 +14484,7 @@ SFesChanEventPkg::mutable_stchanevent() { // SFesRTUEventPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesRTUEventPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -14495,26 +14495,26 @@ inline void SFesRTUEventPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesRTUEventPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesRTUEventPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRTUEventPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesRTUEventPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesRTUEventPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesRTUEventPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesRTUEventPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesRTUEventPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesRTUEventPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesRTUEventPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesRTUEventPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesRTUEventPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesRTUEventPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -14522,36 +14522,36 @@ inline void SFesRTUEventPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesRTUEventPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesRTUEventPkg.stHead) } -// repeated .kbd_idlfile.SFesRTUEventInfo stRtuEvent = 2; +// repeated .iot_idl.SFesRTUEventInfo stRtuEvent = 2; inline int SFesRTUEventPkg::strtuevent_size() const { return strtuevent_.size(); } inline void SFesRTUEventPkg::clear_strtuevent() { strtuevent_.Clear(); } -inline const ::kbd_idlfile::SFesRTUEventInfo& SFesRTUEventPkg::strtuevent(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesRTUEventPkg.stRtuEvent) +inline const ::iot_idl::SFesRTUEventInfo& SFesRTUEventPkg::strtuevent(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesRTUEventPkg.stRtuEvent) return strtuevent_.Get(index); } -inline ::kbd_idlfile::SFesRTUEventInfo* SFesRTUEventPkg::mutable_strtuevent(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesRTUEventPkg.stRtuEvent) +inline ::iot_idl::SFesRTUEventInfo* SFesRTUEventPkg::mutable_strtuevent(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesRTUEventPkg.stRtuEvent) return strtuevent_.Mutable(index); } -inline ::kbd_idlfile::SFesRTUEventInfo* SFesRTUEventPkg::add_strtuevent() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesRTUEventPkg.stRtuEvent) +inline ::iot_idl::SFesRTUEventInfo* SFesRTUEventPkg::add_strtuevent() { + // @@protoc_insertion_point(field_add:iot_idl.SFesRTUEventPkg.stRtuEvent) return strtuevent_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesRTUEventInfo >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesRTUEventInfo >& SFesRTUEventPkg::strtuevent() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesRTUEventPkg.stRtuEvent) + // @@protoc_insertion_point(field_list:iot_idl.SFesRTUEventPkg.stRtuEvent) return strtuevent_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesRTUEventInfo >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesRTUEventInfo >* SFesRTUEventPkg::mutable_strtuevent() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesRTUEventPkg.stRtuEvent) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesRTUEventPkg.stRtuEvent) return &strtuevent_; } @@ -14574,13 +14574,13 @@ inline void SFesAiValue::clear_npointno() { clear_has_npointno(); } inline ::google::protobuf::int32 SFesAiValue::npointno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiValue.nPointNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesAiValue.nPointNo) return npointno_; } inline void SFesAiValue::set_npointno(::google::protobuf::int32 value) { set_has_npointno(); npointno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAiValue.nPointNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesAiValue.nPointNo) } // required float fValue = 2; @@ -14598,13 +14598,13 @@ inline void SFesAiValue::clear_fvalue() { clear_has_fvalue(); } inline float SFesAiValue::fvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiValue.fValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesAiValue.fValue) return fvalue_; } inline void SFesAiValue::set_fvalue(float value) { set_has_fvalue(); fvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAiValue.fValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesAiValue.fValue) } // required uint32 uStatus = 3; @@ -14622,13 +14622,13 @@ inline void SFesAiValue::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesAiValue::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiValue.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesAiValue.uStatus) return ustatus_; } inline void SFesAiValue::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAiValue.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesAiValue.uStatus) } // required uint64 ulTime = 4; @@ -14646,13 +14646,13 @@ inline void SFesAiValue::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesAiValue::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiValue.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesAiValue.ulTime) return ultime_; } inline void SFesAiValue::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAiValue.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesAiValue.ulTime) } // ------------------------------------------------------------------- @@ -14674,13 +14674,13 @@ inline void SFesDiValue::clear_npointno() { clear_has_npointno(); } inline ::google::protobuf::int32 SFesDiValue::npointno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiValue.nPointNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesDiValue.nPointNo) return npointno_; } inline void SFesDiValue::set_npointno(::google::protobuf::int32 value) { set_has_npointno(); npointno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDiValue.nPointNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesDiValue.nPointNo) } // required int32 nValue = 2; @@ -14698,13 +14698,13 @@ inline void SFesDiValue::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int32 SFesDiValue::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiValue.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesDiValue.nValue) return nvalue_; } inline void SFesDiValue::set_nvalue(::google::protobuf::int32 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDiValue.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesDiValue.nValue) } // required uint32 uStatus = 3; @@ -14722,13 +14722,13 @@ inline void SFesDiValue::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesDiValue::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiValue.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesDiValue.uStatus) return ustatus_; } inline void SFesDiValue::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDiValue.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesDiValue.uStatus) } // required uint64 ulTime = 4; @@ -14746,13 +14746,13 @@ inline void SFesDiValue::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesDiValue::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiValue.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesDiValue.ulTime) return ultime_; } inline void SFesDiValue::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDiValue.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesDiValue.ulTime) } // ------------------------------------------------------------------- @@ -14774,13 +14774,13 @@ inline void SFesPiValue::clear_npointno() { clear_has_npointno(); } inline ::google::protobuf::int32 SFesPiValue::npointno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiValue.nPointNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesPiValue.nPointNo) return npointno_; } inline void SFesPiValue::set_npointno(::google::protobuf::int32 value) { set_has_npointno(); npointno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesPiValue.nPointNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesPiValue.nPointNo) } // required int64 nValue = 2; @@ -14798,13 +14798,13 @@ inline void SFesPiValue::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int64 SFesPiValue::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiValue.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesPiValue.nValue) return nvalue_; } inline void SFesPiValue::set_nvalue(::google::protobuf::int64 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesPiValue.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesPiValue.nValue) } // required uint32 uStatus = 3; @@ -14822,13 +14822,13 @@ inline void SFesPiValue::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesPiValue::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiValue.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesPiValue.uStatus) return ustatus_; } inline void SFesPiValue::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesPiValue.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesPiValue.uStatus) } // required uint64 ulTime = 4; @@ -14846,13 +14846,13 @@ inline void SFesPiValue::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesPiValue::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiValue.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesPiValue.ulTime) return ultime_; } inline void SFesPiValue::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesPiValue.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesPiValue.ulTime) } // ------------------------------------------------------------------- @@ -14874,13 +14874,13 @@ inline void SFesMiValue::clear_npointno() { clear_has_npointno(); } inline ::google::protobuf::int32 SFesMiValue::npointno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiValue.nPointNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesMiValue.nPointNo) return npointno_; } inline void SFesMiValue::set_npointno(::google::protobuf::int32 value) { set_has_npointno(); npointno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMiValue.nPointNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesMiValue.nPointNo) } // required int32 nValue = 2; @@ -14898,13 +14898,13 @@ inline void SFesMiValue::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int32 SFesMiValue::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiValue.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesMiValue.nValue) return nvalue_; } inline void SFesMiValue::set_nvalue(::google::protobuf::int32 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMiValue.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesMiValue.nValue) } // required uint32 uStatus = 3; @@ -14922,13 +14922,13 @@ inline void SFesMiValue::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesMiValue::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiValue.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesMiValue.uStatus) return ustatus_; } inline void SFesMiValue::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMiValue.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesMiValue.uStatus) } // required uint64 ulTime = 4; @@ -14946,20 +14946,20 @@ inline void SFesMiValue::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesMiValue::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiValue.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesMiValue.ulTime) return ultime_; } inline void SFesMiValue::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMiValue.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesMiValue.ulTime) } // ------------------------------------------------------------------- // SFesValueReqPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesValueReqPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -14970,26 +14970,26 @@ inline void SFesValueReqPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesValueReqPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesValueReqPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesValueReqPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesValueReqPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesValueReqPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesValueReqPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesValueReqPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesValueReqPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesValueReqPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesValueReqPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesValueReqPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesValueReqPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesValueReqPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -14997,7 +14997,7 @@ inline void SFesValueReqPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesValueReqPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesValueReqPkg.stHead) } // required int32 nRtuNo = 2; @@ -15015,20 +15015,20 @@ inline void SFesValueReqPkg::clear_nrtuno() { clear_has_nrtuno(); } inline ::google::protobuf::int32 SFesValueReqPkg::nrtuno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesValueReqPkg.nRtuNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesValueReqPkg.nRtuNo) return nrtuno_; } inline void SFesValueReqPkg::set_nrtuno(::google::protobuf::int32 value) { set_has_nrtuno(); nrtuno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesValueReqPkg.nRtuNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesValueReqPkg.nRtuNo) } // ------------------------------------------------------------------- // SFesAiValueRespPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesAiValueRespPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -15039,26 +15039,26 @@ inline void SFesAiValueRespPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesAiValueRespPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesAiValueRespPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiValueRespPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesAiValueRespPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesAiValueRespPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesAiValueRespPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesAiValueRespPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesAiValueRespPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesAiValueRespPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesAiValueRespPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesAiValueRespPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesAiValueRespPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesAiValueRespPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -15066,7 +15066,7 @@ inline void SFesAiValueRespPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgH } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesAiValueRespPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesAiValueRespPkg.stHead) } // required int32 nRtuNo = 2; @@ -15084,42 +15084,42 @@ inline void SFesAiValueRespPkg::clear_nrtuno() { clear_has_nrtuno(); } inline ::google::protobuf::int32 SFesAiValueRespPkg::nrtuno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiValueRespPkg.nRtuNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesAiValueRespPkg.nRtuNo) return nrtuno_; } inline void SFesAiValueRespPkg::set_nrtuno(::google::protobuf::int32 value) { set_has_nrtuno(); nrtuno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesAiValueRespPkg.nRtuNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesAiValueRespPkg.nRtuNo) } -// repeated .kbd_idlfile.SFesAiValue stAiValue = 3; +// repeated .iot_idl.SFesAiValue stAiValue = 3; inline int SFesAiValueRespPkg::staivalue_size() const { return staivalue_.size(); } inline void SFesAiValueRespPkg::clear_staivalue() { staivalue_.Clear(); } -inline const ::kbd_idlfile::SFesAiValue& SFesAiValueRespPkg::staivalue(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesAiValueRespPkg.stAiValue) +inline const ::iot_idl::SFesAiValue& SFesAiValueRespPkg::staivalue(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesAiValueRespPkg.stAiValue) return staivalue_.Get(index); } -inline ::kbd_idlfile::SFesAiValue* SFesAiValueRespPkg::mutable_staivalue(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesAiValueRespPkg.stAiValue) +inline ::iot_idl::SFesAiValue* SFesAiValueRespPkg::mutable_staivalue(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesAiValueRespPkg.stAiValue) return staivalue_.Mutable(index); } -inline ::kbd_idlfile::SFesAiValue* SFesAiValueRespPkg::add_staivalue() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesAiValueRespPkg.stAiValue) +inline ::iot_idl::SFesAiValue* SFesAiValueRespPkg::add_staivalue() { + // @@protoc_insertion_point(field_add:iot_idl.SFesAiValueRespPkg.stAiValue) return staivalue_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesAiValue >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAiValue >& SFesAiValueRespPkg::staivalue() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesAiValueRespPkg.stAiValue) + // @@protoc_insertion_point(field_list:iot_idl.SFesAiValueRespPkg.stAiValue) return staivalue_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesAiValue >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAiValue >* SFesAiValueRespPkg::mutable_staivalue() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesAiValueRespPkg.stAiValue) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesAiValueRespPkg.stAiValue) return &staivalue_; } @@ -15127,7 +15127,7 @@ SFesAiValueRespPkg::mutable_staivalue() { // SFesDiValueRespPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesDiValueRespPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -15138,26 +15138,26 @@ inline void SFesDiValueRespPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesDiValueRespPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesDiValueRespPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiValueRespPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesDiValueRespPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesDiValueRespPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesDiValueRespPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesDiValueRespPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesDiValueRespPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesDiValueRespPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesDiValueRespPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesDiValueRespPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesDiValueRespPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesDiValueRespPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -15165,7 +15165,7 @@ inline void SFesDiValueRespPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgH } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesDiValueRespPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesDiValueRespPkg.stHead) } // required int32 nRtuNo = 2; @@ -15183,42 +15183,42 @@ inline void SFesDiValueRespPkg::clear_nrtuno() { clear_has_nrtuno(); } inline ::google::protobuf::int32 SFesDiValueRespPkg::nrtuno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiValueRespPkg.nRtuNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesDiValueRespPkg.nRtuNo) return nrtuno_; } inline void SFesDiValueRespPkg::set_nrtuno(::google::protobuf::int32 value) { set_has_nrtuno(); nrtuno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesDiValueRespPkg.nRtuNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesDiValueRespPkg.nRtuNo) } -// repeated .kbd_idlfile.SFesDiValue stDiValue = 3; +// repeated .iot_idl.SFesDiValue stDiValue = 3; inline int SFesDiValueRespPkg::stdivalue_size() const { return stdivalue_.size(); } inline void SFesDiValueRespPkg::clear_stdivalue() { stdivalue_.Clear(); } -inline const ::kbd_idlfile::SFesDiValue& SFesDiValueRespPkg::stdivalue(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesDiValueRespPkg.stDiValue) +inline const ::iot_idl::SFesDiValue& SFesDiValueRespPkg::stdivalue(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesDiValueRespPkg.stDiValue) return stdivalue_.Get(index); } -inline ::kbd_idlfile::SFesDiValue* SFesDiValueRespPkg::mutable_stdivalue(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesDiValueRespPkg.stDiValue) +inline ::iot_idl::SFesDiValue* SFesDiValueRespPkg::mutable_stdivalue(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesDiValueRespPkg.stDiValue) return stdivalue_.Mutable(index); } -inline ::kbd_idlfile::SFesDiValue* SFesDiValueRespPkg::add_stdivalue() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesDiValueRespPkg.stDiValue) +inline ::iot_idl::SFesDiValue* SFesDiValueRespPkg::add_stdivalue() { + // @@protoc_insertion_point(field_add:iot_idl.SFesDiValueRespPkg.stDiValue) return stdivalue_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesDiValue >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDiValue >& SFesDiValueRespPkg::stdivalue() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesDiValueRespPkg.stDiValue) + // @@protoc_insertion_point(field_list:iot_idl.SFesDiValueRespPkg.stDiValue) return stdivalue_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesDiValue >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDiValue >* SFesDiValueRespPkg::mutable_stdivalue() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesDiValueRespPkg.stDiValue) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesDiValueRespPkg.stDiValue) return &stdivalue_; } @@ -15226,7 +15226,7 @@ SFesDiValueRespPkg::mutable_stdivalue() { // SFesPiValueRespPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesPiValueRespPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -15237,26 +15237,26 @@ inline void SFesPiValueRespPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesPiValueRespPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesPiValueRespPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiValueRespPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesPiValueRespPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesPiValueRespPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesPiValueRespPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesPiValueRespPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesPiValueRespPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesPiValueRespPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesPiValueRespPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesPiValueRespPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesPiValueRespPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesPiValueRespPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -15264,7 +15264,7 @@ inline void SFesPiValueRespPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgH } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesPiValueRespPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesPiValueRespPkg.stHead) } // required int32 nRtuNo = 2; @@ -15282,42 +15282,42 @@ inline void SFesPiValueRespPkg::clear_nrtuno() { clear_has_nrtuno(); } inline ::google::protobuf::int32 SFesPiValueRespPkg::nrtuno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiValueRespPkg.nRtuNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesPiValueRespPkg.nRtuNo) return nrtuno_; } inline void SFesPiValueRespPkg::set_nrtuno(::google::protobuf::int32 value) { set_has_nrtuno(); nrtuno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesPiValueRespPkg.nRtuNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesPiValueRespPkg.nRtuNo) } -// repeated .kbd_idlfile.SFesPiValue stPiValue = 3; +// repeated .iot_idl.SFesPiValue stPiValue = 3; inline int SFesPiValueRespPkg::stpivalue_size() const { return stpivalue_.size(); } inline void SFesPiValueRespPkg::clear_stpivalue() { stpivalue_.Clear(); } -inline const ::kbd_idlfile::SFesPiValue& SFesPiValueRespPkg::stpivalue(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesPiValueRespPkg.stPiValue) +inline const ::iot_idl::SFesPiValue& SFesPiValueRespPkg::stpivalue(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesPiValueRespPkg.stPiValue) return stpivalue_.Get(index); } -inline ::kbd_idlfile::SFesPiValue* SFesPiValueRespPkg::mutable_stpivalue(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesPiValueRespPkg.stPiValue) +inline ::iot_idl::SFesPiValue* SFesPiValueRespPkg::mutable_stpivalue(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesPiValueRespPkg.stPiValue) return stpivalue_.Mutable(index); } -inline ::kbd_idlfile::SFesPiValue* SFesPiValueRespPkg::add_stpivalue() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesPiValueRespPkg.stPiValue) +inline ::iot_idl::SFesPiValue* SFesPiValueRespPkg::add_stpivalue() { + // @@protoc_insertion_point(field_add:iot_idl.SFesPiValueRespPkg.stPiValue) return stpivalue_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesPiValue >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesPiValue >& SFesPiValueRespPkg::stpivalue() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesPiValueRespPkg.stPiValue) + // @@protoc_insertion_point(field_list:iot_idl.SFesPiValueRespPkg.stPiValue) return stpivalue_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesPiValue >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesPiValue >* SFesPiValueRespPkg::mutable_stpivalue() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesPiValueRespPkg.stPiValue) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesPiValueRespPkg.stPiValue) return &stpivalue_; } @@ -15325,7 +15325,7 @@ SFesPiValueRespPkg::mutable_stpivalue() { // SFesMiValueRespPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesMiValueRespPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -15336,26 +15336,26 @@ inline void SFesMiValueRespPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesMiValueRespPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesMiValueRespPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiValueRespPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesMiValueRespPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesMiValueRespPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesMiValueRespPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesMiValueRespPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesMiValueRespPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesMiValueRespPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesMiValueRespPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesMiValueRespPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesMiValueRespPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesMiValueRespPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -15363,7 +15363,7 @@ inline void SFesMiValueRespPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgH } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesMiValueRespPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesMiValueRespPkg.stHead) } // required int32 nRtuNo = 2; @@ -15381,42 +15381,42 @@ inline void SFesMiValueRespPkg::clear_nrtuno() { clear_has_nrtuno(); } inline ::google::protobuf::int32 SFesMiValueRespPkg::nrtuno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiValueRespPkg.nRtuNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesMiValueRespPkg.nRtuNo) return nrtuno_; } inline void SFesMiValueRespPkg::set_nrtuno(::google::protobuf::int32 value) { set_has_nrtuno(); nrtuno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesMiValueRespPkg.nRtuNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesMiValueRespPkg.nRtuNo) } -// repeated .kbd_idlfile.SFesMiValue stMiValue = 3; +// repeated .iot_idl.SFesMiValue stMiValue = 3; inline int SFesMiValueRespPkg::stmivalue_size() const { return stmivalue_.size(); } inline void SFesMiValueRespPkg::clear_stmivalue() { stmivalue_.Clear(); } -inline const ::kbd_idlfile::SFesMiValue& SFesMiValueRespPkg::stmivalue(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesMiValueRespPkg.stMiValue) +inline const ::iot_idl::SFesMiValue& SFesMiValueRespPkg::stmivalue(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesMiValueRespPkg.stMiValue) return stmivalue_.Get(index); } -inline ::kbd_idlfile::SFesMiValue* SFesMiValueRespPkg::mutable_stmivalue(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesMiValueRespPkg.stMiValue) +inline ::iot_idl::SFesMiValue* SFesMiValueRespPkg::mutable_stmivalue(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesMiValueRespPkg.stMiValue) return stmivalue_.Mutable(index); } -inline ::kbd_idlfile::SFesMiValue* SFesMiValueRespPkg::add_stmivalue() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesMiValueRespPkg.stMiValue) +inline ::iot_idl::SFesMiValue* SFesMiValueRespPkg::add_stmivalue() { + // @@protoc_insertion_point(field_add:iot_idl.SFesMiValueRespPkg.stMiValue) return stmivalue_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesMiValue >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMiValue >& SFesMiValueRespPkg::stmivalue() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesMiValueRespPkg.stMiValue) + // @@protoc_insertion_point(field_list:iot_idl.SFesMiValueRespPkg.stMiValue) return stmivalue_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesMiValue >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMiValue >* SFesMiValueRespPkg::mutable_stmivalue() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesMiValueRespPkg.stMiValue) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesMiValueRespPkg.stMiValue) return &stmivalue_; } @@ -15441,7 +15441,7 @@ inline void SFesVirtualData::clear_strrtutag() { clear_has_strrtutag(); } inline const ::std::string& SFesVirtualData::strrtutag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesVirtualData.strRtuTag) + // @@protoc_insertion_point(field_get:iot_idl.SFesVirtualData.strRtuTag) return *strrtutag_; } inline void SFesVirtualData::set_strrtutag(const ::std::string& value) { @@ -15450,7 +15450,7 @@ inline void SFesVirtualData::set_strrtutag(const ::std::string& value) { strrtutag_ = new ::std::string; } strrtutag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesVirtualData.strRtuTag) + // @@protoc_insertion_point(field_set:iot_idl.SFesVirtualData.strRtuTag) } inline void SFesVirtualData::set_strrtutag(const char* value) { set_has_strrtutag(); @@ -15458,7 +15458,7 @@ inline void SFesVirtualData::set_strrtutag(const char* value) { strrtutag_ = new ::std::string; } strrtutag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesVirtualData.strRtuTag) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesVirtualData.strRtuTag) } inline void SFesVirtualData::set_strrtutag(const char* value, size_t size) { set_has_strrtutag(); @@ -15466,14 +15466,14 @@ inline void SFesVirtualData::set_strrtutag(const char* value, size_t size) { strrtutag_ = new ::std::string; } strrtutag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesVirtualData.strRtuTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesVirtualData.strRtuTag) } inline ::std::string* SFesVirtualData::mutable_strrtutag() { set_has_strrtutag(); if (strrtutag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strrtutag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesVirtualData.strRtuTag) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesVirtualData.strRtuTag) return strrtutag_; } inline ::std::string* SFesVirtualData::release_strrtutag() { @@ -15497,7 +15497,7 @@ inline void SFesVirtualData::set_allocated_strrtutag(::std::string* strrtutag) { clear_has_strrtutag(); strrtutag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesVirtualData.strRtuTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesVirtualData.strRtuTag) } // required string strPointTag = 2; @@ -15517,7 +15517,7 @@ inline void SFesVirtualData::clear_strpointtag() { clear_has_strpointtag(); } inline const ::std::string& SFesVirtualData::strpointtag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesVirtualData.strPointTag) + // @@protoc_insertion_point(field_get:iot_idl.SFesVirtualData.strPointTag) return *strpointtag_; } inline void SFesVirtualData::set_strpointtag(const ::std::string& value) { @@ -15526,7 +15526,7 @@ inline void SFesVirtualData::set_strpointtag(const ::std::string& value) { strpointtag_ = new ::std::string; } strpointtag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesVirtualData.strPointTag) + // @@protoc_insertion_point(field_set:iot_idl.SFesVirtualData.strPointTag) } inline void SFesVirtualData::set_strpointtag(const char* value) { set_has_strpointtag(); @@ -15534,7 +15534,7 @@ inline void SFesVirtualData::set_strpointtag(const char* value) { strpointtag_ = new ::std::string; } strpointtag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesVirtualData.strPointTag) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesVirtualData.strPointTag) } inline void SFesVirtualData::set_strpointtag(const char* value, size_t size) { set_has_strpointtag(); @@ -15542,14 +15542,14 @@ inline void SFesVirtualData::set_strpointtag(const char* value, size_t size) { strpointtag_ = new ::std::string; } strpointtag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesVirtualData.strPointTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesVirtualData.strPointTag) } inline ::std::string* SFesVirtualData::mutable_strpointtag() { set_has_strpointtag(); if (strpointtag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strpointtag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesVirtualData.strPointTag) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesVirtualData.strPointTag) return strpointtag_; } inline ::std::string* SFesVirtualData::release_strpointtag() { @@ -15573,7 +15573,7 @@ inline void SFesVirtualData::set_allocated_strpointtag(::std::string* strpointta clear_has_strpointtag(); strpointtag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesVirtualData.strPointTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesVirtualData.strPointTag) } // required int32 nPointType = 3; @@ -15591,13 +15591,13 @@ inline void SFesVirtualData::clear_npointtype() { clear_has_npointtype(); } inline ::google::protobuf::int32 SFesVirtualData::npointtype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesVirtualData.nPointType) + // @@protoc_insertion_point(field_get:iot_idl.SFesVirtualData.nPointType) return npointtype_; } inline void SFesVirtualData::set_npointtype(::google::protobuf::int32 value) { set_has_npointtype(); npointtype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesVirtualData.nPointType) + // @@protoc_insertion_point(field_set:iot_idl.SFesVirtualData.nPointType) } // required int32 nOrder = 4; @@ -15615,13 +15615,13 @@ inline void SFesVirtualData::clear_norder() { clear_has_norder(); } inline ::google::protobuf::int32 SFesVirtualData::norder() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesVirtualData.nOrder) + // @@protoc_insertion_point(field_get:iot_idl.SFesVirtualData.nOrder) return norder_; } inline void SFesVirtualData::set_norder(::google::protobuf::int32 value) { set_has_norder(); norder_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesVirtualData.nOrder) + // @@protoc_insertion_point(field_set:iot_idl.SFesVirtualData.nOrder) } // required float fValue = 5; @@ -15639,13 +15639,13 @@ inline void SFesVirtualData::clear_fvalue() { clear_has_fvalue(); } inline float SFesVirtualData::fvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesVirtualData.fValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesVirtualData.fValue) return fvalue_; } inline void SFesVirtualData::set_fvalue(float value) { set_has_fvalue(); fvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesVirtualData.fValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesVirtualData.fValue) } // required uint64 ulTime = 6; @@ -15663,20 +15663,20 @@ inline void SFesVirtualData::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesVirtualData::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesVirtualData.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesVirtualData.ulTime) return ultime_; } inline void SFesVirtualData::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesVirtualData.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesVirtualData.ulTime) } // ------------------------------------------------------------------- // SFesChangeVirtualDataPkg -// required .kbd_idlfile.SFesRealPkgHead stHead = 1; +// required .iot_idl.SFesRealPkgHead stHead = 1; inline bool SFesChangeVirtualDataPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -15687,26 +15687,26 @@ inline void SFesChangeVirtualDataPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesChangeVirtualDataPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesRealPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesRealPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesRealPkgHead& SFesChangeVirtualDataPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChangeVirtualDataPkg.stHead) +inline const ::iot_idl::SFesRealPkgHead& SFesChangeVirtualDataPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesChangeVirtualDataPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesChangeVirtualDataPkg::mutable_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesChangeVirtualDataPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesRealPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesChangeVirtualDataPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesRealPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesChangeVirtualDataPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesRealPkgHead* SFesChangeVirtualDataPkg::release_sthead() { +inline ::iot_idl::SFesRealPkgHead* SFesChangeVirtualDataPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesRealPkgHead* temp = sthead_; + ::iot_idl::SFesRealPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesChangeVirtualDataPkg::set_allocated_sthead(::kbd_idlfile::SFesRealPkgHead* sthead) { +inline void SFesChangeVirtualDataPkg::set_allocated_sthead(::iot_idl::SFesRealPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -15714,52 +15714,52 @@ inline void SFesChangeVirtualDataPkg::set_allocated_sthead(::kbd_idlfile::SFesRe } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesChangeVirtualDataPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesChangeVirtualDataPkg.stHead) } -// repeated .kbd_idlfile.SFesVirtualData stData = 2; +// repeated .iot_idl.SFesVirtualData stData = 2; inline int SFesChangeVirtualDataPkg::stdata_size() const { return stdata_.size(); } inline void SFesChangeVirtualDataPkg::clear_stdata() { stdata_.Clear(); } -inline const ::kbd_idlfile::SFesVirtualData& SFesChangeVirtualDataPkg::stdata(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesChangeVirtualDataPkg.stData) +inline const ::iot_idl::SFesVirtualData& SFesChangeVirtualDataPkg::stdata(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesChangeVirtualDataPkg.stData) return stdata_.Get(index); } -inline ::kbd_idlfile::SFesVirtualData* SFesChangeVirtualDataPkg::mutable_stdata(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesChangeVirtualDataPkg.stData) +inline ::iot_idl::SFesVirtualData* SFesChangeVirtualDataPkg::mutable_stdata(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesChangeVirtualDataPkg.stData) return stdata_.Mutable(index); } -inline ::kbd_idlfile::SFesVirtualData* SFesChangeVirtualDataPkg::add_stdata() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesChangeVirtualDataPkg.stData) +inline ::iot_idl::SFesVirtualData* SFesChangeVirtualDataPkg::add_stdata() { + // @@protoc_insertion_point(field_add:iot_idl.SFesChangeVirtualDataPkg.stData) return stdata_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesVirtualData >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesVirtualData >& SFesChangeVirtualDataPkg::stdata() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesChangeVirtualDataPkg.stData) + // @@protoc_insertion_point(field_list:iot_idl.SFesChangeVirtualDataPkg.stData) return stdata_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesVirtualData >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesVirtualData >* SFesChangeVirtualDataPkg::mutable_stdata() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesChangeVirtualDataPkg.stData) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesChangeVirtualDataPkg.stData) return &stdata_; } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::enFesMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enFesMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enFesMsgType>() { - return ::kbd_idlfile::enFesMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enFesMsgType>() { + return ::iot_idl::enFesMsgType_descriptor(); } } // namespace google diff --git a/platform/src/idl_files/FesMessage.proto b/platform/src/idl_files/FesMessage.proto index 2159aed7..eda62ad2 100644 --- a/platform/src/idl_files/FesMessage.proto +++ b/platform/src/idl_files/FesMessage.proto @@ -4,7 +4,7 @@ // @author ??? //======================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; //======================================================================================== // 消息类型枚举 diff --git a/platform/src/idl_files/IntelliAlmMsg.pb.cc b/platform/src/idl_files/IntelliAlmMsg.pb.cc index a2b35c5b..696d732c 100644 --- a/platform/src/idl_files/IntelliAlmMsg.pb.cc +++ b/platform/src/idl_files/IntelliAlmMsg.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -224,14 +224,14 @@ void protobuf_AddDesc_IntelliAlmMsg_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\023IntelliAlmMsg.proto\022\013kbd_idlfile\"\327\001\n\017S" + "\n\023IntelliAlmMsg.proto\022\013iot_idl\"\327\001\n\017S" "IntelliAlmInfo\0228\n\013logic_state\030\001 \002(\0162#.kb" "d_idlfile.enIntelliAlmLogicState\022\021\n\tdoma" "in_id\030\002 \002(\005\022\020\n\010priority\030\003 \002(\005\022\022\n\ntime_st" "amp\030\004 \002(\003\022\023\n\013uuid_base64\030\005 \002(\t\022\017\n\007conten" "t\030\006 \002(\t\022\025\n\rdisposal_plan\030\007 \001(\t\022\024\n\014raw_al" "m_uuid\030\010 \003(\t\"@\n\016SIntelliAlmAdd\022.\n\010alm_in" - "fo\030\001 \003(\0132\034.kbd_idlfile.SIntelliAlmInfo\"8" + "fo\030\001 \003(\0132\034.iot_idl.SIntelliAlmInfo\"8" "\n\016SIntelliAlmDel\022\021\n\tdomain_id\030\001 \002(\005\022\023\n\013u" "uid_base64\030\002 \003(\t\"(\n\021SIntelliAlmBroken\022\023\n" "\013uuid_base64\030\001 \003(\t\")\n\022SIntelliAlmRelease" @@ -329,7 +329,7 @@ const int SIntelliAlmInfo::kRawAlmUuidFieldNumber; SIntelliAlmInfo::SIntelliAlmInfo() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SIntelliAlmInfo) + // @@protoc_insertion_point(constructor:iot_idl.SIntelliAlmInfo) } void SIntelliAlmInfo::InitAsDefaultInstance() { @@ -339,7 +339,7 @@ SIntelliAlmInfo::SIntelliAlmInfo(const SIntelliAlmInfo& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SIntelliAlmInfo) + // @@protoc_insertion_point(copy_constructor:iot_idl.SIntelliAlmInfo) } void SIntelliAlmInfo::SharedCtor() { @@ -356,7 +356,7 @@ void SIntelliAlmInfo::SharedCtor() { } SIntelliAlmInfo::~SIntelliAlmInfo() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SIntelliAlmInfo) + // @@protoc_insertion_point(destructor:iot_idl.SIntelliAlmInfo) SharedDtor(); } @@ -439,21 +439,21 @@ bool SIntelliAlmInfo::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SIntelliAlmInfo) + // @@protoc_insertion_point(parse_start:iot_idl.SIntelliAlmInfo) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.enIntelliAlmLogicState logic_state = 1; + // required .iot_idl.enIntelliAlmLogicState logic_state = 1; case 1: { if (tag == 8) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::enIntelliAlmLogicState_IsValid(value)) { - set_logic_state(static_cast< ::kbd_idlfile::enIntelliAlmLogicState >(value)); + if (::iot_idl::enIntelliAlmLogicState_IsValid(value)) { + set_logic_state(static_cast< ::iot_idl::enIntelliAlmLogicState >(value)); } else { mutable_unknown_fields()->AddVarint(1, value); } @@ -593,18 +593,18 @@ bool SIntelliAlmInfo::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SIntelliAlmInfo) + // @@protoc_insertion_point(parse_success:iot_idl.SIntelliAlmInfo) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SIntelliAlmInfo) + // @@protoc_insertion_point(parse_failure:iot_idl.SIntelliAlmInfo) return false; #undef DO_ } void SIntelliAlmInfo::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SIntelliAlmInfo) - // required .kbd_idlfile.enIntelliAlmLogicState logic_state = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SIntelliAlmInfo) + // required .iot_idl.enIntelliAlmLogicState logic_state = 1; if (has_logic_state()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 1, this->logic_state(), output); @@ -669,13 +669,13 @@ void SIntelliAlmInfo::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SIntelliAlmInfo) + // @@protoc_insertion_point(serialize_end:iot_idl.SIntelliAlmInfo) } ::google::protobuf::uint8* SIntelliAlmInfo::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SIntelliAlmInfo) - // required .kbd_idlfile.enIntelliAlmLogicState logic_state = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SIntelliAlmInfo) + // required .iot_idl.enIntelliAlmLogicState logic_state = 1; if (has_logic_state()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 1, this->logic_state(), target); @@ -743,7 +743,7 @@ void SIntelliAlmInfo::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SIntelliAlmInfo) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SIntelliAlmInfo) return target; } @@ -751,7 +751,7 @@ int SIntelliAlmInfo::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.enIntelliAlmLogicState logic_state = 1; + // required .iot_idl.enIntelliAlmLogicState logic_state = 1; if (has_logic_state()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->logic_state()); @@ -911,7 +911,7 @@ const int SIntelliAlmAdd::kAlmInfoFieldNumber; SIntelliAlmAdd::SIntelliAlmAdd() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SIntelliAlmAdd) + // @@protoc_insertion_point(constructor:iot_idl.SIntelliAlmAdd) } void SIntelliAlmAdd::InitAsDefaultInstance() { @@ -921,7 +921,7 @@ SIntelliAlmAdd::SIntelliAlmAdd(const SIntelliAlmAdd& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SIntelliAlmAdd) + // @@protoc_insertion_point(copy_constructor:iot_idl.SIntelliAlmAdd) } void SIntelliAlmAdd::SharedCtor() { @@ -930,7 +930,7 @@ void SIntelliAlmAdd::SharedCtor() { } SIntelliAlmAdd::~SIntelliAlmAdd() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SIntelliAlmAdd) + // @@protoc_insertion_point(destructor:iot_idl.SIntelliAlmAdd) SharedDtor(); } @@ -970,13 +970,13 @@ bool SIntelliAlmAdd::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SIntelliAlmAdd) + // @@protoc_insertion_point(parse_start:iot_idl.SIntelliAlmAdd) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated .kbd_idlfile.SIntelliAlmInfo alm_info = 1; + // repeated .iot_idl.SIntelliAlmInfo alm_info = 1; case 1: { if (tag == 10) { parse_alm_info: @@ -1004,18 +1004,18 @@ bool SIntelliAlmAdd::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SIntelliAlmAdd) + // @@protoc_insertion_point(parse_success:iot_idl.SIntelliAlmAdd) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SIntelliAlmAdd) + // @@protoc_insertion_point(parse_failure:iot_idl.SIntelliAlmAdd) return false; #undef DO_ } void SIntelliAlmAdd::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SIntelliAlmAdd) - // repeated .kbd_idlfile.SIntelliAlmInfo alm_info = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SIntelliAlmAdd) + // repeated .iot_idl.SIntelliAlmInfo alm_info = 1; for (int i = 0; i < this->alm_info_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->alm_info(i), output); @@ -1025,13 +1025,13 @@ void SIntelliAlmAdd::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SIntelliAlmAdd) + // @@protoc_insertion_point(serialize_end:iot_idl.SIntelliAlmAdd) } ::google::protobuf::uint8* SIntelliAlmAdd::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SIntelliAlmAdd) - // repeated .kbd_idlfile.SIntelliAlmInfo alm_info = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SIntelliAlmAdd) + // repeated .iot_idl.SIntelliAlmInfo alm_info = 1; for (int i = 0; i < this->alm_info_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1042,14 +1042,14 @@ void SIntelliAlmAdd::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SIntelliAlmAdd) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SIntelliAlmAdd) return target; } int SIntelliAlmAdd::ByteSize() const { int total_size = 0; - // repeated .kbd_idlfile.SIntelliAlmInfo alm_info = 1; + // repeated .iot_idl.SIntelliAlmInfo alm_info = 1; total_size += 1 * this->alm_info_size(); for (int i = 0; i < this->alm_info_size(); i++) { total_size += @@ -1132,7 +1132,7 @@ const int SIntelliAlmDel::kUuidBase64FieldNumber; SIntelliAlmDel::SIntelliAlmDel() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SIntelliAlmDel) + // @@protoc_insertion_point(constructor:iot_idl.SIntelliAlmDel) } void SIntelliAlmDel::InitAsDefaultInstance() { @@ -1142,7 +1142,7 @@ SIntelliAlmDel::SIntelliAlmDel(const SIntelliAlmDel& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SIntelliAlmDel) + // @@protoc_insertion_point(copy_constructor:iot_idl.SIntelliAlmDel) } void SIntelliAlmDel::SharedCtor() { @@ -1153,7 +1153,7 @@ void SIntelliAlmDel::SharedCtor() { } SIntelliAlmDel::~SIntelliAlmDel() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SIntelliAlmDel) + // @@protoc_insertion_point(destructor:iot_idl.SIntelliAlmDel) SharedDtor(); } @@ -1194,7 +1194,7 @@ bool SIntelliAlmDel::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SIntelliAlmDel) + // @@protoc_insertion_point(parse_start:iot_idl.SIntelliAlmDel) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1247,17 +1247,17 @@ bool SIntelliAlmDel::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SIntelliAlmDel) + // @@protoc_insertion_point(parse_success:iot_idl.SIntelliAlmDel) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SIntelliAlmDel) + // @@protoc_insertion_point(parse_failure:iot_idl.SIntelliAlmDel) return false; #undef DO_ } void SIntelliAlmDel::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SIntelliAlmDel) + // @@protoc_insertion_point(serialize_start:iot_idl.SIntelliAlmDel) // required int32 domain_id = 1; if (has_domain_id()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->domain_id(), output); @@ -1277,12 +1277,12 @@ void SIntelliAlmDel::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SIntelliAlmDel) + // @@protoc_insertion_point(serialize_end:iot_idl.SIntelliAlmDel) } ::google::protobuf::uint8* SIntelliAlmDel::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SIntelliAlmDel) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SIntelliAlmDel) // required int32 domain_id = 1; if (has_domain_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->domain_id(), target); @@ -1302,7 +1302,7 @@ void SIntelliAlmDel::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SIntelliAlmDel) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SIntelliAlmDel) return target; } @@ -1405,7 +1405,7 @@ const int SIntelliAlmBroken::kUuidBase64FieldNumber; SIntelliAlmBroken::SIntelliAlmBroken() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SIntelliAlmBroken) + // @@protoc_insertion_point(constructor:iot_idl.SIntelliAlmBroken) } void SIntelliAlmBroken::InitAsDefaultInstance() { @@ -1415,7 +1415,7 @@ SIntelliAlmBroken::SIntelliAlmBroken(const SIntelliAlmBroken& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SIntelliAlmBroken) + // @@protoc_insertion_point(copy_constructor:iot_idl.SIntelliAlmBroken) } void SIntelliAlmBroken::SharedCtor() { @@ -1425,7 +1425,7 @@ void SIntelliAlmBroken::SharedCtor() { } SIntelliAlmBroken::~SIntelliAlmBroken() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SIntelliAlmBroken) + // @@protoc_insertion_point(destructor:iot_idl.SIntelliAlmBroken) SharedDtor(); } @@ -1465,7 +1465,7 @@ bool SIntelliAlmBroken::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SIntelliAlmBroken) + // @@protoc_insertion_point(parse_start:iot_idl.SIntelliAlmBroken) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1504,17 +1504,17 @@ bool SIntelliAlmBroken::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SIntelliAlmBroken) + // @@protoc_insertion_point(parse_success:iot_idl.SIntelliAlmBroken) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SIntelliAlmBroken) + // @@protoc_insertion_point(parse_failure:iot_idl.SIntelliAlmBroken) return false; #undef DO_ } void SIntelliAlmBroken::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SIntelliAlmBroken) + // @@protoc_insertion_point(serialize_start:iot_idl.SIntelliAlmBroken) // repeated string uuid_base64 = 1; for (int i = 0; i < this->uuid_base64_size(); i++) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1529,12 +1529,12 @@ void SIntelliAlmBroken::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SIntelliAlmBroken) + // @@protoc_insertion_point(serialize_end:iot_idl.SIntelliAlmBroken) } ::google::protobuf::uint8* SIntelliAlmBroken::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SIntelliAlmBroken) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SIntelliAlmBroken) // repeated string uuid_base64 = 1; for (int i = 0; i < this->uuid_base64_size(); i++) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1549,7 +1549,7 @@ void SIntelliAlmBroken::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SIntelliAlmBroken) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SIntelliAlmBroken) return target; } @@ -1636,7 +1636,7 @@ const int SIntelliAlmRelease::kUuidBase64FieldNumber; SIntelliAlmRelease::SIntelliAlmRelease() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SIntelliAlmRelease) + // @@protoc_insertion_point(constructor:iot_idl.SIntelliAlmRelease) } void SIntelliAlmRelease::InitAsDefaultInstance() { @@ -1646,7 +1646,7 @@ SIntelliAlmRelease::SIntelliAlmRelease(const SIntelliAlmRelease& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SIntelliAlmRelease) + // @@protoc_insertion_point(copy_constructor:iot_idl.SIntelliAlmRelease) } void SIntelliAlmRelease::SharedCtor() { @@ -1656,7 +1656,7 @@ void SIntelliAlmRelease::SharedCtor() { } SIntelliAlmRelease::~SIntelliAlmRelease() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SIntelliAlmRelease) + // @@protoc_insertion_point(destructor:iot_idl.SIntelliAlmRelease) SharedDtor(); } @@ -1696,7 +1696,7 @@ bool SIntelliAlmRelease::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SIntelliAlmRelease) + // @@protoc_insertion_point(parse_start:iot_idl.SIntelliAlmRelease) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1735,17 +1735,17 @@ bool SIntelliAlmRelease::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SIntelliAlmRelease) + // @@protoc_insertion_point(parse_success:iot_idl.SIntelliAlmRelease) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SIntelliAlmRelease) + // @@protoc_insertion_point(parse_failure:iot_idl.SIntelliAlmRelease) return false; #undef DO_ } void SIntelliAlmRelease::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SIntelliAlmRelease) + // @@protoc_insertion_point(serialize_start:iot_idl.SIntelliAlmRelease) // repeated string uuid_base64 = 1; for (int i = 0; i < this->uuid_base64_size(); i++) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1760,12 +1760,12 @@ void SIntelliAlmRelease::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SIntelliAlmRelease) + // @@protoc_insertion_point(serialize_end:iot_idl.SIntelliAlmRelease) } ::google::protobuf::uint8* SIntelliAlmRelease::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SIntelliAlmRelease) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SIntelliAlmRelease) // repeated string uuid_base64 = 1; for (int i = 0; i < this->uuid_base64_size(); i++) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1780,7 +1780,7 @@ void SIntelliAlmRelease::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SIntelliAlmRelease) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SIntelliAlmRelease) return target; } @@ -1868,7 +1868,7 @@ const int SIntelliAlmSepr::kRawAlmUuidFieldNumber; SIntelliAlmSepr::SIntelliAlmSepr() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SIntelliAlmSepr) + // @@protoc_insertion_point(constructor:iot_idl.SIntelliAlmSepr) } void SIntelliAlmSepr::InitAsDefaultInstance() { @@ -1878,7 +1878,7 @@ SIntelliAlmSepr::SIntelliAlmSepr(const SIntelliAlmSepr& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SIntelliAlmSepr) + // @@protoc_insertion_point(copy_constructor:iot_idl.SIntelliAlmSepr) } void SIntelliAlmSepr::SharedCtor() { @@ -1889,7 +1889,7 @@ void SIntelliAlmSepr::SharedCtor() { } SIntelliAlmSepr::~SIntelliAlmSepr() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SIntelliAlmSepr) + // @@protoc_insertion_point(destructor:iot_idl.SIntelliAlmSepr) SharedDtor(); } @@ -1930,7 +1930,7 @@ bool SIntelliAlmSepr::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SIntelliAlmSepr) + // @@protoc_insertion_point(parse_start:iot_idl.SIntelliAlmSepr) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1983,17 +1983,17 @@ bool SIntelliAlmSepr::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SIntelliAlmSepr) + // @@protoc_insertion_point(parse_success:iot_idl.SIntelliAlmSepr) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SIntelliAlmSepr) + // @@protoc_insertion_point(parse_failure:iot_idl.SIntelliAlmSepr) return false; #undef DO_ } void SIntelliAlmSepr::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SIntelliAlmSepr) + // @@protoc_insertion_point(serialize_start:iot_idl.SIntelliAlmSepr) // required int32 domain_id = 1; if (has_domain_id()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->domain_id(), output); @@ -2013,12 +2013,12 @@ void SIntelliAlmSepr::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SIntelliAlmSepr) + // @@protoc_insertion_point(serialize_end:iot_idl.SIntelliAlmSepr) } ::google::protobuf::uint8* SIntelliAlmSepr::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SIntelliAlmSepr) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SIntelliAlmSepr) // required int32 domain_id = 1; if (has_domain_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->domain_id(), target); @@ -2038,7 +2038,7 @@ void SIntelliAlmSepr::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SIntelliAlmSepr) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SIntelliAlmSepr) return target; } @@ -2142,7 +2142,7 @@ const int SIntelliAlmMerge::kRawAlmUuidFieldNumber; SIntelliAlmMerge::SIntelliAlmMerge() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SIntelliAlmMerge) + // @@protoc_insertion_point(constructor:iot_idl.SIntelliAlmMerge) } void SIntelliAlmMerge::InitAsDefaultInstance() { @@ -2152,7 +2152,7 @@ SIntelliAlmMerge::SIntelliAlmMerge(const SIntelliAlmMerge& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SIntelliAlmMerge) + // @@protoc_insertion_point(copy_constructor:iot_idl.SIntelliAlmMerge) } void SIntelliAlmMerge::SharedCtor() { @@ -2163,7 +2163,7 @@ void SIntelliAlmMerge::SharedCtor() { } SIntelliAlmMerge::~SIntelliAlmMerge() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SIntelliAlmMerge) + // @@protoc_insertion_point(destructor:iot_idl.SIntelliAlmMerge) SharedDtor(); } @@ -2204,7 +2204,7 @@ bool SIntelliAlmMerge::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SIntelliAlmMerge) + // @@protoc_insertion_point(parse_start:iot_idl.SIntelliAlmMerge) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2257,17 +2257,17 @@ bool SIntelliAlmMerge::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SIntelliAlmMerge) + // @@protoc_insertion_point(parse_success:iot_idl.SIntelliAlmMerge) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SIntelliAlmMerge) + // @@protoc_insertion_point(parse_failure:iot_idl.SIntelliAlmMerge) return false; #undef DO_ } void SIntelliAlmMerge::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SIntelliAlmMerge) + // @@protoc_insertion_point(serialize_start:iot_idl.SIntelliAlmMerge) // required int32 domain_id = 1; if (has_domain_id()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->domain_id(), output); @@ -2287,12 +2287,12 @@ void SIntelliAlmMerge::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SIntelliAlmMerge) + // @@protoc_insertion_point(serialize_end:iot_idl.SIntelliAlmMerge) } ::google::protobuf::uint8* SIntelliAlmMerge::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SIntelliAlmMerge) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SIntelliAlmMerge) // required int32 domain_id = 1; if (has_domain_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->domain_id(), target); @@ -2312,7 +2312,7 @@ void SIntelliAlmMerge::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SIntelliAlmMerge) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SIntelliAlmMerge) return target; } @@ -2408,6 +2408,6 @@ void SIntelliAlmMerge::Swap(SIntelliAlmMerge* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/platform/src/idl_files/IntelliAlmMsg.pb.h b/platform/src/idl_files/IntelliAlmMsg.pb.h index e3e598f5..1417d2bd 100644 --- a/platform/src/idl_files/IntelliAlmMsg.pb.h +++ b/platform/src/idl_files/IntelliAlmMsg.pb.h @@ -27,7 +27,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { // Internal implementation detail -- do not call these. void IDL_FILES_EXPORT protobuf_AddDesc_IntelliAlmMsg_2eproto(); @@ -146,12 +146,12 @@ class IDL_FILES_EXPORT SIntelliAlmInfo : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.enIntelliAlmLogicState logic_state = 1; + // required .iot_idl.enIntelliAlmLogicState logic_state = 1; inline bool has_logic_state() const; inline void clear_logic_state(); static const int kLogicStateFieldNumber = 1; - inline ::kbd_idlfile::enIntelliAlmLogicState logic_state() const; - inline void set_logic_state(::kbd_idlfile::enIntelliAlmLogicState value); + inline ::iot_idl::enIntelliAlmLogicState logic_state() const; + inline void set_logic_state(::iot_idl::enIntelliAlmLogicState value); // required int32 domain_id = 2; inline bool has_domain_id() const; @@ -226,7 +226,7 @@ class IDL_FILES_EXPORT SIntelliAlmInfo : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& raw_alm_uuid() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_raw_alm_uuid(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SIntelliAlmInfo) + // @@protoc_insertion_point(class_scope:iot_idl.SIntelliAlmInfo) private: inline void set_has_logic_state(); inline void clear_has_logic_state(); @@ -317,26 +317,26 @@ class IDL_FILES_EXPORT SIntelliAlmAdd : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // repeated .kbd_idlfile.SIntelliAlmInfo alm_info = 1; + // repeated .iot_idl.SIntelliAlmInfo alm_info = 1; inline int alm_info_size() const; inline void clear_alm_info(); static const int kAlmInfoFieldNumber = 1; - inline const ::kbd_idlfile::SIntelliAlmInfo& alm_info(int index) const; - inline ::kbd_idlfile::SIntelliAlmInfo* mutable_alm_info(int index); - inline ::kbd_idlfile::SIntelliAlmInfo* add_alm_info(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SIntelliAlmInfo >& + inline const ::iot_idl::SIntelliAlmInfo& alm_info(int index) const; + inline ::iot_idl::SIntelliAlmInfo* mutable_alm_info(int index); + inline ::iot_idl::SIntelliAlmInfo* add_alm_info(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SIntelliAlmInfo >& alm_info() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SIntelliAlmInfo >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SIntelliAlmInfo >* mutable_alm_info(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SIntelliAlmAdd) + // @@protoc_insertion_point(class_scope:iot_idl.SIntelliAlmAdd) private: ::google::protobuf::UnknownFieldSet _unknown_fields_; ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SIntelliAlmInfo > alm_info_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SIntelliAlmInfo > alm_info_; friend void IDL_FILES_EXPORT protobuf_AddDesc_IntelliAlmMsg_2eproto(); friend void protobuf_AssignDesc_IntelliAlmMsg_2eproto(); friend void protobuf_ShutdownFile_IntelliAlmMsg_2eproto(); @@ -422,7 +422,7 @@ class IDL_FILES_EXPORT SIntelliAlmDel : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& uuid_base64() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_uuid_base64(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SIntelliAlmDel) + // @@protoc_insertion_point(class_scope:iot_idl.SIntelliAlmDel) private: inline void set_has_domain_id(); inline void clear_has_domain_id(); @@ -511,7 +511,7 @@ class IDL_FILES_EXPORT SIntelliAlmBroken : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& uuid_base64() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_uuid_base64(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SIntelliAlmBroken) + // @@protoc_insertion_point(class_scope:iot_idl.SIntelliAlmBroken) private: ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -597,7 +597,7 @@ class IDL_FILES_EXPORT SIntelliAlmRelease : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& uuid_base64() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_uuid_base64(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SIntelliAlmRelease) + // @@protoc_insertion_point(class_scope:iot_idl.SIntelliAlmRelease) private: ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -690,7 +690,7 @@ class IDL_FILES_EXPORT SIntelliAlmSepr : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& raw_alm_uuid() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_raw_alm_uuid(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SIntelliAlmSepr) + // @@protoc_insertion_point(class_scope:iot_idl.SIntelliAlmSepr) private: inline void set_has_domain_id(); inline void clear_has_domain_id(); @@ -786,7 +786,7 @@ class IDL_FILES_EXPORT SIntelliAlmMerge : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& raw_alm_uuid() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_raw_alm_uuid(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SIntelliAlmMerge) + // @@protoc_insertion_point(class_scope:iot_idl.SIntelliAlmMerge) private: inline void set_has_domain_id(); inline void clear_has_domain_id(); @@ -811,7 +811,7 @@ class IDL_FILES_EXPORT SIntelliAlmMerge : public ::google::protobuf::Message { // SIntelliAlmInfo -// required .kbd_idlfile.enIntelliAlmLogicState logic_state = 1; +// required .iot_idl.enIntelliAlmLogicState logic_state = 1; inline bool SIntelliAlmInfo::has_logic_state() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -825,15 +825,15 @@ inline void SIntelliAlmInfo::clear_logic_state() { logic_state_ = 1; clear_has_logic_state(); } -inline ::kbd_idlfile::enIntelliAlmLogicState SIntelliAlmInfo::logic_state() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmInfo.logic_state) - return static_cast< ::kbd_idlfile::enIntelliAlmLogicState >(logic_state_); +inline ::iot_idl::enIntelliAlmLogicState SIntelliAlmInfo::logic_state() const { + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmInfo.logic_state) + return static_cast< ::iot_idl::enIntelliAlmLogicState >(logic_state_); } -inline void SIntelliAlmInfo::set_logic_state(::kbd_idlfile::enIntelliAlmLogicState value) { - assert(::kbd_idlfile::enIntelliAlmLogicState_IsValid(value)); +inline void SIntelliAlmInfo::set_logic_state(::iot_idl::enIntelliAlmLogicState value) { + assert(::iot_idl::enIntelliAlmLogicState_IsValid(value)); set_has_logic_state(); logic_state_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SIntelliAlmInfo.logic_state) + // @@protoc_insertion_point(field_set:iot_idl.SIntelliAlmInfo.logic_state) } // required int32 domain_id = 2; @@ -851,13 +851,13 @@ inline void SIntelliAlmInfo::clear_domain_id() { clear_has_domain_id(); } inline ::google::protobuf::int32 SIntelliAlmInfo::domain_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmInfo.domain_id) + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmInfo.domain_id) return domain_id_; } inline void SIntelliAlmInfo::set_domain_id(::google::protobuf::int32 value) { set_has_domain_id(); domain_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SIntelliAlmInfo.domain_id) + // @@protoc_insertion_point(field_set:iot_idl.SIntelliAlmInfo.domain_id) } // required int32 priority = 3; @@ -875,13 +875,13 @@ inline void SIntelliAlmInfo::clear_priority() { clear_has_priority(); } inline ::google::protobuf::int32 SIntelliAlmInfo::priority() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmInfo.priority) + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmInfo.priority) return priority_; } inline void SIntelliAlmInfo::set_priority(::google::protobuf::int32 value) { set_has_priority(); priority_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SIntelliAlmInfo.priority) + // @@protoc_insertion_point(field_set:iot_idl.SIntelliAlmInfo.priority) } // required int64 time_stamp = 4; @@ -899,13 +899,13 @@ inline void SIntelliAlmInfo::clear_time_stamp() { clear_has_time_stamp(); } inline ::google::protobuf::int64 SIntelliAlmInfo::time_stamp() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmInfo.time_stamp) + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmInfo.time_stamp) return time_stamp_; } inline void SIntelliAlmInfo::set_time_stamp(::google::protobuf::int64 value) { set_has_time_stamp(); time_stamp_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SIntelliAlmInfo.time_stamp) + // @@protoc_insertion_point(field_set:iot_idl.SIntelliAlmInfo.time_stamp) } // required string uuid_base64 = 5; @@ -925,7 +925,7 @@ inline void SIntelliAlmInfo::clear_uuid_base64() { clear_has_uuid_base64(); } inline const ::std::string& SIntelliAlmInfo::uuid_base64() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmInfo.uuid_base64) + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmInfo.uuid_base64) return *uuid_base64_; } inline void SIntelliAlmInfo::set_uuid_base64(const ::std::string& value) { @@ -934,7 +934,7 @@ inline void SIntelliAlmInfo::set_uuid_base64(const ::std::string& value) { uuid_base64_ = new ::std::string; } uuid_base64_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SIntelliAlmInfo.uuid_base64) + // @@protoc_insertion_point(field_set:iot_idl.SIntelliAlmInfo.uuid_base64) } inline void SIntelliAlmInfo::set_uuid_base64(const char* value) { set_has_uuid_base64(); @@ -942,7 +942,7 @@ inline void SIntelliAlmInfo::set_uuid_base64(const char* value) { uuid_base64_ = new ::std::string; } uuid_base64_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SIntelliAlmInfo.uuid_base64) + // @@protoc_insertion_point(field_set_char:iot_idl.SIntelliAlmInfo.uuid_base64) } inline void SIntelliAlmInfo::set_uuid_base64(const char* value, size_t size) { set_has_uuid_base64(); @@ -950,14 +950,14 @@ inline void SIntelliAlmInfo::set_uuid_base64(const char* value, size_t size) { uuid_base64_ = new ::std::string; } uuid_base64_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SIntelliAlmInfo.uuid_base64) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SIntelliAlmInfo.uuid_base64) } inline ::std::string* SIntelliAlmInfo::mutable_uuid_base64() { set_has_uuid_base64(); if (uuid_base64_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { uuid_base64_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SIntelliAlmInfo.uuid_base64) + // @@protoc_insertion_point(field_mutable:iot_idl.SIntelliAlmInfo.uuid_base64) return uuid_base64_; } inline ::std::string* SIntelliAlmInfo::release_uuid_base64() { @@ -981,7 +981,7 @@ inline void SIntelliAlmInfo::set_allocated_uuid_base64(::std::string* uuid_base6 clear_has_uuid_base64(); uuid_base64_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SIntelliAlmInfo.uuid_base64) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SIntelliAlmInfo.uuid_base64) } // required string content = 6; @@ -1001,7 +1001,7 @@ inline void SIntelliAlmInfo::clear_content() { clear_has_content(); } inline const ::std::string& SIntelliAlmInfo::content() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmInfo.content) + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmInfo.content) return *content_; } inline void SIntelliAlmInfo::set_content(const ::std::string& value) { @@ -1010,7 +1010,7 @@ inline void SIntelliAlmInfo::set_content(const ::std::string& value) { content_ = new ::std::string; } content_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SIntelliAlmInfo.content) + // @@protoc_insertion_point(field_set:iot_idl.SIntelliAlmInfo.content) } inline void SIntelliAlmInfo::set_content(const char* value) { set_has_content(); @@ -1018,7 +1018,7 @@ inline void SIntelliAlmInfo::set_content(const char* value) { content_ = new ::std::string; } content_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SIntelliAlmInfo.content) + // @@protoc_insertion_point(field_set_char:iot_idl.SIntelliAlmInfo.content) } inline void SIntelliAlmInfo::set_content(const char* value, size_t size) { set_has_content(); @@ -1026,14 +1026,14 @@ inline void SIntelliAlmInfo::set_content(const char* value, size_t size) { content_ = new ::std::string; } content_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SIntelliAlmInfo.content) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SIntelliAlmInfo.content) } inline ::std::string* SIntelliAlmInfo::mutable_content() { set_has_content(); if (content_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { content_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SIntelliAlmInfo.content) + // @@protoc_insertion_point(field_mutable:iot_idl.SIntelliAlmInfo.content) return content_; } inline ::std::string* SIntelliAlmInfo::release_content() { @@ -1057,7 +1057,7 @@ inline void SIntelliAlmInfo::set_allocated_content(::std::string* content) { clear_has_content(); content_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SIntelliAlmInfo.content) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SIntelliAlmInfo.content) } // optional string disposal_plan = 7; @@ -1077,7 +1077,7 @@ inline void SIntelliAlmInfo::clear_disposal_plan() { clear_has_disposal_plan(); } inline const ::std::string& SIntelliAlmInfo::disposal_plan() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmInfo.disposal_plan) + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmInfo.disposal_plan) return *disposal_plan_; } inline void SIntelliAlmInfo::set_disposal_plan(const ::std::string& value) { @@ -1086,7 +1086,7 @@ inline void SIntelliAlmInfo::set_disposal_plan(const ::std::string& value) { disposal_plan_ = new ::std::string; } disposal_plan_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SIntelliAlmInfo.disposal_plan) + // @@protoc_insertion_point(field_set:iot_idl.SIntelliAlmInfo.disposal_plan) } inline void SIntelliAlmInfo::set_disposal_plan(const char* value) { set_has_disposal_plan(); @@ -1094,7 +1094,7 @@ inline void SIntelliAlmInfo::set_disposal_plan(const char* value) { disposal_plan_ = new ::std::string; } disposal_plan_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SIntelliAlmInfo.disposal_plan) + // @@protoc_insertion_point(field_set_char:iot_idl.SIntelliAlmInfo.disposal_plan) } inline void SIntelliAlmInfo::set_disposal_plan(const char* value, size_t size) { set_has_disposal_plan(); @@ -1102,14 +1102,14 @@ inline void SIntelliAlmInfo::set_disposal_plan(const char* value, size_t size) { disposal_plan_ = new ::std::string; } disposal_plan_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SIntelliAlmInfo.disposal_plan) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SIntelliAlmInfo.disposal_plan) } inline ::std::string* SIntelliAlmInfo::mutable_disposal_plan() { set_has_disposal_plan(); if (disposal_plan_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { disposal_plan_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SIntelliAlmInfo.disposal_plan) + // @@protoc_insertion_point(field_mutable:iot_idl.SIntelliAlmInfo.disposal_plan) return disposal_plan_; } inline ::std::string* SIntelliAlmInfo::release_disposal_plan() { @@ -1133,7 +1133,7 @@ inline void SIntelliAlmInfo::set_allocated_disposal_plan(::std::string* disposal clear_has_disposal_plan(); disposal_plan_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SIntelliAlmInfo.disposal_plan) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SIntelliAlmInfo.disposal_plan) } // repeated string raw_alm_uuid = 8; @@ -1144,49 +1144,49 @@ inline void SIntelliAlmInfo::clear_raw_alm_uuid() { raw_alm_uuid_.Clear(); } inline const ::std::string& SIntelliAlmInfo::raw_alm_uuid(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmInfo.raw_alm_uuid) + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmInfo.raw_alm_uuid) return raw_alm_uuid_.Get(index); } inline ::std::string* SIntelliAlmInfo::mutable_raw_alm_uuid(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SIntelliAlmInfo.raw_alm_uuid) + // @@protoc_insertion_point(field_mutable:iot_idl.SIntelliAlmInfo.raw_alm_uuid) return raw_alm_uuid_.Mutable(index); } inline void SIntelliAlmInfo::set_raw_alm_uuid(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.SIntelliAlmInfo.raw_alm_uuid) + // @@protoc_insertion_point(field_set:iot_idl.SIntelliAlmInfo.raw_alm_uuid) raw_alm_uuid_.Mutable(index)->assign(value); } inline void SIntelliAlmInfo::set_raw_alm_uuid(int index, const char* value) { raw_alm_uuid_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SIntelliAlmInfo.raw_alm_uuid) + // @@protoc_insertion_point(field_set_char:iot_idl.SIntelliAlmInfo.raw_alm_uuid) } inline void SIntelliAlmInfo::set_raw_alm_uuid(int index, const char* value, size_t size) { raw_alm_uuid_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SIntelliAlmInfo.raw_alm_uuid) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SIntelliAlmInfo.raw_alm_uuid) } inline ::std::string* SIntelliAlmInfo::add_raw_alm_uuid() { return raw_alm_uuid_.Add(); } inline void SIntelliAlmInfo::add_raw_alm_uuid(const ::std::string& value) { raw_alm_uuid_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.SIntelliAlmInfo.raw_alm_uuid) + // @@protoc_insertion_point(field_add:iot_idl.SIntelliAlmInfo.raw_alm_uuid) } inline void SIntelliAlmInfo::add_raw_alm_uuid(const char* value) { raw_alm_uuid_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.SIntelliAlmInfo.raw_alm_uuid) + // @@protoc_insertion_point(field_add_char:iot_idl.SIntelliAlmInfo.raw_alm_uuid) } inline void SIntelliAlmInfo::add_raw_alm_uuid(const char* value, size_t size) { raw_alm_uuid_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.SIntelliAlmInfo.raw_alm_uuid) + // @@protoc_insertion_point(field_add_pointer:iot_idl.SIntelliAlmInfo.raw_alm_uuid) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& SIntelliAlmInfo::raw_alm_uuid() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SIntelliAlmInfo.raw_alm_uuid) + // @@protoc_insertion_point(field_list:iot_idl.SIntelliAlmInfo.raw_alm_uuid) return raw_alm_uuid_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* SIntelliAlmInfo::mutable_raw_alm_uuid() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SIntelliAlmInfo.raw_alm_uuid) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SIntelliAlmInfo.raw_alm_uuid) return &raw_alm_uuid_; } @@ -1194,33 +1194,33 @@ SIntelliAlmInfo::mutable_raw_alm_uuid() { // SIntelliAlmAdd -// repeated .kbd_idlfile.SIntelliAlmInfo alm_info = 1; +// repeated .iot_idl.SIntelliAlmInfo alm_info = 1; inline int SIntelliAlmAdd::alm_info_size() const { return alm_info_.size(); } inline void SIntelliAlmAdd::clear_alm_info() { alm_info_.Clear(); } -inline const ::kbd_idlfile::SIntelliAlmInfo& SIntelliAlmAdd::alm_info(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmAdd.alm_info) +inline const ::iot_idl::SIntelliAlmInfo& SIntelliAlmAdd::alm_info(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmAdd.alm_info) return alm_info_.Get(index); } -inline ::kbd_idlfile::SIntelliAlmInfo* SIntelliAlmAdd::mutable_alm_info(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SIntelliAlmAdd.alm_info) +inline ::iot_idl::SIntelliAlmInfo* SIntelliAlmAdd::mutable_alm_info(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SIntelliAlmAdd.alm_info) return alm_info_.Mutable(index); } -inline ::kbd_idlfile::SIntelliAlmInfo* SIntelliAlmAdd::add_alm_info() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SIntelliAlmAdd.alm_info) +inline ::iot_idl::SIntelliAlmInfo* SIntelliAlmAdd::add_alm_info() { + // @@protoc_insertion_point(field_add:iot_idl.SIntelliAlmAdd.alm_info) return alm_info_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SIntelliAlmInfo >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SIntelliAlmInfo >& SIntelliAlmAdd::alm_info() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SIntelliAlmAdd.alm_info) + // @@protoc_insertion_point(field_list:iot_idl.SIntelliAlmAdd.alm_info) return alm_info_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SIntelliAlmInfo >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SIntelliAlmInfo >* SIntelliAlmAdd::mutable_alm_info() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SIntelliAlmAdd.alm_info) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SIntelliAlmAdd.alm_info) return &alm_info_; } @@ -1243,13 +1243,13 @@ inline void SIntelliAlmDel::clear_domain_id() { clear_has_domain_id(); } inline ::google::protobuf::int32 SIntelliAlmDel::domain_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmDel.domain_id) + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmDel.domain_id) return domain_id_; } inline void SIntelliAlmDel::set_domain_id(::google::protobuf::int32 value) { set_has_domain_id(); domain_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SIntelliAlmDel.domain_id) + // @@protoc_insertion_point(field_set:iot_idl.SIntelliAlmDel.domain_id) } // repeated string uuid_base64 = 2; @@ -1260,49 +1260,49 @@ inline void SIntelliAlmDel::clear_uuid_base64() { uuid_base64_.Clear(); } inline const ::std::string& SIntelliAlmDel::uuid_base64(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmDel.uuid_base64) + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmDel.uuid_base64) return uuid_base64_.Get(index); } inline ::std::string* SIntelliAlmDel::mutable_uuid_base64(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SIntelliAlmDel.uuid_base64) + // @@protoc_insertion_point(field_mutable:iot_idl.SIntelliAlmDel.uuid_base64) return uuid_base64_.Mutable(index); } inline void SIntelliAlmDel::set_uuid_base64(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.SIntelliAlmDel.uuid_base64) + // @@protoc_insertion_point(field_set:iot_idl.SIntelliAlmDel.uuid_base64) uuid_base64_.Mutable(index)->assign(value); } inline void SIntelliAlmDel::set_uuid_base64(int index, const char* value) { uuid_base64_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SIntelliAlmDel.uuid_base64) + // @@protoc_insertion_point(field_set_char:iot_idl.SIntelliAlmDel.uuid_base64) } inline void SIntelliAlmDel::set_uuid_base64(int index, const char* value, size_t size) { uuid_base64_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SIntelliAlmDel.uuid_base64) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SIntelliAlmDel.uuid_base64) } inline ::std::string* SIntelliAlmDel::add_uuid_base64() { return uuid_base64_.Add(); } inline void SIntelliAlmDel::add_uuid_base64(const ::std::string& value) { uuid_base64_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.SIntelliAlmDel.uuid_base64) + // @@protoc_insertion_point(field_add:iot_idl.SIntelliAlmDel.uuid_base64) } inline void SIntelliAlmDel::add_uuid_base64(const char* value) { uuid_base64_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.SIntelliAlmDel.uuid_base64) + // @@protoc_insertion_point(field_add_char:iot_idl.SIntelliAlmDel.uuid_base64) } inline void SIntelliAlmDel::add_uuid_base64(const char* value, size_t size) { uuid_base64_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.SIntelliAlmDel.uuid_base64) + // @@protoc_insertion_point(field_add_pointer:iot_idl.SIntelliAlmDel.uuid_base64) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& SIntelliAlmDel::uuid_base64() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SIntelliAlmDel.uuid_base64) + // @@protoc_insertion_point(field_list:iot_idl.SIntelliAlmDel.uuid_base64) return uuid_base64_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* SIntelliAlmDel::mutable_uuid_base64() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SIntelliAlmDel.uuid_base64) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SIntelliAlmDel.uuid_base64) return &uuid_base64_; } @@ -1318,49 +1318,49 @@ inline void SIntelliAlmBroken::clear_uuid_base64() { uuid_base64_.Clear(); } inline const ::std::string& SIntelliAlmBroken::uuid_base64(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmBroken.uuid_base64) + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmBroken.uuid_base64) return uuid_base64_.Get(index); } inline ::std::string* SIntelliAlmBroken::mutable_uuid_base64(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SIntelliAlmBroken.uuid_base64) + // @@protoc_insertion_point(field_mutable:iot_idl.SIntelliAlmBroken.uuid_base64) return uuid_base64_.Mutable(index); } inline void SIntelliAlmBroken::set_uuid_base64(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.SIntelliAlmBroken.uuid_base64) + // @@protoc_insertion_point(field_set:iot_idl.SIntelliAlmBroken.uuid_base64) uuid_base64_.Mutable(index)->assign(value); } inline void SIntelliAlmBroken::set_uuid_base64(int index, const char* value) { uuid_base64_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SIntelliAlmBroken.uuid_base64) + // @@protoc_insertion_point(field_set_char:iot_idl.SIntelliAlmBroken.uuid_base64) } inline void SIntelliAlmBroken::set_uuid_base64(int index, const char* value, size_t size) { uuid_base64_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SIntelliAlmBroken.uuid_base64) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SIntelliAlmBroken.uuid_base64) } inline ::std::string* SIntelliAlmBroken::add_uuid_base64() { return uuid_base64_.Add(); } inline void SIntelliAlmBroken::add_uuid_base64(const ::std::string& value) { uuid_base64_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.SIntelliAlmBroken.uuid_base64) + // @@protoc_insertion_point(field_add:iot_idl.SIntelliAlmBroken.uuid_base64) } inline void SIntelliAlmBroken::add_uuid_base64(const char* value) { uuid_base64_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.SIntelliAlmBroken.uuid_base64) + // @@protoc_insertion_point(field_add_char:iot_idl.SIntelliAlmBroken.uuid_base64) } inline void SIntelliAlmBroken::add_uuid_base64(const char* value, size_t size) { uuid_base64_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.SIntelliAlmBroken.uuid_base64) + // @@protoc_insertion_point(field_add_pointer:iot_idl.SIntelliAlmBroken.uuid_base64) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& SIntelliAlmBroken::uuid_base64() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SIntelliAlmBroken.uuid_base64) + // @@protoc_insertion_point(field_list:iot_idl.SIntelliAlmBroken.uuid_base64) return uuid_base64_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* SIntelliAlmBroken::mutable_uuid_base64() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SIntelliAlmBroken.uuid_base64) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SIntelliAlmBroken.uuid_base64) return &uuid_base64_; } @@ -1376,49 +1376,49 @@ inline void SIntelliAlmRelease::clear_uuid_base64() { uuid_base64_.Clear(); } inline const ::std::string& SIntelliAlmRelease::uuid_base64(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmRelease.uuid_base64) + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmRelease.uuid_base64) return uuid_base64_.Get(index); } inline ::std::string* SIntelliAlmRelease::mutable_uuid_base64(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SIntelliAlmRelease.uuid_base64) + // @@protoc_insertion_point(field_mutable:iot_idl.SIntelliAlmRelease.uuid_base64) return uuid_base64_.Mutable(index); } inline void SIntelliAlmRelease::set_uuid_base64(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.SIntelliAlmRelease.uuid_base64) + // @@protoc_insertion_point(field_set:iot_idl.SIntelliAlmRelease.uuid_base64) uuid_base64_.Mutable(index)->assign(value); } inline void SIntelliAlmRelease::set_uuid_base64(int index, const char* value) { uuid_base64_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SIntelliAlmRelease.uuid_base64) + // @@protoc_insertion_point(field_set_char:iot_idl.SIntelliAlmRelease.uuid_base64) } inline void SIntelliAlmRelease::set_uuid_base64(int index, const char* value, size_t size) { uuid_base64_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SIntelliAlmRelease.uuid_base64) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SIntelliAlmRelease.uuid_base64) } inline ::std::string* SIntelliAlmRelease::add_uuid_base64() { return uuid_base64_.Add(); } inline void SIntelliAlmRelease::add_uuid_base64(const ::std::string& value) { uuid_base64_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.SIntelliAlmRelease.uuid_base64) + // @@protoc_insertion_point(field_add:iot_idl.SIntelliAlmRelease.uuid_base64) } inline void SIntelliAlmRelease::add_uuid_base64(const char* value) { uuid_base64_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.SIntelliAlmRelease.uuid_base64) + // @@protoc_insertion_point(field_add_char:iot_idl.SIntelliAlmRelease.uuid_base64) } inline void SIntelliAlmRelease::add_uuid_base64(const char* value, size_t size) { uuid_base64_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.SIntelliAlmRelease.uuid_base64) + // @@protoc_insertion_point(field_add_pointer:iot_idl.SIntelliAlmRelease.uuid_base64) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& SIntelliAlmRelease::uuid_base64() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SIntelliAlmRelease.uuid_base64) + // @@protoc_insertion_point(field_list:iot_idl.SIntelliAlmRelease.uuid_base64) return uuid_base64_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* SIntelliAlmRelease::mutable_uuid_base64() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SIntelliAlmRelease.uuid_base64) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SIntelliAlmRelease.uuid_base64) return &uuid_base64_; } @@ -1441,13 +1441,13 @@ inline void SIntelliAlmSepr::clear_domain_id() { clear_has_domain_id(); } inline ::google::protobuf::int32 SIntelliAlmSepr::domain_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmSepr.domain_id) + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmSepr.domain_id) return domain_id_; } inline void SIntelliAlmSepr::set_domain_id(::google::protobuf::int32 value) { set_has_domain_id(); domain_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SIntelliAlmSepr.domain_id) + // @@protoc_insertion_point(field_set:iot_idl.SIntelliAlmSepr.domain_id) } // repeated string raw_alm_uuid = 2; @@ -1458,49 +1458,49 @@ inline void SIntelliAlmSepr::clear_raw_alm_uuid() { raw_alm_uuid_.Clear(); } inline const ::std::string& SIntelliAlmSepr::raw_alm_uuid(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmSepr.raw_alm_uuid) + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmSepr.raw_alm_uuid) return raw_alm_uuid_.Get(index); } inline ::std::string* SIntelliAlmSepr::mutable_raw_alm_uuid(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SIntelliAlmSepr.raw_alm_uuid) + // @@protoc_insertion_point(field_mutable:iot_idl.SIntelliAlmSepr.raw_alm_uuid) return raw_alm_uuid_.Mutable(index); } inline void SIntelliAlmSepr::set_raw_alm_uuid(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.SIntelliAlmSepr.raw_alm_uuid) + // @@protoc_insertion_point(field_set:iot_idl.SIntelliAlmSepr.raw_alm_uuid) raw_alm_uuid_.Mutable(index)->assign(value); } inline void SIntelliAlmSepr::set_raw_alm_uuid(int index, const char* value) { raw_alm_uuid_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SIntelliAlmSepr.raw_alm_uuid) + // @@protoc_insertion_point(field_set_char:iot_idl.SIntelliAlmSepr.raw_alm_uuid) } inline void SIntelliAlmSepr::set_raw_alm_uuid(int index, const char* value, size_t size) { raw_alm_uuid_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SIntelliAlmSepr.raw_alm_uuid) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SIntelliAlmSepr.raw_alm_uuid) } inline ::std::string* SIntelliAlmSepr::add_raw_alm_uuid() { return raw_alm_uuid_.Add(); } inline void SIntelliAlmSepr::add_raw_alm_uuid(const ::std::string& value) { raw_alm_uuid_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.SIntelliAlmSepr.raw_alm_uuid) + // @@protoc_insertion_point(field_add:iot_idl.SIntelliAlmSepr.raw_alm_uuid) } inline void SIntelliAlmSepr::add_raw_alm_uuid(const char* value) { raw_alm_uuid_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.SIntelliAlmSepr.raw_alm_uuid) + // @@protoc_insertion_point(field_add_char:iot_idl.SIntelliAlmSepr.raw_alm_uuid) } inline void SIntelliAlmSepr::add_raw_alm_uuid(const char* value, size_t size) { raw_alm_uuid_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.SIntelliAlmSepr.raw_alm_uuid) + // @@protoc_insertion_point(field_add_pointer:iot_idl.SIntelliAlmSepr.raw_alm_uuid) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& SIntelliAlmSepr::raw_alm_uuid() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SIntelliAlmSepr.raw_alm_uuid) + // @@protoc_insertion_point(field_list:iot_idl.SIntelliAlmSepr.raw_alm_uuid) return raw_alm_uuid_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* SIntelliAlmSepr::mutable_raw_alm_uuid() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SIntelliAlmSepr.raw_alm_uuid) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SIntelliAlmSepr.raw_alm_uuid) return &raw_alm_uuid_; } @@ -1523,13 +1523,13 @@ inline void SIntelliAlmMerge::clear_domain_id() { clear_has_domain_id(); } inline ::google::protobuf::int32 SIntelliAlmMerge::domain_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmMerge.domain_id) + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmMerge.domain_id) return domain_id_; } inline void SIntelliAlmMerge::set_domain_id(::google::protobuf::int32 value) { set_has_domain_id(); domain_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SIntelliAlmMerge.domain_id) + // @@protoc_insertion_point(field_set:iot_idl.SIntelliAlmMerge.domain_id) } // repeated string raw_alm_uuid = 2; @@ -1540,70 +1540,70 @@ inline void SIntelliAlmMerge::clear_raw_alm_uuid() { raw_alm_uuid_.Clear(); } inline const ::std::string& SIntelliAlmMerge::raw_alm_uuid(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SIntelliAlmMerge.raw_alm_uuid) + // @@protoc_insertion_point(field_get:iot_idl.SIntelliAlmMerge.raw_alm_uuid) return raw_alm_uuid_.Get(index); } inline ::std::string* SIntelliAlmMerge::mutable_raw_alm_uuid(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SIntelliAlmMerge.raw_alm_uuid) + // @@protoc_insertion_point(field_mutable:iot_idl.SIntelliAlmMerge.raw_alm_uuid) return raw_alm_uuid_.Mutable(index); } inline void SIntelliAlmMerge::set_raw_alm_uuid(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.SIntelliAlmMerge.raw_alm_uuid) + // @@protoc_insertion_point(field_set:iot_idl.SIntelliAlmMerge.raw_alm_uuid) raw_alm_uuid_.Mutable(index)->assign(value); } inline void SIntelliAlmMerge::set_raw_alm_uuid(int index, const char* value) { raw_alm_uuid_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SIntelliAlmMerge.raw_alm_uuid) + // @@protoc_insertion_point(field_set_char:iot_idl.SIntelliAlmMerge.raw_alm_uuid) } inline void SIntelliAlmMerge::set_raw_alm_uuid(int index, const char* value, size_t size) { raw_alm_uuid_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SIntelliAlmMerge.raw_alm_uuid) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SIntelliAlmMerge.raw_alm_uuid) } inline ::std::string* SIntelliAlmMerge::add_raw_alm_uuid() { return raw_alm_uuid_.Add(); } inline void SIntelliAlmMerge::add_raw_alm_uuid(const ::std::string& value) { raw_alm_uuid_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.SIntelliAlmMerge.raw_alm_uuid) + // @@protoc_insertion_point(field_add:iot_idl.SIntelliAlmMerge.raw_alm_uuid) } inline void SIntelliAlmMerge::add_raw_alm_uuid(const char* value) { raw_alm_uuid_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.SIntelliAlmMerge.raw_alm_uuid) + // @@protoc_insertion_point(field_add_char:iot_idl.SIntelliAlmMerge.raw_alm_uuid) } inline void SIntelliAlmMerge::add_raw_alm_uuid(const char* value, size_t size) { raw_alm_uuid_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.SIntelliAlmMerge.raw_alm_uuid) + // @@protoc_insertion_point(field_add_pointer:iot_idl.SIntelliAlmMerge.raw_alm_uuid) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& SIntelliAlmMerge::raw_alm_uuid() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SIntelliAlmMerge.raw_alm_uuid) + // @@protoc_insertion_point(field_list:iot_idl.SIntelliAlmMerge.raw_alm_uuid) return raw_alm_uuid_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* SIntelliAlmMerge::mutable_raw_alm_uuid() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SIntelliAlmMerge.raw_alm_uuid) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SIntelliAlmMerge.raw_alm_uuid) return &raw_alm_uuid_; } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::enIntelliAlmMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enIntelliAlmMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enIntelliAlmMsgType>() { - return ::kbd_idlfile::enIntelliAlmMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enIntelliAlmMsgType>() { + return ::iot_idl::enIntelliAlmMsgType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::enIntelliAlmLogicState> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enIntelliAlmLogicState> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enIntelliAlmLogicState>() { - return ::kbd_idlfile::enIntelliAlmLogicState_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enIntelliAlmLogicState>() { + return ::iot_idl::enIntelliAlmLogicState_descriptor(); } } // namespace google diff --git a/platform/src/idl_files/IntelliAlmMsg.proto b/platform/src/idl_files/IntelliAlmMsg.proto index 8e065594..c7970f33 100644 --- a/platform/src/idl_files/IntelliAlmMsg.proto +++ b/platform/src/idl_files/IntelliAlmMsg.proto @@ -5,7 +5,7 @@ //======================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; // 缩写说明： // Intelli : Intelligent diff --git a/platform/src/idl_files/NodeMngMessage.pb.cc b/platform/src/idl_files/NodeMngMessage.pb.cc index be2096ae..683cbf61 100644 --- a/platform/src/idl_files/NodeMngMessage.pb.cc +++ b/platform/src/idl_files/NodeMngMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -166,7 +166,7 @@ void protobuf_AddDesc_NodeMngMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\024NodeMngMessage.proto\022\013kbd_idlfile\"\272\001\n\020" + "\n\024NodeMngMessage.proto\022\013iot_idl\"\272\001\n\020" "SAppHeartbeatMsg\022\016\n\006nAppId\030\001 \002(\005\022\021\n\tnPri" "ority\030\002 \002(\005\022\022\n\nbIP1Active\030\003 \002(\010\022\022\n\nbIP2A" "ctive\030\004 \002(\010\022\017\n\007bActive\030\005 \002(\010\022\017\n\007bMaster\030" @@ -174,9 +174,9 @@ void protobuf_AddDesc_NodeMngMessage_2eproto() { "\010\022\025\n\rbSwitchFailed\030\t \002(\010\"\223\001\n\021SNodeHeartb" "eatMsg\022\021\n\tnDomainId\030\001 \002(\005\022\023\n\013strNodeName" "\030\002 \002(\t\022\016\n\006strIP1\030\003 \002(\t\022\016\n\006strIP2\030\004 \002(\t\0226" - "\n\017vecAppHeartbeat\030\005 \003(\0132\035.kbd_idlfile.SA" + "\n\017vecAppHeartbeat\030\005 \003(\0132\035.iot_idl.SA" "ppHeartbeatMsg\"R\n\026SMultiNodeHeartbeatMsg" - "\0228\n\020vecNodeHeartBeat\030\001 \003(\0132\036.kbd_idlfile" + "\0228\n\020vecNodeHeartBeat\030\001 \003(\0132\036.iot_idl" ".SNodeHeartbeatMsg\"\325\001\n\021SRedundancyCmdMsg" "\022\021\n\tnDomainId\030\001 \002(\005\022\016\n\006nAppId\030\002 \002(\005\022\031\n\021s" "trSwitchNodeName\030\003 \002(\t\022\032\n\022strArbiterNode" @@ -239,7 +239,7 @@ const int SAppHeartbeatMsg::kBSwitchFailedFieldNumber; SAppHeartbeatMsg::SAppHeartbeatMsg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SAppHeartbeatMsg) + // @@protoc_insertion_point(constructor:iot_idl.SAppHeartbeatMsg) } void SAppHeartbeatMsg::InitAsDefaultInstance() { @@ -249,7 +249,7 @@ SAppHeartbeatMsg::SAppHeartbeatMsg(const SAppHeartbeatMsg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SAppHeartbeatMsg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SAppHeartbeatMsg) } void SAppHeartbeatMsg::SharedCtor() { @@ -267,7 +267,7 @@ void SAppHeartbeatMsg::SharedCtor() { } SAppHeartbeatMsg::~SAppHeartbeatMsg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SAppHeartbeatMsg) + // @@protoc_insertion_point(destructor:iot_idl.SAppHeartbeatMsg) SharedDtor(); } @@ -324,7 +324,7 @@ bool SAppHeartbeatMsg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SAppHeartbeatMsg) + // @@protoc_insertion_point(parse_start:iot_idl.SAppHeartbeatMsg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -478,17 +478,17 @@ bool SAppHeartbeatMsg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SAppHeartbeatMsg) + // @@protoc_insertion_point(parse_success:iot_idl.SAppHeartbeatMsg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SAppHeartbeatMsg) + // @@protoc_insertion_point(parse_failure:iot_idl.SAppHeartbeatMsg) return false; #undef DO_ } void SAppHeartbeatMsg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SAppHeartbeatMsg) + // @@protoc_insertion_point(serialize_start:iot_idl.SAppHeartbeatMsg) // required int32 nAppId = 1; if (has_nappid()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->nappid(), output); @@ -538,12 +538,12 @@ void SAppHeartbeatMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SAppHeartbeatMsg) + // @@protoc_insertion_point(serialize_end:iot_idl.SAppHeartbeatMsg) } ::google::protobuf::uint8* SAppHeartbeatMsg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SAppHeartbeatMsg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SAppHeartbeatMsg) // required int32 nAppId = 1; if (has_nappid()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->nappid(), target); @@ -593,7 +593,7 @@ void SAppHeartbeatMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SAppHeartbeatMsg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SAppHeartbeatMsg) return target; } @@ -769,7 +769,7 @@ const int SNodeHeartbeatMsg::kVecAppHeartbeatFieldNumber; SNodeHeartbeatMsg::SNodeHeartbeatMsg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SNodeHeartbeatMsg) + // @@protoc_insertion_point(constructor:iot_idl.SNodeHeartbeatMsg) } void SNodeHeartbeatMsg::InitAsDefaultInstance() { @@ -779,7 +779,7 @@ SNodeHeartbeatMsg::SNodeHeartbeatMsg(const SNodeHeartbeatMsg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SNodeHeartbeatMsg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SNodeHeartbeatMsg) } void SNodeHeartbeatMsg::SharedCtor() { @@ -793,7 +793,7 @@ void SNodeHeartbeatMsg::SharedCtor() { } SNodeHeartbeatMsg::~SNodeHeartbeatMsg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SNodeHeartbeatMsg) + // @@protoc_insertion_point(destructor:iot_idl.SNodeHeartbeatMsg) SharedDtor(); } @@ -860,7 +860,7 @@ bool SNodeHeartbeatMsg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SNodeHeartbeatMsg) + // @@protoc_insertion_point(parse_start:iot_idl.SNodeHeartbeatMsg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -931,7 +931,7 @@ bool SNodeHeartbeatMsg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SAppHeartbeatMsg vecAppHeartbeat = 5; + // repeated .iot_idl.SAppHeartbeatMsg vecAppHeartbeat = 5; case 5: { if (tag == 42) { parse_vecAppHeartbeat: @@ -959,17 +959,17 @@ bool SNodeHeartbeatMsg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SNodeHeartbeatMsg) + // @@protoc_insertion_point(parse_success:iot_idl.SNodeHeartbeatMsg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SNodeHeartbeatMsg) + // @@protoc_insertion_point(parse_failure:iot_idl.SNodeHeartbeatMsg) return false; #undef DO_ } void SNodeHeartbeatMsg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SNodeHeartbeatMsg) + // @@protoc_insertion_point(serialize_start:iot_idl.SNodeHeartbeatMsg) // required int32 nDomainId = 1; if (has_ndomainid()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->ndomainid(), output); @@ -1005,7 +1005,7 @@ void SNodeHeartbeatMsg::SerializeWithCachedSizes( 4, this->strip2(), output); } - // repeated .kbd_idlfile.SAppHeartbeatMsg vecAppHeartbeat = 5; + // repeated .iot_idl.SAppHeartbeatMsg vecAppHeartbeat = 5; for (int i = 0; i < this->vecappheartbeat_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 5, this->vecappheartbeat(i), output); @@ -1015,12 +1015,12 @@ void SNodeHeartbeatMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SNodeHeartbeatMsg) + // @@protoc_insertion_point(serialize_end:iot_idl.SNodeHeartbeatMsg) } ::google::protobuf::uint8* SNodeHeartbeatMsg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SNodeHeartbeatMsg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SNodeHeartbeatMsg) // required int32 nDomainId = 1; if (has_ndomainid()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->ndomainid(), target); @@ -1059,7 +1059,7 @@ void SNodeHeartbeatMsg::SerializeWithCachedSizes( 4, this->strip2(), target); } - // repeated .kbd_idlfile.SAppHeartbeatMsg vecAppHeartbeat = 5; + // repeated .iot_idl.SAppHeartbeatMsg vecAppHeartbeat = 5; for (int i = 0; i < this->vecappheartbeat_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1070,7 +1070,7 @@ void SNodeHeartbeatMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SNodeHeartbeatMsg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SNodeHeartbeatMsg) return target; } @@ -1107,7 +1107,7 @@ int SNodeHeartbeatMsg::ByteSize() const { } } - // repeated .kbd_idlfile.SAppHeartbeatMsg vecAppHeartbeat = 5; + // repeated .iot_idl.SAppHeartbeatMsg vecAppHeartbeat = 5; total_size += 1 * this->vecappheartbeat_size(); for (int i = 0; i < this->vecappheartbeat_size(); i++) { total_size += @@ -1208,7 +1208,7 @@ const int SMultiNodeHeartbeatMsg::kVecNodeHeartBeatFieldNumber; SMultiNodeHeartbeatMsg::SMultiNodeHeartbeatMsg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SMultiNodeHeartbeatMsg) + // @@protoc_insertion_point(constructor:iot_idl.SMultiNodeHeartbeatMsg) } void SMultiNodeHeartbeatMsg::InitAsDefaultInstance() { @@ -1218,7 +1218,7 @@ SMultiNodeHeartbeatMsg::SMultiNodeHeartbeatMsg(const SMultiNodeHeartbeatMsg& fro : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SMultiNodeHeartbeatMsg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SMultiNodeHeartbeatMsg) } void SMultiNodeHeartbeatMsg::SharedCtor() { @@ -1227,7 +1227,7 @@ void SMultiNodeHeartbeatMsg::SharedCtor() { } SMultiNodeHeartbeatMsg::~SMultiNodeHeartbeatMsg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SMultiNodeHeartbeatMsg) + // @@protoc_insertion_point(destructor:iot_idl.SMultiNodeHeartbeatMsg) SharedDtor(); } @@ -1267,13 +1267,13 @@ bool SMultiNodeHeartbeatMsg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SMultiNodeHeartbeatMsg) + // @@protoc_insertion_point(parse_start:iot_idl.SMultiNodeHeartbeatMsg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated .kbd_idlfile.SNodeHeartbeatMsg vecNodeHeartBeat = 1; + // repeated .iot_idl.SNodeHeartbeatMsg vecNodeHeartBeat = 1; case 1: { if (tag == 10) { parse_vecNodeHeartBeat: @@ -1301,18 +1301,18 @@ bool SMultiNodeHeartbeatMsg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SMultiNodeHeartbeatMsg) + // @@protoc_insertion_point(parse_success:iot_idl.SMultiNodeHeartbeatMsg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SMultiNodeHeartbeatMsg) + // @@protoc_insertion_point(parse_failure:iot_idl.SMultiNodeHeartbeatMsg) return false; #undef DO_ } void SMultiNodeHeartbeatMsg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SMultiNodeHeartbeatMsg) - // repeated .kbd_idlfile.SNodeHeartbeatMsg vecNodeHeartBeat = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SMultiNodeHeartbeatMsg) + // repeated .iot_idl.SNodeHeartbeatMsg vecNodeHeartBeat = 1; for (int i = 0; i < this->vecnodeheartbeat_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->vecnodeheartbeat(i), output); @@ -1322,13 +1322,13 @@ void SMultiNodeHeartbeatMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SMultiNodeHeartbeatMsg) + // @@protoc_insertion_point(serialize_end:iot_idl.SMultiNodeHeartbeatMsg) } ::google::protobuf::uint8* SMultiNodeHeartbeatMsg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SMultiNodeHeartbeatMsg) - // repeated .kbd_idlfile.SNodeHeartbeatMsg vecNodeHeartBeat = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SMultiNodeHeartbeatMsg) + // repeated .iot_idl.SNodeHeartbeatMsg vecNodeHeartBeat = 1; for (int i = 0; i < this->vecnodeheartbeat_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1339,14 +1339,14 @@ void SMultiNodeHeartbeatMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SMultiNodeHeartbeatMsg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SMultiNodeHeartbeatMsg) return target; } int SMultiNodeHeartbeatMsg::ByteSize() const { int total_size = 0; - // repeated .kbd_idlfile.SNodeHeartbeatMsg vecNodeHeartBeat = 1; + // repeated .iot_idl.SNodeHeartbeatMsg vecNodeHeartBeat = 1; total_size += 1 * this->vecnodeheartbeat_size(); for (int i = 0; i < this->vecnodeheartbeat_size(); i++) { total_size += @@ -1436,7 +1436,7 @@ const int SRedundancyCmdMsg::kBSlaveFieldNumber; SRedundancyCmdMsg::SRedundancyCmdMsg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SRedundancyCmdMsg) + // @@protoc_insertion_point(constructor:iot_idl.SRedundancyCmdMsg) } void SRedundancyCmdMsg::InitAsDefaultInstance() { @@ -1446,7 +1446,7 @@ SRedundancyCmdMsg::SRedundancyCmdMsg(const SRedundancyCmdMsg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SRedundancyCmdMsg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SRedundancyCmdMsg) } void SRedundancyCmdMsg::SharedCtor() { @@ -1465,7 +1465,7 @@ void SRedundancyCmdMsg::SharedCtor() { } SRedundancyCmdMsg::~SRedundancyCmdMsg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SRedundancyCmdMsg) + // @@protoc_insertion_point(destructor:iot_idl.SRedundancyCmdMsg) SharedDtor(); } @@ -1555,7 +1555,7 @@ bool SRedundancyCmdMsg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SRedundancyCmdMsg) + // @@protoc_insertion_point(parse_start:iot_idl.SRedundancyCmdMsg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1717,17 +1717,17 @@ bool SRedundancyCmdMsg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SRedundancyCmdMsg) + // @@protoc_insertion_point(parse_success:iot_idl.SRedundancyCmdMsg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SRedundancyCmdMsg) + // @@protoc_insertion_point(parse_failure:iot_idl.SRedundancyCmdMsg) return false; #undef DO_ } void SRedundancyCmdMsg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SRedundancyCmdMsg) + // @@protoc_insertion_point(serialize_start:iot_idl.SRedundancyCmdMsg) // required int32 nDomainId = 1; if (has_ndomainid()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->ndomainid(), output); @@ -1797,12 +1797,12 @@ void SRedundancyCmdMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SRedundancyCmdMsg) + // @@protoc_insertion_point(serialize_end:iot_idl.SRedundancyCmdMsg) } ::google::protobuf::uint8* SRedundancyCmdMsg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SRedundancyCmdMsg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SRedundancyCmdMsg) // required int32 nDomainId = 1; if (has_ndomainid()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->ndomainid(), target); @@ -1876,7 +1876,7 @@ void SRedundancyCmdMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SRedundancyCmdMsg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SRedundancyCmdMsg) return target; } @@ -2049,6 +2049,6 @@ void SRedundancyCmdMsg::Swap(SRedundancyCmdMsg* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/platform/src/idl_files/NodeMngMessage.pb.h b/platform/src/idl_files/NodeMngMessage.pb.h index 983b9140..1e9e4b72 100644 --- a/platform/src/idl_files/NodeMngMessage.pb.h +++ b/platform/src/idl_files/NodeMngMessage.pb.h @@ -27,7 +27,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { // Internal implementation detail -- do not call these. void IDL_FILES_EXPORT protobuf_AddDesc_NodeMngMessage_2eproto(); @@ -178,7 +178,7 @@ class IDL_FILES_EXPORT SAppHeartbeatMsg : public ::google::protobuf::Message { inline bool bswitchfailed() const; inline void set_bswitchfailed(bool value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SAppHeartbeatMsg) + // @@protoc_insertion_point(class_scope:iot_idl.SAppHeartbeatMsg) private: inline void set_has_nappid(); inline void clear_has_nappid(); @@ -317,19 +317,19 @@ class IDL_FILES_EXPORT SNodeHeartbeatMsg : public ::google::protobuf::Message { inline ::std::string* release_strip2(); inline void set_allocated_strip2(::std::string* strip2); - // repeated .kbd_idlfile.SAppHeartbeatMsg vecAppHeartbeat = 5; + // repeated .iot_idl.SAppHeartbeatMsg vecAppHeartbeat = 5; inline int vecappheartbeat_size() const; inline void clear_vecappheartbeat(); static const int kVecAppHeartbeatFieldNumber = 5; - inline const ::kbd_idlfile::SAppHeartbeatMsg& vecappheartbeat(int index) const; - inline ::kbd_idlfile::SAppHeartbeatMsg* mutable_vecappheartbeat(int index); - inline ::kbd_idlfile::SAppHeartbeatMsg* add_vecappheartbeat(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAppHeartbeatMsg >& + inline const ::iot_idl::SAppHeartbeatMsg& vecappheartbeat(int index) const; + inline ::iot_idl::SAppHeartbeatMsg* mutable_vecappheartbeat(int index); + inline ::iot_idl::SAppHeartbeatMsg* add_vecappheartbeat(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SAppHeartbeatMsg >& vecappheartbeat() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAppHeartbeatMsg >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SAppHeartbeatMsg >* mutable_vecappheartbeat(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SNodeHeartbeatMsg) + // @@protoc_insertion_point(class_scope:iot_idl.SNodeHeartbeatMsg) private: inline void set_has_ndomainid(); inline void clear_has_ndomainid(); @@ -347,7 +347,7 @@ class IDL_FILES_EXPORT SNodeHeartbeatMsg : public ::google::protobuf::Message { ::std::string* strnodename_; ::std::string* strip1_; ::std::string* strip2_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAppHeartbeatMsg > vecappheartbeat_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SAppHeartbeatMsg > vecappheartbeat_; ::google::protobuf::int32 ndomainid_; friend void IDL_FILES_EXPORT protobuf_AddDesc_NodeMngMessage_2eproto(); friend void protobuf_AssignDesc_NodeMngMessage_2eproto(); @@ -411,26 +411,26 @@ class IDL_FILES_EXPORT SMultiNodeHeartbeatMsg : public ::google::protobuf::Messa // accessors ------------------------------------------------------- - // repeated .kbd_idlfile.SNodeHeartbeatMsg vecNodeHeartBeat = 1; + // repeated .iot_idl.SNodeHeartbeatMsg vecNodeHeartBeat = 1; inline int vecnodeheartbeat_size() const; inline void clear_vecnodeheartbeat(); static const int kVecNodeHeartBeatFieldNumber = 1; - inline const ::kbd_idlfile::SNodeHeartbeatMsg& vecnodeheartbeat(int index) const; - inline ::kbd_idlfile::SNodeHeartbeatMsg* mutable_vecnodeheartbeat(int index); - inline ::kbd_idlfile::SNodeHeartbeatMsg* add_vecnodeheartbeat(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SNodeHeartbeatMsg >& + inline const ::iot_idl::SNodeHeartbeatMsg& vecnodeheartbeat(int index) const; + inline ::iot_idl::SNodeHeartbeatMsg* mutable_vecnodeheartbeat(int index); + inline ::iot_idl::SNodeHeartbeatMsg* add_vecnodeheartbeat(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SNodeHeartbeatMsg >& vecnodeheartbeat() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SNodeHeartbeatMsg >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SNodeHeartbeatMsg >* mutable_vecnodeheartbeat(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SMultiNodeHeartbeatMsg) + // @@protoc_insertion_point(class_scope:iot_idl.SMultiNodeHeartbeatMsg) private: ::google::protobuf::UnknownFieldSet _unknown_fields_; ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SNodeHeartbeatMsg > vecnodeheartbeat_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SNodeHeartbeatMsg > vecnodeheartbeat_; friend void IDL_FILES_EXPORT protobuf_AddDesc_NodeMngMessage_2eproto(); friend void protobuf_AssignDesc_NodeMngMessage_2eproto(); friend void protobuf_ShutdownFile_NodeMngMessage_2eproto(); @@ -576,7 +576,7 @@ class IDL_FILES_EXPORT SRedundancyCmdMsg : public ::google::protobuf::Message { inline bool bslave() const; inline void set_bslave(bool value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SRedundancyCmdMsg) + // @@protoc_insertion_point(class_scope:iot_idl.SRedundancyCmdMsg) private: inline void set_has_ndomainid(); inline void clear_has_ndomainid(); @@ -639,13 +639,13 @@ inline void SAppHeartbeatMsg::clear_nappid() { clear_has_nappid(); } inline ::google::protobuf::int32 SAppHeartbeatMsg::nappid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAppHeartbeatMsg.nAppId) + // @@protoc_insertion_point(field_get:iot_idl.SAppHeartbeatMsg.nAppId) return nappid_; } inline void SAppHeartbeatMsg::set_nappid(::google::protobuf::int32 value) { set_has_nappid(); nappid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAppHeartbeatMsg.nAppId) + // @@protoc_insertion_point(field_set:iot_idl.SAppHeartbeatMsg.nAppId) } // required int32 nPriority = 2; @@ -663,13 +663,13 @@ inline void SAppHeartbeatMsg::clear_npriority() { clear_has_npriority(); } inline ::google::protobuf::int32 SAppHeartbeatMsg::npriority() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAppHeartbeatMsg.nPriority) + // @@protoc_insertion_point(field_get:iot_idl.SAppHeartbeatMsg.nPriority) return npriority_; } inline void SAppHeartbeatMsg::set_npriority(::google::protobuf::int32 value) { set_has_npriority(); npriority_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAppHeartbeatMsg.nPriority) + // @@protoc_insertion_point(field_set:iot_idl.SAppHeartbeatMsg.nPriority) } // required bool bIP1Active = 3; @@ -687,13 +687,13 @@ inline void SAppHeartbeatMsg::clear_bip1active() { clear_has_bip1active(); } inline bool SAppHeartbeatMsg::bip1active() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAppHeartbeatMsg.bIP1Active) + // @@protoc_insertion_point(field_get:iot_idl.SAppHeartbeatMsg.bIP1Active) return bip1active_; } inline void SAppHeartbeatMsg::set_bip1active(bool value) { set_has_bip1active(); bip1active_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAppHeartbeatMsg.bIP1Active) + // @@protoc_insertion_point(field_set:iot_idl.SAppHeartbeatMsg.bIP1Active) } // required bool bIP2Active = 4; @@ -711,13 +711,13 @@ inline void SAppHeartbeatMsg::clear_bip2active() { clear_has_bip2active(); } inline bool SAppHeartbeatMsg::bip2active() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAppHeartbeatMsg.bIP2Active) + // @@protoc_insertion_point(field_get:iot_idl.SAppHeartbeatMsg.bIP2Active) return bip2active_; } inline void SAppHeartbeatMsg::set_bip2active(bool value) { set_has_bip2active(); bip2active_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAppHeartbeatMsg.bIP2Active) + // @@protoc_insertion_point(field_set:iot_idl.SAppHeartbeatMsg.bIP2Active) } // required bool bActive = 5; @@ -735,13 +735,13 @@ inline void SAppHeartbeatMsg::clear_bactive() { clear_has_bactive(); } inline bool SAppHeartbeatMsg::bactive() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAppHeartbeatMsg.bActive) + // @@protoc_insertion_point(field_get:iot_idl.SAppHeartbeatMsg.bActive) return bactive_; } inline void SAppHeartbeatMsg::set_bactive(bool value) { set_has_bactive(); bactive_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAppHeartbeatMsg.bActive) + // @@protoc_insertion_point(field_set:iot_idl.SAppHeartbeatMsg.bActive) } // required bool bMaster = 6; @@ -759,13 +759,13 @@ inline void SAppHeartbeatMsg::clear_bmaster() { clear_has_bmaster(); } inline bool SAppHeartbeatMsg::bmaster() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAppHeartbeatMsg.bMaster) + // @@protoc_insertion_point(field_get:iot_idl.SAppHeartbeatMsg.bMaster) return bmaster_; } inline void SAppHeartbeatMsg::set_bmaster(bool value) { set_has_bmaster(); bmaster_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAppHeartbeatMsg.bMaster) + // @@protoc_insertion_point(field_set:iot_idl.SAppHeartbeatMsg.bMaster) } // required bool bSlave = 7; @@ -783,13 +783,13 @@ inline void SAppHeartbeatMsg::clear_bslave() { clear_has_bslave(); } inline bool SAppHeartbeatMsg::bslave() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAppHeartbeatMsg.bSlave) + // @@protoc_insertion_point(field_get:iot_idl.SAppHeartbeatMsg.bSlave) return bslave_; } inline void SAppHeartbeatMsg::set_bslave(bool value) { set_has_bslave(); bslave_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAppHeartbeatMsg.bSlave) + // @@protoc_insertion_point(field_set:iot_idl.SAppHeartbeatMsg.bSlave) } // required bool bHasMaster = 8; @@ -807,13 +807,13 @@ inline void SAppHeartbeatMsg::clear_bhasmaster() { clear_has_bhasmaster(); } inline bool SAppHeartbeatMsg::bhasmaster() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAppHeartbeatMsg.bHasMaster) + // @@protoc_insertion_point(field_get:iot_idl.SAppHeartbeatMsg.bHasMaster) return bhasmaster_; } inline void SAppHeartbeatMsg::set_bhasmaster(bool value) { set_has_bhasmaster(); bhasmaster_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAppHeartbeatMsg.bHasMaster) + // @@protoc_insertion_point(field_set:iot_idl.SAppHeartbeatMsg.bHasMaster) } // required bool bSwitchFailed = 9; @@ -831,13 +831,13 @@ inline void SAppHeartbeatMsg::clear_bswitchfailed() { clear_has_bswitchfailed(); } inline bool SAppHeartbeatMsg::bswitchfailed() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SAppHeartbeatMsg.bSwitchFailed) + // @@protoc_insertion_point(field_get:iot_idl.SAppHeartbeatMsg.bSwitchFailed) return bswitchfailed_; } inline void SAppHeartbeatMsg::set_bswitchfailed(bool value) { set_has_bswitchfailed(); bswitchfailed_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SAppHeartbeatMsg.bSwitchFailed) + // @@protoc_insertion_point(field_set:iot_idl.SAppHeartbeatMsg.bSwitchFailed) } // ------------------------------------------------------------------- @@ -859,13 +859,13 @@ inline void SNodeHeartbeatMsg::clear_ndomainid() { clear_has_ndomainid(); } inline ::google::protobuf::int32 SNodeHeartbeatMsg::ndomainid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SNodeHeartbeatMsg.nDomainId) + // @@protoc_insertion_point(field_get:iot_idl.SNodeHeartbeatMsg.nDomainId) return ndomainid_; } inline void SNodeHeartbeatMsg::set_ndomainid(::google::protobuf::int32 value) { set_has_ndomainid(); ndomainid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SNodeHeartbeatMsg.nDomainId) + // @@protoc_insertion_point(field_set:iot_idl.SNodeHeartbeatMsg.nDomainId) } // required string strNodeName = 2; @@ -885,7 +885,7 @@ inline void SNodeHeartbeatMsg::clear_strnodename() { clear_has_strnodename(); } inline const ::std::string& SNodeHeartbeatMsg::strnodename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SNodeHeartbeatMsg.strNodeName) + // @@protoc_insertion_point(field_get:iot_idl.SNodeHeartbeatMsg.strNodeName) return *strnodename_; } inline void SNodeHeartbeatMsg::set_strnodename(const ::std::string& value) { @@ -894,7 +894,7 @@ inline void SNodeHeartbeatMsg::set_strnodename(const ::std::string& value) { strnodename_ = new ::std::string; } strnodename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SNodeHeartbeatMsg.strNodeName) + // @@protoc_insertion_point(field_set:iot_idl.SNodeHeartbeatMsg.strNodeName) } inline void SNodeHeartbeatMsg::set_strnodename(const char* value) { set_has_strnodename(); @@ -902,7 +902,7 @@ inline void SNodeHeartbeatMsg::set_strnodename(const char* value) { strnodename_ = new ::std::string; } strnodename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SNodeHeartbeatMsg.strNodeName) + // @@protoc_insertion_point(field_set_char:iot_idl.SNodeHeartbeatMsg.strNodeName) } inline void SNodeHeartbeatMsg::set_strnodename(const char* value, size_t size) { set_has_strnodename(); @@ -910,14 +910,14 @@ inline void SNodeHeartbeatMsg::set_strnodename(const char* value, size_t size) { strnodename_ = new ::std::string; } strnodename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SNodeHeartbeatMsg.strNodeName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SNodeHeartbeatMsg.strNodeName) } inline ::std::string* SNodeHeartbeatMsg::mutable_strnodename() { set_has_strnodename(); if (strnodename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strnodename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SNodeHeartbeatMsg.strNodeName) + // @@protoc_insertion_point(field_mutable:iot_idl.SNodeHeartbeatMsg.strNodeName) return strnodename_; } inline ::std::string* SNodeHeartbeatMsg::release_strnodename() { @@ -941,7 +941,7 @@ inline void SNodeHeartbeatMsg::set_allocated_strnodename(::std::string* strnoden clear_has_strnodename(); strnodename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SNodeHeartbeatMsg.strNodeName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SNodeHeartbeatMsg.strNodeName) } // required string strIP1 = 3; @@ -961,7 +961,7 @@ inline void SNodeHeartbeatMsg::clear_strip1() { clear_has_strip1(); } inline const ::std::string& SNodeHeartbeatMsg::strip1() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SNodeHeartbeatMsg.strIP1) + // @@protoc_insertion_point(field_get:iot_idl.SNodeHeartbeatMsg.strIP1) return *strip1_; } inline void SNodeHeartbeatMsg::set_strip1(const ::std::string& value) { @@ -970,7 +970,7 @@ inline void SNodeHeartbeatMsg::set_strip1(const ::std::string& value) { strip1_ = new ::std::string; } strip1_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SNodeHeartbeatMsg.strIP1) + // @@protoc_insertion_point(field_set:iot_idl.SNodeHeartbeatMsg.strIP1) } inline void SNodeHeartbeatMsg::set_strip1(const char* value) { set_has_strip1(); @@ -978,7 +978,7 @@ inline void SNodeHeartbeatMsg::set_strip1(const char* value) { strip1_ = new ::std::string; } strip1_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SNodeHeartbeatMsg.strIP1) + // @@protoc_insertion_point(field_set_char:iot_idl.SNodeHeartbeatMsg.strIP1) } inline void SNodeHeartbeatMsg::set_strip1(const char* value, size_t size) { set_has_strip1(); @@ -986,14 +986,14 @@ inline void SNodeHeartbeatMsg::set_strip1(const char* value, size_t size) { strip1_ = new ::std::string; } strip1_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SNodeHeartbeatMsg.strIP1) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SNodeHeartbeatMsg.strIP1) } inline ::std::string* SNodeHeartbeatMsg::mutable_strip1() { set_has_strip1(); if (strip1_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strip1_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SNodeHeartbeatMsg.strIP1) + // @@protoc_insertion_point(field_mutable:iot_idl.SNodeHeartbeatMsg.strIP1) return strip1_; } inline ::std::string* SNodeHeartbeatMsg::release_strip1() { @@ -1017,7 +1017,7 @@ inline void SNodeHeartbeatMsg::set_allocated_strip1(::std::string* strip1) { clear_has_strip1(); strip1_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SNodeHeartbeatMsg.strIP1) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SNodeHeartbeatMsg.strIP1) } // required string strIP2 = 4; @@ -1037,7 +1037,7 @@ inline void SNodeHeartbeatMsg::clear_strip2() { clear_has_strip2(); } inline const ::std::string& SNodeHeartbeatMsg::strip2() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SNodeHeartbeatMsg.strIP2) + // @@protoc_insertion_point(field_get:iot_idl.SNodeHeartbeatMsg.strIP2) return *strip2_; } inline void SNodeHeartbeatMsg::set_strip2(const ::std::string& value) { @@ -1046,7 +1046,7 @@ inline void SNodeHeartbeatMsg::set_strip2(const ::std::string& value) { strip2_ = new ::std::string; } strip2_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SNodeHeartbeatMsg.strIP2) + // @@protoc_insertion_point(field_set:iot_idl.SNodeHeartbeatMsg.strIP2) } inline void SNodeHeartbeatMsg::set_strip2(const char* value) { set_has_strip2(); @@ -1054,7 +1054,7 @@ inline void SNodeHeartbeatMsg::set_strip2(const char* value) { strip2_ = new ::std::string; } strip2_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SNodeHeartbeatMsg.strIP2) + // @@protoc_insertion_point(field_set_char:iot_idl.SNodeHeartbeatMsg.strIP2) } inline void SNodeHeartbeatMsg::set_strip2(const char* value, size_t size) { set_has_strip2(); @@ -1062,14 +1062,14 @@ inline void SNodeHeartbeatMsg::set_strip2(const char* value, size_t size) { strip2_ = new ::std::string; } strip2_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SNodeHeartbeatMsg.strIP2) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SNodeHeartbeatMsg.strIP2) } inline ::std::string* SNodeHeartbeatMsg::mutable_strip2() { set_has_strip2(); if (strip2_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strip2_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SNodeHeartbeatMsg.strIP2) + // @@protoc_insertion_point(field_mutable:iot_idl.SNodeHeartbeatMsg.strIP2) return strip2_; } inline ::std::string* SNodeHeartbeatMsg::release_strip2() { @@ -1093,36 +1093,36 @@ inline void SNodeHeartbeatMsg::set_allocated_strip2(::std::string* strip2) { clear_has_strip2(); strip2_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SNodeHeartbeatMsg.strIP2) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SNodeHeartbeatMsg.strIP2) } -// repeated .kbd_idlfile.SAppHeartbeatMsg vecAppHeartbeat = 5; +// repeated .iot_idl.SAppHeartbeatMsg vecAppHeartbeat = 5; inline int SNodeHeartbeatMsg::vecappheartbeat_size() const { return vecappheartbeat_.size(); } inline void SNodeHeartbeatMsg::clear_vecappheartbeat() { vecappheartbeat_.Clear(); } -inline const ::kbd_idlfile::SAppHeartbeatMsg& SNodeHeartbeatMsg::vecappheartbeat(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SNodeHeartbeatMsg.vecAppHeartbeat) +inline const ::iot_idl::SAppHeartbeatMsg& SNodeHeartbeatMsg::vecappheartbeat(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SNodeHeartbeatMsg.vecAppHeartbeat) return vecappheartbeat_.Get(index); } -inline ::kbd_idlfile::SAppHeartbeatMsg* SNodeHeartbeatMsg::mutable_vecappheartbeat(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SNodeHeartbeatMsg.vecAppHeartbeat) +inline ::iot_idl::SAppHeartbeatMsg* SNodeHeartbeatMsg::mutable_vecappheartbeat(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SNodeHeartbeatMsg.vecAppHeartbeat) return vecappheartbeat_.Mutable(index); } -inline ::kbd_idlfile::SAppHeartbeatMsg* SNodeHeartbeatMsg::add_vecappheartbeat() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SNodeHeartbeatMsg.vecAppHeartbeat) +inline ::iot_idl::SAppHeartbeatMsg* SNodeHeartbeatMsg::add_vecappheartbeat() { + // @@protoc_insertion_point(field_add:iot_idl.SNodeHeartbeatMsg.vecAppHeartbeat) return vecappheartbeat_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAppHeartbeatMsg >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SAppHeartbeatMsg >& SNodeHeartbeatMsg::vecappheartbeat() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SNodeHeartbeatMsg.vecAppHeartbeat) + // @@protoc_insertion_point(field_list:iot_idl.SNodeHeartbeatMsg.vecAppHeartbeat) return vecappheartbeat_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SAppHeartbeatMsg >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SAppHeartbeatMsg >* SNodeHeartbeatMsg::mutable_vecappheartbeat() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SNodeHeartbeatMsg.vecAppHeartbeat) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SNodeHeartbeatMsg.vecAppHeartbeat) return &vecappheartbeat_; } @@ -1130,33 +1130,33 @@ SNodeHeartbeatMsg::mutable_vecappheartbeat() { // SMultiNodeHeartbeatMsg -// repeated .kbd_idlfile.SNodeHeartbeatMsg vecNodeHeartBeat = 1; +// repeated .iot_idl.SNodeHeartbeatMsg vecNodeHeartBeat = 1; inline int SMultiNodeHeartbeatMsg::vecnodeheartbeat_size() const { return vecnodeheartbeat_.size(); } inline void SMultiNodeHeartbeatMsg::clear_vecnodeheartbeat() { vecnodeheartbeat_.Clear(); } -inline const ::kbd_idlfile::SNodeHeartbeatMsg& SMultiNodeHeartbeatMsg::vecnodeheartbeat(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SMultiNodeHeartbeatMsg.vecNodeHeartBeat) +inline const ::iot_idl::SNodeHeartbeatMsg& SMultiNodeHeartbeatMsg::vecnodeheartbeat(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SMultiNodeHeartbeatMsg.vecNodeHeartBeat) return vecnodeheartbeat_.Get(index); } -inline ::kbd_idlfile::SNodeHeartbeatMsg* SMultiNodeHeartbeatMsg::mutable_vecnodeheartbeat(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SMultiNodeHeartbeatMsg.vecNodeHeartBeat) +inline ::iot_idl::SNodeHeartbeatMsg* SMultiNodeHeartbeatMsg::mutable_vecnodeheartbeat(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SMultiNodeHeartbeatMsg.vecNodeHeartBeat) return vecnodeheartbeat_.Mutable(index); } -inline ::kbd_idlfile::SNodeHeartbeatMsg* SMultiNodeHeartbeatMsg::add_vecnodeheartbeat() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SMultiNodeHeartbeatMsg.vecNodeHeartBeat) +inline ::iot_idl::SNodeHeartbeatMsg* SMultiNodeHeartbeatMsg::add_vecnodeheartbeat() { + // @@protoc_insertion_point(field_add:iot_idl.SMultiNodeHeartbeatMsg.vecNodeHeartBeat) return vecnodeheartbeat_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SNodeHeartbeatMsg >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SNodeHeartbeatMsg >& SMultiNodeHeartbeatMsg::vecnodeheartbeat() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SMultiNodeHeartbeatMsg.vecNodeHeartBeat) + // @@protoc_insertion_point(field_list:iot_idl.SMultiNodeHeartbeatMsg.vecNodeHeartBeat) return vecnodeheartbeat_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SNodeHeartbeatMsg >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SNodeHeartbeatMsg >* SMultiNodeHeartbeatMsg::mutable_vecnodeheartbeat() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SMultiNodeHeartbeatMsg.vecNodeHeartBeat) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SMultiNodeHeartbeatMsg.vecNodeHeartBeat) return &vecnodeheartbeat_; } @@ -1179,13 +1179,13 @@ inline void SRedundancyCmdMsg::clear_ndomainid() { clear_has_ndomainid(); } inline ::google::protobuf::int32 SRedundancyCmdMsg::ndomainid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRedundancyCmdMsg.nDomainId) + // @@protoc_insertion_point(field_get:iot_idl.SRedundancyCmdMsg.nDomainId) return ndomainid_; } inline void SRedundancyCmdMsg::set_ndomainid(::google::protobuf::int32 value) { set_has_ndomainid(); ndomainid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SRedundancyCmdMsg.nDomainId) + // @@protoc_insertion_point(field_set:iot_idl.SRedundancyCmdMsg.nDomainId) } // required int32 nAppId = 2; @@ -1203,13 +1203,13 @@ inline void SRedundancyCmdMsg::clear_nappid() { clear_has_nappid(); } inline ::google::protobuf::int32 SRedundancyCmdMsg::nappid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRedundancyCmdMsg.nAppId) + // @@protoc_insertion_point(field_get:iot_idl.SRedundancyCmdMsg.nAppId) return nappid_; } inline void SRedundancyCmdMsg::set_nappid(::google::protobuf::int32 value) { set_has_nappid(); nappid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SRedundancyCmdMsg.nAppId) + // @@protoc_insertion_point(field_set:iot_idl.SRedundancyCmdMsg.nAppId) } // required string strSwitchNodeName = 3; @@ -1229,7 +1229,7 @@ inline void SRedundancyCmdMsg::clear_strswitchnodename() { clear_has_strswitchnodename(); } inline const ::std::string& SRedundancyCmdMsg::strswitchnodename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRedundancyCmdMsg.strSwitchNodeName) + // @@protoc_insertion_point(field_get:iot_idl.SRedundancyCmdMsg.strSwitchNodeName) return *strswitchnodename_; } inline void SRedundancyCmdMsg::set_strswitchnodename(const ::std::string& value) { @@ -1238,7 +1238,7 @@ inline void SRedundancyCmdMsg::set_strswitchnodename(const ::std::string& value) strswitchnodename_ = new ::std::string; } strswitchnodename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SRedundancyCmdMsg.strSwitchNodeName) + // @@protoc_insertion_point(field_set:iot_idl.SRedundancyCmdMsg.strSwitchNodeName) } inline void SRedundancyCmdMsg::set_strswitchnodename(const char* value) { set_has_strswitchnodename(); @@ -1246,7 +1246,7 @@ inline void SRedundancyCmdMsg::set_strswitchnodename(const char* value) { strswitchnodename_ = new ::std::string; } strswitchnodename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SRedundancyCmdMsg.strSwitchNodeName) + // @@protoc_insertion_point(field_set_char:iot_idl.SRedundancyCmdMsg.strSwitchNodeName) } inline void SRedundancyCmdMsg::set_strswitchnodename(const char* value, size_t size) { set_has_strswitchnodename(); @@ -1254,14 +1254,14 @@ inline void SRedundancyCmdMsg::set_strswitchnodename(const char* value, size_t s strswitchnodename_ = new ::std::string; } strswitchnodename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SRedundancyCmdMsg.strSwitchNodeName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SRedundancyCmdMsg.strSwitchNodeName) } inline ::std::string* SRedundancyCmdMsg::mutable_strswitchnodename() { set_has_strswitchnodename(); if (strswitchnodename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strswitchnodename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SRedundancyCmdMsg.strSwitchNodeName) + // @@protoc_insertion_point(field_mutable:iot_idl.SRedundancyCmdMsg.strSwitchNodeName) return strswitchnodename_; } inline ::std::string* SRedundancyCmdMsg::release_strswitchnodename() { @@ -1285,7 +1285,7 @@ inline void SRedundancyCmdMsg::set_allocated_strswitchnodename(::std::string* st clear_has_strswitchnodename(); strswitchnodename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SRedundancyCmdMsg.strSwitchNodeName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SRedundancyCmdMsg.strSwitchNodeName) } // required string strArbiterNodeName = 4; @@ -1305,7 +1305,7 @@ inline void SRedundancyCmdMsg::clear_strarbiternodename() { clear_has_strarbiternodename(); } inline const ::std::string& SRedundancyCmdMsg::strarbiternodename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeName) + // @@protoc_insertion_point(field_get:iot_idl.SRedundancyCmdMsg.strArbiterNodeName) return *strarbiternodename_; } inline void SRedundancyCmdMsg::set_strarbiternodename(const ::std::string& value) { @@ -1314,7 +1314,7 @@ inline void SRedundancyCmdMsg::set_strarbiternodename(const ::std::string& value strarbiternodename_ = new ::std::string; } strarbiternodename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeName) + // @@protoc_insertion_point(field_set:iot_idl.SRedundancyCmdMsg.strArbiterNodeName) } inline void SRedundancyCmdMsg::set_strarbiternodename(const char* value) { set_has_strarbiternodename(); @@ -1322,7 +1322,7 @@ inline void SRedundancyCmdMsg::set_strarbiternodename(const char* value) { strarbiternodename_ = new ::std::string; } strarbiternodename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeName) + // @@protoc_insertion_point(field_set_char:iot_idl.SRedundancyCmdMsg.strArbiterNodeName) } inline void SRedundancyCmdMsg::set_strarbiternodename(const char* value, size_t size) { set_has_strarbiternodename(); @@ -1330,14 +1330,14 @@ inline void SRedundancyCmdMsg::set_strarbiternodename(const char* value, size_t strarbiternodename_ = new ::std::string; } strarbiternodename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SRedundancyCmdMsg.strArbiterNodeName) } inline ::std::string* SRedundancyCmdMsg::mutable_strarbiternodename() { set_has_strarbiternodename(); if (strarbiternodename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strarbiternodename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeName) + // @@protoc_insertion_point(field_mutable:iot_idl.SRedundancyCmdMsg.strArbiterNodeName) return strarbiternodename_; } inline ::std::string* SRedundancyCmdMsg::release_strarbiternodename() { @@ -1361,7 +1361,7 @@ inline void SRedundancyCmdMsg::set_allocated_strarbiternodename(::std::string* s clear_has_strarbiternodename(); strarbiternodename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SRedundancyCmdMsg.strArbiterNodeName) } // required string strArbiterNodeIP1 = 5; @@ -1381,7 +1381,7 @@ inline void SRedundancyCmdMsg::clear_strarbiternodeip1() { clear_has_strarbiternodeip1(); } inline const ::std::string& SRedundancyCmdMsg::strarbiternodeip1() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeIP1) + // @@protoc_insertion_point(field_get:iot_idl.SRedundancyCmdMsg.strArbiterNodeIP1) return *strarbiternodeip1_; } inline void SRedundancyCmdMsg::set_strarbiternodeip1(const ::std::string& value) { @@ -1390,7 +1390,7 @@ inline void SRedundancyCmdMsg::set_strarbiternodeip1(const ::std::string& value) strarbiternodeip1_ = new ::std::string; } strarbiternodeip1_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeIP1) + // @@protoc_insertion_point(field_set:iot_idl.SRedundancyCmdMsg.strArbiterNodeIP1) } inline void SRedundancyCmdMsg::set_strarbiternodeip1(const char* value) { set_has_strarbiternodeip1(); @@ -1398,7 +1398,7 @@ inline void SRedundancyCmdMsg::set_strarbiternodeip1(const char* value) { strarbiternodeip1_ = new ::std::string; } strarbiternodeip1_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeIP1) + // @@protoc_insertion_point(field_set_char:iot_idl.SRedundancyCmdMsg.strArbiterNodeIP1) } inline void SRedundancyCmdMsg::set_strarbiternodeip1(const char* value, size_t size) { set_has_strarbiternodeip1(); @@ -1406,14 +1406,14 @@ inline void SRedundancyCmdMsg::set_strarbiternodeip1(const char* value, size_t s strarbiternodeip1_ = new ::std::string; } strarbiternodeip1_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeIP1) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SRedundancyCmdMsg.strArbiterNodeIP1) } inline ::std::string* SRedundancyCmdMsg::mutable_strarbiternodeip1() { set_has_strarbiternodeip1(); if (strarbiternodeip1_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strarbiternodeip1_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeIP1) + // @@protoc_insertion_point(field_mutable:iot_idl.SRedundancyCmdMsg.strArbiterNodeIP1) return strarbiternodeip1_; } inline ::std::string* SRedundancyCmdMsg::release_strarbiternodeip1() { @@ -1437,7 +1437,7 @@ inline void SRedundancyCmdMsg::set_allocated_strarbiternodeip1(::std::string* st clear_has_strarbiternodeip1(); strarbiternodeip1_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeIP1) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SRedundancyCmdMsg.strArbiterNodeIP1) } // required string strArbiterNodeIP2 = 6; @@ -1457,7 +1457,7 @@ inline void SRedundancyCmdMsg::clear_strarbiternodeip2() { clear_has_strarbiternodeip2(); } inline const ::std::string& SRedundancyCmdMsg::strarbiternodeip2() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeIP2) + // @@protoc_insertion_point(field_get:iot_idl.SRedundancyCmdMsg.strArbiterNodeIP2) return *strarbiternodeip2_; } inline void SRedundancyCmdMsg::set_strarbiternodeip2(const ::std::string& value) { @@ -1466,7 +1466,7 @@ inline void SRedundancyCmdMsg::set_strarbiternodeip2(const ::std::string& value) strarbiternodeip2_ = new ::std::string; } strarbiternodeip2_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeIP2) + // @@protoc_insertion_point(field_set:iot_idl.SRedundancyCmdMsg.strArbiterNodeIP2) } inline void SRedundancyCmdMsg::set_strarbiternodeip2(const char* value) { set_has_strarbiternodeip2(); @@ -1474,7 +1474,7 @@ inline void SRedundancyCmdMsg::set_strarbiternodeip2(const char* value) { strarbiternodeip2_ = new ::std::string; } strarbiternodeip2_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeIP2) + // @@protoc_insertion_point(field_set_char:iot_idl.SRedundancyCmdMsg.strArbiterNodeIP2) } inline void SRedundancyCmdMsg::set_strarbiternodeip2(const char* value, size_t size) { set_has_strarbiternodeip2(); @@ -1482,14 +1482,14 @@ inline void SRedundancyCmdMsg::set_strarbiternodeip2(const char* value, size_t s strarbiternodeip2_ = new ::std::string; } strarbiternodeip2_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeIP2) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SRedundancyCmdMsg.strArbiterNodeIP2) } inline ::std::string* SRedundancyCmdMsg::mutable_strarbiternodeip2() { set_has_strarbiternodeip2(); if (strarbiternodeip2_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strarbiternodeip2_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeIP2) + // @@protoc_insertion_point(field_mutable:iot_idl.SRedundancyCmdMsg.strArbiterNodeIP2) return strarbiternodeip2_; } inline ::std::string* SRedundancyCmdMsg::release_strarbiternodeip2() { @@ -1513,7 +1513,7 @@ inline void SRedundancyCmdMsg::set_allocated_strarbiternodeip2(::std::string* st clear_has_strarbiternodeip2(); strarbiternodeip2_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SRedundancyCmdMsg.strArbiterNodeIP2) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SRedundancyCmdMsg.strArbiterNodeIP2) } // required bool bActive = 7; @@ -1531,13 +1531,13 @@ inline void SRedundancyCmdMsg::clear_bactive() { clear_has_bactive(); } inline bool SRedundancyCmdMsg::bactive() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRedundancyCmdMsg.bActive) + // @@protoc_insertion_point(field_get:iot_idl.SRedundancyCmdMsg.bActive) return bactive_; } inline void SRedundancyCmdMsg::set_bactive(bool value) { set_has_bactive(); bactive_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SRedundancyCmdMsg.bActive) + // @@protoc_insertion_point(field_set:iot_idl.SRedundancyCmdMsg.bActive) } // required bool bMaster = 8; @@ -1555,13 +1555,13 @@ inline void SRedundancyCmdMsg::clear_bmaster() { clear_has_bmaster(); } inline bool SRedundancyCmdMsg::bmaster() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRedundancyCmdMsg.bMaster) + // @@protoc_insertion_point(field_get:iot_idl.SRedundancyCmdMsg.bMaster) return bmaster_; } inline void SRedundancyCmdMsg::set_bmaster(bool value) { set_has_bmaster(); bmaster_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SRedundancyCmdMsg.bMaster) + // @@protoc_insertion_point(field_set:iot_idl.SRedundancyCmdMsg.bMaster) } // required bool bSlave = 9; @@ -1579,28 +1579,28 @@ inline void SRedundancyCmdMsg::clear_bslave() { clear_has_bslave(); } inline bool SRedundancyCmdMsg::bslave() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SRedundancyCmdMsg.bSlave) + // @@protoc_insertion_point(field_get:iot_idl.SRedundancyCmdMsg.bSlave) return bslave_; } inline void SRedundancyCmdMsg::set_bslave(bool value) { set_has_bslave(); bslave_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SRedundancyCmdMsg.bSlave) + // @@protoc_insertion_point(field_set:iot_idl.SRedundancyCmdMsg.bSlave) } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::ENodeMngMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::ENodeMngMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::ENodeMngMsgType>() { - return ::kbd_idlfile::ENodeMngMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::ENodeMngMsgType>() { + return ::iot_idl::ENodeMngMsgType_descriptor(); } } // namespace google diff --git a/platform/src/idl_files/NodeMngMessage.proto b/platform/src/idl_files/NodeMngMessage.proto index 81a120b1..1bfedf02 100644 --- a/platform/src/idl_files/NodeMngMessage.proto +++ b/platform/src/idl_files/NodeMngMessage.proto @@ -1,5 +1,5 @@ syntax="proto2"; -package kbd_idlfile; +package iot_idl; //ϢеϢ enum ENodeMngMsgType diff --git a/platform/src/idl_files/OptDataMessage.pb.cc b/platform/src/idl_files/OptDataMessage.pb.cc index b5a47506..40059ee8 100644 --- a/platform/src/idl_files/OptDataMessage.pb.cc +++ b/platform/src/idl_files/OptDataMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -184,18 +184,18 @@ void protobuf_AddDesc_OptDataMessage_2eproto() { already_here = true; GOOGLE_PROTOBUF_VERIFY_VERSION; - ::kbd_idlfile::protobuf_AddDesc_Public_2eproto(); + ::iot_idl::protobuf_AddDesc_Public_2eproto(); ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\024OptDataMessage.proto\022\013kbd_idlfile\032\014Pub" + "\n\024OptDataMessage.proto\022\013iot_idl\032\014Pub" "lic.proto\"e\n\017SOptDataPkgHead\022\023\n\013str_src_" "tag\030\001 \002(\t\022\024\n\014n_point_type\030\002 \002(\005\022\023\n\013b_not" "_alarm\030\003 \002(\010\022\022\n\nn_opt_time\030\004 \002(\003\"}\n\016SOpt" "SetDataMsg\022\024\n\014str_tag_name\030\001 \002(\t\022\024\n\014u_ad" "d_status\030\002 \002(\r\022\024\n\014u_del_status\030\003 \002(\r\022)\n\t" - "var_value\030\004 \002(\0132\026.kbd_idlfile.SVariable\"" + "var_value\030\004 \002(\0132\026.iot_idl.SVariable\"" "|\n\016SOptSetDataPkg\0222\n\014package_head\030\001 \002(\0132" - "\034.kbd_idlfile.SOptDataPkgHead\0226\n\021seq_set" - "_data_info\030\002 \003(\0132\033.kbd_idlfile.SOptSetDa" + "\034.iot_idl.SOptDataPkgHead\0226\n\021seq_set" + "_data_info\030\002 \003(\0132\033.iot_idl.SOptSetDa" "taMsg\"\202\001\n\023SOptVirtCtrlRequest\022\024\n\014str_tab" "_name\030\001 \002(\t\022\024\n\014str_tag_name\030\002 \002(\t\022\024\n\014str" "_col_name\030\003 \002(\t\022)\n\tvar_value\030\004 \002(\0132\026.kbd" @@ -282,7 +282,7 @@ const int SOptDataPkgHead::kNOptTimeFieldNumber; SOptDataPkgHead::SOptDataPkgHead() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SOptDataPkgHead) + // @@protoc_insertion_point(constructor:iot_idl.SOptDataPkgHead) } void SOptDataPkgHead::InitAsDefaultInstance() { @@ -292,7 +292,7 @@ SOptDataPkgHead::SOptDataPkgHead(const SOptDataPkgHead& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SOptDataPkgHead) + // @@protoc_insertion_point(copy_constructor:iot_idl.SOptDataPkgHead) } void SOptDataPkgHead::SharedCtor() { @@ -306,7 +306,7 @@ void SOptDataPkgHead::SharedCtor() { } SOptDataPkgHead::~SOptDataPkgHead() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SOptDataPkgHead) + // @@protoc_insertion_point(destructor:iot_idl.SOptDataPkgHead) SharedDtor(); } @@ -370,7 +370,7 @@ bool SOptDataPkgHead::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SOptDataPkgHead) + // @@protoc_insertion_point(parse_start:iot_idl.SOptDataPkgHead) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -451,17 +451,17 @@ bool SOptDataPkgHead::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SOptDataPkgHead) + // @@protoc_insertion_point(parse_success:iot_idl.SOptDataPkgHead) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SOptDataPkgHead) + // @@protoc_insertion_point(parse_failure:iot_idl.SOptDataPkgHead) return false; #undef DO_ } void SOptDataPkgHead::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SOptDataPkgHead) + // @@protoc_insertion_point(serialize_start:iot_idl.SOptDataPkgHead) // required string str_src_tag = 1; if (has_str_src_tag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -491,12 +491,12 @@ void SOptDataPkgHead::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SOptDataPkgHead) + // @@protoc_insertion_point(serialize_end:iot_idl.SOptDataPkgHead) } ::google::protobuf::uint8* SOptDataPkgHead::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SOptDataPkgHead) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SOptDataPkgHead) // required string str_src_tag = 1; if (has_str_src_tag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -527,7 +527,7 @@ void SOptDataPkgHead::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SOptDataPkgHead) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SOptDataPkgHead) return target; } @@ -655,18 +655,18 @@ const int SOptSetDataMsg::kVarValueFieldNumber; SOptSetDataMsg::SOptSetDataMsg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SOptSetDataMsg) + // @@protoc_insertion_point(constructor:iot_idl.SOptSetDataMsg) } void SOptSetDataMsg::InitAsDefaultInstance() { - var_value_ = const_cast< ::kbd_idlfile::SVariable*>(&::kbd_idlfile::SVariable::default_instance()); + var_value_ = const_cast< ::iot_idl::SVariable*>(&::iot_idl::SVariable::default_instance()); } SOptSetDataMsg::SOptSetDataMsg(const SOptSetDataMsg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SOptSetDataMsg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SOptSetDataMsg) } void SOptSetDataMsg::SharedCtor() { @@ -680,7 +680,7 @@ void SOptSetDataMsg::SharedCtor() { } SOptSetDataMsg::~SOptSetDataMsg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SOptSetDataMsg) + // @@protoc_insertion_point(destructor:iot_idl.SOptSetDataMsg) SharedDtor(); } @@ -733,7 +733,7 @@ void SOptSetDataMsg::Clear() { } } if (has_var_value()) { - if (var_value_ != NULL) var_value_->::kbd_idlfile::SVariable::Clear(); + if (var_value_ != NULL) var_value_->::iot_idl::SVariable::Clear(); } } @@ -748,7 +748,7 @@ bool SOptSetDataMsg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SOptSetDataMsg) + // @@protoc_insertion_point(parse_start:iot_idl.SOptSetDataMsg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -800,7 +800,7 @@ bool SOptSetDataMsg::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.SVariable var_value = 4; + // required .iot_idl.SVariable var_value = 4; case 4: { if (tag == 34) { parse_var_value: @@ -827,17 +827,17 @@ bool SOptSetDataMsg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SOptSetDataMsg) + // @@protoc_insertion_point(parse_success:iot_idl.SOptSetDataMsg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SOptSetDataMsg) + // @@protoc_insertion_point(parse_failure:iot_idl.SOptSetDataMsg) return false; #undef DO_ } void SOptSetDataMsg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SOptSetDataMsg) + // @@protoc_insertion_point(serialize_start:iot_idl.SOptSetDataMsg) // required string str_tag_name = 1; if (has_str_tag_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -858,7 +858,7 @@ void SOptSetDataMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->u_del_status(), output); } - // required .kbd_idlfile.SVariable var_value = 4; + // required .iot_idl.SVariable var_value = 4; if (has_var_value()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->var_value(), output); @@ -868,12 +868,12 @@ void SOptSetDataMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SOptSetDataMsg) + // @@protoc_insertion_point(serialize_end:iot_idl.SOptSetDataMsg) } ::google::protobuf::uint8* SOptSetDataMsg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SOptSetDataMsg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SOptSetDataMsg) // required string str_tag_name = 1; if (has_str_tag_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -895,7 +895,7 @@ void SOptSetDataMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->u_del_status(), target); } - // required .kbd_idlfile.SVariable var_value = 4; + // required .iot_idl.SVariable var_value = 4; if (has_var_value()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -906,7 +906,7 @@ void SOptSetDataMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SOptSetDataMsg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SOptSetDataMsg) return target; } @@ -935,7 +935,7 @@ int SOptSetDataMsg::ByteSize() const { this->u_del_status()); } - // required .kbd_idlfile.SVariable var_value = 4; + // required .iot_idl.SVariable var_value = 4; if (has_var_value()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -979,7 +979,7 @@ void SOptSetDataMsg::MergeFrom(const SOptSetDataMsg& from) { set_u_del_status(from.u_del_status()); } if (from.has_var_value()) { - mutable_var_value()->::kbd_idlfile::SVariable::MergeFrom(from.var_value()); + mutable_var_value()->::iot_idl::SVariable::MergeFrom(from.var_value()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -1037,18 +1037,18 @@ const int SOptSetDataPkg::kSeqSetDataInfoFieldNumber; SOptSetDataPkg::SOptSetDataPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SOptSetDataPkg) + // @@protoc_insertion_point(constructor:iot_idl.SOptSetDataPkg) } void SOptSetDataPkg::InitAsDefaultInstance() { - package_head_ = const_cast< ::kbd_idlfile::SOptDataPkgHead*>(&::kbd_idlfile::SOptDataPkgHead::default_instance()); + package_head_ = const_cast< ::iot_idl::SOptDataPkgHead*>(&::iot_idl::SOptDataPkgHead::default_instance()); } SOptSetDataPkg::SOptSetDataPkg(const SOptSetDataPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SOptSetDataPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SOptSetDataPkg) } void SOptSetDataPkg::SharedCtor() { @@ -1058,7 +1058,7 @@ void SOptSetDataPkg::SharedCtor() { } SOptSetDataPkg::~SOptSetDataPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SOptSetDataPkg) + // @@protoc_insertion_point(destructor:iot_idl.SOptSetDataPkg) SharedDtor(); } @@ -1091,7 +1091,7 @@ SOptSetDataPkg* SOptSetDataPkg::New() const { void SOptSetDataPkg::Clear() { if (has_package_head()) { - if (package_head_ != NULL) package_head_->::kbd_idlfile::SOptDataPkgHead::Clear(); + if (package_head_ != NULL) package_head_->::iot_idl::SOptDataPkgHead::Clear(); } seq_set_data_info_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -1102,13 +1102,13 @@ bool SOptSetDataPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SOptSetDataPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SOptSetDataPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.SOptDataPkgHead package_head = 1; + // required .iot_idl.SOptDataPkgHead package_head = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -1120,7 +1120,7 @@ bool SOptSetDataPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SOptSetDataMsg seq_set_data_info = 2; + // repeated .iot_idl.SOptSetDataMsg seq_set_data_info = 2; case 2: { if (tag == 18) { parse_seq_set_data_info: @@ -1148,24 +1148,24 @@ bool SOptSetDataPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SOptSetDataPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SOptSetDataPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SOptSetDataPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SOptSetDataPkg) return false; #undef DO_ } void SOptSetDataPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SOptSetDataPkg) - // required .kbd_idlfile.SOptDataPkgHead package_head = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SOptSetDataPkg) + // required .iot_idl.SOptDataPkgHead package_head = 1; if (has_package_head()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->package_head(), output); } - // repeated .kbd_idlfile.SOptSetDataMsg seq_set_data_info = 2; + // repeated .iot_idl.SOptSetDataMsg seq_set_data_info = 2; for (int i = 0; i < this->seq_set_data_info_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->seq_set_data_info(i), output); @@ -1175,20 +1175,20 @@ void SOptSetDataPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SOptSetDataPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SOptSetDataPkg) } ::google::protobuf::uint8* SOptSetDataPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SOptSetDataPkg) - // required .kbd_idlfile.SOptDataPkgHead package_head = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SOptSetDataPkg) + // required .iot_idl.SOptDataPkgHead package_head = 1; if (has_package_head()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->package_head(), target); } - // repeated .kbd_idlfile.SOptSetDataMsg seq_set_data_info = 2; + // repeated .iot_idl.SOptSetDataMsg seq_set_data_info = 2; for (int i = 0; i < this->seq_set_data_info_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1199,7 +1199,7 @@ void SOptSetDataPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SOptSetDataPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SOptSetDataPkg) return target; } @@ -1207,7 +1207,7 @@ int SOptSetDataPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SOptDataPkgHead package_head = 1; + // required .iot_idl.SOptDataPkgHead package_head = 1; if (has_package_head()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -1215,7 +1215,7 @@ int SOptSetDataPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SOptSetDataMsg seq_set_data_info = 2; + // repeated .iot_idl.SOptSetDataMsg seq_set_data_info = 2; total_size += 1 * this->seq_set_data_info_size(); for (int i = 0; i < this->seq_set_data_info_size(); i++) { total_size += @@ -1251,7 +1251,7 @@ void SOptSetDataPkg::MergeFrom(const SOptSetDataPkg& from) { seq_set_data_info_.MergeFrom(from.seq_set_data_info_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_package_head()) { - mutable_package_head()->::kbd_idlfile::SOptDataPkgHead::MergeFrom(from.package_head()); + mutable_package_head()->::iot_idl::SOptDataPkgHead::MergeFrom(from.package_head()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -1310,18 +1310,18 @@ const int SOptVirtCtrlRequest::kVarValueFieldNumber; SOptVirtCtrlRequest::SOptVirtCtrlRequest() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SOptVirtCtrlRequest) + // @@protoc_insertion_point(constructor:iot_idl.SOptVirtCtrlRequest) } void SOptVirtCtrlRequest::InitAsDefaultInstance() { - var_value_ = const_cast< ::kbd_idlfile::SVariable*>(&::kbd_idlfile::SVariable::default_instance()); + var_value_ = const_cast< ::iot_idl::SVariable*>(&::iot_idl::SVariable::default_instance()); } SOptVirtCtrlRequest::SOptVirtCtrlRequest(const SOptVirtCtrlRequest& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SOptVirtCtrlRequest) + // @@protoc_insertion_point(copy_constructor:iot_idl.SOptVirtCtrlRequest) } void SOptVirtCtrlRequest::SharedCtor() { @@ -1335,7 +1335,7 @@ void SOptVirtCtrlRequest::SharedCtor() { } SOptVirtCtrlRequest::~SOptVirtCtrlRequest() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SOptVirtCtrlRequest) + // @@protoc_insertion_point(destructor:iot_idl.SOptVirtCtrlRequest) SharedDtor(); } @@ -1393,7 +1393,7 @@ void SOptVirtCtrlRequest::Clear() { } } if (has_var_value()) { - if (var_value_ != NULL) var_value_->::kbd_idlfile::SVariable::Clear(); + if (var_value_ != NULL) var_value_->::iot_idl::SVariable::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -1404,7 +1404,7 @@ bool SOptVirtCtrlRequest::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SOptVirtCtrlRequest) + // @@protoc_insertion_point(parse_start:iot_idl.SOptVirtCtrlRequest) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1460,7 +1460,7 @@ bool SOptVirtCtrlRequest::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.SVariable var_value = 4; + // required .iot_idl.SVariable var_value = 4; case 4: { if (tag == 34) { parse_var_value: @@ -1487,17 +1487,17 @@ bool SOptVirtCtrlRequest::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SOptVirtCtrlRequest) + // @@protoc_insertion_point(parse_success:iot_idl.SOptVirtCtrlRequest) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SOptVirtCtrlRequest) + // @@protoc_insertion_point(parse_failure:iot_idl.SOptVirtCtrlRequest) return false; #undef DO_ } void SOptVirtCtrlRequest::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SOptVirtCtrlRequest) + // @@protoc_insertion_point(serialize_start:iot_idl.SOptVirtCtrlRequest) // required string str_tab_name = 1; if (has_str_tab_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1528,7 +1528,7 @@ void SOptVirtCtrlRequest::SerializeWithCachedSizes( 3, this->str_col_name(), output); } - // required .kbd_idlfile.SVariable var_value = 4; + // required .iot_idl.SVariable var_value = 4; if (has_var_value()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->var_value(), output); @@ -1538,12 +1538,12 @@ void SOptVirtCtrlRequest::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SOptVirtCtrlRequest) + // @@protoc_insertion_point(serialize_end:iot_idl.SOptVirtCtrlRequest) } ::google::protobuf::uint8* SOptVirtCtrlRequest::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SOptVirtCtrlRequest) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SOptVirtCtrlRequest) // required string str_tab_name = 1; if (has_str_tab_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1577,7 +1577,7 @@ void SOptVirtCtrlRequest::SerializeWithCachedSizes( 3, this->str_col_name(), target); } - // required .kbd_idlfile.SVariable var_value = 4; + // required .iot_idl.SVariable var_value = 4; if (has_var_value()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1588,7 +1588,7 @@ void SOptVirtCtrlRequest::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SOptVirtCtrlRequest) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SOptVirtCtrlRequest) return target; } @@ -1617,7 +1617,7 @@ int SOptVirtCtrlRequest::ByteSize() const { this->str_col_name()); } - // required .kbd_idlfile.SVariable var_value = 4; + // required .iot_idl.SVariable var_value = 4; if (has_var_value()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -1661,7 +1661,7 @@ void SOptVirtCtrlRequest::MergeFrom(const SOptVirtCtrlRequest& from) { set_str_col_name(from.str_col_name()); } if (from.has_var_value()) { - mutable_var_value()->::kbd_idlfile::SVariable::MergeFrom(from.var_value()); + mutable_var_value()->::iot_idl::SVariable::MergeFrom(from.var_value()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -1723,7 +1723,7 @@ const int SOptVirtCtrlReply::kStrSourceTagFieldNumber; SOptVirtCtrlReply::SOptVirtCtrlReply() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SOptVirtCtrlReply) + // @@protoc_insertion_point(constructor:iot_idl.SOptVirtCtrlReply) } void SOptVirtCtrlReply::InitAsDefaultInstance() { @@ -1733,7 +1733,7 @@ SOptVirtCtrlReply::SOptVirtCtrlReply(const SOptVirtCtrlReply& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SOptVirtCtrlReply) + // @@protoc_insertion_point(copy_constructor:iot_idl.SOptVirtCtrlReply) } void SOptVirtCtrlReply::SharedCtor() { @@ -1749,7 +1749,7 @@ void SOptVirtCtrlReply::SharedCtor() { } SOptVirtCtrlReply::~SOptVirtCtrlReply() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SOptVirtCtrlReply) + // @@protoc_insertion_point(destructor:iot_idl.SOptVirtCtrlReply) SharedDtor(); } @@ -1831,7 +1831,7 @@ bool SOptVirtCtrlReply::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SOptVirtCtrlReply) + // @@protoc_insertion_point(parse_start:iot_idl.SOptVirtCtrlReply) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1950,17 +1950,17 @@ bool SOptVirtCtrlReply::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SOptVirtCtrlReply) + // @@protoc_insertion_point(parse_success:iot_idl.SOptVirtCtrlReply) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SOptVirtCtrlReply) + // @@protoc_insertion_point(parse_failure:iot_idl.SOptVirtCtrlReply) return false; #undef DO_ } void SOptVirtCtrlReply::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SOptVirtCtrlReply) + // @@protoc_insertion_point(serialize_start:iot_idl.SOptVirtCtrlReply) // required string str_tab_name = 1; if (has_str_tab_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2020,12 +2020,12 @@ void SOptVirtCtrlReply::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SOptVirtCtrlReply) + // @@protoc_insertion_point(serialize_end:iot_idl.SOptVirtCtrlReply) } ::google::protobuf::uint8* SOptVirtCtrlReply::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SOptVirtCtrlReply) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SOptVirtCtrlReply) // required string str_tab_name = 1; if (has_str_tab_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2090,7 +2090,7 @@ void SOptVirtCtrlReply::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SOptVirtCtrlReply) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SOptVirtCtrlReply) return target; } @@ -2232,6 +2232,6 @@ void SOptVirtCtrlReply::Swap(SOptVirtCtrlReply* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/platform/src/idl_files/OptDataMessage.pb.h b/platform/src/idl_files/OptDataMessage.pb.h index 80f5f19f..bbd83890 100644 --- a/platform/src/idl_files/OptDataMessage.pb.h +++ b/platform/src/idl_files/OptDataMessage.pb.h @@ -28,7 +28,7 @@ #include "Public.pb.h" // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { // Internal implementation detail -- do not call these. void IDL_FILES_EXPORT protobuf_AddDesc_OptDataMessage_2eproto(); @@ -173,7 +173,7 @@ class IDL_FILES_EXPORT SOptDataPkgHead : public ::google::protobuf::Message { inline ::google::protobuf::int64 n_opt_time() const; inline void set_n_opt_time(::google::protobuf::int64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SOptDataPkgHead) + // @@protoc_insertion_point(class_scope:iot_idl.SOptDataPkgHead) private: inline void set_has_str_src_tag(); inline void clear_has_str_src_tag(); @@ -280,16 +280,16 @@ class IDL_FILES_EXPORT SOptSetDataMsg : public ::google::protobuf::Message { inline ::google::protobuf::uint32 u_del_status() const; inline void set_u_del_status(::google::protobuf::uint32 value); - // required .kbd_idlfile.SVariable var_value = 4; + // required .iot_idl.SVariable var_value = 4; inline bool has_var_value() const; inline void clear_var_value(); static const int kVarValueFieldNumber = 4; - inline const ::kbd_idlfile::SVariable& var_value() const; - inline ::kbd_idlfile::SVariable* mutable_var_value(); - inline ::kbd_idlfile::SVariable* release_var_value(); - inline void set_allocated_var_value(::kbd_idlfile::SVariable* var_value); + inline const ::iot_idl::SVariable& var_value() const; + inline ::iot_idl::SVariable* mutable_var_value(); + inline ::iot_idl::SVariable* release_var_value(); + inline void set_allocated_var_value(::iot_idl::SVariable* var_value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SOptSetDataMsg) + // @@protoc_insertion_point(class_scope:iot_idl.SOptSetDataMsg) private: inline void set_has_str_tag_name(); inline void clear_has_str_tag_name(); @@ -307,7 +307,7 @@ class IDL_FILES_EXPORT SOptSetDataMsg : public ::google::protobuf::Message { ::std::string* str_tag_name_; ::google::protobuf::uint32 u_add_status_; ::google::protobuf::uint32 u_del_status_; - ::kbd_idlfile::SVariable* var_value_; + ::iot_idl::SVariable* var_value_; friend void IDL_FILES_EXPORT protobuf_AddDesc_OptDataMessage_2eproto(); friend void protobuf_AssignDesc_OptDataMessage_2eproto(); friend void protobuf_ShutdownFile_OptDataMessage_2eproto(); @@ -370,28 +370,28 @@ class IDL_FILES_EXPORT SOptSetDataPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SOptDataPkgHead package_head = 1; + // required .iot_idl.SOptDataPkgHead package_head = 1; inline bool has_package_head() const; inline void clear_package_head(); static const int kPackageHeadFieldNumber = 1; - inline const ::kbd_idlfile::SOptDataPkgHead& package_head() const; - inline ::kbd_idlfile::SOptDataPkgHead* mutable_package_head(); - inline ::kbd_idlfile::SOptDataPkgHead* release_package_head(); - inline void set_allocated_package_head(::kbd_idlfile::SOptDataPkgHead* package_head); + inline const ::iot_idl::SOptDataPkgHead& package_head() const; + inline ::iot_idl::SOptDataPkgHead* mutable_package_head(); + inline ::iot_idl::SOptDataPkgHead* release_package_head(); + inline void set_allocated_package_head(::iot_idl::SOptDataPkgHead* package_head); - // repeated .kbd_idlfile.SOptSetDataMsg seq_set_data_info = 2; + // repeated .iot_idl.SOptSetDataMsg seq_set_data_info = 2; inline int seq_set_data_info_size() const; inline void clear_seq_set_data_info(); static const int kSeqSetDataInfoFieldNumber = 2; - inline const ::kbd_idlfile::SOptSetDataMsg& seq_set_data_info(int index) const; - inline ::kbd_idlfile::SOptSetDataMsg* mutable_seq_set_data_info(int index); - inline ::kbd_idlfile::SOptSetDataMsg* add_seq_set_data_info(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SOptSetDataMsg >& + inline const ::iot_idl::SOptSetDataMsg& seq_set_data_info(int index) const; + inline ::iot_idl::SOptSetDataMsg* mutable_seq_set_data_info(int index); + inline ::iot_idl::SOptSetDataMsg* add_seq_set_data_info(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SOptSetDataMsg >& seq_set_data_info() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SOptSetDataMsg >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SOptSetDataMsg >* mutable_seq_set_data_info(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SOptSetDataPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SOptSetDataPkg) private: inline void set_has_package_head(); inline void clear_has_package_head(); @@ -400,8 +400,8 @@ class IDL_FILES_EXPORT SOptSetDataPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SOptDataPkgHead* package_head_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SOptSetDataMsg > seq_set_data_info_; + ::iot_idl::SOptDataPkgHead* package_head_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SOptSetDataMsg > seq_set_data_info_; friend void IDL_FILES_EXPORT protobuf_AddDesc_OptDataMessage_2eproto(); friend void protobuf_AssignDesc_OptDataMessage_2eproto(); friend void protobuf_ShutdownFile_OptDataMessage_2eproto(); @@ -500,16 +500,16 @@ class IDL_FILES_EXPORT SOptVirtCtrlRequest : public ::google::protobuf::Message inline ::std::string* release_str_col_name(); inline void set_allocated_str_col_name(::std::string* str_col_name); - // required .kbd_idlfile.SVariable var_value = 4; + // required .iot_idl.SVariable var_value = 4; inline bool has_var_value() const; inline void clear_var_value(); static const int kVarValueFieldNumber = 4; - inline const ::kbd_idlfile::SVariable& var_value() const; - inline ::kbd_idlfile::SVariable* mutable_var_value(); - inline ::kbd_idlfile::SVariable* release_var_value(); - inline void set_allocated_var_value(::kbd_idlfile::SVariable* var_value); + inline const ::iot_idl::SVariable& var_value() const; + inline ::iot_idl::SVariable* mutable_var_value(); + inline ::iot_idl::SVariable* release_var_value(); + inline void set_allocated_var_value(::iot_idl::SVariable* var_value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SOptVirtCtrlRequest) + // @@protoc_insertion_point(class_scope:iot_idl.SOptVirtCtrlRequest) private: inline void set_has_str_tab_name(); inline void clear_has_str_tab_name(); @@ -527,7 +527,7 @@ class IDL_FILES_EXPORT SOptVirtCtrlRequest : public ::google::protobuf::Message ::std::string* str_tab_name_; ::std::string* str_tag_name_; ::std::string* str_col_name_; - ::kbd_idlfile::SVariable* var_value_; + ::iot_idl::SVariable* var_value_; friend void IDL_FILES_EXPORT protobuf_AddDesc_OptDataMessage_2eproto(); friend void protobuf_AssignDesc_OptDataMessage_2eproto(); friend void protobuf_ShutdownFile_OptDataMessage_2eproto(); @@ -657,7 +657,7 @@ class IDL_FILES_EXPORT SOptVirtCtrlReply : public ::google::protobuf::Message { inline ::std::string* release_str_source_tag(); inline void set_allocated_str_source_tag(::std::string* str_source_tag); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SOptVirtCtrlReply) + // @@protoc_insertion_point(class_scope:iot_idl.SOptVirtCtrlReply) private: inline void set_has_str_tab_name(); inline void clear_has_str_tab_name(); @@ -713,7 +713,7 @@ inline void SOptDataPkgHead::clear_str_src_tag() { clear_has_str_src_tag(); } inline const ::std::string& SOptDataPkgHead::str_src_tag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptDataPkgHead.str_src_tag) + // @@protoc_insertion_point(field_get:iot_idl.SOptDataPkgHead.str_src_tag) return *str_src_tag_; } inline void SOptDataPkgHead::set_str_src_tag(const ::std::string& value) { @@ -722,7 +722,7 @@ inline void SOptDataPkgHead::set_str_src_tag(const ::std::string& value) { str_src_tag_ = new ::std::string; } str_src_tag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SOptDataPkgHead.str_src_tag) + // @@protoc_insertion_point(field_set:iot_idl.SOptDataPkgHead.str_src_tag) } inline void SOptDataPkgHead::set_str_src_tag(const char* value) { set_has_str_src_tag(); @@ -730,7 +730,7 @@ inline void SOptDataPkgHead::set_str_src_tag(const char* value) { str_src_tag_ = new ::std::string; } str_src_tag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SOptDataPkgHead.str_src_tag) + // @@protoc_insertion_point(field_set_char:iot_idl.SOptDataPkgHead.str_src_tag) } inline void SOptDataPkgHead::set_str_src_tag(const char* value, size_t size) { set_has_str_src_tag(); @@ -738,14 +738,14 @@ inline void SOptDataPkgHead::set_str_src_tag(const char* value, size_t size) { str_src_tag_ = new ::std::string; } str_src_tag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SOptDataPkgHead.str_src_tag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SOptDataPkgHead.str_src_tag) } inline ::std::string* SOptDataPkgHead::mutable_str_src_tag() { set_has_str_src_tag(); if (str_src_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { str_src_tag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SOptDataPkgHead.str_src_tag) + // @@protoc_insertion_point(field_mutable:iot_idl.SOptDataPkgHead.str_src_tag) return str_src_tag_; } inline ::std::string* SOptDataPkgHead::release_str_src_tag() { @@ -769,7 +769,7 @@ inline void SOptDataPkgHead::set_allocated_str_src_tag(::std::string* str_src_ta clear_has_str_src_tag(); str_src_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SOptDataPkgHead.str_src_tag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SOptDataPkgHead.str_src_tag) } // required int32 n_point_type = 2; @@ -787,13 +787,13 @@ inline void SOptDataPkgHead::clear_n_point_type() { clear_has_n_point_type(); } inline ::google::protobuf::int32 SOptDataPkgHead::n_point_type() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptDataPkgHead.n_point_type) + // @@protoc_insertion_point(field_get:iot_idl.SOptDataPkgHead.n_point_type) return n_point_type_; } inline void SOptDataPkgHead::set_n_point_type(::google::protobuf::int32 value) { set_has_n_point_type(); n_point_type_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SOptDataPkgHead.n_point_type) + // @@protoc_insertion_point(field_set:iot_idl.SOptDataPkgHead.n_point_type) } // required bool b_not_alarm = 3; @@ -811,13 +811,13 @@ inline void SOptDataPkgHead::clear_b_not_alarm() { clear_has_b_not_alarm(); } inline bool SOptDataPkgHead::b_not_alarm() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptDataPkgHead.b_not_alarm) + // @@protoc_insertion_point(field_get:iot_idl.SOptDataPkgHead.b_not_alarm) return b_not_alarm_; } inline void SOptDataPkgHead::set_b_not_alarm(bool value) { set_has_b_not_alarm(); b_not_alarm_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SOptDataPkgHead.b_not_alarm) + // @@protoc_insertion_point(field_set:iot_idl.SOptDataPkgHead.b_not_alarm) } // required int64 n_opt_time = 4; @@ -835,13 +835,13 @@ inline void SOptDataPkgHead::clear_n_opt_time() { clear_has_n_opt_time(); } inline ::google::protobuf::int64 SOptDataPkgHead::n_opt_time() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptDataPkgHead.n_opt_time) + // @@protoc_insertion_point(field_get:iot_idl.SOptDataPkgHead.n_opt_time) return n_opt_time_; } inline void SOptDataPkgHead::set_n_opt_time(::google::protobuf::int64 value) { set_has_n_opt_time(); n_opt_time_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SOptDataPkgHead.n_opt_time) + // @@protoc_insertion_point(field_set:iot_idl.SOptDataPkgHead.n_opt_time) } // ------------------------------------------------------------------- @@ -865,7 +865,7 @@ inline void SOptSetDataMsg::clear_str_tag_name() { clear_has_str_tag_name(); } inline const ::std::string& SOptSetDataMsg::str_tag_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptSetDataMsg.str_tag_name) + // @@protoc_insertion_point(field_get:iot_idl.SOptSetDataMsg.str_tag_name) return *str_tag_name_; } inline void SOptSetDataMsg::set_str_tag_name(const ::std::string& value) { @@ -874,7 +874,7 @@ inline void SOptSetDataMsg::set_str_tag_name(const ::std::string& value) { str_tag_name_ = new ::std::string; } str_tag_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SOptSetDataMsg.str_tag_name) + // @@protoc_insertion_point(field_set:iot_idl.SOptSetDataMsg.str_tag_name) } inline void SOptSetDataMsg::set_str_tag_name(const char* value) { set_has_str_tag_name(); @@ -882,7 +882,7 @@ inline void SOptSetDataMsg::set_str_tag_name(const char* value) { str_tag_name_ = new ::std::string; } str_tag_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SOptSetDataMsg.str_tag_name) + // @@protoc_insertion_point(field_set_char:iot_idl.SOptSetDataMsg.str_tag_name) } inline void SOptSetDataMsg::set_str_tag_name(const char* value, size_t size) { set_has_str_tag_name(); @@ -890,14 +890,14 @@ inline void SOptSetDataMsg::set_str_tag_name(const char* value, size_t size) { str_tag_name_ = new ::std::string; } str_tag_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SOptSetDataMsg.str_tag_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SOptSetDataMsg.str_tag_name) } inline ::std::string* SOptSetDataMsg::mutable_str_tag_name() { set_has_str_tag_name(); if (str_tag_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { str_tag_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SOptSetDataMsg.str_tag_name) + // @@protoc_insertion_point(field_mutable:iot_idl.SOptSetDataMsg.str_tag_name) return str_tag_name_; } inline ::std::string* SOptSetDataMsg::release_str_tag_name() { @@ -921,7 +921,7 @@ inline void SOptSetDataMsg::set_allocated_str_tag_name(::std::string* str_tag_na clear_has_str_tag_name(); str_tag_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SOptSetDataMsg.str_tag_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SOptSetDataMsg.str_tag_name) } // required uint32 u_add_status = 2; @@ -939,13 +939,13 @@ inline void SOptSetDataMsg::clear_u_add_status() { clear_has_u_add_status(); } inline ::google::protobuf::uint32 SOptSetDataMsg::u_add_status() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptSetDataMsg.u_add_status) + // @@protoc_insertion_point(field_get:iot_idl.SOptSetDataMsg.u_add_status) return u_add_status_; } inline void SOptSetDataMsg::set_u_add_status(::google::protobuf::uint32 value) { set_has_u_add_status(); u_add_status_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SOptSetDataMsg.u_add_status) + // @@protoc_insertion_point(field_set:iot_idl.SOptSetDataMsg.u_add_status) } // required uint32 u_del_status = 3; @@ -963,16 +963,16 @@ inline void SOptSetDataMsg::clear_u_del_status() { clear_has_u_del_status(); } inline ::google::protobuf::uint32 SOptSetDataMsg::u_del_status() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptSetDataMsg.u_del_status) + // @@protoc_insertion_point(field_get:iot_idl.SOptSetDataMsg.u_del_status) return u_del_status_; } inline void SOptSetDataMsg::set_u_del_status(::google::protobuf::uint32 value) { set_has_u_del_status(); u_del_status_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SOptSetDataMsg.u_del_status) + // @@protoc_insertion_point(field_set:iot_idl.SOptSetDataMsg.u_del_status) } -// required .kbd_idlfile.SVariable var_value = 4; +// required .iot_idl.SVariable var_value = 4; inline bool SOptSetDataMsg::has_var_value() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -983,26 +983,26 @@ inline void SOptSetDataMsg::clear_has_var_value() { _has_bits_[0] &= ~0x00000008u; } inline void SOptSetDataMsg::clear_var_value() { - if (var_value_ != NULL) var_value_->::kbd_idlfile::SVariable::Clear(); + if (var_value_ != NULL) var_value_->::iot_idl::SVariable::Clear(); clear_has_var_value(); } -inline const ::kbd_idlfile::SVariable& SOptSetDataMsg::var_value() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptSetDataMsg.var_value) +inline const ::iot_idl::SVariable& SOptSetDataMsg::var_value() const { + // @@protoc_insertion_point(field_get:iot_idl.SOptSetDataMsg.var_value) return var_value_ != NULL ? *var_value_ : *default_instance_->var_value_; } -inline ::kbd_idlfile::SVariable* SOptSetDataMsg::mutable_var_value() { +inline ::iot_idl::SVariable* SOptSetDataMsg::mutable_var_value() { set_has_var_value(); - if (var_value_ == NULL) var_value_ = new ::kbd_idlfile::SVariable; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SOptSetDataMsg.var_value) + if (var_value_ == NULL) var_value_ = new ::iot_idl::SVariable; + // @@protoc_insertion_point(field_mutable:iot_idl.SOptSetDataMsg.var_value) return var_value_; } -inline ::kbd_idlfile::SVariable* SOptSetDataMsg::release_var_value() { +inline ::iot_idl::SVariable* SOptSetDataMsg::release_var_value() { clear_has_var_value(); - ::kbd_idlfile::SVariable* temp = var_value_; + ::iot_idl::SVariable* temp = var_value_; var_value_ = NULL; return temp; } -inline void SOptSetDataMsg::set_allocated_var_value(::kbd_idlfile::SVariable* var_value) { +inline void SOptSetDataMsg::set_allocated_var_value(::iot_idl::SVariable* var_value) { delete var_value_; var_value_ = var_value; if (var_value) { @@ -1010,14 +1010,14 @@ inline void SOptSetDataMsg::set_allocated_var_value(::kbd_idlfile::SVariable* va } else { clear_has_var_value(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SOptSetDataMsg.var_value) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SOptSetDataMsg.var_value) } // ------------------------------------------------------------------- // SOptSetDataPkg -// required .kbd_idlfile.SOptDataPkgHead package_head = 1; +// required .iot_idl.SOptDataPkgHead package_head = 1; inline bool SOptSetDataPkg::has_package_head() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -1028,26 +1028,26 @@ inline void SOptSetDataPkg::clear_has_package_head() { _has_bits_[0] &= ~0x00000001u; } inline void SOptSetDataPkg::clear_package_head() { - if (package_head_ != NULL) package_head_->::kbd_idlfile::SOptDataPkgHead::Clear(); + if (package_head_ != NULL) package_head_->::iot_idl::SOptDataPkgHead::Clear(); clear_has_package_head(); } -inline const ::kbd_idlfile::SOptDataPkgHead& SOptSetDataPkg::package_head() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptSetDataPkg.package_head) +inline const ::iot_idl::SOptDataPkgHead& SOptSetDataPkg::package_head() const { + // @@protoc_insertion_point(field_get:iot_idl.SOptSetDataPkg.package_head) return package_head_ != NULL ? *package_head_ : *default_instance_->package_head_; } -inline ::kbd_idlfile::SOptDataPkgHead* SOptSetDataPkg::mutable_package_head() { +inline ::iot_idl::SOptDataPkgHead* SOptSetDataPkg::mutable_package_head() { set_has_package_head(); - if (package_head_ == NULL) package_head_ = new ::kbd_idlfile::SOptDataPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SOptSetDataPkg.package_head) + if (package_head_ == NULL) package_head_ = new ::iot_idl::SOptDataPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SOptSetDataPkg.package_head) return package_head_; } -inline ::kbd_idlfile::SOptDataPkgHead* SOptSetDataPkg::release_package_head() { +inline ::iot_idl::SOptDataPkgHead* SOptSetDataPkg::release_package_head() { clear_has_package_head(); - ::kbd_idlfile::SOptDataPkgHead* temp = package_head_; + ::iot_idl::SOptDataPkgHead* temp = package_head_; package_head_ = NULL; return temp; } -inline void SOptSetDataPkg::set_allocated_package_head(::kbd_idlfile::SOptDataPkgHead* package_head) { +inline void SOptSetDataPkg::set_allocated_package_head(::iot_idl::SOptDataPkgHead* package_head) { delete package_head_; package_head_ = package_head; if (package_head) { @@ -1055,36 +1055,36 @@ inline void SOptSetDataPkg::set_allocated_package_head(::kbd_idlfile::SOptDataPk } else { clear_has_package_head(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SOptSetDataPkg.package_head) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SOptSetDataPkg.package_head) } -// repeated .kbd_idlfile.SOptSetDataMsg seq_set_data_info = 2; +// repeated .iot_idl.SOptSetDataMsg seq_set_data_info = 2; inline int SOptSetDataPkg::seq_set_data_info_size() const { return seq_set_data_info_.size(); } inline void SOptSetDataPkg::clear_seq_set_data_info() { seq_set_data_info_.Clear(); } -inline const ::kbd_idlfile::SOptSetDataMsg& SOptSetDataPkg::seq_set_data_info(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptSetDataPkg.seq_set_data_info) +inline const ::iot_idl::SOptSetDataMsg& SOptSetDataPkg::seq_set_data_info(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SOptSetDataPkg.seq_set_data_info) return seq_set_data_info_.Get(index); } -inline ::kbd_idlfile::SOptSetDataMsg* SOptSetDataPkg::mutable_seq_set_data_info(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SOptSetDataPkg.seq_set_data_info) +inline ::iot_idl::SOptSetDataMsg* SOptSetDataPkg::mutable_seq_set_data_info(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SOptSetDataPkg.seq_set_data_info) return seq_set_data_info_.Mutable(index); } -inline ::kbd_idlfile::SOptSetDataMsg* SOptSetDataPkg::add_seq_set_data_info() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SOptSetDataPkg.seq_set_data_info) +inline ::iot_idl::SOptSetDataMsg* SOptSetDataPkg::add_seq_set_data_info() { + // @@protoc_insertion_point(field_add:iot_idl.SOptSetDataPkg.seq_set_data_info) return seq_set_data_info_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SOptSetDataMsg >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SOptSetDataMsg >& SOptSetDataPkg::seq_set_data_info() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SOptSetDataPkg.seq_set_data_info) + // @@protoc_insertion_point(field_list:iot_idl.SOptSetDataPkg.seq_set_data_info) return seq_set_data_info_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SOptSetDataMsg >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SOptSetDataMsg >* SOptSetDataPkg::mutable_seq_set_data_info() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SOptSetDataPkg.seq_set_data_info) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SOptSetDataPkg.seq_set_data_info) return &seq_set_data_info_; } @@ -1109,7 +1109,7 @@ inline void SOptVirtCtrlRequest::clear_str_tab_name() { clear_has_str_tab_name(); } inline const ::std::string& SOptVirtCtrlRequest::str_tab_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptVirtCtrlRequest.str_tab_name) + // @@protoc_insertion_point(field_get:iot_idl.SOptVirtCtrlRequest.str_tab_name) return *str_tab_name_; } inline void SOptVirtCtrlRequest::set_str_tab_name(const ::std::string& value) { @@ -1118,7 +1118,7 @@ inline void SOptVirtCtrlRequest::set_str_tab_name(const ::std::string& value) { str_tab_name_ = new ::std::string; } str_tab_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SOptVirtCtrlRequest.str_tab_name) + // @@protoc_insertion_point(field_set:iot_idl.SOptVirtCtrlRequest.str_tab_name) } inline void SOptVirtCtrlRequest::set_str_tab_name(const char* value) { set_has_str_tab_name(); @@ -1126,7 +1126,7 @@ inline void SOptVirtCtrlRequest::set_str_tab_name(const char* value) { str_tab_name_ = new ::std::string; } str_tab_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SOptVirtCtrlRequest.str_tab_name) + // @@protoc_insertion_point(field_set_char:iot_idl.SOptVirtCtrlRequest.str_tab_name) } inline void SOptVirtCtrlRequest::set_str_tab_name(const char* value, size_t size) { set_has_str_tab_name(); @@ -1134,14 +1134,14 @@ inline void SOptVirtCtrlRequest::set_str_tab_name(const char* value, size_t size str_tab_name_ = new ::std::string; } str_tab_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SOptVirtCtrlRequest.str_tab_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SOptVirtCtrlRequest.str_tab_name) } inline ::std::string* SOptVirtCtrlRequest::mutable_str_tab_name() { set_has_str_tab_name(); if (str_tab_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { str_tab_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SOptVirtCtrlRequest.str_tab_name) + // @@protoc_insertion_point(field_mutable:iot_idl.SOptVirtCtrlRequest.str_tab_name) return str_tab_name_; } inline ::std::string* SOptVirtCtrlRequest::release_str_tab_name() { @@ -1165,7 +1165,7 @@ inline void SOptVirtCtrlRequest::set_allocated_str_tab_name(::std::string* str_t clear_has_str_tab_name(); str_tab_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SOptVirtCtrlRequest.str_tab_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SOptVirtCtrlRequest.str_tab_name) } // required string str_tag_name = 2; @@ -1185,7 +1185,7 @@ inline void SOptVirtCtrlRequest::clear_str_tag_name() { clear_has_str_tag_name(); } inline const ::std::string& SOptVirtCtrlRequest::str_tag_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptVirtCtrlRequest.str_tag_name) + // @@protoc_insertion_point(field_get:iot_idl.SOptVirtCtrlRequest.str_tag_name) return *str_tag_name_; } inline void SOptVirtCtrlRequest::set_str_tag_name(const ::std::string& value) { @@ -1194,7 +1194,7 @@ inline void SOptVirtCtrlRequest::set_str_tag_name(const ::std::string& value) { str_tag_name_ = new ::std::string; } str_tag_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SOptVirtCtrlRequest.str_tag_name) + // @@protoc_insertion_point(field_set:iot_idl.SOptVirtCtrlRequest.str_tag_name) } inline void SOptVirtCtrlRequest::set_str_tag_name(const char* value) { set_has_str_tag_name(); @@ -1202,7 +1202,7 @@ inline void SOptVirtCtrlRequest::set_str_tag_name(const char* value) { str_tag_name_ = new ::std::string; } str_tag_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SOptVirtCtrlRequest.str_tag_name) + // @@protoc_insertion_point(field_set_char:iot_idl.SOptVirtCtrlRequest.str_tag_name) } inline void SOptVirtCtrlRequest::set_str_tag_name(const char* value, size_t size) { set_has_str_tag_name(); @@ -1210,14 +1210,14 @@ inline void SOptVirtCtrlRequest::set_str_tag_name(const char* value, size_t size str_tag_name_ = new ::std::string; } str_tag_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SOptVirtCtrlRequest.str_tag_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SOptVirtCtrlRequest.str_tag_name) } inline ::std::string* SOptVirtCtrlRequest::mutable_str_tag_name() { set_has_str_tag_name(); if (str_tag_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { str_tag_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SOptVirtCtrlRequest.str_tag_name) + // @@protoc_insertion_point(field_mutable:iot_idl.SOptVirtCtrlRequest.str_tag_name) return str_tag_name_; } inline ::std::string* SOptVirtCtrlRequest::release_str_tag_name() { @@ -1241,7 +1241,7 @@ inline void SOptVirtCtrlRequest::set_allocated_str_tag_name(::std::string* str_t clear_has_str_tag_name(); str_tag_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SOptVirtCtrlRequest.str_tag_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SOptVirtCtrlRequest.str_tag_name) } // required string str_col_name = 3; @@ -1261,7 +1261,7 @@ inline void SOptVirtCtrlRequest::clear_str_col_name() { clear_has_str_col_name(); } inline const ::std::string& SOptVirtCtrlRequest::str_col_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptVirtCtrlRequest.str_col_name) + // @@protoc_insertion_point(field_get:iot_idl.SOptVirtCtrlRequest.str_col_name) return *str_col_name_; } inline void SOptVirtCtrlRequest::set_str_col_name(const ::std::string& value) { @@ -1270,7 +1270,7 @@ inline void SOptVirtCtrlRequest::set_str_col_name(const ::std::string& value) { str_col_name_ = new ::std::string; } str_col_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SOptVirtCtrlRequest.str_col_name) + // @@protoc_insertion_point(field_set:iot_idl.SOptVirtCtrlRequest.str_col_name) } inline void SOptVirtCtrlRequest::set_str_col_name(const char* value) { set_has_str_col_name(); @@ -1278,7 +1278,7 @@ inline void SOptVirtCtrlRequest::set_str_col_name(const char* value) { str_col_name_ = new ::std::string; } str_col_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SOptVirtCtrlRequest.str_col_name) + // @@protoc_insertion_point(field_set_char:iot_idl.SOptVirtCtrlRequest.str_col_name) } inline void SOptVirtCtrlRequest::set_str_col_name(const char* value, size_t size) { set_has_str_col_name(); @@ -1286,14 +1286,14 @@ inline void SOptVirtCtrlRequest::set_str_col_name(const char* value, size_t size str_col_name_ = new ::std::string; } str_col_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SOptVirtCtrlRequest.str_col_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SOptVirtCtrlRequest.str_col_name) } inline ::std::string* SOptVirtCtrlRequest::mutable_str_col_name() { set_has_str_col_name(); if (str_col_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { str_col_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SOptVirtCtrlRequest.str_col_name) + // @@protoc_insertion_point(field_mutable:iot_idl.SOptVirtCtrlRequest.str_col_name) return str_col_name_; } inline ::std::string* SOptVirtCtrlRequest::release_str_col_name() { @@ -1317,10 +1317,10 @@ inline void SOptVirtCtrlRequest::set_allocated_str_col_name(::std::string* str_c clear_has_str_col_name(); str_col_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SOptVirtCtrlRequest.str_col_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SOptVirtCtrlRequest.str_col_name) } -// required .kbd_idlfile.SVariable var_value = 4; +// required .iot_idl.SVariable var_value = 4; inline bool SOptVirtCtrlRequest::has_var_value() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -1331,26 +1331,26 @@ inline void SOptVirtCtrlRequest::clear_has_var_value() { _has_bits_[0] &= ~0x00000008u; } inline void SOptVirtCtrlRequest::clear_var_value() { - if (var_value_ != NULL) var_value_->::kbd_idlfile::SVariable::Clear(); + if (var_value_ != NULL) var_value_->::iot_idl::SVariable::Clear(); clear_has_var_value(); } -inline const ::kbd_idlfile::SVariable& SOptVirtCtrlRequest::var_value() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptVirtCtrlRequest.var_value) +inline const ::iot_idl::SVariable& SOptVirtCtrlRequest::var_value() const { + // @@protoc_insertion_point(field_get:iot_idl.SOptVirtCtrlRequest.var_value) return var_value_ != NULL ? *var_value_ : *default_instance_->var_value_; } -inline ::kbd_idlfile::SVariable* SOptVirtCtrlRequest::mutable_var_value() { +inline ::iot_idl::SVariable* SOptVirtCtrlRequest::mutable_var_value() { set_has_var_value(); - if (var_value_ == NULL) var_value_ = new ::kbd_idlfile::SVariable; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SOptVirtCtrlRequest.var_value) + if (var_value_ == NULL) var_value_ = new ::iot_idl::SVariable; + // @@protoc_insertion_point(field_mutable:iot_idl.SOptVirtCtrlRequest.var_value) return var_value_; } -inline ::kbd_idlfile::SVariable* SOptVirtCtrlRequest::release_var_value() { +inline ::iot_idl::SVariable* SOptVirtCtrlRequest::release_var_value() { clear_has_var_value(); - ::kbd_idlfile::SVariable* temp = var_value_; + ::iot_idl::SVariable* temp = var_value_; var_value_ = NULL; return temp; } -inline void SOptVirtCtrlRequest::set_allocated_var_value(::kbd_idlfile::SVariable* var_value) { +inline void SOptVirtCtrlRequest::set_allocated_var_value(::iot_idl::SVariable* var_value) { delete var_value_; var_value_ = var_value; if (var_value) { @@ -1358,7 +1358,7 @@ inline void SOptVirtCtrlRequest::set_allocated_var_value(::kbd_idlfile::SVariabl } else { clear_has_var_value(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SOptVirtCtrlRequest.var_value) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SOptVirtCtrlRequest.var_value) } // ------------------------------------------------------------------- @@ -1382,7 +1382,7 @@ inline void SOptVirtCtrlReply::clear_str_tab_name() { clear_has_str_tab_name(); } inline const ::std::string& SOptVirtCtrlReply::str_tab_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptVirtCtrlReply.str_tab_name) + // @@protoc_insertion_point(field_get:iot_idl.SOptVirtCtrlReply.str_tab_name) return *str_tab_name_; } inline void SOptVirtCtrlReply::set_str_tab_name(const ::std::string& value) { @@ -1391,7 +1391,7 @@ inline void SOptVirtCtrlReply::set_str_tab_name(const ::std::string& value) { str_tab_name_ = new ::std::string; } str_tab_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SOptVirtCtrlReply.str_tab_name) + // @@protoc_insertion_point(field_set:iot_idl.SOptVirtCtrlReply.str_tab_name) } inline void SOptVirtCtrlReply::set_str_tab_name(const char* value) { set_has_str_tab_name(); @@ -1399,7 +1399,7 @@ inline void SOptVirtCtrlReply::set_str_tab_name(const char* value) { str_tab_name_ = new ::std::string; } str_tab_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SOptVirtCtrlReply.str_tab_name) + // @@protoc_insertion_point(field_set_char:iot_idl.SOptVirtCtrlReply.str_tab_name) } inline void SOptVirtCtrlReply::set_str_tab_name(const char* value, size_t size) { set_has_str_tab_name(); @@ -1407,14 +1407,14 @@ inline void SOptVirtCtrlReply::set_str_tab_name(const char* value, size_t size) str_tab_name_ = new ::std::string; } str_tab_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SOptVirtCtrlReply.str_tab_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SOptVirtCtrlReply.str_tab_name) } inline ::std::string* SOptVirtCtrlReply::mutable_str_tab_name() { set_has_str_tab_name(); if (str_tab_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { str_tab_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SOptVirtCtrlReply.str_tab_name) + // @@protoc_insertion_point(field_mutable:iot_idl.SOptVirtCtrlReply.str_tab_name) return str_tab_name_; } inline ::std::string* SOptVirtCtrlReply::release_str_tab_name() { @@ -1438,7 +1438,7 @@ inline void SOptVirtCtrlReply::set_allocated_str_tab_name(::std::string* str_tab clear_has_str_tab_name(); str_tab_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SOptVirtCtrlReply.str_tab_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SOptVirtCtrlReply.str_tab_name) } // required string str_tag_name = 2; @@ -1458,7 +1458,7 @@ inline void SOptVirtCtrlReply::clear_str_tag_name() { clear_has_str_tag_name(); } inline const ::std::string& SOptVirtCtrlReply::str_tag_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptVirtCtrlReply.str_tag_name) + // @@protoc_insertion_point(field_get:iot_idl.SOptVirtCtrlReply.str_tag_name) return *str_tag_name_; } inline void SOptVirtCtrlReply::set_str_tag_name(const ::std::string& value) { @@ -1467,7 +1467,7 @@ inline void SOptVirtCtrlReply::set_str_tag_name(const ::std::string& value) { str_tag_name_ = new ::std::string; } str_tag_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SOptVirtCtrlReply.str_tag_name) + // @@protoc_insertion_point(field_set:iot_idl.SOptVirtCtrlReply.str_tag_name) } inline void SOptVirtCtrlReply::set_str_tag_name(const char* value) { set_has_str_tag_name(); @@ -1475,7 +1475,7 @@ inline void SOptVirtCtrlReply::set_str_tag_name(const char* value) { str_tag_name_ = new ::std::string; } str_tag_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SOptVirtCtrlReply.str_tag_name) + // @@protoc_insertion_point(field_set_char:iot_idl.SOptVirtCtrlReply.str_tag_name) } inline void SOptVirtCtrlReply::set_str_tag_name(const char* value, size_t size) { set_has_str_tag_name(); @@ -1483,14 +1483,14 @@ inline void SOptVirtCtrlReply::set_str_tag_name(const char* value, size_t size) str_tag_name_ = new ::std::string; } str_tag_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SOptVirtCtrlReply.str_tag_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SOptVirtCtrlReply.str_tag_name) } inline ::std::string* SOptVirtCtrlReply::mutable_str_tag_name() { set_has_str_tag_name(); if (str_tag_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { str_tag_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SOptVirtCtrlReply.str_tag_name) + // @@protoc_insertion_point(field_mutable:iot_idl.SOptVirtCtrlReply.str_tag_name) return str_tag_name_; } inline ::std::string* SOptVirtCtrlReply::release_str_tag_name() { @@ -1514,7 +1514,7 @@ inline void SOptVirtCtrlReply::set_allocated_str_tag_name(::std::string* str_tag clear_has_str_tag_name(); str_tag_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SOptVirtCtrlReply.str_tag_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SOptVirtCtrlReply.str_tag_name) } // required string str_col_name = 3; @@ -1534,7 +1534,7 @@ inline void SOptVirtCtrlReply::clear_str_col_name() { clear_has_str_col_name(); } inline const ::std::string& SOptVirtCtrlReply::str_col_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptVirtCtrlReply.str_col_name) + // @@protoc_insertion_point(field_get:iot_idl.SOptVirtCtrlReply.str_col_name) return *str_col_name_; } inline void SOptVirtCtrlReply::set_str_col_name(const ::std::string& value) { @@ -1543,7 +1543,7 @@ inline void SOptVirtCtrlReply::set_str_col_name(const ::std::string& value) { str_col_name_ = new ::std::string; } str_col_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SOptVirtCtrlReply.str_col_name) + // @@protoc_insertion_point(field_set:iot_idl.SOptVirtCtrlReply.str_col_name) } inline void SOptVirtCtrlReply::set_str_col_name(const char* value) { set_has_str_col_name(); @@ -1551,7 +1551,7 @@ inline void SOptVirtCtrlReply::set_str_col_name(const char* value) { str_col_name_ = new ::std::string; } str_col_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SOptVirtCtrlReply.str_col_name) + // @@protoc_insertion_point(field_set_char:iot_idl.SOptVirtCtrlReply.str_col_name) } inline void SOptVirtCtrlReply::set_str_col_name(const char* value, size_t size) { set_has_str_col_name(); @@ -1559,14 +1559,14 @@ inline void SOptVirtCtrlReply::set_str_col_name(const char* value, size_t size) str_col_name_ = new ::std::string; } str_col_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SOptVirtCtrlReply.str_col_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SOptVirtCtrlReply.str_col_name) } inline ::std::string* SOptVirtCtrlReply::mutable_str_col_name() { set_has_str_col_name(); if (str_col_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { str_col_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SOptVirtCtrlReply.str_col_name) + // @@protoc_insertion_point(field_mutable:iot_idl.SOptVirtCtrlReply.str_col_name) return str_col_name_; } inline ::std::string* SOptVirtCtrlReply::release_str_col_name() { @@ -1590,7 +1590,7 @@ inline void SOptVirtCtrlReply::set_allocated_str_col_name(::std::string* str_col clear_has_str_col_name(); str_col_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SOptVirtCtrlReply.str_col_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SOptVirtCtrlReply.str_col_name) } // required int32 n_ctrl_result = 4; @@ -1608,13 +1608,13 @@ inline void SOptVirtCtrlReply::clear_n_ctrl_result() { clear_has_n_ctrl_result(); } inline ::google::protobuf::int32 SOptVirtCtrlReply::n_ctrl_result() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptVirtCtrlReply.n_ctrl_result) + // @@protoc_insertion_point(field_get:iot_idl.SOptVirtCtrlReply.n_ctrl_result) return n_ctrl_result_; } inline void SOptVirtCtrlReply::set_n_ctrl_result(::google::protobuf::int32 value) { set_has_n_ctrl_result(); n_ctrl_result_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SOptVirtCtrlReply.n_ctrl_result) + // @@protoc_insertion_point(field_set:iot_idl.SOptVirtCtrlReply.n_ctrl_result) } // optional string str_err = 5; @@ -1634,7 +1634,7 @@ inline void SOptVirtCtrlReply::clear_str_err() { clear_has_str_err(); } inline const ::std::string& SOptVirtCtrlReply::str_err() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptVirtCtrlReply.str_err) + // @@protoc_insertion_point(field_get:iot_idl.SOptVirtCtrlReply.str_err) return *str_err_; } inline void SOptVirtCtrlReply::set_str_err(const ::std::string& value) { @@ -1643,7 +1643,7 @@ inline void SOptVirtCtrlReply::set_str_err(const ::std::string& value) { str_err_ = new ::std::string; } str_err_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SOptVirtCtrlReply.str_err) + // @@protoc_insertion_point(field_set:iot_idl.SOptVirtCtrlReply.str_err) } inline void SOptVirtCtrlReply::set_str_err(const char* value) { set_has_str_err(); @@ -1651,7 +1651,7 @@ inline void SOptVirtCtrlReply::set_str_err(const char* value) { str_err_ = new ::std::string; } str_err_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SOptVirtCtrlReply.str_err) + // @@protoc_insertion_point(field_set_char:iot_idl.SOptVirtCtrlReply.str_err) } inline void SOptVirtCtrlReply::set_str_err(const char* value, size_t size) { set_has_str_err(); @@ -1659,14 +1659,14 @@ inline void SOptVirtCtrlReply::set_str_err(const char* value, size_t size) { str_err_ = new ::std::string; } str_err_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SOptVirtCtrlReply.str_err) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SOptVirtCtrlReply.str_err) } inline ::std::string* SOptVirtCtrlReply::mutable_str_err() { set_has_str_err(); if (str_err_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { str_err_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SOptVirtCtrlReply.str_err) + // @@protoc_insertion_point(field_mutable:iot_idl.SOptVirtCtrlReply.str_err) return str_err_; } inline ::std::string* SOptVirtCtrlReply::release_str_err() { @@ -1690,7 +1690,7 @@ inline void SOptVirtCtrlReply::set_allocated_str_err(::std::string* str_err) { clear_has_str_err(); str_err_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SOptVirtCtrlReply.str_err) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SOptVirtCtrlReply.str_err) } // optional string str_source_tag = 6; @@ -1710,7 +1710,7 @@ inline void SOptVirtCtrlReply::clear_str_source_tag() { clear_has_str_source_tag(); } inline const ::std::string& SOptVirtCtrlReply::str_source_tag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SOptVirtCtrlReply.str_source_tag) + // @@protoc_insertion_point(field_get:iot_idl.SOptVirtCtrlReply.str_source_tag) return *str_source_tag_; } inline void SOptVirtCtrlReply::set_str_source_tag(const ::std::string& value) { @@ -1719,7 +1719,7 @@ inline void SOptVirtCtrlReply::set_str_source_tag(const ::std::string& value) { str_source_tag_ = new ::std::string; } str_source_tag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SOptVirtCtrlReply.str_source_tag) + // @@protoc_insertion_point(field_set:iot_idl.SOptVirtCtrlReply.str_source_tag) } inline void SOptVirtCtrlReply::set_str_source_tag(const char* value) { set_has_str_source_tag(); @@ -1727,7 +1727,7 @@ inline void SOptVirtCtrlReply::set_str_source_tag(const char* value) { str_source_tag_ = new ::std::string; } str_source_tag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SOptVirtCtrlReply.str_source_tag) + // @@protoc_insertion_point(field_set_char:iot_idl.SOptVirtCtrlReply.str_source_tag) } inline void SOptVirtCtrlReply::set_str_source_tag(const char* value, size_t size) { set_has_str_source_tag(); @@ -1735,14 +1735,14 @@ inline void SOptVirtCtrlReply::set_str_source_tag(const char* value, size_t size str_source_tag_ = new ::std::string; } str_source_tag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SOptVirtCtrlReply.str_source_tag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SOptVirtCtrlReply.str_source_tag) } inline ::std::string* SOptVirtCtrlReply::mutable_str_source_tag() { set_has_str_source_tag(); if (str_source_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { str_source_tag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SOptVirtCtrlReply.str_source_tag) + // @@protoc_insertion_point(field_mutable:iot_idl.SOptVirtCtrlReply.str_source_tag) return str_source_tag_; } inline ::std::string* SOptVirtCtrlReply::release_str_source_tag() { @@ -1766,27 +1766,27 @@ inline void SOptVirtCtrlReply::set_allocated_str_source_tag(::std::string* str_s clear_has_str_source_tag(); str_source_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SOptVirtCtrlReply.str_source_tag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SOptVirtCtrlReply.str_source_tag) } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::enOptSetDataMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enOptSetDataMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enOptSetDataMsgType>() { - return ::kbd_idlfile::enOptSetDataMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enOptSetDataMsgType>() { + return ::iot_idl::enOptSetDataMsgType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::enOptVirtCtrlMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enOptVirtCtrlMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enOptVirtCtrlMsgType>() { - return ::kbd_idlfile::enOptVirtCtrlMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enOptVirtCtrlMsgType>() { + return ::iot_idl::enOptVirtCtrlMsgType_descriptor(); } } // namespace google diff --git a/platform/src/idl_files/OptDataMessage.proto b/platform/src/idl_files/OptDataMessage.proto index d90cac86..c3319642 100644 --- a/platform/src/idl_files/OptDataMessage.proto +++ b/platform/src/idl_files/OptDataMessage.proto @@ -4,7 +4,7 @@ // @author zhouzhenlgong //======================================================================================== syntax="proto2" ; -package kbd_idlfile ; +package iot_idl ; import "Public.proto"; enum enOptSetDataMsgType diff --git a/platform/src/idl_files/Public.pb.cc b/platform/src/idl_files/Public.pb.cc index 43287829..c31cb4b2 100644 --- a/platform/src/idl_files/Public.pb.cc +++ b/platform/src/idl_files/Public.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -92,8 +92,8 @@ void protobuf_AddDesc_Public_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\014Public.proto\022\013kbd_idlfile\"\270\001\n\tSVariabl" - "e\022(\n\teDataType\030\001 \002(\0162\025.kbd_idlfile.DataT" + "\n\014Public.proto\022\013iot_idl\"\270\001\n\tSVariabl" + "e\022(\n\teDataType\030\001 \002(\0162\025.iot_idl.DataT" "ype\022\016\n\006bValue\030\002 \001(\010\022\016\n\006uValue\030\003 \001(\r\022\016\n\006n" "Value\030\004 \001(\005\022\017\n\007ulValue\030\005 \001(\004\022\016\n\006lValue\030\006" " \001(\003\022\016\n\006fValue\030\007 \001(\002\022\016\n\006dValue\030\010 \001(\001\022\020\n\010" @@ -193,7 +193,7 @@ const int SVariable::kStrValueFieldNumber; SVariable::SVariable() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SVariable) + // @@protoc_insertion_point(constructor:iot_idl.SVariable) } void SVariable::InitAsDefaultInstance() { @@ -203,7 +203,7 @@ SVariable::SVariable(const SVariable& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SVariable) + // @@protoc_insertion_point(copy_constructor:iot_idl.SVariable) } void SVariable::SharedCtor() { @@ -222,7 +222,7 @@ void SVariable::SharedCtor() { } SVariable::~SVariable() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SVariable) + // @@protoc_insertion_point(destructor:iot_idl.SVariable) SharedDtor(); } @@ -288,21 +288,21 @@ bool SVariable::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SVariable) + // @@protoc_insertion_point(parse_start:iot_idl.SVariable) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.DataType eDataType = 1; + // required .iot_idl.DataType eDataType = 1; case 1: { if (tag == 8) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::DataType_IsValid(value)) { - set_edatatype(static_cast< ::kbd_idlfile::DataType >(value)); + if (::iot_idl::DataType_IsValid(value)) { + set_edatatype(static_cast< ::iot_idl::DataType >(value)); } else { mutable_unknown_fields()->AddVarint(1, value); } @@ -449,18 +449,18 @@ bool SVariable::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SVariable) + // @@protoc_insertion_point(parse_success:iot_idl.SVariable) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SVariable) + // @@protoc_insertion_point(parse_failure:iot_idl.SVariable) return false; #undef DO_ } void SVariable::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SVariable) - // required .kbd_idlfile.DataType eDataType = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SVariable) + // required .iot_idl.DataType eDataType = 1; if (has_edatatype()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 1, this->edatatype(), output); @@ -515,13 +515,13 @@ void SVariable::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SVariable) + // @@protoc_insertion_point(serialize_end:iot_idl.SVariable) } ::google::protobuf::uint8* SVariable::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SVariable) - // required .kbd_idlfile.DataType eDataType = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SVariable) + // required .iot_idl.DataType eDataType = 1; if (has_edatatype()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 1, this->edatatype(), target); @@ -577,7 +577,7 @@ void SVariable::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SVariable) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SVariable) return target; } @@ -585,7 +585,7 @@ int SVariable::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.DataType eDataType = 1; + // required .iot_idl.DataType eDataType = 1; if (has_edatatype()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->edatatype()); @@ -749,6 +749,6 @@ void SVariable::Swap(SVariable* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/platform/src/idl_files/Public.pb.h b/platform/src/idl_files/Public.pb.h index 5c9fbc5a..9caa1cd7 100644 --- a/platform/src/idl_files/Public.pb.h +++ b/platform/src/idl_files/Public.pb.h @@ -27,7 +27,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { // Internal implementation detail -- do not call these. void IDL_FILES_EXPORT protobuf_AddDesc_Public_2eproto(); @@ -159,12 +159,12 @@ class IDL_FILES_EXPORT SVariable : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.DataType eDataType = 1; + // required .iot_idl.DataType eDataType = 1; inline bool has_edatatype() const; inline void clear_edatatype(); static const int kEDataTypeFieldNumber = 1; - inline ::kbd_idlfile::DataType edatatype() const; - inline void set_edatatype(::kbd_idlfile::DataType value); + inline ::iot_idl::DataType edatatype() const; + inline void set_edatatype(::iot_idl::DataType value); // optional bool bValue = 2; inline bool has_bvalue() const; @@ -227,7 +227,7 @@ class IDL_FILES_EXPORT SVariable : public ::google::protobuf::Message { inline ::std::string* release_strvalue(); inline void set_allocated_strvalue(::std::string* strvalue); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SVariable) + // @@protoc_insertion_point(class_scope:iot_idl.SVariable) private: inline void set_has_edatatype(); inline void clear_has_edatatype(); @@ -275,7 +275,7 @@ class IDL_FILES_EXPORT SVariable : public ::google::protobuf::Message { // SVariable -// required .kbd_idlfile.DataType eDataType = 1; +// required .iot_idl.DataType eDataType = 1; inline bool SVariable::has_edatatype() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -289,15 +289,15 @@ inline void SVariable::clear_edatatype() { edatatype_ = 1; clear_has_edatatype(); } -inline ::kbd_idlfile::DataType SVariable::edatatype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVariable.eDataType) - return static_cast< ::kbd_idlfile::DataType >(edatatype_); +inline ::iot_idl::DataType SVariable::edatatype() const { + // @@protoc_insertion_point(field_get:iot_idl.SVariable.eDataType) + return static_cast< ::iot_idl::DataType >(edatatype_); } -inline void SVariable::set_edatatype(::kbd_idlfile::DataType value) { - assert(::kbd_idlfile::DataType_IsValid(value)); +inline void SVariable::set_edatatype(::iot_idl::DataType value) { + assert(::iot_idl::DataType_IsValid(value)); set_has_edatatype(); edatatype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SVariable.eDataType) + // @@protoc_insertion_point(field_set:iot_idl.SVariable.eDataType) } // optional bool bValue = 2; @@ -315,13 +315,13 @@ inline void SVariable::clear_bvalue() { clear_has_bvalue(); } inline bool SVariable::bvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVariable.bValue) + // @@protoc_insertion_point(field_get:iot_idl.SVariable.bValue) return bvalue_; } inline void SVariable::set_bvalue(bool value) { set_has_bvalue(); bvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SVariable.bValue) + // @@protoc_insertion_point(field_set:iot_idl.SVariable.bValue) } // optional uint32 uValue = 3; @@ -339,13 +339,13 @@ inline void SVariable::clear_uvalue() { clear_has_uvalue(); } inline ::google::protobuf::uint32 SVariable::uvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVariable.uValue) + // @@protoc_insertion_point(field_get:iot_idl.SVariable.uValue) return uvalue_; } inline void SVariable::set_uvalue(::google::protobuf::uint32 value) { set_has_uvalue(); uvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SVariable.uValue) + // @@protoc_insertion_point(field_set:iot_idl.SVariable.uValue) } // optional int32 nValue = 4; @@ -363,13 +363,13 @@ inline void SVariable::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int32 SVariable::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVariable.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SVariable.nValue) return nvalue_; } inline void SVariable::set_nvalue(::google::protobuf::int32 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SVariable.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SVariable.nValue) } // optional uint64 ulValue = 5; @@ -387,13 +387,13 @@ inline void SVariable::clear_ulvalue() { clear_has_ulvalue(); } inline ::google::protobuf::uint64 SVariable::ulvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVariable.ulValue) + // @@protoc_insertion_point(field_get:iot_idl.SVariable.ulValue) return ulvalue_; } inline void SVariable::set_ulvalue(::google::protobuf::uint64 value) { set_has_ulvalue(); ulvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SVariable.ulValue) + // @@protoc_insertion_point(field_set:iot_idl.SVariable.ulValue) } // optional int64 lValue = 6; @@ -411,13 +411,13 @@ inline void SVariable::clear_lvalue() { clear_has_lvalue(); } inline ::google::protobuf::int64 SVariable::lvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVariable.lValue) + // @@protoc_insertion_point(field_get:iot_idl.SVariable.lValue) return lvalue_; } inline void SVariable::set_lvalue(::google::protobuf::int64 value) { set_has_lvalue(); lvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SVariable.lValue) + // @@protoc_insertion_point(field_set:iot_idl.SVariable.lValue) } // optional float fValue = 7; @@ -435,13 +435,13 @@ inline void SVariable::clear_fvalue() { clear_has_fvalue(); } inline float SVariable::fvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVariable.fValue) + // @@protoc_insertion_point(field_get:iot_idl.SVariable.fValue) return fvalue_; } inline void SVariable::set_fvalue(float value) { set_has_fvalue(); fvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SVariable.fValue) + // @@protoc_insertion_point(field_set:iot_idl.SVariable.fValue) } // optional double dValue = 8; @@ -459,13 +459,13 @@ inline void SVariable::clear_dvalue() { clear_has_dvalue(); } inline double SVariable::dvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVariable.dValue) + // @@protoc_insertion_point(field_get:iot_idl.SVariable.dValue) return dvalue_; } inline void SVariable::set_dvalue(double value) { set_has_dvalue(); dvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SVariable.dValue) + // @@protoc_insertion_point(field_set:iot_idl.SVariable.dValue) } // optional string strValue = 9; @@ -485,7 +485,7 @@ inline void SVariable::clear_strvalue() { clear_has_strvalue(); } inline const ::std::string& SVariable::strvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVariable.strValue) + // @@protoc_insertion_point(field_get:iot_idl.SVariable.strValue) return *strvalue_; } inline void SVariable::set_strvalue(const ::std::string& value) { @@ -494,7 +494,7 @@ inline void SVariable::set_strvalue(const ::std::string& value) { strvalue_ = new ::std::string; } strvalue_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SVariable.strValue) + // @@protoc_insertion_point(field_set:iot_idl.SVariable.strValue) } inline void SVariable::set_strvalue(const char* value) { set_has_strvalue(); @@ -502,7 +502,7 @@ inline void SVariable::set_strvalue(const char* value) { strvalue_ = new ::std::string; } strvalue_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SVariable.strValue) + // @@protoc_insertion_point(field_set_char:iot_idl.SVariable.strValue) } inline void SVariable::set_strvalue(const char* value, size_t size) { set_has_strvalue(); @@ -510,14 +510,14 @@ inline void SVariable::set_strvalue(const char* value, size_t size) { strvalue_ = new ::std::string; } strvalue_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SVariable.strValue) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SVariable.strValue) } inline ::std::string* SVariable::mutable_strvalue() { set_has_strvalue(); if (strvalue_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strvalue_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SVariable.strValue) + // @@protoc_insertion_point(field_mutable:iot_idl.SVariable.strValue) return strvalue_; } inline ::std::string* SVariable::release_strvalue() { @@ -541,32 +541,32 @@ inline void SVariable::set_allocated_strvalue(::std::string* strvalue) { clear_has_strvalue(); strvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SVariable.strValue) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SVariable.strValue) } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::DataType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::DataType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::DataType>() { - return ::kbd_idlfile::DataType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::DataType>() { + return ::iot_idl::DataType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::ENConditionLogic> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::ENConditionLogic> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::ENConditionLogic>() { - return ::kbd_idlfile::ENConditionLogic_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::ENConditionLogic>() { + return ::iot_idl::ENConditionLogic_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::ENConditionRelation> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::ENConditionRelation> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::ENConditionRelation>() { - return ::kbd_idlfile::ENConditionRelation_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::ENConditionRelation>() { + return ::iot_idl::ENConditionRelation_descriptor(); } } // namespace google diff --git a/platform/src/idl_files/Public.proto b/platform/src/idl_files/Public.proto index 03b565e5..8bdfd7df 100644 --- a/platform/src/idl_files/Public.proto +++ b/platform/src/idl_files/Public.proto @@ -5,7 +5,7 @@ //======================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; // Proto?????? //======================================================================================== diff --git a/platform/src/idl_files/PushMessage.pb.cc b/platform/src/idl_files/PushMessage.pb.cc index bb6e51da..bb127718 100644 --- a/platform/src/idl_files/PushMessage.pb.cc +++ b/platform/src/idl_files/PushMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -119,7 +119,7 @@ void protobuf_AddDesc_PushMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\021PushMessage.proto\022\013kbd_idlfile\"\331\002\n\nSSM" + "\n\021PushMessage.proto\022\013iot_idl\"\331\002\n\nSSM" "TP_MAIL\022\026\n\016server_address\030\001 \002(\t\022\014\n\004port\030" "\002 \002(\t\022T\n\017connecttionType\030\003 \002(\0162(.kbd_idl" "file.SSMTP_MAIL.enConnectionType:\021CT_TCP" @@ -209,7 +209,7 @@ const int SSMTP_MAIL::kTimeFieldNumber; SSMTP_MAIL::SSMTP_MAIL() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SSMTP_MAIL) + // @@protoc_insertion_point(constructor:iot_idl.SSMTP_MAIL) } void SSMTP_MAIL::InitAsDefaultInstance() { @@ -219,7 +219,7 @@ SSMTP_MAIL::SSMTP_MAIL(const SSMTP_MAIL& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SSMTP_MAIL) + // @@protoc_insertion_point(copy_constructor:iot_idl.SSMTP_MAIL) } void SSMTP_MAIL::SharedCtor() { @@ -239,7 +239,7 @@ void SSMTP_MAIL::SharedCtor() { } SSMTP_MAIL::~SSMTP_MAIL() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SSMTP_MAIL) + // @@protoc_insertion_point(destructor:iot_idl.SSMTP_MAIL) SharedDtor(); } @@ -348,7 +348,7 @@ bool SSMTP_MAIL::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SSMTP_MAIL) + // @@protoc_insertion_point(parse_start:iot_idl.SSMTP_MAIL) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -387,7 +387,7 @@ bool SSMTP_MAIL::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.SSMTP_MAIL.enConnectionType connecttionType = 3 [default = CT_TCP_CONNECTION]; + // required .iot_idl.SSMTP_MAIL.enConnectionType connecttionType = 3 [default = CT_TCP_CONNECTION]; case 3: { if (tag == 24) { parse_connecttionType: @@ -395,8 +395,8 @@ bool SSMTP_MAIL::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::SSMTP_MAIL_enConnectionType_IsValid(value)) { - set_connecttiontype(static_cast< ::kbd_idlfile::SSMTP_MAIL_enConnectionType >(value)); + if (::iot_idl::SSMTP_MAIL_enConnectionType_IsValid(value)) { + set_connecttiontype(static_cast< ::iot_idl::SSMTP_MAIL_enConnectionType >(value)); } else { mutable_unknown_fields()->AddVarint(3, value); } @@ -538,17 +538,17 @@ bool SSMTP_MAIL::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SSMTP_MAIL) + // @@protoc_insertion_point(parse_success:iot_idl.SSMTP_MAIL) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SSMTP_MAIL) + // @@protoc_insertion_point(parse_failure:iot_idl.SSMTP_MAIL) return false; #undef DO_ } void SSMTP_MAIL::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SSMTP_MAIL) + // @@protoc_insertion_point(serialize_start:iot_idl.SSMTP_MAIL) // required string server_address = 1; if (has_server_address()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -569,7 +569,7 @@ void SSMTP_MAIL::SerializeWithCachedSizes( 2, this->port(), output); } - // required .kbd_idlfile.SSMTP_MAIL.enConnectionType connecttionType = 3 [default = CT_TCP_CONNECTION]; + // required .iot_idl.SSMTP_MAIL.enConnectionType connecttionType = 3 [default = CT_TCP_CONNECTION]; if (has_connecttiontype()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 3, this->connecttiontype(), output); @@ -644,12 +644,12 @@ void SSMTP_MAIL::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SSMTP_MAIL) + // @@protoc_insertion_point(serialize_end:iot_idl.SSMTP_MAIL) } ::google::protobuf::uint8* SSMTP_MAIL::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SSMTP_MAIL) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SSMTP_MAIL) // required string server_address = 1; if (has_server_address()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -672,7 +672,7 @@ void SSMTP_MAIL::SerializeWithCachedSizes( 2, this->port(), target); } - // required .kbd_idlfile.SSMTP_MAIL.enConnectionType connecttionType = 3 [default = CT_TCP_CONNECTION]; + // required .iot_idl.SSMTP_MAIL.enConnectionType connecttionType = 3 [default = CT_TCP_CONNECTION]; if (has_connecttiontype()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 3, this->connecttiontype(), target); @@ -753,7 +753,7 @@ void SSMTP_MAIL::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SSMTP_MAIL) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SSMTP_MAIL) return target; } @@ -775,7 +775,7 @@ int SSMTP_MAIL::ByteSize() const { this->port()); } - // required .kbd_idlfile.SSMTP_MAIL.enConnectionType connecttionType = 3 [default = CT_TCP_CONNECTION]; + // required .iot_idl.SSMTP_MAIL.enConnectionType connecttionType = 3 [default = CT_TCP_CONNECTION]; if (has_connecttiontype()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->connecttiontype()); @@ -955,7 +955,7 @@ const int SBBNIOT_VSMS::kTimeFieldNumber; SBBNIOT_VSMS::SBBNIOT_VSMS() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SBBNIOT_VSMS) + // @@protoc_insertion_point(constructor:iot_idl.SBBNIOT_VSMS) } void SBBNIOT_VSMS::InitAsDefaultInstance() { @@ -965,7 +965,7 @@ SBBNIOT_VSMS::SBBNIOT_VSMS(const SBBNIOT_VSMS& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SBBNIOT_VSMS) + // @@protoc_insertion_point(copy_constructor:iot_idl.SBBNIOT_VSMS) } void SBBNIOT_VSMS::SharedCtor() { @@ -982,7 +982,7 @@ void SBBNIOT_VSMS::SharedCtor() { } SBBNIOT_VSMS::~SBBNIOT_VSMS() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SBBNIOT_VSMS) + // @@protoc_insertion_point(destructor:iot_idl.SBBNIOT_VSMS) SharedDtor(); } @@ -1072,7 +1072,7 @@ bool SBBNIOT_VSMS::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SBBNIOT_VSMS) + // @@protoc_insertion_point(parse_start:iot_idl.SBBNIOT_VSMS) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1208,17 +1208,17 @@ bool SBBNIOT_VSMS::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SBBNIOT_VSMS) + // @@protoc_insertion_point(parse_success:iot_idl.SBBNIOT_VSMS) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SBBNIOT_VSMS) + // @@protoc_insertion_point(parse_failure:iot_idl.SBBNIOT_VSMS) return false; #undef DO_ } void SBBNIOT_VSMS::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SBBNIOT_VSMS) + // @@protoc_insertion_point(serialize_start:iot_idl.SBBNIOT_VSMS) // required string server_address = 1; if (has_server_address()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1288,12 +1288,12 @@ void SBBNIOT_VSMS::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SBBNIOT_VSMS) + // @@protoc_insertion_point(serialize_end:iot_idl.SBBNIOT_VSMS) } ::google::protobuf::uint8* SBBNIOT_VSMS::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SBBNIOT_VSMS) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SBBNIOT_VSMS) // required string server_address = 1; if (has_server_address()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1369,7 +1369,7 @@ void SBBNIOT_VSMS::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SBBNIOT_VSMS) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SBBNIOT_VSMS) return target; } @@ -1522,6 +1522,6 @@ void SBBNIOT_VSMS::Swap(SBBNIOT_VSMS* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/platform/src/idl_files/PushMessage.pb.h b/platform/src/idl_files/PushMessage.pb.h index 66c7ed61..f0118fc0 100644 --- a/platform/src/idl_files/PushMessage.pb.h +++ b/platform/src/idl_files/PushMessage.pb.h @@ -27,7 +27,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { // Internal implementation detail -- do not call these. void IDL_FILES_EXPORT protobuf_AddDesc_PushMessage_2eproto(); @@ -182,12 +182,12 @@ class IDL_FILES_EXPORT SSMTP_MAIL : public ::google::protobuf::Message { inline ::std::string* release_port(); inline void set_allocated_port(::std::string* port); - // required .kbd_idlfile.SSMTP_MAIL.enConnectionType connecttionType = 3 [default = CT_TCP_CONNECTION]; + // required .iot_idl.SSMTP_MAIL.enConnectionType connecttionType = 3 [default = CT_TCP_CONNECTION]; inline bool has_connecttiontype() const; inline void clear_connecttiontype(); static const int kConnecttionTypeFieldNumber = 3; - inline ::kbd_idlfile::SSMTP_MAIL_enConnectionType connecttiontype() const; - inline void set_connecttiontype(::kbd_idlfile::SSMTP_MAIL_enConnectionType value); + inline ::iot_idl::SSMTP_MAIL_enConnectionType connecttiontype() const; + inline void set_connecttiontype(::iot_idl::SSMTP_MAIL_enConnectionType value); // required string sender = 4; inline bool has_sender() const; @@ -268,7 +268,7 @@ class IDL_FILES_EXPORT SSMTP_MAIL : public ::google::protobuf::Message { inline ::google::protobuf::int64 time() const; inline void set_time(::google::protobuf::int64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SSMTP_MAIL) + // @@protoc_insertion_point(class_scope:iot_idl.SSMTP_MAIL) private: inline void set_has_server_address(); inline void clear_has_server_address(); @@ -446,7 +446,7 @@ class IDL_FILES_EXPORT SBBNIOT_VSMS : public ::google::protobuf::Message { inline ::google::protobuf::int64 time() const; inline void set_time(::google::protobuf::int64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SBBNIOT_VSMS) + // @@protoc_insertion_point(class_scope:iot_idl.SBBNIOT_VSMS) private: inline void set_has_server_address(); inline void clear_has_server_address(); @@ -505,7 +505,7 @@ inline void SSMTP_MAIL::clear_server_address() { clear_has_server_address(); } inline const ::std::string& SSMTP_MAIL::server_address() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SSMTP_MAIL.server_address) + // @@protoc_insertion_point(field_get:iot_idl.SSMTP_MAIL.server_address) return *server_address_; } inline void SSMTP_MAIL::set_server_address(const ::std::string& value) { @@ -514,7 +514,7 @@ inline void SSMTP_MAIL::set_server_address(const ::std::string& value) { server_address_ = new ::std::string; } server_address_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SSMTP_MAIL.server_address) + // @@protoc_insertion_point(field_set:iot_idl.SSMTP_MAIL.server_address) } inline void SSMTP_MAIL::set_server_address(const char* value) { set_has_server_address(); @@ -522,7 +522,7 @@ inline void SSMTP_MAIL::set_server_address(const char* value) { server_address_ = new ::std::string; } server_address_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SSMTP_MAIL.server_address) + // @@protoc_insertion_point(field_set_char:iot_idl.SSMTP_MAIL.server_address) } inline void SSMTP_MAIL::set_server_address(const char* value, size_t size) { set_has_server_address(); @@ -530,14 +530,14 @@ inline void SSMTP_MAIL::set_server_address(const char* value, size_t size) { server_address_ = new ::std::string; } server_address_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SSMTP_MAIL.server_address) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SSMTP_MAIL.server_address) } inline ::std::string* SSMTP_MAIL::mutable_server_address() { set_has_server_address(); if (server_address_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { server_address_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SSMTP_MAIL.server_address) + // @@protoc_insertion_point(field_mutable:iot_idl.SSMTP_MAIL.server_address) return server_address_; } inline ::std::string* SSMTP_MAIL::release_server_address() { @@ -561,7 +561,7 @@ inline void SSMTP_MAIL::set_allocated_server_address(::std::string* server_addre clear_has_server_address(); server_address_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SSMTP_MAIL.server_address) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SSMTP_MAIL.server_address) } // required string port = 2; @@ -581,7 +581,7 @@ inline void SSMTP_MAIL::clear_port() { clear_has_port(); } inline const ::std::string& SSMTP_MAIL::port() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SSMTP_MAIL.port) + // @@protoc_insertion_point(field_get:iot_idl.SSMTP_MAIL.port) return *port_; } inline void SSMTP_MAIL::set_port(const ::std::string& value) { @@ -590,7 +590,7 @@ inline void SSMTP_MAIL::set_port(const ::std::string& value) { port_ = new ::std::string; } port_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SSMTP_MAIL.port) + // @@protoc_insertion_point(field_set:iot_idl.SSMTP_MAIL.port) } inline void SSMTP_MAIL::set_port(const char* value) { set_has_port(); @@ -598,7 +598,7 @@ inline void SSMTP_MAIL::set_port(const char* value) { port_ = new ::std::string; } port_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SSMTP_MAIL.port) + // @@protoc_insertion_point(field_set_char:iot_idl.SSMTP_MAIL.port) } inline void SSMTP_MAIL::set_port(const char* value, size_t size) { set_has_port(); @@ -606,14 +606,14 @@ inline void SSMTP_MAIL::set_port(const char* value, size_t size) { port_ = new ::std::string; } port_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SSMTP_MAIL.port) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SSMTP_MAIL.port) } inline ::std::string* SSMTP_MAIL::mutable_port() { set_has_port(); if (port_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { port_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SSMTP_MAIL.port) + // @@protoc_insertion_point(field_mutable:iot_idl.SSMTP_MAIL.port) return port_; } inline ::std::string* SSMTP_MAIL::release_port() { @@ -637,10 +637,10 @@ inline void SSMTP_MAIL::set_allocated_port(::std::string* port) { clear_has_port(); port_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SSMTP_MAIL.port) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SSMTP_MAIL.port) } -// required .kbd_idlfile.SSMTP_MAIL.enConnectionType connecttionType = 3 [default = CT_TCP_CONNECTION]; +// required .iot_idl.SSMTP_MAIL.enConnectionType connecttionType = 3 [default = CT_TCP_CONNECTION]; inline bool SSMTP_MAIL::has_connecttiontype() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -654,15 +654,15 @@ inline void SSMTP_MAIL::clear_connecttiontype() { connecttiontype_ = 0; clear_has_connecttiontype(); } -inline ::kbd_idlfile::SSMTP_MAIL_enConnectionType SSMTP_MAIL::connecttiontype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SSMTP_MAIL.connecttionType) - return static_cast< ::kbd_idlfile::SSMTP_MAIL_enConnectionType >(connecttiontype_); +inline ::iot_idl::SSMTP_MAIL_enConnectionType SSMTP_MAIL::connecttiontype() const { + // @@protoc_insertion_point(field_get:iot_idl.SSMTP_MAIL.connecttionType) + return static_cast< ::iot_idl::SSMTP_MAIL_enConnectionType >(connecttiontype_); } -inline void SSMTP_MAIL::set_connecttiontype(::kbd_idlfile::SSMTP_MAIL_enConnectionType value) { - assert(::kbd_idlfile::SSMTP_MAIL_enConnectionType_IsValid(value)); +inline void SSMTP_MAIL::set_connecttiontype(::iot_idl::SSMTP_MAIL_enConnectionType value) { + assert(::iot_idl::SSMTP_MAIL_enConnectionType_IsValid(value)); set_has_connecttiontype(); connecttiontype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SSMTP_MAIL.connecttionType) + // @@protoc_insertion_point(field_set:iot_idl.SSMTP_MAIL.connecttionType) } // required string sender = 4; @@ -682,7 +682,7 @@ inline void SSMTP_MAIL::clear_sender() { clear_has_sender(); } inline const ::std::string& SSMTP_MAIL::sender() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SSMTP_MAIL.sender) + // @@protoc_insertion_point(field_get:iot_idl.SSMTP_MAIL.sender) return *sender_; } inline void SSMTP_MAIL::set_sender(const ::std::string& value) { @@ -691,7 +691,7 @@ inline void SSMTP_MAIL::set_sender(const ::std::string& value) { sender_ = new ::std::string; } sender_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SSMTP_MAIL.sender) + // @@protoc_insertion_point(field_set:iot_idl.SSMTP_MAIL.sender) } inline void SSMTP_MAIL::set_sender(const char* value) { set_has_sender(); @@ -699,7 +699,7 @@ inline void SSMTP_MAIL::set_sender(const char* value) { sender_ = new ::std::string; } sender_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SSMTP_MAIL.sender) + // @@protoc_insertion_point(field_set_char:iot_idl.SSMTP_MAIL.sender) } inline void SSMTP_MAIL::set_sender(const char* value, size_t size) { set_has_sender(); @@ -707,14 +707,14 @@ inline void SSMTP_MAIL::set_sender(const char* value, size_t size) { sender_ = new ::std::string; } sender_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SSMTP_MAIL.sender) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SSMTP_MAIL.sender) } inline ::std::string* SSMTP_MAIL::mutable_sender() { set_has_sender(); if (sender_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { sender_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SSMTP_MAIL.sender) + // @@protoc_insertion_point(field_mutable:iot_idl.SSMTP_MAIL.sender) return sender_; } inline ::std::string* SSMTP_MAIL::release_sender() { @@ -738,7 +738,7 @@ inline void SSMTP_MAIL::set_allocated_sender(::std::string* sender) { clear_has_sender(); sender_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SSMTP_MAIL.sender) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SSMTP_MAIL.sender) } // required string recipients = 5; @@ -758,7 +758,7 @@ inline void SSMTP_MAIL::clear_recipients() { clear_has_recipients(); } inline const ::std::string& SSMTP_MAIL::recipients() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SSMTP_MAIL.recipients) + // @@protoc_insertion_point(field_get:iot_idl.SSMTP_MAIL.recipients) return *recipients_; } inline void SSMTP_MAIL::set_recipients(const ::std::string& value) { @@ -767,7 +767,7 @@ inline void SSMTP_MAIL::set_recipients(const ::std::string& value) { recipients_ = new ::std::string; } recipients_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SSMTP_MAIL.recipients) + // @@protoc_insertion_point(field_set:iot_idl.SSMTP_MAIL.recipients) } inline void SSMTP_MAIL::set_recipients(const char* value) { set_has_recipients(); @@ -775,7 +775,7 @@ inline void SSMTP_MAIL::set_recipients(const char* value) { recipients_ = new ::std::string; } recipients_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SSMTP_MAIL.recipients) + // @@protoc_insertion_point(field_set_char:iot_idl.SSMTP_MAIL.recipients) } inline void SSMTP_MAIL::set_recipients(const char* value, size_t size) { set_has_recipients(); @@ -783,14 +783,14 @@ inline void SSMTP_MAIL::set_recipients(const char* value, size_t size) { recipients_ = new ::std::string; } recipients_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SSMTP_MAIL.recipients) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SSMTP_MAIL.recipients) } inline ::std::string* SSMTP_MAIL::mutable_recipients() { set_has_recipients(); if (recipients_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { recipients_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SSMTP_MAIL.recipients) + // @@protoc_insertion_point(field_mutable:iot_idl.SSMTP_MAIL.recipients) return recipients_; } inline ::std::string* SSMTP_MAIL::release_recipients() { @@ -814,7 +814,7 @@ inline void SSMTP_MAIL::set_allocated_recipients(::std::string* recipients) { clear_has_recipients(); recipients_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SSMTP_MAIL.recipients) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SSMTP_MAIL.recipients) } // required string username = 6; @@ -834,7 +834,7 @@ inline void SSMTP_MAIL::clear_username() { clear_has_username(); } inline const ::std::string& SSMTP_MAIL::username() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SSMTP_MAIL.username) + // @@protoc_insertion_point(field_get:iot_idl.SSMTP_MAIL.username) return *username_; } inline void SSMTP_MAIL::set_username(const ::std::string& value) { @@ -843,7 +843,7 @@ inline void SSMTP_MAIL::set_username(const ::std::string& value) { username_ = new ::std::string; } username_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SSMTP_MAIL.username) + // @@protoc_insertion_point(field_set:iot_idl.SSMTP_MAIL.username) } inline void SSMTP_MAIL::set_username(const char* value) { set_has_username(); @@ -851,7 +851,7 @@ inline void SSMTP_MAIL::set_username(const char* value) { username_ = new ::std::string; } username_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SSMTP_MAIL.username) + // @@protoc_insertion_point(field_set_char:iot_idl.SSMTP_MAIL.username) } inline void SSMTP_MAIL::set_username(const char* value, size_t size) { set_has_username(); @@ -859,14 +859,14 @@ inline void SSMTP_MAIL::set_username(const char* value, size_t size) { username_ = new ::std::string; } username_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SSMTP_MAIL.username) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SSMTP_MAIL.username) } inline ::std::string* SSMTP_MAIL::mutable_username() { set_has_username(); if (username_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { username_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SSMTP_MAIL.username) + // @@protoc_insertion_point(field_mutable:iot_idl.SSMTP_MAIL.username) return username_; } inline ::std::string* SSMTP_MAIL::release_username() { @@ -890,7 +890,7 @@ inline void SSMTP_MAIL::set_allocated_username(::std::string* username) { clear_has_username(); username_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SSMTP_MAIL.username) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SSMTP_MAIL.username) } // required string password = 7; @@ -910,7 +910,7 @@ inline void SSMTP_MAIL::clear_password() { clear_has_password(); } inline const ::std::string& SSMTP_MAIL::password() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SSMTP_MAIL.password) + // @@protoc_insertion_point(field_get:iot_idl.SSMTP_MAIL.password) return *password_; } inline void SSMTP_MAIL::set_password(const ::std::string& value) { @@ -919,7 +919,7 @@ inline void SSMTP_MAIL::set_password(const ::std::string& value) { password_ = new ::std::string; } password_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SSMTP_MAIL.password) + // @@protoc_insertion_point(field_set:iot_idl.SSMTP_MAIL.password) } inline void SSMTP_MAIL::set_password(const char* value) { set_has_password(); @@ -927,7 +927,7 @@ inline void SSMTP_MAIL::set_password(const char* value) { password_ = new ::std::string; } password_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SSMTP_MAIL.password) + // @@protoc_insertion_point(field_set_char:iot_idl.SSMTP_MAIL.password) } inline void SSMTP_MAIL::set_password(const char* value, size_t size) { set_has_password(); @@ -935,14 +935,14 @@ inline void SSMTP_MAIL::set_password(const char* value, size_t size) { password_ = new ::std::string; } password_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SSMTP_MAIL.password) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SSMTP_MAIL.password) } inline ::std::string* SSMTP_MAIL::mutable_password() { set_has_password(); if (password_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { password_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SSMTP_MAIL.password) + // @@protoc_insertion_point(field_mutable:iot_idl.SSMTP_MAIL.password) return password_; } inline ::std::string* SSMTP_MAIL::release_password() { @@ -966,7 +966,7 @@ inline void SSMTP_MAIL::set_allocated_password(::std::string* password) { clear_has_password(); password_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SSMTP_MAIL.password) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SSMTP_MAIL.password) } // required string subject = 8; @@ -986,7 +986,7 @@ inline void SSMTP_MAIL::clear_subject() { clear_has_subject(); } inline const ::std::string& SSMTP_MAIL::subject() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SSMTP_MAIL.subject) + // @@protoc_insertion_point(field_get:iot_idl.SSMTP_MAIL.subject) return *subject_; } inline void SSMTP_MAIL::set_subject(const ::std::string& value) { @@ -995,7 +995,7 @@ inline void SSMTP_MAIL::set_subject(const ::std::string& value) { subject_ = new ::std::string; } subject_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SSMTP_MAIL.subject) + // @@protoc_insertion_point(field_set:iot_idl.SSMTP_MAIL.subject) } inline void SSMTP_MAIL::set_subject(const char* value) { set_has_subject(); @@ -1003,7 +1003,7 @@ inline void SSMTP_MAIL::set_subject(const char* value) { subject_ = new ::std::string; } subject_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SSMTP_MAIL.subject) + // @@protoc_insertion_point(field_set_char:iot_idl.SSMTP_MAIL.subject) } inline void SSMTP_MAIL::set_subject(const char* value, size_t size) { set_has_subject(); @@ -1011,14 +1011,14 @@ inline void SSMTP_MAIL::set_subject(const char* value, size_t size) { subject_ = new ::std::string; } subject_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SSMTP_MAIL.subject) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SSMTP_MAIL.subject) } inline ::std::string* SSMTP_MAIL::mutable_subject() { set_has_subject(); if (subject_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { subject_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SSMTP_MAIL.subject) + // @@protoc_insertion_point(field_mutable:iot_idl.SSMTP_MAIL.subject) return subject_; } inline ::std::string* SSMTP_MAIL::release_subject() { @@ -1042,7 +1042,7 @@ inline void SSMTP_MAIL::set_allocated_subject(::std::string* subject) { clear_has_subject(); subject_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SSMTP_MAIL.subject) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SSMTP_MAIL.subject) } // required string content = 9; @@ -1062,7 +1062,7 @@ inline void SSMTP_MAIL::clear_content() { clear_has_content(); } inline const ::std::string& SSMTP_MAIL::content() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SSMTP_MAIL.content) + // @@protoc_insertion_point(field_get:iot_idl.SSMTP_MAIL.content) return *content_; } inline void SSMTP_MAIL::set_content(const ::std::string& value) { @@ -1071,7 +1071,7 @@ inline void SSMTP_MAIL::set_content(const ::std::string& value) { content_ = new ::std::string; } content_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SSMTP_MAIL.content) + // @@protoc_insertion_point(field_set:iot_idl.SSMTP_MAIL.content) } inline void SSMTP_MAIL::set_content(const char* value) { set_has_content(); @@ -1079,7 +1079,7 @@ inline void SSMTP_MAIL::set_content(const char* value) { content_ = new ::std::string; } content_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SSMTP_MAIL.content) + // @@protoc_insertion_point(field_set_char:iot_idl.SSMTP_MAIL.content) } inline void SSMTP_MAIL::set_content(const char* value, size_t size) { set_has_content(); @@ -1087,14 +1087,14 @@ inline void SSMTP_MAIL::set_content(const char* value, size_t size) { content_ = new ::std::string; } content_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SSMTP_MAIL.content) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SSMTP_MAIL.content) } inline ::std::string* SSMTP_MAIL::mutable_content() { set_has_content(); if (content_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { content_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SSMTP_MAIL.content) + // @@protoc_insertion_point(field_mutable:iot_idl.SSMTP_MAIL.content) return content_; } inline ::std::string* SSMTP_MAIL::release_content() { @@ -1118,7 +1118,7 @@ inline void SSMTP_MAIL::set_allocated_content(::std::string* content) { clear_has_content(); content_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SSMTP_MAIL.content) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SSMTP_MAIL.content) } // required int64 time = 10; @@ -1136,13 +1136,13 @@ inline void SSMTP_MAIL::clear_time() { clear_has_time(); } inline ::google::protobuf::int64 SSMTP_MAIL::time() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SSMTP_MAIL.time) + // @@protoc_insertion_point(field_get:iot_idl.SSMTP_MAIL.time) return time_; } inline void SSMTP_MAIL::set_time(::google::protobuf::int64 value) { set_has_time(); time_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SSMTP_MAIL.time) + // @@protoc_insertion_point(field_set:iot_idl.SSMTP_MAIL.time) } // ------------------------------------------------------------------- @@ -1166,7 +1166,7 @@ inline void SBBNIOT_VSMS::clear_server_address() { clear_has_server_address(); } inline const ::std::string& SBBNIOT_VSMS::server_address() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SBBNIOT_VSMS.server_address) + // @@protoc_insertion_point(field_get:iot_idl.SBBNIOT_VSMS.server_address) return *server_address_; } inline void SBBNIOT_VSMS::set_server_address(const ::std::string& value) { @@ -1175,7 +1175,7 @@ inline void SBBNIOT_VSMS::set_server_address(const ::std::string& value) { server_address_ = new ::std::string; } server_address_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SBBNIOT_VSMS.server_address) + // @@protoc_insertion_point(field_set:iot_idl.SBBNIOT_VSMS.server_address) } inline void SBBNIOT_VSMS::set_server_address(const char* value) { set_has_server_address(); @@ -1183,7 +1183,7 @@ inline void SBBNIOT_VSMS::set_server_address(const char* value) { server_address_ = new ::std::string; } server_address_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SBBNIOT_VSMS.server_address) + // @@protoc_insertion_point(field_set_char:iot_idl.SBBNIOT_VSMS.server_address) } inline void SBBNIOT_VSMS::set_server_address(const char* value, size_t size) { set_has_server_address(); @@ -1191,14 +1191,14 @@ inline void SBBNIOT_VSMS::set_server_address(const char* value, size_t size) { server_address_ = new ::std::string; } server_address_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SBBNIOT_VSMS.server_address) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SBBNIOT_VSMS.server_address) } inline ::std::string* SBBNIOT_VSMS::mutable_server_address() { set_has_server_address(); if (server_address_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { server_address_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SBBNIOT_VSMS.server_address) + // @@protoc_insertion_point(field_mutable:iot_idl.SBBNIOT_VSMS.server_address) return server_address_; } inline ::std::string* SBBNIOT_VSMS::release_server_address() { @@ -1222,7 +1222,7 @@ inline void SBBNIOT_VSMS::set_allocated_server_address(::std::string* server_add clear_has_server_address(); server_address_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SBBNIOT_VSMS.server_address) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SBBNIOT_VSMS.server_address) } // required string username = 2; @@ -1242,7 +1242,7 @@ inline void SBBNIOT_VSMS::clear_username() { clear_has_username(); } inline const ::std::string& SBBNIOT_VSMS::username() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SBBNIOT_VSMS.username) + // @@protoc_insertion_point(field_get:iot_idl.SBBNIOT_VSMS.username) return *username_; } inline void SBBNIOT_VSMS::set_username(const ::std::string& value) { @@ -1251,7 +1251,7 @@ inline void SBBNIOT_VSMS::set_username(const ::std::string& value) { username_ = new ::std::string; } username_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SBBNIOT_VSMS.username) + // @@protoc_insertion_point(field_set:iot_idl.SBBNIOT_VSMS.username) } inline void SBBNIOT_VSMS::set_username(const char* value) { set_has_username(); @@ -1259,7 +1259,7 @@ inline void SBBNIOT_VSMS::set_username(const char* value) { username_ = new ::std::string; } username_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SBBNIOT_VSMS.username) + // @@protoc_insertion_point(field_set_char:iot_idl.SBBNIOT_VSMS.username) } inline void SBBNIOT_VSMS::set_username(const char* value, size_t size) { set_has_username(); @@ -1267,14 +1267,14 @@ inline void SBBNIOT_VSMS::set_username(const char* value, size_t size) { username_ = new ::std::string; } username_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SBBNIOT_VSMS.username) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SBBNIOT_VSMS.username) } inline ::std::string* SBBNIOT_VSMS::mutable_username() { set_has_username(); if (username_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { username_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SBBNIOT_VSMS.username) + // @@protoc_insertion_point(field_mutable:iot_idl.SBBNIOT_VSMS.username) return username_; } inline ::std::string* SBBNIOT_VSMS::release_username() { @@ -1298,7 +1298,7 @@ inline void SBBNIOT_VSMS::set_allocated_username(::std::string* username) { clear_has_username(); username_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SBBNIOT_VSMS.username) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SBBNIOT_VSMS.username) } // required string password = 3; @@ -1318,7 +1318,7 @@ inline void SBBNIOT_VSMS::clear_password() { clear_has_password(); } inline const ::std::string& SBBNIOT_VSMS::password() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SBBNIOT_VSMS.password) + // @@protoc_insertion_point(field_get:iot_idl.SBBNIOT_VSMS.password) return *password_; } inline void SBBNIOT_VSMS::set_password(const ::std::string& value) { @@ -1327,7 +1327,7 @@ inline void SBBNIOT_VSMS::set_password(const ::std::string& value) { password_ = new ::std::string; } password_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SBBNIOT_VSMS.password) + // @@protoc_insertion_point(field_set:iot_idl.SBBNIOT_VSMS.password) } inline void SBBNIOT_VSMS::set_password(const char* value) { set_has_password(); @@ -1335,7 +1335,7 @@ inline void SBBNIOT_VSMS::set_password(const char* value) { password_ = new ::std::string; } password_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SBBNIOT_VSMS.password) + // @@protoc_insertion_point(field_set_char:iot_idl.SBBNIOT_VSMS.password) } inline void SBBNIOT_VSMS::set_password(const char* value, size_t size) { set_has_password(); @@ -1343,14 +1343,14 @@ inline void SBBNIOT_VSMS::set_password(const char* value, size_t size) { password_ = new ::std::string; } password_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SBBNIOT_VSMS.password) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SBBNIOT_VSMS.password) } inline ::std::string* SBBNIOT_VSMS::mutable_password() { set_has_password(); if (password_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { password_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SBBNIOT_VSMS.password) + // @@protoc_insertion_point(field_mutable:iot_idl.SBBNIOT_VSMS.password) return password_; } inline ::std::string* SBBNIOT_VSMS::release_password() { @@ -1374,7 +1374,7 @@ inline void SBBNIOT_VSMS::set_allocated_password(::std::string* password) { clear_has_password(); password_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SBBNIOT_VSMS.password) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SBBNIOT_VSMS.password) } // required string method = 4; @@ -1394,7 +1394,7 @@ inline void SBBNIOT_VSMS::clear_method() { clear_has_method(); } inline const ::std::string& SBBNIOT_VSMS::method() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SBBNIOT_VSMS.method) + // @@protoc_insertion_point(field_get:iot_idl.SBBNIOT_VSMS.method) return *method_; } inline void SBBNIOT_VSMS::set_method(const ::std::string& value) { @@ -1403,7 +1403,7 @@ inline void SBBNIOT_VSMS::set_method(const ::std::string& value) { method_ = new ::std::string; } method_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SBBNIOT_VSMS.method) + // @@protoc_insertion_point(field_set:iot_idl.SBBNIOT_VSMS.method) } inline void SBBNIOT_VSMS::set_method(const char* value) { set_has_method(); @@ -1411,7 +1411,7 @@ inline void SBBNIOT_VSMS::set_method(const char* value) { method_ = new ::std::string; } method_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SBBNIOT_VSMS.method) + // @@protoc_insertion_point(field_set_char:iot_idl.SBBNIOT_VSMS.method) } inline void SBBNIOT_VSMS::set_method(const char* value, size_t size) { set_has_method(); @@ -1419,14 +1419,14 @@ inline void SBBNIOT_VSMS::set_method(const char* value, size_t size) { method_ = new ::std::string; } method_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SBBNIOT_VSMS.method) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SBBNIOT_VSMS.method) } inline ::std::string* SBBNIOT_VSMS::mutable_method() { set_has_method(); if (method_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { method_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SBBNIOT_VSMS.method) + // @@protoc_insertion_point(field_mutable:iot_idl.SBBNIOT_VSMS.method) return method_; } inline ::std::string* SBBNIOT_VSMS::release_method() { @@ -1450,7 +1450,7 @@ inline void SBBNIOT_VSMS::set_allocated_method(::std::string* method) { clear_has_method(); method_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SBBNIOT_VSMS.method) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SBBNIOT_VSMS.method) } // required string number = 5; @@ -1470,7 +1470,7 @@ inline void SBBNIOT_VSMS::clear_number() { clear_has_number(); } inline const ::std::string& SBBNIOT_VSMS::number() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SBBNIOT_VSMS.number) + // @@protoc_insertion_point(field_get:iot_idl.SBBNIOT_VSMS.number) return *number_; } inline void SBBNIOT_VSMS::set_number(const ::std::string& value) { @@ -1479,7 +1479,7 @@ inline void SBBNIOT_VSMS::set_number(const ::std::string& value) { number_ = new ::std::string; } number_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SBBNIOT_VSMS.number) + // @@protoc_insertion_point(field_set:iot_idl.SBBNIOT_VSMS.number) } inline void SBBNIOT_VSMS::set_number(const char* value) { set_has_number(); @@ -1487,7 +1487,7 @@ inline void SBBNIOT_VSMS::set_number(const char* value) { number_ = new ::std::string; } number_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SBBNIOT_VSMS.number) + // @@protoc_insertion_point(field_set_char:iot_idl.SBBNIOT_VSMS.number) } inline void SBBNIOT_VSMS::set_number(const char* value, size_t size) { set_has_number(); @@ -1495,14 +1495,14 @@ inline void SBBNIOT_VSMS::set_number(const char* value, size_t size) { number_ = new ::std::string; } number_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SBBNIOT_VSMS.number) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SBBNIOT_VSMS.number) } inline ::std::string* SBBNIOT_VSMS::mutable_number() { set_has_number(); if (number_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { number_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SBBNIOT_VSMS.number) + // @@protoc_insertion_point(field_mutable:iot_idl.SBBNIOT_VSMS.number) return number_; } inline ::std::string* SBBNIOT_VSMS::release_number() { @@ -1526,7 +1526,7 @@ inline void SBBNIOT_VSMS::set_allocated_number(::std::string* number) { clear_has_number(); number_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SBBNIOT_VSMS.number) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SBBNIOT_VSMS.number) } // required string content = 6; @@ -1546,7 +1546,7 @@ inline void SBBNIOT_VSMS::clear_content() { clear_has_content(); } inline const ::std::string& SBBNIOT_VSMS::content() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SBBNIOT_VSMS.content) + // @@protoc_insertion_point(field_get:iot_idl.SBBNIOT_VSMS.content) return *content_; } inline void SBBNIOT_VSMS::set_content(const ::std::string& value) { @@ -1555,7 +1555,7 @@ inline void SBBNIOT_VSMS::set_content(const ::std::string& value) { content_ = new ::std::string; } content_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SBBNIOT_VSMS.content) + // @@protoc_insertion_point(field_set:iot_idl.SBBNIOT_VSMS.content) } inline void SBBNIOT_VSMS::set_content(const char* value) { set_has_content(); @@ -1563,7 +1563,7 @@ inline void SBBNIOT_VSMS::set_content(const char* value) { content_ = new ::std::string; } content_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SBBNIOT_VSMS.content) + // @@protoc_insertion_point(field_set_char:iot_idl.SBBNIOT_VSMS.content) } inline void SBBNIOT_VSMS::set_content(const char* value, size_t size) { set_has_content(); @@ -1571,14 +1571,14 @@ inline void SBBNIOT_VSMS::set_content(const char* value, size_t size) { content_ = new ::std::string; } content_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SBBNIOT_VSMS.content) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SBBNIOT_VSMS.content) } inline ::std::string* SBBNIOT_VSMS::mutable_content() { set_has_content(); if (content_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { content_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SBBNIOT_VSMS.content) + // @@protoc_insertion_point(field_mutable:iot_idl.SBBNIOT_VSMS.content) return content_; } inline ::std::string* SBBNIOT_VSMS::release_content() { @@ -1602,7 +1602,7 @@ inline void SBBNIOT_VSMS::set_allocated_content(::std::string* content) { clear_has_content(); content_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SBBNIOT_VSMS.content) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SBBNIOT_VSMS.content) } // required int64 time = 7; @@ -1620,33 +1620,33 @@ inline void SBBNIOT_VSMS::clear_time() { clear_has_time(); } inline ::google::protobuf::int64 SBBNIOT_VSMS::time() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SBBNIOT_VSMS.time) + // @@protoc_insertion_point(field_get:iot_idl.SBBNIOT_VSMS.time) return time_; } inline void SBBNIOT_VSMS::set_time(::google::protobuf::int64 value) { set_has_time(); time_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SBBNIOT_VSMS.time) + // @@protoc_insertion_point(field_set:iot_idl.SBBNIOT_VSMS.time) } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::SSMTP_MAIL_enConnectionType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::SSMTP_MAIL_enConnectionType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::SSMTP_MAIL_enConnectionType>() { - return ::kbd_idlfile::SSMTP_MAIL_enConnectionType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::SSMTP_MAIL_enConnectionType>() { + return ::iot_idl::SSMTP_MAIL_enConnectionType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::enPushTypeMessage> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enPushTypeMessage> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enPushTypeMessage>() { - return ::kbd_idlfile::enPushTypeMessage_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enPushTypeMessage>() { + return ::iot_idl::enPushTypeMessage_descriptor(); } } // namespace google diff --git a/platform/src/idl_files/PushMessage.proto b/platform/src/idl_files/PushMessage.proto index c196cd96..e4673bdb 100644 --- a/platform/src/idl_files/PushMessage.proto +++ b/platform/src/idl_files/PushMessage.proto @@ -5,7 +5,7 @@ //======================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; // 缩写说明： diff --git a/platform/src/idl_files/RdbServerMessage.pb.cc b/platform/src/idl_files/RdbServerMessage.pb.cc index a89df6ea..cde557ea 100644 --- a/platform/src/idl_files/RdbServerMessage.pb.cc +++ b/platform/src/idl_files/RdbServerMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -371,46 +371,46 @@ void protobuf_AddDesc_RdbServerMessage_2eproto() { already_here = true; GOOGLE_PROTOBUF_VERIFY_VERSION; - ::kbd_idlfile::protobuf_AddDesc_Public_2eproto(); + ::iot_idl::protobuf_AddDesc_Public_2eproto(); ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\026RdbServerMessage.proto\022\013kbd_idlfile\032\014P" + "\n\026RdbServerMessage.proto\022\013iot_idl\032\014P" "ublic.proto\"\265\001\n\014RdbCondition\022.\n\007enLogic\030" - "\001 \001(\0162\035.kbd_idlfile.ENConditionLogic\0224\n\n" - "enRelation\030\002 \002(\0162 .kbd_idlfile.ENConditi" + "\001 \001(\0162\035.iot_idl.ENConditionLogic\0224\n\n" + "enRelation\030\002 \002(\0162 .iot_idl.ENConditi" "onRelation\022\025\n\rstrColumnName\030\003 \002(\t\022(\n\010msg" - "Value\030\005 \002(\0132\026.kbd_idlfile.SVariable\":\n\tR" + "Value\030\005 \002(\0132\026.iot_idl.SVariable\":\n\tR" "dbRecord\022-\n\rmsgValueArray\030\001 \003(\0132\026.kbd_id" "lfile.SVariable\"Q\n\016RdbUpdateValue\022\025\n\rstr" "ColumnName\030\001 \002(\t\022(\n\010msgValue\030\002 \002(\0132\026.kbd" "_idlfile.SVariable\"\233\001\n\010RdbQuery\022\024\n\014strTa" "bleName\030\001 \002(\t\022\033\n\023strSelectColNameArr\030\002 \003" "(\t\022\032\n\022strOrderColNameArr\030\003 \003(\t\022/\n\014msgCon" - "dition\030\004 \003(\0132\031.kbd_idlfile.RdbCondition\022" + "dition\030\004 \003(\0132\031.iot_idl.RdbCondition\022" "\017\n\004nAsc\030\005 \001(\005:\0011\"a\n\tRdbInsert\022\024\n\014strTabl" "eName\030\001 \002(\t\022\025\n\rstrColumnName\030\002 \003(\t\022\'\n\007ms" - "gData\030\003 \003(\0132\026.kbd_idlfile.RdbRecord\"V\n\tR" + "gData\030\003 \003(\0132\026.iot_idl.RdbRecord\"V\n\tR" "dbRemove\022\024\n\014strTableName\030\001 \002(\t\0223\n\020msgCon" - "dtionArray\030\002 \003(\0132\031.kbd_idlfile.RdbCondit" + "dtionArray\030\002 \003(\0132\031.iot_idl.RdbCondit" "ion\"\207\001\n\tRdbUpdate\022\024\n\014strTableName\030\001 \002(\t\022" - "/\n\014msgCondition\030\002 \003(\0132\031.kbd_idlfile.RdbC" + "/\n\014msgCondition\030\002 \003(\0132\031.iot_idl.RdbC" "ondition\0223\n\016msgUpdateValue\030\003 \003(\0132\033.kbd_i" "dlfile.RdbUpdateValue\"3\n\014RdbLockTable\022\024\n" "\014strTableName\030\001 \002(\t\022\r\n\005bLock\030\002 \002(\010\"S\n\006Rd" "bRet\022\016\n\003ret\030\002 \002(\005:\0010\022)\n\tmsgRecord\030\003 \003(\0132" - "\026.kbd_idlfile.RdbRecord\022\016\n\006strErr\030\004 \001(\t\"" + "\026.iot_idl.RdbRecord\022\016\n\006strErr\030\004 \001(\t\"" "\216\002\n\nRdbRequest\022\024\n\014strSessionID\030\001 \002(\t\022\024\n\014" "strPackageId\030\002 \002(\t\022\'\n\010msgQuery\030\004 \001(\0132\025.k" "bd_idlfile.RdbQuery\022)\n\tmsgInsert\030\005 \001(\0132\026" - ".kbd_idlfile.RdbInsert\022)\n\tmsgRemove\030\006 \001(" - "\0132\026.kbd_idlfile.RdbRemove\022)\n\tmsgUpdate\030\007" - " \001(\0132\026.kbd_idlfile.RdbUpdate\022*\n\007msgLock\030" - "\010 \001(\0132\031.kbd_idlfile.RdbLockTable\"X\n\010RdbR" + ".iot_idl.RdbInsert\022)\n\tmsgRemove\030\006 \001(" + "\0132\026.iot_idl.RdbRemove\022)\n\tmsgUpdate\030\007" + " \001(\0132\026.iot_idl.RdbUpdate\022*\n\007msgLock\030" + "\010 \001(\0132\031.iot_idl.RdbLockTable\"X\n\010RdbR" "eply\022\024\n\014strSessionID\030\001 \002(\t\022\024\n\014strPackage" - "Id\030\003 \002(\t\022 \n\003ret\030\002 \002(\0132\023.kbd_idlfile.RdbR" + "Id\030\003 \002(\t\022 \n\003ret\030\002 \002(\0132\023.iot_idl.RdbR" "et\"f\n\nRdbReplace\022\024\n\014strSessionID\030\001 \002(\t\022\024" "\n\014strTableName\030\002 \002(\t\022,\n\tmsgUpdate\030\003 \003(\0132" - "\031.kbd_idlfile.RdbSynUpdate\"\205\001\n\014RdbSynUpd" - "ate\022/\n\014msgCondition\030\001 \003(\0132\031.kbd_idlfile." + "\031.iot_idl.RdbSynUpdate\"\205\001\n\014RdbSynUpd" + "ate\022/\n\014msgCondition\030\001 \003(\0132\031.iot_idl." "RdbCondition\0223\n\016msgUpdateValue\030\002 \003(\0132\033.k" "bd_idlfile.RdbUpdateValue\022\017\n\007strKeys\030\003 \001" "(\t*\371\001\n\022enRdbServerMessage\022\036\n\032MT_DBMS_RTD" @@ -489,18 +489,18 @@ const int RdbCondition::kMsgValueFieldNumber; RdbCondition::RdbCondition() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.RdbCondition) + // @@protoc_insertion_point(constructor:iot_idl.RdbCondition) } void RdbCondition::InitAsDefaultInstance() { - msgvalue_ = const_cast< ::kbd_idlfile::SVariable*>(&::kbd_idlfile::SVariable::default_instance()); + msgvalue_ = const_cast< ::iot_idl::SVariable*>(&::iot_idl::SVariable::default_instance()); } RdbCondition::RdbCondition(const RdbCondition& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.RdbCondition) + // @@protoc_insertion_point(copy_constructor:iot_idl.RdbCondition) } void RdbCondition::SharedCtor() { @@ -514,7 +514,7 @@ void RdbCondition::SharedCtor() { } RdbCondition::~RdbCondition() { - // @@protoc_insertion_point(destructor:kbd_idlfile.RdbCondition) + // @@protoc_insertion_point(destructor:iot_idl.RdbCondition) SharedDtor(); } @@ -567,7 +567,7 @@ void RdbCondition::Clear() { } } if (has_msgvalue()) { - if (msgvalue_ != NULL) msgvalue_->::kbd_idlfile::SVariable::Clear(); + if (msgvalue_ != NULL) msgvalue_->::iot_idl::SVariable::Clear(); } } @@ -582,21 +582,21 @@ bool RdbCondition::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.RdbCondition) + // @@protoc_insertion_point(parse_start:iot_idl.RdbCondition) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional .kbd_idlfile.ENConditionLogic enLogic = 1; + // optional .iot_idl.ENConditionLogic enLogic = 1; case 1: { if (tag == 8) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::ENConditionLogic_IsValid(value)) { - set_enlogic(static_cast< ::kbd_idlfile::ENConditionLogic >(value)); + if (::iot_idl::ENConditionLogic_IsValid(value)) { + set_enlogic(static_cast< ::iot_idl::ENConditionLogic >(value)); } else { mutable_unknown_fields()->AddVarint(1, value); } @@ -607,7 +607,7 @@ bool RdbCondition::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.ENConditionRelation enRelation = 2; + // required .iot_idl.ENConditionRelation enRelation = 2; case 2: { if (tag == 16) { parse_enRelation: @@ -615,8 +615,8 @@ bool RdbCondition::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::ENConditionRelation_IsValid(value)) { - set_enrelation(static_cast< ::kbd_idlfile::ENConditionRelation >(value)); + if (::iot_idl::ENConditionRelation_IsValid(value)) { + set_enrelation(static_cast< ::iot_idl::ENConditionRelation >(value)); } else { mutable_unknown_fields()->AddVarint(2, value); } @@ -644,7 +644,7 @@ bool RdbCondition::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.SVariable msgValue = 5; + // required .iot_idl.SVariable msgValue = 5; case 5: { if (tag == 42) { parse_msgValue: @@ -671,24 +671,24 @@ bool RdbCondition::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.RdbCondition) + // @@protoc_insertion_point(parse_success:iot_idl.RdbCondition) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.RdbCondition) + // @@protoc_insertion_point(parse_failure:iot_idl.RdbCondition) return false; #undef DO_ } void RdbCondition::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.RdbCondition) - // optional .kbd_idlfile.ENConditionLogic enLogic = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.RdbCondition) + // optional .iot_idl.ENConditionLogic enLogic = 1; if (has_enlogic()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 1, this->enlogic(), output); } - // required .kbd_idlfile.ENConditionRelation enRelation = 2; + // required .iot_idl.ENConditionRelation enRelation = 2; if (has_enrelation()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 2, this->enrelation(), output); @@ -704,7 +704,7 @@ void RdbCondition::SerializeWithCachedSizes( 3, this->strcolumnname(), output); } - // required .kbd_idlfile.SVariable msgValue = 5; + // required .iot_idl.SVariable msgValue = 5; if (has_msgvalue()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 5, this->msgvalue(), output); @@ -714,19 +714,19 @@ void RdbCondition::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.RdbCondition) + // @@protoc_insertion_point(serialize_end:iot_idl.RdbCondition) } ::google::protobuf::uint8* RdbCondition::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.RdbCondition) - // optional .kbd_idlfile.ENConditionLogic enLogic = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.RdbCondition) + // optional .iot_idl.ENConditionLogic enLogic = 1; if (has_enlogic()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 1, this->enlogic(), target); } - // required .kbd_idlfile.ENConditionRelation enRelation = 2; + // required .iot_idl.ENConditionRelation enRelation = 2; if (has_enrelation()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 2, this->enrelation(), target); @@ -743,7 +743,7 @@ void RdbCondition::SerializeWithCachedSizes( 3, this->strcolumnname(), target); } - // required .kbd_idlfile.SVariable msgValue = 5; + // required .iot_idl.SVariable msgValue = 5; if (has_msgvalue()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -754,7 +754,7 @@ void RdbCondition::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.RdbCondition) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.RdbCondition) return target; } @@ -762,13 +762,13 @@ int RdbCondition::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // optional .kbd_idlfile.ENConditionLogic enLogic = 1; + // optional .iot_idl.ENConditionLogic enLogic = 1; if (has_enlogic()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->enlogic()); } - // required .kbd_idlfile.ENConditionRelation enRelation = 2; + // required .iot_idl.ENConditionRelation enRelation = 2; if (has_enrelation()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->enrelation()); @@ -781,7 +781,7 @@ int RdbCondition::ByteSize() const { this->strcolumnname()); } - // required .kbd_idlfile.SVariable msgValue = 5; + // required .iot_idl.SVariable msgValue = 5; if (has_msgvalue()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -825,7 +825,7 @@ void RdbCondition::MergeFrom(const RdbCondition& from) { set_strcolumnname(from.strcolumnname()); } if (from.has_msgvalue()) { - mutable_msgvalue()->::kbd_idlfile::SVariable::MergeFrom(from.msgvalue()); + mutable_msgvalue()->::iot_idl::SVariable::MergeFrom(from.msgvalue()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -882,7 +882,7 @@ const int RdbRecord::kMsgValueArrayFieldNumber; RdbRecord::RdbRecord() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.RdbRecord) + // @@protoc_insertion_point(constructor:iot_idl.RdbRecord) } void RdbRecord::InitAsDefaultInstance() { @@ -892,7 +892,7 @@ RdbRecord::RdbRecord(const RdbRecord& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.RdbRecord) + // @@protoc_insertion_point(copy_constructor:iot_idl.RdbRecord) } void RdbRecord::SharedCtor() { @@ -901,7 +901,7 @@ void RdbRecord::SharedCtor() { } RdbRecord::~RdbRecord() { - // @@protoc_insertion_point(destructor:kbd_idlfile.RdbRecord) + // @@protoc_insertion_point(destructor:iot_idl.RdbRecord) SharedDtor(); } @@ -941,13 +941,13 @@ bool RdbRecord::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.RdbRecord) + // @@protoc_insertion_point(parse_start:iot_idl.RdbRecord) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated .kbd_idlfile.SVariable msgValueArray = 1; + // repeated .iot_idl.SVariable msgValueArray = 1; case 1: { if (tag == 10) { parse_msgValueArray: @@ -975,18 +975,18 @@ bool RdbRecord::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.RdbRecord) + // @@protoc_insertion_point(parse_success:iot_idl.RdbRecord) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.RdbRecord) + // @@protoc_insertion_point(parse_failure:iot_idl.RdbRecord) return false; #undef DO_ } void RdbRecord::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.RdbRecord) - // repeated .kbd_idlfile.SVariable msgValueArray = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.RdbRecord) + // repeated .iot_idl.SVariable msgValueArray = 1; for (int i = 0; i < this->msgvaluearray_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->msgvaluearray(i), output); @@ -996,13 +996,13 @@ void RdbRecord::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.RdbRecord) + // @@protoc_insertion_point(serialize_end:iot_idl.RdbRecord) } ::google::protobuf::uint8* RdbRecord::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.RdbRecord) - // repeated .kbd_idlfile.SVariable msgValueArray = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.RdbRecord) + // repeated .iot_idl.SVariable msgValueArray = 1; for (int i = 0; i < this->msgvaluearray_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1013,14 +1013,14 @@ void RdbRecord::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.RdbRecord) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.RdbRecord) return target; } int RdbRecord::ByteSize() const { int total_size = 0; - // repeated .kbd_idlfile.SVariable msgValueArray = 1; + // repeated .iot_idl.SVariable msgValueArray = 1; total_size += 1 * this->msgvaluearray_size(); for (int i = 0; i < this->msgvaluearray_size(); i++) { total_size += @@ -1103,18 +1103,18 @@ const int RdbUpdateValue::kMsgValueFieldNumber; RdbUpdateValue::RdbUpdateValue() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.RdbUpdateValue) + // @@protoc_insertion_point(constructor:iot_idl.RdbUpdateValue) } void RdbUpdateValue::InitAsDefaultInstance() { - msgvalue_ = const_cast< ::kbd_idlfile::SVariable*>(&::kbd_idlfile::SVariable::default_instance()); + msgvalue_ = const_cast< ::iot_idl::SVariable*>(&::iot_idl::SVariable::default_instance()); } RdbUpdateValue::RdbUpdateValue(const RdbUpdateValue& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.RdbUpdateValue) + // @@protoc_insertion_point(copy_constructor:iot_idl.RdbUpdateValue) } void RdbUpdateValue::SharedCtor() { @@ -1126,7 +1126,7 @@ void RdbUpdateValue::SharedCtor() { } RdbUpdateValue::~RdbUpdateValue() { - // @@protoc_insertion_point(destructor:kbd_idlfile.RdbUpdateValue) + // @@protoc_insertion_point(destructor:iot_idl.RdbUpdateValue) SharedDtor(); } @@ -1168,7 +1168,7 @@ void RdbUpdateValue::Clear() { } } if (has_msgvalue()) { - if (msgvalue_ != NULL) msgvalue_->::kbd_idlfile::SVariable::Clear(); + if (msgvalue_ != NULL) msgvalue_->::iot_idl::SVariable::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -1179,7 +1179,7 @@ bool RdbUpdateValue::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.RdbUpdateValue) + // @@protoc_insertion_point(parse_start:iot_idl.RdbUpdateValue) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1201,7 +1201,7 @@ bool RdbUpdateValue::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.SVariable msgValue = 2; + // required .iot_idl.SVariable msgValue = 2; case 2: { if (tag == 18) { parse_msgValue: @@ -1228,17 +1228,17 @@ bool RdbUpdateValue::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.RdbUpdateValue) + // @@protoc_insertion_point(parse_success:iot_idl.RdbUpdateValue) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.RdbUpdateValue) + // @@protoc_insertion_point(parse_failure:iot_idl.RdbUpdateValue) return false; #undef DO_ } void RdbUpdateValue::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.RdbUpdateValue) + // @@protoc_insertion_point(serialize_start:iot_idl.RdbUpdateValue) // required string strColumnName = 1; if (has_strcolumnname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1249,7 +1249,7 @@ void RdbUpdateValue::SerializeWithCachedSizes( 1, this->strcolumnname(), output); } - // required .kbd_idlfile.SVariable msgValue = 2; + // required .iot_idl.SVariable msgValue = 2; if (has_msgvalue()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->msgvalue(), output); @@ -1259,12 +1259,12 @@ void RdbUpdateValue::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.RdbUpdateValue) + // @@protoc_insertion_point(serialize_end:iot_idl.RdbUpdateValue) } ::google::protobuf::uint8* RdbUpdateValue::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.RdbUpdateValue) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.RdbUpdateValue) // required string strColumnName = 1; if (has_strcolumnname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1276,7 +1276,7 @@ void RdbUpdateValue::SerializeWithCachedSizes( 1, this->strcolumnname(), target); } - // required .kbd_idlfile.SVariable msgValue = 2; + // required .iot_idl.SVariable msgValue = 2; if (has_msgvalue()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1287,7 +1287,7 @@ void RdbUpdateValue::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.RdbUpdateValue) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.RdbUpdateValue) return target; } @@ -1302,7 +1302,7 @@ int RdbUpdateValue::ByteSize() const { this->strcolumnname()); } - // required .kbd_idlfile.SVariable msgValue = 2; + // required .iot_idl.SVariable msgValue = 2; if (has_msgvalue()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -1340,7 +1340,7 @@ void RdbUpdateValue::MergeFrom(const RdbUpdateValue& from) { set_strcolumnname(from.strcolumnname()); } if (from.has_msgvalue()) { - mutable_msgvalue()->::kbd_idlfile::SVariable::MergeFrom(from.msgvalue()); + mutable_msgvalue()->::iot_idl::SVariable::MergeFrom(from.msgvalue()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -1399,7 +1399,7 @@ const int RdbQuery::kNAscFieldNumber; RdbQuery::RdbQuery() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.RdbQuery) + // @@protoc_insertion_point(constructor:iot_idl.RdbQuery) } void RdbQuery::InitAsDefaultInstance() { @@ -1409,7 +1409,7 @@ RdbQuery::RdbQuery(const RdbQuery& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.RdbQuery) + // @@protoc_insertion_point(copy_constructor:iot_idl.RdbQuery) } void RdbQuery::SharedCtor() { @@ -1421,7 +1421,7 @@ void RdbQuery::SharedCtor() { } RdbQuery::~RdbQuery() { - // @@protoc_insertion_point(destructor:kbd_idlfile.RdbQuery) + // @@protoc_insertion_point(destructor:iot_idl.RdbQuery) SharedDtor(); } @@ -1474,7 +1474,7 @@ bool RdbQuery::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.RdbQuery) + // @@protoc_insertion_point(parse_start:iot_idl.RdbQuery) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1534,7 +1534,7 @@ bool RdbQuery::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.RdbCondition msgCondition = 4; + // repeated .iot_idl.RdbCondition msgCondition = 4; case 4: { if (tag == 34) { parse_msgCondition: @@ -1577,17 +1577,17 @@ bool RdbQuery::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.RdbQuery) + // @@protoc_insertion_point(parse_success:iot_idl.RdbQuery) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.RdbQuery) + // @@protoc_insertion_point(parse_failure:iot_idl.RdbQuery) return false; #undef DO_ } void RdbQuery::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.RdbQuery) + // @@protoc_insertion_point(serialize_start:iot_idl.RdbQuery) // required string strTableName = 1; if (has_strtablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1618,7 +1618,7 @@ void RdbQuery::SerializeWithCachedSizes( 3, this->strordercolnamearr(i), output); } - // repeated .kbd_idlfile.RdbCondition msgCondition = 4; + // repeated .iot_idl.RdbCondition msgCondition = 4; for (int i = 0; i < this->msgcondition_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->msgcondition(i), output); @@ -1633,12 +1633,12 @@ void RdbQuery::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.RdbQuery) + // @@protoc_insertion_point(serialize_end:iot_idl.RdbQuery) } ::google::protobuf::uint8* RdbQuery::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.RdbQuery) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.RdbQuery) // required string strTableName = 1; if (has_strtablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1670,7 +1670,7 @@ void RdbQuery::SerializeWithCachedSizes( WriteStringToArray(3, this->strordercolnamearr(i), target); } - // repeated .kbd_idlfile.RdbCondition msgCondition = 4; + // repeated .iot_idl.RdbCondition msgCondition = 4; for (int i = 0; i < this->msgcondition_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1686,7 +1686,7 @@ void RdbQuery::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.RdbQuery) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.RdbQuery) return target; } @@ -1723,7 +1723,7 @@ int RdbQuery::ByteSize() const { this->strordercolnamearr(i)); } - // repeated .kbd_idlfile.RdbCondition msgCondition = 4; + // repeated .iot_idl.RdbCondition msgCondition = 4; total_size += 1 * this->msgcondition_size(); for (int i = 0; i < this->msgcondition_size(); i++) { total_size += @@ -1822,7 +1822,7 @@ const int RdbInsert::kMsgDataFieldNumber; RdbInsert::RdbInsert() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.RdbInsert) + // @@protoc_insertion_point(constructor:iot_idl.RdbInsert) } void RdbInsert::InitAsDefaultInstance() { @@ -1832,7 +1832,7 @@ RdbInsert::RdbInsert(const RdbInsert& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.RdbInsert) + // @@protoc_insertion_point(copy_constructor:iot_idl.RdbInsert) } void RdbInsert::SharedCtor() { @@ -1843,7 +1843,7 @@ void RdbInsert::SharedCtor() { } RdbInsert::~RdbInsert() { - // @@protoc_insertion_point(destructor:kbd_idlfile.RdbInsert) + // @@protoc_insertion_point(destructor:iot_idl.RdbInsert) SharedDtor(); } @@ -1892,7 +1892,7 @@ bool RdbInsert::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.RdbInsert) + // @@protoc_insertion_point(parse_start:iot_idl.RdbInsert) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1933,7 +1933,7 @@ bool RdbInsert::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.RdbRecord msgData = 3; + // repeated .iot_idl.RdbRecord msgData = 3; case 3: { if (tag == 26) { parse_msgData: @@ -1961,17 +1961,17 @@ bool RdbInsert::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.RdbInsert) + // @@protoc_insertion_point(parse_success:iot_idl.RdbInsert) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.RdbInsert) + // @@protoc_insertion_point(parse_failure:iot_idl.RdbInsert) return false; #undef DO_ } void RdbInsert::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.RdbInsert) + // @@protoc_insertion_point(serialize_start:iot_idl.RdbInsert) // required string strTableName = 1; if (has_strtablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1992,7 +1992,7 @@ void RdbInsert::SerializeWithCachedSizes( 2, this->strcolumnname(i), output); } - // repeated .kbd_idlfile.RdbRecord msgData = 3; + // repeated .iot_idl.RdbRecord msgData = 3; for (int i = 0; i < this->msgdata_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->msgdata(i), output); @@ -2002,12 +2002,12 @@ void RdbInsert::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.RdbInsert) + // @@protoc_insertion_point(serialize_end:iot_idl.RdbInsert) } ::google::protobuf::uint8* RdbInsert::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.RdbInsert) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.RdbInsert) // required string strTableName = 1; if (has_strtablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2029,7 +2029,7 @@ void RdbInsert::SerializeWithCachedSizes( WriteStringToArray(2, this->strcolumnname(i), target); } - // repeated .kbd_idlfile.RdbRecord msgData = 3; + // repeated .iot_idl.RdbRecord msgData = 3; for (int i = 0; i < this->msgdata_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -2040,7 +2040,7 @@ void RdbInsert::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.RdbInsert) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.RdbInsert) return target; } @@ -2063,7 +2063,7 @@ int RdbInsert::ByteSize() const { this->strcolumnname(i)); } - // repeated .kbd_idlfile.RdbRecord msgData = 3; + // repeated .iot_idl.RdbRecord msgData = 3; total_size += 1 * this->msgdata_size(); for (int i = 0; i < this->msgdata_size(); i++) { total_size += @@ -2155,7 +2155,7 @@ const int RdbRemove::kMsgCondtionArrayFieldNumber; RdbRemove::RdbRemove() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.RdbRemove) + // @@protoc_insertion_point(constructor:iot_idl.RdbRemove) } void RdbRemove::InitAsDefaultInstance() { @@ -2165,7 +2165,7 @@ RdbRemove::RdbRemove(const RdbRemove& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.RdbRemove) + // @@protoc_insertion_point(copy_constructor:iot_idl.RdbRemove) } void RdbRemove::SharedCtor() { @@ -2176,7 +2176,7 @@ void RdbRemove::SharedCtor() { } RdbRemove::~RdbRemove() { - // @@protoc_insertion_point(destructor:kbd_idlfile.RdbRemove) + // @@protoc_insertion_point(destructor:iot_idl.RdbRemove) SharedDtor(); } @@ -2224,7 +2224,7 @@ bool RdbRemove::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.RdbRemove) + // @@protoc_insertion_point(parse_start:iot_idl.RdbRemove) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2246,7 +2246,7 @@ bool RdbRemove::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.RdbCondition msgCondtionArray = 2; + // repeated .iot_idl.RdbCondition msgCondtionArray = 2; case 2: { if (tag == 18) { parse_msgCondtionArray: @@ -2274,17 +2274,17 @@ bool RdbRemove::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.RdbRemove) + // @@protoc_insertion_point(parse_success:iot_idl.RdbRemove) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.RdbRemove) + // @@protoc_insertion_point(parse_failure:iot_idl.RdbRemove) return false; #undef DO_ } void RdbRemove::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.RdbRemove) + // @@protoc_insertion_point(serialize_start:iot_idl.RdbRemove) // required string strTableName = 1; if (has_strtablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2295,7 +2295,7 @@ void RdbRemove::SerializeWithCachedSizes( 1, this->strtablename(), output); } - // repeated .kbd_idlfile.RdbCondition msgCondtionArray = 2; + // repeated .iot_idl.RdbCondition msgCondtionArray = 2; for (int i = 0; i < this->msgcondtionarray_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->msgcondtionarray(i), output); @@ -2305,12 +2305,12 @@ void RdbRemove::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.RdbRemove) + // @@protoc_insertion_point(serialize_end:iot_idl.RdbRemove) } ::google::protobuf::uint8* RdbRemove::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.RdbRemove) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.RdbRemove) // required string strTableName = 1; if (has_strtablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2322,7 +2322,7 @@ void RdbRemove::SerializeWithCachedSizes( 1, this->strtablename(), target); } - // repeated .kbd_idlfile.RdbCondition msgCondtionArray = 2; + // repeated .iot_idl.RdbCondition msgCondtionArray = 2; for (int i = 0; i < this->msgcondtionarray_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -2333,7 +2333,7 @@ void RdbRemove::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.RdbRemove) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.RdbRemove) return target; } @@ -2349,7 +2349,7 @@ int RdbRemove::ByteSize() const { } } - // repeated .kbd_idlfile.RdbCondition msgCondtionArray = 2; + // repeated .iot_idl.RdbCondition msgCondtionArray = 2; total_size += 1 * this->msgcondtionarray_size(); for (int i = 0; i < this->msgcondtionarray_size(); i++) { total_size += @@ -2440,7 +2440,7 @@ const int RdbUpdate::kMsgUpdateValueFieldNumber; RdbUpdate::RdbUpdate() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.RdbUpdate) + // @@protoc_insertion_point(constructor:iot_idl.RdbUpdate) } void RdbUpdate::InitAsDefaultInstance() { @@ -2450,7 +2450,7 @@ RdbUpdate::RdbUpdate(const RdbUpdate& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.RdbUpdate) + // @@protoc_insertion_point(copy_constructor:iot_idl.RdbUpdate) } void RdbUpdate::SharedCtor() { @@ -2461,7 +2461,7 @@ void RdbUpdate::SharedCtor() { } RdbUpdate::~RdbUpdate() { - // @@protoc_insertion_point(destructor:kbd_idlfile.RdbUpdate) + // @@protoc_insertion_point(destructor:iot_idl.RdbUpdate) SharedDtor(); } @@ -2510,7 +2510,7 @@ bool RdbUpdate::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.RdbUpdate) + // @@protoc_insertion_point(parse_start:iot_idl.RdbUpdate) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2532,7 +2532,7 @@ bool RdbUpdate::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.RdbCondition msgCondition = 2; + // repeated .iot_idl.RdbCondition msgCondition = 2; case 2: { if (tag == 18) { parse_msgCondition: @@ -2546,7 +2546,7 @@ bool RdbUpdate::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.RdbUpdateValue msgUpdateValue = 3; + // repeated .iot_idl.RdbUpdateValue msgUpdateValue = 3; case 3: { if (tag == 26) { parse_msgUpdateValue: @@ -2574,17 +2574,17 @@ bool RdbUpdate::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.RdbUpdate) + // @@protoc_insertion_point(parse_success:iot_idl.RdbUpdate) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.RdbUpdate) + // @@protoc_insertion_point(parse_failure:iot_idl.RdbUpdate) return false; #undef DO_ } void RdbUpdate::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.RdbUpdate) + // @@protoc_insertion_point(serialize_start:iot_idl.RdbUpdate) // required string strTableName = 1; if (has_strtablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2595,13 +2595,13 @@ void RdbUpdate::SerializeWithCachedSizes( 1, this->strtablename(), output); } - // repeated .kbd_idlfile.RdbCondition msgCondition = 2; + // repeated .iot_idl.RdbCondition msgCondition = 2; for (int i = 0; i < this->msgcondition_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->msgcondition(i), output); } - // repeated .kbd_idlfile.RdbUpdateValue msgUpdateValue = 3; + // repeated .iot_idl.RdbUpdateValue msgUpdateValue = 3; for (int i = 0; i < this->msgupdatevalue_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->msgupdatevalue(i), output); @@ -2611,12 +2611,12 @@ void RdbUpdate::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.RdbUpdate) + // @@protoc_insertion_point(serialize_end:iot_idl.RdbUpdate) } ::google::protobuf::uint8* RdbUpdate::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.RdbUpdate) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.RdbUpdate) // required string strTableName = 1; if (has_strtablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2628,14 +2628,14 @@ void RdbUpdate::SerializeWithCachedSizes( 1, this->strtablename(), target); } - // repeated .kbd_idlfile.RdbCondition msgCondition = 2; + // repeated .iot_idl.RdbCondition msgCondition = 2; for (int i = 0; i < this->msgcondition_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->msgcondition(i), target); } - // repeated .kbd_idlfile.RdbUpdateValue msgUpdateValue = 3; + // repeated .iot_idl.RdbUpdateValue msgUpdateValue = 3; for (int i = 0; i < this->msgupdatevalue_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -2646,7 +2646,7 @@ void RdbUpdate::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.RdbUpdate) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.RdbUpdate) return target; } @@ -2662,7 +2662,7 @@ int RdbUpdate::ByteSize() const { } } - // repeated .kbd_idlfile.RdbCondition msgCondition = 2; + // repeated .iot_idl.RdbCondition msgCondition = 2; total_size += 1 * this->msgcondition_size(); for (int i = 0; i < this->msgcondition_size(); i++) { total_size += @@ -2670,7 +2670,7 @@ int RdbUpdate::ByteSize() const { this->msgcondition(i)); } - // repeated .kbd_idlfile.RdbUpdateValue msgUpdateValue = 3; + // repeated .iot_idl.RdbUpdateValue msgUpdateValue = 3; total_size += 1 * this->msgupdatevalue_size(); for (int i = 0; i < this->msgupdatevalue_size(); i++) { total_size += @@ -2763,7 +2763,7 @@ const int RdbLockTable::kBLockFieldNumber; RdbLockTable::RdbLockTable() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.RdbLockTable) + // @@protoc_insertion_point(constructor:iot_idl.RdbLockTable) } void RdbLockTable::InitAsDefaultInstance() { @@ -2773,7 +2773,7 @@ RdbLockTable::RdbLockTable(const RdbLockTable& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.RdbLockTable) + // @@protoc_insertion_point(copy_constructor:iot_idl.RdbLockTable) } void RdbLockTable::SharedCtor() { @@ -2785,7 +2785,7 @@ void RdbLockTable::SharedCtor() { } RdbLockTable::~RdbLockTable() { - // @@protoc_insertion_point(destructor:kbd_idlfile.RdbLockTable) + // @@protoc_insertion_point(destructor:iot_idl.RdbLockTable) SharedDtor(); } @@ -2835,7 +2835,7 @@ bool RdbLockTable::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.RdbLockTable) + // @@protoc_insertion_point(parse_start:iot_idl.RdbLockTable) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2886,17 +2886,17 @@ bool RdbLockTable::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.RdbLockTable) + // @@protoc_insertion_point(parse_success:iot_idl.RdbLockTable) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.RdbLockTable) + // @@protoc_insertion_point(parse_failure:iot_idl.RdbLockTable) return false; #undef DO_ } void RdbLockTable::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.RdbLockTable) + // @@protoc_insertion_point(serialize_start:iot_idl.RdbLockTable) // required string strTableName = 1; if (has_strtablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2916,12 +2916,12 @@ void RdbLockTable::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.RdbLockTable) + // @@protoc_insertion_point(serialize_end:iot_idl.RdbLockTable) } ::google::protobuf::uint8* RdbLockTable::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.RdbLockTable) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.RdbLockTable) // required string strTableName = 1; if (has_strtablename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2942,7 +2942,7 @@ void RdbLockTable::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.RdbLockTable) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.RdbLockTable) return target; } @@ -3047,7 +3047,7 @@ const int RdbRet::kStrErrFieldNumber; RdbRet::RdbRet() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.RdbRet) + // @@protoc_insertion_point(constructor:iot_idl.RdbRet) } void RdbRet::InitAsDefaultInstance() { @@ -3057,7 +3057,7 @@ RdbRet::RdbRet(const RdbRet& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.RdbRet) + // @@protoc_insertion_point(copy_constructor:iot_idl.RdbRet) } void RdbRet::SharedCtor() { @@ -3069,7 +3069,7 @@ void RdbRet::SharedCtor() { } RdbRet::~RdbRet() { - // @@protoc_insertion_point(destructor:kbd_idlfile.RdbRet) + // @@protoc_insertion_point(destructor:iot_idl.RdbRet) SharedDtor(); } @@ -3120,7 +3120,7 @@ bool RdbRet::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.RdbRet) + // @@protoc_insertion_point(parse_start:iot_idl.RdbRet) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -3140,7 +3140,7 @@ bool RdbRet::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.RdbRecord msgRecord = 3; + // repeated .iot_idl.RdbRecord msgRecord = 3; case 3: { if (tag == 26) { parse_msgRecord: @@ -3185,23 +3185,23 @@ bool RdbRet::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.RdbRet) + // @@protoc_insertion_point(parse_success:iot_idl.RdbRet) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.RdbRet) + // @@protoc_insertion_point(parse_failure:iot_idl.RdbRet) return false; #undef DO_ } void RdbRet::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.RdbRet) + // @@protoc_insertion_point(serialize_start:iot_idl.RdbRet) // required int32 ret = 2 [default = 0]; if (has_ret()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->ret(), output); } - // repeated .kbd_idlfile.RdbRecord msgRecord = 3; + // repeated .iot_idl.RdbRecord msgRecord = 3; for (int i = 0; i < this->msgrecord_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->msgrecord(i), output); @@ -3221,18 +3221,18 @@ void RdbRet::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.RdbRet) + // @@protoc_insertion_point(serialize_end:iot_idl.RdbRet) } ::google::protobuf::uint8* RdbRet::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.RdbRet) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.RdbRet) // required int32 ret = 2 [default = 0]; if (has_ret()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->ret(), target); } - // repeated .kbd_idlfile.RdbRecord msgRecord = 3; + // repeated .iot_idl.RdbRecord msgRecord = 3; for (int i = 0; i < this->msgrecord_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -3254,7 +3254,7 @@ void RdbRet::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.RdbRet) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.RdbRet) return target; } @@ -3277,7 +3277,7 @@ int RdbRet::ByteSize() const { } } - // repeated .kbd_idlfile.RdbRecord msgRecord = 3; + // repeated .iot_idl.RdbRecord msgRecord = 3; total_size += 1 * this->msgrecord_size(); for (int i = 0; i < this->msgrecord_size(); i++) { total_size += @@ -3376,22 +3376,22 @@ const int RdbRequest::kMsgLockFieldNumber; RdbRequest::RdbRequest() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.RdbRequest) + // @@protoc_insertion_point(constructor:iot_idl.RdbRequest) } void RdbRequest::InitAsDefaultInstance() { - msgquery_ = const_cast< ::kbd_idlfile::RdbQuery*>(&::kbd_idlfile::RdbQuery::default_instance()); - msginsert_ = const_cast< ::kbd_idlfile::RdbInsert*>(&::kbd_idlfile::RdbInsert::default_instance()); - msgremove_ = const_cast< ::kbd_idlfile::RdbRemove*>(&::kbd_idlfile::RdbRemove::default_instance()); - msgupdate_ = const_cast< ::kbd_idlfile::RdbUpdate*>(&::kbd_idlfile::RdbUpdate::default_instance()); - msglock_ = const_cast< ::kbd_idlfile::RdbLockTable*>(&::kbd_idlfile::RdbLockTable::default_instance()); + msgquery_ = const_cast< ::iot_idl::RdbQuery*>(&::iot_idl::RdbQuery::default_instance()); + msginsert_ = const_cast< ::iot_idl::RdbInsert*>(&::iot_idl::RdbInsert::default_instance()); + msgremove_ = const_cast< ::iot_idl::RdbRemove*>(&::iot_idl::RdbRemove::default_instance()); + msgupdate_ = const_cast< ::iot_idl::RdbUpdate*>(&::iot_idl::RdbUpdate::default_instance()); + msglock_ = const_cast< ::iot_idl::RdbLockTable*>(&::iot_idl::RdbLockTable::default_instance()); } RdbRequest::RdbRequest(const RdbRequest& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.RdbRequest) + // @@protoc_insertion_point(copy_constructor:iot_idl.RdbRequest) } void RdbRequest::SharedCtor() { @@ -3408,7 +3408,7 @@ void RdbRequest::SharedCtor() { } RdbRequest::~RdbRequest() { - // @@protoc_insertion_point(destructor:kbd_idlfile.RdbRequest) + // @@protoc_insertion_point(destructor:iot_idl.RdbRequest) SharedDtor(); } @@ -3462,19 +3462,19 @@ void RdbRequest::Clear() { } } if (has_msgquery()) { - if (msgquery_ != NULL) msgquery_->::kbd_idlfile::RdbQuery::Clear(); + if (msgquery_ != NULL) msgquery_->::iot_idl::RdbQuery::Clear(); } if (has_msginsert()) { - if (msginsert_ != NULL) msginsert_->::kbd_idlfile::RdbInsert::Clear(); + if (msginsert_ != NULL) msginsert_->::iot_idl::RdbInsert::Clear(); } if (has_msgremove()) { - if (msgremove_ != NULL) msgremove_->::kbd_idlfile::RdbRemove::Clear(); + if (msgremove_ != NULL) msgremove_->::iot_idl::RdbRemove::Clear(); } if (has_msgupdate()) { - if (msgupdate_ != NULL) msgupdate_->::kbd_idlfile::RdbUpdate::Clear(); + if (msgupdate_ != NULL) msgupdate_->::iot_idl::RdbUpdate::Clear(); } if (has_msglock()) { - if (msglock_ != NULL) msglock_->::kbd_idlfile::RdbLockTable::Clear(); + if (msglock_ != NULL) msglock_->::iot_idl::RdbLockTable::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -3485,7 +3485,7 @@ bool RdbRequest::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.RdbRequest) + // @@protoc_insertion_point(parse_start:iot_idl.RdbRequest) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -3524,7 +3524,7 @@ bool RdbRequest::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.RdbQuery msgQuery = 4; + // optional .iot_idl.RdbQuery msgQuery = 4; case 4: { if (tag == 34) { parse_msgQuery: @@ -3537,7 +3537,7 @@ bool RdbRequest::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.RdbInsert msgInsert = 5; + // optional .iot_idl.RdbInsert msgInsert = 5; case 5: { if (tag == 42) { parse_msgInsert: @@ -3550,7 +3550,7 @@ bool RdbRequest::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.RdbRemove msgRemove = 6; + // optional .iot_idl.RdbRemove msgRemove = 6; case 6: { if (tag == 50) { parse_msgRemove: @@ -3563,7 +3563,7 @@ bool RdbRequest::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.RdbUpdate msgUpdate = 7; + // optional .iot_idl.RdbUpdate msgUpdate = 7; case 7: { if (tag == 58) { parse_msgUpdate: @@ -3576,7 +3576,7 @@ bool RdbRequest::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.RdbLockTable msgLock = 8; + // optional .iot_idl.RdbLockTable msgLock = 8; case 8: { if (tag == 66) { parse_msgLock: @@ -3603,17 +3603,17 @@ bool RdbRequest::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.RdbRequest) + // @@protoc_insertion_point(parse_success:iot_idl.RdbRequest) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.RdbRequest) + // @@protoc_insertion_point(parse_failure:iot_idl.RdbRequest) return false; #undef DO_ } void RdbRequest::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.RdbRequest) + // @@protoc_insertion_point(serialize_start:iot_idl.RdbRequest) // required string strSessionID = 1; if (has_strsessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -3634,31 +3634,31 @@ void RdbRequest::SerializeWithCachedSizes( 2, this->strpackageid(), output); } - // optional .kbd_idlfile.RdbQuery msgQuery = 4; + // optional .iot_idl.RdbQuery msgQuery = 4; if (has_msgquery()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->msgquery(), output); } - // optional .kbd_idlfile.RdbInsert msgInsert = 5; + // optional .iot_idl.RdbInsert msgInsert = 5; if (has_msginsert()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 5, this->msginsert(), output); } - // optional .kbd_idlfile.RdbRemove msgRemove = 6; + // optional .iot_idl.RdbRemove msgRemove = 6; if (has_msgremove()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 6, this->msgremove(), output); } - // optional .kbd_idlfile.RdbUpdate msgUpdate = 7; + // optional .iot_idl.RdbUpdate msgUpdate = 7; if (has_msgupdate()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 7, this->msgupdate(), output); } - // optional .kbd_idlfile.RdbLockTable msgLock = 8; + // optional .iot_idl.RdbLockTable msgLock = 8; if (has_msglock()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 8, this->msglock(), output); @@ -3668,12 +3668,12 @@ void RdbRequest::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.RdbRequest) + // @@protoc_insertion_point(serialize_end:iot_idl.RdbRequest) } ::google::protobuf::uint8* RdbRequest::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.RdbRequest) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.RdbRequest) // required string strSessionID = 1; if (has_strsessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -3696,35 +3696,35 @@ void RdbRequest::SerializeWithCachedSizes( 2, this->strpackageid(), target); } - // optional .kbd_idlfile.RdbQuery msgQuery = 4; + // optional .iot_idl.RdbQuery msgQuery = 4; if (has_msgquery()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 4, this->msgquery(), target); } - // optional .kbd_idlfile.RdbInsert msgInsert = 5; + // optional .iot_idl.RdbInsert msgInsert = 5; if (has_msginsert()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 5, this->msginsert(), target); } - // optional .kbd_idlfile.RdbRemove msgRemove = 6; + // optional .iot_idl.RdbRemove msgRemove = 6; if (has_msgremove()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 6, this->msgremove(), target); } - // optional .kbd_idlfile.RdbUpdate msgUpdate = 7; + // optional .iot_idl.RdbUpdate msgUpdate = 7; if (has_msgupdate()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 7, this->msgupdate(), target); } - // optional .kbd_idlfile.RdbLockTable msgLock = 8; + // optional .iot_idl.RdbLockTable msgLock = 8; if (has_msglock()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -3735,7 +3735,7 @@ void RdbRequest::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.RdbRequest) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.RdbRequest) return target; } @@ -3757,35 +3757,35 @@ int RdbRequest::ByteSize() const { this->strpackageid()); } - // optional .kbd_idlfile.RdbQuery msgQuery = 4; + // optional .iot_idl.RdbQuery msgQuery = 4; if (has_msgquery()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->msgquery()); } - // optional .kbd_idlfile.RdbInsert msgInsert = 5; + // optional .iot_idl.RdbInsert msgInsert = 5; if (has_msginsert()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->msginsert()); } - // optional .kbd_idlfile.RdbRemove msgRemove = 6; + // optional .iot_idl.RdbRemove msgRemove = 6; if (has_msgremove()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->msgremove()); } - // optional .kbd_idlfile.RdbUpdate msgUpdate = 7; + // optional .iot_idl.RdbUpdate msgUpdate = 7; if (has_msgupdate()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->msgupdate()); } - // optional .kbd_idlfile.RdbLockTable msgLock = 8; + // optional .iot_idl.RdbLockTable msgLock = 8; if (has_msglock()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -3826,19 +3826,19 @@ void RdbRequest::MergeFrom(const RdbRequest& from) { set_strpackageid(from.strpackageid()); } if (from.has_msgquery()) { - mutable_msgquery()->::kbd_idlfile::RdbQuery::MergeFrom(from.msgquery()); + mutable_msgquery()->::iot_idl::RdbQuery::MergeFrom(from.msgquery()); } if (from.has_msginsert()) { - mutable_msginsert()->::kbd_idlfile::RdbInsert::MergeFrom(from.msginsert()); + mutable_msginsert()->::iot_idl::RdbInsert::MergeFrom(from.msginsert()); } if (from.has_msgremove()) { - mutable_msgremove()->::kbd_idlfile::RdbRemove::MergeFrom(from.msgremove()); + mutable_msgremove()->::iot_idl::RdbRemove::MergeFrom(from.msgremove()); } if (from.has_msgupdate()) { - mutable_msgupdate()->::kbd_idlfile::RdbUpdate::MergeFrom(from.msgupdate()); + mutable_msgupdate()->::iot_idl::RdbUpdate::MergeFrom(from.msgupdate()); } if (from.has_msglock()) { - mutable_msglock()->::kbd_idlfile::RdbLockTable::MergeFrom(from.msglock()); + mutable_msglock()->::iot_idl::RdbLockTable::MergeFrom(from.msglock()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -3912,18 +3912,18 @@ const int RdbReply::kRetFieldNumber; RdbReply::RdbReply() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.RdbReply) + // @@protoc_insertion_point(constructor:iot_idl.RdbReply) } void RdbReply::InitAsDefaultInstance() { - ret_ = const_cast< ::kbd_idlfile::RdbRet*>(&::kbd_idlfile::RdbRet::default_instance()); + ret_ = const_cast< ::iot_idl::RdbRet*>(&::iot_idl::RdbRet::default_instance()); } RdbReply::RdbReply(const RdbReply& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.RdbReply) + // @@protoc_insertion_point(copy_constructor:iot_idl.RdbReply) } void RdbReply::SharedCtor() { @@ -3936,7 +3936,7 @@ void RdbReply::SharedCtor() { } RdbReply::~RdbReply() { - // @@protoc_insertion_point(destructor:kbd_idlfile.RdbReply) + // @@protoc_insertion_point(destructor:iot_idl.RdbReply) SharedDtor(); } @@ -3986,7 +3986,7 @@ void RdbReply::Clear() { } } if (has_ret()) { - if (ret_ != NULL) ret_->::kbd_idlfile::RdbRet::Clear(); + if (ret_ != NULL) ret_->::iot_idl::RdbRet::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -3997,7 +3997,7 @@ bool RdbReply::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.RdbReply) + // @@protoc_insertion_point(parse_start:iot_idl.RdbReply) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -4019,7 +4019,7 @@ bool RdbReply::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.RdbRet ret = 2; + // required .iot_idl.RdbRet ret = 2; case 2: { if (tag == 18) { parse_ret: @@ -4063,17 +4063,17 @@ bool RdbReply::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.RdbReply) + // @@protoc_insertion_point(parse_success:iot_idl.RdbReply) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.RdbReply) + // @@protoc_insertion_point(parse_failure:iot_idl.RdbReply) return false; #undef DO_ } void RdbReply::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.RdbReply) + // @@protoc_insertion_point(serialize_start:iot_idl.RdbReply) // required string strSessionID = 1; if (has_strsessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4084,7 +4084,7 @@ void RdbReply::SerializeWithCachedSizes( 1, this->strsessionid(), output); } - // required .kbd_idlfile.RdbRet ret = 2; + // required .iot_idl.RdbRet ret = 2; if (has_ret()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->ret(), output); @@ -4104,12 +4104,12 @@ void RdbReply::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.RdbReply) + // @@protoc_insertion_point(serialize_end:iot_idl.RdbReply) } ::google::protobuf::uint8* RdbReply::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.RdbReply) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.RdbReply) // required string strSessionID = 1; if (has_strsessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4121,7 +4121,7 @@ void RdbReply::SerializeWithCachedSizes( 1, this->strsessionid(), target); } - // required .kbd_idlfile.RdbRet ret = 2; + // required .iot_idl.RdbRet ret = 2; if (has_ret()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -4143,7 +4143,7 @@ void RdbReply::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.RdbReply) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.RdbReply) return target; } @@ -4165,7 +4165,7 @@ int RdbReply::ByteSize() const { this->strpackageid()); } - // required .kbd_idlfile.RdbRet ret = 2; + // required .iot_idl.RdbRet ret = 2; if (has_ret()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -4206,7 +4206,7 @@ void RdbReply::MergeFrom(const RdbReply& from) { set_strpackageid(from.strpackageid()); } if (from.has_ret()) { - mutable_ret()->::kbd_idlfile::RdbRet::MergeFrom(from.ret()); + mutable_ret()->::iot_idl::RdbRet::MergeFrom(from.ret()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -4264,7 +4264,7 @@ const int RdbReplace::kMsgUpdateFieldNumber; RdbReplace::RdbReplace() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.RdbReplace) + // @@protoc_insertion_point(constructor:iot_idl.RdbReplace) } void RdbReplace::InitAsDefaultInstance() { @@ -4274,7 +4274,7 @@ RdbReplace::RdbReplace(const RdbReplace& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.RdbReplace) + // @@protoc_insertion_point(copy_constructor:iot_idl.RdbReplace) } void RdbReplace::SharedCtor() { @@ -4286,7 +4286,7 @@ void RdbReplace::SharedCtor() { } RdbReplace::~RdbReplace() { - // @@protoc_insertion_point(destructor:kbd_idlfile.RdbReplace) + // @@protoc_insertion_point(destructor:iot_idl.RdbReplace) SharedDtor(); } @@ -4344,7 +4344,7 @@ bool RdbReplace::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.RdbReplace) + // @@protoc_insertion_point(parse_start:iot_idl.RdbReplace) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -4383,7 +4383,7 @@ bool RdbReplace::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.RdbSynUpdate msgUpdate = 3; + // repeated .iot_idl.RdbSynUpdate msgUpdate = 3; case 3: { if (tag == 26) { parse_msgUpdate: @@ -4411,17 +4411,17 @@ bool RdbReplace::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.RdbReplace) + // @@protoc_insertion_point(parse_success:iot_idl.RdbReplace) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.RdbReplace) + // @@protoc_insertion_point(parse_failure:iot_idl.RdbReplace) return false; #undef DO_ } void RdbReplace::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.RdbReplace) + // @@protoc_insertion_point(serialize_start:iot_idl.RdbReplace) // required string strSessionID = 1; if (has_strsessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4442,7 +4442,7 @@ void RdbReplace::SerializeWithCachedSizes( 2, this->strtablename(), output); } - // repeated .kbd_idlfile.RdbSynUpdate msgUpdate = 3; + // repeated .iot_idl.RdbSynUpdate msgUpdate = 3; for (int i = 0; i < this->msgupdate_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->msgupdate(i), output); @@ -4452,12 +4452,12 @@ void RdbReplace::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.RdbReplace) + // @@protoc_insertion_point(serialize_end:iot_idl.RdbReplace) } ::google::protobuf::uint8* RdbReplace::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.RdbReplace) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.RdbReplace) // required string strSessionID = 1; if (has_strsessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4480,7 +4480,7 @@ void RdbReplace::SerializeWithCachedSizes( 2, this->strtablename(), target); } - // repeated .kbd_idlfile.RdbSynUpdate msgUpdate = 3; + // repeated .iot_idl.RdbSynUpdate msgUpdate = 3; for (int i = 0; i < this->msgupdate_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -4491,7 +4491,7 @@ void RdbReplace::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.RdbReplace) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.RdbReplace) return target; } @@ -4514,7 +4514,7 @@ int RdbReplace::ByteSize() const { } } - // repeated .kbd_idlfile.RdbSynUpdate msgUpdate = 3; + // repeated .iot_idl.RdbSynUpdate msgUpdate = 3; total_size += 1 * this->msgupdate_size(); for (int i = 0; i < this->msgupdate_size(); i++) { total_size += @@ -4609,7 +4609,7 @@ const int RdbSynUpdate::kStrKeysFieldNumber; RdbSynUpdate::RdbSynUpdate() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.RdbSynUpdate) + // @@protoc_insertion_point(constructor:iot_idl.RdbSynUpdate) } void RdbSynUpdate::InitAsDefaultInstance() { @@ -4619,7 +4619,7 @@ RdbSynUpdate::RdbSynUpdate(const RdbSynUpdate& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.RdbSynUpdate) + // @@protoc_insertion_point(copy_constructor:iot_idl.RdbSynUpdate) } void RdbSynUpdate::SharedCtor() { @@ -4630,7 +4630,7 @@ void RdbSynUpdate::SharedCtor() { } RdbSynUpdate::~RdbSynUpdate() { - // @@protoc_insertion_point(destructor:kbd_idlfile.RdbSynUpdate) + // @@protoc_insertion_point(destructor:iot_idl.RdbSynUpdate) SharedDtor(); } @@ -4679,13 +4679,13 @@ bool RdbSynUpdate::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.RdbSynUpdate) + // @@protoc_insertion_point(parse_start:iot_idl.RdbSynUpdate) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated .kbd_idlfile.RdbCondition msgCondition = 1; + // repeated .iot_idl.RdbCondition msgCondition = 1; case 1: { if (tag == 10) { parse_msgCondition: @@ -4699,7 +4699,7 @@ bool RdbSynUpdate::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.RdbUpdateValue msgUpdateValue = 2; + // repeated .iot_idl.RdbUpdateValue msgUpdateValue = 2; case 2: { if (tag == 18) { parse_msgUpdateValue: @@ -4744,24 +4744,24 @@ bool RdbSynUpdate::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.RdbSynUpdate) + // @@protoc_insertion_point(parse_success:iot_idl.RdbSynUpdate) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.RdbSynUpdate) + // @@protoc_insertion_point(parse_failure:iot_idl.RdbSynUpdate) return false; #undef DO_ } void RdbSynUpdate::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.RdbSynUpdate) - // repeated .kbd_idlfile.RdbCondition msgCondition = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.RdbSynUpdate) + // repeated .iot_idl.RdbCondition msgCondition = 1; for (int i = 0; i < this->msgcondition_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->msgcondition(i), output); } - // repeated .kbd_idlfile.RdbUpdateValue msgUpdateValue = 2; + // repeated .iot_idl.RdbUpdateValue msgUpdateValue = 2; for (int i = 0; i < this->msgupdatevalue_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->msgupdatevalue(i), output); @@ -4781,20 +4781,20 @@ void RdbSynUpdate::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.RdbSynUpdate) + // @@protoc_insertion_point(serialize_end:iot_idl.RdbSynUpdate) } ::google::protobuf::uint8* RdbSynUpdate::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.RdbSynUpdate) - // repeated .kbd_idlfile.RdbCondition msgCondition = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.RdbSynUpdate) + // repeated .iot_idl.RdbCondition msgCondition = 1; for (int i = 0; i < this->msgcondition_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->msgcondition(i), target); } - // repeated .kbd_idlfile.RdbUpdateValue msgUpdateValue = 2; + // repeated .iot_idl.RdbUpdateValue msgUpdateValue = 2; for (int i = 0; i < this->msgupdatevalue_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -4816,7 +4816,7 @@ void RdbSynUpdate::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.RdbSynUpdate) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.RdbSynUpdate) return target; } @@ -4832,7 +4832,7 @@ int RdbSynUpdate::ByteSize() const { } } - // repeated .kbd_idlfile.RdbCondition msgCondition = 1; + // repeated .iot_idl.RdbCondition msgCondition = 1; total_size += 1 * this->msgcondition_size(); for (int i = 0; i < this->msgcondition_size(); i++) { total_size += @@ -4840,7 +4840,7 @@ int RdbSynUpdate::ByteSize() const { this->msgcondition(i)); } - // repeated .kbd_idlfile.RdbUpdateValue msgUpdateValue = 2; + // repeated .iot_idl.RdbUpdateValue msgUpdateValue = 2; total_size += 1 * this->msgupdatevalue_size(); for (int i = 0; i < this->msgupdatevalue_size(); i++) { total_size += @@ -4924,6 +4924,6 @@ void RdbSynUpdate::Swap(RdbSynUpdate* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/platform/src/idl_files/RdbServerMessage.pb.h b/platform/src/idl_files/RdbServerMessage.pb.h index d5f8b56e..f631a983 100644 --- a/platform/src/idl_files/RdbServerMessage.pb.h +++ b/platform/src/idl_files/RdbServerMessage.pb.h @@ -28,7 +28,7 @@ #include "Public.pb.h" // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { // Internal implementation detail -- do not call these. void IDL_FILES_EXPORT protobuf_AddDesc_RdbServerMessage_2eproto(); @@ -128,19 +128,19 @@ class IDL_FILES_EXPORT RdbCondition : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // optional .kbd_idlfile.ENConditionLogic enLogic = 1; + // optional .iot_idl.ENConditionLogic enLogic = 1; inline bool has_enlogic() const; inline void clear_enlogic(); static const int kEnLogicFieldNumber = 1; - inline ::kbd_idlfile::ENConditionLogic enlogic() const; - inline void set_enlogic(::kbd_idlfile::ENConditionLogic value); + inline ::iot_idl::ENConditionLogic enlogic() const; + inline void set_enlogic(::iot_idl::ENConditionLogic value); - // required .kbd_idlfile.ENConditionRelation enRelation = 2; + // required .iot_idl.ENConditionRelation enRelation = 2; inline bool has_enrelation() const; inline void clear_enrelation(); static const int kEnRelationFieldNumber = 2; - inline ::kbd_idlfile::ENConditionRelation enrelation() const; - inline void set_enrelation(::kbd_idlfile::ENConditionRelation value); + inline ::iot_idl::ENConditionRelation enrelation() const; + inline void set_enrelation(::iot_idl::ENConditionRelation value); // required string strColumnName = 3; inline bool has_strcolumnname() const; @@ -154,16 +154,16 @@ class IDL_FILES_EXPORT RdbCondition : public ::google::protobuf::Message { inline ::std::string* release_strcolumnname(); inline void set_allocated_strcolumnname(::std::string* strcolumnname); - // required .kbd_idlfile.SVariable msgValue = 5; + // required .iot_idl.SVariable msgValue = 5; inline bool has_msgvalue() const; inline void clear_msgvalue(); static const int kMsgValueFieldNumber = 5; - inline const ::kbd_idlfile::SVariable& msgvalue() const; - inline ::kbd_idlfile::SVariable* mutable_msgvalue(); - inline ::kbd_idlfile::SVariable* release_msgvalue(); - inline void set_allocated_msgvalue(::kbd_idlfile::SVariable* msgvalue); + inline const ::iot_idl::SVariable& msgvalue() const; + inline ::iot_idl::SVariable* mutable_msgvalue(); + inline ::iot_idl::SVariable* release_msgvalue(); + inline void set_allocated_msgvalue(::iot_idl::SVariable* msgvalue); - // @@protoc_insertion_point(class_scope:kbd_idlfile.RdbCondition) + // @@protoc_insertion_point(class_scope:iot_idl.RdbCondition) private: inline void set_has_enlogic(); inline void clear_has_enlogic(); @@ -181,7 +181,7 @@ class IDL_FILES_EXPORT RdbCondition : public ::google::protobuf::Message { int enlogic_; int enrelation_; ::std::string* strcolumnname_; - ::kbd_idlfile::SVariable* msgvalue_; + ::iot_idl::SVariable* msgvalue_; friend void IDL_FILES_EXPORT protobuf_AddDesc_RdbServerMessage_2eproto(); friend void protobuf_AssignDesc_RdbServerMessage_2eproto(); friend void protobuf_ShutdownFile_RdbServerMessage_2eproto(); @@ -244,26 +244,26 @@ class IDL_FILES_EXPORT RdbRecord : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // repeated .kbd_idlfile.SVariable msgValueArray = 1; + // repeated .iot_idl.SVariable msgValueArray = 1; inline int msgvaluearray_size() const; inline void clear_msgvaluearray(); static const int kMsgValueArrayFieldNumber = 1; - inline const ::kbd_idlfile::SVariable& msgvaluearray(int index) const; - inline ::kbd_idlfile::SVariable* mutable_msgvaluearray(int index); - inline ::kbd_idlfile::SVariable* add_msgvaluearray(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVariable >& + inline const ::iot_idl::SVariable& msgvaluearray(int index) const; + inline ::iot_idl::SVariable* mutable_msgvaluearray(int index); + inline ::iot_idl::SVariable* add_msgvaluearray(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SVariable >& msgvaluearray() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVariable >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SVariable >* mutable_msgvaluearray(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.RdbRecord) + // @@protoc_insertion_point(class_scope:iot_idl.RdbRecord) private: ::google::protobuf::UnknownFieldSet _unknown_fields_; ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVariable > msgvaluearray_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SVariable > msgvaluearray_; friend void IDL_FILES_EXPORT protobuf_AddDesc_RdbServerMessage_2eproto(); friend void protobuf_AssignDesc_RdbServerMessage_2eproto(); friend void protobuf_ShutdownFile_RdbServerMessage_2eproto(); @@ -338,16 +338,16 @@ class IDL_FILES_EXPORT RdbUpdateValue : public ::google::protobuf::Message { inline ::std::string* release_strcolumnname(); inline void set_allocated_strcolumnname(::std::string* strcolumnname); - // required .kbd_idlfile.SVariable msgValue = 2; + // required .iot_idl.SVariable msgValue = 2; inline bool has_msgvalue() const; inline void clear_msgvalue(); static const int kMsgValueFieldNumber = 2; - inline const ::kbd_idlfile::SVariable& msgvalue() const; - inline ::kbd_idlfile::SVariable* mutable_msgvalue(); - inline ::kbd_idlfile::SVariable* release_msgvalue(); - inline void set_allocated_msgvalue(::kbd_idlfile::SVariable* msgvalue); + inline const ::iot_idl::SVariable& msgvalue() const; + inline ::iot_idl::SVariable* mutable_msgvalue(); + inline ::iot_idl::SVariable* release_msgvalue(); + inline void set_allocated_msgvalue(::iot_idl::SVariable* msgvalue); - // @@protoc_insertion_point(class_scope:kbd_idlfile.RdbUpdateValue) + // @@protoc_insertion_point(class_scope:iot_idl.RdbUpdateValue) private: inline void set_has_strcolumnname(); inline void clear_has_strcolumnname(); @@ -359,7 +359,7 @@ class IDL_FILES_EXPORT RdbUpdateValue : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::std::string* strcolumnname_; - ::kbd_idlfile::SVariable* msgvalue_; + ::iot_idl::SVariable* msgvalue_; friend void IDL_FILES_EXPORT protobuf_AddDesc_RdbServerMessage_2eproto(); friend void protobuf_AssignDesc_RdbServerMessage_2eproto(); friend void protobuf_ShutdownFile_RdbServerMessage_2eproto(); @@ -466,16 +466,16 @@ class IDL_FILES_EXPORT RdbQuery : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& strordercolnamearr() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_strordercolnamearr(); - // repeated .kbd_idlfile.RdbCondition msgCondition = 4; + // repeated .iot_idl.RdbCondition msgCondition = 4; inline int msgcondition_size() const; inline void clear_msgcondition(); static const int kMsgConditionFieldNumber = 4; - inline const ::kbd_idlfile::RdbCondition& msgcondition(int index) const; - inline ::kbd_idlfile::RdbCondition* mutable_msgcondition(int index); - inline ::kbd_idlfile::RdbCondition* add_msgcondition(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition >& + inline const ::iot_idl::RdbCondition& msgcondition(int index) const; + inline ::iot_idl::RdbCondition* mutable_msgcondition(int index); + inline ::iot_idl::RdbCondition* add_msgcondition(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition >& msgcondition() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition >* mutable_msgcondition(); // optional int32 nAsc = 5 [default = 1]; @@ -485,7 +485,7 @@ class IDL_FILES_EXPORT RdbQuery : public ::google::protobuf::Message { inline ::google::protobuf::int32 nasc() const; inline void set_nasc(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.RdbQuery) + // @@protoc_insertion_point(class_scope:iot_idl.RdbQuery) private: inline void set_has_strtablename(); inline void clear_has_strtablename(); @@ -499,7 +499,7 @@ class IDL_FILES_EXPORT RdbQuery : public ::google::protobuf::Message { ::std::string* strtablename_; ::google::protobuf::RepeatedPtrField< ::std::string> strselectcolnamearr_; ::google::protobuf::RepeatedPtrField< ::std::string> strordercolnamearr_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition > msgcondition_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition > msgcondition_; ::google::protobuf::int32 nasc_; friend void IDL_FILES_EXPORT protobuf_AddDesc_RdbServerMessage_2eproto(); friend void protobuf_AssignDesc_RdbServerMessage_2eproto(); @@ -591,19 +591,19 @@ class IDL_FILES_EXPORT RdbInsert : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& strcolumnname() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_strcolumnname(); - // repeated .kbd_idlfile.RdbRecord msgData = 3; + // repeated .iot_idl.RdbRecord msgData = 3; inline int msgdata_size() const; inline void clear_msgdata(); static const int kMsgDataFieldNumber = 3; - inline const ::kbd_idlfile::RdbRecord& msgdata(int index) const; - inline ::kbd_idlfile::RdbRecord* mutable_msgdata(int index); - inline ::kbd_idlfile::RdbRecord* add_msgdata(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbRecord >& + inline const ::iot_idl::RdbRecord& msgdata(int index) const; + inline ::iot_idl::RdbRecord* mutable_msgdata(int index); + inline ::iot_idl::RdbRecord* add_msgdata(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbRecord >& msgdata() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbRecord >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbRecord >* mutable_msgdata(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.RdbInsert) + // @@protoc_insertion_point(class_scope:iot_idl.RdbInsert) private: inline void set_has_strtablename(); inline void clear_has_strtablename(); @@ -614,7 +614,7 @@ class IDL_FILES_EXPORT RdbInsert : public ::google::protobuf::Message { mutable int _cached_size_; ::std::string* strtablename_; ::google::protobuf::RepeatedPtrField< ::std::string> strcolumnname_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbRecord > msgdata_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbRecord > msgdata_; friend void IDL_FILES_EXPORT protobuf_AddDesc_RdbServerMessage_2eproto(); friend void protobuf_AssignDesc_RdbServerMessage_2eproto(); friend void protobuf_ShutdownFile_RdbServerMessage_2eproto(); @@ -689,19 +689,19 @@ class IDL_FILES_EXPORT RdbRemove : public ::google::protobuf::Message { inline ::std::string* release_strtablename(); inline void set_allocated_strtablename(::std::string* strtablename); - // repeated .kbd_idlfile.RdbCondition msgCondtionArray = 2; + // repeated .iot_idl.RdbCondition msgCondtionArray = 2; inline int msgcondtionarray_size() const; inline void clear_msgcondtionarray(); static const int kMsgCondtionArrayFieldNumber = 2; - inline const ::kbd_idlfile::RdbCondition& msgcondtionarray(int index) const; - inline ::kbd_idlfile::RdbCondition* mutable_msgcondtionarray(int index); - inline ::kbd_idlfile::RdbCondition* add_msgcondtionarray(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition >& + inline const ::iot_idl::RdbCondition& msgcondtionarray(int index) const; + inline ::iot_idl::RdbCondition* mutable_msgcondtionarray(int index); + inline ::iot_idl::RdbCondition* add_msgcondtionarray(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition >& msgcondtionarray() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition >* mutable_msgcondtionarray(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.RdbRemove) + // @@protoc_insertion_point(class_scope:iot_idl.RdbRemove) private: inline void set_has_strtablename(); inline void clear_has_strtablename(); @@ -711,7 +711,7 @@ class IDL_FILES_EXPORT RdbRemove : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::std::string* strtablename_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition > msgcondtionarray_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition > msgcondtionarray_; friend void IDL_FILES_EXPORT protobuf_AddDesc_RdbServerMessage_2eproto(); friend void protobuf_AssignDesc_RdbServerMessage_2eproto(); friend void protobuf_ShutdownFile_RdbServerMessage_2eproto(); @@ -786,31 +786,31 @@ class IDL_FILES_EXPORT RdbUpdate : public ::google::protobuf::Message { inline ::std::string* release_strtablename(); inline void set_allocated_strtablename(::std::string* strtablename); - // repeated .kbd_idlfile.RdbCondition msgCondition = 2; + // repeated .iot_idl.RdbCondition msgCondition = 2; inline int msgcondition_size() const; inline void clear_msgcondition(); static const int kMsgConditionFieldNumber = 2; - inline const ::kbd_idlfile::RdbCondition& msgcondition(int index) const; - inline ::kbd_idlfile::RdbCondition* mutable_msgcondition(int index); - inline ::kbd_idlfile::RdbCondition* add_msgcondition(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition >& + inline const ::iot_idl::RdbCondition& msgcondition(int index) const; + inline ::iot_idl::RdbCondition* mutable_msgcondition(int index); + inline ::iot_idl::RdbCondition* add_msgcondition(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition >& msgcondition() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition >* mutable_msgcondition(); - // repeated .kbd_idlfile.RdbUpdateValue msgUpdateValue = 3; + // repeated .iot_idl.RdbUpdateValue msgUpdateValue = 3; inline int msgupdatevalue_size() const; inline void clear_msgupdatevalue(); static const int kMsgUpdateValueFieldNumber = 3; - inline const ::kbd_idlfile::RdbUpdateValue& msgupdatevalue(int index) const; - inline ::kbd_idlfile::RdbUpdateValue* mutable_msgupdatevalue(int index); - inline ::kbd_idlfile::RdbUpdateValue* add_msgupdatevalue(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbUpdateValue >& + inline const ::iot_idl::RdbUpdateValue& msgupdatevalue(int index) const; + inline ::iot_idl::RdbUpdateValue* mutable_msgupdatevalue(int index); + inline ::iot_idl::RdbUpdateValue* add_msgupdatevalue(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbUpdateValue >& msgupdatevalue() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbUpdateValue >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbUpdateValue >* mutable_msgupdatevalue(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.RdbUpdate) + // @@protoc_insertion_point(class_scope:iot_idl.RdbUpdate) private: inline void set_has_strtablename(); inline void clear_has_strtablename(); @@ -820,8 +820,8 @@ class IDL_FILES_EXPORT RdbUpdate : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::std::string* strtablename_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition > msgcondition_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbUpdateValue > msgupdatevalue_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition > msgcondition_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbUpdateValue > msgupdatevalue_; friend void IDL_FILES_EXPORT protobuf_AddDesc_RdbServerMessage_2eproto(); friend void protobuf_AssignDesc_RdbServerMessage_2eproto(); friend void protobuf_ShutdownFile_RdbServerMessage_2eproto(); @@ -903,7 +903,7 @@ class IDL_FILES_EXPORT RdbLockTable : public ::google::protobuf::Message { inline bool block() const; inline void set_block(bool value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.RdbLockTable) + // @@protoc_insertion_point(class_scope:iot_idl.RdbLockTable) private: inline void set_has_strtablename(); inline void clear_has_strtablename(); @@ -985,16 +985,16 @@ class IDL_FILES_EXPORT RdbRet : public ::google::protobuf::Message { inline ::google::protobuf::int32 ret() const; inline void set_ret(::google::protobuf::int32 value); - // repeated .kbd_idlfile.RdbRecord msgRecord = 3; + // repeated .iot_idl.RdbRecord msgRecord = 3; inline int msgrecord_size() const; inline void clear_msgrecord(); static const int kMsgRecordFieldNumber = 3; - inline const ::kbd_idlfile::RdbRecord& msgrecord(int index) const; - inline ::kbd_idlfile::RdbRecord* mutable_msgrecord(int index); - inline ::kbd_idlfile::RdbRecord* add_msgrecord(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbRecord >& + inline const ::iot_idl::RdbRecord& msgrecord(int index) const; + inline ::iot_idl::RdbRecord* mutable_msgrecord(int index); + inline ::iot_idl::RdbRecord* add_msgrecord(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbRecord >& msgrecord() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbRecord >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbRecord >* mutable_msgrecord(); // optional string strErr = 4; @@ -1009,7 +1009,7 @@ class IDL_FILES_EXPORT RdbRet : public ::google::protobuf::Message { inline ::std::string* release_strerr(); inline void set_allocated_strerr(::std::string* strerr); - // @@protoc_insertion_point(class_scope:kbd_idlfile.RdbRet) + // @@protoc_insertion_point(class_scope:iot_idl.RdbRet) private: inline void set_has_ret(); inline void clear_has_ret(); @@ -1020,7 +1020,7 @@ class IDL_FILES_EXPORT RdbRet : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbRecord > msgrecord_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbRecord > msgrecord_; ::std::string* strerr_; ::google::protobuf::int32 ret_; friend void IDL_FILES_EXPORT protobuf_AddDesc_RdbServerMessage_2eproto(); @@ -1109,52 +1109,52 @@ class IDL_FILES_EXPORT RdbRequest : public ::google::protobuf::Message { inline ::std::string* release_strpackageid(); inline void set_allocated_strpackageid(::std::string* strpackageid); - // optional .kbd_idlfile.RdbQuery msgQuery = 4; + // optional .iot_idl.RdbQuery msgQuery = 4; inline bool has_msgquery() const; inline void clear_msgquery(); static const int kMsgQueryFieldNumber = 4; - inline const ::kbd_idlfile::RdbQuery& msgquery() const; - inline ::kbd_idlfile::RdbQuery* mutable_msgquery(); - inline ::kbd_idlfile::RdbQuery* release_msgquery(); - inline void set_allocated_msgquery(::kbd_idlfile::RdbQuery* msgquery); + inline const ::iot_idl::RdbQuery& msgquery() const; + inline ::iot_idl::RdbQuery* mutable_msgquery(); + inline ::iot_idl::RdbQuery* release_msgquery(); + inline void set_allocated_msgquery(::iot_idl::RdbQuery* msgquery); - // optional .kbd_idlfile.RdbInsert msgInsert = 5; + // optional .iot_idl.RdbInsert msgInsert = 5; inline bool has_msginsert() const; inline void clear_msginsert(); static const int kMsgInsertFieldNumber = 5; - inline const ::kbd_idlfile::RdbInsert& msginsert() const; - inline ::kbd_idlfile::RdbInsert* mutable_msginsert(); - inline ::kbd_idlfile::RdbInsert* release_msginsert(); - inline void set_allocated_msginsert(::kbd_idlfile::RdbInsert* msginsert); + inline const ::iot_idl::RdbInsert& msginsert() const; + inline ::iot_idl::RdbInsert* mutable_msginsert(); + inline ::iot_idl::RdbInsert* release_msginsert(); + inline void set_allocated_msginsert(::iot_idl::RdbInsert* msginsert); - // optional .kbd_idlfile.RdbRemove msgRemove = 6; + // optional .iot_idl.RdbRemove msgRemove = 6; inline bool has_msgremove() const; inline void clear_msgremove(); static const int kMsgRemoveFieldNumber = 6; - inline const ::kbd_idlfile::RdbRemove& msgremove() const; - inline ::kbd_idlfile::RdbRemove* mutable_msgremove(); - inline ::kbd_idlfile::RdbRemove* release_msgremove(); - inline void set_allocated_msgremove(::kbd_idlfile::RdbRemove* msgremove); + inline const ::iot_idl::RdbRemove& msgremove() const; + inline ::iot_idl::RdbRemove* mutable_msgremove(); + inline ::iot_idl::RdbRemove* release_msgremove(); + inline void set_allocated_msgremove(::iot_idl::RdbRemove* msgremove); - // optional .kbd_idlfile.RdbUpdate msgUpdate = 7; + // optional .iot_idl.RdbUpdate msgUpdate = 7; inline bool has_msgupdate() const; inline void clear_msgupdate(); static const int kMsgUpdateFieldNumber = 7; - inline const ::kbd_idlfile::RdbUpdate& msgupdate() const; - inline ::kbd_idlfile::RdbUpdate* mutable_msgupdate(); - inline ::kbd_idlfile::RdbUpdate* release_msgupdate(); - inline void set_allocated_msgupdate(::kbd_idlfile::RdbUpdate* msgupdate); + inline const ::iot_idl::RdbUpdate& msgupdate() const; + inline ::iot_idl::RdbUpdate* mutable_msgupdate(); + inline ::iot_idl::RdbUpdate* release_msgupdate(); + inline void set_allocated_msgupdate(::iot_idl::RdbUpdate* msgupdate); - // optional .kbd_idlfile.RdbLockTable msgLock = 8; + // optional .iot_idl.RdbLockTable msgLock = 8; inline bool has_msglock() const; inline void clear_msglock(); static const int kMsgLockFieldNumber = 8; - inline const ::kbd_idlfile::RdbLockTable& msglock() const; - inline ::kbd_idlfile::RdbLockTable* mutable_msglock(); - inline ::kbd_idlfile::RdbLockTable* release_msglock(); - inline void set_allocated_msglock(::kbd_idlfile::RdbLockTable* msglock); + inline const ::iot_idl::RdbLockTable& msglock() const; + inline ::iot_idl::RdbLockTable* mutable_msglock(); + inline ::iot_idl::RdbLockTable* release_msglock(); + inline void set_allocated_msglock(::iot_idl::RdbLockTable* msglock); - // @@protoc_insertion_point(class_scope:kbd_idlfile.RdbRequest) + // @@protoc_insertion_point(class_scope:iot_idl.RdbRequest) private: inline void set_has_strsessionid(); inline void clear_has_strsessionid(); @@ -1177,11 +1177,11 @@ class IDL_FILES_EXPORT RdbRequest : public ::google::protobuf::Message { mutable int _cached_size_; ::std::string* strsessionid_; ::std::string* strpackageid_; - ::kbd_idlfile::RdbQuery* msgquery_; - ::kbd_idlfile::RdbInsert* msginsert_; - ::kbd_idlfile::RdbRemove* msgremove_; - ::kbd_idlfile::RdbUpdate* msgupdate_; - ::kbd_idlfile::RdbLockTable* msglock_; + ::iot_idl::RdbQuery* msgquery_; + ::iot_idl::RdbInsert* msginsert_; + ::iot_idl::RdbRemove* msgremove_; + ::iot_idl::RdbUpdate* msgupdate_; + ::iot_idl::RdbLockTable* msglock_; friend void IDL_FILES_EXPORT protobuf_AddDesc_RdbServerMessage_2eproto(); friend void protobuf_AssignDesc_RdbServerMessage_2eproto(); friend void protobuf_ShutdownFile_RdbServerMessage_2eproto(); @@ -1268,16 +1268,16 @@ class IDL_FILES_EXPORT RdbReply : public ::google::protobuf::Message { inline ::std::string* release_strpackageid(); inline void set_allocated_strpackageid(::std::string* strpackageid); - // required .kbd_idlfile.RdbRet ret = 2; + // required .iot_idl.RdbRet ret = 2; inline bool has_ret() const; inline void clear_ret(); static const int kRetFieldNumber = 2; - inline const ::kbd_idlfile::RdbRet& ret() const; - inline ::kbd_idlfile::RdbRet* mutable_ret(); - inline ::kbd_idlfile::RdbRet* release_ret(); - inline void set_allocated_ret(::kbd_idlfile::RdbRet* ret); + inline const ::iot_idl::RdbRet& ret() const; + inline ::iot_idl::RdbRet* mutable_ret(); + inline ::iot_idl::RdbRet* release_ret(); + inline void set_allocated_ret(::iot_idl::RdbRet* ret); - // @@protoc_insertion_point(class_scope:kbd_idlfile.RdbReply) + // @@protoc_insertion_point(class_scope:iot_idl.RdbReply) private: inline void set_has_strsessionid(); inline void clear_has_strsessionid(); @@ -1292,7 +1292,7 @@ class IDL_FILES_EXPORT RdbReply : public ::google::protobuf::Message { mutable int _cached_size_; ::std::string* strsessionid_; ::std::string* strpackageid_; - ::kbd_idlfile::RdbRet* ret_; + ::iot_idl::RdbRet* ret_; friend void IDL_FILES_EXPORT protobuf_AddDesc_RdbServerMessage_2eproto(); friend void protobuf_AssignDesc_RdbServerMessage_2eproto(); friend void protobuf_ShutdownFile_RdbServerMessage_2eproto(); @@ -1379,19 +1379,19 @@ class IDL_FILES_EXPORT RdbReplace : public ::google::protobuf::Message { inline ::std::string* release_strtablename(); inline void set_allocated_strtablename(::std::string* strtablename); - // repeated .kbd_idlfile.RdbSynUpdate msgUpdate = 3; + // repeated .iot_idl.RdbSynUpdate msgUpdate = 3; inline int msgupdate_size() const; inline void clear_msgupdate(); static const int kMsgUpdateFieldNumber = 3; - inline const ::kbd_idlfile::RdbSynUpdate& msgupdate(int index) const; - inline ::kbd_idlfile::RdbSynUpdate* mutable_msgupdate(int index); - inline ::kbd_idlfile::RdbSynUpdate* add_msgupdate(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbSynUpdate >& + inline const ::iot_idl::RdbSynUpdate& msgupdate(int index) const; + inline ::iot_idl::RdbSynUpdate* mutable_msgupdate(int index); + inline ::iot_idl::RdbSynUpdate* add_msgupdate(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbSynUpdate >& msgupdate() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbSynUpdate >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbSynUpdate >* mutable_msgupdate(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.RdbReplace) + // @@protoc_insertion_point(class_scope:iot_idl.RdbReplace) private: inline void set_has_strsessionid(); inline void clear_has_strsessionid(); @@ -1404,7 +1404,7 @@ class IDL_FILES_EXPORT RdbReplace : public ::google::protobuf::Message { mutable int _cached_size_; ::std::string* strsessionid_; ::std::string* strtablename_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbSynUpdate > msgupdate_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbSynUpdate > msgupdate_; friend void IDL_FILES_EXPORT protobuf_AddDesc_RdbServerMessage_2eproto(); friend void protobuf_AssignDesc_RdbServerMessage_2eproto(); friend void protobuf_ShutdownFile_RdbServerMessage_2eproto(); @@ -1467,28 +1467,28 @@ class IDL_FILES_EXPORT RdbSynUpdate : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // repeated .kbd_idlfile.RdbCondition msgCondition = 1; + // repeated .iot_idl.RdbCondition msgCondition = 1; inline int msgcondition_size() const; inline void clear_msgcondition(); static const int kMsgConditionFieldNumber = 1; - inline const ::kbd_idlfile::RdbCondition& msgcondition(int index) const; - inline ::kbd_idlfile::RdbCondition* mutable_msgcondition(int index); - inline ::kbd_idlfile::RdbCondition* add_msgcondition(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition >& + inline const ::iot_idl::RdbCondition& msgcondition(int index) const; + inline ::iot_idl::RdbCondition* mutable_msgcondition(int index); + inline ::iot_idl::RdbCondition* add_msgcondition(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition >& msgcondition() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition >* mutable_msgcondition(); - // repeated .kbd_idlfile.RdbUpdateValue msgUpdateValue = 2; + // repeated .iot_idl.RdbUpdateValue msgUpdateValue = 2; inline int msgupdatevalue_size() const; inline void clear_msgupdatevalue(); static const int kMsgUpdateValueFieldNumber = 2; - inline const ::kbd_idlfile::RdbUpdateValue& msgupdatevalue(int index) const; - inline ::kbd_idlfile::RdbUpdateValue* mutable_msgupdatevalue(int index); - inline ::kbd_idlfile::RdbUpdateValue* add_msgupdatevalue(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbUpdateValue >& + inline const ::iot_idl::RdbUpdateValue& msgupdatevalue(int index) const; + inline ::iot_idl::RdbUpdateValue* mutable_msgupdatevalue(int index); + inline ::iot_idl::RdbUpdateValue* add_msgupdatevalue(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbUpdateValue >& msgupdatevalue() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbUpdateValue >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbUpdateValue >* mutable_msgupdatevalue(); // optional string strKeys = 3; @@ -1503,7 +1503,7 @@ class IDL_FILES_EXPORT RdbSynUpdate : public ::google::protobuf::Message { inline ::std::string* release_strkeys(); inline void set_allocated_strkeys(::std::string* strkeys); - // @@protoc_insertion_point(class_scope:kbd_idlfile.RdbSynUpdate) + // @@protoc_insertion_point(class_scope:iot_idl.RdbSynUpdate) private: inline void set_has_strkeys(); inline void clear_has_strkeys(); @@ -1512,8 +1512,8 @@ class IDL_FILES_EXPORT RdbSynUpdate : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition > msgcondition_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbUpdateValue > msgupdatevalue_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition > msgcondition_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbUpdateValue > msgupdatevalue_; ::std::string* strkeys_; friend void IDL_FILES_EXPORT protobuf_AddDesc_RdbServerMessage_2eproto(); friend void protobuf_AssignDesc_RdbServerMessage_2eproto(); @@ -1529,7 +1529,7 @@ class IDL_FILES_EXPORT RdbSynUpdate : public ::google::protobuf::Message { // RdbCondition -// optional .kbd_idlfile.ENConditionLogic enLogic = 1; +// optional .iot_idl.ENConditionLogic enLogic = 1; inline bool RdbCondition::has_enlogic() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -1543,18 +1543,18 @@ inline void RdbCondition::clear_enlogic() { enlogic_ = 0; clear_has_enlogic(); } -inline ::kbd_idlfile::ENConditionLogic RdbCondition::enlogic() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbCondition.enLogic) - return static_cast< ::kbd_idlfile::ENConditionLogic >(enlogic_); +inline ::iot_idl::ENConditionLogic RdbCondition::enlogic() const { + // @@protoc_insertion_point(field_get:iot_idl.RdbCondition.enLogic) + return static_cast< ::iot_idl::ENConditionLogic >(enlogic_); } -inline void RdbCondition::set_enlogic(::kbd_idlfile::ENConditionLogic value) { - assert(::kbd_idlfile::ENConditionLogic_IsValid(value)); +inline void RdbCondition::set_enlogic(::iot_idl::ENConditionLogic value) { + assert(::iot_idl::ENConditionLogic_IsValid(value)); set_has_enlogic(); enlogic_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbCondition.enLogic) + // @@protoc_insertion_point(field_set:iot_idl.RdbCondition.enLogic) } -// required .kbd_idlfile.ENConditionRelation enRelation = 2; +// required .iot_idl.ENConditionRelation enRelation = 2; inline bool RdbCondition::has_enrelation() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -1568,15 +1568,15 @@ inline void RdbCondition::clear_enrelation() { enrelation_ = 0; clear_has_enrelation(); } -inline ::kbd_idlfile::ENConditionRelation RdbCondition::enrelation() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbCondition.enRelation) - return static_cast< ::kbd_idlfile::ENConditionRelation >(enrelation_); +inline ::iot_idl::ENConditionRelation RdbCondition::enrelation() const { + // @@protoc_insertion_point(field_get:iot_idl.RdbCondition.enRelation) + return static_cast< ::iot_idl::ENConditionRelation >(enrelation_); } -inline void RdbCondition::set_enrelation(::kbd_idlfile::ENConditionRelation value) { - assert(::kbd_idlfile::ENConditionRelation_IsValid(value)); +inline void RdbCondition::set_enrelation(::iot_idl::ENConditionRelation value) { + assert(::iot_idl::ENConditionRelation_IsValid(value)); set_has_enrelation(); enrelation_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbCondition.enRelation) + // @@protoc_insertion_point(field_set:iot_idl.RdbCondition.enRelation) } // required string strColumnName = 3; @@ -1596,7 +1596,7 @@ inline void RdbCondition::clear_strcolumnname() { clear_has_strcolumnname(); } inline const ::std::string& RdbCondition::strcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbCondition.strColumnName) + // @@protoc_insertion_point(field_get:iot_idl.RdbCondition.strColumnName) return *strcolumnname_; } inline void RdbCondition::set_strcolumnname(const ::std::string& value) { @@ -1605,7 +1605,7 @@ inline void RdbCondition::set_strcolumnname(const ::std::string& value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbCondition.strColumnName) + // @@protoc_insertion_point(field_set:iot_idl.RdbCondition.strColumnName) } inline void RdbCondition::set_strcolumnname(const char* value) { set_has_strcolumnname(); @@ -1613,7 +1613,7 @@ inline void RdbCondition::set_strcolumnname(const char* value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbCondition.strColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbCondition.strColumnName) } inline void RdbCondition::set_strcolumnname(const char* value, size_t size) { set_has_strcolumnname(); @@ -1621,14 +1621,14 @@ inline void RdbCondition::set_strcolumnname(const char* value, size_t size) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbCondition.strColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbCondition.strColumnName) } inline ::std::string* RdbCondition::mutable_strcolumnname() { set_has_strcolumnname(); if (strcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbCondition.strColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbCondition.strColumnName) return strcolumnname_; } inline ::std::string* RdbCondition::release_strcolumnname() { @@ -1652,10 +1652,10 @@ inline void RdbCondition::set_allocated_strcolumnname(::std::string* strcolumnna clear_has_strcolumnname(); strcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbCondition.strColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbCondition.strColumnName) } -// required .kbd_idlfile.SVariable msgValue = 5; +// required .iot_idl.SVariable msgValue = 5; inline bool RdbCondition::has_msgvalue() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -1666,26 +1666,26 @@ inline void RdbCondition::clear_has_msgvalue() { _has_bits_[0] &= ~0x00000008u; } inline void RdbCondition::clear_msgvalue() { - if (msgvalue_ != NULL) msgvalue_->::kbd_idlfile::SVariable::Clear(); + if (msgvalue_ != NULL) msgvalue_->::iot_idl::SVariable::Clear(); clear_has_msgvalue(); } -inline const ::kbd_idlfile::SVariable& RdbCondition::msgvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbCondition.msgValue) +inline const ::iot_idl::SVariable& RdbCondition::msgvalue() const { + // @@protoc_insertion_point(field_get:iot_idl.RdbCondition.msgValue) return msgvalue_ != NULL ? *msgvalue_ : *default_instance_->msgvalue_; } -inline ::kbd_idlfile::SVariable* RdbCondition::mutable_msgvalue() { +inline ::iot_idl::SVariable* RdbCondition::mutable_msgvalue() { set_has_msgvalue(); - if (msgvalue_ == NULL) msgvalue_ = new ::kbd_idlfile::SVariable; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbCondition.msgValue) + if (msgvalue_ == NULL) msgvalue_ = new ::iot_idl::SVariable; + // @@protoc_insertion_point(field_mutable:iot_idl.RdbCondition.msgValue) return msgvalue_; } -inline ::kbd_idlfile::SVariable* RdbCondition::release_msgvalue() { +inline ::iot_idl::SVariable* RdbCondition::release_msgvalue() { clear_has_msgvalue(); - ::kbd_idlfile::SVariable* temp = msgvalue_; + ::iot_idl::SVariable* temp = msgvalue_; msgvalue_ = NULL; return temp; } -inline void RdbCondition::set_allocated_msgvalue(::kbd_idlfile::SVariable* msgvalue) { +inline void RdbCondition::set_allocated_msgvalue(::iot_idl::SVariable* msgvalue) { delete msgvalue_; msgvalue_ = msgvalue; if (msgvalue) { @@ -1693,40 +1693,40 @@ inline void RdbCondition::set_allocated_msgvalue(::kbd_idlfile::SVariable* msgva } else { clear_has_msgvalue(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbCondition.msgValue) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbCondition.msgValue) } // ------------------------------------------------------------------- // RdbRecord -// repeated .kbd_idlfile.SVariable msgValueArray = 1; +// repeated .iot_idl.SVariable msgValueArray = 1; inline int RdbRecord::msgvaluearray_size() const { return msgvaluearray_.size(); } inline void RdbRecord::clear_msgvaluearray() { msgvaluearray_.Clear(); } -inline const ::kbd_idlfile::SVariable& RdbRecord::msgvaluearray(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbRecord.msgValueArray) +inline const ::iot_idl::SVariable& RdbRecord::msgvaluearray(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.RdbRecord.msgValueArray) return msgvaluearray_.Get(index); } -inline ::kbd_idlfile::SVariable* RdbRecord::mutable_msgvaluearray(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbRecord.msgValueArray) +inline ::iot_idl::SVariable* RdbRecord::mutable_msgvaluearray(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.RdbRecord.msgValueArray) return msgvaluearray_.Mutable(index); } -inline ::kbd_idlfile::SVariable* RdbRecord::add_msgvaluearray() { - // @@protoc_insertion_point(field_add:kbd_idlfile.RdbRecord.msgValueArray) +inline ::iot_idl::SVariable* RdbRecord::add_msgvaluearray() { + // @@protoc_insertion_point(field_add:iot_idl.RdbRecord.msgValueArray) return msgvaluearray_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVariable >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SVariable >& RdbRecord::msgvaluearray() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.RdbRecord.msgValueArray) + // @@protoc_insertion_point(field_list:iot_idl.RdbRecord.msgValueArray) return msgvaluearray_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVariable >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SVariable >* RdbRecord::mutable_msgvaluearray() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.RdbRecord.msgValueArray) + // @@protoc_insertion_point(field_mutable_list:iot_idl.RdbRecord.msgValueArray) return &msgvaluearray_; } @@ -1751,7 +1751,7 @@ inline void RdbUpdateValue::clear_strcolumnname() { clear_has_strcolumnname(); } inline const ::std::string& RdbUpdateValue::strcolumnname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbUpdateValue.strColumnName) + // @@protoc_insertion_point(field_get:iot_idl.RdbUpdateValue.strColumnName) return *strcolumnname_; } inline void RdbUpdateValue::set_strcolumnname(const ::std::string& value) { @@ -1760,7 +1760,7 @@ inline void RdbUpdateValue::set_strcolumnname(const ::std::string& value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbUpdateValue.strColumnName) + // @@protoc_insertion_point(field_set:iot_idl.RdbUpdateValue.strColumnName) } inline void RdbUpdateValue::set_strcolumnname(const char* value) { set_has_strcolumnname(); @@ -1768,7 +1768,7 @@ inline void RdbUpdateValue::set_strcolumnname(const char* value) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbUpdateValue.strColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbUpdateValue.strColumnName) } inline void RdbUpdateValue::set_strcolumnname(const char* value, size_t size) { set_has_strcolumnname(); @@ -1776,14 +1776,14 @@ inline void RdbUpdateValue::set_strcolumnname(const char* value, size_t size) { strcolumnname_ = new ::std::string; } strcolumnname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbUpdateValue.strColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbUpdateValue.strColumnName) } inline ::std::string* RdbUpdateValue::mutable_strcolumnname() { set_has_strcolumnname(); if (strcolumnname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strcolumnname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbUpdateValue.strColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbUpdateValue.strColumnName) return strcolumnname_; } inline ::std::string* RdbUpdateValue::release_strcolumnname() { @@ -1807,10 +1807,10 @@ inline void RdbUpdateValue::set_allocated_strcolumnname(::std::string* strcolumn clear_has_strcolumnname(); strcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbUpdateValue.strColumnName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbUpdateValue.strColumnName) } -// required .kbd_idlfile.SVariable msgValue = 2; +// required .iot_idl.SVariable msgValue = 2; inline bool RdbUpdateValue::has_msgvalue() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -1821,26 +1821,26 @@ inline void RdbUpdateValue::clear_has_msgvalue() { _has_bits_[0] &= ~0x00000002u; } inline void RdbUpdateValue::clear_msgvalue() { - if (msgvalue_ != NULL) msgvalue_->::kbd_idlfile::SVariable::Clear(); + if (msgvalue_ != NULL) msgvalue_->::iot_idl::SVariable::Clear(); clear_has_msgvalue(); } -inline const ::kbd_idlfile::SVariable& RdbUpdateValue::msgvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbUpdateValue.msgValue) +inline const ::iot_idl::SVariable& RdbUpdateValue::msgvalue() const { + // @@protoc_insertion_point(field_get:iot_idl.RdbUpdateValue.msgValue) return msgvalue_ != NULL ? *msgvalue_ : *default_instance_->msgvalue_; } -inline ::kbd_idlfile::SVariable* RdbUpdateValue::mutable_msgvalue() { +inline ::iot_idl::SVariable* RdbUpdateValue::mutable_msgvalue() { set_has_msgvalue(); - if (msgvalue_ == NULL) msgvalue_ = new ::kbd_idlfile::SVariable; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbUpdateValue.msgValue) + if (msgvalue_ == NULL) msgvalue_ = new ::iot_idl::SVariable; + // @@protoc_insertion_point(field_mutable:iot_idl.RdbUpdateValue.msgValue) return msgvalue_; } -inline ::kbd_idlfile::SVariable* RdbUpdateValue::release_msgvalue() { +inline ::iot_idl::SVariable* RdbUpdateValue::release_msgvalue() { clear_has_msgvalue(); - ::kbd_idlfile::SVariable* temp = msgvalue_; + ::iot_idl::SVariable* temp = msgvalue_; msgvalue_ = NULL; return temp; } -inline void RdbUpdateValue::set_allocated_msgvalue(::kbd_idlfile::SVariable* msgvalue) { +inline void RdbUpdateValue::set_allocated_msgvalue(::iot_idl::SVariable* msgvalue) { delete msgvalue_; msgvalue_ = msgvalue; if (msgvalue) { @@ -1848,7 +1848,7 @@ inline void RdbUpdateValue::set_allocated_msgvalue(::kbd_idlfile::SVariable* msg } else { clear_has_msgvalue(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbUpdateValue.msgValue) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbUpdateValue.msgValue) } // ------------------------------------------------------------------- @@ -1872,7 +1872,7 @@ inline void RdbQuery::clear_strtablename() { clear_has_strtablename(); } inline const ::std::string& RdbQuery::strtablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbQuery.strTableName) + // @@protoc_insertion_point(field_get:iot_idl.RdbQuery.strTableName) return *strtablename_; } inline void RdbQuery::set_strtablename(const ::std::string& value) { @@ -1881,7 +1881,7 @@ inline void RdbQuery::set_strtablename(const ::std::string& value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbQuery.strTableName) + // @@protoc_insertion_point(field_set:iot_idl.RdbQuery.strTableName) } inline void RdbQuery::set_strtablename(const char* value) { set_has_strtablename(); @@ -1889,7 +1889,7 @@ inline void RdbQuery::set_strtablename(const char* value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbQuery.strTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbQuery.strTableName) } inline void RdbQuery::set_strtablename(const char* value, size_t size) { set_has_strtablename(); @@ -1897,14 +1897,14 @@ inline void RdbQuery::set_strtablename(const char* value, size_t size) { strtablename_ = new ::std::string; } strtablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbQuery.strTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbQuery.strTableName) } inline ::std::string* RdbQuery::mutable_strtablename() { set_has_strtablename(); if (strtablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbQuery.strTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbQuery.strTableName) return strtablename_; } inline ::std::string* RdbQuery::release_strtablename() { @@ -1928,7 +1928,7 @@ inline void RdbQuery::set_allocated_strtablename(::std::string* strtablename) { clear_has_strtablename(); strtablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbQuery.strTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbQuery.strTableName) } // repeated string strSelectColNameArr = 2; @@ -1939,49 +1939,49 @@ inline void RdbQuery::clear_strselectcolnamearr() { strselectcolnamearr_.Clear(); } inline const ::std::string& RdbQuery::strselectcolnamearr(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbQuery.strSelectColNameArr) + // @@protoc_insertion_point(field_get:iot_idl.RdbQuery.strSelectColNameArr) return strselectcolnamearr_.Get(index); } inline ::std::string* RdbQuery::mutable_strselectcolnamearr(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbQuery.strSelectColNameArr) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbQuery.strSelectColNameArr) return strselectcolnamearr_.Mutable(index); } inline void RdbQuery::set_strselectcolnamearr(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbQuery.strSelectColNameArr) + // @@protoc_insertion_point(field_set:iot_idl.RdbQuery.strSelectColNameArr) strselectcolnamearr_.Mutable(index)->assign(value); } inline void RdbQuery::set_strselectcolnamearr(int index, const char* value) { strselectcolnamearr_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbQuery.strSelectColNameArr) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbQuery.strSelectColNameArr) } inline void RdbQuery::set_strselectcolnamearr(int index, const char* value, size_t size) { strselectcolnamearr_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbQuery.strSelectColNameArr) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbQuery.strSelectColNameArr) } inline ::std::string* RdbQuery::add_strselectcolnamearr() { return strselectcolnamearr_.Add(); } inline void RdbQuery::add_strselectcolnamearr(const ::std::string& value) { strselectcolnamearr_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.RdbQuery.strSelectColNameArr) + // @@protoc_insertion_point(field_add:iot_idl.RdbQuery.strSelectColNameArr) } inline void RdbQuery::add_strselectcolnamearr(const char* value) { strselectcolnamearr_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.RdbQuery.strSelectColNameArr) + // @@protoc_insertion_point(field_add_char:iot_idl.RdbQuery.strSelectColNameArr) } inline void RdbQuery::add_strselectcolnamearr(const char* value, size_t size) { strselectcolnamearr_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.RdbQuery.strSelectColNameArr) + // @@protoc_insertion_point(field_add_pointer:iot_idl.RdbQuery.strSelectColNameArr) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& RdbQuery::strselectcolnamearr() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.RdbQuery.strSelectColNameArr) + // @@protoc_insertion_point(field_list:iot_idl.RdbQuery.strSelectColNameArr) return strselectcolnamearr_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* RdbQuery::mutable_strselectcolnamearr() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.RdbQuery.strSelectColNameArr) + // @@protoc_insertion_point(field_mutable_list:iot_idl.RdbQuery.strSelectColNameArr) return &strselectcolnamearr_; } @@ -1993,79 +1993,79 @@ inline void RdbQuery::clear_strordercolnamearr() { strordercolnamearr_.Clear(); } inline const ::std::string& RdbQuery::strordercolnamearr(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbQuery.strOrderColNameArr) + // @@protoc_insertion_point(field_get:iot_idl.RdbQuery.strOrderColNameArr) return strordercolnamearr_.Get(index); } inline ::std::string* RdbQuery::mutable_strordercolnamearr(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbQuery.strOrderColNameArr) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbQuery.strOrderColNameArr) return strordercolnamearr_.Mutable(index); } inline void RdbQuery::set_strordercolnamearr(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbQuery.strOrderColNameArr) + // @@protoc_insertion_point(field_set:iot_idl.RdbQuery.strOrderColNameArr) strordercolnamearr_.Mutable(index)->assign(value); } inline void RdbQuery::set_strordercolnamearr(int index, const char* value) { strordercolnamearr_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbQuery.strOrderColNameArr) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbQuery.strOrderColNameArr) } inline void RdbQuery::set_strordercolnamearr(int index, const char* value, size_t size) { strordercolnamearr_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbQuery.strOrderColNameArr) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbQuery.strOrderColNameArr) } inline ::std::string* RdbQuery::add_strordercolnamearr() { return strordercolnamearr_.Add(); } inline void RdbQuery::add_strordercolnamearr(const ::std::string& value) { strordercolnamearr_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.RdbQuery.strOrderColNameArr) + // @@protoc_insertion_point(field_add:iot_idl.RdbQuery.strOrderColNameArr) } inline void RdbQuery::add_strordercolnamearr(const char* value) { strordercolnamearr_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.RdbQuery.strOrderColNameArr) + // @@protoc_insertion_point(field_add_char:iot_idl.RdbQuery.strOrderColNameArr) } inline void RdbQuery::add_strordercolnamearr(const char* value, size_t size) { strordercolnamearr_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.RdbQuery.strOrderColNameArr) + // @@protoc_insertion_point(field_add_pointer:iot_idl.RdbQuery.strOrderColNameArr) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& RdbQuery::strordercolnamearr() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.RdbQuery.strOrderColNameArr) + // @@protoc_insertion_point(field_list:iot_idl.RdbQuery.strOrderColNameArr) return strordercolnamearr_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* RdbQuery::mutable_strordercolnamearr() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.RdbQuery.strOrderColNameArr) + // @@protoc_insertion_point(field_mutable_list:iot_idl.RdbQuery.strOrderColNameArr) return &strordercolnamearr_; } -// repeated .kbd_idlfile.RdbCondition msgCondition = 4; +// repeated .iot_idl.RdbCondition msgCondition = 4; inline int RdbQuery::msgcondition_size() const { return msgcondition_.size(); } inline void RdbQuery::clear_msgcondition() { msgcondition_.Clear(); } -inline const ::kbd_idlfile::RdbCondition& RdbQuery::msgcondition(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbQuery.msgCondition) +inline const ::iot_idl::RdbCondition& RdbQuery::msgcondition(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.RdbQuery.msgCondition) return msgcondition_.Get(index); } -inline ::kbd_idlfile::RdbCondition* RdbQuery::mutable_msgcondition(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbQuery.msgCondition) +inline ::iot_idl::RdbCondition* RdbQuery::mutable_msgcondition(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.RdbQuery.msgCondition) return msgcondition_.Mutable(index); } -inline ::kbd_idlfile::RdbCondition* RdbQuery::add_msgcondition() { - // @@protoc_insertion_point(field_add:kbd_idlfile.RdbQuery.msgCondition) +inline ::iot_idl::RdbCondition* RdbQuery::add_msgcondition() { + // @@protoc_insertion_point(field_add:iot_idl.RdbQuery.msgCondition) return msgcondition_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition >& RdbQuery::msgcondition() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.RdbQuery.msgCondition) + // @@protoc_insertion_point(field_list:iot_idl.RdbQuery.msgCondition) return msgcondition_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition >* RdbQuery::mutable_msgcondition() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.RdbQuery.msgCondition) + // @@protoc_insertion_point(field_mutable_list:iot_idl.RdbQuery.msgCondition) return &msgcondition_; } @@ -2084,13 +2084,13 @@ inline void RdbQuery::clear_nasc() { clear_has_nasc(); } inline ::google::protobuf::int32 RdbQuery::nasc() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbQuery.nAsc) + // @@protoc_insertion_point(field_get:iot_idl.RdbQuery.nAsc) return nasc_; } inline void RdbQuery::set_nasc(::google::protobuf::int32 value) { set_has_nasc(); nasc_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbQuery.nAsc) + // @@protoc_insertion_point(field_set:iot_idl.RdbQuery.nAsc) } // ------------------------------------------------------------------- @@ -2114,7 +2114,7 @@ inline void RdbInsert::clear_strtablename() { clear_has_strtablename(); } inline const ::std::string& RdbInsert::strtablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbInsert.strTableName) + // @@protoc_insertion_point(field_get:iot_idl.RdbInsert.strTableName) return *strtablename_; } inline void RdbInsert::set_strtablename(const ::std::string& value) { @@ -2123,7 +2123,7 @@ inline void RdbInsert::set_strtablename(const ::std::string& value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbInsert.strTableName) + // @@protoc_insertion_point(field_set:iot_idl.RdbInsert.strTableName) } inline void RdbInsert::set_strtablename(const char* value) { set_has_strtablename(); @@ -2131,7 +2131,7 @@ inline void RdbInsert::set_strtablename(const char* value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbInsert.strTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbInsert.strTableName) } inline void RdbInsert::set_strtablename(const char* value, size_t size) { set_has_strtablename(); @@ -2139,14 +2139,14 @@ inline void RdbInsert::set_strtablename(const char* value, size_t size) { strtablename_ = new ::std::string; } strtablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbInsert.strTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbInsert.strTableName) } inline ::std::string* RdbInsert::mutable_strtablename() { set_has_strtablename(); if (strtablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbInsert.strTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbInsert.strTableName) return strtablename_; } inline ::std::string* RdbInsert::release_strtablename() { @@ -2170,7 +2170,7 @@ inline void RdbInsert::set_allocated_strtablename(::std::string* strtablename) { clear_has_strtablename(); strtablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbInsert.strTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbInsert.strTableName) } // repeated string strColumnName = 2; @@ -2181,79 +2181,79 @@ inline void RdbInsert::clear_strcolumnname() { strcolumnname_.Clear(); } inline const ::std::string& RdbInsert::strcolumnname(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbInsert.strColumnName) + // @@protoc_insertion_point(field_get:iot_idl.RdbInsert.strColumnName) return strcolumnname_.Get(index); } inline ::std::string* RdbInsert::mutable_strcolumnname(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbInsert.strColumnName) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbInsert.strColumnName) return strcolumnname_.Mutable(index); } inline void RdbInsert::set_strcolumnname(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbInsert.strColumnName) + // @@protoc_insertion_point(field_set:iot_idl.RdbInsert.strColumnName) strcolumnname_.Mutable(index)->assign(value); } inline void RdbInsert::set_strcolumnname(int index, const char* value) { strcolumnname_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbInsert.strColumnName) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbInsert.strColumnName) } inline void RdbInsert::set_strcolumnname(int index, const char* value, size_t size) { strcolumnname_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbInsert.strColumnName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbInsert.strColumnName) } inline ::std::string* RdbInsert::add_strcolumnname() { return strcolumnname_.Add(); } inline void RdbInsert::add_strcolumnname(const ::std::string& value) { strcolumnname_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.RdbInsert.strColumnName) + // @@protoc_insertion_point(field_add:iot_idl.RdbInsert.strColumnName) } inline void RdbInsert::add_strcolumnname(const char* value) { strcolumnname_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.RdbInsert.strColumnName) + // @@protoc_insertion_point(field_add_char:iot_idl.RdbInsert.strColumnName) } inline void RdbInsert::add_strcolumnname(const char* value, size_t size) { strcolumnname_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.RdbInsert.strColumnName) + // @@protoc_insertion_point(field_add_pointer:iot_idl.RdbInsert.strColumnName) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& RdbInsert::strcolumnname() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.RdbInsert.strColumnName) + // @@protoc_insertion_point(field_list:iot_idl.RdbInsert.strColumnName) return strcolumnname_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* RdbInsert::mutable_strcolumnname() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.RdbInsert.strColumnName) + // @@protoc_insertion_point(field_mutable_list:iot_idl.RdbInsert.strColumnName) return &strcolumnname_; } -// repeated .kbd_idlfile.RdbRecord msgData = 3; +// repeated .iot_idl.RdbRecord msgData = 3; inline int RdbInsert::msgdata_size() const { return msgdata_.size(); } inline void RdbInsert::clear_msgdata() { msgdata_.Clear(); } -inline const ::kbd_idlfile::RdbRecord& RdbInsert::msgdata(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbInsert.msgData) +inline const ::iot_idl::RdbRecord& RdbInsert::msgdata(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.RdbInsert.msgData) return msgdata_.Get(index); } -inline ::kbd_idlfile::RdbRecord* RdbInsert::mutable_msgdata(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbInsert.msgData) +inline ::iot_idl::RdbRecord* RdbInsert::mutable_msgdata(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.RdbInsert.msgData) return msgdata_.Mutable(index); } -inline ::kbd_idlfile::RdbRecord* RdbInsert::add_msgdata() { - // @@protoc_insertion_point(field_add:kbd_idlfile.RdbInsert.msgData) +inline ::iot_idl::RdbRecord* RdbInsert::add_msgdata() { + // @@protoc_insertion_point(field_add:iot_idl.RdbInsert.msgData) return msgdata_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbRecord >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbRecord >& RdbInsert::msgdata() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.RdbInsert.msgData) + // @@protoc_insertion_point(field_list:iot_idl.RdbInsert.msgData) return msgdata_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbRecord >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbRecord >* RdbInsert::mutable_msgdata() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.RdbInsert.msgData) + // @@protoc_insertion_point(field_mutable_list:iot_idl.RdbInsert.msgData) return &msgdata_; } @@ -2278,7 +2278,7 @@ inline void RdbRemove::clear_strtablename() { clear_has_strtablename(); } inline const ::std::string& RdbRemove::strtablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbRemove.strTableName) + // @@protoc_insertion_point(field_get:iot_idl.RdbRemove.strTableName) return *strtablename_; } inline void RdbRemove::set_strtablename(const ::std::string& value) { @@ -2287,7 +2287,7 @@ inline void RdbRemove::set_strtablename(const ::std::string& value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbRemove.strTableName) + // @@protoc_insertion_point(field_set:iot_idl.RdbRemove.strTableName) } inline void RdbRemove::set_strtablename(const char* value) { set_has_strtablename(); @@ -2295,7 +2295,7 @@ inline void RdbRemove::set_strtablename(const char* value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbRemove.strTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbRemove.strTableName) } inline void RdbRemove::set_strtablename(const char* value, size_t size) { set_has_strtablename(); @@ -2303,14 +2303,14 @@ inline void RdbRemove::set_strtablename(const char* value, size_t size) { strtablename_ = new ::std::string; } strtablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbRemove.strTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbRemove.strTableName) } inline ::std::string* RdbRemove::mutable_strtablename() { set_has_strtablename(); if (strtablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbRemove.strTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbRemove.strTableName) return strtablename_; } inline ::std::string* RdbRemove::release_strtablename() { @@ -2334,36 +2334,36 @@ inline void RdbRemove::set_allocated_strtablename(::std::string* strtablename) { clear_has_strtablename(); strtablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbRemove.strTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbRemove.strTableName) } -// repeated .kbd_idlfile.RdbCondition msgCondtionArray = 2; +// repeated .iot_idl.RdbCondition msgCondtionArray = 2; inline int RdbRemove::msgcondtionarray_size() const { return msgcondtionarray_.size(); } inline void RdbRemove::clear_msgcondtionarray() { msgcondtionarray_.Clear(); } -inline const ::kbd_idlfile::RdbCondition& RdbRemove::msgcondtionarray(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbRemove.msgCondtionArray) +inline const ::iot_idl::RdbCondition& RdbRemove::msgcondtionarray(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.RdbRemove.msgCondtionArray) return msgcondtionarray_.Get(index); } -inline ::kbd_idlfile::RdbCondition* RdbRemove::mutable_msgcondtionarray(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbRemove.msgCondtionArray) +inline ::iot_idl::RdbCondition* RdbRemove::mutable_msgcondtionarray(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.RdbRemove.msgCondtionArray) return msgcondtionarray_.Mutable(index); } -inline ::kbd_idlfile::RdbCondition* RdbRemove::add_msgcondtionarray() { - // @@protoc_insertion_point(field_add:kbd_idlfile.RdbRemove.msgCondtionArray) +inline ::iot_idl::RdbCondition* RdbRemove::add_msgcondtionarray() { + // @@protoc_insertion_point(field_add:iot_idl.RdbRemove.msgCondtionArray) return msgcondtionarray_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition >& RdbRemove::msgcondtionarray() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.RdbRemove.msgCondtionArray) + // @@protoc_insertion_point(field_list:iot_idl.RdbRemove.msgCondtionArray) return msgcondtionarray_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition >* RdbRemove::mutable_msgcondtionarray() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.RdbRemove.msgCondtionArray) + // @@protoc_insertion_point(field_mutable_list:iot_idl.RdbRemove.msgCondtionArray) return &msgcondtionarray_; } @@ -2388,7 +2388,7 @@ inline void RdbUpdate::clear_strtablename() { clear_has_strtablename(); } inline const ::std::string& RdbUpdate::strtablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbUpdate.strTableName) + // @@protoc_insertion_point(field_get:iot_idl.RdbUpdate.strTableName) return *strtablename_; } inline void RdbUpdate::set_strtablename(const ::std::string& value) { @@ -2397,7 +2397,7 @@ inline void RdbUpdate::set_strtablename(const ::std::string& value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbUpdate.strTableName) + // @@protoc_insertion_point(field_set:iot_idl.RdbUpdate.strTableName) } inline void RdbUpdate::set_strtablename(const char* value) { set_has_strtablename(); @@ -2405,7 +2405,7 @@ inline void RdbUpdate::set_strtablename(const char* value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbUpdate.strTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbUpdate.strTableName) } inline void RdbUpdate::set_strtablename(const char* value, size_t size) { set_has_strtablename(); @@ -2413,14 +2413,14 @@ inline void RdbUpdate::set_strtablename(const char* value, size_t size) { strtablename_ = new ::std::string; } strtablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbUpdate.strTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbUpdate.strTableName) } inline ::std::string* RdbUpdate::mutable_strtablename() { set_has_strtablename(); if (strtablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbUpdate.strTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbUpdate.strTableName) return strtablename_; } inline ::std::string* RdbUpdate::release_strtablename() { @@ -2444,66 +2444,66 @@ inline void RdbUpdate::set_allocated_strtablename(::std::string* strtablename) { clear_has_strtablename(); strtablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbUpdate.strTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbUpdate.strTableName) } -// repeated .kbd_idlfile.RdbCondition msgCondition = 2; +// repeated .iot_idl.RdbCondition msgCondition = 2; inline int RdbUpdate::msgcondition_size() const { return msgcondition_.size(); } inline void RdbUpdate::clear_msgcondition() { msgcondition_.Clear(); } -inline const ::kbd_idlfile::RdbCondition& RdbUpdate::msgcondition(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbUpdate.msgCondition) +inline const ::iot_idl::RdbCondition& RdbUpdate::msgcondition(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.RdbUpdate.msgCondition) return msgcondition_.Get(index); } -inline ::kbd_idlfile::RdbCondition* RdbUpdate::mutable_msgcondition(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbUpdate.msgCondition) +inline ::iot_idl::RdbCondition* RdbUpdate::mutable_msgcondition(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.RdbUpdate.msgCondition) return msgcondition_.Mutable(index); } -inline ::kbd_idlfile::RdbCondition* RdbUpdate::add_msgcondition() { - // @@protoc_insertion_point(field_add:kbd_idlfile.RdbUpdate.msgCondition) +inline ::iot_idl::RdbCondition* RdbUpdate::add_msgcondition() { + // @@protoc_insertion_point(field_add:iot_idl.RdbUpdate.msgCondition) return msgcondition_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition >& RdbUpdate::msgcondition() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.RdbUpdate.msgCondition) + // @@protoc_insertion_point(field_list:iot_idl.RdbUpdate.msgCondition) return msgcondition_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition >* RdbUpdate::mutable_msgcondition() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.RdbUpdate.msgCondition) + // @@protoc_insertion_point(field_mutable_list:iot_idl.RdbUpdate.msgCondition) return &msgcondition_; } -// repeated .kbd_idlfile.RdbUpdateValue msgUpdateValue = 3; +// repeated .iot_idl.RdbUpdateValue msgUpdateValue = 3; inline int RdbUpdate::msgupdatevalue_size() const { return msgupdatevalue_.size(); } inline void RdbUpdate::clear_msgupdatevalue() { msgupdatevalue_.Clear(); } -inline const ::kbd_idlfile::RdbUpdateValue& RdbUpdate::msgupdatevalue(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbUpdate.msgUpdateValue) +inline const ::iot_idl::RdbUpdateValue& RdbUpdate::msgupdatevalue(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.RdbUpdate.msgUpdateValue) return msgupdatevalue_.Get(index); } -inline ::kbd_idlfile::RdbUpdateValue* RdbUpdate::mutable_msgupdatevalue(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbUpdate.msgUpdateValue) +inline ::iot_idl::RdbUpdateValue* RdbUpdate::mutable_msgupdatevalue(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.RdbUpdate.msgUpdateValue) return msgupdatevalue_.Mutable(index); } -inline ::kbd_idlfile::RdbUpdateValue* RdbUpdate::add_msgupdatevalue() { - // @@protoc_insertion_point(field_add:kbd_idlfile.RdbUpdate.msgUpdateValue) +inline ::iot_idl::RdbUpdateValue* RdbUpdate::add_msgupdatevalue() { + // @@protoc_insertion_point(field_add:iot_idl.RdbUpdate.msgUpdateValue) return msgupdatevalue_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbUpdateValue >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbUpdateValue >& RdbUpdate::msgupdatevalue() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.RdbUpdate.msgUpdateValue) + // @@protoc_insertion_point(field_list:iot_idl.RdbUpdate.msgUpdateValue) return msgupdatevalue_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbUpdateValue >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbUpdateValue >* RdbUpdate::mutable_msgupdatevalue() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.RdbUpdate.msgUpdateValue) + // @@protoc_insertion_point(field_mutable_list:iot_idl.RdbUpdate.msgUpdateValue) return &msgupdatevalue_; } @@ -2528,7 +2528,7 @@ inline void RdbLockTable::clear_strtablename() { clear_has_strtablename(); } inline const ::std::string& RdbLockTable::strtablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbLockTable.strTableName) + // @@protoc_insertion_point(field_get:iot_idl.RdbLockTable.strTableName) return *strtablename_; } inline void RdbLockTable::set_strtablename(const ::std::string& value) { @@ -2537,7 +2537,7 @@ inline void RdbLockTable::set_strtablename(const ::std::string& value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbLockTable.strTableName) + // @@protoc_insertion_point(field_set:iot_idl.RdbLockTable.strTableName) } inline void RdbLockTable::set_strtablename(const char* value) { set_has_strtablename(); @@ -2545,7 +2545,7 @@ inline void RdbLockTable::set_strtablename(const char* value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbLockTable.strTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbLockTable.strTableName) } inline void RdbLockTable::set_strtablename(const char* value, size_t size) { set_has_strtablename(); @@ -2553,14 +2553,14 @@ inline void RdbLockTable::set_strtablename(const char* value, size_t size) { strtablename_ = new ::std::string; } strtablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbLockTable.strTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbLockTable.strTableName) } inline ::std::string* RdbLockTable::mutable_strtablename() { set_has_strtablename(); if (strtablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbLockTable.strTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbLockTable.strTableName) return strtablename_; } inline ::std::string* RdbLockTable::release_strtablename() { @@ -2584,7 +2584,7 @@ inline void RdbLockTable::set_allocated_strtablename(::std::string* strtablename clear_has_strtablename(); strtablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbLockTable.strTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbLockTable.strTableName) } // required bool bLock = 2; @@ -2602,13 +2602,13 @@ inline void RdbLockTable::clear_block() { clear_has_block(); } inline bool RdbLockTable::block() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbLockTable.bLock) + // @@protoc_insertion_point(field_get:iot_idl.RdbLockTable.bLock) return block_; } inline void RdbLockTable::set_block(bool value) { set_has_block(); block_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbLockTable.bLock) + // @@protoc_insertion_point(field_set:iot_idl.RdbLockTable.bLock) } // ------------------------------------------------------------------- @@ -2630,42 +2630,42 @@ inline void RdbRet::clear_ret() { clear_has_ret(); } inline ::google::protobuf::int32 RdbRet::ret() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbRet.ret) + // @@protoc_insertion_point(field_get:iot_idl.RdbRet.ret) return ret_; } inline void RdbRet::set_ret(::google::protobuf::int32 value) { set_has_ret(); ret_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbRet.ret) + // @@protoc_insertion_point(field_set:iot_idl.RdbRet.ret) } -// repeated .kbd_idlfile.RdbRecord msgRecord = 3; +// repeated .iot_idl.RdbRecord msgRecord = 3; inline int RdbRet::msgrecord_size() const { return msgrecord_.size(); } inline void RdbRet::clear_msgrecord() { msgrecord_.Clear(); } -inline const ::kbd_idlfile::RdbRecord& RdbRet::msgrecord(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbRet.msgRecord) +inline const ::iot_idl::RdbRecord& RdbRet::msgrecord(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.RdbRet.msgRecord) return msgrecord_.Get(index); } -inline ::kbd_idlfile::RdbRecord* RdbRet::mutable_msgrecord(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbRet.msgRecord) +inline ::iot_idl::RdbRecord* RdbRet::mutable_msgrecord(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.RdbRet.msgRecord) return msgrecord_.Mutable(index); } -inline ::kbd_idlfile::RdbRecord* RdbRet::add_msgrecord() { - // @@protoc_insertion_point(field_add:kbd_idlfile.RdbRet.msgRecord) +inline ::iot_idl::RdbRecord* RdbRet::add_msgrecord() { + // @@protoc_insertion_point(field_add:iot_idl.RdbRet.msgRecord) return msgrecord_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbRecord >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbRecord >& RdbRet::msgrecord() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.RdbRet.msgRecord) + // @@protoc_insertion_point(field_list:iot_idl.RdbRet.msgRecord) return msgrecord_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbRecord >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbRecord >* RdbRet::mutable_msgrecord() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.RdbRet.msgRecord) + // @@protoc_insertion_point(field_mutable_list:iot_idl.RdbRet.msgRecord) return &msgrecord_; } @@ -2686,7 +2686,7 @@ inline void RdbRet::clear_strerr() { clear_has_strerr(); } inline const ::std::string& RdbRet::strerr() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbRet.strErr) + // @@protoc_insertion_point(field_get:iot_idl.RdbRet.strErr) return *strerr_; } inline void RdbRet::set_strerr(const ::std::string& value) { @@ -2695,7 +2695,7 @@ inline void RdbRet::set_strerr(const ::std::string& value) { strerr_ = new ::std::string; } strerr_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbRet.strErr) + // @@protoc_insertion_point(field_set:iot_idl.RdbRet.strErr) } inline void RdbRet::set_strerr(const char* value) { set_has_strerr(); @@ -2703,7 +2703,7 @@ inline void RdbRet::set_strerr(const char* value) { strerr_ = new ::std::string; } strerr_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbRet.strErr) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbRet.strErr) } inline void RdbRet::set_strerr(const char* value, size_t size) { set_has_strerr(); @@ -2711,14 +2711,14 @@ inline void RdbRet::set_strerr(const char* value, size_t size) { strerr_ = new ::std::string; } strerr_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbRet.strErr) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbRet.strErr) } inline ::std::string* RdbRet::mutable_strerr() { set_has_strerr(); if (strerr_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strerr_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbRet.strErr) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbRet.strErr) return strerr_; } inline ::std::string* RdbRet::release_strerr() { @@ -2742,7 +2742,7 @@ inline void RdbRet::set_allocated_strerr(::std::string* strerr) { clear_has_strerr(); strerr_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbRet.strErr) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbRet.strErr) } // ------------------------------------------------------------------- @@ -2766,7 +2766,7 @@ inline void RdbRequest::clear_strsessionid() { clear_has_strsessionid(); } inline const ::std::string& RdbRequest::strsessionid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbRequest.strSessionID) + // @@protoc_insertion_point(field_get:iot_idl.RdbRequest.strSessionID) return *strsessionid_; } inline void RdbRequest::set_strsessionid(const ::std::string& value) { @@ -2775,7 +2775,7 @@ inline void RdbRequest::set_strsessionid(const ::std::string& value) { strsessionid_ = new ::std::string; } strsessionid_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbRequest.strSessionID) + // @@protoc_insertion_point(field_set:iot_idl.RdbRequest.strSessionID) } inline void RdbRequest::set_strsessionid(const char* value) { set_has_strsessionid(); @@ -2783,7 +2783,7 @@ inline void RdbRequest::set_strsessionid(const char* value) { strsessionid_ = new ::std::string; } strsessionid_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbRequest.strSessionID) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbRequest.strSessionID) } inline void RdbRequest::set_strsessionid(const char* value, size_t size) { set_has_strsessionid(); @@ -2791,14 +2791,14 @@ inline void RdbRequest::set_strsessionid(const char* value, size_t size) { strsessionid_ = new ::std::string; } strsessionid_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbRequest.strSessionID) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbRequest.strSessionID) } inline ::std::string* RdbRequest::mutable_strsessionid() { set_has_strsessionid(); if (strsessionid_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strsessionid_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbRequest.strSessionID) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbRequest.strSessionID) return strsessionid_; } inline ::std::string* RdbRequest::release_strsessionid() { @@ -2822,7 +2822,7 @@ inline void RdbRequest::set_allocated_strsessionid(::std::string* strsessionid) clear_has_strsessionid(); strsessionid_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbRequest.strSessionID) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbRequest.strSessionID) } // required string strPackageId = 2; @@ -2842,7 +2842,7 @@ inline void RdbRequest::clear_strpackageid() { clear_has_strpackageid(); } inline const ::std::string& RdbRequest::strpackageid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbRequest.strPackageId) + // @@protoc_insertion_point(field_get:iot_idl.RdbRequest.strPackageId) return *strpackageid_; } inline void RdbRequest::set_strpackageid(const ::std::string& value) { @@ -2851,7 +2851,7 @@ inline void RdbRequest::set_strpackageid(const ::std::string& value) { strpackageid_ = new ::std::string; } strpackageid_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbRequest.strPackageId) + // @@protoc_insertion_point(field_set:iot_idl.RdbRequest.strPackageId) } inline void RdbRequest::set_strpackageid(const char* value) { set_has_strpackageid(); @@ -2859,7 +2859,7 @@ inline void RdbRequest::set_strpackageid(const char* value) { strpackageid_ = new ::std::string; } strpackageid_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbRequest.strPackageId) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbRequest.strPackageId) } inline void RdbRequest::set_strpackageid(const char* value, size_t size) { set_has_strpackageid(); @@ -2867,14 +2867,14 @@ inline void RdbRequest::set_strpackageid(const char* value, size_t size) { strpackageid_ = new ::std::string; } strpackageid_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbRequest.strPackageId) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbRequest.strPackageId) } inline ::std::string* RdbRequest::mutable_strpackageid() { set_has_strpackageid(); if (strpackageid_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strpackageid_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbRequest.strPackageId) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbRequest.strPackageId) return strpackageid_; } inline ::std::string* RdbRequest::release_strpackageid() { @@ -2898,10 +2898,10 @@ inline void RdbRequest::set_allocated_strpackageid(::std::string* strpackageid) clear_has_strpackageid(); strpackageid_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbRequest.strPackageId) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbRequest.strPackageId) } -// optional .kbd_idlfile.RdbQuery msgQuery = 4; +// optional .iot_idl.RdbQuery msgQuery = 4; inline bool RdbRequest::has_msgquery() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -2912,26 +2912,26 @@ inline void RdbRequest::clear_has_msgquery() { _has_bits_[0] &= ~0x00000004u; } inline void RdbRequest::clear_msgquery() { - if (msgquery_ != NULL) msgquery_->::kbd_idlfile::RdbQuery::Clear(); + if (msgquery_ != NULL) msgquery_->::iot_idl::RdbQuery::Clear(); clear_has_msgquery(); } -inline const ::kbd_idlfile::RdbQuery& RdbRequest::msgquery() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbRequest.msgQuery) +inline const ::iot_idl::RdbQuery& RdbRequest::msgquery() const { + // @@protoc_insertion_point(field_get:iot_idl.RdbRequest.msgQuery) return msgquery_ != NULL ? *msgquery_ : *default_instance_->msgquery_; } -inline ::kbd_idlfile::RdbQuery* RdbRequest::mutable_msgquery() { +inline ::iot_idl::RdbQuery* RdbRequest::mutable_msgquery() { set_has_msgquery(); - if (msgquery_ == NULL) msgquery_ = new ::kbd_idlfile::RdbQuery; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbRequest.msgQuery) + if (msgquery_ == NULL) msgquery_ = new ::iot_idl::RdbQuery; + // @@protoc_insertion_point(field_mutable:iot_idl.RdbRequest.msgQuery) return msgquery_; } -inline ::kbd_idlfile::RdbQuery* RdbRequest::release_msgquery() { +inline ::iot_idl::RdbQuery* RdbRequest::release_msgquery() { clear_has_msgquery(); - ::kbd_idlfile::RdbQuery* temp = msgquery_; + ::iot_idl::RdbQuery* temp = msgquery_; msgquery_ = NULL; return temp; } -inline void RdbRequest::set_allocated_msgquery(::kbd_idlfile::RdbQuery* msgquery) { +inline void RdbRequest::set_allocated_msgquery(::iot_idl::RdbQuery* msgquery) { delete msgquery_; msgquery_ = msgquery; if (msgquery) { @@ -2939,10 +2939,10 @@ inline void RdbRequest::set_allocated_msgquery(::kbd_idlfile::RdbQuery* msgquery } else { clear_has_msgquery(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbRequest.msgQuery) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbRequest.msgQuery) } -// optional .kbd_idlfile.RdbInsert msgInsert = 5; +// optional .iot_idl.RdbInsert msgInsert = 5; inline bool RdbRequest::has_msginsert() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -2953,26 +2953,26 @@ inline void RdbRequest::clear_has_msginsert() { _has_bits_[0] &= ~0x00000008u; } inline void RdbRequest::clear_msginsert() { - if (msginsert_ != NULL) msginsert_->::kbd_idlfile::RdbInsert::Clear(); + if (msginsert_ != NULL) msginsert_->::iot_idl::RdbInsert::Clear(); clear_has_msginsert(); } -inline const ::kbd_idlfile::RdbInsert& RdbRequest::msginsert() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbRequest.msgInsert) +inline const ::iot_idl::RdbInsert& RdbRequest::msginsert() const { + // @@protoc_insertion_point(field_get:iot_idl.RdbRequest.msgInsert) return msginsert_ != NULL ? *msginsert_ : *default_instance_->msginsert_; } -inline ::kbd_idlfile::RdbInsert* RdbRequest::mutable_msginsert() { +inline ::iot_idl::RdbInsert* RdbRequest::mutable_msginsert() { set_has_msginsert(); - if (msginsert_ == NULL) msginsert_ = new ::kbd_idlfile::RdbInsert; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbRequest.msgInsert) + if (msginsert_ == NULL) msginsert_ = new ::iot_idl::RdbInsert; + // @@protoc_insertion_point(field_mutable:iot_idl.RdbRequest.msgInsert) return msginsert_; } -inline ::kbd_idlfile::RdbInsert* RdbRequest::release_msginsert() { +inline ::iot_idl::RdbInsert* RdbRequest::release_msginsert() { clear_has_msginsert(); - ::kbd_idlfile::RdbInsert* temp = msginsert_; + ::iot_idl::RdbInsert* temp = msginsert_; msginsert_ = NULL; return temp; } -inline void RdbRequest::set_allocated_msginsert(::kbd_idlfile::RdbInsert* msginsert) { +inline void RdbRequest::set_allocated_msginsert(::iot_idl::RdbInsert* msginsert) { delete msginsert_; msginsert_ = msginsert; if (msginsert) { @@ -2980,10 +2980,10 @@ inline void RdbRequest::set_allocated_msginsert(::kbd_idlfile::RdbInsert* msgins } else { clear_has_msginsert(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbRequest.msgInsert) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbRequest.msgInsert) } -// optional .kbd_idlfile.RdbRemove msgRemove = 6; +// optional .iot_idl.RdbRemove msgRemove = 6; inline bool RdbRequest::has_msgremove() const { return (_has_bits_[0] & 0x00000010u) != 0; } @@ -2994,26 +2994,26 @@ inline void RdbRequest::clear_has_msgremove() { _has_bits_[0] &= ~0x00000010u; } inline void RdbRequest::clear_msgremove() { - if (msgremove_ != NULL) msgremove_->::kbd_idlfile::RdbRemove::Clear(); + if (msgremove_ != NULL) msgremove_->::iot_idl::RdbRemove::Clear(); clear_has_msgremove(); } -inline const ::kbd_idlfile::RdbRemove& RdbRequest::msgremove() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbRequest.msgRemove) +inline const ::iot_idl::RdbRemove& RdbRequest::msgremove() const { + // @@protoc_insertion_point(field_get:iot_idl.RdbRequest.msgRemove) return msgremove_ != NULL ? *msgremove_ : *default_instance_->msgremove_; } -inline ::kbd_idlfile::RdbRemove* RdbRequest::mutable_msgremove() { +inline ::iot_idl::RdbRemove* RdbRequest::mutable_msgremove() { set_has_msgremove(); - if (msgremove_ == NULL) msgremove_ = new ::kbd_idlfile::RdbRemove; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbRequest.msgRemove) + if (msgremove_ == NULL) msgremove_ = new ::iot_idl::RdbRemove; + // @@protoc_insertion_point(field_mutable:iot_idl.RdbRequest.msgRemove) return msgremove_; } -inline ::kbd_idlfile::RdbRemove* RdbRequest::release_msgremove() { +inline ::iot_idl::RdbRemove* RdbRequest::release_msgremove() { clear_has_msgremove(); - ::kbd_idlfile::RdbRemove* temp = msgremove_; + ::iot_idl::RdbRemove* temp = msgremove_; msgremove_ = NULL; return temp; } -inline void RdbRequest::set_allocated_msgremove(::kbd_idlfile::RdbRemove* msgremove) { +inline void RdbRequest::set_allocated_msgremove(::iot_idl::RdbRemove* msgremove) { delete msgremove_; msgremove_ = msgremove; if (msgremove) { @@ -3021,10 +3021,10 @@ inline void RdbRequest::set_allocated_msgremove(::kbd_idlfile::RdbRemove* msgrem } else { clear_has_msgremove(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbRequest.msgRemove) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbRequest.msgRemove) } -// optional .kbd_idlfile.RdbUpdate msgUpdate = 7; +// optional .iot_idl.RdbUpdate msgUpdate = 7; inline bool RdbRequest::has_msgupdate() const { return (_has_bits_[0] & 0x00000020u) != 0; } @@ -3035,26 +3035,26 @@ inline void RdbRequest::clear_has_msgupdate() { _has_bits_[0] &= ~0x00000020u; } inline void RdbRequest::clear_msgupdate() { - if (msgupdate_ != NULL) msgupdate_->::kbd_idlfile::RdbUpdate::Clear(); + if (msgupdate_ != NULL) msgupdate_->::iot_idl::RdbUpdate::Clear(); clear_has_msgupdate(); } -inline const ::kbd_idlfile::RdbUpdate& RdbRequest::msgupdate() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbRequest.msgUpdate) +inline const ::iot_idl::RdbUpdate& RdbRequest::msgupdate() const { + // @@protoc_insertion_point(field_get:iot_idl.RdbRequest.msgUpdate) return msgupdate_ != NULL ? *msgupdate_ : *default_instance_->msgupdate_; } -inline ::kbd_idlfile::RdbUpdate* RdbRequest::mutable_msgupdate() { +inline ::iot_idl::RdbUpdate* RdbRequest::mutable_msgupdate() { set_has_msgupdate(); - if (msgupdate_ == NULL) msgupdate_ = new ::kbd_idlfile::RdbUpdate; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbRequest.msgUpdate) + if (msgupdate_ == NULL) msgupdate_ = new ::iot_idl::RdbUpdate; + // @@protoc_insertion_point(field_mutable:iot_idl.RdbRequest.msgUpdate) return msgupdate_; } -inline ::kbd_idlfile::RdbUpdate* RdbRequest::release_msgupdate() { +inline ::iot_idl::RdbUpdate* RdbRequest::release_msgupdate() { clear_has_msgupdate(); - ::kbd_idlfile::RdbUpdate* temp = msgupdate_; + ::iot_idl::RdbUpdate* temp = msgupdate_; msgupdate_ = NULL; return temp; } -inline void RdbRequest::set_allocated_msgupdate(::kbd_idlfile::RdbUpdate* msgupdate) { +inline void RdbRequest::set_allocated_msgupdate(::iot_idl::RdbUpdate* msgupdate) { delete msgupdate_; msgupdate_ = msgupdate; if (msgupdate) { @@ -3062,10 +3062,10 @@ inline void RdbRequest::set_allocated_msgupdate(::kbd_idlfile::RdbUpdate* msgupd } else { clear_has_msgupdate(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbRequest.msgUpdate) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbRequest.msgUpdate) } -// optional .kbd_idlfile.RdbLockTable msgLock = 8; +// optional .iot_idl.RdbLockTable msgLock = 8; inline bool RdbRequest::has_msglock() const { return (_has_bits_[0] & 0x00000040u) != 0; } @@ -3076,26 +3076,26 @@ inline void RdbRequest::clear_has_msglock() { _has_bits_[0] &= ~0x00000040u; } inline void RdbRequest::clear_msglock() { - if (msglock_ != NULL) msglock_->::kbd_idlfile::RdbLockTable::Clear(); + if (msglock_ != NULL) msglock_->::iot_idl::RdbLockTable::Clear(); clear_has_msglock(); } -inline const ::kbd_idlfile::RdbLockTable& RdbRequest::msglock() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbRequest.msgLock) +inline const ::iot_idl::RdbLockTable& RdbRequest::msglock() const { + // @@protoc_insertion_point(field_get:iot_idl.RdbRequest.msgLock) return msglock_ != NULL ? *msglock_ : *default_instance_->msglock_; } -inline ::kbd_idlfile::RdbLockTable* RdbRequest::mutable_msglock() { +inline ::iot_idl::RdbLockTable* RdbRequest::mutable_msglock() { set_has_msglock(); - if (msglock_ == NULL) msglock_ = new ::kbd_idlfile::RdbLockTable; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbRequest.msgLock) + if (msglock_ == NULL) msglock_ = new ::iot_idl::RdbLockTable; + // @@protoc_insertion_point(field_mutable:iot_idl.RdbRequest.msgLock) return msglock_; } -inline ::kbd_idlfile::RdbLockTable* RdbRequest::release_msglock() { +inline ::iot_idl::RdbLockTable* RdbRequest::release_msglock() { clear_has_msglock(); - ::kbd_idlfile::RdbLockTable* temp = msglock_; + ::iot_idl::RdbLockTable* temp = msglock_; msglock_ = NULL; return temp; } -inline void RdbRequest::set_allocated_msglock(::kbd_idlfile::RdbLockTable* msglock) { +inline void RdbRequest::set_allocated_msglock(::iot_idl::RdbLockTable* msglock) { delete msglock_; msglock_ = msglock; if (msglock) { @@ -3103,7 +3103,7 @@ inline void RdbRequest::set_allocated_msglock(::kbd_idlfile::RdbLockTable* msglo } else { clear_has_msglock(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbRequest.msgLock) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbRequest.msgLock) } // ------------------------------------------------------------------- @@ -3127,7 +3127,7 @@ inline void RdbReply::clear_strsessionid() { clear_has_strsessionid(); } inline const ::std::string& RdbReply::strsessionid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbReply.strSessionID) + // @@protoc_insertion_point(field_get:iot_idl.RdbReply.strSessionID) return *strsessionid_; } inline void RdbReply::set_strsessionid(const ::std::string& value) { @@ -3136,7 +3136,7 @@ inline void RdbReply::set_strsessionid(const ::std::string& value) { strsessionid_ = new ::std::string; } strsessionid_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbReply.strSessionID) + // @@protoc_insertion_point(field_set:iot_idl.RdbReply.strSessionID) } inline void RdbReply::set_strsessionid(const char* value) { set_has_strsessionid(); @@ -3144,7 +3144,7 @@ inline void RdbReply::set_strsessionid(const char* value) { strsessionid_ = new ::std::string; } strsessionid_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbReply.strSessionID) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbReply.strSessionID) } inline void RdbReply::set_strsessionid(const char* value, size_t size) { set_has_strsessionid(); @@ -3152,14 +3152,14 @@ inline void RdbReply::set_strsessionid(const char* value, size_t size) { strsessionid_ = new ::std::string; } strsessionid_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbReply.strSessionID) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbReply.strSessionID) } inline ::std::string* RdbReply::mutable_strsessionid() { set_has_strsessionid(); if (strsessionid_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strsessionid_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbReply.strSessionID) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbReply.strSessionID) return strsessionid_; } inline ::std::string* RdbReply::release_strsessionid() { @@ -3183,7 +3183,7 @@ inline void RdbReply::set_allocated_strsessionid(::std::string* strsessionid) { clear_has_strsessionid(); strsessionid_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbReply.strSessionID) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbReply.strSessionID) } // required string strPackageId = 3; @@ -3203,7 +3203,7 @@ inline void RdbReply::clear_strpackageid() { clear_has_strpackageid(); } inline const ::std::string& RdbReply::strpackageid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbReply.strPackageId) + // @@protoc_insertion_point(field_get:iot_idl.RdbReply.strPackageId) return *strpackageid_; } inline void RdbReply::set_strpackageid(const ::std::string& value) { @@ -3212,7 +3212,7 @@ inline void RdbReply::set_strpackageid(const ::std::string& value) { strpackageid_ = new ::std::string; } strpackageid_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbReply.strPackageId) + // @@protoc_insertion_point(field_set:iot_idl.RdbReply.strPackageId) } inline void RdbReply::set_strpackageid(const char* value) { set_has_strpackageid(); @@ -3220,7 +3220,7 @@ inline void RdbReply::set_strpackageid(const char* value) { strpackageid_ = new ::std::string; } strpackageid_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbReply.strPackageId) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbReply.strPackageId) } inline void RdbReply::set_strpackageid(const char* value, size_t size) { set_has_strpackageid(); @@ -3228,14 +3228,14 @@ inline void RdbReply::set_strpackageid(const char* value, size_t size) { strpackageid_ = new ::std::string; } strpackageid_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbReply.strPackageId) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbReply.strPackageId) } inline ::std::string* RdbReply::mutable_strpackageid() { set_has_strpackageid(); if (strpackageid_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strpackageid_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbReply.strPackageId) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbReply.strPackageId) return strpackageid_; } inline ::std::string* RdbReply::release_strpackageid() { @@ -3259,10 +3259,10 @@ inline void RdbReply::set_allocated_strpackageid(::std::string* strpackageid) { clear_has_strpackageid(); strpackageid_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbReply.strPackageId) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbReply.strPackageId) } -// required .kbd_idlfile.RdbRet ret = 2; +// required .iot_idl.RdbRet ret = 2; inline bool RdbReply::has_ret() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -3273,26 +3273,26 @@ inline void RdbReply::clear_has_ret() { _has_bits_[0] &= ~0x00000004u; } inline void RdbReply::clear_ret() { - if (ret_ != NULL) ret_->::kbd_idlfile::RdbRet::Clear(); + if (ret_ != NULL) ret_->::iot_idl::RdbRet::Clear(); clear_has_ret(); } -inline const ::kbd_idlfile::RdbRet& RdbReply::ret() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbReply.ret) +inline const ::iot_idl::RdbRet& RdbReply::ret() const { + // @@protoc_insertion_point(field_get:iot_idl.RdbReply.ret) return ret_ != NULL ? *ret_ : *default_instance_->ret_; } -inline ::kbd_idlfile::RdbRet* RdbReply::mutable_ret() { +inline ::iot_idl::RdbRet* RdbReply::mutable_ret() { set_has_ret(); - if (ret_ == NULL) ret_ = new ::kbd_idlfile::RdbRet; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbReply.ret) + if (ret_ == NULL) ret_ = new ::iot_idl::RdbRet; + // @@protoc_insertion_point(field_mutable:iot_idl.RdbReply.ret) return ret_; } -inline ::kbd_idlfile::RdbRet* RdbReply::release_ret() { +inline ::iot_idl::RdbRet* RdbReply::release_ret() { clear_has_ret(); - ::kbd_idlfile::RdbRet* temp = ret_; + ::iot_idl::RdbRet* temp = ret_; ret_ = NULL; return temp; } -inline void RdbReply::set_allocated_ret(::kbd_idlfile::RdbRet* ret) { +inline void RdbReply::set_allocated_ret(::iot_idl::RdbRet* ret) { delete ret_; ret_ = ret; if (ret) { @@ -3300,7 +3300,7 @@ inline void RdbReply::set_allocated_ret(::kbd_idlfile::RdbRet* ret) { } else { clear_has_ret(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbReply.ret) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbReply.ret) } // ------------------------------------------------------------------- @@ -3324,7 +3324,7 @@ inline void RdbReplace::clear_strsessionid() { clear_has_strsessionid(); } inline const ::std::string& RdbReplace::strsessionid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbReplace.strSessionID) + // @@protoc_insertion_point(field_get:iot_idl.RdbReplace.strSessionID) return *strsessionid_; } inline void RdbReplace::set_strsessionid(const ::std::string& value) { @@ -3333,7 +3333,7 @@ inline void RdbReplace::set_strsessionid(const ::std::string& value) { strsessionid_ = new ::std::string; } strsessionid_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbReplace.strSessionID) + // @@protoc_insertion_point(field_set:iot_idl.RdbReplace.strSessionID) } inline void RdbReplace::set_strsessionid(const char* value) { set_has_strsessionid(); @@ -3341,7 +3341,7 @@ inline void RdbReplace::set_strsessionid(const char* value) { strsessionid_ = new ::std::string; } strsessionid_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbReplace.strSessionID) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbReplace.strSessionID) } inline void RdbReplace::set_strsessionid(const char* value, size_t size) { set_has_strsessionid(); @@ -3349,14 +3349,14 @@ inline void RdbReplace::set_strsessionid(const char* value, size_t size) { strsessionid_ = new ::std::string; } strsessionid_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbReplace.strSessionID) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbReplace.strSessionID) } inline ::std::string* RdbReplace::mutable_strsessionid() { set_has_strsessionid(); if (strsessionid_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strsessionid_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbReplace.strSessionID) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbReplace.strSessionID) return strsessionid_; } inline ::std::string* RdbReplace::release_strsessionid() { @@ -3380,7 +3380,7 @@ inline void RdbReplace::set_allocated_strsessionid(::std::string* strsessionid) clear_has_strsessionid(); strsessionid_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbReplace.strSessionID) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbReplace.strSessionID) } // required string strTableName = 2; @@ -3400,7 +3400,7 @@ inline void RdbReplace::clear_strtablename() { clear_has_strtablename(); } inline const ::std::string& RdbReplace::strtablename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbReplace.strTableName) + // @@protoc_insertion_point(field_get:iot_idl.RdbReplace.strTableName) return *strtablename_; } inline void RdbReplace::set_strtablename(const ::std::string& value) { @@ -3409,7 +3409,7 @@ inline void RdbReplace::set_strtablename(const ::std::string& value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbReplace.strTableName) + // @@protoc_insertion_point(field_set:iot_idl.RdbReplace.strTableName) } inline void RdbReplace::set_strtablename(const char* value) { set_has_strtablename(); @@ -3417,7 +3417,7 @@ inline void RdbReplace::set_strtablename(const char* value) { strtablename_ = new ::std::string; } strtablename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbReplace.strTableName) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbReplace.strTableName) } inline void RdbReplace::set_strtablename(const char* value, size_t size) { set_has_strtablename(); @@ -3425,14 +3425,14 @@ inline void RdbReplace::set_strtablename(const char* value, size_t size) { strtablename_ = new ::std::string; } strtablename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbReplace.strTableName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbReplace.strTableName) } inline ::std::string* RdbReplace::mutable_strtablename() { set_has_strtablename(); if (strtablename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strtablename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbReplace.strTableName) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbReplace.strTableName) return strtablename_; } inline ::std::string* RdbReplace::release_strtablename() { @@ -3456,36 +3456,36 @@ inline void RdbReplace::set_allocated_strtablename(::std::string* strtablename) clear_has_strtablename(); strtablename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbReplace.strTableName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbReplace.strTableName) } -// repeated .kbd_idlfile.RdbSynUpdate msgUpdate = 3; +// repeated .iot_idl.RdbSynUpdate msgUpdate = 3; inline int RdbReplace::msgupdate_size() const { return msgupdate_.size(); } inline void RdbReplace::clear_msgupdate() { msgupdate_.Clear(); } -inline const ::kbd_idlfile::RdbSynUpdate& RdbReplace::msgupdate(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbReplace.msgUpdate) +inline const ::iot_idl::RdbSynUpdate& RdbReplace::msgupdate(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.RdbReplace.msgUpdate) return msgupdate_.Get(index); } -inline ::kbd_idlfile::RdbSynUpdate* RdbReplace::mutable_msgupdate(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbReplace.msgUpdate) +inline ::iot_idl::RdbSynUpdate* RdbReplace::mutable_msgupdate(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.RdbReplace.msgUpdate) return msgupdate_.Mutable(index); } -inline ::kbd_idlfile::RdbSynUpdate* RdbReplace::add_msgupdate() { - // @@protoc_insertion_point(field_add:kbd_idlfile.RdbReplace.msgUpdate) +inline ::iot_idl::RdbSynUpdate* RdbReplace::add_msgupdate() { + // @@protoc_insertion_point(field_add:iot_idl.RdbReplace.msgUpdate) return msgupdate_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbSynUpdate >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbSynUpdate >& RdbReplace::msgupdate() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.RdbReplace.msgUpdate) + // @@protoc_insertion_point(field_list:iot_idl.RdbReplace.msgUpdate) return msgupdate_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbSynUpdate >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbSynUpdate >* RdbReplace::mutable_msgupdate() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.RdbReplace.msgUpdate) + // @@protoc_insertion_point(field_mutable_list:iot_idl.RdbReplace.msgUpdate) return &msgupdate_; } @@ -3493,63 +3493,63 @@ RdbReplace::mutable_msgupdate() { // RdbSynUpdate -// repeated .kbd_idlfile.RdbCondition msgCondition = 1; +// repeated .iot_idl.RdbCondition msgCondition = 1; inline int RdbSynUpdate::msgcondition_size() const { return msgcondition_.size(); } inline void RdbSynUpdate::clear_msgcondition() { msgcondition_.Clear(); } -inline const ::kbd_idlfile::RdbCondition& RdbSynUpdate::msgcondition(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbSynUpdate.msgCondition) +inline const ::iot_idl::RdbCondition& RdbSynUpdate::msgcondition(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.RdbSynUpdate.msgCondition) return msgcondition_.Get(index); } -inline ::kbd_idlfile::RdbCondition* RdbSynUpdate::mutable_msgcondition(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbSynUpdate.msgCondition) +inline ::iot_idl::RdbCondition* RdbSynUpdate::mutable_msgcondition(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.RdbSynUpdate.msgCondition) return msgcondition_.Mutable(index); } -inline ::kbd_idlfile::RdbCondition* RdbSynUpdate::add_msgcondition() { - // @@protoc_insertion_point(field_add:kbd_idlfile.RdbSynUpdate.msgCondition) +inline ::iot_idl::RdbCondition* RdbSynUpdate::add_msgcondition() { + // @@protoc_insertion_point(field_add:iot_idl.RdbSynUpdate.msgCondition) return msgcondition_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition >& RdbSynUpdate::msgcondition() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.RdbSynUpdate.msgCondition) + // @@protoc_insertion_point(field_list:iot_idl.RdbSynUpdate.msgCondition) return msgcondition_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbCondition >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbCondition >* RdbSynUpdate::mutable_msgcondition() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.RdbSynUpdate.msgCondition) + // @@protoc_insertion_point(field_mutable_list:iot_idl.RdbSynUpdate.msgCondition) return &msgcondition_; } -// repeated .kbd_idlfile.RdbUpdateValue msgUpdateValue = 2; +// repeated .iot_idl.RdbUpdateValue msgUpdateValue = 2; inline int RdbSynUpdate::msgupdatevalue_size() const { return msgupdatevalue_.size(); } inline void RdbSynUpdate::clear_msgupdatevalue() { msgupdatevalue_.Clear(); } -inline const ::kbd_idlfile::RdbUpdateValue& RdbSynUpdate::msgupdatevalue(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbSynUpdate.msgUpdateValue) +inline const ::iot_idl::RdbUpdateValue& RdbSynUpdate::msgupdatevalue(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.RdbSynUpdate.msgUpdateValue) return msgupdatevalue_.Get(index); } -inline ::kbd_idlfile::RdbUpdateValue* RdbSynUpdate::mutable_msgupdatevalue(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbSynUpdate.msgUpdateValue) +inline ::iot_idl::RdbUpdateValue* RdbSynUpdate::mutable_msgupdatevalue(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.RdbSynUpdate.msgUpdateValue) return msgupdatevalue_.Mutable(index); } -inline ::kbd_idlfile::RdbUpdateValue* RdbSynUpdate::add_msgupdatevalue() { - // @@protoc_insertion_point(field_add:kbd_idlfile.RdbSynUpdate.msgUpdateValue) +inline ::iot_idl::RdbUpdateValue* RdbSynUpdate::add_msgupdatevalue() { + // @@protoc_insertion_point(field_add:iot_idl.RdbSynUpdate.msgUpdateValue) return msgupdatevalue_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbUpdateValue >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbUpdateValue >& RdbSynUpdate::msgupdatevalue() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.RdbSynUpdate.msgUpdateValue) + // @@protoc_insertion_point(field_list:iot_idl.RdbSynUpdate.msgUpdateValue) return msgupdatevalue_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::RdbUpdateValue >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::RdbUpdateValue >* RdbSynUpdate::mutable_msgupdatevalue() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.RdbSynUpdate.msgUpdateValue) + // @@protoc_insertion_point(field_mutable_list:iot_idl.RdbSynUpdate.msgUpdateValue) return &msgupdatevalue_; } @@ -3570,7 +3570,7 @@ inline void RdbSynUpdate::clear_strkeys() { clear_has_strkeys(); } inline const ::std::string& RdbSynUpdate::strkeys() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RdbSynUpdate.strKeys) + // @@protoc_insertion_point(field_get:iot_idl.RdbSynUpdate.strKeys) return *strkeys_; } inline void RdbSynUpdate::set_strkeys(const ::std::string& value) { @@ -3579,7 +3579,7 @@ inline void RdbSynUpdate::set_strkeys(const ::std::string& value) { strkeys_ = new ::std::string; } strkeys_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RdbSynUpdate.strKeys) + // @@protoc_insertion_point(field_set:iot_idl.RdbSynUpdate.strKeys) } inline void RdbSynUpdate::set_strkeys(const char* value) { set_has_strkeys(); @@ -3587,7 +3587,7 @@ inline void RdbSynUpdate::set_strkeys(const char* value) { strkeys_ = new ::std::string; } strkeys_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RdbSynUpdate.strKeys) + // @@protoc_insertion_point(field_set_char:iot_idl.RdbSynUpdate.strKeys) } inline void RdbSynUpdate::set_strkeys(const char* value, size_t size) { set_has_strkeys(); @@ -3595,14 +3595,14 @@ inline void RdbSynUpdate::set_strkeys(const char* value, size_t size) { strkeys_ = new ::std::string; } strkeys_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RdbSynUpdate.strKeys) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RdbSynUpdate.strKeys) } inline ::std::string* RdbSynUpdate::mutable_strkeys() { set_has_strkeys(); if (strkeys_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strkeys_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RdbSynUpdate.strKeys) + // @@protoc_insertion_point(field_mutable:iot_idl.RdbSynUpdate.strKeys) return strkeys_; } inline ::std::string* RdbSynUpdate::release_strkeys() { @@ -3626,22 +3626,22 @@ inline void RdbSynUpdate::set_allocated_strkeys(::std::string* strkeys) { clear_has_strkeys(); strkeys_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RdbSynUpdate.strKeys) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RdbSynUpdate.strKeys) } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::enRdbServerMessage> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enRdbServerMessage> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enRdbServerMessage>() { - return ::kbd_idlfile::enRdbServerMessage_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enRdbServerMessage>() { + return ::iot_idl::enRdbServerMessage_descriptor(); } } // namespace google diff --git a/platform/src/idl_files/RdbServerMessage.proto b/platform/src/idl_files/RdbServerMessage.proto index 00939f94..f36d003f 100644 --- a/platform/src/idl_files/RdbServerMessage.proto +++ b/platform/src/idl_files/RdbServerMessage.proto @@ -4,7 +4,7 @@ syntax="proto2"; import "Public.proto"; -package kbd_idlfile; +package iot_idl; //======================================================================================== // 消息类型枚举 diff --git a/platform/src/idl_files/TsdbSaveMessage.pb.cc b/platform/src/idl_files/TsdbSaveMessage.pb.cc index 043754d8..8aa15bfa 100644 --- a/platform/src/idl_files/TsdbSaveMessage.pb.cc +++ b/platform/src/idl_files/TsdbSaveMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -109,16 +109,16 @@ void protobuf_AddDesc_TsdbSaveMessage_2eproto() { already_here = true; GOOGLE_PROTOBUF_VERIFY_VERSION; - ::kbd_idlfile::protobuf_AddDesc_Public_2eproto(); + ::iot_idl::protobuf_AddDesc_Public_2eproto(); ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\025TsdbSaveMessage.proto\022\013kbd_idlfile\032\014Pu" + "\n\025TsdbSaveMessage.proto\022\013iot_idl\032\014Pu" "blic.proto\"\\\n\nSTsdbPoint\022\022\n\ntime_stamp\030\001" " \002(\003\022\017\n\007tag_val\030\002 \003(\t\022)\n\tfield_val\030\003 \003(\013" - "2\026.kbd_idlfile.SVariable\"\240\001\n\nSTssInsert\022" - "1\n\013save_action\030\001 \002(\0162\034.kbd_idlfile.enTss" + "2\026.iot_idl.SVariable\"\240\001\n\nSTssInsert\022" + "1\n\013save_action\030\001 \002(\0162\034.iot_idl.enTss" "SaveAction\022\021\n\tmeas_name\030\002 \002(\t\022\020\n\010tag_nam" "e\030\003 \003(\t\022\022\n\nfield_name\030\004 \003(\t\022&\n\005point\030\005 \003" - "(\0132\027.kbd_idlfile.STsdbPoint*B\n\014enTssMsgT" + "(\0132\027.iot_idl.STsdbPoint*B\n\014enTssMsgT" "ype\022\026\n\022MT_TSS_APP2SRV_ADD\020\001\022\032\n\026MT_TSS_SR" "V2APP_ADD_ACK\020\002*p\n\017enTssSaveAction\022\025\n\021SA" "_TSS_DO_NOTHING\020\000\022\025\n\021SA_TSS_LOCAL_ONLY\020\001" @@ -181,7 +181,7 @@ const int STsdbPoint::kFieldValFieldNumber; STsdbPoint::STsdbPoint() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.STsdbPoint) + // @@protoc_insertion_point(constructor:iot_idl.STsdbPoint) } void STsdbPoint::InitAsDefaultInstance() { @@ -191,7 +191,7 @@ STsdbPoint::STsdbPoint(const STsdbPoint& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.STsdbPoint) + // @@protoc_insertion_point(copy_constructor:iot_idl.STsdbPoint) } void STsdbPoint::SharedCtor() { @@ -202,7 +202,7 @@ void STsdbPoint::SharedCtor() { } STsdbPoint::~STsdbPoint() { - // @@protoc_insertion_point(destructor:kbd_idlfile.STsdbPoint) + // @@protoc_insertion_point(destructor:iot_idl.STsdbPoint) SharedDtor(); } @@ -244,7 +244,7 @@ bool STsdbPoint::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.STsdbPoint) + // @@protoc_insertion_point(parse_start:iot_idl.STsdbPoint) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -283,7 +283,7 @@ bool STsdbPoint::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SVariable field_val = 3; + // repeated .iot_idl.SVariable field_val = 3; case 3: { if (tag == 26) { parse_field_val: @@ -311,17 +311,17 @@ bool STsdbPoint::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.STsdbPoint) + // @@protoc_insertion_point(parse_success:iot_idl.STsdbPoint) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.STsdbPoint) + // @@protoc_insertion_point(parse_failure:iot_idl.STsdbPoint) return false; #undef DO_ } void STsdbPoint::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.STsdbPoint) + // @@protoc_insertion_point(serialize_start:iot_idl.STsdbPoint) // required int64 time_stamp = 1; if (has_time_stamp()) { ::google::protobuf::internal::WireFormatLite::WriteInt64(1, this->time_stamp(), output); @@ -337,7 +337,7 @@ void STsdbPoint::SerializeWithCachedSizes( 2, this->tag_val(i), output); } - // repeated .kbd_idlfile.SVariable field_val = 3; + // repeated .iot_idl.SVariable field_val = 3; for (int i = 0; i < this->field_val_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->field_val(i), output); @@ -347,12 +347,12 @@ void STsdbPoint::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.STsdbPoint) + // @@protoc_insertion_point(serialize_end:iot_idl.STsdbPoint) } ::google::protobuf::uint8* STsdbPoint::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.STsdbPoint) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.STsdbPoint) // required int64 time_stamp = 1; if (has_time_stamp()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(1, this->time_stamp(), target); @@ -368,7 +368,7 @@ void STsdbPoint::SerializeWithCachedSizes( WriteStringToArray(2, this->tag_val(i), target); } - // repeated .kbd_idlfile.SVariable field_val = 3; + // repeated .iot_idl.SVariable field_val = 3; for (int i = 0; i < this->field_val_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -379,7 +379,7 @@ void STsdbPoint::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.STsdbPoint) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.STsdbPoint) return target; } @@ -402,7 +402,7 @@ int STsdbPoint::ByteSize() const { this->tag_val(i)); } - // repeated .kbd_idlfile.SVariable field_val = 3; + // repeated .iot_idl.SVariable field_val = 3; total_size += 1 * this->field_val_size(); for (int i = 0; i < this->field_val_size(); i++) { total_size += @@ -497,7 +497,7 @@ const int STssInsert::kPointFieldNumber; STssInsert::STssInsert() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.STssInsert) + // @@protoc_insertion_point(constructor:iot_idl.STssInsert) } void STssInsert::InitAsDefaultInstance() { @@ -507,7 +507,7 @@ STssInsert::STssInsert(const STssInsert& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.STssInsert) + // @@protoc_insertion_point(copy_constructor:iot_idl.STssInsert) } void STssInsert::SharedCtor() { @@ -519,7 +519,7 @@ void STssInsert::SharedCtor() { } STssInsert::~STssInsert() { - // @@protoc_insertion_point(destructor:kbd_idlfile.STssInsert) + // @@protoc_insertion_point(destructor:iot_idl.STssInsert) SharedDtor(); } @@ -572,21 +572,21 @@ bool STssInsert::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.STssInsert) + // @@protoc_insertion_point(parse_start:iot_idl.STssInsert) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .kbd_idlfile.enTssSaveAction save_action = 1; + // required .iot_idl.enTssSaveAction save_action = 1; case 1: { if (tag == 8) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::enTssSaveAction_IsValid(value)) { - set_save_action(static_cast< ::kbd_idlfile::enTssSaveAction >(value)); + if (::iot_idl::enTssSaveAction_IsValid(value)) { + set_save_action(static_cast< ::iot_idl::enTssSaveAction >(value)); } else { mutable_unknown_fields()->AddVarint(1, value); } @@ -652,7 +652,7 @@ bool STssInsert::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.STsdbPoint point = 5; + // repeated .iot_idl.STsdbPoint point = 5; case 5: { if (tag == 42) { parse_point: @@ -680,18 +680,18 @@ bool STssInsert::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.STssInsert) + // @@protoc_insertion_point(parse_success:iot_idl.STssInsert) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.STssInsert) + // @@protoc_insertion_point(parse_failure:iot_idl.STssInsert) return false; #undef DO_ } void STssInsert::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.STssInsert) - // required .kbd_idlfile.enTssSaveAction save_action = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.STssInsert) + // required .iot_idl.enTssSaveAction save_action = 1; if (has_save_action()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 1, this->save_action(), output); @@ -727,7 +727,7 @@ void STssInsert::SerializeWithCachedSizes( 4, this->field_name(i), output); } - // repeated .kbd_idlfile.STsdbPoint point = 5; + // repeated .iot_idl.STsdbPoint point = 5; for (int i = 0; i < this->point_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 5, this->point(i), output); @@ -737,13 +737,13 @@ void STssInsert::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.STssInsert) + // @@protoc_insertion_point(serialize_end:iot_idl.STssInsert) } ::google::protobuf::uint8* STssInsert::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.STssInsert) - // required .kbd_idlfile.enTssSaveAction save_action = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.STssInsert) + // required .iot_idl.enTssSaveAction save_action = 1; if (has_save_action()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 1, this->save_action(), target); @@ -780,7 +780,7 @@ void STssInsert::SerializeWithCachedSizes( WriteStringToArray(4, this->field_name(i), target); } - // repeated .kbd_idlfile.STsdbPoint point = 5; + // repeated .iot_idl.STsdbPoint point = 5; for (int i = 0; i < this->point_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -791,7 +791,7 @@ void STssInsert::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.STssInsert) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.STssInsert) return target; } @@ -799,7 +799,7 @@ int STssInsert::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.enTssSaveAction save_action = 1; + // required .iot_idl.enTssSaveAction save_action = 1; if (has_save_action()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->save_action()); @@ -827,7 +827,7 @@ int STssInsert::ByteSize() const { this->field_name(i)); } - // repeated .kbd_idlfile.STsdbPoint point = 5; + // repeated .iot_idl.STsdbPoint point = 5; total_size += 1 * this->point_size(); for (int i = 0; i < this->point_size(); i++) { total_size += @@ -917,6 +917,6 @@ void STssInsert::Swap(STssInsert* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/platform/src/idl_files/TsdbSaveMessage.pb.h b/platform/src/idl_files/TsdbSaveMessage.pb.h index 8191facd..c29ee9cc 100644 --- a/platform/src/idl_files/TsdbSaveMessage.pb.h +++ b/platform/src/idl_files/TsdbSaveMessage.pb.h @@ -28,7 +28,7 @@ #include "Public.pb.h" // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { // Internal implementation detail -- do not call these. void IDL_FILES_EXPORT protobuf_AddDesc_TsdbSaveMessage_2eproto(); @@ -156,19 +156,19 @@ class IDL_FILES_EXPORT STsdbPoint : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& tag_val() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_tag_val(); - // repeated .kbd_idlfile.SVariable field_val = 3; + // repeated .iot_idl.SVariable field_val = 3; inline int field_val_size() const; inline void clear_field_val(); static const int kFieldValFieldNumber = 3; - inline const ::kbd_idlfile::SVariable& field_val(int index) const; - inline ::kbd_idlfile::SVariable* mutable_field_val(int index); - inline ::kbd_idlfile::SVariable* add_field_val(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVariable >& + inline const ::iot_idl::SVariable& field_val(int index) const; + inline ::iot_idl::SVariable* mutable_field_val(int index); + inline ::iot_idl::SVariable* add_field_val(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SVariable >& field_val() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVariable >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SVariable >* mutable_field_val(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.STsdbPoint) + // @@protoc_insertion_point(class_scope:iot_idl.STsdbPoint) private: inline void set_has_time_stamp(); inline void clear_has_time_stamp(); @@ -179,7 +179,7 @@ class IDL_FILES_EXPORT STsdbPoint : public ::google::protobuf::Message { mutable int _cached_size_; ::google::protobuf::int64 time_stamp_; ::google::protobuf::RepeatedPtrField< ::std::string> tag_val_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVariable > field_val_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SVariable > field_val_; friend void IDL_FILES_EXPORT protobuf_AddDesc_TsdbSaveMessage_2eproto(); friend void protobuf_AssignDesc_TsdbSaveMessage_2eproto(); friend void protobuf_ShutdownFile_TsdbSaveMessage_2eproto(); @@ -242,12 +242,12 @@ class IDL_FILES_EXPORT STssInsert : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.enTssSaveAction save_action = 1; + // required .iot_idl.enTssSaveAction save_action = 1; inline bool has_save_action() const; inline void clear_save_action(); static const int kSaveActionFieldNumber = 1; - inline ::kbd_idlfile::enTssSaveAction save_action() const; - inline void set_save_action(::kbd_idlfile::enTssSaveAction value); + inline ::iot_idl::enTssSaveAction save_action() const; + inline void set_save_action(::iot_idl::enTssSaveAction value); // required string meas_name = 2; inline bool has_meas_name() const; @@ -293,19 +293,19 @@ class IDL_FILES_EXPORT STssInsert : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& field_name() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_field_name(); - // repeated .kbd_idlfile.STsdbPoint point = 5; + // repeated .iot_idl.STsdbPoint point = 5; inline int point_size() const; inline void clear_point(); static const int kPointFieldNumber = 5; - inline const ::kbd_idlfile::STsdbPoint& point(int index) const; - inline ::kbd_idlfile::STsdbPoint* mutable_point(int index); - inline ::kbd_idlfile::STsdbPoint* add_point(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::STsdbPoint >& + inline const ::iot_idl::STsdbPoint& point(int index) const; + inline ::iot_idl::STsdbPoint* mutable_point(int index); + inline ::iot_idl::STsdbPoint* add_point(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::STsdbPoint >& point() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::STsdbPoint >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::STsdbPoint >* mutable_point(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.STssInsert) + // @@protoc_insertion_point(class_scope:iot_idl.STssInsert) private: inline void set_has_save_action(); inline void clear_has_save_action(); @@ -319,7 +319,7 @@ class IDL_FILES_EXPORT STssInsert : public ::google::protobuf::Message { ::std::string* meas_name_; ::google::protobuf::RepeatedPtrField< ::std::string> tag_name_; ::google::protobuf::RepeatedPtrField< ::std::string> field_name_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::STsdbPoint > point_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::STsdbPoint > point_; int save_action_; friend void IDL_FILES_EXPORT protobuf_AddDesc_TsdbSaveMessage_2eproto(); friend void protobuf_AssignDesc_TsdbSaveMessage_2eproto(); @@ -350,13 +350,13 @@ inline void STsdbPoint::clear_time_stamp() { clear_has_time_stamp(); } inline ::google::protobuf::int64 STsdbPoint::time_stamp() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.STsdbPoint.time_stamp) + // @@protoc_insertion_point(field_get:iot_idl.STsdbPoint.time_stamp) return time_stamp_; } inline void STsdbPoint::set_time_stamp(::google::protobuf::int64 value) { set_has_time_stamp(); time_stamp_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.STsdbPoint.time_stamp) + // @@protoc_insertion_point(field_set:iot_idl.STsdbPoint.time_stamp) } // repeated string tag_val = 2; @@ -367,79 +367,79 @@ inline void STsdbPoint::clear_tag_val() { tag_val_.Clear(); } inline const ::std::string& STsdbPoint::tag_val(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.STsdbPoint.tag_val) + // @@protoc_insertion_point(field_get:iot_idl.STsdbPoint.tag_val) return tag_val_.Get(index); } inline ::std::string* STsdbPoint::mutable_tag_val(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.STsdbPoint.tag_val) + // @@protoc_insertion_point(field_mutable:iot_idl.STsdbPoint.tag_val) return tag_val_.Mutable(index); } inline void STsdbPoint::set_tag_val(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.STsdbPoint.tag_val) + // @@protoc_insertion_point(field_set:iot_idl.STsdbPoint.tag_val) tag_val_.Mutable(index)->assign(value); } inline void STsdbPoint::set_tag_val(int index, const char* value) { tag_val_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.STsdbPoint.tag_val) + // @@protoc_insertion_point(field_set_char:iot_idl.STsdbPoint.tag_val) } inline void STsdbPoint::set_tag_val(int index, const char* value, size_t size) { tag_val_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.STsdbPoint.tag_val) + // @@protoc_insertion_point(field_set_pointer:iot_idl.STsdbPoint.tag_val) } inline ::std::string* STsdbPoint::add_tag_val() { return tag_val_.Add(); } inline void STsdbPoint::add_tag_val(const ::std::string& value) { tag_val_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.STsdbPoint.tag_val) + // @@protoc_insertion_point(field_add:iot_idl.STsdbPoint.tag_val) } inline void STsdbPoint::add_tag_val(const char* value) { tag_val_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.STsdbPoint.tag_val) + // @@protoc_insertion_point(field_add_char:iot_idl.STsdbPoint.tag_val) } inline void STsdbPoint::add_tag_val(const char* value, size_t size) { tag_val_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.STsdbPoint.tag_val) + // @@protoc_insertion_point(field_add_pointer:iot_idl.STsdbPoint.tag_val) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& STsdbPoint::tag_val() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.STsdbPoint.tag_val) + // @@protoc_insertion_point(field_list:iot_idl.STsdbPoint.tag_val) return tag_val_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* STsdbPoint::mutable_tag_val() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.STsdbPoint.tag_val) + // @@protoc_insertion_point(field_mutable_list:iot_idl.STsdbPoint.tag_val) return &tag_val_; } -// repeated .kbd_idlfile.SVariable field_val = 3; +// repeated .iot_idl.SVariable field_val = 3; inline int STsdbPoint::field_val_size() const { return field_val_.size(); } inline void STsdbPoint::clear_field_val() { field_val_.Clear(); } -inline const ::kbd_idlfile::SVariable& STsdbPoint::field_val(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.STsdbPoint.field_val) +inline const ::iot_idl::SVariable& STsdbPoint::field_val(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.STsdbPoint.field_val) return field_val_.Get(index); } -inline ::kbd_idlfile::SVariable* STsdbPoint::mutable_field_val(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.STsdbPoint.field_val) +inline ::iot_idl::SVariable* STsdbPoint::mutable_field_val(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.STsdbPoint.field_val) return field_val_.Mutable(index); } -inline ::kbd_idlfile::SVariable* STsdbPoint::add_field_val() { - // @@protoc_insertion_point(field_add:kbd_idlfile.STsdbPoint.field_val) +inline ::iot_idl::SVariable* STsdbPoint::add_field_val() { + // @@protoc_insertion_point(field_add:iot_idl.STsdbPoint.field_val) return field_val_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVariable >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SVariable >& STsdbPoint::field_val() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.STsdbPoint.field_val) + // @@protoc_insertion_point(field_list:iot_idl.STsdbPoint.field_val) return field_val_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVariable >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SVariable >* STsdbPoint::mutable_field_val() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.STsdbPoint.field_val) + // @@protoc_insertion_point(field_mutable_list:iot_idl.STsdbPoint.field_val) return &field_val_; } @@ -447,7 +447,7 @@ STsdbPoint::mutable_field_val() { // STssInsert -// required .kbd_idlfile.enTssSaveAction save_action = 1; +// required .iot_idl.enTssSaveAction save_action = 1; inline bool STssInsert::has_save_action() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -461,15 +461,15 @@ inline void STssInsert::clear_save_action() { save_action_ = 0; clear_has_save_action(); } -inline ::kbd_idlfile::enTssSaveAction STssInsert::save_action() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.STssInsert.save_action) - return static_cast< ::kbd_idlfile::enTssSaveAction >(save_action_); +inline ::iot_idl::enTssSaveAction STssInsert::save_action() const { + // @@protoc_insertion_point(field_get:iot_idl.STssInsert.save_action) + return static_cast< ::iot_idl::enTssSaveAction >(save_action_); } -inline void STssInsert::set_save_action(::kbd_idlfile::enTssSaveAction value) { - assert(::kbd_idlfile::enTssSaveAction_IsValid(value)); +inline void STssInsert::set_save_action(::iot_idl::enTssSaveAction value) { + assert(::iot_idl::enTssSaveAction_IsValid(value)); set_has_save_action(); save_action_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.STssInsert.save_action) + // @@protoc_insertion_point(field_set:iot_idl.STssInsert.save_action) } // required string meas_name = 2; @@ -489,7 +489,7 @@ inline void STssInsert::clear_meas_name() { clear_has_meas_name(); } inline const ::std::string& STssInsert::meas_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.STssInsert.meas_name) + // @@protoc_insertion_point(field_get:iot_idl.STssInsert.meas_name) return *meas_name_; } inline void STssInsert::set_meas_name(const ::std::string& value) { @@ -498,7 +498,7 @@ inline void STssInsert::set_meas_name(const ::std::string& value) { meas_name_ = new ::std::string; } meas_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.STssInsert.meas_name) + // @@protoc_insertion_point(field_set:iot_idl.STssInsert.meas_name) } inline void STssInsert::set_meas_name(const char* value) { set_has_meas_name(); @@ -506,7 +506,7 @@ inline void STssInsert::set_meas_name(const char* value) { meas_name_ = new ::std::string; } meas_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.STssInsert.meas_name) + // @@protoc_insertion_point(field_set_char:iot_idl.STssInsert.meas_name) } inline void STssInsert::set_meas_name(const char* value, size_t size) { set_has_meas_name(); @@ -514,14 +514,14 @@ inline void STssInsert::set_meas_name(const char* value, size_t size) { meas_name_ = new ::std::string; } meas_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.STssInsert.meas_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.STssInsert.meas_name) } inline ::std::string* STssInsert::mutable_meas_name() { set_has_meas_name(); if (meas_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { meas_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.STssInsert.meas_name) + // @@protoc_insertion_point(field_mutable:iot_idl.STssInsert.meas_name) return meas_name_; } inline ::std::string* STssInsert::release_meas_name() { @@ -545,7 +545,7 @@ inline void STssInsert::set_allocated_meas_name(::std::string* meas_name) { clear_has_meas_name(); meas_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.STssInsert.meas_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.STssInsert.meas_name) } // repeated string tag_name = 3; @@ -556,49 +556,49 @@ inline void STssInsert::clear_tag_name() { tag_name_.Clear(); } inline const ::std::string& STssInsert::tag_name(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.STssInsert.tag_name) + // @@protoc_insertion_point(field_get:iot_idl.STssInsert.tag_name) return tag_name_.Get(index); } inline ::std::string* STssInsert::mutable_tag_name(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.STssInsert.tag_name) + // @@protoc_insertion_point(field_mutable:iot_idl.STssInsert.tag_name) return tag_name_.Mutable(index); } inline void STssInsert::set_tag_name(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.STssInsert.tag_name) + // @@protoc_insertion_point(field_set:iot_idl.STssInsert.tag_name) tag_name_.Mutable(index)->assign(value); } inline void STssInsert::set_tag_name(int index, const char* value) { tag_name_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.STssInsert.tag_name) + // @@protoc_insertion_point(field_set_char:iot_idl.STssInsert.tag_name) } inline void STssInsert::set_tag_name(int index, const char* value, size_t size) { tag_name_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.STssInsert.tag_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.STssInsert.tag_name) } inline ::std::string* STssInsert::add_tag_name() { return tag_name_.Add(); } inline void STssInsert::add_tag_name(const ::std::string& value) { tag_name_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.STssInsert.tag_name) + // @@protoc_insertion_point(field_add:iot_idl.STssInsert.tag_name) } inline void STssInsert::add_tag_name(const char* value) { tag_name_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.STssInsert.tag_name) + // @@protoc_insertion_point(field_add_char:iot_idl.STssInsert.tag_name) } inline void STssInsert::add_tag_name(const char* value, size_t size) { tag_name_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.STssInsert.tag_name) + // @@protoc_insertion_point(field_add_pointer:iot_idl.STssInsert.tag_name) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& STssInsert::tag_name() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.STssInsert.tag_name) + // @@protoc_insertion_point(field_list:iot_idl.STssInsert.tag_name) return tag_name_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* STssInsert::mutable_tag_name() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.STssInsert.tag_name) + // @@protoc_insertion_point(field_mutable_list:iot_idl.STssInsert.tag_name) return &tag_name_; } @@ -610,100 +610,100 @@ inline void STssInsert::clear_field_name() { field_name_.Clear(); } inline const ::std::string& STssInsert::field_name(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.STssInsert.field_name) + // @@protoc_insertion_point(field_get:iot_idl.STssInsert.field_name) return field_name_.Get(index); } inline ::std::string* STssInsert::mutable_field_name(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.STssInsert.field_name) + // @@protoc_insertion_point(field_mutable:iot_idl.STssInsert.field_name) return field_name_.Mutable(index); } inline void STssInsert::set_field_name(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.STssInsert.field_name) + // @@protoc_insertion_point(field_set:iot_idl.STssInsert.field_name) field_name_.Mutable(index)->assign(value); } inline void STssInsert::set_field_name(int index, const char* value) { field_name_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.STssInsert.field_name) + // @@protoc_insertion_point(field_set_char:iot_idl.STssInsert.field_name) } inline void STssInsert::set_field_name(int index, const char* value, size_t size) { field_name_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.STssInsert.field_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.STssInsert.field_name) } inline ::std::string* STssInsert::add_field_name() { return field_name_.Add(); } inline void STssInsert::add_field_name(const ::std::string& value) { field_name_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.STssInsert.field_name) + // @@protoc_insertion_point(field_add:iot_idl.STssInsert.field_name) } inline void STssInsert::add_field_name(const char* value) { field_name_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.STssInsert.field_name) + // @@protoc_insertion_point(field_add_char:iot_idl.STssInsert.field_name) } inline void STssInsert::add_field_name(const char* value, size_t size) { field_name_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.STssInsert.field_name) + // @@protoc_insertion_point(field_add_pointer:iot_idl.STssInsert.field_name) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& STssInsert::field_name() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.STssInsert.field_name) + // @@protoc_insertion_point(field_list:iot_idl.STssInsert.field_name) return field_name_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* STssInsert::mutable_field_name() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.STssInsert.field_name) + // @@protoc_insertion_point(field_mutable_list:iot_idl.STssInsert.field_name) return &field_name_; } -// repeated .kbd_idlfile.STsdbPoint point = 5; +// repeated .iot_idl.STsdbPoint point = 5; inline int STssInsert::point_size() const { return point_.size(); } inline void STssInsert::clear_point() { point_.Clear(); } -inline const ::kbd_idlfile::STsdbPoint& STssInsert::point(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.STssInsert.point) +inline const ::iot_idl::STsdbPoint& STssInsert::point(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.STssInsert.point) return point_.Get(index); } -inline ::kbd_idlfile::STsdbPoint* STssInsert::mutable_point(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.STssInsert.point) +inline ::iot_idl::STsdbPoint* STssInsert::mutable_point(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.STssInsert.point) return point_.Mutable(index); } -inline ::kbd_idlfile::STsdbPoint* STssInsert::add_point() { - // @@protoc_insertion_point(field_add:kbd_idlfile.STssInsert.point) +inline ::iot_idl::STsdbPoint* STssInsert::add_point() { + // @@protoc_insertion_point(field_add:iot_idl.STssInsert.point) return point_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::STsdbPoint >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::STsdbPoint >& STssInsert::point() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.STssInsert.point) + // @@protoc_insertion_point(field_list:iot_idl.STssInsert.point) return point_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::STsdbPoint >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::STsdbPoint >* STssInsert::mutable_point() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.STssInsert.point) + // @@protoc_insertion_point(field_mutable_list:iot_idl.STssInsert.point) return &point_; } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::enTssMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enTssMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enTssMsgType>() { - return ::kbd_idlfile::enTssMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enTssMsgType>() { + return ::iot_idl::enTssMsgType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::enTssSaveAction> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enTssSaveAction> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enTssSaveAction>() { - return ::kbd_idlfile::enTssSaveAction_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enTssSaveAction>() { + return ::iot_idl::enTssSaveAction_descriptor(); } } // namespace google diff --git a/platform/src/idl_files/TsdbSaveMessage.proto b/platform/src/idl_files/TsdbSaveMessage.proto index 8d8290cf..65aa5044 100644 --- a/platform/src/idl_files/TsdbSaveMessage.proto +++ b/platform/src/idl_files/TsdbSaveMessage.proto @@ -5,7 +5,7 @@ //======================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; // 用到了SVariable import "Public.proto"; 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 603d0aa8..072d12e5 100644 --- a/platform/src/include/application/app_fbd/fbd_common/FbdAlarmCltApi.h +++ b/platform/src/include/application/app_fbd/fbd_common/FbdAlarmCltApi.h @@ -12,7 +12,7 @@ #include "FbdCommonExport.h" #include "FbdDiagDataStruct.h" -namespace kbd_idlfile +namespace iot_idl { class SAlmCltAddAlm; class SAlmCltCfmAlm; @@ -173,63 +173,63 @@ private: * @param objAllAlm ： 收到的全部告警消息结构 * @return 无 **********************************************************************************/ - virtual void setAlarmFullSync( int nDomainID, kbd_idlfile::SAlmCltAddAlm &objAllAlm ) = 0; + virtual void setAlarmFullSync( int nDomainID, iot_idl::SAlmCltAddAlm &objAllAlm ) = 0; /******************************************************************************//** * @brief 处理告警服务发来的添加告警消息 * @param objAddAlm ： 收到的添加告警消息结构 * @return 无 **********************************************************************************/ - virtual void addAlarm( kbd_idlfile::SAlmCltAddAlm &objAddAlm ) = 0; + virtual void addAlarm( iot_idl::SAlmCltAddAlm &objAddAlm ) = 0; /******************************************************************************//** * @brief 处理告警服务发来的确认告警消息 * @param objCfmAlm ： 收到的确认告警消息结构 * @return 无 **********************************************************************************/ - virtual void cfmAlarm( kbd_idlfile::SAlmCltCfmAlm &objCfmAlm ) = 0; + virtual void cfmAlarm( iot_idl::SAlmCltCfmAlm &objCfmAlm ) = 0; /******************************************************************************//** * @brief 处理告警服务发来的删除告警消息 * @param objDelAlm ： 收到的删除告警消息结构 * @return 无 **********************************************************************************/ - virtual void delAlarm( kbd_idlfile::SAlmCltDelAlm &objDelAlm ) = 0; + virtual void delAlarm( iot_idl::SAlmCltDelAlm &objDelAlm ) = 0; /******************************************************************************//** * @brief 处理告警服务发来的释放告警内存消息 * @param objReleaseAlm ： 收到的释放告警内存消息结构 * @return 无 **********************************************************************************/ - virtual void releaseAlarm( kbd_idlfile::SAlmCltReleaseAlm &objReleaseAlm ) = 0; + virtual void releaseAlarm( iot_idl::SAlmCltReleaseAlm &objReleaseAlm ) = 0; /******************************************************************************//** * @brief 处理告警服务发来的关联故障录波消息 * @param objWave2Alm ： 收到的关联录波文件消息结构 * @return 无 **********************************************************************************/ - virtual void linkWave2Alarm( kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Alm ) = 0; + virtual void linkWave2Alarm( iot_idl::SAlmCltLinkWave2Alm &objWave2Alm ) = 0; /******************************************************************************//** * @brief 处理服务端发来的全部智能告警消息 * @param objAllItlAlm ： 收到的全部智能告警消息结构 * @return 无 **********************************************************************************/ - virtual void setItlAlmFullSync( int nDomainID, kbd_idlfile::SIntelliAlmAdd &objAllItlAlm ) = 0; + virtual void setItlAlmFullSync( int nDomainID, iot_idl::SIntelliAlmAdd &objAllItlAlm ) = 0; /******************************************************************************//** * @brief 处理服务端发来的添加智能告警消息 * @param objAddItlAlm ： 收到的添加智能告警消息结构 * @return 无 **********************************************************************************/ - virtual void addItlAlm( kbd_idlfile::SIntelliAlmAdd &objAddItlAlm ) = 0; + virtual void addItlAlm( iot_idl::SIntelliAlmAdd &objAddItlAlm ) = 0; /******************************************************************************//** * @brief 处理服务端发来的删除智能告警消息 * @param objDelItlAlm ： 收到的删除告警消息结构 * @return 无 **********************************************************************************/ - virtual void delItlAlm( kbd_idlfile::SIntelliAlmDel &objDelItlAlm ) = 0; + virtual void delItlAlm( iot_idl::SIntelliAlmDel &objDelItlAlm ) = 0; /******************************************************************************//** * @brief 处理服务端发来的通知智能告警不完整的消息 @@ -237,14 +237,14 @@ private: * @param objBrokenItlAlm ： 收到的智能告警不完整消息结构 * @return 无 **********************************************************************************/ - virtual void breakItlAlm( kbd_idlfile::SIntelliAlmBroken &objBrokenItlAlm ) = 0; + virtual void breakItlAlm( iot_idl::SIntelliAlmBroken &objBrokenItlAlm ) = 0; /******************************************************************************//** * @brief 处理服务端发来的释放智能告警消息 * @param objReleaseItlAlm ： 收到的释放智能告警消息结构 * @return 无 **********************************************************************************/ - virtual void releaseItlAlm( kbd_idlfile::SIntelliAlmRelease &objReleaseItlAlm ) = 0; + virtual void releaseItlAlm( iot_idl::SIntelliAlmRelease &objReleaseItlAlm ) = 0; }; typedef boost::shared_ptr CFbdAlarmCltApiPtr; 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 b5baac2c..fda2ad47 100644 --- a/platform/src/include/application/app_fbd/fbd_common/FbdAlarmSrcApi.h +++ b/platform/src/include/application/app_fbd/fbd_common/FbdAlarmSrcApi.h @@ -53,7 +53,7 @@ public: * @retval true：成功 * false：失败（缓存队列已满，或消息结构不正确） **********************************************************************************/ - virtual bool addAlarm( kbd_idlfile::SAppAddAlm &objAlarm ) = 0; + virtual bool addAlarm( iot_idl::SAppAddAlm &objAlarm ) = 0; }; 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 ee8f00c8..14472351 100644 --- a/platform/src/include/application/app_fbd/fbd_common/FbdDiagDataApi.h +++ b/platform/src/include/application/app_fbd/fbd_common/FbdDiagDataApi.h @@ -12,7 +12,7 @@ #include "FbdCommonExport.h" #include "FbdDiagDataStruct.h" -namespace kbd_idlfile +namespace iot_idl { class SFBDDebugRequest; class SFBDDebugResponse; @@ -199,8 +199,8 @@ private: * objRep： 响应消息，输出参数 * @return 成功返回kbdSuccess，失败返回错误码 **********************************************************************************/ - virtual int getDebugResponse( const kbd_idlfile::SFBDDebugRequest &objReq, - kbd_idlfile::SFBDDebugResponse &objRep ) = 0; + virtual int getDebugResponse( const iot_idl::SFBDDebugRequest &objReq, + iot_idl::SFBDDebugResponse &objRep ) = 0; }; typedef boost::shared_ptr CFbdDiagDataApiPtr; 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 dc310a7d..05281e82 100644 --- a/platform/src/include/application/app_fbd/fbd_common/FbdDiagDataStruct.h +++ b/platform/src/include/application/app_fbd/fbd_common/FbdDiagDataStruct.h @@ -20,7 +20,7 @@ #include "FbdCommonExport.h" -namespace kbd_idlfile +namespace iot_idl { class SIntelliAlmInfo; //< SFbdItlAlmInfo 中使用 class SAlmInfoToAlmClt; //< SFbdAlarmInfo 中使用 @@ -124,7 +124,7 @@ struct SFbdStringValue #pragma warning(disable: 4251) #endif -typedef boost::shared_ptr ConstSItlAlmInfoPtr; +typedef boost::shared_ptr ConstSItlAlmInfoPtr; //< 单条智能告警的信息 struct FBD_COMMON_API SFbdItlAlmInfo { @@ -185,7 +185,7 @@ enum EnFbdAlarmStyle EN_AS_DO_NOTHING = 3 //< 无，客户端就不可能收到 }; -typedef boost::shared_ptr ConstSAlmInfoPtr; +typedef boost::shared_ptr ConstSAlmInfoPtr; //< 单条告警的信息 struct FBD_COMMON_API SFbdAlarmInfo { 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 0b6620ce..05fd7e5e 100644 --- a/platform/src/include/application/app_fbd/fbd_common/FbdSysInfoApi.h +++ b/platform/src/include/application/app_fbd/fbd_common/FbdSysInfoApi.h @@ -28,12 +28,12 @@ public: /******************************************************************************//** * @brief 获取系统信息接口类 **********************************************************************************/ - virtual kbd_public::CSysInfoInterface &getSysInfo() = 0; + virtual iot_public::CSysInfoInterface &getSysInfo() = 0; /******************************************************************************//** * @brief 获取当前进程的运行信息 **********************************************************************************/ - virtual const kbd_public::SRunAppInfo &getCurrentRunAppInfo() = 0; + virtual const iot_public::SRunAppInfo &getCurrentRunAppInfo() = 0; private: friend class CFbdServerApp; @@ -42,7 +42,7 @@ private: * @brief 设置当前进程的运行信息 * 仅供 fbd_server 启动时设置 **********************************************************************************/ - virtual void setCurrentRunAppInfo( const kbd_public::SRunAppInfo &stSetVal ) = 0; + virtual void setCurrentRunAppInfo( const iot_public::SRunAppInfo &stSetVal ) = 0; }; typedef boost::shared_ptr CFbdSysInfoApiPtr; diff --git a/platform/src/include/dbms/db_api_ex/CDbApi.h b/platform/src/include/dbms/db_api_ex/CDbApi.h index e5344221..3426bebd 100644 --- a/platform/src/include/dbms/db_api_ex/CDbApi.h +++ b/platform/src/include/dbms/db_api_ex/CDbApi.h @@ -13,7 +13,7 @@ #include "db_api_ex/DbExport.h" #include "db_api_ex/EDbConnType.h" -namespace kbd_dbms +namespace iot_dbms { class CDbApi_impl;//CDb类的具体实现类 diff --git a/platform/src/include/dbms/db_base_api/CDbBaseApi.h b/platform/src/include/dbms/db_base_api/CDbBaseApi.h index 09ebb1eb..880d0892 100644 --- a/platform/src/include/dbms/db_base_api/CDbBaseApi.h +++ b/platform/src/include/dbms/db_base_api/CDbBaseApi.h @@ -10,7 +10,7 @@ /** * @brief 数据库、实时库相关组件命名空间 */ -namespace kbd_dbms +namespace iot_dbms { class CDbBaseApi_impl; // CDbBaseApi的具体实现类 diff --git a/platform/src/include/dbms/db_base_api/CDbCondition.h b/platform/src/include/dbms/db_base_api/CDbCondition.h index d20237bd..dbb542fa 100644 --- a/platform/src/include/dbms/db_base_api/CDbCondition.h +++ b/platform/src/include/dbms/db_base_api/CDbCondition.h @@ -5,7 +5,7 @@ #include #include "DbBaseExport.h" -namespace kbd_dbms +namespace iot_dbms { /** diff --git a/platform/src/include/dbms/db_base_api/CDbOrder.h b/platform/src/include/dbms/db_base_api/CDbOrder.h index 78cec637..49383423 100644 --- a/platform/src/include/dbms/db_base_api/CDbOrder.h +++ b/platform/src/include/dbms/db_base_api/CDbOrder.h @@ -4,7 +4,7 @@ #include #include "DbBaseExport.h" -namespace kbd_dbms +namespace iot_dbms { /** diff --git a/platform/src/include/dbms/db_base_api/CDbPara.h b/platform/src/include/dbms/db_base_api/CDbPara.h index a0fa1958..2b37a43a 100644 --- a/platform/src/include/dbms/db_base_api/CDbPara.h +++ b/platform/src/include/dbms/db_base_api/CDbPara.h @@ -4,7 +4,7 @@ #include #include "DbBaseExport.h" -namespace kbd_dbms +namespace iot_dbms { // 数据库类型枚举 diff --git a/platform/src/include/dbms/db_his_mng_api/CHisMngApi.h b/platform/src/include/dbms/db_his_mng_api/CHisMngApi.h index 14035d1d..0cefe32a 100644 --- a/platform/src/include/dbms/db_his_mng_api/CHisMngApi.h +++ b/platform/src/include/dbms/db_his_mng_api/CHisMngApi.h @@ -7,7 +7,7 @@ #include #include -namespace kbd_dbms { +namespace iot_dbms { class CHisMngApiImp; class DB_HIS_MNG_API CHisMngApi : public QObject diff --git a/platform/src/include/dbms/db_his_query_api/DbHisQueryApi.h b/platform/src/include/dbms/db_his_query_api/DbHisQueryApi.h index 54ebbd47..29845af7 100644 --- a/platform/src/include/dbms/db_his_query_api/DbHisQueryApi.h +++ b/platform/src/include/dbms/db_his_query_api/DbHisQueryApi.h @@ -12,7 +12,7 @@ #include "DbHisQueryApiExport.h" #include "DbHisQueryBase.h" -namespace kbd_dbms +namespace iot_dbms { class CTsdbConn; @@ -174,5 +174,5 @@ bool getHisEventPoint(CTsdbConn &objConn, int nTimeOut, boost::int64_t nGroupByMs, const std::vector *> &vecResult); -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/include/dbms/db_his_query_api/DbHisQueryBase.h b/platform/src/include/dbms/db_his_query_api/DbHisQueryBase.h index 62288fdf..43349d7a 100644 --- a/platform/src/include/dbms/db_his_query_api/DbHisQueryBase.h +++ b/platform/src/include/dbms/db_his_query_api/DbHisQueryBase.h @@ -15,7 +15,7 @@ //#include "DbHisQueryApiExport.h" -namespace kbd_dbms +namespace iot_dbms { /******************************************************************************//** @@ -153,5 +153,5 @@ struct SHisEventPoint boost::int32_t m_nAlmStatus; //< 告警状态（可理解为小类） }; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/include/dbms/db_manager_api/db_manager_api.h b/platform/src/include/dbms/db_manager_api/db_manager_api.h index 2f24ee61..40c257d2 100644 --- a/platform/src/include/dbms/db_manager_api/db_manager_api.h +++ b/platform/src/include/dbms/db_manager_api/db_manager_api.h @@ -26,7 +26,7 @@ enum EInitProjectErr class db_opt; class file_opt; -namespace kbd_dbms +namespace iot_dbms { class DBMANAGER_EXPORT db_manager_api : public QObject @@ -169,5 +169,5 @@ private: }; -} //< namespace kbd_dbms +} //< namespace iot_dbms #endif // DBMANAGER_API_H diff --git a/platform/src/include/dbms/db_manager_api/db_opt.h b/platform/src/include/dbms/db_manager_api/db_opt.h index bd50df7c..666d5891 100644 --- a/platform/src/include/dbms/db_manager_api/db_opt.h +++ b/platform/src/include/dbms/db_manager_api/db_opt.h @@ -73,7 +73,7 @@ public: public: - virtual kbd_dbms::EDbType getDbType() = 0; + virtual iot_dbms::EDbType getDbType() = 0; /** * @brief openDatabase 打开数据库 @@ -85,7 +85,7 @@ public: */ bool openDatabase( QString sIp, int nPort, QString sUser, QString sPasswd ,QString sDatabaseName = ""); - kbd_dbms::CDbPara getDbPara() const; + iot_dbms::CDbPara getDbPara() const; /** * @brief closeDatabase 关闭数据库 @@ -552,7 +552,7 @@ public: QStringList tempTables; //临时表 QStringList hisTables; //历史表 QStringList m_sTriggerSqlList; //保存创建触发器、存储过程、函数的容器（插入Excel数据后执行） - kbd_dbms::CDbBaseApi m_objDb; + iot_dbms::CDbBaseApi m_objDb; private: bool createTableNotExist( QDomElement& eleTable ); diff --git a/platform/src/include/dbms/db_manager_api/db_opt_kingbase.h b/platform/src/include/dbms/db_manager_api/db_opt_kingbase.h index 09ab8761..ccbbbbd1 100644 --- a/platform/src/include/dbms/db_manager_api/db_opt_kingbase.h +++ b/platform/src/include/dbms/db_manager_api/db_opt_kingbase.h @@ -13,7 +13,7 @@ public: ~db_opt_kingbase(); public: - kbd_dbms::EDbType getDbType() override { return kbd_dbms::EDbType::DB_KINGBASE;} + iot_dbms::EDbType getDbType() override { return iot_dbms::EDbType::DB_KINGBASE;} bool getAllDatabaseName( QStringList& listDatabase ); bool getUseDatabaseString( QString sDatabaseName, QString& sUseDatabaseString ); diff --git a/platform/src/include/dbms/db_manager_api/db_opt_mysql.h b/platform/src/include/dbms/db_manager_api/db_opt_mysql.h index 8c20f2f8..f5bed17b 100644 --- a/platform/src/include/dbms/db_manager_api/db_opt_mysql.h +++ b/platform/src/include/dbms/db_manager_api/db_opt_mysql.h @@ -13,7 +13,7 @@ public: ~db_opt_mysql(); public: - kbd_dbms::EDbType getDbType() override { return kbd_dbms::EDbType::DB_MYSQL;} + iot_dbms::EDbType getDbType() override { return iot_dbms::EDbType::DB_MYSQL;} bool getAllDatabaseName( QStringList& listDatabase ); bool getUseDatabaseString( QString sDatabaseName, QString& sUseDatabaseString ); diff --git a/platform/src/include/dbms/db_manager_api/db_opt_opengauss.h b/platform/src/include/dbms/db_manager_api/db_opt_opengauss.h index 148310ad..4acfb733 100644 --- a/platform/src/include/dbms/db_manager_api/db_opt_opengauss.h +++ b/platform/src/include/dbms/db_manager_api/db_opt_opengauss.h @@ -13,7 +13,7 @@ public: ~db_opt_opengauss(); public: - kbd_dbms::EDbType getDbType() override { return kbd_dbms::EDbType::DB_OPENGAUSS;} + iot_dbms::EDbType getDbType() override { return iot_dbms::EDbType::DB_OPENGAUSS;} bool getAllDatabaseName( QStringList& listDatabase ); bool getUseDatabaseString( QString sDatabaseName, QString& sUseDatabaseString ); diff --git a/platform/src/include/dbms/db_manager_api/db_opt_oracle.h b/platform/src/include/dbms/db_manager_api/db_opt_oracle.h index e34b7b07..b4ae3f16 100644 --- a/platform/src/include/dbms/db_manager_api/db_opt_oracle.h +++ b/platform/src/include/dbms/db_manager_api/db_opt_oracle.h @@ -13,7 +13,7 @@ public: ~db_opt_oracle(); public: - kbd_dbms::EDbType getDbType() override { return kbd_dbms::EDbType::DB_ORACLE;} + iot_dbms::EDbType getDbType() override { return iot_dbms::EDbType::DB_ORACLE;} bool getAllDatabaseName( QStringList& listDatabase ); bool getUseDatabaseString( QString sDatabaseName, QString& sUseDatabaseString ); diff --git a/platform/src/include/dbms/db_save_api/DbSaveApi.h b/platform/src/include/dbms/db_save_api/DbSaveApi.h index 85f771d2..59ac3b36 100644 --- a/platform/src/include/dbms/db_save_api/DbSaveApi.h +++ b/platform/src/include/dbms/db_save_api/DbSaveApi.h @@ -11,7 +11,7 @@ #include "common/Export.h" #include "DbSaveMessage.pb.h" -namespace kbd_dbms +namespace iot_dbms { /******************************************************************************//** @@ -31,15 +31,15 @@ DLL_CLASS bool initDbSaveApi(int nDomainID, int nAppID); * 提交成功代表本库已接收提交，但并不代表已写入数据库 * @retval true成功，false失败（消息不符合要求，缓存已满，或未初始化本库） **********************************************************************************/ -DLL_CLASS bool saveHisData(const kbd_idlfile::DbInsert &objInsert); +DLL_CLASS bool saveHisData(const iot_idl::DbInsert &objInsert); -DLL_CLASS bool saveHisData(const kbd_idlfile::DbUpdate &objUpdate); +DLL_CLASS bool saveHisData(const iot_idl::DbUpdate &objUpdate); -DLL_CLASS bool saveHisData(const kbd_idlfile::DbUpdateMulti &objUpdateMulti); +DLL_CLASS bool saveHisData(const iot_idl::DbUpdateMulti &objUpdateMulti); -DLL_CLASS bool saveHisData(const kbd_idlfile::DbRemove &objRemove); +DLL_CLASS bool saveHisData(const iot_idl::DbRemove &objRemove); -DLL_CLASS bool saveHisData(const kbd_idlfile::DbRemoveMulti &objRemoveMulti); +DLL_CLASS bool saveHisData(const iot_idl::DbRemoveMulti &objRemoveMulti); /******************************************************************************//** * @brief releaseDbSaveApi()，释放本接口库，结束工作线程 diff --git a/platform/src/include/dbms/db_sysinfo_api/CDbSysInfo.h b/platform/src/include/dbms/db_sysinfo_api/CDbSysInfo.h index dcd0b8b6..4ff07d34 100644 --- a/platform/src/include/dbms/db_sysinfo_api/CDbSysInfo.h +++ b/platform/src/include/dbms/db_sysinfo_api/CDbSysInfo.h @@ -55,7 +55,7 @@ private: CDbSysInfo(); public: - static kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; + static iot_public::CSysInfoInterfacePtr m_ptrSysInfo; public: /** @@ -114,42 +114,42 @@ public: * @param dbParam * @return ： 可以连接返回true， 否则返回false */ -// static bool checkDbConnInfo( const kbd_public::SDatabaseInfo& stConnectInfo, kbd_dbms::CDbPara& dbParam ); +// static bool checkDbConnInfo( const iot_public::SDatabaseInfo& stConnectInfo, iot_dbms::CDbPara& dbParam ); /** * @brief getDbParam: 通过节点名获取数据库连接参数 * @param dbParam： 数据库连接参数 * @return 可以连接true */ -// static bool getDbParamByNodeName( const std::string& strNodeName, kbd_dbms::CDbPara& objDbParam ); +// static bool getDbParamByNodeName( const std::string& strNodeName, iot_dbms::CDbPara& objDbParam ); /** * @brief getCenterDbParam 获取本域首链接数据库参数，首链接连接失败时返回false * @param objDbParam 用于返回数据库参数 * @return true：成功 false：失败 */ -// static bool getCenterDbParam( kbd_dbms::CDbPara& objDbParam ); +// static bool getCenterDbParam( iot_dbms::CDbPara& objDbParam ); /** * @brief getLocalDbParam 获取本域第一个可用的本地数据库参数 * @param objDbParam 用于返回数据库参数 * @return true：成功 false：失败 */ -// static bool getLocalDbParam( kbd_dbms::CDbPara& objDbParam ); +// static bool getLocalDbParam( iot_dbms::CDbPara& objDbParam ); /** * @brief getRemoteDbParam 获取本域第一个可用的远程数据库参数 * @param objDbParam 用于返回数据库参数 * @return true：成功 false：失败 */ -// static bool getRemoteDbParam( kbd_dbms::CDbPara& objDbParam ); +// static bool getRemoteDbParam( iot_dbms::CDbPara& objDbParam ); /** * @brief getAllLocalDbInfo 获取本域所有本地数据库参数 * @param vecLocalDbInfo 用于返回数据库参数 * @return true：成功 false：失败 */ -// static bool getAllLocalDbInfo( std::vector& vecLocalDbInfo ); +// static bool getAllLocalDbInfo( std::vector& vecLocalDbInfo ); /** * @brief getHisDataDbInfoNodeName 获取本域所有本地、远程数据库参数 @@ -157,14 +157,14 @@ public: * @param vecRemoteDbInfo 用于返回数据库参数 * @return true：成功 false：失败 */ -// static bool getHisDataDbInfoNodeName( std::vector& vecLocalDbInfo, std::vector& vecRemoteDbInfo ); +// static bool getHisDataDbInfoNodeName( std::vector& vecLocalDbInfo, std::vector& vecRemoteDbInfo ); /** * @brief getLocalDbInfoExceptFirstConnect 获取本域所有除了首链接的本地数据库参数（排除首链接配置与本地数据库之一配置相同的情况） * @param vecLocalDbInfo 用于返回数据库参数 * @return true：成功 false：失败 */ -// static bool getLocalDbInfoExceptFirstConnect( std::vector& vecLocalDbInfo ); +// static bool getLocalDbInfoExceptFirstConnect( std::vector& vecLocalDbInfo ); /** * @brief getAllRdbTableNameBySubsystemId 通过专业id获取与此id相关的内存表名 diff --git a/platform/src/include/dbms/rdb_api/CRdbAccess.h b/platform/src/include/dbms/rdb_api/CRdbAccess.h index 697d08df..12be5e0e 100644 --- a/platform/src/include/dbms/rdb_api/CRdbAccess.h +++ b/platform/src/include/dbms/rdb_api/CRdbAccess.h @@ -11,7 +11,7 @@ #include "rdb_api/CVarType.h" #include -namespace kbd_dbms +namespace iot_dbms { class CRdbQueryResultImpl; diff --git a/platform/src/include/dbms/rdb_api/CRdbAccessEx.h b/platform/src/include/dbms/rdb_api/CRdbAccessEx.h index 24515ff6..b92ba4c9 100644 --- a/platform/src/include/dbms/rdb_api/CRdbAccessEx.h +++ b/platform/src/include/dbms/rdb_api/CRdbAccessEx.h @@ -5,7 +5,7 @@ #include "boost/scoped_array.hpp" #include "pub_logger_api/logger.h" -namespace kbd_dbms +namespace iot_dbms { class CRdbAccessEx : public CRdbAccess diff --git a/platform/src/include/dbms/rdb_api/CRdbMngInterface.h b/platform/src/include/dbms/rdb_api/CRdbMngInterface.h index eee86802..3d13268e 100644 --- a/platform/src/include/dbms/rdb_api/CRdbMngInterface.h +++ b/platform/src/include/dbms/rdb_api/CRdbMngInterface.h @@ -10,7 +10,7 @@ #include "rdb_api/RdbDefine.h" #include -namespace kbd_dbms +namespace iot_dbms { /** diff --git a/platform/src/include/dbms/rdb_api/CVarType.h b/platform/src/include/dbms/rdb_api/CVarType.h index 49b75cf8..6e1d10bd 100644 --- a/platform/src/include/dbms/rdb_api/CVarType.h +++ b/platform/src/include/dbms/rdb_api/CVarType.h @@ -9,7 +9,7 @@ #include #include -namespace kbd_dbms +namespace iot_dbms { //数据类型定义 diff --git a/platform/src/include/dbms/rdb_api/FuncForNet.h b/platform/src/include/dbms/rdb_api/FuncForNet.h index 1c02820c..5768b7e3 100644 --- a/platform/src/include/dbms/rdb_api/FuncForNet.h +++ b/platform/src/include/dbms/rdb_api/FuncForNet.h @@ -4,8 +4,8 @@ #include "rdb_api/CVarType.h" #include "Public.pb.h" -using namespace kbd_idlfile; -using namespace kbd_dbms; +using namespace iot_idl; +using namespace iot_dbms; inline SVariable& Vartype2SVarivale( const CVarType& localValue, SVariable& netValue ) { diff --git a/platform/src/include/dbms/rdb_api/RdbDefine.h b/platform/src/include/dbms/rdb_api/RdbDefine.h index 02ff7259..15ca8d37 100644 --- a/platform/src/include/dbms/rdb_api/RdbDefine.h +++ b/platform/src/include/dbms/rdb_api/RdbDefine.h @@ -3,7 +3,7 @@ #include "Common.h" #include "rdb_api/CVarType.h" -namespace kbd_dbms +namespace iot_dbms { #define DB_RT_TABLE_MODE "RT_TABLE_MODE" diff --git a/platform/src/include/dbms/rdb_api/RdbMemMan.h b/platform/src/include/dbms/rdb_api/RdbMemMan.h index 65ef8fad..03eb4e59 100644 --- a/platform/src/include/dbms/rdb_api/RdbMemMan.h +++ b/platform/src/include/dbms/rdb_api/RdbMemMan.h @@ -7,7 +7,7 @@ #include "rdb_api/RdbDefine.h" #include "boost/atomic.hpp" -namespace kbd_dbms +namespace iot_dbms { #define RDB_SERVER_MEMID 3219000 diff --git a/platform/src/include/dbms/rdb_api/RdbTableMng.h b/platform/src/include/dbms/rdb_api/RdbTableMng.h index 20564a73..78c4af31 100644 --- a/platform/src/include/dbms/rdb_api/RdbTableMng.h +++ b/platform/src/include/dbms/rdb_api/RdbTableMng.h @@ -10,7 +10,7 @@ #include "rdb_api/RdbDefine.h" #include "rdb_api/CRdbAccessEx.h" -namespace kbd_dbms +namespace iot_dbms { class CRdbTableMngLockGuard; class CRdbTableMng @@ -21,14 +21,14 @@ public: private: std::string m_strAppName; - std::map m_mapRdbTable; + std::map m_mapRdbTable; public: //通过数据表表信息 //========================================================================================== void* getTableInfo(const std::string strTableName, BTBL_TABLEINFO& tableInfo ) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -46,7 +46,7 @@ public: bool getColumnInfo(const std::string strTableName, const std::string strColName, unsigned char &ucDataType, unsigned short &usDataLen ) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -70,7 +70,7 @@ public: //========================================================================================== int searchRecordByKey(const std::string strTableName,const void* keyValue) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -87,7 +87,7 @@ public: //========================================================================================== int getTableRecordCount(const std::string &strTableName) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -104,7 +104,7 @@ public: //========================================================================================== const void* getRecordAllColumnByIndex(const std::string &strTableName, int nRecordIndex) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -127,7 +127,7 @@ public: template bool getRecordAllColumnByIndex(const std::string &strTableName, int nRecordIndex, T &record) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -168,7 +168,7 @@ public: const std::string &colName, T &value) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -204,7 +204,7 @@ public: const std::string &strColName, const T &value) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -233,7 +233,7 @@ public: const std::string &strColName2, const T2 &value2) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -257,9 +257,9 @@ public: /*通过nRecordIndex更新 multi 条记录的列值 */ bool updateRecordMultiValueByIndex(const std::string strTableName, int nRecordIndex, - std::vector vecUpdColumn) + std::vector vecUpdColumn) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -285,7 +285,7 @@ public: const void* keyValue, T &objRecord) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -304,7 +304,7 @@ public: const std::vector &vecSelectColumn, T &objRecord) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) @@ -324,7 +324,7 @@ public: const std::string &strColName, T &value) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -345,7 +345,7 @@ public: const std::string &strColName, const T &value) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -368,7 +368,7 @@ public: const std::string &strColName2, const T2 &value2) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -386,9 +386,9 @@ public: bool updateRecordMultiValueByKey(const std::string strTableName, const void* keyValue, - std::vector vecUpdColumn) + std::vector vecUpdColumn) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -406,7 +406,7 @@ public: bool deleteRecordByKey(const std::string strTableName, const void* keyValue) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -433,7 +433,7 @@ public: const std::string &strOrder = "", int nAsc = 1) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -454,7 +454,7 @@ public: const std::string &strOrder = "", int nAsc = 1) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -473,7 +473,7 @@ public: const std::string &strColumnName,//选择列 std::vector &ColumnValue)//输出值 { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -500,7 +500,7 @@ public: const std::string &strOrder = "", int nAsc = 1) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -528,7 +528,7 @@ public: std::string strOrder = "", int nAsc = 1) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -555,7 +555,7 @@ public: unsigned char nConType = ATTRCOND_EQU ) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -578,11 +578,11 @@ public: template bool selectAllColumnMultiCondition(const std::string &strTableName, std::vector &vecTableStruct, - const std::vector &vecCondInfo, + const std::vector &vecCondInfo, std::string strOrder = "", int nAsc = 1) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -601,11 +601,11 @@ public: bool selectSelColumnMultiCondition(const std::string strTableName,//表名称 const std::vector &vecSelColumn, //选择列 std::vector &vecTableStruct, //输出结构 - const std::vector &vecCondInfo, + const std::vector &vecCondInfo, std::string strOrder = "", int nAsc = 1) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -622,11 +622,11 @@ public: bool selectOneColumnMultiCondition(const std::string &strTableName,//表名称 const std::string &strColumnName,//选择列 std::vector &ColumnValue,//条件列值 - const std::vector &vecCondInfo, + const std::vector &vecCondInfo, const std::string &strOrder = "", int nAsc = 1) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -649,7 +649,7 @@ public: const std::string strColName, const T &value) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -672,7 +672,7 @@ public: const T2 &ConColValue,//条件列值 const unsigned char nConType = ATTRCOND_EQU) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -695,9 +695,9 @@ public: bool updateMultiCondition(const std::string strTableName, const std::string strColName, const T &value, - const std::vector &vecCondInfo) + const std::vector &vecCondInfo) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -715,7 +715,7 @@ public: /*删除All记录 */ bool removeAll(const std::string strTableName) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -735,7 +735,7 @@ public: const T &ConColValue,//条件列值 unsigned char nConType = ATTRCOND_EQU) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -749,9 +749,9 @@ public: } /*按条件删除N条记录,多个条件 */ bool removeMultiCondition(const std::string strTableName, - const std::vector &vecCondInfo) + const std::vector &vecCondInfo) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -771,7 +771,7 @@ public: bool insertOneRecord(const std::string strTableName, const T &stRecord) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -789,7 +789,7 @@ public: bool insertMultiReocrd(const std::string strTableName, const std::vector &vecRecord) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = m_mapRdbTable[strTableName]; if (objTable.isOpen() != true) { @@ -817,7 +817,7 @@ public: CRdbTableMngLockGuard(CRdbTableMng &objMng, const std::string &strTableName) :m_objTableMng(objMng), m_strTableName(strTableName), m_bLock(false) { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbAccessEx &objTable = objMng.m_mapRdbTable[strTableName]; if (!objTable.isOpen()) { diff --git a/platform/src/include/dbms/rdb_changedata_api/CRdbChangeData.h b/platform/src/include/dbms/rdb_changedata_api/CRdbChangeData.h index 709c20f5..1d544333 100644 --- a/platform/src/include/dbms/rdb_changedata_api/CRdbChangeData.h +++ b/platform/src/include/dbms/rdb_changedata_api/CRdbChangeData.h @@ -8,10 +8,10 @@ #include "pub_utility_api/TimerThreadBase.h" class CSubscribeEngine; -namespace kbd_net{ +namespace iot_net{ class CMbCommunicator; } -namespace kbd_dbms{ +namespace iot_dbms{ class CVarType; } @@ -23,7 +23,7 @@ struct SPointInfo; * 变化数据通过 recvChangeData 函数通知应用程序 * 无效测点通过 dealInvalidPoint 函数通知应用程序 */ -class DLL_CLASS CRdbChangeData : public kbd_public::CTimerThreadBase +class DLL_CLASS CRdbChangeData : public iot_public::CTimerThreadBase { public: CRdbChangeData(); @@ -87,7 +87,7 @@ public: * @param vVar 值的容器 */ virtual void recvChangeData( const std::vector& vPointInfo, - const std::vector& vVar ) = 0; + const std::vector& vVar ) = 0; /** * @brief dealInvalidPoint 处理无效测点即超时未收到数据的测点（测点无效后不会删除订阅关系） @@ -105,11 +105,11 @@ private: private: int m_nRecvChangeDataPeriod; // 应用程序接收数据的时间间隔，单位：ms int64 m_nLastSendChangeDataTime; // 上次发送数据给应用程序的时间，单位：ms - kbd_net::CMbCommunicator* m_pMbComm; // 通讯器 + iot_net::CMbCommunicator* m_pMbComm; // 通讯器 CSubscribeEngine* m_pSubscribe; // 订阅关系 int64 m_nLastSendSubscribeSnapTime; // 上次发送订阅快照时间，单位：ms std::vector m_vPointInfo; // 缓存测点 - std::vector m_vVar; // 缓存值 + std::vector m_vVar; // 缓存值 int64 m_nLastCheckValueTime; // 上次检查值超时时间 }; diff --git a/platform/src/include/dbms/rdb_changedata_api/CSubscribeApi.h b/platform/src/include/dbms/rdb_changedata_api/CSubscribeApi.h index f632d84e..85184e4e 100644 --- a/platform/src/include/dbms/rdb_changedata_api/CSubscribeApi.h +++ b/platform/src/include/dbms/rdb_changedata_api/CSubscribeApi.h @@ -44,7 +44,7 @@ struct SPointInfo sKey = t.sKey; sColumn = t.sColumn; } - SPointInfo( const kbd_idlfile::SPointMsg& t ) + SPointInfo( const iot_idl::SPointMsg& t ) { nDomainId = t.ndominid(); nAppId = t.nappid(); @@ -100,7 +100,7 @@ struct SCommInfo sHost = t.sHost; nLastSubscribeTime = t.nLastSubscribeTime; } - SCommInfo ( const kbd_net::CMbMessage& t) + SCommInfo ( const iot_net::CMbMessage& t) { sComm = t.getSrcComm(); sProc = t.getSrcProc(); diff --git a/platform/src/include/dbms/rdb_net_api/CRdbNetApi.h b/platform/src/include/dbms/rdb_net_api/CRdbNetApi.h index c77b37f4..c499ba91 100644 --- a/platform/src/include/dbms/rdb_net_api/CRdbNetApi.h +++ b/platform/src/include/dbms/rdb_net_api/CRdbNetApi.h @@ -4,14 +4,14 @@ #include "common/Export.h" #include "RdbServerMessage.pb.h" -namespace kbd_dbms +namespace iot_dbms { class CRdbNetApiImpl; /** * @brief CRdbNetApi * -* 实时库网络接口类. 宿主程序负责初始化消息总线，kbd_net::initMsgBus()。 +* 实时库网络接口类. 宿主程序负责初始化消息总线，iot_net::initMsgBus()。 * * 加解锁接口已废弃，单次操作在服务端作为事务执行，本接口不支持事务 */ @@ -23,10 +23,10 @@ public: public: void connect( int nDomainID, int nAppID ); - bool insert( kbd_idlfile::RdbInsert& objInsert, bool asyn = false ); //默认同步方式, 异步方式总是返回true - bool remove( kbd_idlfile::RdbRemove& objRemove, bool asyn = false ); - bool update( kbd_idlfile::RdbUpdate& objUpdate, bool asyn = false ); - bool query( kbd_idlfile::RdbQuery& objQuery, kbd_idlfile::RdbRet& objRet, bool asyn = false ); + bool insert( iot_idl::RdbInsert& objInsert, bool asyn = false ); //默认同步方式, 异步方式总是返回true + bool remove( iot_idl::RdbRemove& objRemove, bool asyn = false ); + bool update( iot_idl::RdbUpdate& objUpdate, bool asyn = false ); + bool query( iot_idl::RdbQuery& objQuery, iot_idl::RdbRet& objRet, bool asyn = false ); /** * @brief queryByKey 通过主键查询 * @param sTable 表名 @@ -37,7 +37,7 @@ public: * @return true成功，false失败 */ bool queryByKey( const std::string& sTable, const std::string& sKey, - const std::string& sColumn, kbd_idlfile::RdbRet& objRet, bool asyn = false ); + const std::string& sColumn, iot_idl::RdbRet& objRet, bool asyn = false ); /** * @brief queryByKey 通过主键查询 * @param sTable 表名 @@ -51,7 +51,7 @@ public: * @return true成功，false失败（当返回结果为false时，结果集不可信） */ bool queryByKey( const std::string& sTable, const std::vector& vecKey, - const std::vector& vecColumn, kbd_idlfile::RdbRet& objRet, bool asyn = false ); + const std::vector& vecColumn, iot_idl::RdbRet& objRet, bool asyn = false ); /** * @brief queryTotal 查询整张表信息 @@ -66,13 +66,13 @@ public: * @return true成功，false失败（当返回结果为false时，结果集不可信） */ bool queryTotal( const std::string& sTable, const std::vector& vecColumn, - kbd_idlfile::RdbRet& objRet, bool asyn = false, bool bSendToDomain = true ); + iot_idl::RdbRet& objRet, bool asyn = false, bool bSendToDomain = true ); bool lock( const std::string& strTableName, bool asyn = false ); // 已废弃，保留仅为兼容 // 异步方式不需要锁表 bool unLock( const std::string& strTableName, bool asyn = false ); // 已废弃，保留仅为兼容 bool checkStatus(); // 可以调用getRet获取结果。 - bool getRet( kbd_idlfile::RdbRet* const objRet = NULL ); // query 接口需要传入非NULL指针，用于获取查询结果 + bool getRet( iot_idl::RdbRet* const objRet = NULL ); // query 接口需要传入非NULL指针，用于获取查询结果 void clearAsynRequest(); // 清空异步请求队列，同时清空异步结果队列 const std::string& getErr() const; // 获取错误信息，在返回结果为失败时可信 diff --git a/platform/src/include/dbms/tsdb_api/CTsdbConn.h b/platform/src/include/dbms/tsdb_api/CTsdbConn.h index 5e3482bc..3fff90e1 100644 --- a/platform/src/include/dbms/tsdb_api/CTsdbConn.h +++ b/platform/src/include/dbms/tsdb_api/CTsdbConn.h @@ -14,7 +14,7 @@ #include "TsdbApiExport.h" -namespace kbd_dbms +namespace iot_dbms { //< CTsdbConn的实现类 class CTsdbConnImp; @@ -102,5 +102,5 @@ private: typedef boost::shared_ptr CTsdbConnPtr; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/include/dbms/tsdb_api/TsdbApi.h b/platform/src/include/dbms/tsdb_api/TsdbApi.h index 9e9cf0cc..1cc6cdf5 100644 --- a/platform/src/include/dbms/tsdb_api/TsdbApi.h +++ b/platform/src/include/dbms/tsdb_api/TsdbApi.h @@ -14,7 +14,7 @@ //< 本文件为时序库访问接口库总头文件 #include "CTsdbConn.h" -namespace kbd_dbms +namespace iot_dbms { /******************************************************************************//** @@ -49,5 +49,5 @@ TSDB_API CTsdbConnPtr getOneUseableConn(bool bLocalDomain); **********************************************************************************/ TSDB_API bool releaseTsdbApi(); -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/include/dbms/tsdb_save_api/CTsdbSaveApi.h b/platform/src/include/dbms/tsdb_save_api/CTsdbSaveApi.h index 686c6333..01c678ef 100644 --- a/platform/src/include/dbms/tsdb_save_api/CTsdbSaveApi.h +++ b/platform/src/include/dbms/tsdb_save_api/CTsdbSaveApi.h @@ -34,7 +34,7 @@ #pragma warning(pop) #endif -namespace kbd_dbms +namespace iot_dbms { class CTsdbSaveApiImp; //< 实现类 @@ -81,7 +81,7 @@ public: * @retval true：成功 * false：失败（缓存队列已满，或消息结构不正确） **********************************************************************************/ - bool addInsertMsg(const kbd_idlfile::STssInsert &objInsert); + bool addInsertMsg(const iot_idl::STssInsert &objInsert); private: @@ -90,5 +90,5 @@ private: typedef boost::shared_ptr CTsdbSaveApiPtr; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/platform/src/include/gui/GraphTool/Retriever/CRetriever.h b/platform/src/include/gui/GraphTool/Retriever/CRetriever.h index f6c5b3c3..4b895e85 100644 --- a/platform/src/include/gui/GraphTool/Retriever/CRetriever.h +++ b/platform/src/include/gui/GraphTool/Retriever/CRetriever.h @@ -16,7 +16,7 @@ namespace Ui { class CRetriever; } -using namespace kbd_dbms; +using namespace iot_dbms; class QStandardItem; class QStandardItemModel; diff --git a/platform/src/include/net/net_msg_bus_api/CMbCommunicator.h b/platform/src/include/net/net_msg_bus_api/CMbCommunicator.h index 68d5a936..c69bb5f6 100644 --- a/platform/src/include/net/net_msg_bus_api/CMbCommunicator.h +++ b/platform/src/include/net/net_msg_bus_api/CMbCommunicator.h @@ -15,7 +15,7 @@ #include "CMbMessage.h" #include "CMbSubInfo.h" -namespace kbd_net +namespace iot_net { //< CMbCommunicator的实现类 class CMbCommunicatorImp; @@ -185,5 +185,5 @@ private: CMbCommunicatorImp *m_pImp; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/include/net/net_msg_bus_api/CMbMessage.h b/platform/src/include/net/net_msg_bus_api/CMbMessage.h index 0e09085e..3059da0e 100644 --- a/platform/src/include/net/net_msg_bus_api/CMbMessage.h +++ b/platform/src/include/net/net_msg_bus_api/CMbMessage.h @@ -26,7 +26,7 @@ class MessageLite; } //< namespace protobuf } //< namespace google -namespace kbd_net +namespace iot_net { /******************************************************************************//** @@ -280,5 +280,5 @@ private: kmbp_t *m_pKmbp; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/include/net/net_msg_bus_api/CMbSubInfo.h b/platform/src/include/net/net_msg_bus_api/CMbSubInfo.h index 24df4f9e..e39d1dc5 100644 --- a/platform/src/include/net/net_msg_bus_api/CMbSubInfo.h +++ b/platform/src/include/net/net_msg_bus_api/CMbSubInfo.h @@ -13,7 +13,7 @@ #include "MbApiExport.h" -namespace kbd_net +namespace iot_net { class CMbSubInfoImp; //< 实现类 @@ -88,5 +88,5 @@ private: CMbSubInfoImp *m_pImp; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/include/net/net_msg_bus_api/MbApiExport.h b/platform/src/include/net/net_msg_bus_api/MbApiExport.h index 4c9646e4..a699cf04 100644 --- a/platform/src/include/net/net_msg_bus_api/MbApiExport.h +++ b/platform/src/include/net/net_msg_bus_api/MbApiExport.h @@ -17,7 +17,7 @@ #define MSGBUS_API G_DECL_IMPORT #endif -namespace kbd_net +namespace iot_net { /** @brief 压缩开关选项枚举 */ @@ -30,5 +30,5 @@ enum EnMbZipSwitch EN_MB_ZIP_DISABLE, //!< 不启用压缩 }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/include/net/net_msg_bus_api/MsgBusApi.h b/platform/src/include/net/net_msg_bus_api/MsgBusApi.h index 9baca641..2730cbb1 100644 --- a/platform/src/include/net/net_msg_bus_api/MsgBusApi.h +++ b/platform/src/include/net/net_msg_bus_api/MsgBusApi.h @@ -20,7 +20,7 @@ /** * @brief network，网络相关组件命名空间 */ -namespace kbd_net +namespace iot_net { /******************************************************************************//** @@ -65,5 +65,5 @@ MSGBUS_API bool isConnected(); **********************************************************************************/ MSGBUS_API bool releaseMsgBus(); -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/include/public/pub_logger_api/logger.h b/platform/src/include/public/pub_logger_api/logger.h index 61a321d4..cad8d628 100644 --- a/platform/src/include/public/pub_logger_api/logger.h +++ b/platform/src/include/public/pub_logger_api/logger.h @@ -17,7 +17,7 @@ /** * @brief 公共基础组件命名空间 */ -namespace kbd_public { +namespace iot_public { /** * @brief 启动日志系统 @@ -43,7 +43,7 @@ DLL_CLASS log4cplus::Logger& getLogger( bool& bValid ); LOG4CPLUS_SUPPRESS_DOWHILE_WARNING() \ do { \ bool bValid = false; \ - log4cplus::Logger& tmpLogger = kbd_public::getLogger( bValid ); \ + log4cplus::Logger& tmpLogger = iot_public::getLogger( bValid ); \ if ( bValid ) \ { \ LOG4CPLUS_TRACE_FMT( tmpLogger, pszFormat, ##__VA_ARGS__ ); \ @@ -58,7 +58,7 @@ DLL_CLASS log4cplus::Logger& getLogger( bool& bValid ); LOG4CPLUS_SUPPRESS_DOWHILE_WARNING() \ do { \ bool bValid = false; \ - log4cplus::Logger& tmpLogger = kbd_public::getLogger( bValid ); \ + log4cplus::Logger& tmpLogger = iot_public::getLogger( bValid ); \ if ( bValid ) \ { \ LOG4CPLUS_DEBUG_FMT( tmpLogger, pszFormat, ##__VA_ARGS__ ); \ @@ -73,7 +73,7 @@ DLL_CLASS log4cplus::Logger& getLogger( bool& bValid ); LOG4CPLUS_SUPPRESS_DOWHILE_WARNING() \ do { \ bool bValid = false; \ - log4cplus::Logger& tmpLogger = kbd_public::getLogger( bValid ); \ + log4cplus::Logger& tmpLogger = iot_public::getLogger( bValid ); \ if ( bValid ) \ { \ LOG4CPLUS_INFO_FMT( tmpLogger, pszFormat, ##__VA_ARGS__ ); \ @@ -88,7 +88,7 @@ DLL_CLASS log4cplus::Logger& getLogger( bool& bValid ); LOG4CPLUS_SUPPRESS_DOWHILE_WARNING() \ do { \ bool bValid = false; \ - log4cplus::Logger& tmpLogger = kbd_public::getLogger( bValid ); \ + log4cplus::Logger& tmpLogger = iot_public::getLogger( bValid ); \ if ( bValid ) \ { \ LOG4CPLUS_WARN_FMT( tmpLogger, pszFormat, ##__VA_ARGS__ ); \ @@ -103,7 +103,7 @@ DLL_CLASS log4cplus::Logger& getLogger( bool& bValid ); LOG4CPLUS_SUPPRESS_DOWHILE_WARNING() \ do { \ bool bValid = false; \ - log4cplus::Logger& tmpLogger = kbd_public::getLogger( bValid ); \ + log4cplus::Logger& tmpLogger = iot_public::getLogger( bValid ); \ if ( bValid ) \ { \ LOG4CPLUS_ERROR_FMT( tmpLogger, pszFormat, ##__VA_ARGS__ ); \ @@ -118,7 +118,7 @@ DLL_CLASS log4cplus::Logger& getLogger( bool& bValid ); LOG4CPLUS_SUPPRESS_DOWHILE_WARNING() \ do { \ bool bValid = false; \ - log4cplus::Logger& tmpLogger = kbd_public::getLogger( bValid ); \ + log4cplus::Logger& tmpLogger = iot_public::getLogger( bValid ); \ if ( bValid ) \ { \ LOG4CPLUS_FATAL_FMT( tmpLogger, pszFormat, ##__VA_ARGS__ ); \ 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 a924d32d..7172631a 100644 --- a/platform/src/include/public/pub_lua_engine_api/LuaEngineImpl.inl +++ b/platform/src/include/public/pub_lua_engine_api/LuaEngineImpl.inl @@ -112,7 +112,7 @@ bool CLuaEngineInterface::convertToLuaArgs(const LuaVariantTypeSeq &vecArgs, lua /* @brief 执行指定函数,不带参数的 */ template -int kbd_public::CLuaEngineInterface::execFunction(const std::string &strFuncName, const std::string &strFunction, T1 &ret) +int iot_public::CLuaEngineInterface::execFunction(const std::string &strFuncName, const std::string &strFunction, T1 &ret) { if (kbdSuccess != loadFunction(strFunction)) { @@ -140,7 +140,7 @@ int kbd_public::CLuaEngineInterface::execFunction(const std::string &strFuncName /* @brief 执行指定函数,带1个参数 */ template -int kbd_public::CLuaEngineInterface::execFunction(const std::string &strFuncName, +int iot_public::CLuaEngineInterface::execFunction(const std::string &strFuncName, const std::string &strFunction, const LuaVariantTypeSeq &vecArgs, T1 &ret) @@ -275,7 +275,7 @@ int CLuaEngineInterface::execFunction(const std::string &strFuncName, /* @brief 执行指定函数,带4个参数 */ template -int kbd_public::CLuaEngineInterface::execFunction(const std::string &strFuncName, +int iot_public::CLuaEngineInterface::execFunction(const std::string &strFuncName, const std::string &strFunction, const LuaVariantTypeSeq &vecArgs1, const LuaVariantTypeSeq &vecArgs2, 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 d7d29a04..7015dfef 100644 --- a/platform/src/include/public/pub_lua_engine_api/LuaEngineInterface.h +++ b/platform/src/include/public/pub_lua_engine_api/LuaEngineInterface.h @@ -24,7 +24,7 @@ #include "common/Common.h" #include "boost/variant.hpp" -namespace kbd_public +namespace iot_public { typedef boost::variant LuaVariantType; typedef std::vector LuaVariantTypeSeq; diff --git a/platform/src/include/public/pub_sysinfo_api/SysInfoApi.h b/platform/src/include/public/pub_sysinfo_api/SysInfoApi.h index e3d3c06c..04081e7b 100644 --- a/platform/src/include/public/pub_sysinfo_api/SysInfoApi.h +++ b/platform/src/include/public/pub_sysinfo_api/SysInfoApi.h @@ -19,7 +19,7 @@ #define PUB_SYSINFO_API G_DECL_IMPORT #endif -namespace kbd_public +namespace iot_public { /** @brief 系统信息接口定义 @@ -407,4 +407,4 @@ namespace kbd_public /* @brief 创建系统信息访问库实例 */ extern "C" PUB_SYSINFO_API bool createSysInfoInstance(CSysInfoInterfacePtr &spOutput); -} //namespace kbd_public +} //namespace iot_public diff --git a/platform/src/include/public/pub_sysinfo_api/SysInfoBase.h b/platform/src/include/public/pub_sysinfo_api/SysInfoBase.h index 2ec871a0..886ac327 100644 --- a/platform/src/include/public/pub_sysinfo_api/SysInfoBase.h +++ b/platform/src/include/public/pub_sysinfo_api/SysInfoBase.h @@ -11,7 +11,7 @@ #include #include "Common.h" -namespace kbd_public +namespace iot_public { /** @brief 节点类型 @@ -343,5 +343,5 @@ namespace kbd_public std::vector m_vecRelaySub; }; -} //namespace kbd_public +} //namespace iot_public diff --git a/platform/src/include/public/pub_utility_api/BaseService.h b/platform/src/include/public/pub_utility_api/BaseService.h index 76b00caa..057d2557 100644 --- a/platform/src/include/public/pub_utility_api/BaseService.h +++ b/platform/src/include/public/pub_utility_api/BaseService.h @@ -14,7 +14,7 @@ #pragma warning(disable:4251) #endif -namespace kbd_public +namespace iot_public { class PUB_UTILITY_API CBaseService { diff --git a/platform/src/include/public/pub_utility_api/BreakPadInterface.h b/platform/src/include/public/pub_utility_api/BreakPadInterface.h index dc29aefa..ee8bc552 100644 --- a/platform/src/include/public/pub_utility_api/BreakPadInterface.h +++ b/platform/src/include/public/pub_utility_api/BreakPadInterface.h @@ -9,7 +9,7 @@ const std::string CN_MiniDumpPath = "../../minidump"; //< dump文件存储路径 -namespace kbd_public +namespace iot_public { /** @brief 初始化minidump生成类，只能捕获此方法调用之后的异常 @@ -22,4 +22,4 @@ namespace kbd_public */ bool PUB_UTILITY_API uninstallBreakPad(); -} //namespace kbd_public +} //namespace iot_public diff --git a/platform/src/include/public/pub_utility_api/CProcessSharedMutex.h b/platform/src/include/public/pub_utility_api/CProcessSharedMutex.h index f17ce90e..525eb9cf 100644 --- a/platform/src/include/public/pub_utility_api/CProcessSharedMutex.h +++ b/platform/src/include/public/pub_utility_api/CProcessSharedMutex.h @@ -15,7 +15,7 @@ #define MUTEX_NAME_MAX_LENGTH 128 -namespace kbd_public +namespace iot_public { // 进程共享互斥锁 diff --git a/platform/src/include/public/pub_utility_api/CharUtil.h b/platform/src/include/public/pub_utility_api/CharUtil.h index c6a16523..c4fafc49 100644 --- a/platform/src/include/public/pub_utility_api/CharUtil.h +++ b/platform/src/include/public/pub_utility_api/CharUtil.h @@ -12,7 +12,7 @@ #include #include "DataType.h" -namespace kbd_public +namespace iot_public { __inline std::string BoolToString(bool bValue) { diff --git a/platform/src/include/public/pub_utility_api/CommonConfigParse.h b/platform/src/include/public/pub_utility_api/CommonConfigParse.h index 6f295a56..edbde52b 100644 --- a/platform/src/include/public/pub_utility_api/CommonConfigParse.h +++ b/platform/src/include/public/pub_utility_api/CommonConfigParse.h @@ -14,7 +14,7 @@ #pragma warning(disable:4251) #endif -namespace kbd_public +namespace iot_public { /* @brief 通用的配置文件解析类，创建对象后先调用load函数 */ class PUB_UTILITY_API CCommonConfigParse @@ -140,7 +140,7 @@ namespace kbd_public ParamMAP m_mapParam; //< 保存所有的参数信息 }; -} //namespace kbd_public +} //namespace iot_public #ifdef _MSC_VER #pragma warning(pop) diff --git a/platform/src/include/public/pub_utility_api/DeadlockCheckThread.h b/platform/src/include/public/pub_utility_api/DeadlockCheckThread.h index e102efb7..853e9cf2 100644 --- a/platform/src/include/public/pub_utility_api/DeadlockCheckThread.h +++ b/platform/src/include/public/pub_utility_api/DeadlockCheckThread.h @@ -15,7 +15,7 @@ #pragma warning(disable:4251) #endif -namespace kbd_public +namespace iot_public { const int CN_DeadlockTimeoutMsec = 3 * 60 * 1000; //< 死锁超时时间 const int CN_DeadlockCheckPeriod = 5 * 1000; //< 死锁检查周期 @@ -81,7 +81,7 @@ namespace kbd_public boost::condition_variable m_objCond; //< 信号量 }; -} //namespace kbd_public +} //namespace iot_public #ifdef _MSC_VER #pragma warning(pop) diff --git a/platform/src/include/public/pub_utility_api/FileStyle.h b/platform/src/include/public/pub_utility_api/FileStyle.h index 1d99db55..78a3b26d 100644 --- a/platform/src/include/public/pub_utility_api/FileStyle.h +++ b/platform/src/include/public/pub_utility_api/FileStyle.h @@ -9,7 +9,7 @@ #include #include "pub_utility_api/UtilityCommon.h" -namespace kbd_public +namespace iot_public { class PUB_UTILITY_API CFileStyle @@ -36,4 +36,4 @@ public: const std::string &strDefaultStyle = "light" ); }; -} //namespace kbd_public +} //namespace iot_public diff --git a/platform/src/include/public/pub_utility_api/FileUtil.h b/platform/src/include/public/pub_utility_api/FileUtil.h index cc49d2d0..d64cfe86 100644 --- a/platform/src/include/public/pub_utility_api/FileUtil.h +++ b/platform/src/include/public/pub_utility_api/FileUtil.h @@ -8,7 +8,7 @@ #include #include "pub_utility_api/UtilityCommon.h" -namespace kbd_public +namespace iot_public { class PUB_UTILITY_API CFileUtil { @@ -104,4 +104,4 @@ public: }; -} //namespace kbd_public +} //namespace iot_public diff --git a/platform/src/include/public/pub_utility_api/I18N.h b/platform/src/include/public/pub_utility_api/I18N.h index c4e8215e..0f7ef33c 100644 --- a/platform/src/include/public/pub_utility_api/I18N.h +++ b/platform/src/include/public/pub_utility_api/I18N.h @@ -16,7 +16,7 @@ // #define I18N_DLL(strDomain,strMsg) boost::locale::translate(strMsg).str(strDomain) // #define I18N_DLL_C(strDomain,strMsg) boost::locale::translate(strMsg).str(strDomain).c_str() -namespace kbd_public +namespace iot_public { /** @@ -39,4 +39,4 @@ PUB_UTILITY_API bool initI18N( const std::string &strRelativePath, const std::st const std::string &strPlatOrProd = DIR_PLAT_OR_PROD ); -} //< namespace kbd_public +} //< namespace iot_public diff --git a/platform/src/include/public/pub_utility_api/LoadLibrary.h b/platform/src/include/public/pub_utility_api/LoadLibrary.h index 55f41e36..9b496a3c 100644 --- a/platform/src/include/public/pub_utility_api/LoadLibrary.h +++ b/platform/src/include/public/pub_utility_api/LoadLibrary.h @@ -14,7 +14,7 @@ #include #include "pub_utility_api/UtilityCommon.h" -namespace kbd_public +namespace iot_public { /** @brief 动态库加载类 diff --git a/platform/src/include/public/pub_utility_api/ProcUtil.h b/platform/src/include/public/pub_utility_api/ProcUtil.h index aeb6d60b..7dffa170 100644 --- a/platform/src/include/public/pub_utility_api/ProcUtil.h +++ b/platform/src/include/public/pub_utility_api/ProcUtil.h @@ -42,7 +42,7 @@ #endif -namespace kbd_public +namespace iot_public { /** @brief 进程相关操作 @@ -94,4 +94,4 @@ public: }; -} //namespace kbd_public +} //namespace iot_public diff --git a/platform/src/include/public/pub_utility_api/SingleProcInstance.h b/platform/src/include/public/pub_utility_api/SingleProcInstance.h index 937a7232..21216b55 100644 --- a/platform/src/include/public/pub_utility_api/SingleProcInstance.h +++ b/platform/src/include/public/pub_utility_api/SingleProcInstance.h @@ -11,7 +11,7 @@ #include #include "pub_utility_api/UtilityCommon.h" -namespace kbd_public +namespace iot_public { class PUB_UTILITY_API CSingleProcInstance { @@ -26,6 +26,6 @@ namespace kbd_public */ static bool hasInstanceRunning(const std::string& strUniqueName, const bool bCaseSensitive = false); }; -} //namespace kbd_public +} //namespace iot_public #endif // __PUBLIC_SINGLEPROCINSTANCE_H__ diff --git a/platform/src/include/public/pub_utility_api/TimeUtil.h b/platform/src/include/public/pub_utility_api/TimeUtil.h index 0fe21e25..aeffa036 100644 --- a/platform/src/include/public/pub_utility_api/TimeUtil.h +++ b/platform/src/include/public/pub_utility_api/TimeUtil.h @@ -28,7 +28,7 @@ #define HOUR_PER_DAY (24) //每天包含的小时数 -namespace kbd_public +namespace iot_public { /* @brief 操作系统运行至今的毫秒数，不包含休眠时间 */ __inline int64 getMonotonicMsec() @@ -199,6 +199,6 @@ namespace kbd_public } } -} //namespace kbd_public +} //namespace iot_public #endif // __PUBLIC_TIMEUTIL_H__ diff --git a/platform/src/include/public/pub_utility_api/TimerThreadBase.h b/platform/src/include/public/pub_utility_api/TimerThreadBase.h index 9be3c485..4fb71e54 100644 --- a/platform/src/include/public/pub_utility_api/TimerThreadBase.h +++ b/platform/src/include/public/pub_utility_api/TimerThreadBase.h @@ -21,7 +21,7 @@ #pragma warning(disable:4251) #endif -namespace kbd_public +namespace iot_public { const int CN_RunPeriodMsec = 1000; //线程运行间隔，单位：毫秒 @@ -40,7 +40,7 @@ namespace kbd_public */ explicit CTimerThreadBase(const std::string &strThreadDesc, int nRunPeriodMsec = CN_RunPeriodMsec, - int nDeadlockTimeoutMsec = kbd_public::CN_DeadlockTimeoutMsec, + int nDeadlockTimeoutMsec = iot_public::CN_DeadlockTimeoutMsec, bool bSuspend = true); virtual ~CTimerThreadBase(); /** diff --git a/platform/src/include/service/alarm_server_api/AlarmCommonDef.h b/platform/src/include/service/alarm_server_api/AlarmCommonDef.h index 4c4ae38c..64f594c0 100644 --- a/platform/src/include/service/alarm_server_api/AlarmCommonDef.h +++ b/platform/src/include/service/alarm_server_api/AlarmCommonDef.h @@ -8,7 +8,7 @@ #pragma once -namespace kbd_service +namespace iot_service { /******************************************************************************//** @@ -279,5 +279,5 @@ enum enAlarmStatus -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/include/service/alarm_server_api/CAlmApiForAlmClt.h b/platform/src/include/service/alarm_server_api/CAlmApiForAlmClt.h index af789334..95f3b899 100644 --- a/platform/src/include/service/alarm_server_api/CAlmApiForAlmClt.h +++ b/platform/src/include/service/alarm_server_api/CAlmApiForAlmClt.h @@ -33,7 +33,7 @@ #pragma warning(pop) #endif -namespace kbd_service +namespace iot_service { class CAlmApiForAlmCltImp; //< 实现类 @@ -91,7 +91,7 @@ public: * @retval true：处理线程已接收请求，并将与告警服务交互 * false：失败，可能缓存已满，传入结构不正确 **********************************************************************************/ - bool requestCfmAlm(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm); + bool requestCfmAlm(iot_idl::SAlmCltCfmAlm &objCfmAlm); /******************************************************************************//** * @brief 向告警服务请求删除告警 @@ -101,7 +101,7 @@ public: * @retval true：处理线程已接收请求，并将与告警服务交互 * false：失败，可能缓存已满，传入结构不正确 **********************************************************************************/ - bool requestDelAlm(kbd_idlfile::SAlmCltDelAlm &objDelAlm); + bool requestDelAlm(iot_idl::SAlmCltDelAlm &objDelAlm); /******************************************************************************//** * @brief 收到有效的告警服务发来的全部缓存告警消息时，处理线程调用此函数 @@ -110,7 +110,7 @@ public: * @return 无 * @retval 无 **********************************************************************************/ - virtual void handleAllAlmMsg(int nDomainID, kbd_idlfile::SAlmCltAddAlm &objAllAlm) = 0; + virtual void handleAllAlmMsg(int nDomainID, iot_idl::SAlmCltAddAlm &objAllAlm) = 0; /******************************************************************************//** * @brief 收到有效的告警服务发来的添加告警消息时，处理线程调用此函数 @@ -119,7 +119,7 @@ public: * @return 无 * @retval 无 **********************************************************************************/ - virtual void handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm) = 0; + virtual void handleAddAlmMsg(iot_idl::SAlmCltAddAlm &objAddAlm) = 0; /******************************************************************************//** * @brief 收到有效的告警服务发来的确认告警消息时，处理线程调用此函数 @@ -128,7 +128,7 @@ public: * @return 无 * @retval 无 **********************************************************************************/ - virtual void handleCfmAlmMsg(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) = 0; + virtual void handleCfmAlmMsg(iot_idl::SAlmCltCfmAlm &objCfmAlm) = 0; /******************************************************************************//** * @brief 收到有效的告警服务发来的删除告警消息时，处理线程调用此函数 @@ -137,7 +137,7 @@ public: * @return 无 * @retval 无 **********************************************************************************/ - virtual void handleDelAlmMsg(kbd_idlfile::SAlmCltDelAlm &objDelAlm) = 0; + virtual void handleDelAlmMsg(iot_idl::SAlmCltDelAlm &objDelAlm) = 0; /******************************************************************************//** * @brief 收到有效的告警服务发来的释放告警内存消息时，处理线程调用此函数 @@ -146,7 +146,7 @@ public: * @return 无 * @retval 无 **********************************************************************************/ - virtual void handleReleaseAlmMsg(kbd_idlfile::SAlmCltReleaseAlm &objReleaseAlm) = 0; + virtual void handleReleaseAlmMsg(iot_idl::SAlmCltReleaseAlm &objReleaseAlm) = 0; /******************************************************************************//** * @brief 收到有效的告警服务发来的关联故障录波消息时，处理线程调用此函数 @@ -155,11 +155,11 @@ public: * @return 无 * @retval 无 **********************************************************************************/ - virtual void handleLinkWave2AlmMsg( kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Alm); + virtual void handleLinkWave2AlmMsg( iot_idl::SAlmCltLinkWave2Alm &objWave2Alm); private: CAlmApiForAlmCltImp *m_pImp; }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/include/service/alarm_server_api/CAlmApiForApp.h b/platform/src/include/service/alarm_server_api/CAlmApiForApp.h index f35d31bd..95721b16 100644 --- a/platform/src/include/service/alarm_server_api/CAlmApiForApp.h +++ b/platform/src/include/service/alarm_server_api/CAlmApiForApp.h @@ -35,7 +35,7 @@ #pragma warning(pop) #endif -namespace kbd_service +namespace iot_service { class CAlmApiForAppImp; //< 实现类 @@ -83,7 +83,7 @@ public: * @retval true：成功 * false：失败（缓存队列已满，或消息结构不正确） **********************************************************************************/ - bool addAlarm(kbd_idlfile::SAppAddAlm &objAlarm); + bool addAlarm(iot_idl::SAppAddAlm &objAlarm); /******************************************************************************//** * @brief 添加录波信息，用于告警关联 @@ -92,7 +92,7 @@ public: * @retval true：成功 * false：失败（缓存队列已满，或消息结构不正确） **********************************************************************************/ - bool addWave(const kbd_idlfile::SAppAddWave &objWave); + bool addWave(const iot_idl::SAppAddWave &objWave); private: @@ -101,5 +101,5 @@ private: typedef boost::shared_ptr CAlmApiForAppPtr; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/include/service/alarm_server_api/CAlmApiForDpSrv.h b/platform/src/include/service/alarm_server_api/CAlmApiForDpSrv.h index dfd13994..2bab5d44 100644 --- a/platform/src/include/service/alarm_server_api/CAlmApiForDpSrv.h +++ b/platform/src/include/service/alarm_server_api/CAlmApiForDpSrv.h @@ -14,7 +14,7 @@ #include "AlarmServerApiExport.h" -namespace kbd_service +namespace iot_service { class CAlmApiForDpSrvImp; //< 实现类 @@ -70,5 +70,5 @@ private: CAlmApiForDpSrvImp *m_pImp; }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/include/service/alarm_server_api/CAlmApiForEvtClt.h b/platform/src/include/service/alarm_server_api/CAlmApiForEvtClt.h index 587351e2..9e15dd67 100644 --- a/platform/src/include/service/alarm_server_api/CAlmApiForEvtClt.h +++ b/platform/src/include/service/alarm_server_api/CAlmApiForEvtClt.h @@ -12,7 +12,7 @@ #include "CAlmApiForAlmClt.h" -namespace kbd_service +namespace iot_service { /******************************************************************************//** @@ -75,7 +75,7 @@ public: * @return 无 * @retval 无 **********************************************************************************/ - virtual void handleAllEvtMsg(int nDomainID, kbd_idlfile::SEvtCltAddEvt &objAllEvt) = 0; + virtual void handleAllEvtMsg(int nDomainID, iot_idl::SEvtCltAddEvt &objAllEvt) = 0; /******************************************************************************//** * @brief 收到有效的告警服务发来的添加事件消息时，处理线程调用此函数 @@ -85,7 +85,7 @@ public: * @return 无 * @retval 无 **********************************************************************************/ - virtual void handleAddEvtMsg(kbd_idlfile::SEvtCltAddEvt &objAddEvt) = 0; + virtual void handleAddEvtMsg(iot_idl::SEvtCltAddEvt &objAddEvt) = 0; /******************************************************************************//** * @brief 收到有效的告警服务发来的关联故障录波消息时，处理线程调用此函数 @@ -94,22 +94,22 @@ public: * @return 无 * @retval 无 **********************************************************************************/ - virtual void handleLinkWave2EvtMsg( kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Evt); + virtual void handleLinkWave2EvtMsg( iot_idl::SAlmCltLinkWave2Alm &objWave2Evt); private: //< 将告警消息前5000条转为事件消息，调用 handleAllEvtMsg() - void handleAllAlmMsg(int nDomainID, kbd_idlfile::SAlmCltAddAlm &objAllAlm) override; + void handleAllAlmMsg(int nDomainID, iot_idl::SAlmCltAddAlm &objAllAlm) override; //< 将告警消息转为事件消息，调用 handleAddEvtMsg() - void handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm) override; + void handleAddAlmMsg(iot_idl::SAlmCltAddAlm &objAddAlm) override; //< 无需任何处理 - void handleCfmAlmMsg(kbd_idlfile::SAlmCltCfmAlm &) override; - void handleDelAlmMsg(kbd_idlfile::SAlmCltDelAlm &) override; - void handleReleaseAlmMsg(kbd_idlfile::SAlmCltReleaseAlm &) override; + void handleCfmAlmMsg(iot_idl::SAlmCltCfmAlm &) override; + void handleDelAlmMsg(iot_idl::SAlmCltDelAlm &) override; + void handleReleaseAlmMsg(iot_idl::SAlmCltReleaseAlm &) override; //< 转为调用handleLinkWave2EvtMsg() - void handleLinkWave2AlmMsg(kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Alm) override; + void handleLinkWave2AlmMsg(iot_idl::SAlmCltLinkWave2Alm &objWave2Alm) override; }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/include/service/common/NetMsgBusEx.cpp b/platform/src/include/service/common/NetMsgBusEx.cpp index 196ff092..e6e2ad1a 100644 --- a/platform/src/include/service/common/NetMsgBusEx.cpp +++ b/platform/src/include/service/common/NetMsgBusEx.cpp @@ -9,9 +9,9 @@ #include using namespace std; -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_net; +using namespace iot_public; +using namespace iot_service; diff --git a/platform/src/include/service/common/NetMsgBusEx.h b/platform/src/include/service/common/NetMsgBusEx.h index 15ffcc93..040cbfde 100644 --- a/platform/src/include/service/common/NetMsgBusEx.h +++ b/platform/src/include/service/common/NetMsgBusEx.h @@ -15,7 +15,7 @@ /** * @brief 基础服务组件命名空间 */ -namespace kbd_service +namespace iot_service { class CNetMsgBusEx { @@ -28,7 +28,7 @@ private: int m_nSrcDomainId; //消息源Domain ; private: - kbd_net::CMbCommunicator m_objComm; //通讯器； + iot_net::CMbCommunicator m_objComm; //通讯器； std::vector m_vecRegChannel; //订阅消息通道 public: @@ -43,7 +43,7 @@ public: /** @brief 从消息总线接收一条消息 */ - bool readFromBus(kbd_net::CMbMessage &objMsg,int nTimeOutMs=0); + bool readFromBus(iot_net::CMbMessage &objMsg,int nTimeOutMs=0); /** @brief 发送数据到消息总线,不通过消息队列 */ diff --git a/platform/src/include/service/data_process_api/DataProcessApi.h b/platform/src/include/service/data_process_api/DataProcessApi.h index 8ce02236..a1776601 100644 --- a/platform/src/include/service/data_process_api/DataProcessApi.h +++ b/platform/src/include/service/data_process_api/DataProcessApi.h @@ -23,7 +23,7 @@ #define SERVICE_DP_API G_DECL_IMPORT #endif -namespace kbd_service +namespace iot_service { const int STATUS_ORI_OPT = 0; // 人工操作、越限 const int STATUS_ORI_RECV = 1; // 数据接收 @@ -188,7 +188,7 @@ public: @retval */ virtual int getNewStatus(int nType, int &nNewStatus, int nOldStatus, int nAddStatus, int nDelStatus, - int nOriType = kbd_service::STATUS_ORI_OPT, int nUpdateType = 0) = 0 ; + int nOriType = iot_service::STATUS_ORI_OPT, int nUpdateType = 0) = 0 ; /** @brief 状态是否正常，nCalFlag==1时用于公式计算判断各分量是否正常，哪些状态位不正常在构造函数中配置 diff --git a/platform/src/include/service/dp_chg_data_api/CDpcdaForApp.h b/platform/src/include/service/dp_chg_data_api/CDpcdaForApp.h index e572feea..6b5aaa50 100644 --- a/platform/src/include/service/dp_chg_data_api/CDpcdaForApp.h +++ b/platform/src/include/service/dp_chg_data_api/CDpcdaForApp.h @@ -14,7 +14,7 @@ #include "DpcdaExport.h" -namespace kbd_service +namespace iot_service { /******************************************************************************//** @@ -96,5 +96,5 @@ public: typedef boost::shared_ptr CDpcdaForAppPtr; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/include/service/dp_chg_data_api/CDpcdaForDp.h b/platform/src/include/service/dp_chg_data_api/CDpcdaForDp.h index 45014f1b..c0d0801a 100644 --- a/platform/src/include/service/dp_chg_data_api/CDpcdaForDp.h +++ b/platform/src/include/service/dp_chg_data_api/CDpcdaForDp.h @@ -35,10 +35,10 @@ #include "DpcdaExport.h" -namespace kbd_service +namespace iot_service { -typedef boost::shared_ptr ConstSubInfoPtr; +typedef boost::shared_ptr ConstSubInfoPtr; typedef std::vector ConstSubInfoPtrVec; typedef boost::shared_ptr ConstSubInfoPtrVecPtr; @@ -93,7 +93,7 @@ public: * @retval true：成功 * false：失败（事故追忆反演状态，缓存队列已满，或消息结构不正确） **********************************************************************************/ - bool addChgData(kbd_idlfile::SRealTimeDataPkg &objChgData); + bool addChgData(iot_idl::SRealTimeDataPkg &objChgData); /******************************************************************************//** * @brief 获取当前全部订阅 @@ -122,5 +122,5 @@ private: typedef boost::shared_ptr CDpcdaForDpPtr; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/include/service/intelli_alm_api/CIntelliAlmApi4Clt.h b/platform/src/include/service/intelli_alm_api/CIntelliAlmApi4Clt.h index e8506ba2..01627750 100644 --- a/platform/src/include/service/intelli_alm_api/CIntelliAlmApi4Clt.h +++ b/platform/src/include/service/intelli_alm_api/CIntelliAlmApi4Clt.h @@ -33,7 +33,7 @@ #pragma warning(pop) #endif -namespace kbd_service +namespace iot_service { class CIntelliAlmApi4CltImpl; //< 实现类 @@ -97,7 +97,7 @@ public: * @retval true：处理线程已接收请求，并将与服务端交互 * false：失败，可能缓存已满，传入结构不正确 **********************************************************************************/ - bool requestDelAlm(const kbd_idlfile::SIntelliAlmDel &objDelAlm); + bool requestDelAlm(const iot_idl::SIntelliAlmDel &objDelAlm); /******************************************************************************//** * @brief 向服务端请求 将原始告警从其原智能告警中分离 @@ -106,7 +106,7 @@ public: * @retval true：处理线程已接收请求，并将与服务端交互 * false：失败，可能缓存已满，传入结构不正确 **********************************************************************************/ - bool requestSeprAlm(const kbd_idlfile::SIntelliAlmSepr &objSeprAlm); + bool requestSeprAlm(const iot_idl::SIntelliAlmSepr &objSeprAlm); /******************************************************************************//** * @brief 向服务端请求 将多条原始告警合并为一条智能告警 @@ -115,7 +115,7 @@ public: * @retval true：处理线程已接收请求，并将与服务端交互 * false：失败，可能缓存已满，传入结构不正确 **********************************************************************************/ - bool requestMergeAlm(const kbd_idlfile::SIntelliAlmMerge &objMergeAlm); + bool requestMergeAlm(const iot_idl::SIntelliAlmMerge &objMergeAlm); /******************************************************************************//** * @brief 收到有效的服务端发来的全部缓存告警消息时，处理线程调用此函数 @@ -124,7 +124,7 @@ public: * @return 无 * @retval 无 **********************************************************************************/ - virtual void handleAllAlmMsg(int nDomainID, kbd_idlfile::SIntelliAlmAdd &objAllAlm) = 0; + virtual void handleAllAlmMsg(int nDomainID, iot_idl::SIntelliAlmAdd &objAllAlm) = 0; /******************************************************************************//** * @brief 收到有效的服务端发来的添加告警消息时，处理线程调用此函数 @@ -133,7 +133,7 @@ public: * @return 无 * @retval 无 **********************************************************************************/ - virtual void handleAddAlmMsg(kbd_idlfile::SIntelliAlmAdd &objAddAlm) = 0; + virtual void handleAddAlmMsg(iot_idl::SIntelliAlmAdd &objAddAlm) = 0; /******************************************************************************//** @@ -143,7 +143,7 @@ public: * @return 无 * @retval 无 **********************************************************************************/ - virtual void handleDelAlmMsg(kbd_idlfile::SIntelliAlmDel &objDelAlm) = 0; + virtual void handleDelAlmMsg(iot_idl::SIntelliAlmDel &objDelAlm) = 0; /******************************************************************************//** * @brief 收到有效的服务端发来的通知告警不完整的消息时，处理线程调用此函数 @@ -153,7 +153,7 @@ public: * @return 无 * @retval 无 **********************************************************************************/ - virtual void handleBrokenAlmMsg(kbd_idlfile::SIntelliAlmBroken &objBrokenAlm) = 0; + virtual void handleBrokenAlmMsg(iot_idl::SIntelliAlmBroken &objBrokenAlm) = 0; /******************************************************************************//** * @brief 收到有效的服务端发来的释放告警消息时，处理线程调用此函数 @@ -162,11 +162,11 @@ public: * @return 无 * @retval 无 **********************************************************************************/ - virtual void handleReleaseAlmMsg(kbd_idlfile::SIntelliAlmRelease &objReleaseAlm) = 0; + virtual void handleReleaseAlmMsg(iot_idl::SIntelliAlmRelease &objReleaseAlm) = 0; private: CIntelliAlmApi4CltImpl *m_pImpl; }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/include/service/intelli_alm_srv/CIntelliAlmSrv.h b/platform/src/include/service/intelli_alm_srv/CIntelliAlmSrv.h index c6244e5a..dd9d2b6d 100644 --- a/platform/src/include/service/intelli_alm_srv/CIntelliAlmSrv.h +++ b/platform/src/include/service/intelli_alm_srv/CIntelliAlmSrv.h @@ -35,10 +35,10 @@ #endif //< 在智能告警端，不允许修改原始告警，所以是const -typedef boost::shared_ptr ConstSRawAlmInfoPtr; +typedef boost::shared_ptr ConstSRawAlmInfoPtr; typedef std::vector ConstSRawAlmInfoPtrVec; -namespace kbd_service +namespace iot_service { namespace intelli_alm_srv { @@ -108,4 +108,4 @@ private: }; } //< namespace intelli_alm_srv -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/include/service/interlock_api/InterLockInterface.h b/platform/src/include/service/interlock_api/InterLockInterface.h index 55dc81af..57153921 100644 --- a/platform/src/include/service/interlock_api/InterLockInterface.h +++ b/platform/src/include/service/interlock_api/InterLockInterface.h @@ -17,7 +17,7 @@ #define SERVICE_INTERLOCK_API G_DECL_IMPORT #endif -namespace kbd_service +namespace iot_service { /** @brief 进程管理访问库接口类 @@ -40,6 +40,6 @@ namespace kbd_service typedef boost::shared_ptr CInterLockInterfacePtr; /* @brief 创建闭锁参数访问接口实例 */ - SERVICE_INTERLOCK_API CInterLockInterfacePtr getInterLockInstance(const kbd_public::SRunAppInfo &stRunAppInfo,const std::string& strProcess); + SERVICE_INTERLOCK_API CInterLockInterfacePtr getInterLockInstance(const iot_public::SRunAppInfo &stRunAppInfo,const std::string& strProcess); } diff --git a/platform/src/include/service/operate_server_api/JsonOptCommand.cpp b/platform/src/include/service/operate_server_api/JsonOptCommand.cpp index f0416cd1..1f3f78d7 100644 --- a/platform/src/include/service/operate_server_api/JsonOptCommand.cpp +++ b/platform/src/include/service/operate_server_api/JsonOptCommand.cpp @@ -15,7 +15,7 @@ #include "pub_logger_api/logger.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; #define OPT_DOWN_INFO "OPT_DOWN_INFO" #define OPT_DOWN_KEYWORD "OPT_DOWN_KEYWORD" diff --git a/platform/src/include/service/perm_mng_api/PermMngApi.h b/platform/src/include/service/perm_mng_api/PermMngApi.h index 3bc92c94..0e75d046 100644 --- a/platform/src/include/service/perm_mng_api/PermMngApi.h +++ b/platform/src/include/service/perm_mng_api/PermMngApi.h @@ -21,7 +21,7 @@ #define SERVICE_PERM_MNG_API G_DECL_IMPORT #endif -namespace kbd_service +namespace iot_service { /** @brief 权限管理访问库接口类 diff --git a/platform/src/include/service/sample_server_api/SampleDefine.h b/platform/src/include/service/sample_server_api/SampleDefine.h index 40a6fd13..3e16a318 100644 --- a/platform/src/include/service/sample_server_api/SampleDefine.h +++ b/platform/src/include/service/sample_server_api/SampleDefine.h @@ -11,7 +11,7 @@ #define SAMPLE_CYC_MIN 5 //MIN -namespace kbd_service +namespace iot_service { //采样结果INFLEXDB 表定义 diff --git a/platform/src/include/service/sample_server_api/SampleServerApi.h b/platform/src/include/service/sample_server_api/SampleServerApi.h index 25e1a63a..818119f9 100644 --- a/platform/src/include/service/sample_server_api/SampleServerApi.h +++ b/platform/src/include/service/sample_server_api/SampleServerApi.h @@ -18,7 +18,7 @@ #define SERVICE_SAMPLE_SERVER_API G_DECL_IMPORT #endif -namespace kbd_service +namespace iot_service { class CSampleServerApi { @@ -38,7 +38,7 @@ public: }; typedef boost::shared_ptr CSampleServerApiPtr; -SERVICE_SAMPLE_SERVER_API CSampleServerApiPtr getSampleInstance(kbd_public::SRunAppInfo stRunAppInfo); +SERVICE_SAMPLE_SERVER_API CSampleServerApiPtr getSampleInstance(iot_public::SRunAppInfo stRunAppInfo); } diff --git a/platform/src/include/sys/sys_dog_auth_api/DogAuthInterface.h b/platform/src/include/sys/sys_dog_auth_api/DogAuthInterface.h index 80f39e34..fa42bf3b 100644 --- a/platform/src/include/sys/sys_dog_auth_api/DogAuthInterface.h +++ b/platform/src/include/sys/sys_dog_auth_api/DogAuthInterface.h @@ -19,7 +19,7 @@ #define SYS_DOG_AUTH_API G_DECL_IMPORT #endif -namespace kbd_sys +namespace iot_sys { /** @brief 加密狗认证接口类 @@ -39,5 +39,5 @@ namespace kbd_sys /* @brief 创建加密狗认证接口类实例 */ SYS_DOG_AUTH_API CDogAuthInterfacePtr getDogAuthInstance(); -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/include/sys/sys_license_auth_api/LicenseAuthInterface.h b/platform/src/include/sys/sys_license_auth_api/LicenseAuthInterface.h index 44120a00..fed68389 100644 --- a/platform/src/include/sys/sys_license_auth_api/LicenseAuthInterface.h +++ b/platform/src/include/sys/sys_license_auth_api/LicenseAuthInterface.h @@ -16,7 +16,7 @@ #define SYS_LICENSE_AUTH_API G_DECL_IMPORT #endif -namespace kbd_sys +namespace iot_sys { /** @brief LICENSE认证接口类 @@ -39,5 +39,5 @@ namespace kbd_sys /* @brief 创建加密狗认证接口类实例 */ SYS_LICENSE_AUTH_API CLicenseAuthInterfacePtr getLicenseAuthInstance(); -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/include/sys/sys_login_api/CLoginDlg.h b/platform/src/include/sys/sys_login_api/CLoginDlg.h index 5be536f6..bcba0f57 100644 --- a/platform/src/include/sys/sys_login_api/CLoginDlg.h +++ b/platform/src/include/sys/sys_login_api/CLoginDlg.h @@ -126,7 +126,7 @@ private slots: private: Ui::CLoginDlg *ui; - kbd_dbms::CDbApi *m_pReadDb; + iot_dbms::CDbApi *m_pReadDb; QMap m_userGroupMap; QMap m_userMap; diff --git a/platform/src/include/sys/sys_network_check_api/NetworkCheckApiCommon.h b/platform/src/include/sys/sys_network_check_api/NetworkCheckApiCommon.h index f5e22423..40f64786 100644 --- a/platform/src/include/sys/sys_network_check_api/NetworkCheckApiCommon.h +++ b/platform/src/include/sys/sys_network_check_api/NetworkCheckApiCommon.h @@ -6,7 +6,7 @@ #pragma once #include -namespace kbd_sys +namespace iot_sys { struct SNetworkState { @@ -20,4 +20,4 @@ namespace kbd_sys } }; -} //namespace kbd_sys +} //namespace iot_sys 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 78937d36..56289fc5 100644 --- a/platform/src/include/sys/sys_network_check_api/NetworkCheckInterface.h +++ b/platform/src/include/sys/sys_network_check_api/NetworkCheckInterface.h @@ -16,7 +16,7 @@ #define NETWORK_CHECK_API G_DECL_IMPORT #endif -namespace kbd_sys +namespace iot_sys { /** @brief 网络检测接口类 @@ -43,4 +43,4 @@ namespace kbd_sys /* @brief 创建网络检测访问库实例 */ NETWORK_CHECK_API CNetworkCheckInterfacePtr getNetworkCheckInstance(); -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/include/sys/sys_network_check_api/SysRunNetworkInfoTable.h b/platform/src/include/sys/sys_network_check_api/SysRunNetworkInfoTable.h index 8300bd37..5dadc422 100644 --- a/platform/src/include/sys/sys_network_check_api/SysRunNetworkInfoTable.h +++ b/platform/src/include/sys/sys_network_check_api/SysRunNetworkInfoTable.h @@ -12,7 +12,7 @@ // #pragma options align=packed // #endif -namespace kbd_sys +namespace iot_sys { const std::string CN_TN_SysRunNetworkInfo = "sys_run_network_info"; @@ -33,7 +33,7 @@ namespace kbd_sys } }STableRunNetworkInfo, *PSTableRunNetworkInfo; -} //namespace kbd_sys +} //namespace iot_sys // #ifndef _AIX // #pragma pack(pop) diff --git a/platform/src/include/sys/sys_node_mng_api/NodeMngApiCommon.h b/platform/src/include/sys/sys_node_mng_api/NodeMngApiCommon.h index 043ba10c..2186825d 100644 --- a/platform/src/include/sys/sys_node_mng_api/NodeMngApiCommon.h +++ b/platform/src/include/sys/sys_node_mng_api/NodeMngApiCommon.h @@ -12,7 +12,7 @@ #define SYS_NODE_MNG_API G_DECL_IMPORT #endif -namespace kbd_sys +namespace iot_sys { /** @brief 节点冗余信息 @@ -45,4 +45,4 @@ namespace kbd_sys }; typedef std::vector NodeRedundantInfoSeq; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/include/sys/sys_node_mng_api/NodeMngInterface.h b/platform/src/include/sys/sys_node_mng_api/NodeMngInterface.h index 93d02a83..90291ed7 100644 --- a/platform/src/include/sys/sys_node_mng_api/NodeMngInterface.h +++ b/platform/src/include/sys/sys_node_mng_api/NodeMngInterface.h @@ -12,7 +12,7 @@ #include "DataType.h" #include "sys_node_mng_api/NodeMngApiCommon.h" -namespace kbd_sys +namespace iot_sys { /** @brief 冗余切换接口类，主备状态发生变化时通知业务进程 @@ -59,4 +59,4 @@ namespace kbd_sys /* @brief 创建冗余管理访问接口实例 */ SYS_NODE_MNG_API CRedundantMngInterfacePtr getRedundantMngInstance(int nDomainId, int nAppId, const std::string &strNodeName); -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/include/sys/sys_node_mng_api/RedundantInfoInterface.h b/platform/src/include/sys/sys_node_mng_api/RedundantInfoInterface.h index 7867c06c..aacbcfdd 100644 --- a/platform/src/include/sys/sys_node_mng_api/RedundantInfoInterface.h +++ b/platform/src/include/sys/sys_node_mng_api/RedundantInfoInterface.h @@ -12,7 +12,7 @@ #include "DataType.h" #include "sys_node_mng_api/NodeMngApiCommon.h" -namespace kbd_sys +namespace iot_sys { /** @brief 冗余信息接口类 @@ -55,4 +55,4 @@ namespace kbd_sys /* @brief 创建冗余信息访问接口实例 */ SYS_NODE_MNG_API CRedundantInfoInterfacePtr getRedundantInfoInstance(); -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/include/sys/sys_node_mng_api/SysRunRedundantCmdTable.h b/platform/src/include/sys/sys_node_mng_api/SysRunRedundantCmdTable.h index 9ce7e444..593ad5a4 100644 --- a/platform/src/include/sys/sys_node_mng_api/SysRunRedundantCmdTable.h +++ b/platform/src/include/sys/sys_node_mng_api/SysRunRedundantCmdTable.h @@ -12,7 +12,7 @@ // #pragma options align=packed // #endif -namespace kbd_sys +namespace iot_sys { const std::string CN_TN_SysRunRedundancyCmd = "sys_run_redundancy_cmd"; @@ -53,7 +53,7 @@ namespace kbd_sys } }SRunRedundancyCmd, *PSRunRedundancyCmd; -} //namespace kbd_sys +} //namespace iot_sys // #ifndef _AIX // #pragma pack(pop) diff --git a/platform/src/include/sys/sys_node_mng_api/SysRunRedundantInfoTable.h b/platform/src/include/sys/sys_node_mng_api/SysRunRedundantInfoTable.h index 44e0a50d..a7e57320 100644 --- a/platform/src/include/sys/sys_node_mng_api/SysRunRedundantInfoTable.h +++ b/platform/src/include/sys/sys_node_mng_api/SysRunRedundantInfoTable.h @@ -12,7 +12,7 @@ // #pragma options align=packed // #endif -namespace kbd_sys +namespace iot_sys { const std::string CN_TN_SysRunRedundancyInfo = "sys_run_redundancy_info"; @@ -68,7 +68,7 @@ namespace kbd_sys }SRunRedundancyInfo, *PSRunRedundancyInfo; -} //namespace kbd_sys +} //namespace iot_sys // #ifndef _AIX // #pragma pack(pop) diff --git a/platform/src/include/sys/sys_proc_mng_api/ProcMngApiCommon.h b/platform/src/include/sys/sys_proc_mng_api/ProcMngApiCommon.h index a66eb39a..36d4d757 100644 --- a/platform/src/include/sys/sys_proc_mng_api/ProcMngApiCommon.h +++ b/platform/src/include/sys/sys_proc_mng_api/ProcMngApiCommon.h @@ -10,7 +10,7 @@ /** * @brief 系统相关基础组件命名空间 */ -namespace kbd_sys +namespace iot_sys { /* @brief 标识一个进程 */ struct SProcessInfoKey @@ -86,4 +86,4 @@ namespace kbd_sys } }; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/include/sys/sys_proc_mng_api/ProcMngInterface.h b/platform/src/include/sys/sys_proc_mng_api/ProcMngInterface.h index a976612c..9428ff44 100644 --- a/platform/src/include/sys/sys_proc_mng_api/ProcMngInterface.h +++ b/platform/src/include/sys/sys_proc_mng_api/ProcMngInterface.h @@ -18,7 +18,7 @@ #define DOG_TIMEOUT 7200 //秒钟（2小时） -namespace kbd_sys +namespace iot_sys { /* @brief 进程退出接口类 */ class CProcessQuitInterface @@ -70,5 +70,5 @@ namespace kbd_sys /* @brief 创建进程管理访问接口实例 */ SYS_PROC_MNG_API CProcMngInterfacePtr getProcMngInstance(const SProcessInfoKey &stProcKey); -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/include/sys/sys_proc_mng_api/SysRunAppInfoTable.h b/platform/src/include/sys/sys_proc_mng_api/SysRunAppInfoTable.h index b07a2a4f..b64219a7 100644 --- a/platform/src/include/sys/sys_proc_mng_api/SysRunAppInfoTable.h +++ b/platform/src/include/sys/sys_proc_mng_api/SysRunAppInfoTable.h @@ -12,7 +12,7 @@ // #pragma options align=packed // #endif -namespace kbd_sys +namespace iot_sys { const std::string CN_TN_SysRunAppInfo = "sys_run_app_info"; #define RUN_APP_INFO_COL_IS_ACTIVE "is_active" @@ -75,7 +75,7 @@ namespace kbd_sys } }STableRunAppInfo, *PSTableRunAppInfo; -} //namespace kbd_sys +} //namespace iot_sys // #ifndef _AIX // #pragma pack(pop) diff --git a/platform/src/include/sys/sys_proc_mng_api/SysRunProcInfoTable.h b/platform/src/include/sys/sys_proc_mng_api/SysRunProcInfoTable.h index 391b7ca0..5c72c70e 100644 --- a/platform/src/include/sys/sys_proc_mng_api/SysRunProcInfoTable.h +++ b/platform/src/include/sys/sys_proc_mng_api/SysRunProcInfoTable.h @@ -13,7 +13,7 @@ // #pragma options align=packed // #endif -namespace kbd_sys +namespace iot_sys { const std::string CN_TN_SysRunProcInfo = "sys_run_proc_info"; @@ -166,7 +166,7 @@ namespace kbd_sys }STableRunProcInfo, *PSTableRunProcInfo; -} //namespace kbd_sys +} //namespace iot_sys // #ifndef _AIX // #pragma pack(pop) diff --git a/platform/src/include/tools/fbd_designer/fbd_retriever/CRetriever.h b/platform/src/include/tools/fbd_designer/fbd_retriever/CRetriever.h index 8ca2303b..c3d7dc90 100644 --- a/platform/src/include/tools/fbd_designer/fbd_retriever/CRetriever.h +++ b/platform/src/include/tools/fbd_designer/fbd_retriever/CRetriever.h @@ -9,7 +9,7 @@ namespace Ui { class CFBDRetriever; } -using namespace kbd_dbms; +using namespace iot_dbms; class QStandardItem; class QStandardItemModel; diff --git a/platform/src/include/tools/model_table/databasedirect.h b/platform/src/include/tools/model_table/databasedirect.h index 532d709b..770739ce 100644 --- a/platform/src/include/tools/model_table/databasedirect.h +++ b/platform/src/include/tools/model_table/databasedirect.h @@ -3,7 +3,7 @@ #include "databaseinterface.h" -namespace kbd_dbms { +namespace iot_dbms { class CDbBaseApi; } /** @@ -17,7 +17,7 @@ public: // DataBaseInterface interface public: - QString initDBLink(const QString &user, const QString &passwd, const QString &hostName, int port, const QString &dbName, kbd_dbms::EDbType type) override; + QString initDBLink(const QString &user, const QString &passwd, const QString &hostName, int port, const QString &dbName, iot_dbms::EDbType type) override; bool dbIsExist(const QString &dbName) override; bool tableIsExist(const QString &tableName) override; bool startTransaction() override; @@ -37,7 +37,7 @@ public: bool executeOnly(const QStringList &sql) override; QString dbHasError() const override; QString getDbInfo() const override; - kbd_dbms::CDbPara getDbPara() const override; + iot_dbms::CDbPara getDbPara() const override; QString convertQuoteMarks( const QString& sStr ) const override; void close() override; private: @@ -46,7 +46,7 @@ private: void pushLastError(const QString &err); bool executeSql(const QString &sql, QSqlQuery &result); private: - kbd_dbms::CDbBaseApi *m_db; + iot_dbms::CDbBaseApi *m_db; QString m_lastError;//保存错误信息,在每次执行前,清除上一次的错误信息 }; diff --git a/platform/src/include/tools/model_table/databaseinterface.h b/platform/src/include/tools/model_table/databaseinterface.h index 52b276db..906323f0 100644 --- a/platform/src/include/tools/model_table/databaseinterface.h +++ b/platform/src/include/tools/model_table/databaseinterface.h @@ -32,7 +32,7 @@ public: * @return */ virtual QString initDBLink(const QString &user, const QString &passwd, const QString &hostName, - int port, const QString &dbName, kbd_dbms::EDbType type) = 0; + int port, const QString &dbName, iot_dbms::EDbType type) = 0; /** * @brief dbIsExist 判断数据库dbName是否存在 @@ -148,7 +148,7 @@ public: * @brief 获取当前连接的参数，注意，因为存在重连机制，所以返回值会变化 * @return 当前连接的参数，可通过CDbPara::isValid()判断是否有效 */ - virtual kbd_dbms::CDbPara getDbPara() const = 0; + virtual iot_dbms::CDbPara getDbPara() const = 0; /** * @brief 转CDbApi、CDbBaseApi的同名函数，将特殊符号做转义处理 diff --git a/platform/src/include/tools/model_table/databasemodelsub.h b/platform/src/include/tools/model_table/databasemodelsub.h index fa03b398..b39aaba1 100644 --- a/platform/src/include/tools/model_table/databasemodelsub.h +++ b/platform/src/include/tools/model_table/databasemodelsub.h @@ -4,7 +4,7 @@ #include "databaseinterface.h" -namespace kbd_dbms { +namespace iot_dbms { class CDbApi; } /** @@ -18,7 +18,7 @@ public: // DataBaseInterface interface public: - QString initDBLink(const QString &user, const QString &passwd, const QString &hostName, int port, const QString &dbName, kbd_dbms::EDbType type) override; + QString initDBLink(const QString &user, const QString &passwd, const QString &hostName, int port, const QString &dbName, iot_dbms::EDbType type) override; bool dbIsExist(const QString &dbName) override; bool tableIsExist(const QString &tableName) override; bool startTransaction() override; @@ -38,7 +38,7 @@ public: bool executeOnly(const QStringList &sql) override; QString dbHasError() const override; QString getDbInfo() const override; - kbd_dbms::CDbPara getDbPara() const override; + iot_dbms::CDbPara getDbPara() const override; QString convertQuoteMarks( const QString& sStr ) const override; void close() override; private: @@ -47,7 +47,7 @@ private: void pushLastError(const QString &err); bool executeSql(const QString &sql, QSqlQuery &result); private: - kbd_dbms::CDbApi *m_db; + iot_dbms::CDbApi *m_db; QString m_lastError;//保存错误信息,在每次执行前,清除上一次的错误信息 }; diff --git a/platform/src/include/tools/model_table/kbdtabledatamgr.h b/platform/src/include/tools/model_table/kbdtabledatamgr.h index 56b34e00..f1320430 100644 --- a/platform/src/include/tools/model_table/kbdtabledatamgr.h +++ b/platform/src/include/tools/model_table/kbdtabledatamgr.h @@ -33,7 +33,7 @@ public: //直连数据库接口 QString initDBLink(DataBaseInterface::LinkType linkType,const QString &user, const QString &passwd, const QString &hostName,int port, const QString &dbName, - kbd_dbms::EDbType dbType); + iot_dbms::EDbType dbType); //模型提交接口 QString initDBLink(DataBaseInterface::LinkType linkType); @@ -67,7 +67,7 @@ public: * @brief 获取当前连接的参数，注意，因为存在重连机制，所以返回值会变化 * @return 当前连接的参数，可通过CDbPara::isValid()判断是否有效 */ - kbd_dbms::CDbPara getDbPara() const; + iot_dbms::CDbPara getDbPara() const; /** * @brief 转CDbApi、CDbBaseApi的同名函数，将特殊符号做转义处理 diff --git a/platform/src/net/net_keepalived/CCheckDatabaseThread.cpp b/platform/src/net/net_keepalived/CCheckDatabaseThread.cpp index 437c0dc2..1d165f92 100644 --- a/platform/src/net/net_keepalived/CCheckDatabaseThread.cpp +++ b/platform/src/net/net_keepalived/CCheckDatabaseThread.cpp @@ -3,7 +3,7 @@ #define CN_CHECKDBTIME 10 // 检查数据库间隔时间，单位秒 -using namespace kbd_public; +using namespace iot_public; CCheckDatabaseThread::CCheckDatabaseThread() { diff --git a/platform/src/net/net_keepalived/CCheckDatabaseThread.h b/platform/src/net/net_keepalived/CCheckDatabaseThread.h index 77a63554..67a82542 100644 --- a/platform/src/net/net_keepalived/CCheckDatabaseThread.h +++ b/platform/src/net/net_keepalived/CCheckDatabaseThread.h @@ -37,7 +37,7 @@ private: QTimer* m_pCheckTimer; // 检查timer QSqlDatabase* m_pDb; // 数据库连接对象 QMutex* m_pMutex; // 锁 - kbd_public::EDBType m_eDBType;// 数据库类型 + iot_public::EDBType m_eDBType;// 数据库类型 }; #endif // CCHECKDATABASETHREAD_H diff --git a/platform/src/net/net_keepalived/CWorkThread.cpp b/platform/src/net/net_keepalived/CWorkThread.cpp index c51d0f72..54b34d48 100644 --- a/platform/src/net/net_keepalived/CWorkThread.cpp +++ b/platform/src/net/net_keepalived/CWorkThread.cpp @@ -13,7 +13,7 @@ #define CN_CHECKIPTIME 5 // 检查IP间隔时间，单位秒 using namespace std; -using namespace kbd_public; +using namespace iot_public; CWorkThread::CWorkThread() { diff --git a/platform/src/net/net_keepalived/main.cpp b/platform/src/net/net_keepalived/main.cpp index 18457eea..9e862d7d 100644 --- a/platform/src/net/net_keepalived/main.cpp +++ b/platform/src/net/net_keepalived/main.cpp @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) } // 初始化日志系统 - kbd_public::StartLogSystem( "default", "net_keepalived" ); + iot_public::StartLogSystem( "default", "net_keepalived" ); // 创建主类对象 CKeepAlived objTmp; @@ -80,7 +80,7 @@ int main(int argc, char *argv[]) objTmp.release(); // 停止日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); // 返回结果 return nRet; diff --git a/platform/src/net/net_msg_bus/CLocalMng.cpp b/platform/src/net/net_msg_bus/CLocalMng.cpp index c78985d1..b91cad08 100644 --- a/platform/src/net/net_msg_bus/CLocalMng.cpp +++ b/platform/src/net/net_msg_bus/CLocalMng.cpp @@ -19,7 +19,7 @@ #include "CLocalMng.h" -namespace kbd_net +namespace iot_net { CLocalMng::SLocalMng* CLocalMng::SLocalMng::newLocalMng(zsock_t *pActorPipe) @@ -1148,5 +1148,5 @@ void CLocalMng::prepareToExit() zsock_wait(m_pActor); } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus/CLocalMng.h b/platform/src/net/net_msg_bus/CLocalMng.h index b7549825..95dfe241 100644 --- a/platform/src/net/net_msg_bus/CLocalMng.h +++ b/platform/src/net/net_msg_bus/CLocalMng.h @@ -16,7 +16,7 @@ #include "../net_msg_bus_base_api/kmbp_cnt.h" #include "../net_msg_bus_base_api/kmbmp_cnt.h" -namespace kbd_net +namespace iot_net { class CMbSubEngine; @@ -107,5 +107,5 @@ private: }; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus/CMbServer.cpp b/platform/src/net/net_msg_bus/CMbServer.cpp index 0c6a7bda..958d8357 100644 --- a/platform/src/net/net_msg_bus/CMbServer.cpp +++ b/platform/src/net/net_msg_bus/CMbServer.cpp @@ -29,7 +29,7 @@ #define MB_SERVER_PROC_NAME "net_msg_bus" -namespace kbd_net +namespace iot_net { static CMbServer *g_pInstance = NULL; @@ -69,7 +69,7 @@ CMbServer::~CMbServer() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); assert(NULL == m_pAuth); assert(NULL == m_pLocalMng); @@ -108,7 +108,7 @@ bool CMbServer::start(int argc, char *argv[], int& /*nStatus*/) zsys_set_io_threads(2); //< 启动日志 - kbd_public::StartLogSystem(CN_AppName_BASE.c_str(), MB_SERVER_PROC_NAME); + iot_public::StartLogSystem(CN_AppName_BASE.c_str(), MB_SERVER_PROC_NAME); //< 加载配置，并初始化 m_pAuth if (!loadConfig()) @@ -174,7 +174,7 @@ bool CMbServer::start(int argc, char *argv[], int& /*nStatus*/) strStartArgs += argv[i]; } - kbd_sys::SProcessInfoKey stProcessInfo; + iot_sys::SProcessInfoKey stProcessInfo; stProcessInfo.nAppId = CN_AppId_BASE; stProcessInfo.nDomainId = m_nLocalDomainID; @@ -269,7 +269,7 @@ bool CMbServer::stop() //< 停止日志系统 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); //< 明确地提前调用zsys_shutdown()，而非程序退出时自动调用（顺序不可控） //< 防止Windows系统下报错：Assertion failed: Successful WSASTARTUP not yet performed @@ -361,7 +361,7 @@ bool CMbServer::loadConfig() { //< 加载 msg_bus_cfg.xml { - const std::string &&strFileName = kbd_public::CFileUtil::getPathOfCfgFile("msg_bus_cfg.xml"); + const std::string &&strFileName = iot_public::CFileUtil::getPathOfCfgFile("msg_bus_cfg.xml"); boost::property_tree::ptree pt; @@ -394,14 +394,14 @@ bool CMbServer::loadConfig() //< 加载系统建模信息 { - kbd_public::CSysInfoInterfacePtr ptrSysInfo; + iot_public::CSysInfoInterfacePtr ptrSysInfo; if (!createSysInfoInstance(ptrSysInfo)) { LOGERROR("createSysInfoInstance() failed !"); return false; } - kbd_public::SNodeInfo stLocalNodeInfo; + iot_public::SNodeInfo stLocalNodeInfo; if (kbdSuccess != ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) { LOGERROR("getLocalNodeInfo() failed !"); @@ -448,13 +448,13 @@ bool CMbServer::loadConfig() zsock_wait(m_pAuth); } - std::vector vecDomainNodeInfo; + std::vector vecDomainNodeInfo; ptrSysInfo->getNodeListByDomainId(m_nLocalDomainID, vecDomainNodeInfo); m_vecDomainHostsInfo.clear(); for (size_t i = 0; i < vecDomainNodeInfo.size(); i++) { - if (kbd_public::ENodeType_DatabaseServer == vecDomainNodeInfo[i].eNodeType - || kbd_public::ENodeType_VirtualNode == vecDomainNodeInfo[i].eNodeType + if (iot_public::ENodeType_DatabaseServer == vecDomainNodeInfo[i].eNodeType + || iot_public::ENodeType_VirtualNode == vecDomainNodeInfo[i].eNodeType || vecDomainNodeInfo[i].strName == m_objLocalHostInfo.m_strName) { //< 不包含 数据库节点、虚拟节点、本机 @@ -496,5 +496,5 @@ bool CMbServer::loadConfig() } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus/CMbServer.h b/platform/src/net/net_msg_bus/CMbServer.h index 52e5c5f2..ccb07660 100644 --- a/platform/src/net/net_msg_bus/CMbServer.h +++ b/platform/src/net/net_msg_bus/CMbServer.h @@ -16,7 +16,7 @@ typedef struct _zactor_t zactor_t; -namespace kbd_net +namespace iot_net { class CLocalMng; class CRemoteMng; @@ -42,7 +42,7 @@ public: typedef std::vector CMbSvrHostInfoVec; -class CMbServer : public kbd_public::CBaseService, kbd_sys::CProcessQuitInterface +class CMbServer : public iot_public::CBaseService, iot_sys::CProcessQuitInterface { public: //< 单例释放类 @@ -103,7 +103,7 @@ private: CRemoteMng *m_pRemoteMng; CMngAccess *m_pMngAccess; - kbd_sys::CProcMngInterfacePtr m_ptrProcManage; + iot_sys::CProcMngInterfacePtr m_ptrProcManage; //< 本机信息 CMbSvrHostInfo m_objLocalHostInfo; @@ -112,5 +112,5 @@ private: CMbSvrHostInfoVec m_vecDomainHostsInfo; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus/CMngAccess.cpp b/platform/src/net/net_msg_bus/CMngAccess.cpp index 5ddce980..7d84d681 100644 --- a/platform/src/net/net_msg_bus/CMngAccess.cpp +++ b/platform/src/net/net_msg_bus/CMngAccess.cpp @@ -16,7 +16,7 @@ #include "CMngAccess.h" -namespace kbd_net +namespace iot_net { CMngAccess::SMngAccess* CMngAccess::SMngAccess::newMngAccess(zsock_t *pActorPipe) @@ -507,5 +507,5 @@ void CMngAccess::prepareToExit() zsock_wait(m_pActor); } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus/CMngAccess.h b/platform/src/net/net_msg_bus/CMngAccess.h index bff45607..1451c0fa 100644 --- a/platform/src/net/net_msg_bus/CMngAccess.h +++ b/platform/src/net/net_msg_bus/CMngAccess.h @@ -11,7 +11,7 @@ #include "../net_msg_bus_base_api/kmbmp_cnt.h" -namespace kbd_net +namespace iot_net { class CMngAccess @@ -76,5 +76,5 @@ private: }; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus/CRemoteHost.cpp b/platform/src/net/net_msg_bus/CRemoteHost.cpp index 956caee6..5cb1326b 100644 --- a/platform/src/net/net_msg_bus/CRemoteHost.cpp +++ b/platform/src/net/net_msg_bus/CRemoteHost.cpp @@ -17,7 +17,7 @@ #include "CRemoteHost.h" -namespace kbd_net +namespace iot_net { CRemoteHost::SRemoteHost* CRemoteHost::SRemoteHost::newRemoteHost(zsock_t *pActorPipe, const SRemoteHostInitArgs *pArgs) @@ -1223,5 +1223,5 @@ bool CRemoteHost::isNetB_Connected() const return *m_pbNetB_Connected; } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus/CRemoteHost.h b/platform/src/net/net_msg_bus/CRemoteHost.h index d33dffe9..72961c57 100644 --- a/platform/src/net/net_msg_bus/CRemoteHost.h +++ b/platform/src/net/net_msg_bus/CRemoteHost.h @@ -11,7 +11,7 @@ #include "../net_msg_bus_base_api/kmbp_cnt.h" -namespace kbd_net +namespace iot_net { class CMbSvrHostInfo; @@ -143,6 +143,6 @@ private: }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus/CRemoteMng.cpp b/platform/src/net/net_msg_bus/CRemoteMng.cpp index 1c4ba7ff..79a0da04 100644 --- a/platform/src/net/net_msg_bus/CRemoteMng.cpp +++ b/platform/src/net/net_msg_bus/CRemoteMng.cpp @@ -21,7 +21,7 @@ #include "CRemoteMng.h" -namespace kbd_net +namespace iot_net { CRemoteMng::SRemoteMng* CRemoteMng::SRemoteMng::newRemoteMng(zsock_t *pActorPipe) @@ -1073,5 +1073,5 @@ void CRemoteMng::prepareToExit() zsock_wait(m_pActor); } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus/CRemoteMng.h b/platform/src/net/net_msg_bus/CRemoteMng.h index 9a586c0f..999da4df 100644 --- a/platform/src/net/net_msg_bus/CRemoteMng.h +++ b/platform/src/net/net_msg_bus/CRemoteMng.h @@ -16,7 +16,7 @@ #include "../net_msg_bus_base_api/kmbp_cnt.h" #include "../net_msg_bus_base_api/kmbmp_cnt.h" -namespace kbd_net +namespace iot_net { class CRemoteHost; @@ -94,5 +94,5 @@ private: }; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus/Main.cpp b/platform/src/net/net_msg_bus/Main.cpp index e933fa82..c63eb0ec 100644 --- a/platform/src/net/net_msg_bus/Main.cpp +++ b/platform/src/net/net_msg_bus/Main.cpp @@ -11,7 +11,7 @@ int main(int argc, char *argv[]) { - kbd_net::CMbServer::GC gc; //< 单例释放辅助类 - return kbd_net::CMbServer::getInstance().main(argc, argv); + iot_net::CMbServer::GC gc; //< 单例释放辅助类 + return iot_net::CMbServer::getInstance().main(argc, argv); } diff --git a/platform/src/net/net_msg_bus_api/CInProcBroker.cpp b/platform/src/net/net_msg_bus_api/CInProcBroker.cpp index a09aac11..8ac8ba11 100644 --- a/platform/src/net/net_msg_bus_api/CInProcBroker.cpp +++ b/platform/src/net/net_msg_bus_api/CInProcBroker.cpp @@ -22,7 +22,7 @@ #include "CInProcBroker.h" -namespace kbd_net +namespace iot_net { //< 是否允许通讯器发送数据 @@ -1161,5 +1161,5 @@ bool CInProcBroker::isConnected() return nConnected == 1; } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_api/CInProcBroker.h b/platform/src/net/net_msg_bus_api/CInProcBroker.h index b9f0b6a8..8f3bde74 100644 --- a/platform/src/net/net_msg_bus_api/CInProcBroker.h +++ b/platform/src/net/net_msg_bus_api/CInProcBroker.h @@ -13,7 +13,7 @@ #include "../net_msg_bus_base_api/kmbp.h" -namespace kbd_net +namespace iot_net { class CMbSubEngine; @@ -99,5 +99,5 @@ private: zsock_t *m_pSockInData; //< 进程内数据连接,Router,Inproc }; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_api/CMbCommunicator.cpp b/platform/src/net/net_msg_bus_api/CMbCommunicator.cpp index 044f255c..13123be4 100644 --- a/platform/src/net/net_msg_bus_api/CMbCommunicator.cpp +++ b/platform/src/net/net_msg_bus_api/CMbCommunicator.cpp @@ -12,7 +12,7 @@ #include "CMbCommunicatorImp.h" #include "net_msg_bus_api/CMbCommunicator.h" -namespace kbd_net +namespace iot_net { CMbCommunicator::CMbCommunicator(const char *pchName, const int *pAutoZipSize) @@ -96,5 +96,5 @@ std::vector CMbCommunicator::getMySub() return m_pImp->getMySub(); } -} //namespace kbd_net +} //namespace iot_net diff --git a/platform/src/net/net_msg_bus_api/CMbCommunicatorImp.cpp b/platform/src/net/net_msg_bus_api/CMbCommunicatorImp.cpp index 68a65c80..359e7f8c 100644 --- a/platform/src/net/net_msg_bus_api/CMbCommunicatorImp.cpp +++ b/platform/src/net/net_msg_bus_api/CMbCommunicatorImp.cpp @@ -15,7 +15,7 @@ #include "../net_msg_bus_base_api/CommonDef.h" #include "CMbCommunicatorImp.h" -namespace kbd_net +namespace iot_net { //< 是否允许通讯器发送数据 @@ -703,5 +703,5 @@ std::vector CMbCommunicatorImp::getMySub() return vecRet; } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_api/CMbCommunicatorImp.h b/platform/src/net/net_msg_bus_api/CMbCommunicatorImp.h index 1e0c1ebb..8861782d 100644 --- a/platform/src/net/net_msg_bus_api/CMbCommunicatorImp.h +++ b/platform/src/net/net_msg_bus_api/CMbCommunicatorImp.h @@ -19,7 +19,7 @@ typedef struct _kmbp_t kmbp_t; -namespace kbd_net +namespace iot_net { //< MSGBUS_API：导出本类，为net_msg_bus_ping程序使用 @@ -79,5 +79,5 @@ private: boost::mutex m_mutexDataRcv; //< m_pSockData接收锁 }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_api/CMbMessage.cpp b/platform/src/net/net_msg_bus_api/CMbMessage.cpp index 709f14dc..2247cbc8 100644 --- a/platform/src/net/net_msg_bus_api/CMbMessage.cpp +++ b/platform/src/net/net_msg_bus_api/CMbMessage.cpp @@ -14,7 +14,7 @@ #include "net_msg_bus_api/CMbMessage.h" #include "../net_msg_bus_base_api/kmbp.h" -namespace kbd_net +namespace iot_net { static kmbp_t* createKmbp(const void *pBuff, const size_t nSize, const int nAppID, @@ -404,5 +404,5 @@ std::string CMbMessage::printInfoToStr() const return strRet; } -} //namespace kbd_net +} //namespace iot_net diff --git a/platform/src/net/net_msg_bus_api/CMbSubInfo.cpp b/platform/src/net/net_msg_bus_api/CMbSubInfo.cpp index b63fcdfb..3a484217 100644 --- a/platform/src/net/net_msg_bus_api/CMbSubInfo.cpp +++ b/platform/src/net/net_msg_bus_api/CMbSubInfo.cpp @@ -10,7 +10,7 @@ #include "../net_msg_bus_base_api/CMbSubInfoImp.h" #include "net_msg_bus_api/CMbSubInfo.h" -namespace kbd_net +namespace iot_net { CMbSubInfo::CMbSubInfo(int AppID, int ChannelID) @@ -104,5 +104,5 @@ bool CMbSubInfo::fromString(const char *pchSrc) return m_pImp->fromString(pchSrc); } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_api/MsgBusApi.cpp b/platform/src/net/net_msg_bus_api/MsgBusApi.cpp index fd2aa04c..0706619e 100644 --- a/platform/src/net/net_msg_bus_api/MsgBusApi.cpp +++ b/platform/src/net/net_msg_bus_api/MsgBusApi.cpp @@ -16,7 +16,7 @@ #include "net_msg_bus_api/MsgBusApi.h" #include "CInProcBroker.h" -namespace kbd_net +namespace iot_net { //< 是否打印压缩调试信息，压缩前大小、压缩后大小，从 msg_bus_cfg.xml 加载 @@ -44,7 +44,7 @@ bool initMsgBus(const char *pchProcName, const char *pchInstName, bool bAddPid) //< 加载配置 { - const std::string &&strFileName = kbd_public::CFileUtil::getPathOfCfgFile("msg_bus_cfg.xml"); + const std::string &&strFileName = iot_public::CFileUtil::getPathOfCfgFile("msg_bus_cfg.xml"); boost::property_tree::ptree pt; try @@ -102,5 +102,5 @@ bool releaseMsgBus() return true; } -} //namespace kbd_net +} //namespace iot_net diff --git a/platform/src/net/net_msg_bus_base_api/CMbSubEngine.cpp b/platform/src/net/net_msg_bus_base_api/CMbSubEngine.cpp index 42d9396f..08d23072 100644 --- a/platform/src/net/net_msg_bus_base_api/CMbSubEngine.cpp +++ b/platform/src/net/net_msg_bus_base_api/CMbSubEngine.cpp @@ -11,7 +11,7 @@ #include "CMbSubEngine.h" -namespace kbd_net +namespace iot_net { CMbSubEngine::CMbSubEngine() @@ -63,5 +63,5 @@ SubInfoVecPtr CMbSubEngine::delSuber(const std::string &strSuber) return m_pImp->delSuber(strSuber); } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_base_api/CMbSubEngine.h b/platform/src/net/net_msg_bus_base_api/CMbSubEngine.h index 0bfa14a8..9af88045 100644 --- a/platform/src/net/net_msg_bus_base_api/CMbSubEngine.h +++ b/platform/src/net/net_msg_bus_base_api/CMbSubEngine.h @@ -18,7 +18,7 @@ #include "CMbSubInfoImp.h" -namespace kbd_net +namespace iot_net { //< 缩写说明： @@ -115,5 +115,5 @@ private: CMbSubEngineImp *m_pImp; //< 实现类 }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_base_api/CMbSubEngineImp.cpp b/platform/src/net/net_msg_bus_base_api/CMbSubEngineImp.cpp index 9e1484b5..fd58f194 100644 --- a/platform/src/net/net_msg_bus_base_api/CMbSubEngineImp.cpp +++ b/platform/src/net/net_msg_bus_base_api/CMbSubEngineImp.cpp @@ -17,7 +17,7 @@ #include "CMbSubEngineImp.h" -namespace kbd_net +namespace iot_net { class CMbSeSubtion @@ -528,5 +528,5 @@ bool CMbSubEngineImp::delSuberFromSubtion(const int nSuberIndex, CMbSeSubtionPtr return bRet; } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_base_api/CMbSubEngineImp.h b/platform/src/net/net_msg_bus_base_api/CMbSubEngineImp.h index 5ab0c030..d2a109c3 100644 --- a/platform/src/net/net_msg_bus_base_api/CMbSubEngineImp.h +++ b/platform/src/net/net_msg_bus_base_api/CMbSubEngineImp.h @@ -21,7 +21,7 @@ class Roaring; typedef boost::shared_ptr RoaringPtr; -namespace kbd_net +namespace iot_net { //< 缩写说明： @@ -102,5 +102,5 @@ private: boost::unordered::unordered_map m_mapChannelIdBitMap; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_base_api/CMbSubInfoImp.cpp b/platform/src/net/net_msg_bus_base_api/CMbSubInfoImp.cpp index bc49a278..7344630d 100644 --- a/platform/src/net/net_msg_bus_base_api/CMbSubInfoImp.cpp +++ b/platform/src/net/net_msg_bus_base_api/CMbSubInfoImp.cpp @@ -14,7 +14,7 @@ #include "CMbSubInfoImp.h" -namespace kbd_net +namespace iot_net { CMbSubInfoImp::CMbSubInfoImp() :m_nAppID(0), m_nChannelID(0) @@ -111,5 +111,5 @@ bool CMbSubInfoImp::fromString(const char *pchSrc) return true; } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_base_api/CMbSubInfoImp.h b/platform/src/net/net_msg_bus_base_api/CMbSubInfoImp.h index 3aed25da..062024bc 100644 --- a/platform/src/net/net_msg_bus_base_api/CMbSubInfoImp.h +++ b/platform/src/net/net_msg_bus_base_api/CMbSubInfoImp.h @@ -13,7 +13,7 @@ #include "mb_base_api_exp.h" -namespace kbd_net +namespace iot_net { /******************************************************************************//** * @brief CMbSubInfoImp 主题(subject)、订阅(subscription)实现类 @@ -81,5 +81,5 @@ public: int m_nChannelID; //< 通道ID }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_base_api/CommonDef.h b/platform/src/net/net_msg_bus_base_api/CommonDef.h index 5c1cc230..3c78c512 100644 --- a/platform/src/net/net_msg_bus_base_api/CommonDef.h +++ b/platform/src/net/net_msg_bus_base_api/CommonDef.h @@ -11,7 +11,7 @@ #include "czmq_prelude.h" -namespace kbd_net +namespace iot_net { //< 消息从产生，到交给TCP协议栈的超时时间，10sec //< 使用zclock_mono()时间，不受调整系统时间的影响 @@ -87,5 +87,5 @@ namespace kbd_net #define MB_MT_PING_SUBER_IN_HOST ((int)-32) //< Ping指定主机的所有订阅者，使用 C2H_DATA_HOST #define MB_MT_PING_SUBER_IN_PROC ((int)-33) //< Ping指定进程的所有订阅者，使用 C2H_DATA_PEER -} // namespace kbd_net +} // namespace iot_net diff --git a/platform/src/net/net_msg_bus_base_api/test/subengine_test/main.cpp b/platform/src/net/net_msg_bus_base_api/test/subengine_test/main.cpp index 9f3be3d0..c3cf8be8 100644 --- a/platform/src/net/net_msg_bus_base_api/test/subengine_test/main.cpp +++ b/platform/src/net/net_msg_bus_base_api/test/subengine_test/main.cpp @@ -16,9 +16,9 @@ int main(/*int argc, char *argv[]*/) { - kbd_net::CMbSubEngine objSubEg; + iot_net::CMbSubEngine objSubEg; - kbd_net::CMbSubInfoImp objSubInfo; + iot_net::CMbSubInfoImp objSubInfo; const std::string strSuber1("Suber1"); const std::string strSuber2("Suber2"); @@ -70,7 +70,7 @@ int main(/*int argc, char *argv[]*/) //<---------------------------------------------------------- //< 获取全部订阅 - kbd_net::SubInfoVecPtr ptrVecSubInfo = objSubEg.getSubtionOfAll(); + iot_net::SubInfoVecPtr ptrVecSubInfo = objSubEg.getSubtionOfAll(); assert(ptrVecSubInfo); std::sort(ptrVecSubInfo->begin(), ptrVecSubInfo->end()); assert(ptrVecSubInfo->size() == 20); @@ -164,7 +164,7 @@ int main(/*int argc, char *argv[]*/) assert(ptrVecSubInfo->size() == 21); //< 对5设置订阅 - kbd_net::SubInfoVec vecSubSet, vecSubAdd, VecSubDel; + iot_net::SubInfoVec vecSubSet, vecSubAdd, VecSubDel; objSubInfo.setVal(0, 0); vecSubSet.push_back(objSubInfo); objSubEg.setSubtionOfSuber(strSuber5, vecSubSet, vecSubAdd, VecSubDel); @@ -269,7 +269,7 @@ int main(/*int argc, char *argv[]*/) assert(ptrVecSubInfo->size() == 32); objSubInfo.setVal(90, 90); - kbd_net::StrVecPtr ptrVecSuber = objSubEg.lookupSuberOfSubject(objSubInfo); + iot_net::StrVecPtr ptrVecSuber = objSubEg.lookupSuberOfSubject(objSubInfo); assert(ptrVecSuber->size() == 1); assert(ptrVecSuber->at(0) == strSuber5); diff --git a/platform/src/net/net_msg_bus_mng/Main.cpp b/platform/src/net/net_msg_bus_mng/Main.cpp index da2c0276..f4d4acc0 100644 --- a/platform/src/net/net_msg_bus_mng/Main.cpp +++ b/platform/src/net/net_msg_bus_mng/Main.cpp @@ -57,7 +57,7 @@ static void handelOptions(const po::variables_map &objVM, if (objVM.count("s")) { - kbd_net::showHostInfo(objVM["s"].as()); + iot_net::showHostInfo(objVM["s"].as()); return; } @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) #endif //< 启动日志 - kbd_public::StartLogSystem("default", "net_msg_bus_mng"); + iot_public::StartLogSystem("default", "net_msg_bus_mng"); po::options_description objOdMode("Mode (only one can be used at a time)", 200, 100); po::options_description objOdGeneric("Generic", 200, 100); @@ -134,7 +134,7 @@ int main(int argc, char *argv[]) } //< 停止日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); //< 明确地提前调用zsys_shutdown()，而非程序退出时自动调用（顺序不可控） //< 防止Windows系统下报错：Assertion failed: Successful WSASTARTUP not yet performed diff --git a/platform/src/net/net_msg_bus_mng/ShowHostInfo.cpp b/platform/src/net/net_msg_bus_mng/ShowHostInfo.cpp index ed6345ae..01fd6276 100644 --- a/platform/src/net/net_msg_bus_mng/ShowHostInfo.cpp +++ b/platform/src/net/net_msg_bus_mng/ShowHostInfo.cpp @@ -14,7 +14,7 @@ #include "ShowHostInfo.h" -namespace kbd_net +namespace iot_net { void showHostInfo(const std::string &strIp) @@ -101,5 +101,5 @@ void showHostInfo(const std::string &strIp) zsock_destroy(&pSockMng); } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_mng/ShowHostInfo.h b/platform/src/net/net_msg_bus_mng/ShowHostInfo.h index b8a8a2fb..04bdff60 100644 --- a/platform/src/net/net_msg_bus_mng/ShowHostInfo.h +++ b/platform/src/net/net_msg_bus_mng/ShowHostInfo.h @@ -11,10 +11,10 @@ #include -namespace kbd_net +namespace iot_net { void showHostInfo(const std::string &strIp); -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_mng_ping_gui/cmbping.cpp b/platform/src/net/net_msg_bus_mng_ping_gui/cmbping.cpp index 8d97c7a9..830282fb 100644 --- a/platform/src/net/net_msg_bus_mng_ping_gui/cmbping.cpp +++ b/platform/src/net/net_msg_bus_mng_ping_gui/cmbping.cpp @@ -17,7 +17,7 @@ #include "cmbping.h" #include -namespace kbd_net +namespace iot_net { CMbPing::CMbPing() @@ -213,4 +213,4 @@ void CMbPing::recvPingRep() kmbp_destroy(&pKmbp); } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_mng_ping_gui/cmbping.h b/platform/src/net/net_msg_bus_mng_ping_gui/cmbping.h index cba3c191..9a9fc76d 100644 --- a/platform/src/net/net_msg_bus_mng_ping_gui/cmbping.h +++ b/platform/src/net/net_msg_bus_mng_ping_gui/cmbping.h @@ -12,7 +12,7 @@ #include #include -namespace kbd_net +namespace iot_net { class CMbCommunicatorImp; @@ -48,4 +48,4 @@ private: CMbCommunicatorImp *m_pMbComm; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_mng_ping_gui/main.cpp b/platform/src/net/net_msg_bus_mng_ping_gui/main.cpp index ec99e90c..7ed6b1c1 100644 --- a/platform/src/net/net_msg_bus_mng_ping_gui/main.cpp +++ b/platform/src/net/net_msg_bus_mng_ping_gui/main.cpp @@ -19,7 +19,7 @@ int main(int argc, char *argv[]) qRegisterMetaType(); //< 启动日志 - kbd_public::StartLogSystem("default", "net_msg_bus_mng_ping_gui"); + iot_public::StartLogSystem("default", "net_msg_bus_mng_ping_gui"); QApplication a(argc, argv); MainWindow w; diff --git a/platform/src/net/net_msg_bus_mng_ping_gui/mainwindow.cpp b/platform/src/net/net_msg_bus_mng_ping_gui/mainwindow.cpp index b75c639d..26bcbd63 100644 --- a/platform/src/net/net_msg_bus_mng_ping_gui/mainwindow.cpp +++ b/platform/src/net/net_msg_bus_mng_ping_gui/mainwindow.cpp @@ -63,7 +63,7 @@ MainWindow::MainWindow(QWidget *parent) : // 初始化mng的查询线程 MngHostQuery *mngQuery = new MngHostQuery; - m_pObjPing = new kbd_net::CMbPing; + m_pObjPing = new iot_net::CMbPing; m_pObjPing->moveToThread(&m_threadQuery); mngQuery->moveToThread(&m_threadQuery); connect(&m_threadQuery,&QThread::finished, mngQuery, &QObject::deleteLater); @@ -71,16 +71,16 @@ MainWindow::MainWindow(QWidget *parent) : connect(mngQuery,&MngHostQuery::queryResultReady,this,&MainWindow::slotHandleMngQueryResult); //< 几个signal - connect(m_pObjPing,&kbd_net::CMbPing::signalSendResult,this,&MainWindow::slotShowPingResult); + connect(m_pObjPing,&iot_net::CMbPing::signalSendResult,this,&MainWindow::slotShowPingResult); // 查询signal绑定 - connect(this,&MainWindow::signalPingHost,m_pObjPing,&kbd_net::CMbPing::slotPingHost); - connect(this,&MainWindow::signalPingHostInDomain,m_pObjPing,&kbd_net::CMbPing::slotPingHostInDomain); - connect(this,&MainWindow::signalPingProc,m_pObjPing,&kbd_net::CMbPing::slotPingProc); - connect(this,&MainWindow::signalPingProcInHost,m_pObjPing,&kbd_net::CMbPing::slotPingProcInHost); - connect(this,&MainWindow::signalPingSuberInDomain,m_pObjPing,&kbd_net::CMbPing::slotPingSuberInDomain); - connect(this,&MainWindow::signalPingSuberInHost,m_pObjPing,&kbd_net::CMbPing::slotPingSuberInHost); - connect(this,&MainWindow::signalPingSuberInProc,m_pObjPing,&kbd_net::CMbPing::slotPingSuberInProc); + connect(this,&MainWindow::signalPingHost,m_pObjPing,&iot_net::CMbPing::slotPingHost); + connect(this,&MainWindow::signalPingHostInDomain,m_pObjPing,&iot_net::CMbPing::slotPingHostInDomain); + connect(this,&MainWindow::signalPingProc,m_pObjPing,&iot_net::CMbPing::slotPingProc); + connect(this,&MainWindow::signalPingProcInHost,m_pObjPing,&iot_net::CMbPing::slotPingProcInHost); + connect(this,&MainWindow::signalPingSuberInDomain,m_pObjPing,&iot_net::CMbPing::slotPingSuberInDomain); + connect(this,&MainWindow::signalPingSuberInHost,m_pObjPing,&iot_net::CMbPing::slotPingSuberInHost); + connect(this,&MainWindow::signalPingSuberInProc,m_pObjPing,&iot_net::CMbPing::slotPingSuberInProc); m_threadQuery.start(); @@ -128,10 +128,10 @@ MainWindow::~MainWindow() m_threadQuery.wait(); //< 停止消息总线 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); //< 明确地提前调用zsys_shutdown()，而非程序退出时自动调用（顺序不可控） @@ -156,10 +156,10 @@ void MainWindow::loadTreeHosts() { unloadTreeHosts(); // 获取节点 - std::vector nodeInfos; - kbd_public::CSysInfoInterfacePtr nodeInfoSQL; + std::vector nodeInfos; + iot_public::CSysInfoInterfacePtr nodeInfoSQL; - kbd_public::createSysInfoInstance(nodeInfoSQL); + iot_public::createSysInfoInstance(nodeInfoSQL); // 测试数据是否获取成功 假定没有也可以执行执行成功 // assert(nodeInfoSQL != NULL); @@ -168,8 +168,8 @@ void MainWindow::loadTreeHosts() nodeInfoSQL->getAllNodeInfo(nodeInfos); // 添加域对应的结点信息 - QMap>> domainInfos; + QMap>> domainInfos; for(auto node = nodeInfos.cbegin(); node != nodeInfos.cend(); @@ -181,10 +181,10 @@ void MainWindow::loadTreeHosts() if(domainInfo == domainInfos.end()) { // 创建临时指针,将本结点的指针插入链表中 - QList nodeList; + QList nodeList; nodeList.append(&(*node)); - kbd_public::SDomainInfo stDomainInfo; + iot_public::SDomainInfo stDomainInfo; nodeInfoSQL->getDomainInfoById(node->nDomainId,stDomainInfo); domainInfos.insert(node->nDomainId,std::make_pair(stDomainInfo,nodeList)); @@ -716,7 +716,7 @@ bool MainWindow::checkConnection() static bool bInited = false; if (!bInited) { - if (kbd_net::initMsgBus("net_msg_bus_ping", "", true)) + if (iot_net::initMsgBus("net_msg_bus_ping", "", true)) { bInited = true; } @@ -728,7 +728,7 @@ bool MainWindow::checkConnection() } int iLoop = 0; - while (!kbd_net::isConnected()) + while (!iot_net::isConnected()) { if (iLoop > 300) { diff --git a/platform/src/net/net_msg_bus_mng_ping_gui/mainwindow.h b/platform/src/net/net_msg_bus_mng_ping_gui/mainwindow.h index 919ea256..12551915 100644 --- a/platform/src/net/net_msg_bus_mng_ping_gui/mainwindow.h +++ b/platform/src/net/net_msg_bus_mng_ping_gui/mainwindow.h @@ -83,7 +83,7 @@ private: //<数据区域 QThread m_threadQuery;// 查询线程 QMessageBox *m_msgBoxFailConnect; // 连接超时 - kbd_net::CMbPing* m_pObjPing; //ping查询对象 + iot_net::CMbPing* m_pObjPing; //ping查询对象 //< 界面元素-属性浏览器相关 diff --git a/platform/src/net/net_msg_bus_ping/CMbPing.cpp b/platform/src/net/net_msg_bus_ping/CMbPing.cpp index 92e72ff2..4463b5c6 100644 --- a/platform/src/net/net_msg_bus_ping/CMbPing.cpp +++ b/platform/src/net/net_msg_bus_ping/CMbPing.cpp @@ -16,7 +16,7 @@ #include "CMbPing.h" #include -namespace kbd_net +namespace iot_net { CMbPing::CMbPing() @@ -210,5 +210,5 @@ void CMbPing::recvPingRep() kmbp_destroy(&pKmbp); } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_ping/CMbPing.h b/platform/src/net/net_msg_bus_ping/CMbPing.h index f229891e..5b9e57cf 100644 --- a/platform/src/net/net_msg_bus_ping/CMbPing.h +++ b/platform/src/net/net_msg_bus_ping/CMbPing.h @@ -9,7 +9,7 @@ #pragma once -namespace kbd_net +namespace iot_net { class CMbCommunicatorImp; @@ -42,5 +42,5 @@ private: CMbCommunicatorImp *m_pMbComm; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_ping/Main.cpp b/platform/src/net/net_msg_bus_ping/Main.cpp index c868ae2e..0d82a572 100644 --- a/platform/src/net/net_msg_bus_ping/Main.cpp +++ b/platform/src/net/net_msg_bus_ping/Main.cpp @@ -36,7 +36,7 @@ static bool checkConnection() static bool bInited = false; if (!bInited) { - if (kbd_net::initMsgBus("net_msg_bus_ping", "", true)) + if (iot_net::initMsgBus("net_msg_bus_ping", "", true)) { bInited = true; } @@ -48,7 +48,7 @@ static bool checkConnection() } int iLoop = 0; - while (!kbd_net::isConnected()) + while (!iot_net::isConnected()) { if (iLoop > 300) { @@ -71,7 +71,7 @@ static void pingHost(const std::vector &vecStrArg) if (!checkConnection()) return; - kbd_net::CMbPing objPing; + iot_net::CMbPing objPing; objPing.pingHost(strHost.c_str()); } @@ -83,7 +83,7 @@ static void pingHostInDomain(const std::vector &vecStrArg) if (!checkConnection()) return; - kbd_net::CMbPing objPing; + iot_net::CMbPing objPing; objPing.pingHostInDomain(nDomainID); } @@ -98,7 +98,7 @@ static void pingProc(const std::vector &vecStrArg) if (!checkConnection()) return; - kbd_net::CMbPing objPing; + iot_net::CMbPing objPing; objPing.pingProc(strProc.c_str(), strInst.c_str(), nPid, strHost.c_str()); } @@ -110,7 +110,7 @@ static void pingProcInHost(const std::vector &vecStrArg) if (!checkConnection()) return; - kbd_net::CMbPing objPing; + iot_net::CMbPing objPing; objPing.pingProcInHost(strHost.c_str()); } @@ -124,7 +124,7 @@ static void pingSuberInDomain(const std::vector &vecStrArg) if (!checkConnection()) return; - kbd_net::CMbPing objPing; + iot_net::CMbPing objPing; objPing.pingSuberInDomain(nAppID, nChannelID, nDomainID); } @@ -138,7 +138,7 @@ static void pingSuberInHost(const std::vector &vecStrArg) if (!checkConnection()) return; - kbd_net::CMbPing objPing; + iot_net::CMbPing objPing; objPing.pingSuberInHost(nAppID, nChannelID, strHost.c_str()); } @@ -155,7 +155,7 @@ static void pingSuberInProc(const std::vector &vecStrArg) if (!checkConnection()) return; - kbd_net::CMbPing objPing; + iot_net::CMbPing objPing; objPing.pingSuberInProc(nAppID, nChannelID, strProc.c_str(), strInst.c_str(), nPid, strHost.c_str()); } @@ -289,7 +289,7 @@ int main(int argc, char *argv[]) #endif //< 启动日志 - kbd_public::StartLogSystem("default", "net_msg_bus_ping"); + iot_public::StartLogSystem("default", "net_msg_bus_ping"); po::options_description objOdMode("Mode (only one can be used at a time)", 200, 100); po::options_description objOdGeneric("Generic", 200, 100); @@ -327,10 +327,10 @@ int main(int argc, char *argv[]) } //< 停止消息总线 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } diff --git a/platform/src/net/net_msg_bus_relay/CDomainMng.cpp b/platform/src/net/net_msg_bus_relay/CDomainMng.cpp index 6d608b63..722a2f9e 100644 --- a/platform/src/net/net_msg_bus_relay/CDomainMng.cpp +++ b/platform/src/net/net_msg_bus_relay/CDomainMng.cpp @@ -20,7 +20,7 @@ #include "CDomainMng.h" -namespace kbd_net +namespace iot_net { static CDomainMng *g_pDomainMng = NULL; @@ -80,7 +80,7 @@ bool CDomainMng::init() { //< 加载 msg_bus_cfg.xml { - const std::string strFileName = kbd_public::CFileUtil::getPathOfCfgFile("msg_bus_cfg.xml"); + const std::string strFileName = iot_public::CFileUtil::getPathOfCfgFile("msg_bus_cfg.xml"); boost::property_tree::ptree pt; try @@ -110,8 +110,8 @@ bool CDomainMng::init() m_nR2rPort, m_nR2rRtTimeout); } - kbd_public::CSysInfoInterfacePtr ptrSysInfo; - if (kbd_public::createSysInfoInstance(ptrSysInfo) == false) + iot_public::CSysInfoInterfacePtr ptrSysInfo; + if (iot_public::createSysInfoInstance(ptrSysInfo) == false) { LOGERROR("createSysInfoInstance() return false !"); return false; @@ -119,7 +119,7 @@ bool CDomainMng::init() //< 获取本机域ID和主机名 { - kbd_public::SNodeInfo stLocalNodeInfo; + iot_public::SNodeInfo stLocalNodeInfo; if (kbdSuccess != ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) { LOGERROR("getLocalNodeInfo() failed !"); @@ -132,7 +132,7 @@ bool CDomainMng::init() //< 本域为原发域，建立与目标域的连接，并订阅本域的转发主题 { - std::vector vecSrcRelay; + std::vector vecSrcRelay; if (kbdSuccess != ptrSysInfo->getMbRelayInfoBySrcDomainID(m_nLocalDomainID, vecSrcRelay)) { LOGERROR("getMbRelayInfoBySrcDomainID() failed !"); @@ -141,7 +141,7 @@ bool CDomainMng::init() for (size_t i = 0; i < vecSrcRelay.size(); i++) { - const kbd_public::SMbRelayInfo &stRelayInfo = vecSrcRelay[i]; + const iot_public::SMbRelayInfo &stRelayInfo = vecSrcRelay[i]; //< 目标域ID if (stRelayInfo.m_nDstDomainID == m_nLocalDomainID) @@ -199,7 +199,7 @@ bool CDomainMng::init() //< 本域为目标域，建立与原发域的连接，允许消息回复 { - std::vector vecDstRelay; + std::vector vecDstRelay; if (kbdSuccess != ptrSysInfo->getMbRelayInfoByDstDomainID(m_nLocalDomainID, vecDstRelay)) { LOGERROR("getMbRelayInfoByDstDomainID() failed !"); @@ -208,7 +208,7 @@ bool CDomainMng::init() for (size_t i = 0; i < vecDstRelay.size(); i++) { - const kbd_public::SMbRelayInfo &stRelayInfo = vecDstRelay[i]; + const iot_public::SMbRelayInfo &stRelayInfo = vecDstRelay[i]; //< 原发域ID if (stRelayInfo.m_nSrcDomainID == m_nLocalDomainID) @@ -256,7 +256,7 @@ bool CDomainMng::init() const int nDomainID = boost::lexical_cast(itMap->first); //< 本转发程序属于 PUBLIC 应用 - kbd_public::SAppDeploy stAppDep; + iot_public::SAppDeploy stAppDep; if (kbdSuccess != ptrSysInfo->getAppDeployById(nDomainID, CN_AppId_PUBLIC, stAppDep)) { LOGERROR("getAppDeployById() failed , nDomainID = %d , ignore !", nDomainID); @@ -285,7 +285,7 @@ bool CDomainMng::init() continue; } - kbd_public::SNodeInfo stNodeInfo; + iot_public::SNodeInfo stNodeInfo; if (kbdSuccess != ptrSysInfo->getNodeInfoByName(strNodeName, stNodeInfo)) { LOGERROR("getNodeInfoByName() failed , strNodeName = %s , ignore !", strNodeName.c_str()); @@ -346,7 +346,7 @@ bool CDomainMng::init() //< 不catch异常，不允许失败 const int nDomainID = boost::lexical_cast(itMap->first); - std::vector vecNodeInfo; + std::vector vecNodeInfo; if (kbdSuccess != ptrSysInfo->getNodeListByDomainId(nDomainID, vecNodeInfo)) { LOGERROR("getNodeListByDomainId() failed , nDomainID = %d , ignore !", nDomainID); @@ -577,5 +577,5 @@ void CDomainMng::sendMsgOut(kmbp_cnt_t *pKmbpCnt) } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_relay/CDomainMng.h b/platform/src/net/net_msg_bus_relay/CDomainMng.h index ca77d84c..fcacfa2f 100644 --- a/platform/src/net/net_msg_bus_relay/CDomainMng.h +++ b/platform/src/net/net_msg_bus_relay/CDomainMng.h @@ -15,7 +15,7 @@ #include "CDomainThread.h" -namespace kbd_net +namespace iot_net { typedef boost::unordered::unordered_map DomainThreadPtrMap; @@ -104,5 +104,5 @@ private: }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_relay/CDomainThread.cpp b/platform/src/net/net_msg_bus_relay/CDomainThread.cpp index 368267e3..780c8d0b 100644 --- a/platform/src/net/net_msg_bus_relay/CDomainThread.cpp +++ b/platform/src/net/net_msg_bus_relay/CDomainThread.cpp @@ -15,7 +15,7 @@ #include "CDomainThread.h" -namespace kbd_net +namespace iot_net { CDomainThread::CActWorker::CActWorker() @@ -620,5 +620,5 @@ bool CDomainThread::sendMsgOut(kmbp_cnt_t *pKmbpCnt) return false; } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_relay/CDomainThread.h b/platform/src/net/net_msg_bus_relay/CDomainThread.h index 638375e4..cddb79bb 100644 --- a/platform/src/net/net_msg_bus_relay/CDomainThread.h +++ b/platform/src/net/net_msg_bus_relay/CDomainThread.h @@ -15,7 +15,7 @@ #include "CRemoteConn.h" -namespace kbd_net +namespace iot_net { class CDomainThread @@ -116,5 +116,5 @@ private: typedef boost::shared_ptr CDomainThreadPtr; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_relay/CMainThread.cpp b/platform/src/net/net_msg_bus_relay/CMainThread.cpp index 26269210..d1b47b69 100644 --- a/platform/src/net/net_msg_bus_relay/CMainThread.cpp +++ b/platform/src/net/net_msg_bus_relay/CMainThread.cpp @@ -18,7 +18,7 @@ #include "CMainThread.h" -namespace kbd_net +namespace iot_net { CMainThread::CActWorker::CActWorker() @@ -739,5 +739,5 @@ bool CMainThread::isRunning() return NULL != m_pActor; } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_relay/CMainThread.h b/platform/src/net/net_msg_bus_relay/CMainThread.h index c3914609..98a6751f 100644 --- a/platform/src/net/net_msg_bus_relay/CMainThread.h +++ b/platform/src/net/net_msg_bus_relay/CMainThread.h @@ -13,7 +13,7 @@ typedef struct _zactor_t zactor_t; -namespace kbd_net +namespace iot_net { //< 仅主机状态时运行 class CMainThread @@ -91,5 +91,5 @@ private: }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_relay/CMbRelayRedunSw.cpp b/platform/src/net/net_msg_bus_relay/CMbRelayRedunSw.cpp index 4058414d..9fce615a 100644 --- a/platform/src/net/net_msg_bus_relay/CMbRelayRedunSw.cpp +++ b/platform/src/net/net_msg_bus_relay/CMbRelayRedunSw.cpp @@ -13,7 +13,7 @@ #include "CMbRelayRedunSw.h" -namespace kbd_net +namespace iot_net { CMbRelayRedunSw::CMbRelayRedunSw(CMbRelaySrv *pParent) @@ -48,5 +48,5 @@ int CMbRelayRedunSw::redundantSwitch(bool bMaster, bool bSlave) return kbdSuccess; } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_relay/CMbRelayRedunSw.h b/platform/src/net/net_msg_bus_relay/CMbRelayRedunSw.h index 8d9a7604..e468de94 100644 --- a/platform/src/net/net_msg_bus_relay/CMbRelayRedunSw.h +++ b/platform/src/net/net_msg_bus_relay/CMbRelayRedunSw.h @@ -13,12 +13,12 @@ #include "CMainThread.h" -namespace kbd_net +namespace iot_net { class CMbRelaySrv; -class CMbRelayRedunSw : public ::kbd_sys::CRedundantSwitchInterface +class CMbRelayRedunSw : public ::iot_sys::CRedundantSwitchInterface { public: CMbRelayRedunSw(CMbRelaySrv *pParent); @@ -37,5 +37,5 @@ private: typedef boost::shared_ptr CMbRelayRedunSwPtr; -} //< namespace kbd_net +} //< 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 a61b3b71..1482a631 100644 --- a/platform/src/net/net_msg_bus_relay/CMbRelaySrv.cpp +++ b/platform/src/net/net_msg_bus_relay/CMbRelaySrv.cpp @@ -23,7 +23,7 @@ #define MB_RELAY_SRV_PROC_NAME "net_msg_bus_relay" -namespace kbd_net +namespace iot_net { CMbRelaySrv::CMbRelaySrv() @@ -36,7 +36,7 @@ CMbRelaySrv::~CMbRelaySrv() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } @@ -57,7 +57,7 @@ bool CMbRelaySrv::start(int argc, char *argv[], int& /*nStatus*/) zsys_set_io_threads(2); //< 启动日志 - kbd_public::StartLogSystem(CN_AppName_PUBLIC.c_str(), MB_RELAY_SRV_PROC_NAME); + iot_public::StartLogSystem(CN_AppName_PUBLIC.c_str(), MB_RELAY_SRV_PROC_NAME); //< 判断是否已启动 if (isAlreadyRunning()) @@ -96,14 +96,14 @@ bool CMbRelaySrv::start(int argc, char *argv[], int& /*nStatus*/) strStartArgs += argv[i]; } - kbd_sys::SProcessInfoKey objProcInfo; + iot_sys::SProcessInfoKey objProcInfo; objProcInfo.nAppId = CN_AppId_PUBLIC; objProcInfo.nDomainId = CDomainMng::getInstance().getLocalDomainID(); objProcInfo.strNodeName = CDomainMng::getInstance().getLocalNodeName(); objProcInfo.strProcName = MB_RELAY_SRV_PROC_NAME; objProcInfo.strProcParam = strStartArgs; - m_ptrProcMng = kbd_sys::getProcMngInstance(objProcInfo); + m_ptrProcMng = iot_sys::getProcMngInstance(objProcInfo); if (!m_ptrProcMng) { LOGFATAL("getProcMngInstance return NULL"); @@ -115,7 +115,7 @@ bool CMbRelaySrv::start(int argc, char *argv[], int& /*nStatus*/) //< 冗余管理 { - m_ptrRedundantMng = kbd_sys::getRedundantMngInstance(CDomainMng::getInstance().getLocalDomainID(), + m_ptrRedundantMng = iot_sys::getRedundantMngInstance(CDomainMng::getInstance().getLocalDomainID(), CN_AppId_PUBLIC, CDomainMng::getInstance().getLocalNodeName()); if (!m_ptrRedundantMng) @@ -218,7 +218,7 @@ bool CMbRelaySrv::stop() //< 停止日志系统 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); //< 明确地提前调用zsys_shutdown()，而非程序退出时自动调用（顺序不可控） //< 防止Windows系统下报错：Assertion failed: Successful WSASTARTUP not yet performed @@ -248,7 +248,7 @@ int CMbRelaySrv::updateProcInfo(bool bActive, bool bMaster, bool bSlave) bool CMbRelaySrv::isAlreadyRunning() { - return kbd_public::CSingleProcInstance::hasInstanceRunning(MB_RELAY_SRV_PROC_NAME); + return iot_public::CSingleProcInstance::hasInstanceRunning(MB_RELAY_SRV_PROC_NAME); } @@ -315,5 +315,5 @@ bool CMbRelaySrv::parseCommandLine(int argc, char *argv[]) return true; } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_relay/CMbRelaySrv.h b/platform/src/net/net_msg_bus_relay/CMbRelaySrv.h index 83d7f4a8..6dc5234c 100644 --- a/platform/src/net/net_msg_bus_relay/CMbRelaySrv.h +++ b/platform/src/net/net_msg_bus_relay/CMbRelaySrv.h @@ -14,12 +14,12 @@ #include "CMbRelayRedunSw.h" -namespace kbd_net +namespace iot_net { class CMbRelaySrv : - public kbd_public::CBaseService, - kbd_sys::CProcessQuitInterface + public iot_public::CBaseService, + iot_sys::CProcessQuitInterface { public: CMbRelaySrv(); @@ -53,9 +53,9 @@ private: private: enRunModel m_enRunModel; CMbRelayRedunSwPtr m_ptrRedunSw; - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_sys::CProcMngInterfacePtr m_ptrProcMng; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_relay/CRemoteConn.cpp b/platform/src/net/net_msg_bus_relay/CRemoteConn.cpp index 31895f64..02b3a2a2 100644 --- a/platform/src/net/net_msg_bus_relay/CRemoteConn.cpp +++ b/platform/src/net/net_msg_bus_relay/CRemoteConn.cpp @@ -15,7 +15,7 @@ #include "CRemoteConn.h" -namespace kbd_net +namespace iot_net { /******************************************************************************//** * @brief CRemoteConnParent @@ -459,5 +459,5 @@ int CRemoteConn::handleSockMon(zloop_t *, zsock_t *reader, void *arg) } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_relay/CRemoteConn.h b/platform/src/net/net_msg_bus_relay/CRemoteConn.h index f923c20e..dc0be830 100644 --- a/platform/src/net/net_msg_bus_relay/CRemoteConn.h +++ b/platform/src/net/net_msg_bus_relay/CRemoteConn.h @@ -11,7 +11,7 @@ #include "../net_msg_bus_base_api/kmbp.h" -namespace kbd_net +namespace iot_net { class CRemoteConn; @@ -82,5 +82,5 @@ private: zsock_t *m_pSockMon; //< 连接状态监视 }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_msg_bus_relay/Main.cpp b/platform/src/net/net_msg_bus_relay/Main.cpp index 8af0fec9..5df2509b 100644 --- a/platform/src/net/net_msg_bus_relay/Main.cpp +++ b/platform/src/net/net_msg_bus_relay/Main.cpp @@ -11,7 +11,7 @@ int main(int argc, char *argv[]) { - kbd_net::CMbRelaySrv objApp; + iot_net::CMbRelaySrv objApp; return objApp.main(argc, argv); } diff --git a/platform/src/net/net_msg_bus_test/client/main.cpp b/platform/src/net/net_msg_bus_test/client/main.cpp index 7d5fc94c..47022714 100644 --- a/platform/src/net/net_msg_bus_test/client/main.cpp +++ b/platform/src/net/net_msg_bus_test/client/main.cpp @@ -37,12 +37,12 @@ int main(int /*argc*/, char ** /*argv[]*/) #endif //< 启动日志 - kbd_public::StartLogSystem("default", "net_msg_bus_test_client"); + iot_public::StartLogSystem("default", "net_msg_bus_test_client"); LOGINFO("Log system OK !"); //< 初始化消息总线库 - if (!(kbd_net::initMsgBus("net_msg_bus_test_client", "1"))) + if (!(iot_net::initMsgBus("net_msg_bus_test_client", "1"))) { std::cout << "Initialize message bus failed, exit !" << std::endl; return 1; @@ -61,12 +61,12 @@ int main(int /*argc*/, char ** /*argv[]*/) std::cout << "Can not connect to message bus service !" << std::endl; //< 释放消息总线库 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); return 1; } - if (kbd_net::isConnected()) + if (iot_net::isConnected()) { std::cout << "Connected to message bus service !" << std::endl; break; @@ -79,20 +79,20 @@ int main(int /*argc*/, char ** /*argv[]*/) while (!g_bNeedExit) { //< 构建通讯器，测试频繁构造、析构通讯器是否有问题 - kbd_net::CMbCommunicator *pMbComm = new kbd_net::CMbCommunicator(); + iot_net::CMbCommunicator *pMbComm = new iot_net::CMbCommunicator(); std::cout << "Constuct CMbCommunicator successed !" << std::endl; //< 获取通讯器名称（可选） std::cout << "My communicator name is " << pMbComm->getName() << std::endl; - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; objMsg.setMsgType(1); objMsg.setSubject(8888, 8888); objMsg.setData(std::string("Hello world ! Hello world ! Hello world ! Hello world ! Hello world ! " "Hello world ! Hello world ! Hello world ! Hello world ! Hello world ! " "Hello world ! Hello world ! Hello world ! Hello world ! Hello world ! " "Hello world ! Hello world ! Hello world ! Hello world ! Hello world ! ")); - objMsg.m_enZipWhenSend = kbd_net::EN_MB_ZIP_ENABLE; + objMsg.m_enZipWhenSend = iot_net::EN_MB_ZIP_ENABLE; //objMsg.printInfo(); //std::string strMsg = objMsg.printInfoToStr(); @@ -123,10 +123,10 @@ int main(int /*argc*/, char ** /*argv[]*/) } //< 释放消息总线库 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } diff --git a/platform/src/net/net_msg_bus_test/receiver/main.cpp b/platform/src/net/net_msg_bus_test/receiver/main.cpp index 28de75b2..dbc1dd08 100644 --- a/platform/src/net/net_msg_bus_test/receiver/main.cpp +++ b/platform/src/net/net_msg_bus_test/receiver/main.cpp @@ -47,12 +47,12 @@ int main(int argc, char *argv[]) int nLoopCnt = atoi(argv[3]); //< 启动日志 - kbd_public::StartLogSystem("default", "net_msg_bus_test_receiver"); + iot_public::StartLogSystem("default", "net_msg_bus_test_receiver"); LOGINFO("Log system OK !"); //< 初始化消息总线库 - if (!(kbd_net::initMsgBus("net_msg_bus_test_receiver", argv[1], false))) + if (!(iot_net::initMsgBus("net_msg_bus_test_receiver", argv[1], false))) { std::cout << "Initialize message bus failed, exit !" << std::endl; return 1; @@ -71,12 +71,12 @@ int main(int argc, char *argv[]) std::cout << "Can not connect to message bus service !" << std::endl; //< 释放消息总线库 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); return 1; } - if (kbd_net::isConnected()) + if (iot_net::isConnected()) { std::cout << "Connected to message bus service !" << std::endl; break; @@ -87,13 +87,13 @@ int main(int argc, char *argv[]) } //< 构建通讯器 - kbd_net::CMbCommunicator *pMbComm = new kbd_net::CMbCommunicator("Comm1"); + iot_net::CMbCommunicator *pMbComm = new iot_net::CMbCommunicator("Comm1"); std::cout << "Constuct CMbCommunicator successed !" << std::endl; //< 获取通讯器名称（可选） std::cout << "My communicator name is " << pMbComm->getName() << std::endl; - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; std::cout << "Construct CMbMessage successed !" << std::endl; if (pMbComm->addSub(1, nChnID)) @@ -149,10 +149,10 @@ int main(int argc, char *argv[]) pMbComm = NULL; //< 释放消息总线库 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } diff --git a/platform/src/net/net_msg_bus_test/sender/main.cpp b/platform/src/net/net_msg_bus_test/sender/main.cpp index 43abd466..2f99567c 100644 --- a/platform/src/net/net_msg_bus_test/sender/main.cpp +++ b/platform/src/net/net_msg_bus_test/sender/main.cpp @@ -49,12 +49,12 @@ int main(int argc, char *argv[]) int nItvUs = atoi(argv[4]); //< 启动日志 - kbd_public::StartLogSystem("default", "net_msg_bus_test_sender"); + iot_public::StartLogSystem("default", "net_msg_bus_test_sender"); LOGINFO("Log system OK !"); //< 初始化消息总线库 - if (!(kbd_net::initMsgBus("net_msg_bus_test_sender", argv[1], false))) + if (!(iot_net::initMsgBus("net_msg_bus_test_sender", argv[1], false))) { std::cout << "Initialize message bus failed, exit !" << std::endl; return 1; @@ -73,12 +73,12 @@ int main(int argc, char *argv[]) std::cout << "Can not connect to message bus service !" << std::endl; //< 释放消息总线库 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); return 1; } - if (kbd_net::isConnected()) + if (iot_net::isConnected()) { std::cout << "Connected to message bus service !" << std::endl; break; @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) } //< 构建通讯器 - kbd_net::CMbCommunicator *pMbComm = new kbd_net::CMbCommunicator(); + iot_net::CMbCommunicator *pMbComm = new iot_net::CMbCommunicator(); std::cout << "Constuct CMbCommunicator successed !" << std::endl; //< 获取通讯器名称（可选） @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) char *pData = (char *)malloc(nMsgSize + 1); for (int i = 0; i < nMsgSize; i++) pData[i] = randof(256); - kbd_net::CMbMessage objMsg(pData, nMsgSize, 1, nChnID, 1, 2, 3); + iot_net::CMbMessage objMsg(pData, nMsgSize, 1, nChnID, 1, 2, 3); free(pData); pData = NULL; std::cout << "Construct CMbMessage successed !" << std::endl; @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) { //< 调用发送函数后，消息内容将被消息总线接管，传入的消息对象将被清空 //< 如需复用，则先复制 - kbd_net::CMbMessage objMsgToSend = objMsg; + iot_net::CMbMessage objMsgToSend = objMsg; objMsgToSend.setPara1(nLoop); bSendRc = pMbComm->sendMsgToDomain(objMsgToSend); @@ -155,10 +155,10 @@ int main(int argc, char *argv[]) pMbComm = NULL; //< 释放消息总线库 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } diff --git a/platform/src/net/net_msg_bus_test/server/main.cpp b/platform/src/net/net_msg_bus_test/server/main.cpp index ed514b6f..626a88e2 100644 --- a/platform/src/net/net_msg_bus_test/server/main.cpp +++ b/platform/src/net/net_msg_bus_test/server/main.cpp @@ -36,12 +36,12 @@ int main(int /*argc*/, char ** /*argv[]*/) #endif //< 启动日志 - kbd_public::StartLogSystem("default", "net_msg_bus_test_server"); + iot_public::StartLogSystem("default", "net_msg_bus_test_server"); LOGINFO("Log system OK !"); //< 初始化消息总线库 - if (!(kbd_net::initMsgBus("net_msg_bus_test_server", "1"))) + if (!(iot_net::initMsgBus("net_msg_bus_test_server", "1"))) { std::cout << "Initialize message bus failed, exit !" << std::endl; return 1; @@ -60,12 +60,12 @@ int main(int /*argc*/, char ** /*argv[]*/) std::cout << "Can not connect to message bus service !" << std::endl; //< 释放消息总线库 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); return 1; } - if (kbd_net::isConnected()) + if (iot_net::isConnected()) { std::cout << "Connected to message bus service !" << std::endl; break; @@ -76,13 +76,13 @@ int main(int /*argc*/, char ** /*argv[]*/) } //< 构建通讯器 - kbd_net::CMbCommunicator *pMbComm = new kbd_net::CMbCommunicator(); + iot_net::CMbCommunicator *pMbComm = new iot_net::CMbCommunicator(); std::cout << "Constuct CMbCommunicator successed !" << std::endl; //< 获取通讯器名称（可选） std::cout << "My communicator name is " << pMbComm->getName() << std::endl; - kbd_net::CMbMessage objMsgRcv; + iot_net::CMbMessage objMsgRcv; std::cout << "Construct CMbMessage successed !" << std::endl; if (pMbComm->addSub(8888, 8888)) @@ -97,7 +97,7 @@ int main(int /*argc*/, char ** /*argv[]*/) std::string strData((const char *)objMsgRcv.getDataPtr(), objMsgRcv.getDataSize()); std::cout << "Recived message : " << strData << std::endl; - kbd_net::CMbMessage objMsgSend; + iot_net::CMbMessage objMsgSend; objMsgSend.setMsgType(1); objMsgSend.setSubject(1, 2); objMsgSend.setData(std::string("Hello world !")); @@ -115,10 +115,10 @@ int main(int /*argc*/, char ** /*argv[]*/) pMbComm = NULL; //< 释放消息总线库 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } diff --git a/platform/src/net/net_snmp_agent/AgentCommon.cpp b/platform/src/net/net_snmp_agent/AgentCommon.cpp index c0f9053c..011feac6 100644 --- a/platform/src/net/net_snmp_agent/AgentCommon.cpp +++ b/platform/src/net/net_snmp_agent/AgentCommon.cpp @@ -39,7 +39,7 @@ #include "AgentCommon.h" -namespace kbd_net +namespace iot_net { //< 是否需要退出程序 bool g_bNeedExit = false; @@ -255,4 +255,4 @@ void printHelp() printf(" -s \t Run as system service. \n"); } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_snmp_agent/AgentCommon.h b/platform/src/net/net_snmp_agent/AgentCommon.h index 5f85dd7c..6b61c63f 100644 --- a/platform/src/net/net_snmp_agent/AgentCommon.h +++ b/platform/src/net/net_snmp_agent/AgentCommon.h @@ -14,7 +14,7 @@ typedef struct sigar_t sigar_t; -namespace kbd_net +namespace iot_net { //< 自定义 USER_LOG 大类下的小级别 //< 除 USER_LOG 以外的其他大类均为 SMNP++、Agent++ 内部使用，以便控制日志输出级别 @@ -63,7 +63,7 @@ inline int calcPercent(long long nNumerator, long long nDenominator) return (int) (nNumerator / nDenominator + ((nNumerator % nDenominator >= nDenominator / 2) ? 1 : 0)); } -//< 从 kbd_public::CFileUtil::getCurModuleDir() 复制，为了不引入依赖 +//< 从 iot_public::CFileUtil::getCurModuleDir() 复制，为了不引入依赖 //< 得到当前执行程序的绝对路径 std::string getCurModuleDir(); @@ -77,4 +77,4 @@ bool loadXmlConfig(const std::string strFileName, int &nPort, //< 输出命令行帮助 void printHelp(); -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_snmp_agent/CAgentServer.cpp b/platform/src/net/net_snmp_agent/CAgentServer.cpp index ef73c632..b540c5ac 100644 --- a/platform/src/net/net_snmp_agent/CAgentServer.cpp +++ b/platform/src/net/net_snmp_agent/CAgentServer.cpp @@ -37,7 +37,7 @@ using namespace Snmp_pp; using namespace Agentpp; #endif -namespace kbd_net +namespace iot_net { static Mib *pMib = nullptr; @@ -183,17 +183,17 @@ bool CAgentServer::initialize() std::string strAdminPriv("kbdct@0755"); std::set setProcWhiteList; - const std::string &&strCurModuleDir = kbd_net::getCurModuleDir(); + const std::string &&strCurModuleDir = iot_net::getCurModuleDir(); //< 加载配置 { - if (kbd_net::loadXmlConfig(strCurModuleDir + "/snmp_agent_cfg.xml", + if (iot_net::loadXmlConfig(strCurModuleDir + "/snmp_agent_cfg.xml", nPort, strLogFile, nLogErrFlt, nLogWarFlt, nLogEvtFlt, nLogInfFlt, nLogDbgFlt, nLogUsrFlt, strCommunity, strAdminAuth, strAdminPriv, setProcWhiteList)) {} - //< 本程序相对独立，避免增加动态库依赖，不使用 kbd_public::CFileUtil::getPathOfCfgFile - else if (kbd_net::loadXmlConfig(strCurModuleDir + "/../common/sysconfig/snmp_agent_cfg.xml", + //< 本程序相对独立，避免增加动态库依赖，不使用 iot_public::CFileUtil::getPathOfCfgFile + else if (iot_net::loadXmlConfig(strCurModuleDir + "/../common/sysconfig/snmp_agent_cfg.xml", nPort, strLogFile, nLogErrFlt, nLogWarFlt, nLogEvtFlt, nLogInfFlt, nLogDbgFlt, nLogUsrFlt, strCommunity, strAdminAuth, strAdminPriv, setProcWhiteList)) @@ -225,28 +225,28 @@ bool CAgentServer::initialize() DefaultLog::log()->set_filter(USER_LOG, nLogUsrFlt); #endif - LOG_BEGIN(kbd_net::cn_szModuleName, USER_LOG | ULL_EVENT); + LOG_BEGIN(iot_net::cn_szModuleName, USER_LOG | ULL_EVENT); LOG("===================== start ====================="); LOG_END; //< 输出日志，方便调试 { - LOG_BEGIN(kbd_net::cn_szModuleName, USER_LOG | ULL_DEBUG); + LOG_BEGIN(iot_net::cn_szModuleName, USER_LOG | ULL_DEBUG); LOG("nPort"); LOG(nPort); LOG_END; - LOG_BEGIN(kbd_net::cn_szModuleName, USER_LOG | ULL_DEBUG); + LOG_BEGIN(iot_net::cn_szModuleName, USER_LOG | ULL_DEBUG); LOG("strCommunity"); LOG(strCommunity.c_str()); LOG_END; - LOG_BEGIN(kbd_net::cn_szModuleName, USER_LOG | ULL_DEBUG); + LOG_BEGIN(iot_net::cn_szModuleName, USER_LOG | ULL_DEBUG); LOG("strAdminAuth"); LOG(strAdminAuth.c_str()); LOG_END; - LOG_BEGIN(kbd_net::cn_szModuleName, USER_LOG | ULL_DEBUG); + LOG_BEGIN(iot_net::cn_szModuleName, USER_LOG | ULL_DEBUG); LOG("strAdminPriv"); LOG(strAdminPriv.c_str()); LOG_END; @@ -359,7 +359,7 @@ void CAgentServer::release() Snmp::socket_cleanup(); - LOG_BEGIN(kbd_net::cn_szModuleName, USER_LOG | ULL_EVENT); + LOG_BEGIN(iot_net::cn_szModuleName, USER_LOG | ULL_EVENT); LOG("===================== stop ====================="); LOG_END; @@ -413,4 +413,4 @@ void CAgentServer::process(const int nDurationS) } while (!g_bNeedExit && nRestS > 0); } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_snmp_agent/CAgentServer.h b/platform/src/net/net_snmp_agent/CAgentServer.h index 6310a5f3..e4ef3c6e 100644 --- a/platform/src/net/net_snmp_agent/CAgentServer.h +++ b/platform/src/net/net_snmp_agent/CAgentServer.h @@ -9,7 +9,7 @@ #pragma once -namespace kbd_net +namespace iot_net { class CAgentServer @@ -33,4 +33,4 @@ private: }; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_snmp_agent/CpuGroup.cpp b/platform/src/net/net_snmp_agent/CpuGroup.cpp index f2fe4317..4f5b1e40 100644 --- a/platform/src/net/net_snmp_agent/CpuGroup.cpp +++ b/platform/src/net/net_snmp_agent/CpuGroup.cpp @@ -23,7 +23,7 @@ using namespace Snmp_pp; using namespace Agentpp; #endif -namespace kbd_net +namespace iot_net { //< Count 核心数量，单位：个 @@ -290,4 +290,4 @@ void CCpuGroup::updateCpuUsage() *m_pLastCpuTime = objCurrentCpu; } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_snmp_agent/CpuGroup.h b/platform/src/net/net_snmp_agent/CpuGroup.h index c0c2895e..8fad6b13 100644 --- a/platform/src/net/net_snmp_agent/CpuGroup.h +++ b/platform/src/net/net_snmp_agent/CpuGroup.h @@ -13,7 +13,7 @@ typedef struct sigar_cpu_t sigar_cpu_t; -namespace kbd_net +namespace iot_net { class CCpuGroup final : public NS_AGENT MibGroup { @@ -116,4 +116,4 @@ private: CUsageIdle *m_pUsageIdle; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_snmp_agent/FileSysGroup.cpp b/platform/src/net/net_snmp_agent/FileSysGroup.cpp index 2d205d93..ed185525 100644 --- a/platform/src/net/net_snmp_agent/FileSysGroup.cpp +++ b/platform/src/net/net_snmp_agent/FileSysGroup.cpp @@ -23,7 +23,7 @@ using namespace Snmp_pp; using namespace Agentpp; #endif -namespace kbd_net +namespace iot_net { static const index_info indById[1] = { @@ -165,4 +165,4 @@ CFileSysGroup::~CFileSysGroup() { } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_snmp_agent/FileSysGroup.h b/platform/src/net/net_snmp_agent/FileSysGroup.h index b28c2044..ff12f2c8 100644 --- a/platform/src/net/net_snmp_agent/FileSysGroup.h +++ b/platform/src/net/net_snmp_agent/FileSysGroup.h @@ -11,7 +11,7 @@ #include "agent_pp/mib.h" -namespace kbd_net +namespace iot_net { class CFileSysGroup final : public NS_AGENT MibGroup { @@ -47,4 +47,4 @@ private: }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_snmp_agent/MainLinux.cpp b/platform/src/net/net_snmp_agent/MainLinux.cpp index 00fde998..b8b0217f 100644 --- a/platform/src/net/net_snmp_agent/MainLinux.cpp +++ b/platform/src/net/net_snmp_agent/MainLinux.cpp @@ -25,8 +25,8 @@ static void handleSigno(int nSigno) //< 用日志有死锁的风险 printf("\nhandleSigno(): nSigno == %d \n", nSigno); - if (false == kbd_net::g_bNeedExit) - kbd_net::g_bNeedExit = true; + if (false == iot_net::g_bNeedExit) + iot_net::g_bNeedExit = true; } static const char *szSystemdCfgFile = "/lib/systemd/system/kbd_snmp_agent.service"; @@ -52,7 +52,7 @@ static bool regSysService() // fclose(pFile); // } - const std::string strExec = kbd_net::getCurModuleDir() + "/net_snmp_agent -s"; + const std::string strExec = iot_net::getCurModuleDir() + "/net_snmp_agent -s"; //< 生成或修改systemd服务配置文件 try @@ -158,13 +158,13 @@ int main(int argc, char *argv[]) } else { - kbd_net::printHelp(); + iot_net::printHelp(); return EXIT_FAILURE; } } else if (argc > 2) { - kbd_net::printHelp(); + iot_net::printHelp(); return EXIT_FAILURE; } @@ -176,21 +176,21 @@ int main(int argc, char *argv[]) } //< 初始化 - if (kbd_net::CAgentServer::initialize()) + if (iot_net::CAgentServer::initialize()) { //< 处理业务 - while (!kbd_net::g_bNeedExit) + while (!iot_net::g_bNeedExit) { - kbd_net::CAgentServer::process(10); + iot_net::CAgentServer::process(10); } } else printf("Initialize failed, exit.\n"); //< 释放 - kbd_net::CAgentServer::release(); + iot_net::CAgentServer::release(); - return kbd_net::g_bNeedExit ? EXIT_SUCCESS : EXIT_FAILURE; + return iot_net::g_bNeedExit ? EXIT_SUCCESS : EXIT_FAILURE; } #endif //< OS_LINUX diff --git a/platform/src/net/net_snmp_agent/MainWindows.cpp b/platform/src/net/net_snmp_agent/MainWindows.cpp index 0ad3df4f..a0b7b33a 100644 --- a/platform/src/net/net_snmp_agent/MainWindows.cpp +++ b/platform/src/net/net_snmp_agent/MainWindows.cpp @@ -25,8 +25,8 @@ static void handleSigno(int nSigno) //< 用日志有死锁的风险 printf("\nhandleSigno(): nSigno == %d \n", nSigno); - if (false == kbd_net::g_bNeedExit) - kbd_net::g_bNeedExit = true; + if (false == iot_net::g_bNeedExit) + iot_net::g_bNeedExit = true; } #define CN_SERVICE_NAME "kbd_snmp_agent" @@ -52,7 +52,7 @@ static bool regSysService() SC_HANDLE hService = ::OpenServiceA(hSCM, szServiceName, SERVICE_QUERY_CONFIG); if (NULL == hService) { - const std::string strExec = kbd_net::getCurModuleDir() + "/net_snmp_agent.exe -s"; + const std::string strExec = iot_net::getCurModuleDir() + "/net_snmp_agent.exe -s"; //< 创建服务 @@ -180,8 +180,8 @@ static void WINAPI serviceStrl(DWORD dwOpcode) switch (dwOpcode) { case SERVICE_CONTROL_STOP: - if (false == kbd_net::g_bNeedExit) - kbd_net::g_bNeedExit = true; + if (false == iot_net::g_bNeedExit) + iot_net::g_bNeedExit = true; g_pStatus->dwCurrentState = SERVICE_STOP_PENDING; SetServiceStatus(g_hServiceStatus, g_pStatus); break; @@ -220,19 +220,19 @@ static void WINAPI serviceMain() { //< 初始化 - if (kbd_net::CAgentServer::initialize()) + if (iot_net::CAgentServer::initialize()) { //< 处理业务 - while (!kbd_net::g_bNeedExit) + while (!iot_net::g_bNeedExit) { - kbd_net::CAgentServer::process(10); + iot_net::CAgentServer::process(10); } } else printf("Initialize failed, exit.\n"); //< 释放 - kbd_net::CAgentServer::release(); + iot_net::CAgentServer::release(); } g_pStatus->dwCurrentState = SERVICE_STOPPED; @@ -283,13 +283,13 @@ int main(int argc, char *argv[]) } else { - kbd_net::printHelp(); + iot_net::printHelp(); return EXIT_FAILURE; } } else if (argc > 2) { - kbd_net::printHelp(); + iot_net::printHelp(); return EXIT_FAILURE; } else @@ -302,22 +302,22 @@ int main(int argc, char *argv[]) } //< 初始化 - if (kbd_net::CAgentServer::initialize()) + if (iot_net::CAgentServer::initialize()) { //< 处理业务 - while (!kbd_net::g_bNeedExit) + while (!iot_net::g_bNeedExit) { - kbd_net::CAgentServer::process(10); + iot_net::CAgentServer::process(10); } } else printf("Initialize failed, exit.\n"); //< 释放 - kbd_net::CAgentServer::release(); + iot_net::CAgentServer::release(); } - return kbd_net::g_bNeedExit ? EXIT_SUCCESS : EXIT_FAILURE; + return iot_net::g_bNeedExit ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/platform/src/net/net_snmp_agent/MemoryGroup.cpp b/platform/src/net/net_snmp_agent/MemoryGroup.cpp index cc76a2dd..4eb960f3 100644 --- a/platform/src/net/net_snmp_agent/MemoryGroup.cpp +++ b/platform/src/net/net_snmp_agent/MemoryGroup.cpp @@ -23,7 +23,7 @@ using namespace Snmp_pp; using namespace Agentpp; #endif -namespace kbd_net +namespace iot_net { //< Total 物理内存总量，单位：MiB @@ -293,4 +293,4 @@ void CMemoryGroup::updateSwapUsage() m_pSwapPerc->end_synch(); } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_snmp_agent/MemoryGroup.h b/platform/src/net/net_snmp_agent/MemoryGroup.h index 3c95b5ec..efb07e42 100644 --- a/platform/src/net/net_snmp_agent/MemoryGroup.h +++ b/platform/src/net/net_snmp_agent/MemoryGroup.h @@ -11,7 +11,7 @@ #include "agent_pp/mib.h" -namespace kbd_net +namespace iot_net { class CMemoryGroup final : public NS_AGENT MibGroup { @@ -126,4 +126,4 @@ private: CSwapPerc *m_pSwapPerc; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_snmp_agent/NetInterfaceGroup.cpp b/platform/src/net/net_snmp_agent/NetInterfaceGroup.cpp index e797fade..443f42cc 100644 --- a/platform/src/net/net_snmp_agent/NetInterfaceGroup.cpp +++ b/platform/src/net/net_snmp_agent/NetInterfaceGroup.cpp @@ -23,7 +23,7 @@ using namespace Snmp_pp; using namespace Agentpp; #endif -namespace kbd_net +namespace iot_net { static const index_info indById[1] = { @@ -197,4 +197,4 @@ CNetInterfaceGroup::~CNetInterfaceGroup() { } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_snmp_agent/NetInterfaceGroup.h b/platform/src/net/net_snmp_agent/NetInterfaceGroup.h index 2237faea..0208f524 100644 --- a/platform/src/net/net_snmp_agent/NetInterfaceGroup.h +++ b/platform/src/net/net_snmp_agent/NetInterfaceGroup.h @@ -11,7 +11,7 @@ #include "agent_pp/mib.h" -namespace kbd_net +namespace iot_net { class CNetInterfaceGroup final : public NS_AGENT MibGroup { @@ -52,4 +52,4 @@ private: }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_snmp_agent/ProcessGroup.cpp b/platform/src/net/net_snmp_agent/ProcessGroup.cpp index 104b41f5..f87e9e37 100644 --- a/platform/src/net/net_snmp_agent/ProcessGroup.cpp +++ b/platform/src/net/net_snmp_agent/ProcessGroup.cpp @@ -26,7 +26,7 @@ using namespace Snmp_pp; using namespace Agentpp; #endif -namespace kbd_net +namespace iot_net { //< Total 进程总数 @@ -441,4 +441,4 @@ void CProcessGroup::updateProcTableAndCnt() m_pZombie->end_synch(); } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_snmp_agent/ProcessGroup.h b/platform/src/net/net_snmp_agent/ProcessGroup.h index 7b299418..0cd04c6a 100644 --- a/platform/src/net/net_snmp_agent/ProcessGroup.h +++ b/platform/src/net/net_snmp_agent/ProcessGroup.h @@ -15,7 +15,7 @@ typedef struct sigar_cpu_t sigar_cpu_t; -namespace kbd_net +namespace iot_net { class CProcessGroup final : public NS_AGENT MibGroup { @@ -117,4 +117,4 @@ private: CTabByCrc32 *m_pTabByCrc32; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_snmp_agent/SystemGroup.cpp b/platform/src/net/net_snmp_agent/SystemGroup.cpp index f0fdaa79..16d8d092 100644 --- a/platform/src/net/net_snmp_agent/SystemGroup.cpp +++ b/platform/src/net/net_snmp_agent/SystemGroup.cpp @@ -23,7 +23,7 @@ using namespace Snmp_pp; using namespace Agentpp; #endif -namespace kbd_net +namespace iot_net { //< HostName 主机名 @@ -255,4 +255,4 @@ void CSystemGroup::updateSysInfo() m_pVendorVer->end_synch(); } -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/net/net_snmp_agent/SystemGroup.h b/platform/src/net/net_snmp_agent/SystemGroup.h index bbd8b910..94b8a993 100644 --- a/platform/src/net/net_snmp_agent/SystemGroup.h +++ b/platform/src/net/net_snmp_agent/SystemGroup.h @@ -11,7 +11,7 @@ #include "agent_pp/mib.h" -namespace kbd_net +namespace iot_net { class CSystemGroup final : public NS_AGENT MibGroup { @@ -109,4 +109,4 @@ private: CVendorVer *m_pVendorVer; }; -} //< namespace kbd_net +} //< namespace iot_net diff --git a/platform/src/public/pub_logger_api/logger.cpp b/platform/src/public/pub_logger_api/logger.cpp index 6224ba76..807d8588 100644 --- a/platform/src/public/pub_logger_api/logger.cpp +++ b/platform/src/public/pub_logger_api/logger.cpp @@ -28,7 +28,7 @@ using namespace std; using namespace log4cplus; -using namespace kbd_public; +using namespace iot_public; //消除auto_ptr编译告警 #ifdef __GNUC__ @@ -344,7 +344,7 @@ void RestartLogSystem() addDefaultLogger(); } -DLL_CLASS void kbd_public::StartLogSystem( const char* pAppName, const char* pProcessName ) +DLL_CLASS void iot_public::StartLogSystem( const char* pAppName, const char* pProcessName ) { // 应用名赋值 if( pAppName != NULL && strlen(pAppName) > 0 ) @@ -374,7 +374,7 @@ DLL_CLASS void kbd_public::StartLogSystem( const char* pAppName, const char* pPr LOGINFO("********************************"); } -DLL_CLASS void kbd_public::StopLogSystem() +DLL_CLASS void iot_public::StopLogSystem() { LOGINFO("********************************"); LOGINFO("* *"); @@ -393,7 +393,7 @@ DLL_CLASS void kbd_public::StopLogSystem() Logger::shutdown(); } -DLL_CLASS Logger& kbd_public::getLogger( bool& bValid ) +DLL_CLASS Logger& iot_public::getLogger( bool& bValid ) { bValid = g_bLoggerValid; return g_logger; diff --git a/platform/src/public/pub_sysinfo_api/SysInfoApi.cpp b/platform/src/public/pub_sysinfo_api/SysInfoApi.cpp index 2a84bb05..9b31f064 100644 --- a/platform/src/public/pub_sysinfo_api/SysInfoApi.cpp +++ b/platform/src/public/pub_sysinfo_api/SysInfoApi.cpp @@ -10,7 +10,7 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "SysInfoImp.h" -namespace kbd_public +namespace iot_public { bool createSysInfoInstance(CSysInfoInterfacePtr &spOutput) @@ -25,5 +25,5 @@ bool createSysInfoInstance(CSysInfoInterfacePtr &spOutput) return false; } -} //namespace kbd_public +} //namespace iot_public diff --git a/platform/src/public/pub_sysinfo_api/SysInfoData.cpp b/platform/src/public/pub_sysinfo_api/SysInfoData.cpp index 814eeddc..ae4f8d80 100644 --- a/platform/src/public/pub_sysinfo_api/SysInfoData.cpp +++ b/platform/src/public/pub_sysinfo_api/SysInfoData.cpp @@ -22,7 +22,7 @@ //using namespace boost::property_tree; -namespace kbd_public +namespace iot_public { CSysInfoData::CSysInfoData() @@ -37,7 +37,7 @@ CSysInfoData::~CSysInfoData() bool CSysInfoData::loadData() { - std::string strPath = kbd_public::CFileUtil::getCurModuleDir(); + std::string strPath = iot_public::CFileUtil::getCurModuleDir(); //注意加载顺序，有些内容有依赖关系 if (load_APP_INFO(strPath.c_str()) && load_DBCONFIG_DOMAIN(strPath.c_str()) @@ -965,5 +965,5 @@ bool CSysInfoData::load_MSG_RELAY(const char *pchPath) return true; } -} //namespace kbd_public +} //namespace iot_public diff --git a/platform/src/public/pub_sysinfo_api/SysInfoData.h b/platform/src/public/pub_sysinfo_api/SysInfoData.h index fe9bcf0c..57ee0e73 100644 --- a/platform/src/public/pub_sysinfo_api/SysInfoData.h +++ b/platform/src/public/pub_sysinfo_api/SysInfoData.h @@ -13,7 +13,7 @@ #include #include "pub_sysinfo_api/SysInfoBase.h" -namespace kbd_public +namespace iot_public { class CSysInfoData @@ -73,5 +73,5 @@ private: }; -} //namespace kbd_public +} //namespace iot_public diff --git a/platform/src/public/pub_sysinfo_api/SysInfoImp.cpp b/platform/src/public/pub_sysinfo_api/SysInfoImp.cpp index acd63b1e..ae3c2ede 100644 --- a/platform/src/public/pub_sysinfo_api/SysInfoImp.cpp +++ b/platform/src/public/pub_sysinfo_api/SysInfoImp.cpp @@ -21,7 +21,7 @@ #include "SysInfoImp.h" -namespace kbd_public +namespace iot_public { CSysInfoImp::CSysInfoImp() @@ -1038,7 +1038,7 @@ unsigned int CSysInfoImp::getUniqueIdOfNodeInfo() return nRet; } -} //namespace kbd_public +} //namespace iot_public diff --git a/platform/src/public/pub_sysinfo_api/SysInfoImp.h b/platform/src/public/pub_sysinfo_api/SysInfoImp.h index 0c569887..211112c5 100644 --- a/platform/src/public/pub_sysinfo_api/SysInfoImp.h +++ b/platform/src/public/pub_sysinfo_api/SysInfoImp.h @@ -12,7 +12,7 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "SysInfoData.h" -namespace kbd_public +namespace iot_public { class CSysInfoImp : public CSysInfoInterface @@ -396,5 +396,5 @@ private: CSysInfoData m_objData; }; -} //namespace kbd_public +} //namespace iot_public diff --git a/platform/src/public/pub_sysinfo_api/test/main.cpp b/platform/src/public/pub_sysinfo_api/test/main.cpp index 9951e8d4..5b986670 100644 --- a/platform/src/public/pub_sysinfo_api/test/main.cpp +++ b/platform/src/public/pub_sysinfo_api/test/main.cpp @@ -4,12 +4,12 @@ #include "pub_logger_api/logger.h" #include "pub_sysinfo_api/SysInfoApi.h" -using namespace kbd_public; +using namespace iot_public; int main() { - kbd_public::StartLogSystem("default", "pub_sysinfo_api_test"); + iot_public::StartLogSystem("default", "pub_sysinfo_api_test"); CSysInfoInterfacePtr spSysInfo; if (!createSysInfoInstance(spSysInfo)) @@ -39,7 +39,7 @@ int main() } } - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } diff --git a/platform/src/public/pub_utility_api/BaseService.cpp b/platform/src/public/pub_utility_api/BaseService.cpp index 04144eae..63fae1ef 100644 --- a/platform/src/public/pub_utility_api/BaseService.cpp +++ b/platform/src/public/pub_utility_api/BaseService.cpp @@ -21,9 +21,9 @@ #include "pub_utility_api/BaseService.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; -kbd_public::CBaseService* kbd_public::CBaseService::m_pInstance = nullptr; +iot_public::CBaseService* iot_public::CBaseService::m_pInstance = nullptr; //信号回调函数 static void signalCallback(int sig) @@ -35,7 +35,7 @@ static void signalCallback(int sig) } } -kbd_public::CBaseService::CBaseService() +iot_public::CBaseService::CBaseService() { m_pInstance = this; m_bIsService = false; @@ -48,13 +48,13 @@ kbd_public::CBaseService::CBaseService() installBreakPad(); } -kbd_public::CBaseService::~CBaseService() +iot_public::CBaseService::~CBaseService() { m_objDeadlockCheckThread.quit(); uninstallBreakPad(); } -int kbd_public::CBaseService::main(int &argc, char *argv[]) +int iot_public::CBaseService::main(int &argc, char *argv[]) { /* @brief chdir到exe所在路径，防止部分程序查找dll失败的情况 */ boost::system::error_code ec; @@ -153,7 +153,7 @@ int kbd_public::CBaseService::main(int &argc, char *argv[]) return nRet; } -void kbd_public::CBaseService::handleInterrupt(int nSignal) +void iot_public::CBaseService::handleInterrupt(int nSignal) { #ifdef WIN32 if (CTRL_LOGOFF_EVENT == nSignal) @@ -170,25 +170,25 @@ void kbd_public::CBaseService::handleInterrupt(int nSignal) interrupt(); } -kbd_public::CBaseService* kbd_public::CBaseService::getInstance() +iot_public::CBaseService* iot_public::CBaseService::getInstance() { return m_pInstance; } -bool kbd_public::CBaseService::start(int argc, char *argv[], int &nStatus) +bool iot_public::CBaseService::start(int argc, char *argv[], int &nStatus) { std::cout << argc << ":" << argv << ":" << nStatus << endl; return true; } /* @brief 服务停止清理函数 */ -bool kbd_public::CBaseService::stop() +bool iot_public::CBaseService::stop() { return true; } /* @brief 阻塞等待Service的关闭 */ -void kbd_public::CBaseService::waitForShutdown() +void iot_public::CBaseService::waitForShutdown() { //< 运行期间，死锁检测由主线程接管，节省资源 //< 如果子类重写了此函数，让主线程处理其他任务，独立的死锁检测线程也能继续起作用 @@ -206,7 +206,7 @@ void kbd_public::CBaseService::waitForShutdown() } /* @brief 注册信号 */ -void kbd_public::CBaseService::enableInterrupt() +void iot_public::CBaseService::enableInterrupt() { signal(SIGTERM, signalCallback); signal(SIGINT, signalCallback); @@ -218,13 +218,13 @@ void kbd_public::CBaseService::enableInterrupt() } /* @brief 信号回调函数，表示Service被信号中断，默认操作是调用shutdown */ -void kbd_public::CBaseService::interrupt() +void iot_public::CBaseService::interrupt() { shutdown(); } /* @brief 开始运行，服务、命令行模式都从此处运行 */ -int kbd_public::CBaseService::run(const int &argc, char *argv[]) +int iot_public::CBaseService::run(const int &argc, char *argv[]) { /* @brief 以服务模式运行 */ if (m_bIsService) @@ -256,7 +256,7 @@ int kbd_public::CBaseService::run(const int &argc, char *argv[]) return nStatus; } -bool kbd_public::CBaseService::shutdown() +bool iot_public::CBaseService::shutdown() { m_bRunning = false; m_ObjCond.notify_all(); @@ -268,7 +268,7 @@ bool kbd_public::CBaseService::shutdown() #else -void kbd_public::CBaseService::configDaemon(bool bChangeDir, bool bCloseFiles, const std::string &strPidFile) +void iot_public::CBaseService::configDaemon(bool bChangeDir, bool bCloseFiles, const std::string &strPidFile) { m_bIsService = true; //< 是否以守护进程方式运行 m_bChangeDir = bChangeDir; //< 是否更改工作目录 @@ -276,7 +276,7 @@ void kbd_public::CBaseService::configDaemon(bool bChangeDir, bool bCloseFiles, c m_strPidFile = strPidFile; //< pid文件名，保留 } -int kbd_public::CBaseService::runDaemon(int argc, char *argv[]) +int iot_public::CBaseService::runDaemon(int argc, char *argv[]) { if (!m_bIsService) { diff --git a/platform/src/public/pub_utility_api/BreakPadInterface.cpp b/platform/src/public/pub_utility_api/BreakPadInterface.cpp index 020180ea..ab71ec52 100644 --- a/platform/src/public/pub_utility_api/BreakPadInterface.cpp +++ b/platform/src/public/pub_utility_api/BreakPadInterface.cpp @@ -40,7 +40,7 @@ bool FilterCallback(void* /*context*/, EXCEPTION_POINTERS* /*exinfo*/, MDRawAssertionInfo* /*assertion*/) { - if (!kbd_public::CFileUtil::createMultiDir(sg_strDumpPath)) + if (!iot_public::CFileUtil::createMultiDir(sg_strDumpPath)) { return false; } @@ -49,7 +49,7 @@ bool FilterCallback(void* /*context*/, } -bool kbd_public::installBreakPad() +bool iot_public::installBreakPad() { enum { BUF_LEN = 1024 }; char szBuf[BUF_LEN]; @@ -82,7 +82,7 @@ bool kbd_public::installBreakPad() } -bool kbd_public::uninstallBreakPad() +bool iot_public::uninstallBreakPad() { if (sg_pCrash != NULL) { @@ -94,12 +94,12 @@ bool kbd_public::uninstallBreakPad() } #else -bool kbd_public::installBreakPad() +bool iot_public::installBreakPad() { return true; } -bool kbd_public::uninstallBreakPad() +bool iot_public::uninstallBreakPad() { return true; } diff --git a/platform/src/public/pub_utility_api/CProcessSharedMutex.cpp b/platform/src/public/pub_utility_api/CProcessSharedMutex.cpp index cd786822..cf72b890 100644 --- a/platform/src/public/pub_utility_api/CProcessSharedMutex.cpp +++ b/platform/src/public/pub_utility_api/CProcessSharedMutex.cpp @@ -1,10 +1,10 @@ #include "pub_utility_api/CProcessSharedMutex.h" #include "pub_logger_api/logger.h" -using namespace kbd_public; +using namespace iot_public; -kbd_public::CProcessSharedMutex::CProcessSharedMutex() +iot_public::CProcessSharedMutex::CProcessSharedMutex() { m_nKey = 0; memset( m_cName, 0, MUTEX_NAME_MAX_LENGTH+1 ); @@ -15,7 +15,7 @@ kbd_public::CProcessSharedMutex::CProcessSharedMutex() #endif } -kbd_public::CProcessSharedMutex::~CProcessSharedMutex() +iot_public::CProcessSharedMutex::~CProcessSharedMutex() { #ifdef OS_LINUX if ( (long long)m_pLock > 0 ) @@ -26,7 +26,7 @@ kbd_public::CProcessSharedMutex::~CProcessSharedMutex() #endif } -int kbd_public::CProcessSharedMutex::init( char *cName, int nKey ) +int iot_public::CProcessSharedMutex::init( char *cName, int nKey ) { #ifdef OS_WINDOWS snprintf(m_cName, MUTEX_NAME_MAX_LENGTH, "Global\\%s", cName); @@ -127,7 +127,7 @@ int kbd_public::CProcessSharedMutex::init( char *cName, int nKey ) #endif } -int kbd_public::CProcessSharedMutex::lock() +int iot_public::CProcessSharedMutex::lock() { #ifdef OS_LINUX if ( (long long)m_pLock <= 0 ) @@ -184,7 +184,7 @@ int kbd_public::CProcessSharedMutex::lock() #endif } -int kbd_public::CProcessSharedMutex::unlock() +int iot_public::CProcessSharedMutex::unlock() { #ifdef OS_LINUX if ( (long long)m_pLock <= 0 ) diff --git a/platform/src/public/pub_utility_api/CommonConfigParse.cpp b/platform/src/public/pub_utility_api/CommonConfigParse.cpp index 90451119..6141af1b 100644 --- a/platform/src/public/pub_utility_api/CommonConfigParse.cpp +++ b/platform/src/public/pub_utility_api/CommonConfigParse.cpp @@ -13,20 +13,20 @@ #include "pub_utility_api/CharUtil.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; const char* CN_PARAM_SEPARATOR = "#.#"; -kbd_public::CCommonConfigParse::CCommonConfigParse() +iot_public::CCommonConfigParse::CCommonConfigParse() { } -kbd_public::CCommonConfigParse::~CCommonConfigParse() +iot_public::CCommonConfigParse::~CCommonConfigParse() { m_mapParam.clear(); } -int kbd_public::CCommonConfigParse::load( const std::string &strFilePath, const std::string &strFileName ) +int iot_public::CCommonConfigParse::load( const std::string &strFilePath, const std::string &strFileName ) { const string strConfFullPath = CFileUtil::getAbsolutePath( strFilePath, strFileName ); if ( strConfFullPath.empty()) @@ -37,7 +37,7 @@ int kbd_public::CCommonConfigParse::load( const std::string &strFilePath, const return load( strConfFullPath ); } -int kbd_public::CCommonConfigParse::load(const std::string &strFullPath) +int iot_public::CCommonConfigParse::load(const std::string &strFullPath) { m_mapParam.clear(); @@ -71,7 +71,7 @@ int kbd_public::CCommonConfigParse::load(const std::string &strFullPath) return kbdSuccess; } -int kbd_public::CCommonConfigParse::getIntValue(const std::string &strModuleName, const std::string &strKey, int &nValue) +int iot_public::CCommonConfigParse::getIntValue(const std::string &strModuleName, const std::string &strKey, int &nValue) { ParamMAP::const_iterator pIter = m_mapParam.find(strModuleName + CN_PARAM_SEPARATOR + strKey); if (pIter != m_mapParam.end()) @@ -83,7 +83,7 @@ int kbd_public::CCommonConfigParse::getIntValue(const std::string &strModuleName return kbdFailed; } -int kbd_public::CCommonConfigParse::getIntWithDefault(const std::string &strModuleName, +int iot_public::CCommonConfigParse::getIntWithDefault(const std::string &strModuleName, const std::string &strKey, const int nDefaultValue) { @@ -96,7 +96,7 @@ int kbd_public::CCommonConfigParse::getIntWithDefault(const std::string &strModu return nValue; } -int kbd_public::CCommonConfigParse::getStringValue(const std::string &strModuleName, const std::string &strKey, std::string &strValue) +int iot_public::CCommonConfigParse::getStringValue(const std::string &strModuleName, const std::string &strKey, std::string &strValue) { ParamMAP::const_iterator pIter = m_mapParam.find(strModuleName + CN_PARAM_SEPARATOR + strKey); if (pIter != m_mapParam.end()) @@ -108,7 +108,7 @@ int kbd_public::CCommonConfigParse::getStringValue(const std::string &strModuleN return kbdFailed; } -std::string kbd_public::CCommonConfigParse::getStringWithDefault(const std::string &strModuleName, +std::string iot_public::CCommonConfigParse::getStringWithDefault(const std::string &strModuleName, const std::string &strKey, const std::string &strDefaultValue) { @@ -121,7 +121,7 @@ std::string kbd_public::CCommonConfigParse::getStringWithDefault(const std::stri return strValue; } -int kbd_public::CCommonConfigParse::getBoolValue(const std::string &strModuleName, const std::string &strKey, bool &bValue) +int iot_public::CCommonConfigParse::getBoolValue(const std::string &strModuleName, const std::string &strKey, bool &bValue) { ParamMAP::const_iterator pIter = m_mapParam.find(strModuleName + CN_PARAM_SEPARATOR + strKey); if (pIter != m_mapParam.end()) @@ -133,7 +133,7 @@ int kbd_public::CCommonConfigParse::getBoolValue(const std::string &strModuleNam return kbdFailed; } -bool kbd_public::CCommonConfigParse::getBoolWithDefault(const std::string &strModuleName, +bool iot_public::CCommonConfigParse::getBoolWithDefault(const std::string &strModuleName, const std::string &strKey, const bool bDefaultValue) { @@ -147,7 +147,7 @@ bool kbd_public::CCommonConfigParse::getBoolWithDefault(const std::string &strMo return bValue; } -int kbd_public::CCommonConfigParse::getFloatValue(const std::string &strModuleName, +int iot_public::CCommonConfigParse::getFloatValue(const std::string &strModuleName, const std::string &strKey, float &fValue) { @@ -161,7 +161,7 @@ int kbd_public::CCommonConfigParse::getFloatValue(const std::string &strModuleNa return kbdFailed; } -float kbd_public::CCommonConfigParse::getFloatWithDefault(const std::string &strModuleName, +float iot_public::CCommonConfigParse::getFloatWithDefault(const std::string &strModuleName, const std::string &strKey, const float fDefaultValue) { @@ -175,7 +175,7 @@ float kbd_public::CCommonConfigParse::getFloatWithDefault(const std::string &str return fValue; } -int kbd_public::CCommonConfigParse::getStringSeqValue(const std::string &strModuleName, +int iot_public::CCommonConfigParse::getStringSeqValue(const std::string &strModuleName, const std::string &strKey, std::vector &vecValue) { diff --git a/platform/src/public/pub_utility_api/DeadlockCheckThread.cpp b/platform/src/public/pub_utility_api/DeadlockCheckThread.cpp index e02a574d..acbfe00f 100644 --- a/platform/src/public/pub_utility_api/DeadlockCheckThread.cpp +++ b/platform/src/public/pub_utility_api/DeadlockCheckThread.cpp @@ -13,7 +13,7 @@ #include "pub_utility_api/DeadlockCheckThread.h" -namespace kbd_public +namespace iot_public { /** @@ -211,4 +211,4 @@ void CDeadlockCheckThread::checkDeadlock() } -} //namespace kbd_public +} //namespace iot_public diff --git a/platform/src/public/pub_utility_api/FileStyle.cpp b/platform/src/public/pub_utility_api/FileStyle.cpp index f5393a03..239107d8 100644 --- a/platform/src/public/pub_utility_api/FileStyle.cpp +++ b/platform/src/public/pub_utility_api/FileStyle.cpp @@ -13,7 +13,7 @@ #include "pub_utility_api/FileStyle.h" -namespace kbd_public +namespace iot_public { std::string CFileStyle::getCurStyle( const std::string &strDefault ) @@ -63,4 +63,4 @@ std::string CFileStyle::getPathOfStyleFile( const std::string &strFileName, cons return ""; } -} //namespace kbd_public +} //namespace iot_public diff --git a/platform/src/public/pub_utility_api/FileUtil.cpp b/platform/src/public/pub_utility_api/FileUtil.cpp index 35230f13..6671bdf4 100644 --- a/platform/src/public/pub_utility_api/FileUtil.cpp +++ b/platform/src/public/pub_utility_api/FileUtil.cpp @@ -29,7 +29,7 @@ #include "pub_utility_api/FileUtil.h" -namespace kbd_public +namespace iot_public { std::string CFileUtil::getCurModuleDir() @@ -369,4 +369,4 @@ std::string CFileUtil::getPathOfResFile( const std::string &strFileName, return ""; } -} //namespace kbd_public +} //namespace iot_public diff --git a/platform/src/public/pub_utility_api/I18N.cpp b/platform/src/public/pub_utility_api/I18N.cpp index 74639098..fab0a90b 100644 --- a/platform/src/public/pub_utility_api/I18N.cpp +++ b/platform/src/public/pub_utility_api/I18N.cpp @@ -13,7 +13,7 @@ #include "pub_utility_api/I18N.h" -namespace kbd_public +namespace iot_public { boost::locale::generator gen; @@ -83,4 +83,4 @@ bool initI18N( const std::string &strRelativePath, const std::string &strFileNam } -} //< namespace kbd_public \ No newline at end of file +} //< namespace iot_public \ No newline at end of file diff --git a/platform/src/public/pub_utility_api/LoadLibrary.cpp b/platform/src/public/pub_utility_api/LoadLibrary.cpp index 86509c2d..c6d1b77f 100644 --- a/platform/src/public/pub_utility_api/LoadLibrary.cpp +++ b/platform/src/public/pub_utility_api/LoadLibrary.cpp @@ -7,18 +7,18 @@ #include "pub_utility_api/LoadLibrary.h" #include "pub_logger_api/logger.h" -using namespace kbd_public; +using namespace iot_public; -kbd_public::CLoadLibrary::CLoadLibrary() :m_hLib(NULL) +iot_public::CLoadLibrary::CLoadLibrary() :m_hLib(NULL) { } -kbd_public::CLoadLibrary::~CLoadLibrary() +iot_public::CLoadLibrary::~CLoadLibrary() { unload(); } -void * kbd_public::CLoadLibrary::findFunction(const std::string &strFuncName) const +void * iot_public::CLoadLibrary::findFunction(const std::string &strFuncName) const { if (NULL == m_hLib || strFuncName.empty()) { @@ -32,7 +32,7 @@ void * kbd_public::CLoadLibrary::findFunction(const std::string &strFuncName) co #endif } -bool kbd_public::CLoadLibrary::load(const std::string &strLibFileName) +bool iot_public::CLoadLibrary::load(const std::string &strLibFileName) { unload(); #ifdef WIN32 @@ -55,7 +55,7 @@ bool kbd_public::CLoadLibrary::load(const std::string &strLibFileName) return (m_hLib != NULL); } -bool kbd_public::CLoadLibrary::unload() +bool iot_public::CLoadLibrary::unload() { if (m_hLib == NULL) { diff --git a/platform/src/public/pub_utility_api/ProcUtil.cpp b/platform/src/public/pub_utility_api/ProcUtil.cpp index 5642443e..3145d3ca 100644 --- a/platform/src/public/pub_utility_api/ProcUtil.cpp +++ b/platform/src/public/pub_utility_api/ProcUtil.cpp @@ -53,7 +53,7 @@ #include "pub_logger_api/logger.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; namespace fs = boost::filesystem; #ifndef WIN32 @@ -96,7 +96,7 @@ int executeCmd( const std::string &strCmd, std::string &strErrMsg ) /* @brief 执行脚本，同步调用 */ -int kbd_public::CProcUtil::execScript( const std::string &strFileFullPath, const std::string &strArgs ) +int iot_public::CProcUtil::execScript( const std::string &strFileFullPath, const std::string &strArgs ) { namespace fs = boost::filesystem; @@ -120,7 +120,7 @@ int kbd_public::CProcUtil::execScript( const std::string &strFileFullPath, const } -bool kbd_public::CProcUtil::isProcRunning( const std::string &strProcName, const std::string &strParam ) +bool iot_public::CProcUtil::isProcRunning( const std::string &strProcName, const std::string &strParam ) { if ( strProcName.empty()) { @@ -137,7 +137,7 @@ bool kbd_public::CProcUtil::isProcRunning( const std::string &strProcName, const #ifdef WIN32 -bool kbd_public::CProcUtil::startProcess(const std::string &strPath, +bool iot_public::CProcUtil::startProcess(const std::string &strPath, const std::string &strName, const std::string &strParam, bool wShowWindow, @@ -205,7 +205,7 @@ bool kbd_public::CProcUtil::startProcess(const std::string &strPath, return false; } -int64 kbd_public::CProcUtil::getProcessId(const std::string &strProcName, const std::string &strParam) +int64 iot_public::CProcUtil::getProcessId(const std::string &strProcName, const std::string &strParam) { std::string strFullProcName = strProcName + CFileUtil::getProcSuffix(); int64 lPid = -1; @@ -402,7 +402,7 @@ int64 kbd_public::CProcUtil::getProcessId(const std::string &strProcName, const #else -bool kbd_public::CProcUtil::startProcess( const std::string &strPath, +bool iot_public::CProcUtil::startProcess( const std::string &strPath, const std::string &strName, const std::string &strParam, bool /*wShowWindow*/, @@ -447,7 +447,7 @@ bool kbd_public::CProcUtil::startProcess( const std::string &strPath, } -int64 kbd_public::CProcUtil::getProcessId( const std::string &strProcName, const std::string &strParam ) +int64 iot_public::CProcUtil::getProcessId( const std::string &strProcName, const std::string &strParam ) { enum { diff --git a/platform/src/public/pub_utility_api/SingleProcInstance.cpp b/platform/src/public/pub_utility_api/SingleProcInstance.cpp index c64d4b71..79279902 100644 --- a/platform/src/public/pub_utility_api/SingleProcInstance.cpp +++ b/platform/src/public/pub_utility_api/SingleProcInstance.cpp @@ -94,17 +94,17 @@ private: static CGlobalCriticalSection g_objGlobalMutex_; -kbd_public::CSingleProcInstance::CSingleProcInstance() +iot_public::CSingleProcInstance::CSingleProcInstance() { } -kbd_public::CSingleProcInstance::~CSingleProcInstance() +iot_public::CSingleProcInstance::~CSingleProcInstance() { g_objGlobalMutex_.close(); } -bool kbd_public::CSingleProcInstance::hasInstanceRunning(const string& strUniqueName, const bool bCaseSensitive /*= false*/) +bool iot_public::CSingleProcInstance::hasInstanceRunning(const string& strUniqueName, const bool bCaseSensitive /*= false*/) { string strName = strUniqueName; if (!bCaseSensitive) @@ -126,17 +126,17 @@ bool kbd_public::CSingleProcInstance::hasInstanceRunning(const string& strUnique #else -kbd_public::CSingleProcInstance::CSingleProcInstance() +iot_public::CSingleProcInstance::CSingleProcInstance() { } -kbd_public::CSingleProcInstance::~CSingleProcInstance() +iot_public::CSingleProcInstance::~CSingleProcInstance() { } -bool kbd_public::CSingleProcInstance::hasInstanceRunning(const string& strUniqueName, const bool bCaseSensitive /*= false*/) +bool iot_public::CSingleProcInstance::hasInstanceRunning(const string& strUniqueName, const bool bCaseSensitive /*= false*/) { string strName = strUniqueName; if (!bCaseSensitive) diff --git a/platform/src/public/pub_utility_api/TimerThreadBase.cpp b/platform/src/public/pub_utility_api/TimerThreadBase.cpp index 3adbf694..84e68266 100644 --- a/platform/src/public/pub_utility_api/TimerThreadBase.cpp +++ b/platform/src/public/pub_utility_api/TimerThreadBase.cpp @@ -13,9 +13,9 @@ #include #endif -using namespace kbd_public; +using namespace iot_public; -kbd_public::CTimerThreadBase::CTimerThreadBase(const std::string &strThreadDesc, +iot_public::CTimerThreadBase::CTimerThreadBase(const std::string &strThreadDesc, int nRunPeriodMsec /*= CN_RunPeriodMsec*/, int nDeadlockTimeoutMsec /*= CN_DeadlockTimeoutMsec*/, bool bSuspend /*= true*/) @@ -35,7 +35,7 @@ kbd_public::CTimerThreadBase::CTimerThreadBase(const std::string &strThreadDesc, } -kbd_public::CTimerThreadBase::~CTimerThreadBase() +iot_public::CTimerThreadBase::~CTimerThreadBase() { if (!m_bIsExit) //< 防止使用者未调用quit { @@ -43,12 +43,12 @@ kbd_public::CTimerThreadBase::~CTimerThreadBase() } } -int kbd_public::CTimerThreadBase::beforeExecute() +int iot_public::CTimerThreadBase::beforeExecute() { return kbdSuccess; } -void kbd_public::CTimerThreadBase::suspend() +void iot_public::CTimerThreadBase::suspend() { LOGINFO("suspend [%s]", m_strThreadDesc.c_str()); @@ -77,12 +77,12 @@ void kbd_public::CTimerThreadBase::suspend() } -void kbd_public::CTimerThreadBase::afterSuspend() +void iot_public::CTimerThreadBase::afterSuspend() { } -void kbd_public::CTimerThreadBase::resume() +void iot_public::CTimerThreadBase::resume() { LOGINFO("resume [%s]", m_strThreadDesc.c_str()); @@ -111,12 +111,12 @@ void kbd_public::CTimerThreadBase::resume() } -void kbd_public::CTimerThreadBase::afterResume() +void iot_public::CTimerThreadBase::afterResume() { } -void kbd_public::CTimerThreadBase::notify() +void iot_public::CTimerThreadBase::notify() { //LOGINFO("notify [%s]", m_strThreadDesc.c_str()); //< 部分应用会频繁使用此函数，故将此日志暂时屏蔽 m_bIsNotify = true; @@ -124,18 +124,18 @@ void kbd_public::CTimerThreadBase::notify() } -void kbd_public::CTimerThreadBase::afterNotify() +void iot_public::CTimerThreadBase::afterNotify() { } -void kbd_public::CTimerThreadBase::beforeQuit() +void iot_public::CTimerThreadBase::beforeQuit() { } -void kbd_public::CTimerThreadBase::quit() +void iot_public::CTimerThreadBase::quit() { LOGINFO("sync notify thread quit [%s]", m_strThreadDesc.c_str()); m_bIsExit = true; @@ -159,19 +159,19 @@ void kbd_public::CTimerThreadBase::quit() } -void kbd_public::CTimerThreadBase::toQuit() +void iot_public::CTimerThreadBase::toQuit() { LOGINFO("async notify thread quit [%s]", m_strThreadDesc.c_str()); m_bIsExit = true; } -bool kbd_public::CTimerThreadBase::isRunning() const +bool iot_public::CTimerThreadBase::isRunning() const { //return m_ptrThread->joinable(); return m_bRunning; } -void kbd_public::CTimerThreadBase::run() +void iot_public::CTimerThreadBase::run() { #ifdef OS_LINUX prctl(PR_SET_NAME, m_strThreadDesc.c_str(), 0, 0, 0); diff --git a/platform/src/public/pub_utility_api/test/test_file_util/main.cpp b/platform/src/public/pub_utility_api/test/test_file_util/main.cpp index 5ea3474d..7127ae77 100644 --- a/platform/src/public/pub_utility_api/test/test_file_util/main.cpp +++ b/platform/src/public/pub_utility_api/test/test_file_util/main.cpp @@ -18,7 +18,7 @@ int main(/*int argc, char *argv[]*/) { std::cout << "\n------------------------- getCurModuleDir() -----------------------------" << std::endl; - const std::string strPath = std::move( kbd_public::CFileUtil::getCurModuleDir()); + const std::string strPath = std::move( iot_public::CFileUtil::getCurModuleDir()); std::cout << "getCurModuleDir():\n" << strPath << std::endl; std::cout << "\n------------- boost::filesystem::path::parent_path() -------------------" << std::endl; @@ -29,24 +29,24 @@ int main(/*int argc, char *argv[]*/) std::cout << "\n------------------------- getSimplePath() -----------------------------" << std::endl; objPath /= ".././../././test/."; std::cout << "objPath.string():\n" << objPath.string() << std::endl; - std::cout << "getSimplePath():\n" << kbd_public::CFileUtil::getSimplePath( objPath.string()) << std::endl; + std::cout << "getSimplePath():\n" << iot_public::CFileUtil::getSimplePath( objPath.string()) << std::endl; std::cout << "\n------------------------- getPathOfBinDir() -----------------------------" << std::endl; std::cout << "getPathOfBinDir( CN_DIR_PRODUCT ):" << std::endl; - std::cout << kbd_public::CFileUtil::getPathOfBinDir( CN_DIR_PRODUCT ) << std::endl; + std::cout << iot_public::CFileUtil::getPathOfBinDir( CN_DIR_PRODUCT ) << std::endl; std::cout << "\n------------------------- getPathOfBinFile() -----------------------------" << std::endl; std::string strParentPath; std::cout << "getPathOfBinFile( \"alarm_server\", &strParentPath ):" << std::endl; - std::cout << kbd_public::CFileUtil::getPathOfBinFile( "alarm_server", &strParentPath ) << std::endl; + std::cout << iot_public::CFileUtil::getPathOfBinFile( "alarm_server", &strParentPath ) << std::endl; std::cout << strParentPath << std::endl; std::cout << "getPathOfBinFile( \"apc_if_srv\", &strParentPath ):" << std::endl; - std::cout << kbd_public::CFileUtil::getPathOfBinFile( "apc_if_srv", &strParentPath ) << std::endl; + std::cout << iot_public::CFileUtil::getPathOfBinFile( "apc_if_srv", &strParentPath ) << std::endl; std::cout << strParentPath << std::endl; std::cout << "getPathOfBinFile( \"fbd/svr_plugins\", &strParentPath ):" << std::endl; - std::cout << kbd_public::CFileUtil::getPathOfBinFile( "fbd/svr_plugins", &strParentPath ) << std::endl; + std::cout << iot_public::CFileUtil::getPathOfBinFile( "fbd/svr_plugins", &strParentPath ) << std::endl; std::cout << strParentPath << std::endl; return 0; diff --git a/platform/src/service/alarm_resource/CAlarmResource.cpp b/platform/src/service/alarm_resource/CAlarmResource.cpp index d626149e..66b7db1a 100644 --- a/platform/src/service/alarm_resource/CAlarmResource.cpp +++ b/platform/src/service/alarm_resource/CAlarmResource.cpp @@ -4,17 +4,17 @@ #include "net_msg_bus_api/MsgBusApi.h" using namespace std; -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_service; +using namespace iot_net; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_service; #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" const std::string g_sProcessName = "alarm_resource"; //< 当前进程名 -kbd_service::CAlarmResource::CAlarmResource(): +iot_service::CAlarmResource::CAlarmResource(): m_sAppName("BASE"), m_sStartArgs(""), m_pSysInfo(nullptr), @@ -24,12 +24,12 @@ kbd_service::CAlarmResource::CAlarmResource(): { } -kbd_service::CAlarmResource::~CAlarmResource() +iot_service::CAlarmResource::~CAlarmResource() { //stop(); } -bool kbd_service::CAlarmResource::start(int argc, char *argv[], int &/*nStatus*/) +bool iot_service::CAlarmResource::start(int argc, char *argv[], int &/*nStatus*/) { //1.解析启动参数 if (!parseCmdLine(argc, argv)) @@ -104,7 +104,7 @@ bool kbd_service::CAlarmResource::start(int argc, char *argv[], int &/*nStatus*/ return true; } -bool kbd_service::CAlarmResource::stop() +bool iot_service::CAlarmResource::stop() { //10.更新当前进程冗余状态 if (m_pProcMng != nullptr) @@ -143,7 +143,7 @@ bool kbd_service::CAlarmResource::stop() return true; } -int kbd_service::CAlarmResource::toQuit() +int iot_service::CAlarmResource::toQuit() { if (m_pProcMng != nullptr) { @@ -154,7 +154,7 @@ int kbd_service::CAlarmResource::toQuit() return kbdSuccess; } -bool kbd_service::CAlarmResource::parseCmdLine(int argc, char *argv[]) +bool iot_service::CAlarmResource::parseCmdLine(int argc, char *argv[]) { /* @brief 拼接启动参数，用于向进程管理注册 */ for ( int i = 1; i < argc; ++i ) @@ -201,26 +201,26 @@ bool kbd_service::CAlarmResource::parseCmdLine(int argc, char *argv[]) return true; } -void kbd_service::CAlarmResource::showHelp(const boost::program_options::options_description &objDesc) +void iot_service::CAlarmResource::showHelp(const boost::program_options::options_description &objDesc) { std::cout << g_sProcessName << " [-h] | [-a app]" << std::endl; std::cout << objDesc << std::endl; } -bool kbd_service::CAlarmResource::isAlreadyRunning() +bool iot_service::CAlarmResource::isAlreadyRunning() { string strUniqueName = g_sProcessName; strUniqueName += m_sStartArgs; return CSingleProcInstance::hasInstanceRunning(strUniqueName); } -bool kbd_service::CAlarmResource::initLog() +bool iot_service::CAlarmResource::initLog() { StartLogSystem(m_sAppName.c_str(), g_sProcessName.c_str()); return true; } -bool kbd_service::CAlarmResource::getSystemInfo() +bool iot_service::CAlarmResource::getSystemInfo() { if (!createSysInfoInstance(m_pSysInfo)) { @@ -237,13 +237,13 @@ bool kbd_service::CAlarmResource::getSystemInfo() return true; } -bool kbd_service::CAlarmResource::initMessageBus() +bool iot_service::CAlarmResource::initMessageBus() { return initMsgBus( g_sProcessName.c_str(), (g_sProcessName+" -a BASE").c_str() /*bool bAddPid = true*/ ); //消息总线初始化 } /* @brief 向进程管理注册 */ -bool kbd_service::CAlarmResource::registToProcMng() +bool iot_service::CAlarmResource::registToProcMng() { SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stRunAppInfo.nDomainId; @@ -268,7 +268,7 @@ bool kbd_service::CAlarmResource::registToProcMng() return true; } -bool kbd_service::CAlarmResource::initialize() +bool iot_service::CAlarmResource::initialize() { /* @brief 创建服务管理类 */ m_pAlarmResourceRedundantSwitchMng = boost::make_shared(m_stRunAppInfo, m_pProcMng); @@ -288,7 +288,7 @@ bool kbd_service::CAlarmResource::initialize() } /* @brief 清理业务资源 */ -bool kbd_service::CAlarmResource::clean() +bool iot_service::CAlarmResource::clean() { if ( m_pAlarmResourceRedundantSwitchMng != nullptr ) m_pAlarmResourceRedundantSwitchMng.reset(); diff --git a/platform/src/service/alarm_resource/CAlarmResource.h b/platform/src/service/alarm_resource/CAlarmResource.h index dbca8705..f16cc9b9 100644 --- a/platform/src/service/alarm_resource/CAlarmResource.h +++ b/platform/src/service/alarm_resource/CAlarmResource.h @@ -5,11 +5,11 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "CAlarmResourceRedundantSwitch.h" -namespace kbd_service +namespace iot_service { -class CAlarmResource : public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface +class CAlarmResource : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CAlarmResource(); @@ -94,12 +94,12 @@ private: private: std::string m_sAppName; //< 应用名 std::string m_sStartArgs; //< 保存进程启动参数 - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_public::CSysInfoInterfacePtr m_pSysInfo; //< 系统信息访问库智能指针 - kbd_sys::CProcMngInterfacePtr m_pProcMng; //< 进程管理访问库智能指针 - kbd_sys::CRedundantMngInterfacePtr m_pRedundancyMng; //< 冗余管理类 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_public::CSysInfoInterfacePtr m_pSysInfo; //< 系统信息访问库智能指针 + iot_sys::CProcMngInterfacePtr m_pProcMng; //< 进程管理访问库智能指针 + iot_sys::CRedundantMngInterfacePtr m_pRedundancyMng; //< 冗余管理类 CAlarmResourceRedundantSwitchPtr m_pAlarmResourceRedundantSwitchMng; //< 服务管理类 }; -} //namespace kbd_service +} //namespace iot_service diff --git a/platform/src/service/alarm_resource/CAlarmResourceRedundantSwitch.cpp b/platform/src/service/alarm_resource/CAlarmResourceRedundantSwitch.cpp index a96df5a2..25248faf 100644 --- a/platform/src/service/alarm_resource/CAlarmResourceRedundantSwitch.cpp +++ b/platform/src/service/alarm_resource/CAlarmResourceRedundantSwitch.cpp @@ -1,15 +1,15 @@ #include "CAlarmResourceRedundantSwitch.h" #include "pub_logger_api/logger.h" -kbd_service::CAlarmResourceRedundantSwitch::CAlarmResourceRedundantSwitch(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng) +iot_service::CAlarmResourceRedundantSwitch::CAlarmResourceRedundantSwitch(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), m_pProcMng(ptrProcMng), m_ptrAlarmResourceThread(nullptr) { } -kbd_service::CAlarmResourceRedundantSwitch::~CAlarmResourceRedundantSwitch() +iot_service::CAlarmResourceRedundantSwitch::~CAlarmResourceRedundantSwitch() { if (m_ptrAlarmResourceThread != nullptr) { @@ -22,7 +22,7 @@ kbd_service::CAlarmResourceRedundantSwitch::~CAlarmResourceRedundantSwitch() } /* @brief 冗余切换 */ -int kbd_service::CAlarmResourceRedundantSwitch::redundantSwitch(bool bMaster, bool bSlave) +int iot_service::CAlarmResourceRedundantSwitch::redundantSwitch(bool bMaster, bool bSlave) { LOGWARN("接收到冗余切换指令.Master=[%d],Slave=[%d]，但本程序不切换", bMaster, bSlave); @@ -32,7 +32,7 @@ int kbd_service::CAlarmResourceRedundantSwitch::redundantSwitch(bool bMaster, bo } /* @brief 初始化 */ -int kbd_service::CAlarmResourceRedundantSwitch::initialize() +int iot_service::CAlarmResourceRedundantSwitch::initialize() { m_ptrAlarmResourceThread = boost::make_shared(m_stRunAppInfo); if (m_ptrAlarmResourceThread == nullptr) diff --git a/platform/src/service/alarm_resource/CAlarmResourceRedundantSwitch.h b/platform/src/service/alarm_resource/CAlarmResourceRedundantSwitch.h index 801353d5..8d05d516 100644 --- a/platform/src/service/alarm_resource/CAlarmResourceRedundantSwitch.h +++ b/platform/src/service/alarm_resource/CAlarmResourceRedundantSwitch.h @@ -4,15 +4,15 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "CAlarmResourceThread.h" -namespace kbd_service +namespace iot_service { -class CAlarmResourceRedundantSwitch : public kbd_sys::CRedundantSwitchInterface +class CAlarmResourceRedundantSwitch : public iot_sys::CRedundantSwitchInterface { public: - CAlarmResourceRedundantSwitch(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng); + CAlarmResourceRedundantSwitch(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng); virtual ~CAlarmResourceRedundantSwitch(); /** @@ -30,8 +30,8 @@ public: int initialize(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_sys::CProcMngInterfacePtr m_pProcMng; //< 进程管理访问库智能指针 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_sys::CProcMngInterfacePtr m_pProcMng; //< 进程管理访问库智能指针 CAlarmResourceThreadPtr m_ptrAlarmResourceThread; //< 定时更新表线程 }; typedef boost::shared_ptr CAlarmResourceRedundantSwitchPtr; diff --git a/platform/src/service/alarm_resource/CAlarmResourceThread.cpp b/platform/src/service/alarm_resource/CAlarmResourceThread.cpp index fd4d2238..6fcc82db 100644 --- a/platform/src/service/alarm_resource/CAlarmResourceThread.cpp +++ b/platform/src/service/alarm_resource/CAlarmResourceThread.cpp @@ -8,9 +8,9 @@ #include "pub_utility_api/CommonConfigParse.h" using namespace std; -using namespace kbd_service; -using namespace kbd_idlfile; -using namespace kbd_public; +using namespace iot_service; +using namespace iot_idl; +using namespace iot_public; struct SProcInfo { @@ -44,8 +44,8 @@ std::string doubleToString(const double &fVal) return sStr; } -CAlarmResourceThread::CAlarmResourceThread(const kbd_public::SRunAppInfo &stRunAppInfo): - kbd_public::CTimerThreadBase("CAlarmResourceThread", 10000), +CAlarmResourceThread::CAlarmResourceThread(const iot_public::SRunAppInfo &stRunAppInfo): + iot_public::CTimerThreadBase("CAlarmResourceThread", 10000), m_stRunAppInfo(stRunAppInfo) { m_pAlarmApi = nullptr; diff --git a/platform/src/service/alarm_resource/CAlarmResourceThread.h b/platform/src/service/alarm_resource/CAlarmResourceThread.h index dd187a96..e287062b 100644 --- a/platform/src/service/alarm_resource/CAlarmResourceThread.h +++ b/platform/src/service/alarm_resource/CAlarmResourceThread.h @@ -11,14 +11,14 @@ #include "sigar.h" #include "sigar_format.h" -namespace kbd_service +namespace iot_service { -class CAlarmResourceThread : public kbd_public::CTimerThreadBase +class CAlarmResourceThread : public iot_public::CTimerThreadBase { public: - CAlarmResourceThread(const kbd_public::SRunAppInfo &stRunAppInfo); + CAlarmResourceThread(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~CAlarmResourceThread(); public: @@ -41,7 +41,7 @@ public: /** * @brief sendAlarm 发送告警 */ - bool sendAlarm( kbd_service::enAlarmStatus eStatus, kbd_idlfile::enAlmStyle eStyle, std::string sKeyIdTag, std::string sDesc ); + bool sendAlarm( iot_service::enAlarmStatus eStatus, iot_idl::enAlmStyle eStyle, std::string sKeyIdTag, std::string sDesc ); /** * @brief saveComputerInfoToLog 将cpu、内存、硬盘的基本信息输出到日志 @@ -74,8 +74,8 @@ public: void checkDisk(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; // 本应用相关运行参数 - kbd_public::CSysInfoInterfacePtr m_objSysInfo; // 系统信息接口 + iot_public::SRunAppInfo m_stRunAppInfo; // 本应用相关运行参数 + iot_public::CSysInfoInterfacePtr m_objSysInfo; // 系统信息接口 CAlmApiForApp* m_pAlarmApi; // 告警服务接口 int m_nCpuHighPercent; // 判断cpu占用率高的百分比，参数，外部输入 int m_nMemHighPercent; // 判断内存占用率高的百分比，参数，外部输入 diff --git a/platform/src/service/alarm_resource/main.cpp b/platform/src/service/alarm_resource/main.cpp index 01049921..67ccafe1 100644 --- a/platform/src/service/alarm_resource/main.cpp +++ b/platform/src/service/alarm_resource/main.cpp @@ -7,6 +7,6 @@ int main(int argc, char *argv[]) { - kbd_service::CAlarmResource objApp; + iot_service::CAlarmResource objApp; return objApp.main(argc, argv); } diff --git a/platform/src/service/alarm_server/AlmSrvCommon.cpp b/platform/src/service/alarm_server/AlmSrvCommon.cpp index eb5de98c..1c7e89ce 100644 --- a/platform/src/service/alarm_server/AlmSrvCommon.cpp +++ b/platform/src/service/alarm_server/AlmSrvCommon.cpp @@ -16,7 +16,7 @@ #include "CAlarmServer.h" #include "AlmSrvCommon.h" -namespace kbd_service +namespace iot_service { //< 是否输出详细日志 @@ -99,7 +99,7 @@ bool SCfmInfo::isValid() const * @brief struct SAlmMsg 告警消息缓存结构 **********************************************************************************/ SAlmMsg::SAlmMsg() - : m_nSendSeqNo( -1 ), m_enMsgType( kbd_idlfile::MT_ALM_AP2AS_ADD ) + : m_nSendSeqNo( -1 ), m_enMsgType( iot_idl::MT_ALM_AP2AS_ADD ) { } @@ -109,9 +109,9 @@ bool SAlmMsg::isValid() const //< 比 if 效率高 switch (m_enMsgType) { - case kbd_idlfile::MT_ALM_AS2AC_ADD: + case iot_idl::MT_ALM_AS2AC_ADD: break; - case kbd_idlfile::MT_ALM_AS2AC_CFM: + case iot_idl::MT_ALM_AS2AC_CFM: { if ( nullptr == m_ptrCfmInfo) { @@ -126,10 +126,10 @@ bool SAlmMsg::isValid() const } } break; - case kbd_idlfile::MT_ALM_AS2AC_DEL: - case kbd_idlfile::MT_ALM_AS2AC_RELEASE: + case iot_idl::MT_ALM_AS2AC_DEL: + case iot_idl::MT_ALM_AS2AC_RELEASE: break; - case kbd_idlfile::MT_ALM_AS2AC_WAVE: + case iot_idl::MT_ALM_AS2AC_WAVE: { if( nullptr == m_ptrWaveFile) { @@ -156,7 +156,7 @@ bool SAlmMsg::isValid() const return true; } -bool SAlmMsg::serializeToMbMsg(kbd_net::CMbMessage &objMbMsgOutput) const +bool SAlmMsg::serializeToMbMsg(iot_net::CMbMessage &objMbMsgOutput) const { if (!isValid()) { @@ -169,9 +169,9 @@ bool SAlmMsg::serializeToMbMsg(kbd_net::CMbMessage &objMbMsgOutput) const switch (m_enMsgType) { - case kbd_idlfile::MT_ALM_AS2AC_ADD: + case iot_idl::MT_ALM_AS2AC_ADD: { - kbd_idlfile::SAlmCltAddAlm objAddAlm; + iot_idl::SAlmCltAddAlm objAddAlm; BOOST_AUTO(pAlmInfoField, objAddAlm.mutable_alm_info()); pAlmInfoField->Reserve(nReserve); @@ -180,7 +180,7 @@ bool SAlmMsg::serializeToMbMsg(kbd_net::CMbMessage &objMbMsgOutput) const { //< pAlmInfoField 获得所有权 //< 注意，objAddAlm 析构前必须释放所有权 - pAlmInfoField->AddAllocated(const_cast + pAlmInfoField->AddAllocated(const_cast (m_vecAlmInfoPtr[i].get())); } @@ -199,9 +199,9 @@ bool SAlmMsg::serializeToMbMsg(kbd_net::CMbMessage &objMbMsgOutput) const } } break; - case kbd_idlfile::MT_ALM_AS2AC_CFM: + case iot_idl::MT_ALM_AS2AC_CFM: { - kbd_idlfile::SAlmCltCfmAlm objCfmAlm; + iot_idl::SAlmCltCfmAlm objCfmAlm; objCfmAlm.set_node_name(m_ptrCfmInfo->m_strNodeName); objCfmAlm.set_user_id(m_ptrCfmInfo->m_nUserID); objCfmAlm.set_confirm_time(m_ptrCfmInfo->m_nCfmTime); @@ -228,12 +228,12 @@ bool SAlmMsg::serializeToMbMsg(kbd_net::CMbMessage &objMbMsgOutput) const LOGERROR("SAlmMsg::serializeToMbMsg(): SAlmCltCfmAlm序列化失败！"); return false; } - objMbMsgOutput.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMbMsgOutput.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; } break; - case kbd_idlfile::MT_ALM_AS2AC_DEL: + case iot_idl::MT_ALM_AS2AC_DEL: { - kbd_idlfile::SAlmCltDelAlm objDelAlm; + iot_idl::SAlmCltDelAlm objDelAlm; //< isValid()已判断m_vecAlmInfoPtr不为空 objDelAlm.set_domain_id(m_vecAlmInfoPtr[0]->domain_id()); @@ -250,12 +250,12 @@ bool SAlmMsg::serializeToMbMsg(kbd_net::CMbMessage &objMbMsgOutput) const LOGERROR("SAlmMsg::serializeToMbMsg(): SAlmCltDelAlm序列化失败！"); return false; } - objMbMsgOutput.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMbMsgOutput.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; } break; - case kbd_idlfile::MT_ALM_AS2AC_RELEASE: + case iot_idl::MT_ALM_AS2AC_RELEASE: { - kbd_idlfile::SAlmCltReleaseAlm objRelease; + iot_idl::SAlmCltReleaseAlm objRelease; objRelease.mutable_uuid_base64()->Reserve(nReserve); @@ -269,12 +269,12 @@ bool SAlmMsg::serializeToMbMsg(kbd_net::CMbMessage &objMbMsgOutput) const LOGERROR("SAlmMsg::serializeToMbMsg(): SAlmCltReleaseAlm序列化失败！"); return false; } - objMbMsgOutput.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMbMsgOutput.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; } break; - case kbd_idlfile::MT_ALM_AS2AC_WAVE: + case iot_idl::MT_ALM_AS2AC_WAVE: { - kbd_idlfile::SAlmCltLinkWave2Alm objWave; + iot_idl::SAlmCltLinkWave2Alm objWave; objWave.set_wave_file(*m_ptrWaveFile); objWave.mutable_uuid_base64()->Reserve(nReserve); @@ -288,7 +288,7 @@ bool SAlmMsg::serializeToMbMsg(kbd_net::CMbMessage &objMbMsgOutput) const LOGERROR("SAlmMsg::serializeToMbMsg(): SAlmCltLinkWave2Alm序列化失败！"); return false; } - objMbMsgOutput.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMbMsgOutput.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; } break; default: @@ -308,4 +308,4 @@ bool SAlmMsg::serializeToMbMsg(kbd_net::CMbMessage &objMbMsgOutput) const return true; } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/AlmSrvCommon.h b/platform/src/service/alarm_server/AlmSrvCommon.h index e106fc8a..0df1bbac 100644 --- a/platform/src/service/alarm_server/AlmSrvCommon.h +++ b/platform/src/service/alarm_server/AlmSrvCommon.h @@ -46,16 +46,16 @@ #pragma warning(pop) #endif -typedef boost::shared_ptr SAlmInfoPtr; +typedef boost::shared_ptr SAlmInfoPtr; typedef std::vector SAlmInfoPtrVec; typedef std::queue SAlmInfoPtrQue; -typedef boost::shared_ptr ConstSAlmInfoPtr; +typedef boost::shared_ptr ConstSAlmInfoPtr; typedef std::vector ConstSAlmInfoPtrVec; typedef boost::shared_ptr ConstSAlmInfoPtrVecPtr; -namespace kbd_service +namespace iot_service { //< 是否输出详细日志 @@ -237,13 +237,13 @@ public: bool isValid() const; //< 输出为消息总线消息 - bool serializeToMbMsg(kbd_net::CMbMessage &objMbMsgOutput) const; + bool serializeToMbMsg(iot_net::CMbMessage &objMbMsgOutput) const; //< 发送序号 int m_nSendSeqNo; //< 消息类型，添加、确认、删除 - kbd_idlfile::enAlmMsgType m_enMsgType; + iot_idl::enAlmMsgType m_enMsgType; //< 本消息包含的告警信息 ConstSAlmInfoPtrVec m_vecAlmInfoPtr; @@ -286,4 +286,4 @@ typedef boost::multi_index_container > > SAlmMsgPtrContainer; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/CAlarmServer.cpp b/platform/src/service/alarm_server/CAlarmServer.cpp index 8f806aef..ec8eaff4 100644 --- a/platform/src/service/alarm_server/CAlarmServer.cpp +++ b/platform/src/service/alarm_server/CAlarmServer.cpp @@ -22,9 +22,9 @@ #include "AlmSrvCommon.h" #include "CAlarmServer.h" -using namespace kbd_public; +using namespace iot_public; -namespace kbd_service +namespace iot_service { static const char *g_pSzProcName = "alarm_server"; @@ -59,7 +59,7 @@ CAlarmServer::~CAlarmServer() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } @@ -87,7 +87,7 @@ bool CAlarmServer::start(int argc, char *argv[], int & /*nStatus*/) } //< 启动日志 - kbd_public::StartLogSystem(CN_AppName_PUBLIC.c_str(), g_pSzProcName); + iot_public::StartLogSystem(CN_AppName_PUBLIC.c_str(), g_pSzProcName); //< 判断是否已启动，强制slave测试时无需判断 if (RM_NO_PROC_MNG_SLAVE != m_enRunModel) @@ -108,7 +108,7 @@ bool CAlarmServer::start(int argc, char *argv[], int & /*nStatus*/) //< 初始化缓存文件路径、文件名 { - const std::string strCurDir = kbd_public::CFileUtil::getCurModuleDir(); + const std::string strCurDir = iot_public::CFileUtil::getCurModuleDir(); if (strCurDir.empty()) { LOGERROR("获取程序所在路径失败，程序启动失败！"); @@ -125,21 +125,21 @@ bool CAlarmServer::start(int argc, char *argv[], int & /*nStatus*/) } //< 消息总线 - if (!kbd_net::initMsgBus(g_pSzProcName, "", true)) + if (!iot_net::initMsgBus(g_pSzProcName, "", true)) { LOGFATAL("初始化消息总线失败，程序启动失败！"); return false; } //< 数据库历史提交API - if (!kbd_dbms::initDbSaveApi(m_nDomainID, CN_AppId_PUBLIC)) + if (!iot_dbms::initDbSaveApi(m_nDomainID, CN_AppId_PUBLIC)) { LOGFATAL("初始化数据库历史提交API失败，程序启动失败！"); return false; } //< 时序库提交API - m_ptrTsdbSaveApi = boost::make_shared( m_nDomainID, CN_AppId_PUBLIC ); + m_ptrTsdbSaveApi = boost::make_shared( m_nDomainID, CN_AppId_PUBLIC ); if (!m_ptrTsdbSaveApi->resumeThread()) { LOGFATAL("初始化时序库提交API失败，程序启动失败！"); @@ -171,14 +171,14 @@ bool CAlarmServer::start(int argc, char *argv[], int & /*nStatus*/) strStartArgs += argv[i]; } - kbd_sys::SProcessInfoKey objProcInfo; + iot_sys::SProcessInfoKey objProcInfo; objProcInfo.nAppId = CN_AppId_PUBLIC; objProcInfo.nDomainId = m_nDomainID; objProcInfo.strNodeName = m_strNodeName; objProcInfo.strProcName = g_pSzProcName; objProcInfo.strProcParam = strStartArgs; - m_ptrProcMng = kbd_sys::getProcMngInstance(objProcInfo); + m_ptrProcMng = iot_sys::getProcMngInstance(objProcInfo); if (!m_ptrProcMng) { LOGFATAL("获取进程管理实例失败！"); @@ -190,7 +190,7 @@ bool CAlarmServer::start(int argc, char *argv[], int & /*nStatus*/) //< 冗余管理 { - m_ptrRedundantMng = kbd_sys::getRedundantMngInstance(m_nDomainID, + m_ptrRedundantMng = iot_sys::getRedundantMngInstance(m_nDomainID, CN_AppId_PUBLIC, m_strNodeName); if (!m_ptrRedundantMng) @@ -277,14 +277,14 @@ bool CAlarmServer::stop() } //< 停止数据库历史提交API - kbd_dbms::releaseDbSaveApi(); + iot_dbms::releaseDbSaveApi(); //< 停止消息总线 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } @@ -332,7 +332,7 @@ const std::string &CAlarmServer::getAlarmBackupFileName() const } -bool CAlarmServer::addTsdbInsertMsg(const kbd_idlfile::STssInsert &objInsert) +bool CAlarmServer::addTsdbInsertMsg(const iot_idl::STssInsert &objInsert) { if (!m_ptrTsdbSaveApi) return false; @@ -343,7 +343,7 @@ bool CAlarmServer::addTsdbInsertMsg(const kbd_idlfile::STssInsert &objInsert) bool CAlarmServer::isAlreadyRunning() { - return kbd_public::CSingleProcInstance::hasInstanceRunning(g_pSzProcName); + return iot_public::CSingleProcInstance::hasInstanceRunning(g_pSzProcName); } bool CAlarmServer::parseCommandLine(int argc, char *argv[]) @@ -418,14 +418,14 @@ bool CAlarmServer::parseCommandLine(int argc, char *argv[]) bool CAlarmServer::loadSysInfo() { - kbd_public::CSysInfoInterfacePtr sysInfoPtr; - if (!kbd_public::createSysInfoInstance(sysInfoPtr)) + iot_public::CSysInfoInterfacePtr sysInfoPtr; + if (!iot_public::createSysInfoInstance(sysInfoPtr)) { LOGERROR("loadSysInfo(): createSysInfoInstance() return false !"); return false; } - kbd_public::SRunAppInfo objRunAppInfo; + iot_public::SRunAppInfo objRunAppInfo; int nRc = sysInfoPtr->getLocalRunAppInfoById(CN_AppId_PUBLIC, objRunAppInfo); if (kbdSuccess != nRc) { @@ -439,5 +439,5 @@ bool CAlarmServer::loadSysInfo() return true; } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/CAlarmServer.h b/platform/src/service/alarm_server/CAlarmServer.h index 0b6e719e..a735b13e 100644 --- a/platform/src/service/alarm_server/CAlarmServer.h +++ b/platform/src/service/alarm_server/CAlarmServer.h @@ -15,12 +15,12 @@ #include "CAlmSrvRedunSw.h" -namespace kbd_service +namespace iot_service { class CAlarmServer final : - public kbd_public::CBaseService, - kbd_sys::CProcessQuitInterface + public iot_public::CBaseService, + iot_sys::CProcessQuitInterface { public: class GC final @@ -59,7 +59,7 @@ public: const std::string &getAlarmBackupFileName() const; //< 向TSDB写入记录 - bool addTsdbInsertMsg(const kbd_idlfile::STssInsert &objInsert); + bool addTsdbInsertMsg(const iot_idl::STssInsert &objInsert); private: CAlarmServer(); //< 单例 @@ -90,10 +90,10 @@ private: std::string m_strAlarmBackupFileName; CAlmSrvRedunSwPtr m_ptrRedunSw; - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; - kbd_dbms::CTsdbSaveApiPtr m_ptrTsdbSaveApi; + iot_sys::CProcMngInterfacePtr m_ptrProcMng; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_dbms::CTsdbSaveApiPtr m_ptrTsdbSaveApi; }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/CAlmDataMng.cpp b/platform/src/service/alarm_server/CAlmDataMng.cpp index 81436ca7..295bfb2a 100644 --- a/platform/src/service/alarm_server/CAlmDataMng.cpp +++ b/platform/src/service/alarm_server/CAlmDataMng.cpp @@ -21,7 +21,7 @@ #include "CAlarmServer.h" #include "CAlmDataMng.h" -namespace kbd_service +namespace iot_service { @@ -51,7 +51,7 @@ CAlmDataMng::CAlmDataMng() m_objDbInsert_Add.set_strtablename(DB_TABLE_NAME_HIS_EVENT); //< 写本域和中心域 - m_objDbInsert_Add.set_ensaveaction(kbd_idlfile::SA_DSS_LOCAL_REMOTE); + m_objDbInsert_Add.set_ensaveaction(iot_idl::SA_DSS_LOCAL_REMOTE); //< 列名 m_objDbInsert_Add.mutable_strcolumnname()->Reserve(14); @@ -76,7 +76,7 @@ CAlmDataMng::CAlmDataMng() m_objTssInsert_Add.set_meas_name(TSDB_MEAS_NAME_HIS_EVENT); //< 写本域和中心域 - m_objTssInsert_Add.set_save_action(kbd_idlfile::enTssSaveAction::SA_TSS_LOCAL_REMOTE); + m_objTssInsert_Add.set_save_action(iot_idl::enTssSaveAction::SA_TSS_LOCAL_REMOTE); //< 标签名 m_objTssInsert_Add.add_tag_name("key_id_tag"); @@ -89,40 +89,40 @@ CAlmDataMng::CAlmDataMng() //< m_objDbUpdateMulti_Cfm 避免后面频繁设置 { //< 需提交本域和中心 - m_objDbUpdateMulti_Cfm.set_ensaveaction(kbd_idlfile::SA_DSS_LOCAL_REMOTE); + m_objDbUpdateMulti_Cfm.set_ensaveaction(iot_idl::SA_DSS_LOCAL_REMOTE); //< 表名 m_objDbUpdateMulti_Cfm.set_strtablename(DB_TABLE_NAME_HIS_EVENT); //< 设置更新值 { - kbd_idlfile::DbUpdateValue *pDbUpdateVal = m_objDbUpdateMulti_Cfm.add_msgupdatevalue(); + iot_idl::DbUpdateValue *pDbUpdateVal = m_objDbUpdateMulti_Cfm.add_msgupdatevalue(); pDbUpdateVal->set_strcolumnname("CONFIRM_TIME"); - pDbUpdateVal->mutable_msgvalue()->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT64); + pDbUpdateVal->mutable_msgvalue()->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT64); pDbUpdateVal->mutable_msgvalue()->set_lvalue(0); //< 后面填写 pDbUpdateVal = m_objDbUpdateMulti_Cfm.add_msgupdatevalue(); pDbUpdateVal->set_strcolumnname("CONFIRM_USER_ID"); - pDbUpdateVal->mutable_msgvalue()->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT32); + pDbUpdateVal->mutable_msgvalue()->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT32); pDbUpdateVal->mutable_msgvalue()->set_nvalue(0); //< 后面填写 pDbUpdateVal = m_objDbUpdateMulti_Cfm.add_msgupdatevalue(); pDbUpdateVal->set_strcolumnname("CONFIRM_NODE_NAME"); - pDbUpdateVal->mutable_msgvalue()->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + pDbUpdateVal->mutable_msgvalue()->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); pDbUpdateVal->mutable_msgvalue()->set_strvalue(""); //< 后面填写 } //< 设置条件头，加时间条件为了命中分区，避免遍历分区 //< 等效于生成 where UUID_BASE64 = 'v1' and TIME_STAMP = t1 or UUID_BASE64 = 'v2' and TIME_STAMP = t2 or ... { - kbd_idlfile::DbConditionHead *pDbCondHead = m_objDbUpdateMulti_Cfm.add_msgconditionhead(); - pDbCondHead->set_enlogic(kbd_idlfile::ENConditionLogic::enumCondAnd); //< 逻辑与 - pDbCondHead->set_enrelation(kbd_idlfile::ENConditionRelation::enumCondEqual); //< 等于 + iot_idl::DbConditionHead *pDbCondHead = m_objDbUpdateMulti_Cfm.add_msgconditionhead(); + pDbCondHead->set_enlogic(iot_idl::ENConditionLogic::enumCondAnd); //< 逻辑与 + pDbCondHead->set_enrelation(iot_idl::ENConditionRelation::enumCondEqual); //< 等于 pDbCondHead->set_strcolumnname("UUID_BASE64"); pDbCondHead = m_objDbUpdateMulti_Cfm.add_msgconditionhead(); - pDbCondHead->set_enlogic(kbd_idlfile::ENConditionLogic::enumCondOr); //< 逻辑或 - pDbCondHead->set_enrelation(kbd_idlfile::ENConditionRelation::enumCondEqual); //< 等于 + pDbCondHead->set_enlogic(iot_idl::ENConditionLogic::enumCondOr); //< 逻辑或 + pDbCondHead->set_enrelation(iot_idl::ENConditionRelation::enumCondEqual); //< 等于 pDbCondHead->set_strcolumnname("TIME_STAMP"); } } @@ -216,7 +216,7 @@ bool CAlmDataMng::loadFromFile() for (int i = 0; i < nAlmInfoSize; i++) { - SAlmInfoPtr ptrAlmInfo = boost::make_shared(m_objAddAlm.alm_info(i)); + SAlmInfoPtr ptrAlmInfo = boost::make_shared(m_objAddAlm.alm_info(i)); if (nDomainID != ptrAlmInfo->domain_id()) { @@ -231,7 +231,7 @@ bool CAlmDataMng::loadFromFile() m_nSeqNo = 0; //< 更新时间 - m_nLastUpdateTime = kbd_public::getMonotonicMsec(); + m_nLastUpdateTime = iot_public::getMonotonicMsec(); m_nLastSaveTime = m_nLastUpdateTime; //< 防止无用回写 LOGINFO("loadFromFile(): 加载完成!"); @@ -241,7 +241,7 @@ bool CAlmDataMng::loadFromFile() bool CAlmDataMng::saveToFile(bool bForce) { - const boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); if (!bForce && (m_nLastSaveTime + 60 * 1000 > nTimeNow)) return false; @@ -254,7 +254,7 @@ bool CAlmDataMng::saveToFile(bool bForce) //< 更新时间，不放在最后，防止错误时过于平凡尝试 m_nLastSaveTime = nTimeNow; - kbd_net::CMbMessage objBuff; + iot_net::CMbMessage objBuff; if (!getFullAlmSyncMsg(objBuff)) { LOGERROR("saveToFile()：getFullAlmSyncMsg()失败！"); @@ -294,7 +294,7 @@ bool CAlmDataMng::saveToFile(bool bForce) return bSuccess; } -bool CAlmDataMng::addAlarm(const kbd_net::CMbMessage &objMbMsgInput) +bool CAlmDataMng::addAlarm(const iot_net::CMbMessage &objMbMsgInput) { //< 反序列化 if (!m_objAddAlm.ParseFromArray(objMbMsgInput.getDataPtr(), (int) objMbMsgInput.getDataSize())) @@ -342,7 +342,7 @@ bool CAlmDataMng::addAlarm(const kbd_net::CMbMessage &objMbMsgInput) return true; } -bool CAlmDataMng::cfmAlarm(const kbd_net::CMbMessage &objMbMsgInput) +bool CAlmDataMng::cfmAlarm(const iot_net::CMbMessage &objMbMsgInput) { if (!m_objCfmAlm.ParseFromArray(objMbMsgInput.getDataPtr(), (int) objMbMsgInput.getDataSize())) { @@ -383,7 +383,7 @@ bool CAlmDataMng::cfmAlarm(const kbd_net::CMbMessage &objMbMsgInput) return true; } -bool CAlmDataMng::delAlarm(const kbd_net::CMbMessage &objMbMsgInput) +bool CAlmDataMng::delAlarm(const iot_net::CMbMessage &objMbMsgInput) { if (!m_objDelAlm.ParseFromArray(objMbMsgInput.getDataPtr(), (int) objMbMsgInput.getDataSize())) { @@ -417,7 +417,7 @@ bool CAlmDataMng::delAlarm(const kbd_net::CMbMessage &objMbMsgInput) return true; } -bool CAlmDataMng::releaseAlarm(const kbd_net::CMbMessage &objMbMsgInput) +bool CAlmDataMng::releaseAlarm(const iot_net::CMbMessage &objMbMsgInput) { if (!m_objReleaseAlm.ParseFromArray(objMbMsgInput.getDataPtr(), (int) objMbMsgInput.getDataSize())) { @@ -442,9 +442,9 @@ bool CAlmDataMng::releaseAlarm(const kbd_net::CMbMessage &objMbMsgInput) return true; } -bool CAlmDataMng::linkWave2Alm(const kbd_net::CMbMessage &objMbMsgInput) +bool CAlmDataMng::linkWave2Alm(const iot_net::CMbMessage &objMbMsgInput) { - kbd_idlfile::SAlmCltLinkWave2Alm objWave; + iot_idl::SAlmCltLinkWave2Alm objWave; if (!objWave.ParseFromArray(objMbMsgInput.getDataPtr(), (int) objMbMsgInput.getDataSize())) { LOGERROR("linkWave2Alm(): SAlmCltLinkWave2Alm 反序列化失败，信息如下：\n%s", @@ -492,53 +492,53 @@ void CAlmDataMng::releaseTempMem() if (m_objAddAlm.mutable_alm_info()->Capacity() > nMaxCap) { - kbd_idlfile::SAlmCltAddAlm objNew; + iot_idl::SAlmCltAddAlm objNew; m_objAddAlm.Swap(&objNew); } if (m_objCfmAlm.mutable_uuid_base64()->Capacity() > nMaxCap) { - kbd_idlfile::SAlmCltCfmAlm objNew; + iot_idl::SAlmCltCfmAlm objNew; m_objCfmAlm.Swap(&objNew); } if (m_objDelAlm.mutable_uuid_base64()->Capacity() > nMaxCap) { - kbd_idlfile::SAlmCltDelAlm objNew; + iot_idl::SAlmCltDelAlm objNew; m_objDelAlm.Swap(&objNew); } if (m_objReleaseAlm.mutable_uuid_base64()->Capacity() > nMaxCap) { - kbd_idlfile::SAlmCltReleaseAlm objNew; + iot_idl::SAlmCltReleaseAlm objNew; m_objReleaseAlm.Swap(&objNew); } if (m_objDbInsert_Add.mutable_msgrecord()->Capacity() > nMaxCap) { //< 注意，不能整个清空 - google::protobuf::RepeatedPtrField objNew; + google::protobuf::RepeatedPtrField objNew; m_objDbInsert_Add.mutable_msgrecord()->Swap(&objNew); } if (m_objTssInsert_Add.mutable_point()->Capacity() > nMaxCap) { //< 注意，不能整个清空 - google::protobuf::RepeatedPtrField<::kbd_idlfile::STsdbPoint> objNew; + google::protobuf::RepeatedPtrField<::iot_idl::STsdbPoint> objNew; m_objTssInsert_Add.mutable_point()->Swap(&objNew); } if (m_objDbUpdateMulti_Cfm.mutable_msgconditionvalue()->Capacity() > nMaxCap) { //< 注意，不能整个清空 - google::protobuf::RepeatedPtrField<::kbd_idlfile::DbValueArray> objNew; + google::protobuf::RepeatedPtrField<::iot_idl::DbValueArray> objNew; m_objDbUpdateMulti_Cfm.mutable_msgconditionvalue()->Swap(&objNew); } } void CAlmDataMng::saveDb_Add(const SAlmMsg &objAlmMsgAdd) { - if (kbd_idlfile::MT_ALM_AS2AC_ADD != objAlmMsgAdd.m_enMsgType) + if (iot_idl::MT_ALM_AS2AC_ADD != objAlmMsgAdd.m_enMsgType) { LOGERROR("saveDb_Add(): 传入错误的消息类型，检查程序！"); return; @@ -560,11 +560,11 @@ void CAlmDataMng::saveDb_Add(const SAlmMsg &objAlmMsgAdd) for (size_t i = 0; i < nAlmSize; ++i) { - const kbd_idlfile::SAlmInfoToAlmClt &objAlmInfo = *(objAlmMsgAdd.m_vecAlmInfoPtr[i]); + const iot_idl::SAlmInfoToAlmClt &objAlmInfo = *(objAlmMsgAdd.m_vecAlmInfoPtr[i]); //< 关系库 { - kbd_idlfile::DbValueArray *pDbRcd_temp = m_objDbInsert_Add.add_msgrecord(); + iot_idl::DbValueArray *pDbRcd_temp = m_objDbInsert_Add.add_msgrecord(); //< 填充pDbRcd_temp的插入内容 { @@ -574,43 +574,43 @@ void CAlmDataMng::saveDb_Add(const SAlmMsg &objAlmMsgAdd) //< 顺序与列名保持一致 //< UUID_BASE64 - kbd_idlfile::SVariable *pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + iot_idl::SVariable *pColValue = pDbRcd_temp->add_msgvalue(); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); pColValue->set_strvalue(objAlmInfo.uuid_base64()); //< ALM_TYPE pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT32); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT32); pColValue->set_nvalue(objAlmInfo.alm_type()); //< ALM_STATUS pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT32); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT32); pColValue->set_nvalue(objAlmInfo.alm_status()); //< TIME_STAMP pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT64); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT64); pColValue->set_lvalue(objAlmInfo.time_stamp()); //< LOCATION_ID pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT32); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT32); pColValue->set_nvalue(objAlmInfo.location_id()); //< CONTENT pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); pColValue->set_strvalue(objAlmInfo.content()); //< PRIORITY pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT32); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT32); pColValue->set_nvalue(objAlmInfo.priority()); //< SUB_SYSTEM pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT32); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT32); if (objAlmInfo.has_sub_system()) { pColValue->set_nvalue(objAlmInfo.sub_system()); @@ -618,7 +618,7 @@ void CAlmDataMng::saveDb_Add(const SAlmMsg &objAlmMsgAdd) //< DEV_TYPE pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT32); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT32); if (objAlmInfo.has_dev_type()) { pColValue->set_nvalue(objAlmInfo.dev_type()); @@ -626,7 +626,7 @@ void CAlmDataMng::saveDb_Add(const SAlmMsg &objAlmMsgAdd) //< REGION_ID pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT32); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT32); if (objAlmInfo.has_region_id()) { pColValue->set_nvalue(objAlmInfo.region_id()); @@ -634,7 +634,7 @@ void CAlmDataMng::saveDb_Add(const SAlmMsg &objAlmMsgAdd) //< DEV_GROUP_TAG pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); if (objAlmInfo.has_dev_group_tag()) { pColValue->set_strvalue(objAlmInfo.dev_group_tag()); @@ -642,7 +642,7 @@ void CAlmDataMng::saveDb_Add(const SAlmMsg &objAlmMsgAdd) //< KEY_ID_TAG pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); if (objAlmInfo.has_key_id_tag()) { pColValue->set_strvalue(objAlmInfo.key_id_tag()); @@ -650,24 +650,24 @@ void CAlmDataMng::saveDb_Add(const SAlmMsg &objAlmMsgAdd) //< ALM_STYLE pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype( kbd_idlfile::DataType::CN_DATATYPE_INT32 ); - kbd_idlfile::enAlmStyle enAls = kbd_idlfile::AS_EVENT_ONLY; + pColValue->set_edatatype( iot_idl::DataType::CN_DATATYPE_INT32 ); + iot_idl::enAlmStyle enAls = iot_idl::AS_EVENT_ONLY; switch ( objAlmInfo.logic_state()) { - case kbd_idlfile::ALS_ALARM : - case kbd_idlfile::ALS_ALARM_CFM : - case kbd_idlfile::ALS_ALARM_DEL : - case kbd_idlfile::ALS_ALARM_CFM_DEL : - enAls = kbd_idlfile::AS_ALARM; + case iot_idl::ALS_ALARM : + case iot_idl::ALS_ALARM_CFM : + case iot_idl::ALS_ALARM_DEL : + case iot_idl::ALS_ALARM_CFM_DEL : + enAls = iot_idl::AS_ALARM; break; - case kbd_idlfile::ALS_RETURN : - case kbd_idlfile::ALS_RETURN_CFM : - case kbd_idlfile::ALS_RETURN_DEL : - case kbd_idlfile::ALS_RETURN_CFM_DEL : - enAls = kbd_idlfile::AS_ALARM_RTN; + case iot_idl::ALS_RETURN : + case iot_idl::ALS_RETURN_CFM : + case iot_idl::ALS_RETURN_DEL : + case iot_idl::ALS_RETURN_CFM_DEL : + enAls = iot_idl::AS_ALARM_RTN; break; - case kbd_idlfile::ALS_EVT_ONLY : - enAls = kbd_idlfile::AS_EVENT_ONLY; + case iot_idl::ALS_EVT_ONLY : + enAls = iot_idl::AS_EVENT_ONLY; break; default: LOGERROR( "saveDb_Add(): 非预期的logic_state = %d", ( int ) objAlmInfo.logic_state()); break; @@ -680,7 +680,7 @@ void CAlmDataMng::saveDb_Add(const SAlmMsg &objAlmMsgAdd) if (objAlmInfo.has_key_id_tag() && !(objAlmInfo.key_id_tag().empty())) { - kbd_idlfile::STsdbPoint *pPoint = m_objTssInsert_Add.add_point(); + iot_idl::STsdbPoint *pPoint = m_objTssInsert_Add.add_point(); //< 时标 pPoint->set_time_stamp(objAlmInfo.time_stamp()); @@ -689,12 +689,12 @@ void CAlmDataMng::saveDb_Add(const SAlmMsg &objAlmMsgAdd) pPoint->add_tag_val(objAlmInfo.key_id_tag()); //< field - kbd_idlfile::SVariable *pVarValue = pPoint->add_field_val(); - pVarValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT32); + iot_idl::SVariable *pVarValue = pPoint->add_field_val(); + pVarValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT32); pVarValue->set_nvalue(objAlmInfo.alm_type()); pVarValue = pPoint->add_field_val(); - pVarValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT32); + pVarValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT32); pVarValue->set_nvalue(objAlmInfo.alm_status()); } @@ -706,9 +706,9 @@ void CAlmDataMng::saveDb_Add(const SAlmMsg &objAlmMsgAdd) //< m_objDbInsert_Add 的其他信息已在本类构造函数中填写 //< 注意，m_objDbInsert_Add 不允许被外部修改 - const kbd_idlfile::DbInsert &objInsert_Const = m_objDbInsert_Add; + const iot_idl::DbInsert &objInsert_Const = m_objDbInsert_Add; - if (!kbd_dbms::saveHisData(objInsert_Const)) + if (!iot_dbms::saveHisData(objInsert_Const)) { LOGERROR("saveDb_Add(): saveHisData()失败，检查程序！"); } @@ -722,7 +722,7 @@ void CAlmDataMng::saveDb_Add(const SAlmMsg &objAlmMsgAdd) //< m_objTssInsert_Add 的其他信息已在本类构造函数中填写 //< 注意，m_objTssInsert_Add 不允许被外部修改 - const kbd_idlfile::STssInsert &objInsert_Const = m_objTssInsert_Add; + const iot_idl::STssInsert &objInsert_Const = m_objTssInsert_Add; if (!CAlarmServer::getInstance().addTsdbInsertMsg(objInsert_Const)) { @@ -735,7 +735,7 @@ void CAlmDataMng::saveDb_Add(const SAlmMsg &objAlmMsgAdd) void CAlmDataMng::saveDb_Cfm(const SAlmMsg &objAlmMsgCfm) { - if (kbd_idlfile::MT_ALM_AS2AC_CFM != objAlmMsgCfm.m_enMsgType) + if (iot_idl::MT_ALM_AS2AC_CFM != objAlmMsgCfm.m_enMsgType) { LOGERROR("saveDb_Cfm(): 传入错误的消息类型，检查程序！"); return; @@ -768,19 +768,19 @@ void CAlmDataMng::saveDb_Cfm(const SAlmMsg &objAlmMsgCfm) for (size_t i = 0; i < nAlmSize; ++i) { - const kbd_idlfile::SAlmInfoToAlmClt &objAlmInfo = *(objAlmMsgCfm.m_vecAlmInfoPtr[i]); + const iot_idl::SAlmInfoToAlmClt &objAlmInfo = *(objAlmMsgCfm.m_vecAlmInfoPtr[i]); //< 设置条件值 { - kbd_idlfile::DbValueArray *pDbCondVal = m_objDbUpdateMulti_Cfm.add_msgconditionvalue(); + iot_idl::DbValueArray *pDbCondVal = m_objDbUpdateMulti_Cfm.add_msgconditionvalue(); //< 顺序与条件头对应 - kbd_idlfile::SVariable *pValue = pDbCondVal->add_msgvalue(); - pValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + iot_idl::SVariable *pValue = pDbCondVal->add_msgvalue(); + pValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); pValue->set_strvalue(objAlmInfo.uuid_base64()); pValue = pDbCondVal->add_msgvalue(); - pValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT64); + pValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT64); pValue->set_lvalue(objAlmInfo.time_stamp()); } @@ -788,9 +788,9 @@ void CAlmDataMng::saveDb_Cfm(const SAlmMsg &objAlmMsgCfm) if ((m_objDbUpdateMulti_Cfm.msgconditionvalue_size() >= 100) || (i + 1 == nAlmSize)) { //< 注意，m_objDbUpdateMulti_Cfm 不允许被外部修改 - const kbd_idlfile::DbUpdateMulti &objUpdateMulti_Const = m_objDbUpdateMulti_Cfm; + const iot_idl::DbUpdateMulti &objUpdateMulti_Const = m_objDbUpdateMulti_Cfm; - if (!kbd_dbms::saveHisData(objUpdateMulti_Const)) + if (!iot_dbms::saveHisData(objUpdateMulti_Const)) { LOGERROR("saveDb_Cfm(): saveHisData()失败，检查程序！"); } @@ -801,45 +801,45 @@ void CAlmDataMng::saveDb_Cfm(const SAlmMsg &objAlmMsgCfm) } -void CAlmDataMng::saveDb_AlmWave( const kbd_idlfile::SAppAddWave &objAppAddWave ) +void CAlmDataMng::saveDb_AlmWave( const iot_idl::SAppAddWave &objAppAddWave ) { - kbd_idlfile::DbUpdateMulti objDbUpdateMulti; + iot_idl::DbUpdateMulti objDbUpdateMulti; //< 需提交本域和中心 - objDbUpdateMulti.set_ensaveaction( kbd_idlfile::SA_DSS_LOCAL_REMOTE ); + objDbUpdateMulti.set_ensaveaction( iot_idl::SA_DSS_LOCAL_REMOTE ); //< 表名 objDbUpdateMulti.set_strtablename( DB_TABLE_NAME_HIS_EVENT ); //< 设置更新值 { - kbd_idlfile::DbUpdateValue *pDbUpdateVal = objDbUpdateMulti.add_msgupdatevalue(); + iot_idl::DbUpdateValue *pDbUpdateVal = objDbUpdateMulti.add_msgupdatevalue(); pDbUpdateVal->set_strcolumnname( "WAVE_FILE" ); - pDbUpdateVal->mutable_msgvalue()->set_edatatype( kbd_idlfile::DataType::CN_DATATYPE_STRING ); + pDbUpdateVal->mutable_msgvalue()->set_edatatype( iot_idl::DataType::CN_DATATYPE_STRING ); pDbUpdateVal->mutable_msgvalue()->set_strvalue( objAppAddWave.wave_file()); } //< 设置条件头 { - kbd_idlfile::DbConditionHead *pDbCondHead = objDbUpdateMulti.add_msgconditionhead(); - pDbCondHead->set_enlogic( kbd_idlfile::ENConditionLogic::enumCondAnd ); //< 逻辑与 - pDbCondHead->set_enrelation( kbd_idlfile::ENConditionRelation::enumCondLargeEqual ); //< 大于等于 + iot_idl::DbConditionHead *pDbCondHead = objDbUpdateMulti.add_msgconditionhead(); + pDbCondHead->set_enlogic( iot_idl::ENConditionLogic::enumCondAnd ); //< 逻辑与 + pDbCondHead->set_enrelation( iot_idl::ENConditionRelation::enumCondLargeEqual ); //< 大于等于 pDbCondHead->set_strcolumnname( "TIME_STAMP" ); pDbCondHead = objDbUpdateMulti.add_msgconditionhead(); - pDbCondHead->set_enlogic( kbd_idlfile::ENConditionLogic::enumCondAnd ); //< 逻辑与 - pDbCondHead->set_enrelation( kbd_idlfile::ENConditionRelation::enumCondSmallEqual ); //< 小于等于 + pDbCondHead->set_enlogic( iot_idl::ENConditionLogic::enumCondAnd ); //< 逻辑与 + pDbCondHead->set_enrelation( iot_idl::ENConditionRelation::enumCondSmallEqual ); //< 小于等于 pDbCondHead->set_strcolumnname( "TIME_STAMP" ); pDbCondHead = objDbUpdateMulti.add_msgconditionhead(); - pDbCondHead->set_enlogic( kbd_idlfile::ENConditionLogic::enumCondAnd ); //< 逻辑与 - pDbCondHead->set_enrelation( kbd_idlfile::ENConditionRelation::enumCondEqual ); //< 等于 + pDbCondHead->set_enlogic( iot_idl::ENConditionLogic::enumCondAnd ); //< 逻辑与 + pDbCondHead->set_enrelation( iot_idl::ENConditionRelation::enumCondEqual ); //< 等于 pDbCondHead->set_strcolumnname( "DEV_GROUP_TAG" ); //< 与 的优先级高于 或，因为现在没有实现括号，所以这么写 pDbCondHead = objDbUpdateMulti.add_msgconditionhead(); - pDbCondHead->set_enlogic( kbd_idlfile::ENConditionLogic::enumCondOr ); //< 注意：逻辑或 - pDbCondHead->set_enrelation( kbd_idlfile::ENConditionRelation::enumCondEqual ); //< 等于 + pDbCondHead->set_enlogic( iot_idl::ENConditionLogic::enumCondOr ); //< 注意：逻辑或 + pDbCondHead->set_enrelation( iot_idl::ENConditionRelation::enumCondEqual ); //< 等于 pDbCondHead->set_strcolumnname( "ALM_STATUS" ); } @@ -858,36 +858,36 @@ void CAlmDataMng::saveDb_AlmWave( const kbd_idlfile::SAppAddWave &objAppAddWave //< 设置条件值 for ( int i = 0; i < nAlmStatSize; ++i ) { - kbd_idlfile::DbValueArray *pDbCondVal = objDbUpdateMulti.add_msgconditionvalue(); + iot_idl::DbValueArray *pDbCondVal = objDbUpdateMulti.add_msgconditionvalue(); //< 顺序与条件头对应 //< TIME_STAMP - kbd_idlfile::SVariable *pValue = pDbCondVal->add_msgvalue(); - pValue->set_edatatype( kbd_idlfile::DataType::CN_DATATYPE_INT64 ); + iot_idl::SVariable *pValue = pDbCondVal->add_msgvalue(); + pValue->set_edatatype( iot_idl::DataType::CN_DATATYPE_INT64 ); pValue->set_lvalue( objAppAddWave.start_time()); //< TIME_STAMP pValue = pDbCondVal->add_msgvalue(); - pValue->set_edatatype( kbd_idlfile::DataType::CN_DATATYPE_INT64 ); + pValue->set_edatatype( iot_idl::DataType::CN_DATATYPE_INT64 ); pValue->set_lvalue( objAppAddWave.end_time()); //< DEV_GROUP_TAG pValue = pDbCondVal->add_msgvalue(); - pValue->set_edatatype( kbd_idlfile::DataType::CN_DATATYPE_STRING ); + pValue->set_edatatype( iot_idl::DataType::CN_DATATYPE_STRING ); pValue->set_strvalue( objAppAddWave.dev_group_tag()); //< ALM_STATUS pValue = pDbCondVal->add_msgvalue(); - pValue->set_edatatype( kbd_idlfile::DataType::CN_DATATYPE_INT32 ); + pValue->set_edatatype( iot_idl::DataType::CN_DATATYPE_INT32 ); pValue->set_nvalue( enAlmStat[i] ); } - if ( !kbd_dbms::saveHisData( objDbUpdateMulti )) + if ( !iot_dbms::saveHisData( objDbUpdateMulti )) { LOGERROR( "saveDb_AlmWave(): saveHisData()失败，检查程序！" ); } } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/CAlmDataMng.h b/platform/src/service/alarm_server/CAlmDataMng.h index 5d6b0b61..bd946f95 100644 --- a/platform/src/service/alarm_server/CAlmDataMng.h +++ b/platform/src/service/alarm_server/CAlmDataMng.h @@ -33,7 +33,7 @@ #include "CAlmDataMngBase.h" -namespace kbd_service +namespace iot_service { //< 注意：本类非线程安全 @@ -60,27 +60,27 @@ public: bool saveToFile(bool bForce = false); //< 添加告警，主机状态时，nSeqNo无用 - bool addAlarm(const kbd_net::CMbMessage &objMbMsgInput); + bool addAlarm(const iot_net::CMbMessage &objMbMsgInput); using CAlmDataMngBase::addAlarm; //< 确认告警 - bool cfmAlarm(const kbd_net::CMbMessage &objMbMsgInput); + bool cfmAlarm(const iot_net::CMbMessage &objMbMsgInput); using CAlmDataMngBase::cfmAlarm; //< 删除告警 - bool delAlarm(const kbd_net::CMbMessage &objMbMsgInput); + bool delAlarm(const iot_net::CMbMessage &objMbMsgInput); using CAlmDataMngBase::delAlarm; //< 释放告警 - bool releaseAlarm(const kbd_net::CMbMessage &objMbMsgInput); + bool releaseAlarm(const iot_net::CMbMessage &objMbMsgInput); using CAlmDataMngBase::releaseAlarm; //< 添加录波与告警的关联 - bool linkWave2Alm(const kbd_net::CMbMessage &objMbMsgInput); + bool linkWave2Alm(const iot_net::CMbMessage &objMbMsgInput); using CAlmDataMngBase::linkWave2Alm; //< 将数据库中的历史事件与录波关联，事件可能已经不在内存中，所以需要数据库按条件更新 - static void saveDb_AlmWave( const kbd_idlfile::SAppAddWave &objAppAddWave ); + static void saveDb_AlmWave( const iot_idl::SAppAddWave &objAppAddWave ); private: CAlmDataMng(); //< 单例 @@ -97,17 +97,17 @@ private: boost::int64_t m_nLastSaveTime; //< 为了性能作为成员变量，避免反复构造、析构 - kbd_idlfile::SAlmCltAddAlm m_objAddAlm; - kbd_idlfile::SAlmCltCfmAlm m_objCfmAlm; - kbd_idlfile::SAlmCltDelAlm m_objDelAlm; - kbd_idlfile::SAlmCltReleaseAlm m_objReleaseAlm; + iot_idl::SAlmCltAddAlm m_objAddAlm; + iot_idl::SAlmCltCfmAlm m_objCfmAlm; + iot_idl::SAlmCltDelAlm m_objDelAlm; + iot_idl::SAlmCltReleaseAlm m_objReleaseAlm; //< saveDb_Add() 函数中使用，为了性能作为成员变量 - kbd_idlfile::DbInsert m_objDbInsert_Add; - kbd_idlfile::STssInsert m_objTssInsert_Add; + iot_idl::DbInsert m_objDbInsert_Add; + iot_idl::STssInsert m_objTssInsert_Add; //< saveDb_Cfm() 函数中使用，为了性能作为成员变量 - kbd_idlfile::DbUpdateMulti m_objDbUpdateMulti_Cfm; + iot_idl::DbUpdateMulti m_objDbUpdateMulti_Cfm; }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/CAlmDataMngBase.cpp b/platform/src/service/alarm_server/CAlmDataMngBase.cpp index df14e965..9dda8962 100644 --- a/platform/src/service/alarm_server/CAlmDataMngBase.cpp +++ b/platform/src/service/alarm_server/CAlmDataMngBase.cpp @@ -21,7 +21,7 @@ #include "CAlarmServer.h" #include "CAlmDataMngBase.h" -namespace kbd_service +namespace iot_service { CAlmDataMngBase::CAlmDataMngBase() @@ -160,9 +160,9 @@ bool CAlmDataMngBase::getAlmMsgFromSeqNo(int nSendSeqNo, ConstSAlmMsgPtrVec &vec return true; } -bool CAlmDataMngBase::getFullAlmSyncMsg(kbd_net::CMbMessage &objMbMsgOutput) const +bool CAlmDataMngBase::getFullAlmSyncMsg(iot_net::CMbMessage &objMbMsgOutput) const { - kbd_idlfile::SAlmCltAddAlm objAllAlm; + iot_idl::SAlmCltAddAlm objAllAlm; BOOST_AUTO(pAlmInfoField, objAllAlm.mutable_alm_info()); pAlmInfoField->Reserve(static_cast(m_objAliveCache.size()) + 1); @@ -189,7 +189,7 @@ bool CAlmDataMngBase::getFullAlmSyncMsg(kbd_net::CMbMessage &objMbMsgOutput) con return false; } - objMbMsgOutput.setMsgType(kbd_idlfile::MT_ALM_AS2AC_ALL); + objMbMsgOutput.setMsgType(iot_idl::MT_ALM_AS2AC_ALL); objMbMsgOutput.setSubject(CN_AppId_PUBLIC, CH_ALM_TO_CLT_ALARM); objMbMsgOutput.setPara1(CAlarmServer::getInstance().getDomainID()); objMbMsgOutput.setPara2(m_nSeqNo); @@ -197,7 +197,7 @@ bool CAlmDataMngBase::getFullAlmSyncMsg(kbd_net::CMbMessage &objMbMsgOutput) con return true; } -bool CAlmDataMngBase::setFullAlmSync(const kbd_net::CMbMessage &objMbMsgInput) +bool CAlmDataMngBase::setFullAlmSync(const iot_net::CMbMessage &objMbMsgInput) { if (EN_STATE_SLAVE != m_enState) { @@ -205,7 +205,7 @@ bool CAlmDataMngBase::setFullAlmSync(const kbd_net::CMbMessage &objMbMsgInput) return false; } - if (kbd_idlfile::MT_ALM_AS2AC_ALL != objMbMsgInput.getMsgType()) + if (iot_idl::MT_ALM_AS2AC_ALL != objMbMsgInput.getMsgType()) { LOGERROR("setFullAlmSync(): 错误的消息类型 %d ，检查程序！", objMbMsgInput.getMsgType()); @@ -219,7 +219,7 @@ bool CAlmDataMngBase::setFullAlmSync(const kbd_net::CMbMessage &objMbMsgInput) } //< 反序列化 - kbd_idlfile::SAlmCltAddAlm objAddAlm; + iot_idl::SAlmCltAddAlm objAddAlm; if (!objAddAlm.ParseFromArray(objMbMsgInput.getDataPtr(), (int) objMbMsgInput.getDataSize())) { LOGERROR("setFullAlmSync(): SAlmCltAddAlm 反序列化失败，信息如下\n%s", @@ -236,7 +236,7 @@ bool CAlmDataMngBase::setFullAlmSync(const kbd_net::CMbMessage &objMbMsgInput) for (int i = 0; i < nAlmInfoSize; ++i) { //< todo 考虑零复制 - m_objAliveCache.emplace_back( boost::make_shared( objAddAlm.alm_info( i ))); + m_objAliveCache.emplace_back( boost::make_shared( objAddAlm.alm_info( i ))); } //< 更新序号 @@ -244,7 +244,7 @@ bool CAlmDataMngBase::setFullAlmSync(const kbd_net::CMbMessage &objMbMsgInput) //< 更新时间 - m_nLastUpdateTime = kbd_public::getMonotonicMsec(); + m_nLastUpdateTime = iot_public::getMonotonicMsec(); return true; } @@ -326,8 +326,8 @@ const SAlmInfoPtrVec &CAlmDataMngBase::addAlarm(const SAlmInfoPtrVec &vecAlmInfo //< 返回后自动确认的处理，0 否； 1 总是； 2 若动作告警已确认 if (0 != ptrAlmInfo_Add->if_ack_on_rtn() - && (kbd_idlfile::ALS_RETURN == ptrAlmInfo_Add->logic_state() - || kbd_idlfile::ALS_RETURN_DEL == ptrAlmInfo_Add->logic_state())) + && (iot_idl::ALS_RETURN == ptrAlmInfo_Add->logic_state() + || iot_idl::ALS_RETURN_DEL == ptrAlmInfo_Add->logic_state())) { if (ptrAlmInfo_Add->has_key_id_tag()) { @@ -394,22 +394,22 @@ const SAlmInfoPtrVec &CAlmDataMngBase::addAlarm(const SAlmInfoPtrVec &vecAlmInfo { switch ((*it).m_ptrAlmInfo->logic_state()) { - case kbd_idlfile::ALS_ALARM: - case kbd_idlfile::ALS_ALARM_DEL: + case iot_idl::ALS_ALARM: + case iot_idl::ALS_ALARM_DEL: bDoCfm = false; bFind = true; break; - case kbd_idlfile::ALS_ALARM_CFM: - case kbd_idlfile::ALS_ALARM_CFM_DEL: + case iot_idl::ALS_ALARM_CFM: + case iot_idl::ALS_ALARM_CFM_DEL: bDoCfm = true; bFind = true; break; default: - //case kbd_idlfile::ALS_RETURN: - //case kbd_idlfile::ALS_RETURN_CFM: - //case kbd_idlfile::ALS_EVT_ONLY: - //case kbd_idlfile::ALS_RETURN_DEL: - //case kbd_idlfile::ALS_RETURN_CFM_DEL: + //case iot_idl::ALS_RETURN: + //case iot_idl::ALS_RETURN_CFM: + //case iot_idl::ALS_EVT_ONLY: + //case iot_idl::ALS_RETURN_DEL: + //case iot_idl::ALS_RETURN_CFM_DEL: break; } } @@ -462,7 +462,7 @@ const SAlmInfoPtrVec &CAlmDataMngBase::addAlarm(const SAlmInfoPtrVec &vecAlmInfo if (!(ptrAlmMsg->m_vecAlmInfoPtr.empty())) { //< 设置消息其他信息 - ptrAlmMsg->m_enMsgType = kbd_idlfile::MT_ALM_AS2AC_ADD; + ptrAlmMsg->m_enMsgType = iot_idl::MT_ALM_AS2AC_ADD; if (EN_STATE_MASTER == m_enState) { ptrAlmMsg->m_nSendSeqNo = ++m_nSeqNo; @@ -486,7 +486,7 @@ const SAlmInfoPtrVec &CAlmDataMngBase::addAlarm(const SAlmInfoPtrVec &vecAlmInfo } //< 更新时间 - m_nLastUpdateTime = kbd_public::getMonotonicMsec(); + m_nLastUpdateTime = iot_public::getMonotonicMsec(); if (EN_STATE_MASTER == m_enState) { @@ -519,7 +519,7 @@ const SAlmInfoPtrVec &CAlmDataMngBase::addAlarm(const SAlmInfoPtrVec &vecAlmInfo //< todo，用户先写0，后期如果有系统用户定义再修改 cfmAlarm(m_vecp_addAlarm_Temp_Cfm, 0, - kbd_public::getUTCTimeMsec(), + iot_public::getUTCTimeMsec(), CAlarmServer::getInstance().getNodeName(), 0); } @@ -600,37 +600,37 @@ void CAlmDataMngBase::cfmAlarm(const std::vector &vecpAlmIn switch (ptrAlmInfo->logic_state()) { - case kbd_idlfile::ALS_ALARM: + case iot_idl::ALS_ALARM: bDoCfm = true; - ptrAlmInfo->set_logic_state(kbd_idlfile::ALS_ALARM_CFM); + ptrAlmInfo->set_logic_state(iot_idl::ALS_ALARM_CFM); if (0 == nDelActOnAck) bDoDel = true; break; - case kbd_idlfile::ALS_ALARM_DEL: + case iot_idl::ALS_ALARM_DEL: bDoCfm = true; - ptrAlmInfo->set_logic_state(kbd_idlfile::ALS_ALARM_CFM_DEL); + ptrAlmInfo->set_logic_state(iot_idl::ALS_ALARM_CFM_DEL); break; - case kbd_idlfile::ALS_RETURN: + case iot_idl::ALS_RETURN: bDoCfm = true; - ptrAlmInfo->set_logic_state(kbd_idlfile::ALS_RETURN_CFM); + ptrAlmInfo->set_logic_state(iot_idl::ALS_RETURN_CFM); if (0 == nDelActOnAck || 1 == nDelActOnAck) bDoDel = true; break; - case kbd_idlfile::ALS_RETURN_DEL: + case iot_idl::ALS_RETURN_DEL: bDoCfm = true; - ptrAlmInfo->set_logic_state(kbd_idlfile::ALS_RETURN_CFM_DEL); + ptrAlmInfo->set_logic_state(iot_idl::ALS_RETURN_CFM_DEL); break; - case kbd_idlfile::ALS_ALARM_CFM: - case kbd_idlfile::ALS_RETURN_CFM: - case kbd_idlfile::ALS_EVT_ONLY: - case kbd_idlfile::ALS_ALARM_CFM_DEL: - case kbd_idlfile::ALS_RETURN_CFM_DEL: + case iot_idl::ALS_ALARM_CFM: + case iot_idl::ALS_RETURN_CFM: + case iot_idl::ALS_EVT_ONLY: + case iot_idl::ALS_ALARM_CFM_DEL: + case iot_idl::ALS_RETURN_CFM_DEL: bDoCfm = false; //< 无需处理 break; @@ -660,7 +660,7 @@ void CAlmDataMngBase::cfmAlarm(const std::vector &vecpAlmIn } //< 设置消息其他信息 - ptrCfmAlmMsg->m_enMsgType = kbd_idlfile::MT_ALM_AS2AC_CFM; + ptrCfmAlmMsg->m_enMsgType = iot_idl::MT_ALM_AS2AC_CFM; if (EN_STATE_MASTER == m_enState) { ptrCfmAlmMsg->m_nSendSeqNo = ++m_nSeqNo; @@ -687,7 +687,7 @@ void CAlmDataMngBase::cfmAlarm(const std::vector &vecpAlmIn } //< 更新时间 - m_nLastUpdateTime = kbd_public::getMonotonicMsec(); + m_nLastUpdateTime = iot_public::getMonotonicMsec(); //< 主机需处理的任务 if (EN_STATE_MASTER == m_enState) @@ -745,27 +745,27 @@ void CAlmDataMngBase::delAlarm(const std::vector &vecpAlmIn //< 不删除内存，修改 logic_state switch (ptrAlmInfo->logic_state()) { - case kbd_idlfile::ALS_ALARM: + case iot_idl::ALS_ALARM: bDoDel = true; - ptrAlmInfo->set_logic_state(kbd_idlfile::ALS_ALARM_DEL); + ptrAlmInfo->set_logic_state(iot_idl::ALS_ALARM_DEL); break; - case kbd_idlfile::ALS_ALARM_CFM: + case iot_idl::ALS_ALARM_CFM: bDoDel = true; - ptrAlmInfo->set_logic_state(kbd_idlfile::ALS_ALARM_CFM_DEL); + ptrAlmInfo->set_logic_state(iot_idl::ALS_ALARM_CFM_DEL); break; - case kbd_idlfile::ALS_RETURN: + case iot_idl::ALS_RETURN: bDoDel = true; - ptrAlmInfo->set_logic_state(kbd_idlfile::ALS_RETURN_DEL); + ptrAlmInfo->set_logic_state(iot_idl::ALS_RETURN_DEL); break; - case kbd_idlfile::ALS_RETURN_CFM: + case iot_idl::ALS_RETURN_CFM: bDoDel = true; - ptrAlmInfo->set_logic_state(kbd_idlfile::ALS_RETURN_CFM_DEL); + ptrAlmInfo->set_logic_state(iot_idl::ALS_RETURN_CFM_DEL); break; - case kbd_idlfile::ALS_EVT_ONLY: - case kbd_idlfile::ALS_ALARM_DEL: - case kbd_idlfile::ALS_ALARM_CFM_DEL: - case kbd_idlfile::ALS_RETURN_DEL: - case kbd_idlfile::ALS_RETURN_CFM_DEL: + case iot_idl::ALS_EVT_ONLY: + case iot_idl::ALS_ALARM_DEL: + case iot_idl::ALS_ALARM_CFM_DEL: + case iot_idl::ALS_RETURN_DEL: + case iot_idl::ALS_RETURN_CFM_DEL: bDoDel = false; //< 无需处理 break; @@ -789,7 +789,7 @@ void CAlmDataMngBase::delAlarm(const std::vector &vecpAlmIn } //< 设置消息其他信息 - ptrAlmMsg->m_enMsgType = kbd_idlfile::MT_ALM_AS2AC_DEL; + ptrAlmMsg->m_enMsgType = iot_idl::MT_ALM_AS2AC_DEL; if (EN_STATE_MASTER == m_enState) { ptrAlmMsg->m_nSendSeqNo = ++m_nSeqNo; @@ -813,7 +813,7 @@ void CAlmDataMngBase::delAlarm(const std::vector &vecpAlmIn } //< 更新时间 - m_nLastUpdateTime = kbd_public::getMonotonicMsec(); + m_nLastUpdateTime = iot_public::getMonotonicMsec(); } void CAlmDataMngBase::releaseAlarm(const std::vector &vecStrUuid_Release, const int nSeqNo) @@ -857,7 +857,7 @@ void CAlmDataMngBase::releaseAlarm(const std::vector &vecSt } //< 设置消息其他信息 - ptrAlmMsg->m_enMsgType = kbd_idlfile::MT_ALM_AS2AC_RELEASE; + ptrAlmMsg->m_enMsgType = iot_idl::MT_ALM_AS2AC_RELEASE; if (EN_STATE_MASTER == m_enState) { ptrAlmMsg->m_nSendSeqNo = ++m_nSeqNo; @@ -881,10 +881,10 @@ void CAlmDataMngBase::releaseAlarm(const std::vector &vecSt } //< 更新时间 - m_nLastUpdateTime = kbd_public::getMonotonicMsec(); + m_nLastUpdateTime = iot_public::getMonotonicMsec(); } -void CAlmDataMngBase::linkWave2Alm(const kbd_idlfile::SAlmCltLinkWave2Alm &objWave, const int nSeqNo) +void CAlmDataMngBase::linkWave2Alm(const iot_idl::SAlmCltLinkWave2Alm &objWave, const int nSeqNo) { if (EN_STATE_NULL == m_enState) { @@ -925,7 +925,7 @@ void CAlmDataMngBase::linkWave2Alm(const kbd_idlfile::SAlmCltLinkWave2Alm &objWa } //< 设置消息其他信息 - ptrAlmMsg->m_enMsgType = kbd_idlfile::MT_ALM_AS2AC_WAVE; + ptrAlmMsg->m_enMsgType = iot_idl::MT_ALM_AS2AC_WAVE; ptrAlmMsg->m_ptrWaveFile = boost::make_shared(objWave.wave_file()); if (EN_STATE_MASTER == m_enState) { @@ -950,7 +950,7 @@ void CAlmDataMngBase::linkWave2Alm(const kbd_idlfile::SAlmCltLinkWave2Alm &objWa } //< 更新时间 - m_nLastUpdateTime = kbd_public::getMonotonicMsec(); + m_nLastUpdateTime = iot_public::getMonotonicMsec(); } bool CAlmDataMngBase::releaseAliveCacheForce() @@ -981,7 +981,7 @@ bool CAlmDataMngBase::releaseAliveCacheForce() } //< 设置消息其他信息 - ptrAlmMsg->m_enMsgType = kbd_idlfile::MT_ALM_AS2AC_RELEASE; + ptrAlmMsg->m_enMsgType = iot_idl::MT_ALM_AS2AC_RELEASE; ptrAlmMsg->m_nSendSeqNo = ++m_nSeqNo; if (!(ptrAlmMsg->isValid())) @@ -997,7 +997,7 @@ bool CAlmDataMngBase::releaseAliveCacheForce() } //< 更新时间 - m_nLastUpdateTime = kbd_public::getMonotonicMsec(); + m_nLastUpdateTime = iot_public::getMonotonicMsec(); return true; } @@ -1012,7 +1012,7 @@ ConstSAlmInfoPtrVecPtr CAlmDataMngBase::shrinkSize(const int nLastSeqNo) return ptrAlmInfo_CanRelease; } - const boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); const bool bTimeIsUp = m_nLastShrinkSizeTime + 3000 < nTimeNow; if (bTimeIsUp) @@ -1051,20 +1051,20 @@ ConstSAlmInfoPtrVecPtr CAlmDataMngBase::shrinkSize(const int nLastSeqNo) for (BOOST_AUTO(it, m_objAliveCache.cbegin()); it != m_objAliveCache.cend(); ++it) { - const kbd_idlfile::enAlmLogicState enLogicState = (*it).m_ptrAlmInfo->logic_state(); + const iot_idl::enAlmLogicState enLogicState = (*it).m_ptrAlmInfo->logic_state(); switch (enLogicState) { - case kbd_idlfile::ALS_ALARM: - case kbd_idlfile::ALS_ALARM_CFM: - case kbd_idlfile::ALS_RETURN: - case kbd_idlfile::ALS_RETURN_CFM: + case iot_idl::ALS_ALARM: + case iot_idl::ALS_ALARM_CFM: + case iot_idl::ALS_RETURN: + case iot_idl::ALS_RETURN_CFM: bCanRelease = false; break; - case kbd_idlfile::ALS_EVT_ONLY: - case kbd_idlfile::ALS_ALARM_DEL: - case kbd_idlfile::ALS_ALARM_CFM_DEL: - case kbd_idlfile::ALS_RETURN_DEL: - case kbd_idlfile::ALS_RETURN_CFM_DEL: + case iot_idl::ALS_EVT_ONLY: + case iot_idl::ALS_ALARM_DEL: + case iot_idl::ALS_ALARM_CFM_DEL: + case iot_idl::ALS_RETURN_DEL: + case iot_idl::ALS_RETURN_CFM_DEL: bCanRelease = true; break; default: @@ -1103,24 +1103,24 @@ ConstSAlmInfoPtrVecPtr CAlmDataMngBase::shrinkSize(const int nLastSeqNo) for (BOOST_AUTO(it, m_objAliveCache.crbegin()); it != m_objAliveCache.crend(); ++it) { - const kbd_idlfile::enAlmLogicState enLogicState = (*it).m_ptrAlmInfo->logic_state(); + const iot_idl::enAlmLogicState enLogicState = (*it).m_ptrAlmInfo->logic_state(); switch (enLogicState) { - case kbd_idlfile::ALS_ALARM: - case kbd_idlfile::ALS_ALARM_CFM: - case kbd_idlfile::ALS_RETURN: - case kbd_idlfile::ALS_RETURN_CFM: + case iot_idl::ALS_ALARM: + case iot_idl::ALS_ALARM_CFM: + case iot_idl::ALS_RETURN: + case iot_idl::ALS_RETURN_CFM: ++nUndeletedAlmCnt; if (nUndeletedAlmCnt > cn_nUndeletedAlmMaxCnt) { vecpAlmInfoPtr_Del.push_back(&((*it).m_ptrAlmInfo)); } break; - case kbd_idlfile::ALS_EVT_ONLY: - case kbd_idlfile::ALS_ALARM_DEL: - case kbd_idlfile::ALS_ALARM_CFM_DEL: - case kbd_idlfile::ALS_RETURN_DEL: - case kbd_idlfile::ALS_RETURN_CFM_DEL: + case iot_idl::ALS_EVT_ONLY: + case iot_idl::ALS_ALARM_DEL: + case iot_idl::ALS_ALARM_CFM_DEL: + case iot_idl::ALS_RETURN_DEL: + case iot_idl::ALS_RETURN_CFM_DEL: //< 无需处理 break; default: @@ -1181,5 +1181,5 @@ ConstSAlmInfoPtrVecPtr CAlmDataMngBase::shrinkSize(const int nLastSeqNo) return ptrAlmInfo_CanRelease; } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/CAlmDataMngBase.h b/platform/src/service/alarm_server/CAlmDataMngBase.h index d28b6eec..4772bfdb 100644 --- a/platform/src/service/alarm_server/CAlmDataMngBase.h +++ b/platform/src/service/alarm_server/CAlmDataMngBase.h @@ -11,7 +11,7 @@ #include "AlmSrvCommon.h" -namespace kbd_service +namespace iot_service { //< 注意：本类非线程安全 @@ -56,11 +56,11 @@ public: bool getAlmMsgFromSeqNo(int nSendSeqNo, ConstSAlmMsgPtrVec &vecOutput) const; //< 获取告警全同步消息 - bool getFullAlmSyncMsg(kbd_net::CMbMessage &objMbMsgOutput) const; + bool getFullAlmSyncMsg(iot_net::CMbMessage &objMbMsgOutput) const; //< 设置告警全同步，清空原有告警缓存，并以输入消息同步 //< 消息不正确，返回false，不修改任何数据 - bool setFullAlmSync(const kbd_net::CMbMessage &objMbMsgInput); + bool setFullAlmSync(const iot_net::CMbMessage &objMbMsgInput); //< 添加告警，主机状态时，nSeqNo无用 //< 返回值: 自动确认时，需发给DP的告警，主机使用 @@ -78,7 +78,7 @@ public: void releaseAlarm(const std::vector &vecStrUuid_Release, const int nSeqNo); //< 添加录波与告警的关联，主机状态时，nSeqNo无用 - void linkWave2Alm(const kbd_idlfile::SAlmCltLinkWave2Alm &objWave, const int nSeqNo); + void linkWave2Alm(const iot_idl::SAlmCltLinkWave2Alm &objWave, const int nSeqNo); //< 内部有时间控制，可以频繁调用 //< nLastSeqNo: 在此之前（更老的）消息可删除，此条以及之后的需保留。主机使用，防止冲掉还没发出的消息。 @@ -183,4 +183,4 @@ protected: SAlmMsgPtrContainer m_objMsgCache; }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/CAlmSrvRedunSw.cpp b/platform/src/service/alarm_server/CAlmSrvRedunSw.cpp index 3bdd259e..7fc8b319 100644 --- a/platform/src/service/alarm_server/CAlmSrvRedunSw.cpp +++ b/platform/src/service/alarm_server/CAlmSrvRedunSw.cpp @@ -18,7 +18,7 @@ #include "CAlmSrvRedunSw.h" -namespace kbd_service +namespace iot_service { CAlmSrvRedunSw::CAlmSrvRedunSw() @@ -252,4 +252,4 @@ bool CAlmSrvRedunSw::isSlaveThreadsWorking() const } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/CAlmSrvRedunSw.h b/platform/src/service/alarm_server/CAlmSrvRedunSw.h index 88bc4623..95c00330 100644 --- a/platform/src/service/alarm_server/CAlmSrvRedunSw.h +++ b/platform/src/service/alarm_server/CAlmSrvRedunSw.h @@ -11,13 +11,13 @@ #include "sys_node_mng_api/NodeMngInterface.h" -namespace kbd_service +namespace iot_service { class CAppMsgProcThread; class CMainProcThread; class CSlaveSyncThread; -class CAlmSrvRedunSw final : public ::kbd_sys::CRedundantSwitchInterface +class CAlmSrvRedunSw final : public ::iot_sys::CRedundantSwitchInterface { public: CAlmSrvRedunSw(); @@ -54,5 +54,5 @@ private: typedef boost::shared_ptr CAlmSrvRedunSwPtr; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/CAppMsgProcThread.cpp b/platform/src/service/alarm_server/CAppMsgProcThread.cpp index a94531f8..fb975bdd 100644 --- a/platform/src/service/alarm_server/CAppMsgProcThread.cpp +++ b/platform/src/service/alarm_server/CAppMsgProcThread.cpp @@ -40,7 +40,7 @@ #include "CAppMsgProcThread.h" -namespace kbd_service +namespace iot_service { CAppMsgProcThread::CAppMsgProcThread(CMainProcThread &objMainProc) : @@ -138,8 +138,8 @@ bool CAppMsgProcThread::resumeThread() bool bSucess = true; m_pAC_Trie = ac_trie_create(); - kbd_dbms::CVarType varKeywordID, varKeywordName; - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_alarm_keyword_define); + iot_dbms::CVarType varKeywordID, varKeywordName; + iot_dbms::CTableLockGuard tableLock(m_objRtdb_alarm_keyword_define); const int nRcdCnt = m_objRtdb_alarm_keyword_define.getRecordCount(); for (int i = 0; i < nRcdCnt; ++i) @@ -190,7 +190,7 @@ bool CAppMsgProcThread::resumeThread() if (nullptr == m_pMbComm) { - m_pMbComm = new kbd_net::CMbCommunicator(); + m_pMbComm = new iot_net::CMbCommunicator(); } //< 订阅 @@ -242,7 +242,7 @@ bool CAppMsgProcThread::suspendThread() m_mapKeywordValue.clear(); //< 释放内存 - kbd_idlfile::SAppAddAlm objNew; + iot_idl::SAppAddAlm objNew; m_objAppAddAlm.Swap(&objNew); } @@ -281,7 +281,7 @@ void CAppMsgProcThread::execute() //< ProtoBuf 的 Clear() 不会清空内存，用此方法清空 if (m_objAppAddAlm.mutable_alm_info()->Capacity() > m_nReleaseThreshold * 3) { - kbd_idlfile::SAppAddAlm objNew; + iot_idl::SAppAddAlm objNew; m_objAppAddAlm.Swap(&objNew); if (m_objAppAddAlm.mutable_alm_info()->Capacity() > 0) @@ -315,7 +315,7 @@ void CAppMsgProcThread::handleOneMbMsg() //< 确认的消息类型 = 添加的消息类型 + 1 ， 成对定义，比如： //< MT_ALM_AS2AP_ADD_ACK = MT_ALM_AP2AS_ADD + 1 //< MT_ALM_AS2AP_WAVE_ACK = MT_ALM_AP2AS_WAVE + 1 - kbd_net::CMbMessage objMbMSgRep( cn_strSignature, CN_AppId_PUBLIC, CH_ALM_TO_APP, + iot_net::CMbMessage objMbMSgRep( cn_strSignature, CN_AppId_PUBLIC, CH_ALM_TO_APP, m_objMbMsgRcv.getMsgType() + 1, CAlarmServer::getInstance().getDomainID(), m_objMbMsgRcv.getPara2()); @@ -325,13 +325,13 @@ void CAppMsgProcThread::handleOneMbMsg() } //< 录波文件消息 - if ( m_objMbMsgRcv.getMsgType() == kbd_idlfile::MT_ALM_AP2AS_WAVE) + if ( m_objMbMsgRcv.getMsgType() == iot_idl::MT_ALM_AP2AS_WAVE) { m_objMainProc.addWaveFromApp( m_objMbMsgRcv ); return; } - if ( m_objMbMsgRcv.getMsgType() != kbd_idlfile::MT_ALM_AP2AS_ADD) + if ( m_objMbMsgRcv.getMsgType() != iot_idl::MT_ALM_AP2AS_ADD) { LOGERROR( "收到非预期消息类型，忽略！ MsgType == %d", m_objMbMsgRcv.getMsgType()); return; @@ -373,9 +373,9 @@ void CAppMsgProcThread::handleOneMbMsg() //< 注意： objAppAddAlm 中部分内容会被取走！ for (int i = 0; i < nAlmInfoSize; ++i) { - kbd_idlfile::SAlmInfoFromApp &objAlmInfoSrc = *m_objAppAddAlm.mutable_alm_info(i); + iot_idl::SAlmInfoFromApp &objAlmInfoSrc = *m_objAppAddAlm.mutable_alm_info(i); - if (kbd_idlfile::AS_DO_NOTHING == objAlmInfoSrc.alm_style()) + if (iot_idl::AS_DO_NOTHING == objAlmInfoSrc.alm_style()) { //< 不处理 std::string strPrint; @@ -385,16 +385,16 @@ void CAppMsgProcThread::handleOneMbMsg() } else { - SAlmInfoPtr ptrAlmInfoDst = boost::make_shared(); + SAlmInfoPtr ptrAlmInfoDst = boost::make_shared(); //< 注意： objAlmInfoSrc 中部分内容会被取走！ if (generateAlarm(nDomainID, nAppID, objAlmInfoSrc, *ptrAlmInfoDst)) { //< 返回后不产生告警 - if (kbd_idlfile::ALS_RETURN == ptrAlmInfoDst->logic_state() + if (iot_idl::ALS_RETURN == ptrAlmInfoDst->logic_state() && 0 != ptrAlmInfoDst->if_never_alm_on_rtn()) { - ptrAlmInfoDst->set_logic_state(kbd_idlfile::ALS_RETURN_DEL); + ptrAlmInfoDst->set_logic_state(iot_idl::ALS_RETURN_DEL); } m_objMainProc.addAlarmFromApp(ptrAlmInfoDst); @@ -419,8 +419,8 @@ static void ac_listener(AC_TEXT_t *text, void *pStrAlmContent) } bool -CAppMsgProcThread::generateAlarm(const int nDomainID, const int nAppID, kbd_idlfile::SAlmInfoFromApp &objInput, - kbd_idlfile::SAlmInfoToAlmClt &objOutput) +CAppMsgProcThread::generateAlarm(const int nDomainID, const int nAppID, iot_idl::SAlmInfoFromApp &objInput, + iot_idl::SAlmInfoToAlmClt &objOutput) { //< alm_type const int nAlmType = objInput.alm_type(); @@ -434,7 +434,7 @@ CAppMsgProcThread::generateAlarm(const int nDomainID, const int nAppID, kbd_idlf //< status const int nStatus = objInput.status(); int nAlmMannerID; - kbd_dbms::CVarType varFormat; + iot_dbms::CVarType varFormat; if (!getAlmStatusInfo(nAlmType, nStatus, nAlmMannerID, varFormat)) { return false; @@ -456,7 +456,7 @@ CAppMsgProcThread::generateAlarm(const int nDomainID, const int nAppID, kbd_idlf //< 告警方式 if (objInput.has_alm_manner()) { - kbd_idlfile::SAlmManner &objAlmManner = *objInput.mutable_alm_manner(); + iot_idl::SAlmManner &objAlmManner = *objInput.mutable_alm_manner(); objOutput.set_priority(objAlmManner.priority()); objOutput.set_if_ack_on_rtn(objAlmManner.if_ack_on_rtn()); @@ -481,28 +481,28 @@ CAppMsgProcThread::generateAlarm(const int nDomainID, const int nAppID, kbd_idlf //< 查询告警等级，允许查询不到 int nIfEvent = 0; - kbd_dbms::CVarType varSound_Level; //< 告警等级声音，后面使用，这里一次性查出来 + iot_dbms::CVarType varSound_Level; //< 告警等级声音，后面使用，这里一次性查出来 getAlmLevelInfo(objOutput.priority(), nIfEvent, varSound_Level); //< logic_state switch (objInput.alm_style()) { - case kbd_idlfile::AS_ALARM: + case iot_idl::AS_ALARM: if (0 == nIfEvent) - objOutput.set_logic_state(kbd_idlfile::ALS_ALARM); + objOutput.set_logic_state(iot_idl::ALS_ALARM); else - objOutput.set_logic_state(kbd_idlfile::ALS_ALARM_DEL); + objOutput.set_logic_state(iot_idl::ALS_ALARM_DEL); break; - case kbd_idlfile::AS_ALARM_RTN: + case iot_idl::AS_ALARM_RTN: if (0 == nIfEvent) - objOutput.set_logic_state(kbd_idlfile::ALS_RETURN); + objOutput.set_logic_state(iot_idl::ALS_RETURN); else - objOutput.set_logic_state(kbd_idlfile::ALS_RETURN_DEL); + objOutput.set_logic_state(iot_idl::ALS_RETURN_DEL); break; - case kbd_idlfile::AS_EVENT_ONLY: - objOutput.set_logic_state(kbd_idlfile::ALS_EVT_ONLY); + case iot_idl::AS_EVENT_ONLY: + objOutput.set_logic_state(iot_idl::ALS_EVT_ONLY); break; - case kbd_idlfile::AS_DO_NOTHING: + case iot_idl::AS_DO_NOTHING: //< 就不该进到这个函数来，外面有判断 return false; //break; @@ -532,7 +532,7 @@ CAppMsgProcThread::generateAlarm(const int nDomainID, const int nAppID, kbd_idlf const int nKeywordSize = objInput.alm_keyword_size(); for (int i = 0; i < nKeywordSize; ++i) { - const kbd_idlfile::SAlmKeyword &objKeyword = objInput.alm_keyword(i); + const iot_idl::SAlmKeyword &objKeyword = objInput.alm_keyword(i); BOOST_AUTO(it, m_mapKeywordValue.find(objKeyword.id())); if (m_mapKeywordValue.end() == it) @@ -621,7 +621,7 @@ CAppMsgProcThread::generateAlarm(const int nDomainID, const int nAppID, kbd_idlf { //< 对象没有配声音，使用全局配置 - kbd_dbms::CVarType varSound_Region; + iot_dbms::CVarType varSound_Region; if (1 == nAlmSoundSource && objOutput.has_region_id() && getAlmLevelSoundInfo(objOutput.priority(), objOutput.region_id(), varSound_Region)) @@ -731,8 +731,8 @@ void CAppMsgProcThread::generateUuidBase64(std::string &strOut) bool CAppMsgProcThread::getAlmTypeInfo(const int nAlmTypeID, int &nAlmSoundSource) { - kbd_dbms::CVarType objValue; - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_alarm_type_define); + iot_dbms::CVarType objValue; + iot_dbms::CTableLockGuard tableLock(m_objRtdb_alarm_type_define); const int nRecIndex = m_objRtdb_alarm_type_define.searchRecordByKey(&nAlmTypeID); if (nRecIndex < 0) @@ -755,7 +755,7 @@ bool CAppMsgProcThread::getAlmTypeInfo(const int nAlmTypeID, int &nAlmSoundSourc bool CAppMsgProcThread::getAlmStatusInfo(const int nAlmTypeID, const int nAlmStatID, - int &nAlmMannerID, kbd_dbms::CVarType &varFormat) + int &nAlmMannerID, iot_dbms::CVarType &varFormat) { struct STableKey { @@ -763,8 +763,8 @@ bool CAppMsgProcThread::getAlmStatusInfo(const int nAlmTypeID, const int nAlmSta int m_nStatus; } objKey{nAlmTypeID, nAlmStatID}; - kbd_dbms::CVarType objValue; - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_alarm_status_define); + iot_dbms::CVarType objValue; + iot_dbms::CTableLockGuard tableLock(m_objRtdb_alarm_status_define); const int nRecIndex = m_objRtdb_alarm_status_define.searchRecordByKey(&objKey); if (nRecIndex < 0) @@ -798,8 +798,8 @@ bool CAppMsgProcThread::getAlmMannerInfo(const int nMannerID, int &nPriorityID, int &nIfAckOnRtn, int &nDelActOnAck, int &nIfNeverAlmOnRtn, int &nIfWater) { - kbd_dbms::CVarType objValue; - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_alarm_manner_define); + iot_dbms::CVarType objValue; + iot_dbms::CTableLockGuard tableLock(m_objRtdb_alarm_manner_define); const int nRecIndex = m_objRtdb_alarm_manner_define.searchRecordByKey(&nMannerID); if (nRecIndex < 0) @@ -857,9 +857,9 @@ bool CAppMsgProcThread::getAlmMannerInfo(const int nMannerID, int &nPriorityID, } -bool CAppMsgProcThread::getAlmLevelInfo(const int nPriorityID, int &nIfEvent, kbd_dbms::CVarType &varSoundFile) +bool CAppMsgProcThread::getAlmLevelInfo(const int nPriorityID, int &nIfEvent, iot_dbms::CVarType &varSoundFile) { - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_alarm_level_define); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_alarm_level_define); const int nRecIndex = m_objRtdb_alarm_level_define.searchRecordByKey(&nPriorityID); if (nRecIndex < 0) @@ -869,7 +869,7 @@ bool CAppMsgProcThread::getAlmLevelInfo(const int nPriorityID, int &nIfEvent, kb } { - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; if (!(m_objRtdb_alarm_level_define.getColumnValueByIndex(nRecIndex, "if_event", objValue))) { LOGERROR("获取列值 if_event 失败！"); @@ -891,7 +891,7 @@ bool CAppMsgProcThread::getAlmLevelInfo(const int nPriorityID, int &nIfEvent, kb bool -CAppMsgProcThread::getAlmLevelSoundInfo(const int nPriorityID, const int nRegionID, kbd_dbms::CVarType &varSoundFile) +CAppMsgProcThread::getAlmLevelSoundInfo(const int nPriorityID, const int nRegionID, iot_dbms::CVarType &varSoundFile) { struct STableKey { @@ -899,7 +899,7 @@ CAppMsgProcThread::getAlmLevelSoundInfo(const int nPriorityID, const int nRegion int m_nRegionID; } objKey{nPriorityID, nRegionID}; - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_alarm_level_sound_def); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_alarm_level_sound_def); const int nRecIndex = m_objRtdb_alarm_level_sound_def.searchRecordByKey(&objKey); if (nRecIndex < 0) @@ -918,5 +918,5 @@ CAppMsgProcThread::getAlmLevelSoundInfo(const int nPriorityID, const int nRegion return true; } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/CAppMsgProcThread.h b/platform/src/service/alarm_server/CAppMsgProcThread.h index e0b0a516..f016e9c3 100644 --- a/platform/src/service/alarm_server/CAppMsgProcThread.h +++ b/platform/src/service/alarm_server/CAppMsgProcThread.h @@ -39,12 +39,12 @@ #include "net_msg_bus_api/MsgBusApi.h" #include "rdb_api/CRdbAccess.h" -namespace kbd_service +namespace iot_service { class CMainProcThread; -class CAppMsgProcThread final : private kbd_public::CTimerThreadBase +class CAppMsgProcThread final : private iot_public::CTimerThreadBase { public: explicit CAppMsgProcThread(CMainProcThread &objMainProc); @@ -65,8 +65,8 @@ private: void handleOneMbMsg(); //< 注意： objInput 中部分内容会被取走！ - bool generateAlarm(const int nDomainID, const int nAppID, kbd_idlfile::SAlmInfoFromApp &objInput, - kbd_idlfile::SAlmInfoToAlmClt &objOutput); + bool generateAlarm(const int nDomainID, const int nAppID, iot_idl::SAlmInfoFromApp &objInput, + iot_idl::SAlmInfoToAlmClt &objOutput); void generateUuidBase64(std::string &strOut); @@ -74,15 +74,15 @@ private: bool getAlmTypeInfo(const int nAlmTypeID, int &nAlmSoundSource); bool getAlmStatusInfo(const int nAlmTypeID, const int nAlmStatID, - int &nAlmMannerID, kbd_dbms::CVarType &varFormat); + int &nAlmMannerID, iot_dbms::CVarType &varFormat); bool getAlmMannerInfo(const int nMannerID, int &nPriorityID, int &nIfAckOnRtn, int &nDelActOnAck, int &nIfNeverAlmOnRtn, int &nIfWater); - bool getAlmLevelInfo(const int nPriorityID, int &nIfEvent, kbd_dbms::CVarType &varSoundFile); + bool getAlmLevelInfo(const int nPriorityID, int &nIfEvent, iot_dbms::CVarType &varSoundFile); - bool getAlmLevelSoundInfo(const int nPriorityID, const int nRegionID, kbd_dbms::CVarType &varSoundFile); + bool getAlmLevelSoundInfo(const int nPriorityID, const int nRegionID, iot_dbms::CVarType &varSoundFile); private: @@ -95,8 +95,8 @@ private: CMainProcThread &m_objMainProc; //< 主处理类引用 - kbd_net::CMbCommunicator *m_pMbComm; //< 消息总线通讯器 - kbd_net::CMbMessage m_objMbMsgRcv; //< 接收的消息总线消息 + iot_net::CMbCommunicator *m_pMbComm; //< 消息总线通讯器 + iot_net::CMbMessage m_objMbMsgRcv; //< 接收的消息总线消息 //< Aho-Corasick 树 AC_TRIE_t *m_pAC_Trie; @@ -110,15 +110,15 @@ private: boost::unordered_map m_mapKeywordValue; //< 打开表的操作比较耗时，故一张表一个 CRtdbAccess，避免频繁打开表 - kbd_dbms::CRdbAccess m_objRtdb_alarm_type_define; - kbd_dbms::CRdbAccess m_objRtdb_alarm_status_define; - kbd_dbms::CRdbAccess m_objRtdb_alarm_manner_define; - kbd_dbms::CRdbAccess m_objRtdb_alarm_keyword_define; - kbd_dbms::CRdbAccess m_objRtdb_alarm_level_define; - kbd_dbms::CRdbAccess m_objRtdb_alarm_level_sound_def; + iot_dbms::CRdbAccess m_objRtdb_alarm_type_define; + iot_dbms::CRdbAccess m_objRtdb_alarm_status_define; + iot_dbms::CRdbAccess m_objRtdb_alarm_manner_define; + iot_dbms::CRdbAccess m_objRtdb_alarm_keyword_define; + iot_dbms::CRdbAccess m_objRtdb_alarm_level_define; + iot_dbms::CRdbAccess m_objRtdb_alarm_level_sound_def; //< handleOneMbMsg() 函数中使用，为了性能作为成员函数，避免频繁构造 - kbd_idlfile::SAppAddAlm m_objAppAddAlm; + iot_idl::SAppAddAlm m_objAppAddAlm; }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/CItlAlmSrv.cpp b/platform/src/service/alarm_server/CItlAlmSrv.cpp index 2c5abe22..c78b499f 100644 --- a/platform/src/service/alarm_server/CItlAlmSrv.cpp +++ b/platform/src/service/alarm_server/CItlAlmSrv.cpp @@ -15,7 +15,7 @@ #include "CItlAlmSrv.h" -namespace kbd_service +namespace iot_service { static CItlAlmSrv *g_pItlAlmSrvInst = nullptr; @@ -119,4 +119,4 @@ void CItlAlmSrv::handleI2R_ReleaseAck(const ConstSRawAlmInfoPtrVec &vecPtrReleas m_vecI2R_ReleaseAck.insert(m_vecI2R_ReleaseAck.end(), vecPtrRelease.begin(), vecPtrRelease.end()); } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/CItlAlmSrv.h b/platform/src/service/alarm_server/CItlAlmSrv.h index f5ea56bf..9f8db2ba 100644 --- a/platform/src/service/alarm_server/CItlAlmSrv.h +++ b/platform/src/service/alarm_server/CItlAlmSrv.h @@ -14,7 +14,7 @@ #include "intelli_alm_srv/CIntelliAlmSrv.h" #include "AlmSrvCommon.h" -namespace kbd_service +namespace iot_service { class CItlAlmSrv final : public intelli_alm_srv::CIntelliAlmSrv @@ -60,4 +60,4 @@ private: }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/CMainProcThread.cpp b/platform/src/service/alarm_server/CMainProcThread.cpp index 214805d3..85a2d8c2 100644 --- a/platform/src/service/alarm_server/CMainProcThread.cpp +++ b/platform/src/service/alarm_server/CMainProcThread.cpp @@ -28,7 +28,7 @@ //< 不应小于1000，否则大量告警来的时候，不能满负荷工作，见 m_nRcvTimeout 动态调节机制 #define MAX_APP_ADD_ALM_ONCE 5000 -namespace kbd_service +namespace iot_service { CMainProcThread::CMainProcThread() : @@ -64,7 +64,7 @@ bool CMainProcThread::resumeThread() if (nullptr == m_pMbComm) { - m_pMbComm = new kbd_net::CMbCommunicator(); + m_pMbComm = new iot_net::CMbCommunicator(); } //< 订阅所有专业 @@ -139,11 +139,11 @@ void CMainProcThread::addAlarmFromApp(const SAlmInfoPtr &ptrAlmInfo) m_queAppAddAlm.push(ptrAlmInfo); } -void CMainProcThread::addWaveFromApp( kbd_net::CMbMessage &objMbMsg ) +void CMainProcThread::addWaveFromApp( iot_net::CMbMessage &objMbMsg ) { //< 外部调用处已判断消息类型 - kbd_idlfile::SAppAddWave objAddWave; + iot_idl::SAppAddWave objAddWave; if ( !objAddWave.ParseFromArray( objMbMsg.getDataPtr(), ( int ) objMbMsg.getDataSize())) { LOGERROR( "SAppAddWave 反序列化失败，忽略！" ); @@ -187,7 +187,7 @@ void CMainProcThread::execute() if (!m_bIsWorking) return; - m_nTimeNow = kbd_public::getMonotonicMsec(); + m_nTimeNow = iot_public::getMonotonicMsec(); //< 定期发送序号 if (g_bMasterSyncOnly) @@ -200,7 +200,7 @@ void CMainProcThread::execute() //< 不修改数据，响应告警同步请求 { - kbd_net::CMbMessage objAlmFullSyncMsg; + iot_net::CMbMessage objAlmFullSyncMsg; handleAlmAllReq(objAlmFullSyncMsg); handleAlmRtReq(objAlmFullSyncMsg); handleAlmSeqNoReq(); @@ -275,8 +275,8 @@ void CMainProcThread::publishAlmSeqNo(unsigned int nIntervalMs) { if (m_nLastPubSeqNoTime + nIntervalMs < m_nTimeNow) { - kbd_net::CMbMessage objMbMsg; - objMbMsg.setMsgType(kbd_idlfile::MT_ALM_AS2AC_SEQNO); + iot_net::CMbMessage objMbMsg; + objMbMsg.setMsgType(iot_idl::MT_ALM_AS2AC_SEQNO); objMbMsg.setSubject(CN_AppId_PUBLIC, CH_ALM_TO_CLT_ALARM); objMbMsg.setData(cn_strSignature); objMbMsg.setPara1(CAlarmServer::getInstance().getDomainID()); @@ -298,7 +298,7 @@ void CMainProcThread::receiveMbMsg(bool bSyncOnly) while (true) { - CMbMessagePtr ptrMbMsgRcv = boost::make_shared(); + CMbMessagePtr ptrMbMsgRcv = boost::make_shared(); if (!m_pMbComm->recvMsg(*ptrMbMsgRcv, m_nRcvTimeout)) { @@ -309,7 +309,7 @@ void CMainProcThread::receiveMbMsg(bool bSyncOnly) switch (ptrMbMsgRcv->getMsgType()) { //< Alarm Client - case kbd_idlfile::MT_ALM_AC2AS_ALL_REQ: + case iot_idl::MT_ALM_AC2AS_ALL_REQ: { LOGDEBUG("Received MT_ALM_AC2AS_ALL_REQ"); @@ -326,7 +326,7 @@ void CMainProcThread::receiveMbMsg(bool bSyncOnly) } } break; - case kbd_idlfile::MT_ALM_AC2AS_CFM_REQ: + case iot_idl::MT_ALM_AC2AS_CFM_REQ: { LOGDEBUG("Received MT_ALM_AC2AS_CFM_REQ"); @@ -336,11 +336,11 @@ void CMainProcThread::receiveMbMsg(bool bSyncOnly) if (isMeasurePiontAlarmType((enAlarmType) ptrMbMsgRcv->getPara1())) { //< 测点类告警，转发给DP - ptrMbMsgRcv->setMsgType(kbd_idlfile::MT_ALM_AS2DP_CFM_REQ); + ptrMbMsgRcv->setMsgType(iot_idl::MT_ALM_AS2DP_CFM_REQ); { //< 告警窗来的确认消息是按测点AppID发的，修改通道即可 - kbd_net::CMbSubInfo objSub = ptrMbMsgRcv->getSubject(); + iot_net::CMbSubInfo objSub = ptrMbMsgRcv->getSubject(); objSub.setChannelID(CH_ALM_TO_DP); ptrMbMsgRcv->setSubject(objSub); } @@ -356,7 +356,7 @@ void CMainProcThread::receiveMbMsg(bool bSyncOnly) } } break; - case kbd_idlfile::MT_ALM_AC2AS_DEL_REQ: + case iot_idl::MT_ALM_AC2AS_DEL_REQ: { LOGDEBUG("Received MT_ALM_AC2AS_DEL_REQ"); @@ -366,7 +366,7 @@ void CMainProcThread::receiveMbMsg(bool bSyncOnly) } } break; - case kbd_idlfile::MT_ALM_AC2AS_RT_REQ: + case iot_idl::MT_ALM_AC2AS_RT_REQ: { LOGDEBUG("Received MT_ALM_AC2AS_RT_REQ"); @@ -383,7 +383,7 @@ void CMainProcThread::receiveMbMsg(bool bSyncOnly) } } break; - case kbd_idlfile::MT_ALM_AC2AS_SEQNO_REQ: + case iot_idl::MT_ALM_AC2AS_SEQNO_REQ: { LOGDEBUG("Received MT_ALM_AC2AS_SEQNO_REQ"); @@ -402,7 +402,7 @@ void CMainProcThread::receiveMbMsg(bool bSyncOnly) break; //< Data Process - case kbd_idlfile::MT_ALM_DP2AS_CFM: + case iot_idl::MT_ALM_DP2AS_CFM: { LOGDEBUG("Received MT_ALM_DP2AS_CFM"); @@ -425,7 +425,7 @@ void CMainProcThread::receiveMbMsg(bool bSyncOnly) } -void CMainProcThread::handleAlmAllReq(kbd_net::CMbMessage &objFullSyncMsg) +void CMainProcThread::handleAlmAllReq(iot_net::CMbMessage &objFullSyncMsg) { for (size_t i = 0; i < m_vecAlmAllReq.size(); i++) { @@ -435,7 +435,7 @@ void CMainProcThread::handleAlmAllReq(kbd_net::CMbMessage &objFullSyncMsg) } //< objFullSyncMsg还要用，先复制 - kbd_net::CMbMessage objMsgCopy = objFullSyncMsg; + iot_net::CMbMessage objMsgCopy = objFullSyncMsg; m_pMbComm->replyMsg(objMsgCopy, *(m_vecAlmAllReq[i])); } @@ -444,7 +444,7 @@ void CMainProcThread::handleAlmAllReq(kbd_net::CMbMessage &objFullSyncMsg) } -void CMainProcThread::handleAlmRtReq(kbd_net::CMbMessage &objFullSyncMsg) +void CMainProcThread::handleAlmRtReq(iot_net::CMbMessage &objFullSyncMsg) { for (size_t i = 0; i < m_vecAlmRtReq.size(); i++) { @@ -461,7 +461,7 @@ void CMainProcThread::handleAlmRtReq(kbd_net::CMbMessage &objFullSyncMsg) } //< objFullSyncMsg还要用，先复制 - kbd_net::CMbMessage objMsgCopy = objFullSyncMsg; + iot_net::CMbMessage objMsgCopy = objFullSyncMsg; m_pMbComm->replyMsg(objMsgCopy, *(ptrSrcMbMsg)); } @@ -469,7 +469,7 @@ void CMainProcThread::handleAlmRtReq(kbd_net::CMbMessage &objFullSyncMsg) { for (size_t j = 0; j < vecCachedMsg.size(); j++) { - kbd_net::CMbMessage objMbMsgRep; + iot_net::CMbMessage objMbMsgRep; if (vecCachedMsg[j]->serializeToMbMsg(objMbMsgRep)) { //< objMbMsgRep不再使用， 无需复制 @@ -493,8 +493,8 @@ void CMainProcThread::handleAlmSeqNoReq() for (size_t i = 0; i < m_vecAlmSeqNoReq.size(); i++) { //< 绝大多数情况 m_vecSeqNoReq 中数量只有1个，没必要循环外填充消息然后循环内复制 - kbd_net::CMbMessage objMbMsgRep; - objMbMsgRep.setMsgType(kbd_idlfile::MT_ALM_AS2AC_SEQNO); + iot_net::CMbMessage objMbMsgRep; + objMbMsgRep.setMsgType(iot_idl::MT_ALM_AS2AC_SEQNO); objMbMsgRep.setSubject(CN_AppId_PUBLIC, CH_ALM_TO_CLT_ALARM); objMbMsgRep.setData(cn_strSignature); objMbMsgRep.setPara1(CAlarmServer::getInstance().getDomainID()); @@ -577,7 +577,7 @@ void CMainProcThread::handleAlmAdd() //< 按 alm_type、app_id 分组，key为"alm_type-app_id" m_mapCfmAlm.clear(); - boost::int64_t nTimeNow = kbd_public::getUTCTimeMsec(); + boost::int64_t nTimeNow = iot_public::getUTCTimeMsec(); for (size_t i = 0; i < vecCfmToDp.size(); i++) { @@ -587,7 +587,7 @@ void CMainProcThread::handleAlmAdd() std::string strKey = boost::lexical_cast(ptrAlmInfoSrc->alm_type()) + "-"; strKey += boost::lexical_cast(ptrAlmInfoSrc->app_id()); - kbd_idlfile::SAlmCltCfmAlm *pCfmAlm /*= nullptr*/; + iot_idl::SAlmCltCfmAlm *pCfmAlm /*= nullptr*/; BOOST_AUTO(it, m_mapCfmAlm.find(strKey)); if (m_mapCfmAlm.end() == it) @@ -617,7 +617,7 @@ void CMainProcThread::handleAlmAdd() } //< 发送 - kbd_net::CMbMessage objMbMsg; + iot_net::CMbMessage objMbMsg; for (BOOST_AUTO(it, m_mapCfmAlm.begin()); it != m_mapCfmAlm.end(); ++it) { if (!(objMbMsg.setData(it->second))) @@ -625,9 +625,9 @@ void CMainProcThread::handleAlmAdd() LOGERROR("SAlmCltCfmAlm序列化失败！"); continue; } - objMbMsg.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMbMsg.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; - objMbMsg.setMsgType(kbd_idlfile::MT_ALM_AS2DP_CFM_REQ); + objMbMsg.setMsgType(iot_idl::MT_ALM_AS2DP_CFM_REQ); objMbMsg.setSubject(it->second.app_id(), CH_ALM_TO_DP); //< 发送后消息内容被清空 @@ -642,7 +642,7 @@ void CMainProcThread::handleAlmAdd() void CMainProcThread::handleAddWave() { - std::vector vecAppAddWave; + std::vector vecAppAddWave; { //< 加锁 boost::mutex::scoped_lock locker( m_mutexAppAdd ); @@ -660,11 +660,11 @@ void CMainProcThread::handleAddWave() //< 不要 return，还要提交修改历史事件 } - kbd_idlfile::SAlmCltLinkWave2Alm objCltLinkWave; + iot_idl::SAlmCltLinkWave2Alm objCltLinkWave; for ( size_t i = 0; i < vecAppAddWave.size(); ++i ) { - const kbd_idlfile::SAppAddWave &objAppAddWave = vecAppAddWave[i]; + const iot_idl::SAppAddWave &objAppAddWave = vecAppAddWave[i]; //< 事件可能已经不在内存中，所以需要数据库按条件更新 CAlmDataMng::saveDb_AlmWave(objAppAddWave); @@ -740,7 +740,7 @@ void CMainProcThread::publishNewAlmMsg() //< 向客户端发布 { - kbd_net::CMbMessage objMbMsgRep; + iot_net::CMbMessage objMbMsgRep; if (ptrCachedMsg->serializeToMbMsg(objMbMsgRep)) { //< objMbMsgRep不再使用， 无需复制 @@ -757,13 +757,13 @@ void CMainProcThread::publishNewAlmMsg() { switch (ptrCachedMsg->m_enMsgType) { - case kbd_idlfile::MT_ALM_AS2AC_ADD: + case iot_idl::MT_ALM_AS2AC_ADD: CItlAlmSrv::getInstance().pushR2I_AddAct(ptrCachedMsg->m_vecAlmInfoPtr); break; - case kbd_idlfile::MT_ALM_AS2AC_DEL: + case iot_idl::MT_ALM_AS2AC_DEL: CItlAlmSrv::getInstance().pushR2I_DelAct(ptrCachedMsg->m_vecAlmInfoPtr); break; - case kbd_idlfile::MT_ALM_AS2AC_RELEASE: + case iot_idl::MT_ALM_AS2AC_RELEASE: CItlAlmSrv::getInstance().pushR2I_ReleaseAct(ptrCachedMsg->m_vecAlmInfoPtr); break; default: @@ -777,4 +777,4 @@ void CMainProcThread::publishNewAlmMsg() } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/CMainProcThread.h b/platform/src/service/alarm_server/CMainProcThread.h index 1df94637..d0e122c7 100644 --- a/platform/src/service/alarm_server/CMainProcThread.h +++ b/platform/src/service/alarm_server/CMainProcThread.h @@ -16,13 +16,13 @@ #include "CAlmDataMng.h" -typedef boost::shared_ptr CMbMessagePtr; +typedef boost::shared_ptr CMbMessagePtr; typedef std::vector CMbMessagePtrVec; -namespace kbd_service +namespace iot_service { -class CMainProcThread final : private kbd_public::CTimerThreadBase +class CMainProcThread final : private iot_public::CTimerThreadBase { public: CMainProcThread(); @@ -40,7 +40,7 @@ public: void addAlarmFromApp(const SAlmInfoPtr &ptrAlmInfo); //< 添加录波信息，用于关联告警，CAppMsgProcThread 线程调用 - void addWaveFromApp( kbd_net::CMbMessage &objMbMsg ); + void addWaveFromApp( iot_net::CMbMessage &objMbMsg ); private: //< 检查并清空未处理的消息 @@ -56,8 +56,8 @@ private: void receiveMbMsg(bool bSyncOnly); //< 按类型处理消息 - void handleAlmAllReq(kbd_net::CMbMessage &objFullSyncMsg); - void handleAlmRtReq(kbd_net::CMbMessage &objFullSyncMsg); + void handleAlmAllReq(iot_net::CMbMessage &objFullSyncMsg); + void handleAlmRtReq(iot_net::CMbMessage &objFullSyncMsg); void handleAlmSeqNoReq(); void handleAlmCfm(); void handleAlmDelReq(); @@ -80,7 +80,7 @@ private: int m_nRcvTimeout; //< ms，线程的休息时间由接收消息超时时间控制 - kbd_net::CMbCommunicator *m_pMbComm; //< 消息总线通讯器 + iot_net::CMbCommunicator *m_pMbComm; //< 消息总线通讯器 //< 当前时间，开机后ms数 boost::int64_t m_nTimeNow; @@ -94,7 +94,7 @@ private: SAlmInfoPtrVec m_vecAppAddAlm; //< 为了避免频繁构造、释放，作为成员变量 //< SAppAddWave 比较简单且使用频次很低，就不用智能指针了 - std::vector m_vecAppAddWave; + std::vector m_vecAppAddWave; //< 一次处理循环中，各类消息分类缓存，再按序处理 CMbMessagePtrVec m_vecAlmAllReq; //< 告警全同步请求消息 @@ -105,9 +105,9 @@ private: //< handleAlmAdd() 中使用，用于给自动确认时，需发给DP的告警进行分组 //< 按 alm_type、app_id 分组，key为"alm_type-app_id" - std::map m_mapCfmAlm; + std::map m_mapCfmAlm; }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/CSlaveSyncThread.cpp b/platform/src/service/alarm_server/CSlaveSyncThread.cpp index d1263222..050485c2 100644 --- a/platform/src/service/alarm_server/CSlaveSyncThread.cpp +++ b/platform/src/service/alarm_server/CSlaveSyncThread.cpp @@ -16,7 +16,7 @@ #include "CMainProcThread.h" #include "CSlaveSyncThread.h" -namespace kbd_service +namespace iot_service { CSlaveSyncThread::CSlaveSyncThread(const CMainProcThread &objMainProc) : @@ -58,7 +58,7 @@ bool CSlaveSyncThread::resumeThread() if (nullptr == m_pMbComm) { - m_pMbComm = new kbd_net::CMbCommunicator(); + m_pMbComm = new iot_net::CMbCommunicator(); } //< 订阅 @@ -74,8 +74,8 @@ bool CSlaveSyncThread::resumeThread() //< 向主机请求当前序号 { - kbd_net::CMbMessage objMbMsg; - objMbMsg.setMsgType(kbd_idlfile::MT_ALM_AC2AS_SEQNO_REQ); + iot_net::CMbMessage objMbMsg; + objMbMsg.setMsgType(iot_idl::MT_ALM_AC2AS_SEQNO_REQ); objMbMsg.setSubject(CN_AppId_PUBLIC, CH_CLT_TO_ALM); objMbMsg.setData(cn_strSignature); //< 发送后消息内容被清空 @@ -84,7 +84,7 @@ bool CSlaveSyncThread::resumeThread() if (nullptr == m_pMbMsgRcv) { - m_pMbMsgRcv = new kbd_net::CMbMessage(); + m_pMbMsgRcv = new iot_net::CMbMessage(); } //< 先赋值，后resume() @@ -165,8 +165,8 @@ void CSlaveSyncThread::execute() void CSlaveSyncThread::replyAlmFullSyncReq() { - kbd_net::CMbMessage objMsgSend; - objMsgSend.setMsgType(kbd_idlfile::MT_ALM_AC2AS_ALL_REQ); + iot_net::CMbMessage objMsgSend; + objMsgSend.setMsgType(iot_idl::MT_ALM_AC2AS_ALL_REQ); objMsgSend.setSubject(CN_AppId_PUBLIC, CH_CLT_TO_ALM); objMsgSend.setData(cn_strSignature); @@ -179,8 +179,8 @@ void CSlaveSyncThread::replyAlmRtReq() if ((0 != m_nAlmLastRtTime) && (m_nAlmLastRtTime + 3000 > m_nTimeNow)) return; - kbd_net::CMbMessage objMsgSend; - objMsgSend.setMsgType(kbd_idlfile::MT_ALM_AC2AS_RT_REQ); + iot_net::CMbMessage objMsgSend; + objMsgSend.setMsgType(iot_idl::MT_ALM_AC2AS_RT_REQ); objMsgSend.setSubject(CN_AppId_PUBLIC, CH_CLT_TO_ALM); objMsgSend.setData(cn_strSignature); @@ -201,30 +201,30 @@ void CSlaveSyncThread::handleOneMbMsg() return; } - m_nTimeNow = kbd_public::getMonotonicMsec(); + m_nTimeNow = iot_public::getMonotonicMsec(); //< 按类型处理 switch (m_pMbMsgRcv->getMsgType()) { - case kbd_idlfile::MT_ALM_AS2AC_SEQNO: + case iot_idl::MT_ALM_AS2AC_SEQNO: handle_MT_ALM_AS2AC_SEQNO(); break; - case kbd_idlfile::MT_ALM_AS2AC_ALL: + case iot_idl::MT_ALM_AS2AC_ALL: handle_MT_ALM_AS2AC_ALL(); break; - case kbd_idlfile::MT_ALM_AS2AC_ADD: + case iot_idl::MT_ALM_AS2AC_ADD: handle_MT_ALM_AS2AC_ADD(); break; - case kbd_idlfile::MT_ALM_AS2AC_CFM: + case iot_idl::MT_ALM_AS2AC_CFM: handle_MT_ALM_AS2AC_CFM(); break; - case kbd_idlfile::MT_ALM_AS2AC_DEL: + case iot_idl::MT_ALM_AS2AC_DEL: handle_MT_ALM_AS2AC_DEL(); break; - case kbd_idlfile::MT_ALM_AS2AC_RELEASE: + case iot_idl::MT_ALM_AS2AC_RELEASE: handle_MT_ALM_AS2AC_RELEASE(); break; - case kbd_idlfile::MT_ALM_AS2AC_WAVE: + case iot_idl::MT_ALM_AS2AC_WAVE: handle_MT_ALM_AS2AC_WAVE(); break; default: @@ -458,4 +458,4 @@ void CSlaveSyncThread::handle_MT_ALM_AS2AC_WAVE() } } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/CSlaveSyncThread.h b/platform/src/service/alarm_server/CSlaveSyncThread.h index dcb47c2d..4e57f24f 100644 --- a/platform/src/service/alarm_server/CSlaveSyncThread.h +++ b/platform/src/service/alarm_server/CSlaveSyncThread.h @@ -12,12 +12,12 @@ #include "pub_utility_api/TimerThreadBase.h" #include "net_msg_bus_api/MsgBusApi.h" -namespace kbd_service +namespace iot_service { class CMainProcThread; -class CSlaveSyncThread final : private kbd_public::CTimerThreadBase +class CSlaveSyncThread final : private iot_public::CTimerThreadBase { public: explicit CSlaveSyncThread(const CMainProcThread &objMainProc); @@ -56,8 +56,8 @@ private: const CMainProcThread &m_objMainProc; //< 主处理类引用 - kbd_net::CMbCommunicator *m_pMbComm; //< 消息总线通讯器 - kbd_net::CMbMessage *m_pMbMsgRcv; //< 接收的消息总线消息 + iot_net::CMbCommunicator *m_pMbComm; //< 消息总线通讯器 + iot_net::CMbMessage *m_pMbMsgRcv; //< 接收的消息总线消息 boost::int64_t m_nTimeNow; //< 当前时间 @@ -68,5 +68,5 @@ private: std::string m_strMasterMbCommName; }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server/Main.cpp b/platform/src/service/alarm_server/Main.cpp index c663db54..a4b2f156 100644 --- a/platform/src/service/alarm_server/Main.cpp +++ b/platform/src/service/alarm_server/Main.cpp @@ -18,11 +18,11 @@ int main(int argc, char *argv[]) //ProfilerStart("./alarm_server.prof"); //< 控制单例生命周期 - kbd_service::CAlarmServer::GC objAlarmServerGc; - kbd_service::CAlmDataMng::GC objAlmDataMngGc; - kbd_service::CItlAlmSrv::GC objItlAlmSrvGc; + iot_service::CAlarmServer::GC objAlarmServerGc; + iot_service::CAlmDataMng::GC objAlmDataMngGc; + iot_service::CItlAlmSrv::GC objItlAlmSrvGc; - kbd_service::CAlarmServer::getInstance().main(argc, argv); + iot_service::CAlarmServer::getInstance().main(argc, argv); //ProfilerStop(); diff --git a/platform/src/service/alarm_server/test/alarm_test_rdb/main.cpp b/platform/src/service/alarm_server/test/alarm_test_rdb/main.cpp index aad5e7a5..1a539e68 100644 --- a/platform/src/service/alarm_server/test/alarm_test_rdb/main.cpp +++ b/platform/src/service/alarm_server/test/alarm_test_rdb/main.cpp @@ -22,7 +22,7 @@ using namespace boost::chrono; static volatile bool g_bNeedExit = false; -kbd_dbms::CRtdbAccess *g_pRtdbAccess = nullptr; +iot_dbms::CRtdbAccess *g_pRtdbAccess = nullptr; static void signalCallback(int /*sig*/) { @@ -40,7 +40,7 @@ static bool getAlmTypeInfo(const int nAlmTypeID, int &nAlmSoundSource) return false; } - kbd_dbms::CTableLockGuard tableLock(*g_pRtdbAccess); + iot_dbms::CTableLockGuard tableLock(*g_pRtdbAccess); const int nRecIndex = g_pRtdbAccess->searchRecordByKey(&nAlmTypeID); if (nRecIndex < 0) @@ -49,7 +49,7 @@ static bool getAlmTypeInfo(const int nAlmTypeID, int &nAlmSoundSource) return false; } - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; if (!(g_pRtdbAccess->getColumnValueByIndex(nRecIndex, "alarm_sound_source", objValue))) { LOGERROR("获取列值 alarm_sound_source 失败！"); @@ -71,7 +71,7 @@ static bool getAlmStatusInfo(const int nAlmTypeID, const int nAlmStatID, return false; } - kbd_dbms::CTableLockGuard tableLock(*g_pRtdbAccess); + iot_dbms::CTableLockGuard tableLock(*g_pRtdbAccess); struct STableKey { @@ -89,7 +89,7 @@ static bool getAlmStatusInfo(const int nAlmTypeID, const int nAlmStatID, } { - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; if (!(g_pRtdbAccess->getColumnValueByIndex(nRecIndex, "alarm_manner", objValue))) { LOGERROR("获取列值 alarm_manner 失败！"); @@ -99,7 +99,7 @@ static bool getAlmStatusInfo(const int nAlmTypeID, const int nAlmStatID, } { - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; if (!(g_pRtdbAccess->getColumnValueByIndex(nRecIndex, "alarm_format", objValue))) { LOGERROR("获取列值 alarm_format 失败！"); @@ -122,7 +122,7 @@ static bool getAlmMannerInfo(const int nMannerID, int &nPriorityID, return false; } - kbd_dbms::CTableLockGuard tableLock(*g_pRtdbAccess); + iot_dbms::CTableLockGuard tableLock(*g_pRtdbAccess); const int nRecIndex = g_pRtdbAccess->searchRecordByKey(&nMannerID); if (nRecIndex < 0) @@ -132,7 +132,7 @@ static bool getAlmMannerInfo(const int nMannerID, int &nPriorityID, } { - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; if (!(g_pRtdbAccess->getColumnValueByIndex(nRecIndex, "alarm_priority", objValue))) { LOGERROR("获取列值 alarm_priority 失败！"); @@ -142,7 +142,7 @@ static bool getAlmMannerInfo(const int nMannerID, int &nPriorityID, } { - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; if (!(g_pRtdbAccess->getColumnValueByIndex(nRecIndex, "if_ack_on_rtn", objValue))) { LOGERROR("获取列值 if_ack_on_rtn 失败！"); @@ -152,7 +152,7 @@ static bool getAlmMannerInfo(const int nMannerID, int &nPriorityID, } { - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; if (!(g_pRtdbAccess->getColumnValueByIndex(nRecIndex, "del_act_on_ack", objValue))) { LOGERROR("获取列值 del_act_on_ack 失败！"); @@ -162,7 +162,7 @@ static bool getAlmMannerInfo(const int nMannerID, int &nPriorityID, } { - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; if (!(g_pRtdbAccess->getColumnValueByIndex(nRecIndex, "if_never_alm_on_rtn", objValue))) { LOGERROR("获取列值 if_never_alm_on_rtn 失败！"); @@ -172,7 +172,7 @@ static bool getAlmMannerInfo(const int nMannerID, int &nPriorityID, } { - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; if (!(g_pRtdbAccess->getColumnValueByIndex(nRecIndex, "if_water_alm", objValue))) { LOGERROR("获取列值 if_water_alm 失败！"); @@ -193,7 +193,7 @@ static bool getAlmKeywordInfo(const int nKeywordID, std::string &strKeywordName) return false; } - kbd_dbms::CTableLockGuard tableLock(*g_pRtdbAccess); + iot_dbms::CTableLockGuard tableLock(*g_pRtdbAccess); const int nRecIndex = g_pRtdbAccess->searchRecordByKey(&nKeywordID); if (nRecIndex < 0) @@ -202,7 +202,7 @@ static bool getAlmKeywordInfo(const int nKeywordID, std::string &strKeywordName) return false; } - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; if (!(g_pRtdbAccess->getColumnValueByIndex(nRecIndex, "keyword_name", objValue))) { LOGERROR("获取列值 keyword_name 失败！"); @@ -225,7 +225,7 @@ int main(/*int argc, char *argv[]*/) signal(SIGQUIT, signalCallback); #endif - g_pRtdbAccess = new kbd_dbms::CRtdbAccess(); + g_pRtdbAccess = new iot_dbms::CRtdbAccess(); steady_clock::time_point tpStart, tpStop; diff --git a/platform/src/service/alarm_server_api/CAlmApiForAlmClt.cpp b/platform/src/service/alarm_server_api/CAlmApiForAlmClt.cpp index 95d62520..bf563f5e 100644 --- a/platform/src/service/alarm_server_api/CAlmApiForAlmClt.cpp +++ b/platform/src/service/alarm_server_api/CAlmApiForAlmClt.cpp @@ -12,7 +12,7 @@ #include "CAlmApiForAlmCltImp.h" -namespace kbd_service +namespace iot_service { CAlmApiForAlmClt::CAlmApiForAlmClt(bool bFaultRecallState) @@ -47,21 +47,21 @@ bool CAlmApiForAlmClt::suspendThread(bool bCleanStatus) } -bool CAlmApiForAlmClt::requestCfmAlm(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) +bool CAlmApiForAlmClt::requestCfmAlm(iot_idl::SAlmCltCfmAlm &objCfmAlm) { return m_pImp->requestCfmAlm(objCfmAlm); } -bool CAlmApiForAlmClt::requestDelAlm(kbd_idlfile::SAlmCltDelAlm &objDelAlm) +bool CAlmApiForAlmClt::requestDelAlm(iot_idl::SAlmCltDelAlm &objDelAlm) { return m_pImp->requestDelAlm(objDelAlm); } -void CAlmApiForAlmClt::handleLinkWave2AlmMsg( kbd_idlfile::SAlmCltLinkWave2Alm &) +void CAlmApiForAlmClt::handleLinkWave2AlmMsg( iot_idl::SAlmCltLinkWave2Alm &) { //< 某些客户端并不关心故障录波的关联，所以不用纯虚函数，此处写一个空函数实现 } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server_api/CAlmApiForAlmCltImp.cpp b/platform/src/service/alarm_server_api/CAlmApiForAlmCltImp.cpp index bfd73312..4e7eb493 100644 --- a/platform/src/service/alarm_server_api/CAlmApiForAlmCltImp.cpp +++ b/platform/src/service/alarm_server_api/CAlmApiForAlmCltImp.cpp @@ -18,7 +18,7 @@ #include "alarm_server_api/CAlmApiForAlmClt.h" #include "CAlmApiForAlmCltImp.h" -namespace kbd_service +namespace iot_service { CAlmApiForAlmCltImp::CAlmApiForAlmCltImp(CAlmApiForAlmClt *pParent, @@ -32,7 +32,7 @@ CAlmApiForAlmCltImp::CAlmApiForAlmCltImp(CAlmApiForAlmClt *pParent, m_pParent = pParent; //m_bInited = false; - m_nTimeNow = kbd_public::getMonotonicMsec(); + m_nTimeNow = iot_public::getMonotonicMsec(); m_nSrvStatCleanTime = m_nTimeNow; } @@ -82,7 +82,7 @@ bool CAlmApiForAlmCltImp::suspendThread(bool bCleanStatus) } -bool CAlmApiForAlmCltImp::requestCfmAlm(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) +bool CAlmApiForAlmCltImp::requestCfmAlm(iot_idl::SAlmCltCfmAlm &objCfmAlm) { if (objCfmAlm.uuid_base64_size() != objCfmAlm.time_stamp_size() || objCfmAlm.uuid_base64_size() != objCfmAlm.key_id_tag_size()) @@ -91,16 +91,16 @@ bool CAlmApiForAlmCltImp::requestCfmAlm(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) return false; } - kbd_net::CMbMessage objMsgSend; + iot_net::CMbMessage objMsgSend; if (!(objMsgSend.setData(objCfmAlm))) { LOGERROR("SAlmCltCfmAlm序列化失败，可能是有required字段未设值，请求确认失败！"); return false; } - objMsgSend.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMsgSend.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; - objMsgSend.setMsgType(kbd_idlfile::MT_ALM_AC2AS_CFM_REQ); + objMsgSend.setMsgType(iot_idl::MT_ALM_AC2AS_CFM_REQ); objMsgSend.setSubject(objCfmAlm.app_id(), m_nChannelOffset + CH_CLT_TO_ALM); //< 告警服务订阅所有专业的CH_CLT_TO_ALM通道 objMsgSend.setPara1(objCfmAlm.alm_type()); //< Para1是alm_type（方便服务端处理，可以先不反序列化） @@ -120,18 +120,18 @@ bool CAlmApiForAlmCltImp::requestCfmAlm(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) } -bool CAlmApiForAlmCltImp::requestDelAlm(kbd_idlfile::SAlmCltDelAlm &objDelAlm) +bool CAlmApiForAlmCltImp::requestDelAlm(iot_idl::SAlmCltDelAlm &objDelAlm) { - kbd_net::CMbMessage objMsgSend; + iot_net::CMbMessage objMsgSend; if (!(objMsgSend.setData(objDelAlm))) { LOGERROR("SAlmCltDelAlm序列化失败，可能是有required字段未设值，请求删除失败！"); return false; } - objMsgSend.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMsgSend.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; - objMsgSend.setMsgType(kbd_idlfile::MT_ALM_AC2AS_DEL_REQ); + objMsgSend.setMsgType(iot_idl::MT_ALM_AC2AS_DEL_REQ); objMsgSend.setSubject(CN_AppId_PUBLIC, m_nChannelOffset + CH_CLT_TO_ALM); /*if (!objMsgSend.isValid()) @@ -162,50 +162,50 @@ void CAlmApiForAlmCltImp::execute() if (!m_objComm.recvMsg(m_objMsgRcv, 200)) return; - m_nTimeNow = kbd_public::getMonotonicMsec(); + m_nTimeNow = iot_public::getMonotonicMsec(); cleanSrvStatMap(); //< 按类型处理 switch (m_objMsgRcv.getMsgType()) { - case kbd_idlfile::MT_ALM_AS2AC_SEQNO: + case iot_idl::MT_ALM_AS2AC_SEQNO: { //LOGDEBUG("Received MT_ALM_AS2AC_SEQNO"); handle_MT_ALM_AS2AC_SEQNO(); } break; - case kbd_idlfile::MT_ALM_AS2AC_ALL: + case iot_idl::MT_ALM_AS2AC_ALL: { //LOGDEBUG("Received MT_ALM_AS2AC_ALL"); handle_MT_ALM_AS2AC_ALL(); } break; - case kbd_idlfile::MT_ALM_AS2AC_ADD: + case iot_idl::MT_ALM_AS2AC_ADD: { //LOGDEBUG("Received MT_ALM_AS2AC_ADD"); handle_MT_ALM_AS2AC_ADD(); } break; - case kbd_idlfile::MT_ALM_AS2AC_CFM: + case iot_idl::MT_ALM_AS2AC_CFM: { //LOGDEBUG("Received MT_ALM_AS2AC_CFM"); handle_MT_ALM_AS2AC_CFM(); } break; - case kbd_idlfile::MT_ALM_AS2AC_DEL: + case iot_idl::MT_ALM_AS2AC_DEL: { //LOGDEBUG("Received MT_ALM_AS2AC_DEL"); handle_MT_ALM_AS2AC_DEL(); } break; - case kbd_idlfile::MT_ALM_AS2AC_RELEASE: + case iot_idl::MT_ALM_AS2AC_RELEASE: { //LOGDEBUG("Received MT_ALM_AS2AC_RELEASE"); handle_MT_ALM_AS2AC_RELEASE(); } break; - case kbd_idlfile::MT_ALM_AS2AC_WAVE: + case iot_idl::MT_ALM_AS2AC_WAVE: { //LOGDEBUG("Received MT_ALM_AS2AC_WAVE"); handle_MT_ALM_AS2AC_WAVE(); @@ -241,8 +241,8 @@ void CAlmApiForAlmCltImp::checkInit() LOGINFO("CAlmApiForAlmCltImp 添加订阅成功！"); //< 向告警服务请求当前序号 - kbd_net::CMbMessage objMbMsg; - objMbMsg.setMsgType(kbd_idlfile::MT_ALM_AC2AS_SEQNO_REQ); + iot_net::CMbMessage objMbMsg; + objMbMsg.setMsgType(iot_idl::MT_ALM_AC2AS_SEQNO_REQ); objMbMsg.setSubject(CN_AppId_PUBLIC, m_nChannelOffset + CH_CLT_TO_ALM); objMbMsg.setData(std::string("ALM")); @@ -277,8 +277,8 @@ void CAlmApiForAlmCltImp::cleanSrvStatMap() void CAlmApiForAlmCltImp::replyAllReq() { - kbd_net::CMbMessage objMsgSend; - objMsgSend.setMsgType(kbd_idlfile::MT_ALM_AC2AS_ALL_REQ); + iot_net::CMbMessage objMsgSend; + objMsgSend.setMsgType(iot_idl::MT_ALM_AC2AS_ALL_REQ); objMsgSend.setSubject(CN_AppId_PUBLIC, m_nChannelOffset + CH_CLT_TO_ALM); objMsgSend.setData(std::string("ALM")); @@ -294,8 +294,8 @@ void CAlmApiForAlmCltImp::replyRtReq(SAlmSrvStatus &objSrvStatus) LOGINFO("请求重传。"); - kbd_net::CMbMessage objMsgSend; - objMsgSend.setMsgType(kbd_idlfile::MT_ALM_AC2AS_RT_REQ); + iot_net::CMbMessage objMsgSend; + objMsgSend.setMsgType(iot_idl::MT_ALM_AC2AS_RT_REQ); objMsgSend.setSubject(CN_AppId_PUBLIC, m_nChannelOffset + CH_CLT_TO_ALM); objMsgSend.setData(std::string("ALM")); @@ -352,7 +352,7 @@ void CAlmApiForAlmCltImp::handle_MT_ALM_AS2AC_SEQNO() void CAlmApiForAlmCltImp::handle_MT_ALM_AS2AC_ALL() { //< 反序列化 - kbd_idlfile::SAlmCltAddAlm objAllAlm; + iot_idl::SAlmCltAddAlm objAllAlm; bool bRc = objAllAlm.ParseFromArray(m_objMsgRcv.getDataPtr(), (int) m_objMsgRcv.getDataSize()); if (!bRc) { @@ -375,7 +375,7 @@ void CAlmApiForAlmCltImp::handle_MT_ALM_AS2AC_ALL() void CAlmApiForAlmCltImp::handle_MT_ALM_AS2AC_ADD() { //< 反序列化 - kbd_idlfile::SAlmCltAddAlm objAddAlm; + iot_idl::SAlmCltAddAlm objAddAlm; bool bRc = objAddAlm.ParseFromArray(m_objMsgRcv.getDataPtr(), (int) m_objMsgRcv.getDataSize()); if (!bRc) { @@ -417,7 +417,7 @@ void CAlmApiForAlmCltImp::handle_MT_ALM_AS2AC_ADD() void CAlmApiForAlmCltImp::handle_MT_ALM_AS2AC_CFM() { //< 反序列化 - kbd_idlfile::SAlmCltCfmAlm objCfmAlm; + iot_idl::SAlmCltCfmAlm objCfmAlm; bool bRc = objCfmAlm.ParseFromArray(m_objMsgRcv.getDataPtr(), (int) m_objMsgRcv.getDataSize()); if (!bRc) { @@ -459,7 +459,7 @@ void CAlmApiForAlmCltImp::handle_MT_ALM_AS2AC_CFM() void CAlmApiForAlmCltImp::handle_MT_ALM_AS2AC_DEL() { //< 反序列化 - kbd_idlfile::SAlmCltDelAlm objDelAlm; + iot_idl::SAlmCltDelAlm objDelAlm; bool bRc = objDelAlm.ParseFromArray(m_objMsgRcv.getDataPtr(), (int) m_objMsgRcv.getDataSize()); if (!bRc) { @@ -501,7 +501,7 @@ void CAlmApiForAlmCltImp::handle_MT_ALM_AS2AC_DEL() void CAlmApiForAlmCltImp::handle_MT_ALM_AS2AC_RELEASE() { //< 反序列化 - kbd_idlfile::SAlmCltReleaseAlm objReleaseAlm; + iot_idl::SAlmCltReleaseAlm objReleaseAlm; bool bRc = objReleaseAlm.ParseFromArray(m_objMsgRcv.getDataPtr(), (int) m_objMsgRcv.getDataSize()); if (!bRc) { @@ -543,7 +543,7 @@ void CAlmApiForAlmCltImp::handle_MT_ALM_AS2AC_RELEASE() void CAlmApiForAlmCltImp::handle_MT_ALM_AS2AC_WAVE() { //< 反序列化 - kbd_idlfile::SAlmCltLinkWave2Alm objWave2Alm; + iot_idl::SAlmCltLinkWave2Alm objWave2Alm; bool bRc = objWave2Alm.ParseFromArray( m_objMsgRcv.getDataPtr(), (int) m_objMsgRcv.getDataSize()); if (!bRc) { @@ -580,5 +580,5 @@ void CAlmApiForAlmCltImp::handle_MT_ALM_AS2AC_WAVE() m_pParent->handleLinkWave2AlmMsg( objWave2Alm ); } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server_api/CAlmApiForAlmCltImp.h b/platform/src/service/alarm_server_api/CAlmApiForAlmCltImp.h index eb3c3946..3feeb567 100644 --- a/platform/src/service/alarm_server_api/CAlmApiForAlmCltImp.h +++ b/platform/src/service/alarm_server_api/CAlmApiForAlmCltImp.h @@ -38,12 +38,12 @@ #include "SAlmSrvStatus.h" -namespace kbd_service +namespace iot_service { class CAlmApiForAlmClt; -class CAlmApiForAlmCltImp : private kbd_public::CTimerThreadBase +class CAlmApiForAlmCltImp : private iot_public::CTimerThreadBase { public: CAlmApiForAlmCltImp(CAlmApiForAlmClt *pParent, bool bFaultRecallState); @@ -55,9 +55,9 @@ public: // 传入true后，下一次运行时会触发全同步 bool suspendThread(bool bCleanStatus = false); - bool requestCfmAlm(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm); + bool requestCfmAlm(iot_idl::SAlmCltCfmAlm &objCfmAlm); - bool requestDelAlm(kbd_idlfile::SAlmCltDelAlm &objDelAlm); + bool requestDelAlm(iot_idl::SAlmCltDelAlm &objDelAlm); private: void execute(); @@ -93,10 +93,10 @@ private: boost::int64_t m_nTimeNow; //< 当前时间 boost::int64_t m_nSrvStatCleanTime; //< 上一次清理m_mapSrvStat的时间，开机后毫秒数 CAlmApiForAlmClt *m_pParent; //< 父对象指针 - kbd_net::CMbCommunicator m_objComm; //< 消息总线通讯器，动态UUID命名 - kbd_net::CMbMessage m_objMsgRcv; //< 接收的消息总线消息 + iot_net::CMbCommunicator m_objComm; //< 消息总线通讯器，动态UUID命名 + iot_net::CMbMessage m_objMsgRcv; //< 接收的消息总线消息 std::map m_mapSrvStat; //< 服务端状态，key：DomainID }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server_api/CAlmApiForApp.cpp b/platform/src/service/alarm_server_api/CAlmApiForApp.cpp index 338b3306..aab7f033 100644 --- a/platform/src/service/alarm_server_api/CAlmApiForApp.cpp +++ b/platform/src/service/alarm_server_api/CAlmApiForApp.cpp @@ -12,7 +12,7 @@ #include "CAlmApiForAppImp.h" -namespace kbd_service +namespace iot_service { CAlmApiForApp::CAlmApiForApp(int nDomainID, int nAppID) @@ -37,16 +37,16 @@ bool CAlmApiForApp::suspendThread(bool bCleanPendingAlm) return m_pImp->suspendThread(bCleanPendingAlm); } -bool CAlmApiForApp::addAlarm(kbd_idlfile::SAppAddAlm &objAlarm) +bool CAlmApiForApp::addAlarm(iot_idl::SAppAddAlm &objAlarm) { return m_pImp->addAlarm(objAlarm); } -bool CAlmApiForApp::addWave(const kbd_idlfile::SAppAddWave &objWave) +bool CAlmApiForApp::addWave(const iot_idl::SAppAddWave &objWave) { return m_pImp->addWave(objWave); } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server_api/CAlmApiForAppImp.cpp b/platform/src/service/alarm_server_api/CAlmApiForAppImp.cpp index 93fa4159..b8b5484c 100644 --- a/platform/src/service/alarm_server_api/CAlmApiForAppImp.cpp +++ b/platform/src/service/alarm_server_api/CAlmApiForAppImp.cpp @@ -38,7 +38,7 @@ //< 输入队列的上限，防止异常情况下的内存无限制增长 #define CN_MAX_SIZE_OF_QUEUE 6000 -namespace kbd_service +namespace iot_service { //< 死锁检测6分钟，大于单次执行的最坏情况 @@ -88,7 +88,7 @@ bool CAlmApiForAppImp::suspendThread(bool bCleanPendingAlm) } -bool CAlmApiForAppImp::addAlarm(kbd_idlfile::SAppAddAlm &objAlarm) +bool CAlmApiForAppImp::addAlarm(iot_idl::SAppAddAlm &objAlarm) { if (objAlarm.alm_info_size() <= 0) { @@ -115,7 +115,7 @@ bool CAlmApiForAppImp::addAlarm(kbd_idlfile::SAppAddAlm &objAlarm) // LOGDEBUG("addAlarm(): 应用程序添加告警，内容如下：\n%s\n", strPrint.c_str()); //} - ptrCachedMsg->m_nMsgType = kbd_idlfile::MT_ALM_AP2AS_ADD; + ptrCachedMsg->m_nMsgType = iot_idl::MT_ALM_AP2AS_ADD; { //< 加锁 @@ -135,7 +135,7 @@ bool CAlmApiForAppImp::addAlarm(kbd_idlfile::SAppAddAlm &objAlarm) } -bool CAlmApiForAppImp::addWave( const kbd_idlfile::SAppAddWave &objWave ) +bool CAlmApiForAppImp::addWave( const iot_idl::SAppAddWave &objWave ) { if ( 0 == objWave.start_time() || 0 == objWave.end_time() || objWave.start_time() > objWave.end_time()) @@ -165,7 +165,7 @@ bool CAlmApiForAppImp::addWave( const kbd_idlfile::SAppAddWave &objWave ) return false; } - ptrCachedMsg->m_nMsgType = kbd_idlfile::MT_ALM_AP2AS_WAVE; + ptrCachedMsg->m_nMsgType = iot_idl::MT_ALM_AP2AS_WAVE; { //< 加锁 @@ -190,7 +190,7 @@ void CAlmApiForAppImp::execute() //< 一次运行最多发100条 for (int i = 0; i < 100; i++) { - kbd_net::CMbMessage objMbMsg; + iot_net::CMbMessage objMbMsg; while (m_objComm.recvMsg(objMbMsg, 0)) { //< 清空所有收到的消息，防止脏数据 @@ -296,5 +296,5 @@ void CAlmApiForAppImp::execute() } } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server_api/CAlmApiForAppImp.h b/platform/src/service/alarm_server_api/CAlmApiForAppImp.h index 3568267f..be5b089b 100644 --- a/platform/src/service/alarm_server_api/CAlmApiForAppImp.h +++ b/platform/src/service/alarm_server_api/CAlmApiForAppImp.h @@ -39,10 +39,10 @@ #include "pub_utility_api/TimerThreadBase.h" #include "net_msg_bus_api/MsgBusApi.h" -namespace kbd_service +namespace iot_service { -class CAlmApiForAppImp : private kbd_public::CTimerThreadBase +class CAlmApiForAppImp : private iot_public::CTimerThreadBase { public: CAlmApiForAppImp(int nDomainID, int nAppID); @@ -52,9 +52,9 @@ public: bool suspendThread(bool bCleanPendingAlm); - bool addAlarm(kbd_idlfile::SAppAddAlm &objAlarm); + bool addAlarm(iot_idl::SAppAddAlm &objAlarm); - bool addWave(const kbd_idlfile::SAppAddWave &objWave); + bool addWave(const iot_idl::SAppAddWave &objWave); private: void execute() override; @@ -77,10 +77,10 @@ private: int m_nDomainID; //< 域ID int m_nAppID; //< 应用ID int m_nSendSeq; //< 发送序号，从1开始，循环使用 - kbd_net::CMbCommunicator m_objComm; //< 消息总线通讯器，动态UUID命名 + iot_net::CMbCommunicator m_objComm; //< 消息总线通讯器，动态UUID命名 boost::mutex m_mutexQue; //< m_queCachedMsg的锁 std::queue m_queCachedMsg; //< 添加告警的队列 }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server_api/CAlmApiForDpSrv.cpp b/platform/src/service/alarm_server_api/CAlmApiForDpSrv.cpp index 8b02c1fa..e9b3730a 100644 --- a/platform/src/service/alarm_server_api/CAlmApiForDpSrv.cpp +++ b/platform/src/service/alarm_server_api/CAlmApiForDpSrv.cpp @@ -12,7 +12,7 @@ #include "CAlmApiForDpSrvImp.h" -namespace kbd_service +namespace iot_service { CAlmApiForDpSrv::CAlmApiForDpSrv(int nAppID) @@ -39,6 +39,6 @@ bool CAlmApiForDpSrv::suspendThread() return m_pImp->suspendThread(); } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server_api/CAlmApiForDpSrvImp.cpp b/platform/src/service/alarm_server_api/CAlmApiForDpSrvImp.cpp index 34a85677..437b0823 100644 --- a/platform/src/service/alarm_server_api/CAlmApiForDpSrvImp.cpp +++ b/platform/src/service/alarm_server_api/CAlmApiForDpSrvImp.cpp @@ -36,7 +36,7 @@ #include "alarm_server_api/CAlmApiForDpSrv.h" #include "CAlmApiForDpSrvImp.h" -namespace kbd_service +namespace iot_service { CAlmApiForDpSrvImp::CAlmApiForDpSrvImp(CAlmApiForDpSrv *pParent, int nAppID) : @@ -97,14 +97,14 @@ void CAlmApiForDpSrvImp::execute() checkInit(); //< 接收消息 - kbd_net::CMbMessage objMsgRcv; + iot_net::CMbMessage objMsgRcv; if (!m_objComm.recvMsg(objMsgRcv, 1000)) return; //< 按类型处理 switch (objMsgRcv.getMsgType()) { - case kbd_idlfile::MT_ALM_AS2DP_CFM_REQ: + case iot_idl::MT_ALM_AS2DP_CFM_REQ: { handle_MT_ALM_AS2DP_CFM_REQ(objMsgRcv); } @@ -123,7 +123,7 @@ void CAlmApiForDpSrvImp::checkInit() if (m_bInited) return; - kbd_net::CMbMessage objMsgRcv; + iot_net::CMbMessage objMsgRcv; while (m_objComm.recvMsg(objMsgRcv, 0)) { //< 清空所有收到的消息，防止脏数据 @@ -140,10 +140,10 @@ void CAlmApiForDpSrvImp::checkInit() m_bInited = true; } -void CAlmApiForDpSrvImp::handle_MT_ALM_AS2DP_CFM_REQ(const kbd_net::CMbMessage &objMsgRcv) +void CAlmApiForDpSrvImp::handle_MT_ALM_AS2DP_CFM_REQ(const iot_net::CMbMessage &objMsgRcv) { //< 反序列化接收消息 - kbd_idlfile::SAlmCltCfmAlm objCfmAlmRcv; + iot_idl::SAlmCltCfmAlm objCfmAlmRcv; bool bRc = objCfmAlmRcv.ParseFromArray(objMsgRcv.getDataPtr(), (int) objMsgRcv.getDataSize()); if (!bRc) { @@ -167,7 +167,7 @@ void CAlmApiForDpSrvImp::handle_MT_ALM_AS2DP_CFM_REQ(const kbd_net::CMbMessage & } //< 调用处理函数，填充回复消息 - kbd_idlfile::SAlmCltCfmAlm objCfmAlmSend; + iot_idl::SAlmCltCfmAlm objCfmAlmSend; objCfmAlmSend.set_node_name(objCfmAlmRcv.node_name()); objCfmAlmSend.set_user_id(objCfmAlmRcv.user_id()); @@ -213,16 +213,16 @@ void CAlmApiForDpSrvImp::handle_MT_ALM_AS2DP_CFM_REQ(const kbd_net::CMbMessage & return; } - kbd_net::CMbMessage objMsgSend; + iot_net::CMbMessage objMsgSend; bRc = objMsgSend.setData(objCfmAlmSend); if (!bRc) { LOGERROR("SAlmCltCfmAlm 序列化失败，检查程序！"); return; } - objMsgSend.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMsgSend.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; - objMsgSend.setMsgType(kbd_idlfile::MT_ALM_DP2AS_CFM); + objMsgSend.setMsgType(iot_idl::MT_ALM_DP2AS_CFM); objMsgSend.setSubject(m_nAppID, CH_DP_TO_ALM); //< 本应用ID if (!m_objComm.replyMsg(objMsgSend, objMsgRcv)) @@ -233,6 +233,6 @@ void CAlmApiForDpSrvImp::handle_MT_ALM_AS2DP_CFM_REQ(const kbd_net::CMbMessage & } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server_api/CAlmApiForDpSrvImp.h b/platform/src/service/alarm_server_api/CAlmApiForDpSrvImp.h index 825f1ff8..e574c148 100644 --- a/platform/src/service/alarm_server_api/CAlmApiForDpSrvImp.h +++ b/platform/src/service/alarm_server_api/CAlmApiForDpSrvImp.h @@ -13,17 +13,17 @@ #include "pub_utility_api/TimerThreadBase.h" #include "net_msg_bus_api/MsgBusApi.h" -namespace kbd_net +namespace iot_net { class CMbCommunicator; } -namespace kbd_service +namespace iot_service { class CAlmApiForDpSrv; -class CAlmApiForDpSrvImp : private kbd_public::CTimerThreadBase +class CAlmApiForDpSrvImp : private iot_public::CTimerThreadBase { public: CAlmApiForDpSrvImp(CAlmApiForDpSrv *pParent, int nAppID); @@ -41,15 +41,15 @@ private: void checkInit(); //< 消息处理函数 - void handle_MT_ALM_AS2DP_CFM_REQ(const kbd_net::CMbMessage &objMsgRcv); + void handle_MT_ALM_AS2DP_CFM_REQ(const iot_net::CMbMessage &objMsgRcv); private: bool m_bInited; //< 是否已成功初始化 int m_nAppID; //< 应用ID CAlmApiForDpSrv *m_pParent; //< 父对象指针 - kbd_net::CMbCommunicator m_objComm; //< 消息总线通讯器，动态UUID命名 + iot_net::CMbCommunicator m_objComm; //< 消息总线通讯器，动态UUID命名 }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server_api/CAlmApiForEvtClt.cpp b/platform/src/service/alarm_server_api/CAlmApiForEvtClt.cpp index 53915594..00fb8391 100644 --- a/platform/src/service/alarm_server_api/CAlmApiForEvtClt.cpp +++ b/platform/src/service/alarm_server_api/CAlmApiForEvtClt.cpp @@ -10,7 +10,7 @@ #include "alarm_server_api/CAlmApiForEvtClt.h" -namespace kbd_service +namespace iot_service { CAlmApiForEvtClt::CAlmApiForEvtClt(bool bFaultRecallState) @@ -37,18 +37,18 @@ bool CAlmApiForEvtClt::suspendThread(bool bCleanStatus) return CAlmApiForAlmClt::suspendThread(bCleanStatus); } -void CAlmApiForEvtClt::handleLinkWave2EvtMsg( kbd_idlfile::SAlmCltLinkWave2Alm &) +void CAlmApiForEvtClt::handleLinkWave2EvtMsg( iot_idl::SAlmCltLinkWave2Alm &) { //< 某些客户端并不关心故障录波的关联，所以不用纯虚函数，此处写一个空函数实现 } -static void convertAlarmToEvent(kbd_idlfile::SAlmCltAddAlm &objAddAlm, - kbd_idlfile::SEvtCltAddEvt &objAddEvt) +static void convertAlarmToEvent(iot_idl::SAlmCltAddAlm &objAddAlm, + iot_idl::SEvtCltAddEvt &objAddEvt) { for (int i = 0; i < objAddAlm.alm_info_size(); ++i) { - kbd_idlfile::SAlmInfoToAlmClt &objAlmInfo = *objAddAlm.mutable_alm_info(i); - kbd_idlfile::SEvtInfoToEvtClt &objEvtInfo = *objAddEvt.add_evt_info(); + iot_idl::SAlmInfoToAlmClt &objAlmInfo = *objAddAlm.mutable_alm_info(i); + iot_idl::SEvtInfoToEvtClt &objEvtInfo = *objAddEvt.add_evt_info(); //< 避免复制 objEvtInfo.mutable_uuid_base64()->swap(*objAlmInfo.mutable_uuid_base64()); @@ -107,44 +107,44 @@ static void convertAlarmToEvent(kbd_idlfile::SAlmCltAddAlm &objAddAlm, } } -void CAlmApiForEvtClt::handleAllAlmMsg(int nDomainID, kbd_idlfile::SAlmCltAddAlm &objAllAlm) +void CAlmApiForEvtClt::handleAllAlmMsg(int nDomainID, iot_idl::SAlmCltAddAlm &objAllAlm) { - kbd_idlfile::SEvtCltAddEvt objAllEvt; + iot_idl::SEvtCltAddEvt objAllEvt; convertAlarmToEvent(objAllAlm, objAllEvt); handleAllEvtMsg(nDomainID, objAllEvt); } -void CAlmApiForEvtClt::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm) +void CAlmApiForEvtClt::handleAddAlmMsg(iot_idl::SAlmCltAddAlm &objAddAlm) { - kbd_idlfile::SEvtCltAddEvt objAddEvt; + iot_idl::SEvtCltAddEvt objAddEvt; convertAlarmToEvent(objAddAlm, objAddEvt); handleAddEvtMsg(objAddEvt); } -void CAlmApiForEvtClt::handleCfmAlmMsg(kbd_idlfile::SAlmCltCfmAlm &) +void CAlmApiForEvtClt::handleCfmAlmMsg(iot_idl::SAlmCltCfmAlm &) { //< 无需任何处理 } -void CAlmApiForEvtClt::handleDelAlmMsg(kbd_idlfile::SAlmCltDelAlm &) +void CAlmApiForEvtClt::handleDelAlmMsg(iot_idl::SAlmCltDelAlm &) { //< 无需任何处理 } -void CAlmApiForEvtClt::handleReleaseAlmMsg(kbd_idlfile::SAlmCltReleaseAlm &) +void CAlmApiForEvtClt::handleReleaseAlmMsg(iot_idl::SAlmCltReleaseAlm &) { //< 无需任何处理 } -void CAlmApiForEvtClt::handleLinkWave2AlmMsg(kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Alm) +void CAlmApiForEvtClt::handleLinkWave2AlmMsg(iot_idl::SAlmCltLinkWave2Alm &objWave2Alm) { handleLinkWave2EvtMsg(objWave2Alm); } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/alarm_server_api/SAlmSrvStatus.h b/platform/src/service/alarm_server_api/SAlmSrvStatus.h index 79cb8b10..3c15ae9d 100644 --- a/platform/src/service/alarm_server_api/SAlmSrvStatus.h +++ b/platform/src/service/alarm_server_api/SAlmSrvStatus.h @@ -9,7 +9,7 @@ #pragma once -namespace kbd_service +namespace iot_service { struct SAlmSrvStatus @@ -35,5 +35,5 @@ public: std::string m_strMbCommName; }; -} //< namespace kbd_service +} //< namespace iot_service 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 91ab3328..49a092f6 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 @@ -4,7 +4,7 @@ #include "CAddAlmApp.h" -namespace kbd_service +namespace iot_service { CAddAlmApp::CAddAlmApp() @@ -17,7 +17,7 @@ CAddAlmApp::~CAddAlmApp() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } bool CAddAlmApp::start(int /*argc*/, char ** /*argv[]*/, int &/*nStatus*/) @@ -25,10 +25,10 @@ bool CAddAlmApp::start(int /*argc*/, char ** /*argv[]*/, int &/*nStatus*/) bool bRc = false; //< 1 - kbd_public::StartLogSystem("default", "alarm_test_add_alm"); + iot_public::StartLogSystem("default", "alarm_test_add_alm"); //< 2 - bRc = kbd_net::initMsgBus("alarm_test_add_alm", "1", true); + bRc = iot_net::initMsgBus("alarm_test_add_alm", "1", true); assert(bRc); //< 3 @@ -54,12 +54,12 @@ bool CAddAlmApp::stop() //< 2 { - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); } //< 1 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } diff --git a/platform/src/service/alarm_server_api/test/alarm_test_add_alm/CAddAlmApp.h b/platform/src/service/alarm_server_api/test/alarm_test_add_alm/CAddAlmApp.h index 58dcb1ab..016ab81f 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_add_alm/CAddAlmApp.h +++ b/platform/src/service/alarm_server_api/test/alarm_test_add_alm/CAddAlmApp.h @@ -6,10 +6,10 @@ #include "CAddAlmThread.h" -namespace kbd_service +namespace iot_service { -class CAddAlmApp : public kbd_public::CBaseService, kbd_sys::CProcessQuitInterface +class CAddAlmApp : public iot_public::CBaseService, iot_sys::CProcessQuitInterface { public: CAddAlmApp(); 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 d69c6464..d7843c03 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 @@ -13,10 +13,10 @@ #include "CAddAlmThread.h" -using namespace kbd_idlfile; -using namespace kbd_public; +using namespace iot_idl; +using namespace iot_public; -namespace kbd_service +namespace iot_service { const char* g_szDiDevGroupTag = "QHB.300MLBH"; @@ -32,13 +32,13 @@ CAddAlmThread::CAddAlmThread() : m_nPid = boost::this_process::get_id(); - m_nStartTimeMs = kbd_public::getMonotonicMsec(); + m_nStartTimeMs = iot_public::getMonotonicMsec(); //< m_pAlmApi { SNodeInfo stNodeInfo; CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + if (iot_public::createSysInfoInstance(spSysInfo)) { if (kbdSuccess != spSysInfo->getLocalNodeInfo(stNodeInfo)) { @@ -48,7 +48,7 @@ CAddAlmThread::CAddAlmThread() : } else { - std::cout << "false == kbd_public::createSysInfoInstance(spSysInfo)" << std::endl; + std::cout << "false == iot_public::createSysInfoInstance(spSysInfo)" << std::endl; } //< 测试数据库配置，APPID 4，电力 @@ -75,7 +75,7 @@ CAddAlmThread::~CAddAlmThread() } { - boost::int64_t nTimeMs = kbd_public::getMonotonicMsec() - m_nStartTimeMs; + boost::int64_t nTimeMs = iot_public::getMonotonicMsec() - m_nStartTimeMs; double dSpeed = (double) m_nAlmCnt * 1000 / nTimeMs; diff --git a/platform/src/service/alarm_server_api/test/alarm_test_add_alm/CAddAlmThread.h b/platform/src/service/alarm_server_api/test/alarm_test_add_alm/CAddAlmThread.h index 1d2eeb89..63862838 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_add_alm/CAddAlmThread.h +++ b/platform/src/service/alarm_server_api/test/alarm_test_add_alm/CAddAlmThread.h @@ -4,10 +4,10 @@ #include "alarm_server_api/CAlmApiForApp.h" -namespace kbd_service +namespace iot_service { -class CAddAlmThread : public kbd_public::CTimerThreadBase +class CAddAlmThread : public iot_public::CTimerThreadBase { public: CAddAlmThread(); @@ -45,12 +45,12 @@ private: boost::int64_t m_nStartTimeMs; - kbd_idlfile::SAppAddAlm m_alm_di_change; - kbd_idlfile::SAppAddAlm m_alm_ai_over; - kbd_idlfile::SAppAddAlm m_alm_soe; - kbd_idlfile::SAppAddAlm m_alm_operate; - kbd_idlfile::SAppAddAlm m_alm_system; - kbd_idlfile::SAppAddWave m_alm_wave; + iot_idl::SAppAddAlm m_alm_di_change; + iot_idl::SAppAddAlm m_alm_ai_over; + iot_idl::SAppAddAlm m_alm_soe; + iot_idl::SAppAddAlm m_alm_operate; + iot_idl::SAppAddAlm m_alm_system; + iot_idl::SAppAddWave m_alm_wave; }; } diff --git a/platform/src/service/alarm_server_api/test/alarm_test_add_alm/Main.cpp b/platform/src/service/alarm_server_api/test/alarm_test_add_alm/Main.cpp index 71c5da6f..c009fcd6 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_add_alm/Main.cpp +++ b/platform/src/service/alarm_server_api/test/alarm_test_add_alm/Main.cpp @@ -3,6 +3,6 @@ int main(int argc, char *argv[]) { - kbd_service::CAddAlmApp objApp; + iot_service::CAddAlmApp objApp; return objApp.main(argc, argv); } \ No newline at end of file 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 e18de188..0414ea43 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 @@ -4,7 +4,7 @@ #include "CAlmClt.h" -namespace kbd_service +namespace iot_service { CAlmClt::CAlmClt() @@ -17,7 +17,7 @@ CAlmClt::~CAlmClt() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } bool CAlmClt::start(int /*argc*/, char ** /*argv[]*/, int &/*nStatus*/) @@ -25,10 +25,10 @@ bool CAlmClt::start(int /*argc*/, char ** /*argv[]*/, int &/*nStatus*/) bool bRc = false; //< 1 - kbd_public::StartLogSystem("default", "alarm_test_fake_alm_clt"); + iot_public::StartLogSystem("default", "alarm_test_fake_alm_clt"); //< 2 - bRc = kbd_net::initMsgBus("alarm_test_fake_alm_clt", "1", true); + bRc = iot_net::initMsgBus("alarm_test_fake_alm_clt", "1", true); assert(bRc); //< 3 @@ -58,13 +58,13 @@ bool CAlmClt::stop() //< 2 { - bRc = kbd_net::releaseMsgBus(); + bRc = iot_net::releaseMsgBus(); //assert(bRc); } //< 1 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } diff --git a/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/CAlmClt.h b/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/CAlmClt.h index 26a6d3b8..99f51108 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/CAlmClt.h +++ b/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/CAlmClt.h @@ -6,10 +6,10 @@ #include "CMsgThread.h" -namespace kbd_service +namespace iot_service { -class CAlmClt : public kbd_public::CBaseService, kbd_sys::CProcessQuitInterface +class CAlmClt : public iot_public::CBaseService, iot_sys::CProcessQuitInterface { public: CAlmClt(); diff --git a/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/CMsgThread.cpp b/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/CMsgThread.cpp index 7b0752da..672bad08 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/CMsgThread.cpp +++ b/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/CMsgThread.cpp @@ -31,20 +31,20 @@ //#define VERBOSE_DEBUG_INFO #define VERBOSE_DEBUG_INFO_WAVE -namespace kbd_service +namespace iot_service { CMsgThread::CMsgThread() { m_nAlmCnt = 0; - m_nStartTimeMs = kbd_public::getMonotonicMsec(); + m_nStartTimeMs = iot_public::getMonotonicMsec(); } CMsgThread::~CMsgThread() { - boost::int64_t nTimeMs = kbd_public::getMonotonicMsec() - m_nStartTimeMs; + boost::int64_t nTimeMs = iot_public::getMonotonicMsec() - m_nStartTimeMs; double dSpeed = (double) m_nAlmCnt * 1000 / nTimeMs; @@ -55,7 +55,7 @@ CMsgThread::~CMsgThread() std::cout << "*********************************************************\n" << std::endl; } -void CMsgThread::handleAllAlmMsg(int nDomainID, kbd_idlfile::SAlmCltAddAlm &objAllAlm) +void CMsgThread::handleAllAlmMsg(int nDomainID, iot_idl::SAlmCltAddAlm &objAllAlm) { std::cout << "handleAllAlmMsg() nDomainID == " << nDomainID << " , objAllAlm.alm_info_size() == " << objAllAlm.alm_info_size() << std::endl; @@ -65,11 +65,11 @@ void CMsgThread::handleAllAlmMsg(int nDomainID, kbd_idlfile::SAlmCltAddAlm &objA google::protobuf::TextFormat::PrintToString(objAllAlm, &strPrint); - std::cout << "kbd_idlfile::SAlmCltAddAlm : \n " << strPrint << "\n\n" << std::endl; + std::cout << "iot_idl::SAlmCltAddAlm : \n " << strPrint << "\n\n" << std::endl; */ } -void CMsgThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm) +void CMsgThread::handleAddAlmMsg(iot_idl::SAlmCltAddAlm &objAddAlm) { #ifdef VERBOSE_DEBUG_INFO std::cout << "handleAddAlmMsg()" << std::endl; @@ -78,7 +78,7 @@ void CMsgThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm) google::protobuf::TextFormat::PrintToString(objAddAlm, &strPrint); - std::cout << "kbd_idlfile::SAlmCltAddAlm : \n " << strPrint << "\n\n" << std::endl; + std::cout << "iot_idl::SAlmCltAddAlm : \n " << strPrint << "\n\n" << std::endl; #else for (int i = 0; i < objAddAlm.alm_info_size(); ++i) { @@ -89,7 +89,7 @@ void CMsgThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm) m_nAlmCnt += objAddAlm.alm_info_size(); } -void CMsgThread::handleCfmAlmMsg(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) +void CMsgThread::handleCfmAlmMsg(iot_idl::SAlmCltCfmAlm &objCfmAlm) { #ifdef VERBOSE_DEBUG_INFO std::cout << "handleCfmAlmMsg()" << std::endl; @@ -98,14 +98,14 @@ void CMsgThread::handleCfmAlmMsg(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) google::protobuf::TextFormat::PrintToString(objCfmAlm, &strPrint); - std::cout << "kbd_idlfile::SAlmCltCfmAlm : \n " << strPrint << "\n\n" << std::endl; + std::cout << "iot_idl::SAlmCltCfmAlm : \n " << strPrint << "\n\n" << std::endl; #else boost::ignore_unused(objCfmAlm); #endif } -void CMsgThread::handleDelAlmMsg(kbd_idlfile::SAlmCltDelAlm &objDelAlm) +void CMsgThread::handleDelAlmMsg(iot_idl::SAlmCltDelAlm &objDelAlm) { #ifdef VERBOSE_DEBUG_INFO std::cout << "handleDelAlmMsg()" << std::endl; @@ -114,14 +114,14 @@ void CMsgThread::handleDelAlmMsg(kbd_idlfile::SAlmCltDelAlm &objDelAlm) google::protobuf::TextFormat::PrintToString(objDelAlm, &strPrint); - std::cout << "kbd_idlfile::SAlmCltDelAlm : \n " << strPrint << "\n\n" << std::endl; + std::cout << "iot_idl::SAlmCltDelAlm : \n " << strPrint << "\n\n" << std::endl; #else boost::ignore_unused(objDelAlm); #endif } -void CMsgThread::handleReleaseAlmMsg(kbd_idlfile::SAlmCltReleaseAlm &objReleaseAlm) +void CMsgThread::handleReleaseAlmMsg(iot_idl::SAlmCltReleaseAlm &objReleaseAlm) { #ifdef VERBOSE_DEBUG_INFO std::cout << "handleReleaseAlmMsg()" << std::endl; @@ -130,13 +130,13 @@ void CMsgThread::handleReleaseAlmMsg(kbd_idlfile::SAlmCltReleaseAlm &objReleaseA google::protobuf::TextFormat::PrintToString(objDelAlm, &strPrint); - std::cout << "kbd_idlfile::SAlmCltDelAlm : \n " << strPrint << "\n\n" << std::endl; + std::cout << "iot_idl::SAlmCltDelAlm : \n " << strPrint << "\n\n" << std::endl; #else boost::ignore_unused(objReleaseAlm); #endif } -void CMsgThread::handleLinkWave2AlmMsg( kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Alm) +void CMsgThread::handleLinkWave2AlmMsg( iot_idl::SAlmCltLinkWave2Alm &objWave2Alm) { #ifdef VERBOSE_DEBUG_INFO_WAVE std::cout << "handleLinkWave2AlmMsg()" << std::endl; @@ -145,7 +145,7 @@ void CMsgThread::handleLinkWave2AlmMsg( kbd_idlfile::SAlmCltLinkWave2Alm &objWav google::protobuf::TextFormat::PrintToString(objWave2Alm, &strPrint); - std::cout << "kbd_idlfile::SAlmCltLinkWave2Alm : \n " << strPrint << "\n\n" << std::endl; + std::cout << "iot_idl::SAlmCltLinkWave2Alm : \n " << strPrint << "\n\n" << std::endl; #else boost::ignore_unused(objWave2Alm); #endif diff --git a/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/CMsgThread.h b/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/CMsgThread.h index ade6aaa4..0b9a840e 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/CMsgThread.h +++ b/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/CMsgThread.h @@ -1,26 +1,26 @@  #include "alarm_server_api/CAlmApiForAlmClt.h" -namespace kbd_service +namespace iot_service { -class CMsgThread : public kbd_service::CAlmApiForAlmClt +class CMsgThread : public iot_service::CAlmApiForAlmClt { public: CMsgThread(); virtual ~CMsgThread(); - void handleAllAlmMsg(int nDomainID, kbd_idlfile::SAlmCltAddAlm &objAllAlm) override; + void handleAllAlmMsg(int nDomainID, iot_idl::SAlmCltAddAlm &objAllAlm) override; - void handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm) override; + void handleAddAlmMsg(iot_idl::SAlmCltAddAlm &objAddAlm) override; - void handleCfmAlmMsg(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) override; + void handleCfmAlmMsg(iot_idl::SAlmCltCfmAlm &objCfmAlm) override; - void handleDelAlmMsg(kbd_idlfile::SAlmCltDelAlm &objDelAlm) override; + void handleDelAlmMsg(iot_idl::SAlmCltDelAlm &objDelAlm) override; - void handleReleaseAlmMsg(kbd_idlfile::SAlmCltReleaseAlm &objReleaseAlm) override; + void handleReleaseAlmMsg(iot_idl::SAlmCltReleaseAlm &objReleaseAlm) override; - void handleLinkWave2AlmMsg( kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Alm) override; + void handleLinkWave2AlmMsg( iot_idl::SAlmCltLinkWave2Alm &objWave2Alm) override; private: int m_nAlmCnt; diff --git a/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/Main.cpp b/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/Main.cpp index 1e69264c..35474da5 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/Main.cpp +++ b/platform/src/service/alarm_server_api/test/alarm_test_fake_alm_clt/Main.cpp @@ -3,6 +3,6 @@ int main(int argc, char *argv[]) { - kbd_service::CAlmClt objApp; + iot_service::CAlmClt objApp; return objApp.main(argc, argv); } \ No newline at end of file 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 6eca282a..3f73d64f 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 @@ -4,7 +4,7 @@ #include "CFakeDp.h" -namespace kbd_service +namespace iot_service { CFakeDp::CFakeDp() @@ -17,7 +17,7 @@ CFakeDp::~CFakeDp() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } bool CFakeDp::start(int /*argc*/, char ** /*argv[]*/, int &/*nStatus*/) @@ -25,10 +25,10 @@ bool CFakeDp::start(int /*argc*/, char ** /*argv[]*/, int &/*nStatus*/) bool bRc = false; //< 1 - kbd_public::StartLogSystem("default", "alarm_test_fake_dp"); + iot_public::StartLogSystem("default", "alarm_test_fake_dp"); //< 2 - bRc = kbd_net::initMsgBus("alarm_test_fake_dp", "1", true); + bRc = iot_net::initMsgBus("alarm_test_fake_dp", "1", true); assert(bRc); //< 3 @@ -58,13 +58,13 @@ bool CFakeDp::stop() //< 2 { - bRc = kbd_net::releaseMsgBus(); + bRc = iot_net::releaseMsgBus(); //assert(bRc); } //< 1 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } diff --git a/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/CFakeDp.h b/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/CFakeDp.h index ae5060db..7d9f0823 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/CFakeDp.h +++ b/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/CFakeDp.h @@ -6,10 +6,10 @@ #include "CMsgThread.h" -namespace kbd_service +namespace iot_service { -class CFakeDp : public kbd_public::CBaseService, kbd_sys::CProcessQuitInterface +class CFakeDp : public iot_public::CBaseService, iot_sys::CProcessQuitInterface { public: CFakeDp(); 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 c96014c5..f9a66087 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 @@ -5,7 +5,7 @@ #include "CMsgThread.h" -namespace kbd_service +namespace iot_service { CMsgThread::CMsgThread() : CAlmApiForDpSrv(4) //< 测试数据库配置，APPID 4，电力 diff --git a/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/CMsgThread.h b/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/CMsgThread.h index d61e1241..59394b99 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/CMsgThread.h +++ b/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/CMsgThread.h @@ -1,10 +1,10 @@  #include "alarm_server_api/CAlmApiForDpSrv.h" -namespace kbd_service +namespace iot_service { -class CMsgThread : public kbd_service::CAlmApiForDpSrv +class CMsgThread : public iot_service::CAlmApiForDpSrv { public: CMsgThread(); diff --git a/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/Main.cpp b/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/Main.cpp index 59842175..9af1fd59 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/Main.cpp +++ b/platform/src/service/alarm_server_api/test/alarm_test_fake_dp/Main.cpp @@ -3,6 +3,6 @@ int main(int argc, char *argv[]) { - kbd_service::CFakeDp objApp; + iot_service::CFakeDp objApp; return objApp.main(argc, argv); } 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 40b1bd39..67b4a521 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 @@ -4,7 +4,7 @@ #include "CEvtClt.h" -namespace kbd_service +namespace iot_service { CEvtClt::CEvtClt() @@ -17,7 +17,7 @@ CEvtClt::~CEvtClt() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } bool CEvtClt::start(int /*argc*/, char ** /*argv[]*/, int &/*nStatus*/) @@ -25,10 +25,10 @@ bool CEvtClt::start(int /*argc*/, char ** /*argv[]*/, int &/*nStatus*/) bool bRc = false; //< 1 - kbd_public::StartLogSystem("default", "alarm_test_fake_evt_clt"); + iot_public::StartLogSystem("default", "alarm_test_fake_evt_clt"); //< 2 - bRc = kbd_net::initMsgBus("alarm_test_fake_evt_clt", "1", true); + bRc = iot_net::initMsgBus("alarm_test_fake_evt_clt", "1", true); assert(bRc); //< 3 @@ -58,13 +58,13 @@ bool CEvtClt::stop() //< 2 { - bRc = kbd_net::releaseMsgBus(); + bRc = iot_net::releaseMsgBus(); //assert(bRc); } //< 1 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } diff --git a/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/CEvtClt.h b/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/CEvtClt.h index 5f259f73..f15634ef 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/CEvtClt.h +++ b/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/CEvtClt.h @@ -6,10 +6,10 @@ #include "CMsgThread.h" -namespace kbd_service +namespace iot_service { -class CEvtClt : public kbd_public::CBaseService, kbd_sys::CProcessQuitInterface +class CEvtClt : public iot_public::CBaseService, iot_sys::CProcessQuitInterface { public: CEvtClt(); diff --git a/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/CMsgThread.cpp b/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/CMsgThread.cpp index b5201956..1a676191 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/CMsgThread.cpp +++ b/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/CMsgThread.cpp @@ -30,20 +30,20 @@ //#define VERBOSE_DEBUG_INFO -namespace kbd_service +namespace iot_service { CMsgThread::CMsgThread() { m_nEvtCnt = 0; - m_nStartTimeMs = kbd_public::getMonotonicMsec(); + m_nStartTimeMs = iot_public::getMonotonicMsec(); } CMsgThread::~CMsgThread() { - boost::int64_t nTimeMs = kbd_public::getMonotonicMsec() - m_nStartTimeMs; + boost::int64_t nTimeMs = iot_public::getMonotonicMsec() - m_nStartTimeMs; double dSpeed = (double) m_nEvtCnt * 1000 / nTimeMs; @@ -54,7 +54,7 @@ CMsgThread::~CMsgThread() std::cout << "*********************************************************\n" << std::endl; } -void CMsgThread::handleAllEvtMsg(int nDomainID, kbd_idlfile::SEvtCltAddEvt &objAllEvt) +void CMsgThread::handleAllEvtMsg(int nDomainID, iot_idl::SEvtCltAddEvt &objAllEvt) { std::cout << "handleAllEvtMsg() nDomainID == " << nDomainID << " , objAllEvt.evt_info_size() == " << objAllEvt.evt_info_size() << std::endl; @@ -64,11 +64,11 @@ void CMsgThread::handleAllEvtMsg(int nDomainID, kbd_idlfile::SEvtCltAddEvt &objA google::protobuf::TextFormat::PrintToString(objAllEvt, &strPrint); - std::cout << "kbd_idlfile::SEvtCltAddEvt : \n " << strPrint << "\n\n" << std::endl; + std::cout << "iot_idl::SEvtCltAddEvt : \n " << strPrint << "\n\n" << std::endl; */ } -void CMsgThread::handleAddEvtMsg(kbd_idlfile::SEvtCltAddEvt &objAddEvt) +void CMsgThread::handleAddEvtMsg(iot_idl::SEvtCltAddEvt &objAddEvt) { #ifdef VERBOSE_DEBUG_INFO std::cout << "handleAddEvtMsg()" << std::endl; @@ -77,7 +77,7 @@ void CMsgThread::handleAddEvtMsg(kbd_idlfile::SEvtCltAddEvt &objAddEvt) google::protobuf::TextFormat::PrintToString(objAddEvt, &strPrint); - std::cout << "kbd_idlfile::SEvtCltAddEvt : \n " << strPrint << "\n\n" << std::endl; + std::cout << "iot_idl::SEvtCltAddEvt : \n " << strPrint << "\n\n" << std::endl; #else //boost::ignore_unused(objAddEvt); #endif diff --git a/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/CMsgThread.h b/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/CMsgThread.h index 59381200..dbc5201e 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/CMsgThread.h +++ b/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/CMsgThread.h @@ -1,18 +1,18 @@  #include "alarm_server_api/CAlmApiForEvtClt.h" -namespace kbd_service +namespace iot_service { -class CMsgThread : public kbd_service::CAlmApiForEvtClt +class CMsgThread : public iot_service::CAlmApiForEvtClt { public: CMsgThread(); virtual ~CMsgThread(); - virtual void handleAllEvtMsg(int nDomainID, kbd_idlfile::SEvtCltAddEvt &objAllEvt) override; + virtual void handleAllEvtMsg(int nDomainID, iot_idl::SEvtCltAddEvt &objAllEvt) override; - virtual void handleAddEvtMsg(kbd_idlfile::SEvtCltAddEvt &objAddEvt) override; + virtual void handleAddEvtMsg(iot_idl::SEvtCltAddEvt &objAddEvt) override; private: int m_nEvtCnt; diff --git a/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/Main.cpp b/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/Main.cpp index ef08f866..aa0b6838 100644 --- a/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/Main.cpp +++ b/platform/src/service/alarm_server_api/test/alarm_test_fake_evt_clt/Main.cpp @@ -3,6 +3,6 @@ int main(int argc, char *argv[]) { - kbd_service::CEvtClt objApp; + iot_service::CEvtClt objApp; return objApp.main(argc, argv); } \ No newline at end of file diff --git a/platform/src/service/alarm_system/CAlarmSystem.cpp b/platform/src/service/alarm_system/CAlarmSystem.cpp index fa4165c3..42f2b9d0 100644 --- a/platform/src/service/alarm_system/CAlarmSystem.cpp +++ b/platform/src/service/alarm_system/CAlarmSystem.cpp @@ -4,17 +4,17 @@ #include "net_msg_bus_api/MsgBusApi.h" using namespace std; -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_service; +using namespace iot_net; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_service; #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" const std::string g_sProcessName = "alarm_system"; //< 当前进程名 -kbd_service::CAlarmSystem::CAlarmSystem() +iot_service::CAlarmSystem::CAlarmSystem() :m_ptrSysInfo(NULL), m_ptrProcMng(NULL), m_ptrRedundancyMng(NULL), @@ -22,12 +22,12 @@ kbd_service::CAlarmSystem::CAlarmSystem() { } -kbd_service::CAlarmSystem::~CAlarmSystem() +iot_service::CAlarmSystem::~CAlarmSystem() { stop(); } -bool kbd_service::CAlarmSystem::start(int argc, char *argv[], int &/*nStatus*/) +bool iot_service::CAlarmSystem::start(int argc, char *argv[], int &/*nStatus*/) { //1.解析启动参数 if (!parseCmdLine(argc, argv)) @@ -102,7 +102,7 @@ bool kbd_service::CAlarmSystem::start(int argc, char *argv[], int &/*nStatus*/) return true; } -bool kbd_service::CAlarmSystem::stop() +bool iot_service::CAlarmSystem::stop() { //10.更新当前进程冗余状态 if (m_ptrProcMng != NULL) @@ -141,7 +141,7 @@ bool kbd_service::CAlarmSystem::stop() return true; } -int kbd_service::CAlarmSystem::toQuit() +int iot_service::CAlarmSystem::toQuit() { if (m_ptrProcMng != NULL) { @@ -152,7 +152,7 @@ int kbd_service::CAlarmSystem::toQuit() return kbdSuccess; } -bool kbd_service::CAlarmSystem::parseCmdLine(int argc, char *argv[]) +bool iot_service::CAlarmSystem::parseCmdLine(int argc, char *argv[]) { /* @brief 拼接启动参数，用于向进程管理注册 */ for (int i = 1; i < argc; ++i) @@ -214,26 +214,26 @@ bool kbd_service::CAlarmSystem::parseCmdLine(int argc, char *argv[]) return true; } -void kbd_service::CAlarmSystem::showHelp(const boost::program_options::options_description &objDesc) +void iot_service::CAlarmSystem::showHelp(const boost::program_options::options_description &objDesc) { std::cout << g_sProcessName << " [-h] | [-a app]" << std::endl; std::cout << objDesc << std::endl; } -bool kbd_service::CAlarmSystem::isAlreadyRunning() +bool iot_service::CAlarmSystem::isAlreadyRunning() { string strUniqueName = g_sProcessName; strUniqueName += m_strStartArgs; return CSingleProcInstance::hasInstanceRunning(strUniqueName); } -bool kbd_service::CAlarmSystem::initLog() +bool iot_service::CAlarmSystem::initLog() { StartLogSystem(m_strAppName.c_str(), g_sProcessName.c_str()); return true; } -bool kbd_service::CAlarmSystem::getSystemInfo() +bool iot_service::CAlarmSystem::getSystemInfo() { if (!createSysInfoInstance(m_ptrSysInfo)) { @@ -250,13 +250,13 @@ bool kbd_service::CAlarmSystem::getSystemInfo() return true; } -bool kbd_service::CAlarmSystem::initMessageBus() +bool iot_service::CAlarmSystem::initMessageBus() { return initMsgBus( g_sProcessName.c_str(), (g_sProcessName+" -a PUBLIC").c_str() /*bool bAddPid = true*/ ); //消息总线初始化 } /* @brief 向进程管理注册 */ -bool kbd_service::CAlarmSystem::registToProcMng() +bool iot_service::CAlarmSystem::registToProcMng() { SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stRunAppInfo.nDomainId; @@ -281,7 +281,7 @@ bool kbd_service::CAlarmSystem::registToProcMng() return true; } -bool kbd_service::CAlarmSystem::initialize() +bool iot_service::CAlarmSystem::initialize() { /* @brief 创建服务管理类 */ m_ptrAlarmSystemRedundantSwitchMng = boost::make_shared(m_stRunAppInfo, m_ptrProcMng); @@ -301,7 +301,7 @@ bool kbd_service::CAlarmSystem::initialize() } /* @brief 清理业务资源 */ -bool kbd_service::CAlarmSystem::clean() +bool iot_service::CAlarmSystem::clean() { if (m_ptrAlarmSystemRedundantSwitchMng != NULL) { diff --git a/platform/src/service/alarm_system/CAlarmSystem.h b/platform/src/service/alarm_system/CAlarmSystem.h index 89334caf..45e890ab 100644 --- a/platform/src/service/alarm_system/CAlarmSystem.h +++ b/platform/src/service/alarm_system/CAlarmSystem.h @@ -4,9 +4,9 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "CAlarmSystemRedundantSwitch.h" -namespace kbd_service +namespace iot_service { - class CAlarmSystem : public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface + class CAlarmSystem : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CAlarmSystem(); @@ -90,12 +90,12 @@ namespace kbd_service private: std::string m_strAppName; //< 应用名 - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 std::string m_strStartArgs; //< 保存进程启动参数 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundancyMng; //< 冗余管理类 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 + iot_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 + iot_sys::CRedundantMngInterfacePtr m_ptrRedundancyMng; //< 冗余管理类 CAlarmSystemRedundantSwitchPtr m_ptrAlarmSystemRedundantSwitchMng; //< 服务管理类 }; -} //namespace kbd_service +} //namespace iot_service diff --git a/platform/src/service/alarm_system/CAlarmSystemRedundantSwitch.cpp b/platform/src/service/alarm_system/CAlarmSystemRedundantSwitch.cpp index 2115b482..ff763553 100644 --- a/platform/src/service/alarm_system/CAlarmSystemRedundantSwitch.cpp +++ b/platform/src/service/alarm_system/CAlarmSystemRedundantSwitch.cpp @@ -1,15 +1,15 @@ #include "CAlarmSystemRedundantSwitch.h" #include "pub_logger_api/logger.h" -kbd_service::CAlarmSystemRedundantSwitch::CAlarmSystemRedundantSwitch(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng) +iot_service::CAlarmSystemRedundantSwitch::CAlarmSystemRedundantSwitch(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProcMng), m_ptrAlarmSystemThread(NULL) { } -kbd_service::CAlarmSystemRedundantSwitch::~CAlarmSystemRedundantSwitch() +iot_service::CAlarmSystemRedundantSwitch::~CAlarmSystemRedundantSwitch() { if (m_ptrAlarmSystemThread != NULL) { @@ -21,7 +21,7 @@ kbd_service::CAlarmSystemRedundantSwitch::~CAlarmSystemRedundantSwitch() } /* @brief 冗余切换 */ -int kbd_service::CAlarmSystemRedundantSwitch::redundantSwitch(bool bMaster, bool bSlave) +int iot_service::CAlarmSystemRedundantSwitch::redundantSwitch(bool bMaster, bool bSlave) { LOGWARN("接收到冗余切换指令.Master=[%d],Slave=[%d]", bMaster, bSlave); @@ -37,7 +37,7 @@ int kbd_service::CAlarmSystemRedundantSwitch::redundantSwitch(bool bMaster, bool } /* @brief 初始化 */ -int kbd_service::CAlarmSystemRedundantSwitch::initialize() +int iot_service::CAlarmSystemRedundantSwitch::initialize() { m_ptrAlarmSystemThread = boost::make_shared(m_stRunAppInfo); if (m_ptrAlarmSystemThread == NULL) diff --git a/platform/src/service/alarm_system/CAlarmSystemRedundantSwitch.h b/platform/src/service/alarm_system/CAlarmSystemRedundantSwitch.h index 882801bf..5db1d0a6 100644 --- a/platform/src/service/alarm_system/CAlarmSystemRedundantSwitch.h +++ b/platform/src/service/alarm_system/CAlarmSystemRedundantSwitch.h @@ -3,13 +3,13 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "CAlarmSystemThread.h" -namespace kbd_service +namespace iot_service { - class CAlarmSystemRedundantSwitch : public kbd_sys::CRedundantSwitchInterface + class CAlarmSystemRedundantSwitch : public iot_sys::CRedundantSwitchInterface { public: - CAlarmSystemRedundantSwitch(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng); + CAlarmSystemRedundantSwitch(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng); virtual ~CAlarmSystemRedundantSwitch(); /** @@ -27,8 +27,8 @@ namespace kbd_service int initialize(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 CAlarmSystemThreadPtr m_ptrAlarmSystemThread; //< 定时更新表线程 }; diff --git a/platform/src/service/alarm_system/CAlarmSystemThread.cpp b/platform/src/service/alarm_system/CAlarmSystemThread.cpp index 06eab769..f7bd8521 100644 --- a/platform/src/service/alarm_system/CAlarmSystemThread.cpp +++ b/platform/src/service/alarm_system/CAlarmSystemThread.cpp @@ -8,17 +8,17 @@ #include "rapidjson/writer.h" using namespace std; -using namespace kbd_service; -using namespace kbd_dbms; -using namespace kbd_net; -using namespace kbd_idlfile; -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_service; +using namespace iot_dbms; +using namespace iot_net; +using namespace iot_idl; +using namespace iot_public; +using namespace iot_idl; #define UDP_RECV_PORT 6034 -CAlarmSystemThread::CAlarmSystemThread(const kbd_public::SRunAppInfo &stRunAppInfo) - :kbd_public::CTimerThreadBase("CAlarmSystemThread", 1000), +CAlarmSystemThread::CAlarmSystemThread(const iot_public::SRunAppInfo &stRunAppInfo) + :iot_public::CTimerThreadBase("CAlarmSystemThread", 1000), m_stRunAppInfo(stRunAppInfo) { m_bMaster = false; @@ -132,7 +132,7 @@ void CAlarmSystemThread::recvMsg() } } -int CAlarmSystemThread::handleSingleNodeHeartbeatInfo( const kbd_net::CMbMessage &objMsg ) +int CAlarmSystemThread::handleSingleNodeHeartbeatInfo( const iot_net::CMbMessage &objMsg ) { SNodeHeartbeatMsg stHeartbeat; if (!stHeartbeat.ParseFromArray(objMsg.getDataPtr(), static_cast(objMsg.getDataSize()))) diff --git a/platform/src/service/alarm_system/CAlarmSystemThread.h b/platform/src/service/alarm_system/CAlarmSystemThread.h index 78f75c88..bbddb169 100644 --- a/platform/src/service/alarm_system/CAlarmSystemThread.h +++ b/platform/src/service/alarm_system/CAlarmSystemThread.h @@ -58,13 +58,13 @@ struct SAppHeartbeatInfo }; -namespace kbd_service +namespace iot_service { -class CAlarmSystemThread : public kbd_public::CTimerThreadBase +class CAlarmSystemThread : public iot_public::CTimerThreadBase { public: - CAlarmSystemThread(const kbd_public::SRunAppInfo &stRunAppInfo); + CAlarmSystemThread(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~CAlarmSystemThread(); public: @@ -122,12 +122,12 @@ public: * @param objMsg 消息内容 * @return */ - int handleSingleNodeHeartbeatInfo( const kbd_net::CMbMessage &objMsg ); + int handleSingleNodeHeartbeatInfo( const iot_net::CMbMessage &objMsg ); /** * @brief sendAlarm 发送告警 */ - void sendAlarm( kbd_service::enAlarmStatus eStatus, kbd_idlfile::enAlmStyle eStyle, QString sDesc ); + void sendAlarm( iot_service::enAlarmStatus eStatus, iot_idl::enAlmStyle eStyle, QString sDesc ); private: /** @@ -146,11 +146,11 @@ public: bool m_bSlave; private: - kbd_public::SRunAppInfo m_stRunAppInfo; // 本应用相关运行参数 - kbd_net::CMbCommunicator m_objCom; // 消息总线接口 + iot_public::SRunAppInfo m_stRunAppInfo; // 本应用相关运行参数 + iot_net::CMbCommunicator m_objCom; // 消息总线接口 QMap m_mapInfo; // 本地暂存的心跳信息 CAlmApiForApp* m_pAlarmApi; // 告警服务接口 - kbd_public::CSysInfoInterfacePtr m_objSysInfo; // 系统信息接口 + iot_public::CSysInfoInterfacePtr m_objSysInfo; // 系统信息接口 QUdpSocket* m_pRecvUdp; // 接收虚拟IP切换服务的消息 QMap > m_mapIpInfo; // 主机名 -> (最后更新时间 -> 虚拟IP信息) QString m_sLastHostName; // 最后拥有虚拟IP的主机名 diff --git a/platform/src/service/alarm_system/main.cpp b/platform/src/service/alarm_system/main.cpp index 3a1a0157..9e48f7ee 100644 --- a/platform/src/service/alarm_system/main.cpp +++ b/platform/src/service/alarm_system/main.cpp @@ -7,6 +7,6 @@ int main(int argc, char *argv[]) { - kbd_service::CAlarmSystem objApp; + iot_service::CAlarmSystem objApp; return objApp.main(argc, argv); } diff --git a/platform/src/service/data_process/AccProcess.cpp b/platform/src/service/data_process/AccProcess.cpp index 5c47da65..64382a34 100644 --- a/platform/src/service/data_process/AccProcess.cpp +++ b/platform/src/service/data_process/AccProcess.cpp @@ -3,12 +3,12 @@ #include "pub_utility_api/TimeUtil.h" using namespace std; -using namespace kbd_service; -using namespace kbd_idlfile; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_service; +using namespace iot_idl; +using namespace iot_public; +using namespace iot_dbms; -CAccProcess::CAccProcess(kbd_public::SRunAppInfo stRunAppInfo, +CAccProcess::CAccProcess(iot_public::SRunAppInfo stRunAppInfo, CDataProcessApiPtr ptrDataProcApi,\ CSrvDataPublishPtr ptrDataPublish):CPointBase() @@ -650,8 +650,8 @@ void CAccProcess::initChangeAccInfo() @return 无 @retval */ -void CAccProcess::initAccValueStatue(kbd_service::SAccOldValueStatus &stAccOldValueStatus, - kbd_service::SAccNewValueStatus &stAccNewValueStatus) +void CAccProcess::initAccValueStatue(iot_service::SAccOldValueStatus &stAccOldValueStatus, + iot_service::SAccNewValueStatus &stAccNewValueStatus) { stAccOldValueStatus.oldstatus = 0; stAccOldValueStatus.oldvalue = 0; diff --git a/platform/src/service/data_process/AccProcess.h b/platform/src/service/data_process/AccProcess.h index aabb2449..fb2728c1 100644 --- a/platform/src/service/data_process/AccProcess.h +++ b/platform/src/service/data_process/AccProcess.h @@ -17,13 +17,13 @@ #include "data_process_api/DataProcessApi.h" #include "PointBase.h" -namespace kbd_service +namespace iot_service { class CAccProcess :public CPointBase { public: - CAccProcess(kbd_public::SRunAppInfo stRunAppInfo,\ + CAccProcess(iot_public::SRunAppInfo stRunAppInfo,\ CDataProcessApiPtr ptrDataProcApi,\ CSrvDataPublishPtr ptrDataPublish); ~CAccProcess(); @@ -59,19 +59,19 @@ public: @return 成功 true 失败 false @retval */ - int procAccChange(const kbd_idlfile::SFesChangePiPkg &stFesChgPiPkg); + int procAccChange(const iot_idl::SFesChangePiPkg &stFesChgPiPkg); /** @brief 累计量全数据处理函数 @param chgAiPkg 变化数据包结构体 @return 成功 true 失败 false @retval */ - int procAccUpdate(const kbd_idlfile::SFesUpdatePiPkg &stFesUpPiPkg); + int procAccUpdate(const iot_idl::SFesUpdatePiPkg &stFesUpPiPkg); /** @brief 置数、取消置数、取消禁止刷新处理 */ - //int optLockData(const kbd_idlfile::SLockDataPkg &stLockDataPkg); - int processOperate(const kbd_idlfile::SOptSetDataPkg &stOptSetDataPkg,const int nOperateType); + //int optLockData(const iot_idl::SLockDataPkg &stLockDataPkg); + int processOperate(const iot_idl::SOptSetDataPkg &stOptSetDataPkg,const int nOperateType); private: diff --git a/platform/src/service/data_process/AccStructDefine.h b/platform/src/service/data_process/AccStructDefine.h index c9b0f750..ba2598df 100644 --- a/platform/src/service/data_process/AccStructDefine.h +++ b/platform/src/service/data_process/AccStructDefine.h @@ -4,7 +4,7 @@ #include #include "DataType.h" -namespace kbd_service +namespace iot_service { diff --git a/platform/src/service/data_process/AccWorkThread.cpp b/platform/src/service/data_process/AccWorkThread.cpp index 0fa0e913..b73993aa 100644 --- a/platform/src/service/data_process/AccWorkThread.cpp +++ b/platform/src/service/data_process/AccWorkThread.cpp @@ -9,15 +9,15 @@ #include "pub_logger_api/logger.h" #include "pub_utility_api/TimeUtil.h" -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_idlfile; -using namespace kbd_dbms; +using namespace iot_net; +using namespace iot_public; +using namespace iot_service; +using namespace iot_idl; +using namespace iot_dbms; using namespace std; -CAccWorkThread::CAccWorkThread(kbd_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue): +CAccWorkThread::CAccWorkThread(iot_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue): CTimerThreadBase("CAccWorkThread",20) { m_nMsgSeqNum = 0; @@ -209,14 +209,14 @@ int CAccWorkThread::processFesMessage() //处理变化模拟量 //============================================================================================================= - std::deque deqFesChgPiPkg; + std::deque deqFesChgPiPkg; if(m_ptrPacketQueue->getFesChangeAccPkg(deqFesChgPiPkg)) //获得变化数据包队列 { - std::deque::iterator it = deqFesChgPiPkg.begin(); + std::deque::iterator it = deqFesChgPiPkg.begin(); for( ;it!=deqFesChgPiPkg.end();++it) { t1 = getMonotonicMsec() ; - kbd_idlfile::SFesChangePiPkg &objFesChangePiPkg = *it ; + iot_idl::SFesChangePiPkg &objFesChangePiPkg = *it ; m_ptrAccProcess->procAccChange(objFesChangePiPkg); t2 = getMonotonicMsec() ; LOGDEBUG("processFesMessage:处理变化累计量 num=%d，用时=%lld(ms)",objFesChangePiPkg.stpidata_size(),(long long)(t2-t1)); @@ -225,7 +225,7 @@ int CAccWorkThread::processFesMessage() //处理全数据 //============================================================================================================= - kbd_idlfile::SFesUpdatePiPkg objFesUpdPiPkg; + iot_idl::SFesUpdatePiPkg objFesUpdPiPkg; if(m_ptrPacketQueue->getFesUpdateAccPkg(objFesUpdPiPkg)) //获得全数据 { t1 = getMonotonicMsec() ; diff --git a/platform/src/service/data_process/AccWorkThread.h b/platform/src/service/data_process/AccWorkThread.h index c1c3fe37..10464c5d 100644 --- a/platform/src/service/data_process/AccWorkThread.h +++ b/platform/src/service/data_process/AccWorkThread.h @@ -15,12 +15,12 @@ #include -namespace kbd_service +namespace iot_service { -class CAccWorkThread : public kbd_public::CTimerThreadBase +class CAccWorkThread : public iot_public::CTimerThreadBase { public: - CAccWorkThread(kbd_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue); + CAccWorkThread(iot_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue); virtual ~CAccWorkThread(); private: @@ -31,7 +31,7 @@ private: int64 m_lLastProAlmTime; int64 m_lLastTime; int64 m_lLastAllDataTime; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; private: CAccProcessPtr m_ptrAccProcess; CDataProcessApiPtr m_ptrDataProcApi; diff --git a/platform/src/service/data_process/AlarmAckProcess.cpp b/platform/src/service/data_process/AlarmAckProcess.cpp index e923c17a..1ece58cc 100644 --- a/platform/src/service/data_process/AlarmAckProcess.cpp +++ b/platform/src/service/data_process/AlarmAckProcess.cpp @@ -8,11 +8,11 @@ #include "MixStructDefine.h" using namespace std; -using namespace kbd_service; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_service; +using namespace iot_public; +using namespace iot_dbms; -CAlarmAckProcess::CAlarmAckProcess(kbd_public::SRunAppInfo stRunAppInfo): +CAlarmAckProcess::CAlarmAckProcess(iot_public::SRunAppInfo stRunAppInfo): CAlmApiForDpSrv(stRunAppInfo.nAppId) { m_stRunAppInfo = stRunAppInfo ; diff --git a/platform/src/service/data_process/AlarmAckProcess.h b/platform/src/service/data_process/AlarmAckProcess.h index 8d81e1ed..d6c67f69 100644 --- a/platform/src/service/data_process/AlarmAckProcess.h +++ b/platform/src/service/data_process/AlarmAckProcess.h @@ -11,13 +11,13 @@ #include "alarm_server_api/CAlmApiForDpSrv.h" #include "data_process_api/DataProcessApi.h" -namespace kbd_service +namespace iot_service { -class CAlarmAckProcess : public kbd_service::CAlmApiForDpSrv +class CAlarmAckProcess : public iot_service::CAlmApiForDpSrv { public: - CAlarmAckProcess(kbd_public::SRunAppInfo stRunAppInfo); + CAlarmAckProcess(iot_public::SRunAppInfo stRunAppInfo); ~CAlarmAckProcess(void); private: @@ -27,8 +27,8 @@ private: int m_nMenuStateAiAlmNotAck ; int m_nMenuStateAiAbNoraml ; - kbd_public::SRunAppInfo m_stRunAppInfo; - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_public::SRunAppInfo m_stRunAppInfo; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; CDataProcessApiPtr m_ptrDataProcApi; private: diff --git a/platform/src/service/data_process/AnaProcess.cpp b/platform/src/service/data_process/AnaProcess.cpp index 50926b35..de626033 100644 --- a/platform/src/service/data_process/AnaProcess.cpp +++ b/platform/src/service/data_process/AnaProcess.cpp @@ -2,12 +2,12 @@ #include "AnaProcess.h" using namespace std; -using namespace kbd_service; -using namespace kbd_idlfile; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_service; +using namespace iot_idl; +using namespace iot_public; +using namespace iot_dbms; -CAnaProcess::CAnaProcess(kbd_public::SRunAppInfo stRunAppInfo, +CAnaProcess::CAnaProcess(iot_public::SRunAppInfo stRunAppInfo, CDataProcessApiPtr ptrDataProcApi,\ CSrvDataPublishPtr ptrDataPublish) { @@ -779,8 +779,8 @@ int CAnaProcess::writeRdbAndSendMsg(const SChangeAiData &stOneAiLimit, int /*sty @return 无 @retval */ -void CAnaProcess::initAnaValueStatus(kbd_service::SOldValueStatus &stOldValueStatus, - kbd_service::SNewValueStatus &stNewValueStatus) +void CAnaProcess::initAnaValueStatus(iot_service::SOldValueStatus &stOldValueStatus, + iot_service::SNewValueStatus &stNewValueStatus) { stOldValueStatus.oldstatus = 0; stOldValueStatus.oldvalue = 0; diff --git a/platform/src/service/data_process/AnaProcess.h b/platform/src/service/data_process/AnaProcess.h index 7a1b614d..9a42ff68 100644 --- a/platform/src/service/data_process/AnaProcess.h +++ b/platform/src/service/data_process/AnaProcess.h @@ -19,12 +19,12 @@ #include "data_process_api/DataProcessApi.h" #include "PointBase.h" -namespace kbd_service +namespace iot_service { class CAnaProcess :public CPointBase { public: - CAnaProcess(kbd_public::SRunAppInfo stRunAppInfo,\ + CAnaProcess(iot_public::SRunAppInfo stRunAppInfo,\ CDataProcessApiPtr ptrDataProcApi,\ CSrvDataPublishPtr ptrDataPublish); ~CAnaProcess(); @@ -62,18 +62,18 @@ public: @return 成功 true 失败 false @retval */ - int procAnaChange(const kbd_idlfile::SFesChangeAiPkg &stFesChgAiPkg); + int procAnaChange(const iot_idl::SFesChangeAiPkg &stFesChgAiPkg); /** @brief 模拟量全数据处理函数 @param chgAiPkg 变化数据包结构体 @return 成功 true 失败 false @retval */ - int procAnaUpdate(const kbd_idlfile::SFesUpdateAiPkg &stFesUpAiPkg); + int procAnaUpdate(const iot_idl::SFesUpdateAiPkg &stFesUpAiPkg); /** @brief 置数、取消置数、取消禁止刷新处理 */ - int processOperate(const kbd_idlfile::SOptSetDataPkg &stOptSetDataPkg,const int nOperateType); + int processOperate(const iot_idl::SOptSetDataPkg &stOptSetDataPkg,const int nOperateType); /** @brief 越线延迟处理 */ diff --git a/platform/src/service/data_process/AnaStructDefine.h b/platform/src/service/data_process/AnaStructDefine.h index ea1728a0..e56699db 100644 --- a/platform/src/service/data_process/AnaStructDefine.h +++ b/platform/src/service/data_process/AnaStructDefine.h @@ -4,7 +4,7 @@ #include #include "DataType.h" -namespace kbd_service +namespace iot_service { //模拟量全结构定义 diff --git a/platform/src/service/data_process/AnaWorkThread.cpp b/platform/src/service/data_process/AnaWorkThread.cpp index 529c4f98..75f00d4d 100644 --- a/platform/src/service/data_process/AnaWorkThread.cpp +++ b/platform/src/service/data_process/AnaWorkThread.cpp @@ -9,14 +9,14 @@ #include "pub_logger_api/logger.h" #include "pub_utility_api/TimeUtil.h" -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_idlfile; -using namespace kbd_dbms; +using namespace iot_net; +using namespace iot_public; +using namespace iot_service; +using namespace iot_idl; +using namespace iot_dbms; using namespace std; -CAnaWorkThread::CAnaWorkThread(kbd_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue): +CAnaWorkThread::CAnaWorkThread(iot_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue): CTimerThreadBase("CAnaWorkThread",15) { m_nMsgSeqNum = 0; @@ -144,13 +144,13 @@ int CAnaWorkThread::processOptMessage() { //处理标签操作 //============================================================================================================= - std::deque deqOptManSetPkg; + std::deque deqOptManSetPkg; if(m_ptrPacketQueue->getOptManSetPkg(POINT_TYPE_ANA,deqOptManSetPkg)) { - std::deque::iterator it = deqOptManSetPkg.begin(); + std::deque::iterator it = deqOptManSetPkg.begin(); for( ;it!=deqOptManSetPkg.end();++it) { - kbd_idlfile::SOptSetDataPkg &objOptManSetPkg = *it ; + iot_idl::SOptSetDataPkg &objOptManSetPkg = *it ; m_ptrAnaProcess->processOperate(objOptManSetPkg,OPERATE_TYPE ); LOGINFO("processOptMessage:处理标签操作 num=%d .",objOptManSetPkg.seq_set_data_info_size()); } @@ -158,13 +158,13 @@ int CAnaWorkThread::processOptMessage() //处理计算点 //============================================================================================================= - std::deque deqOptCalSetPkg; + std::deque deqOptCalSetPkg; if(m_ptrPacketQueue->getOptCalSetPkg(POINT_TYPE_ANA,deqOptCalSetPkg)) { - std::deque::iterator it = deqOptCalSetPkg.begin(); + std::deque::iterator it = deqOptCalSetPkg.begin(); for( ;it!=deqOptCalSetPkg.end();++it) { - kbd_idlfile::SOptSetDataPkg &objOptCalSetPkg = *it ; + iot_idl::SOptSetDataPkg &objOptCalSetPkg = *it ; m_ptrAnaProcess->processOperate(objOptCalSetPkg,OPT_TYPE_CAL_SET); //LOGINFO("processOptMessage:处理计算点 num=%d .",objOptCalSetPkg.seq_set_data_info_size()); } @@ -185,14 +185,14 @@ int CAnaWorkThread::processFesMessage() //处理变化模拟量 //============================================================================================================= - std::deque deqFesChgAiPkg; + std::deque deqFesChgAiPkg; if(m_ptrPacketQueue->getFesChangeAnaPkg(deqFesChgAiPkg)) //获得变化数据包队列 { - std::deque::iterator it = deqFesChgAiPkg.begin(); + std::deque::iterator it = deqFesChgAiPkg.begin(); for( ;it!=deqFesChgAiPkg.end();++it) { t1 = getMonotonicMsec() ; - kbd_idlfile::SFesChangeAiPkg &objFesChangeAiPkg = *it ; + iot_idl::SFesChangeAiPkg &objFesChangeAiPkg = *it ; m_ptrAnaProcess->procAnaChange(objFesChangeAiPkg); t2 = getMonotonicMsec() ; LOGDEBUG("processFesMessage:处理变化模拟量 num=%d，用时=%lld(ms)",objFesChangeAiPkg.staidata_size(),(long long)(t2-t1)); @@ -201,7 +201,7 @@ int CAnaWorkThread::processFesMessage() //处理全数据 //============================================================================================================= - kbd_idlfile::SFesUpdateAiPkg objFesUpdAiPkg; + iot_idl::SFesUpdateAiPkg objFesUpdAiPkg; if(m_ptrPacketQueue->getFesUpdateAnaPkg(objFesUpdAiPkg)) //获得全数据 { t1 = getMonotonicMsec() ; @@ -263,7 +263,7 @@ void CAnaWorkThread::release() return ; } -int kbd_service::CAnaWorkThread::requestAllDataFromFes() +int iot_service::CAnaWorkThread::requestAllDataFromFes() { /* int64 lCurTimeMs = getMonotonicMsec(); diff --git a/platform/src/service/data_process/AnaWorkThread.h b/platform/src/service/data_process/AnaWorkThread.h index 83429054..3cc73b5c 100644 --- a/platform/src/service/data_process/AnaWorkThread.h +++ b/platform/src/service/data_process/AnaWorkThread.h @@ -15,12 +15,12 @@ #include -namespace kbd_service +namespace iot_service { -class CAnaWorkThread : public kbd_public::CTimerThreadBase +class CAnaWorkThread : public iot_public::CTimerThreadBase { public: - CAnaWorkThread(kbd_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue); + CAnaWorkThread(iot_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue); virtual ~CAnaWorkThread(); private: @@ -30,7 +30,7 @@ private: int64 m_lLastProAlmTime; int64 m_lLastTime; int64 m_lLastAllDataTime; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; private: CAnaProcessPtr m_ptrAnaProcess; //模拟量处理类 CDataProcessApiPtr m_ptrDataProcApi; //数据处理接口库 diff --git a/platform/src/service/data_process/ChgWorkThread.cpp b/platform/src/service/data_process/ChgWorkThread.cpp index 4a1b9ed7..ed654d35 100644 --- a/platform/src/service/data_process/ChgWorkThread.cpp +++ b/platform/src/service/data_process/ChgWorkThread.cpp @@ -3,11 +3,11 @@ #include "common/Common.h" #include "boost/make_shared.hpp" -using namespace kbd_service; +using namespace iot_service; CChgWorkThreadPtr g_ptrChgWorkThread = NULL; /* @brief 获取FBD订阅接口单例 */ - CChgWorkThreadPtr kbd_service::getChgWorkThreadSingleTon(const kbd_public::SRunAppInfo &stRunAppInfo) + CChgWorkThreadPtr iot_service::getChgWorkThreadSingleTon(const iot_public::SRunAppInfo &stRunAppInfo) { if (g_ptrChgWorkThread == NULL) { @@ -29,7 +29,7 @@ CChgWorkThreadPtr g_ptrChgWorkThread = NULL; /* @brief 销毁单例，注意：由于使用了智能指针，一定要保证外部的引用全部释放掉，这样才能保证真正释放 */ - void kbd_service::releaseChgWorkThreadSingleTon() + void iot_service::releaseChgWorkThreadSingleTon() { g_ptrChgWorkThread.reset(); { @@ -39,7 +39,7 @@ CChgWorkThreadPtr g_ptrChgWorkThread = NULL; - bool kbd_service::ChgWorkThread::initialize() + bool iot_service::ChgWorkThread::initialize() { //初始化变化数据发送接口库 //================================================================================================ @@ -58,14 +58,14 @@ CChgWorkThreadPtr g_ptrChgWorkThread = NULL; return true; } - ChgWorkThread::ChgWorkThread(kbd_public::SRunAppInfo stRunAppInfo): + ChgWorkThread::ChgWorkThread(iot_public::SRunAppInfo stRunAppInfo): m_stRunAppInfo(stRunAppInfo), m_ptrChgDataApi(NULL) { } - kbd_service::ChgWorkThread::~ChgWorkThread() + iot_service::ChgWorkThread::~ChgWorkThread() { //释放变化数据接口 if (m_ptrChgDataApi) @@ -77,18 +77,18 @@ CChgWorkThreadPtr g_ptrChgWorkThread = NULL; } } - bool kbd_service::ChgWorkThread::resumeThread() + bool iot_service::ChgWorkThread::resumeThread() { return m_ptrChgDataApi->resumeThread(); } - bool kbd_service::ChgWorkThread::suspendThread() + bool iot_service::ChgWorkThread::suspendThread() { return m_ptrChgDataApi->suspendThread(); } - bool kbd_service::ChgWorkThread::addChgData(kbd_idlfile::SRealTimeDataPkg &objChgData) + bool iot_service::ChgWorkThread::addChgData(iot_idl::SRealTimeDataPkg &objChgData) { return m_ptrChgDataApi->addChgData(objChgData) ; } diff --git a/platform/src/service/data_process/ChgWorkThread.h b/platform/src/service/data_process/ChgWorkThread.h index 5316bb4c..c58583a9 100644 --- a/platform/src/service/data_process/ChgWorkThread.h +++ b/platform/src/service/data_process/ChgWorkThread.h @@ -4,12 +4,12 @@ #include "dp_chg_data_api/CDpcdaForDp.h" -namespace kbd_service +namespace iot_service { class ChgWorkThread { public: - ChgWorkThread(kbd_public::SRunAppInfo stRunAppInfo); + ChgWorkThread(iot_public::SRunAppInfo stRunAppInfo); virtual ~ChgWorkThread(); /******************************************************************************//** * @brief 启动、恢复处理线程 @@ -26,10 +26,10 @@ public: * @retval true：成功 ； false: 失败 **********************************************************************************/ bool suspendThread(); - bool addChgData(kbd_idlfile::SRealTimeDataPkg &objChgData); + bool addChgData(iot_idl::SRealTimeDataPkg &objChgData); bool initialize(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; CDpcdaForDpPtr m_ptrChgDataApi; }; @@ -37,11 +37,11 @@ typedef boost::shared_ptr CChgWorkThreadPtr; /* @brief 获取单例对象 */ -CChgWorkThreadPtr getChgWorkThreadSingleTon(const kbd_public::SRunAppInfo &stRunAppInfo); +CChgWorkThreadPtr getChgWorkThreadSingleTon(const iot_public::SRunAppInfo &stRunAppInfo); /* @brief 销毁单例，注意：由于使用了智能指针，一定要保证外部的引用全部释放掉，这样才能保证真正释放 */ void releaseChgWorkThreadSingleTon(); -} //namespace kbd_service +} //namespace iot_service #endif // CHGWORKTHREAD_H diff --git a/platform/src/service/data_process/CommStructDefine.h b/platform/src/service/data_process/CommStructDefine.h index 2c3e45df..74e77f18 100644 --- a/platform/src/service/data_process/CommStructDefine.h +++ b/platform/src/service/data_process/CommStructDefine.h @@ -4,7 +4,7 @@ #include "string.h" #include "DataType.h" -namespace kbd_service +namespace iot_service { struct MenuReslStruct diff --git a/platform/src/service/data_process/DataProcessApp.cpp b/platform/src/service/data_process/DataProcessApp.cpp index 484f0655..5fa1cc28 100644 --- a/platform/src/service/data_process/DataProcessApp.cpp +++ b/platform/src/service/data_process/DataProcessApp.cpp @@ -18,11 +18,11 @@ #define OPT_DESC_HELP "help" using namespace std; -using namespace kbd_net; -using namespace kbd_sys; -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_sys; +using namespace iot_public; +using namespace iot_service; +using namespace iot_idl; CDataProcessApp::CDataProcessApp() { @@ -93,7 +93,7 @@ bool CDataProcessApp::isAlreadyRunning(std::string strProcessName) m_strInstName += " -a "; m_strInstName += m_strAppName; - return kbd_public::CSingleProcInstance::hasInstanceRunning(m_strInstName); + return iot_public::CSingleProcInstance::hasInstanceRunning(m_strInstName); } /** diff --git a/platform/src/service/data_process/DataProcessApp.h b/platform/src/service/data_process/DataProcessApp.h index 4f17093a..1a9df496 100644 --- a/platform/src/service/data_process/DataProcessApp.h +++ b/platform/src/service/data_process/DataProcessApp.h @@ -18,9 +18,9 @@ #include "WorkThreadMng.h" //工作线程管理 #include "AlarmAckProcess.h" -namespace kbd_service +namespace iot_service { -class CDataProcessApp : public kbd_public::CBaseService,kbd_sys::CProcessQuitInterface +class CDataProcessApp : public iot_public::CBaseService,iot_sys::CProcessQuitInterface { public: CDataProcessApp(); @@ -46,16 +46,16 @@ public: private: std::string m_strStartArgs; //管理进程指针 - kbd_sys::CProcMngInterfacePtr m_ptrProcManage; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; - kbd_service::CWorkThreadMngPtr m_ptrWorkThreadMng; //工作线程管理类 - kbd_service::CAlarmAckProcessPtr m_ptrAlarmAckProc; //告警确认 + iot_sys::CProcMngInterfacePtr m_ptrProcManage; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_service::CWorkThreadMngPtr m_ptrWorkThreadMng; //工作线程管理类 + iot_service::CAlarmAckProcessPtr m_ptrAlarmAckProc; //告警确认 //进程系统信息 std::string m_strAppName; std::string m_strProcessName; std::string m_strInstName; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; public: /** diff --git a/platform/src/service/data_process/DataProcessDefine.h b/platform/src/service/data_process/DataProcessDefine.h index 9f2d61a6..65a24272 100644 --- a/platform/src/service/data_process/DataProcessDefine.h +++ b/platform/src/service/data_process/DataProcessDefine.h @@ -8,7 +8,7 @@ #include #include "service/common/RdbTableDefine.h" -namespace kbd_service +namespace iot_service { //Di Define //======================================================================== diff --git a/platform/src/service/data_process/DataPublish.cpp b/platform/src/service/data_process/DataPublish.cpp index f63ec244..46799f9b 100644 --- a/platform/src/service/data_process/DataPublish.cpp +++ b/platform/src/service/data_process/DataPublish.cpp @@ -10,15 +10,15 @@ #include "service/common/RdbTableDefine.h" #include "MessageChannel.h" -using namespace kbd_service; -using namespace kbd_idlfile; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_service; +using namespace iot_idl; +using namespace iot_public; +using namespace iot_dbms; using namespace std; #define MAX_SEND_ALARM_NUM 2000 //报警缓存一次发送的报警数量（预计1M） -CSrvDataPublish::CSrvDataPublish(kbd_public::SRunAppInfo stRunAppInfo) +CSrvDataPublish::CSrvDataPublish(iot_public::SRunAppInfo stRunAppInfo) { m_stRunAppInfo = stRunAppInfo; @@ -274,7 +274,7 @@ void CSrvDataPublish::addOneChangeDouble(const int nLocationId,const int nSubSys } void CSrvDataPublish::addOneChangeTable(const int nLocationId,const int nSubSystem,const string strTableName, - const string strTagName,const string strColName,kbd_dbms::CVarType &objValue) + const string strTagName,const string strColName,iot_dbms::CVarType &objValue) { STableRealTimeData *stTableRealData = m_stChangeMsg.add_sttblrtd(); @@ -286,7 +286,7 @@ void CSrvDataPublish::addOneChangeTable(const int nLocationId,const int nSubSyst stTableRealData->set_strcolumnname(strColName.c_str(),strColName.size()); stTableRealData->set_strtagname(strTagName.c_str(),strTagName.size()); - kbd_idlfile::SVariable varValue; + iot_idl::SVariable varValue; Vartype2SVarivale(objValue, varValue); stTableRealData->mutable_varvalue()->CopyFrom(varValue); } @@ -321,7 +321,7 @@ void CSrvDataPublish::sendChange() SRealTimePkgHead stHead; stHead.set_strsrctag("data_process"); - stHead.set_ntimestamp(kbd_public::getUTCTimeMsec()); + stHead.set_ntimestamp(iot_public::getUTCTimeMsec()); m_stChangeMsg.mutable_sthead()->CopyFrom(stHead); diff --git a/platform/src/service/data_process/DataPublish.h b/platform/src/service/data_process/DataPublish.h index 752b71c1..92b477e6 100644 --- a/platform/src/service/data_process/DataPublish.h +++ b/platform/src/service/data_process/DataPublish.h @@ -27,26 +27,26 @@ #include "CommStructDefine.h" #include "ChgWorkThread.h" -namespace kbd_service +namespace iot_service { class CSrvDataPublish { public: - CSrvDataPublish(kbd_public::SRunAppInfo stRunAppInfo); + CSrvDataPublish(iot_public::SRunAppInfo stRunAppInfo); virtual ~CSrvDataPublish(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; //data pkg - kbd_idlfile::SRealTimeDataPkg m_stChangeMsg; //变化数据 - kbd_idlfile::SAppAddAlm m_stAppAddAlarm; //告警消息 + iot_idl::SRealTimeDataPkg m_stChangeMsg; //变化数据 + iot_idl::SAppAddAlm m_stAppAddAlarm; //告警消息 CChgWorkThreadPtr m_ptrChgWorkThread; CNetMsgBusExPtr m_ptrNetMsgBus; CAlmApiForAppPtr m_ptrAlmApiForApp; CSampleServerApiPtr m_ptrSampleApi; - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; std::map m_mapDevInfo; std::map m_mapDevGrpName; @@ -84,7 +84,7 @@ public: const std::string strTableName, const std::string strTagName,const std::string strColumnName, \ const double dValue, const int nStatus); void addOneChangeTable(const int nLocationId,const int nSubSystem,const std::string strTableName,\ - const std::string strTagName,const std::string strColumnName,kbd_dbms::CVarType &objValue); + const std::string strTagName,const std::string strColumnName,iot_dbms::CVarType &objValue); /*发送给变化数据到消息总线*/ diff --git a/platform/src/service/data_process/DigProcess.cpp b/platform/src/service/data_process/DigProcess.cpp index 66912ea0..74452ced 100644 --- a/platform/src/service/data_process/DigProcess.cpp +++ b/platform/src/service/data_process/DigProcess.cpp @@ -10,12 +10,12 @@ #include "pub_utility_api/CommonConfigParse.h" using namespace std; -using namespace kbd_service; -using namespace kbd_idlfile; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_service; +using namespace iot_idl; +using namespace iot_public; +using namespace iot_dbms; -CDigProcess::CDigProcess(kbd_public::SRunAppInfo stRunAppInfo, +CDigProcess::CDigProcess(iot_public::SRunAppInfo stRunAppInfo, CDataProcessApiPtr ptrDataProcApi,\ CSrvDataPublishPtr ptrDataPublish):CPointBase() { @@ -59,8 +59,8 @@ CDigProcess::~CDigProcess() bool CDigProcess::readConfig() { - kbd_public::CCommonConfigParse objCfgParse; - if(objCfgParse.load( kbd_public::CFileUtil::getPathOfCfgFile("dataprocess_cfg.xml") ) == kbdFailed) + iot_public::CCommonConfigParse objCfgParse; + if(objCfgParse.load( iot_public::CFileUtil::getPathOfCfgFile("dataprocess_cfg.xml") ) == kbdFailed) { LOGDEBUG("CDigProcess::readConfig() dataprocess_cfg.xml load fail .\n"); return false; @@ -1010,7 +1010,7 @@ int CDigProcess::processDiChange(const SFesChangeDiPkg &stChangeDiPkg) @return 无 @retval */ -int CDigProcess::processSoeEvent(kbd_idlfile::SFesSoeEventPkg objFesSoeEventPkg) //处理soe事件 +int CDigProcess::processSoeEvent(iot_idl::SFesSoeEventPkg objFesSoeEventPkg) //处理soe事件 { int nLoop=0; int nSoeNum; diff --git a/platform/src/service/data_process/DigProcess.h b/platform/src/service/data_process/DigProcess.h index a309e999..680efa49 100644 --- a/platform/src/service/data_process/DigProcess.h +++ b/platform/src/service/data_process/DigProcess.h @@ -14,7 +14,7 @@ #include "PointBase.h" -namespace kbd_service +namespace iot_service { #define DIG_ALARM_TYPE_NOTHING 0 #define DIG_ALARM_TYPE_ONLY_CHG 1 @@ -24,7 +24,7 @@ namespace kbd_service class CDigProcess :public CPointBase { public: - CDigProcess(kbd_public::SRunAppInfo stRunAppInfo, + CDigProcess(iot_public::SRunAppInfo stRunAppInfo, CDataProcessApiPtr ptrDataProcApi,\ CSrvDataPublishPtr ptrDataPublish); ~CDigProcess(); @@ -55,10 +55,10 @@ private: public: bool initialize(); bool readConfig(); //读数据处理配置 - int processDiChange(const kbd_idlfile::SFesChangeDiPkg &stChangeDiPkg); - int processDiUpdate(const kbd_idlfile::SFesUpdateDiPkg &stUpdateDiPkg); - int processOperate(const kbd_idlfile::SOptSetDataPkg &stOptSetDataPkg,const int nOperateType);//人工置数/静止刷新等处理 - int processSoeEvent(kbd_idlfile::SFesSoeEventPkg objFesSoeEventPkg); //处理soe事件 + int processDiChange(const iot_idl::SFesChangeDiPkg &stChangeDiPkg); + int processDiUpdate(const iot_idl::SFesUpdateDiPkg &stUpdateDiPkg); + int processOperate(const iot_idl::SOptSetDataPkg &stOptSetDataPkg,const int nOperateType);//人工置数/静止刷新等处理 + int processSoeEvent(iot_idl::SFesSoeEventPkg objFesSoeEventPkg); //处理soe事件 int processSetData(SDigPointAll &stDigPoint,const int nNewValue,const int nNewStatus,const bool bNotAlarm = false); void checkBuffInfo(); diff --git a/platform/src/service/data_process/DigStructDefine.h b/platform/src/service/data_process/DigStructDefine.h index 78a36358..bd1508e1 100644 --- a/platform/src/service/data_process/DigStructDefine.h +++ b/platform/src/service/data_process/DigStructDefine.h @@ -12,7 +12,7 @@ #include "DataType.h" #include "DataProcessDefine.h" -namespace kbd_service +namespace iot_service { struct SDigPointAll { diff --git a/platform/src/service/data_process/DigWorkThread.cpp b/platform/src/service/data_process/DigWorkThread.cpp index 902ba058..2a0d83c5 100644 --- a/platform/src/service/data_process/DigWorkThread.cpp +++ b/platform/src/service/data_process/DigWorkThread.cpp @@ -9,15 +9,15 @@ #include "pub_logger_api/logger.h" #include "pub_utility_api/TimeUtil.h" -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_idlfile; -using namespace kbd_dbms; +using namespace iot_net; +using namespace iot_public; +using namespace iot_service; +using namespace iot_idl; +using namespace iot_dbms; using namespace std; -CDigWorkThread::CDigWorkThread(kbd_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue): +CDigWorkThread::CDigWorkThread(iot_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue): CTimerThreadBase("CDigWorkThread",15) { m_nMsgSeqNum = 0; @@ -168,7 +168,7 @@ int CDigWorkThread::processOptMessage() std::deque::iterator it = deqOptCalSetPkg.begin(); for( ;it!=deqOptCalSetPkg.end();++it) { - kbd_idlfile::SOptSetDataPkg& objOptCalSetPkg = *it ; + iot_idl::SOptSetDataPkg& objOptCalSetPkg = *it ; m_ptrDigProcess->processOperate(objOptCalSetPkg,OPT_TYPE_CAL_SET); //LOGINFO("processOptMessage:处理计算点 num=%d .",objOptCalSetPkg.seq_set_data_info_size()); } diff --git a/platform/src/service/data_process/DigWorkThread.h b/platform/src/service/data_process/DigWorkThread.h index b846798e..0a8aa4ab 100644 --- a/platform/src/service/data_process/DigWorkThread.h +++ b/platform/src/service/data_process/DigWorkThread.h @@ -14,12 +14,12 @@ #include "PacketQueue.h" #include -namespace kbd_service +namespace iot_service { -class CDigWorkThread : public kbd_public::CTimerThreadBase +class CDigWorkThread : public iot_public::CTimerThreadBase { public: - CDigWorkThread(kbd_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue); + CDigWorkThread(iot_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue); virtual ~CDigWorkThread(); private: @@ -30,7 +30,7 @@ private: int64 m_lLastProAlmTime; int64 m_lLastTime; int64 m_lLastAllDataTime; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; private: CDigProcessPtr m_ptrDigProcess; CDataProcessApiPtr m_ptrDataProcApi; diff --git a/platform/src/service/data_process/LimitProcess.cpp b/platform/src/service/data_process/LimitProcess.cpp index ce2b1fdc..1a6785ec 100644 --- a/platform/src/service/data_process/LimitProcess.cpp +++ b/platform/src/service/data_process/LimitProcess.cpp @@ -10,12 +10,12 @@ #include "pub_utility_api/I18N.h" using namespace std; -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_idlfile; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_service; +using namespace iot_idl; +using namespace iot_dbms; -CLimitProcess::CLimitProcess(kbd_public::SRunAppInfo stRunAppInfo, +CLimitProcess::CLimitProcess(iot_public::SRunAppInfo stRunAppInfo, CDataProcessApiPtr ptrDataProcApi,\ CSrvDataPublishPtr ptrDataPublish) { @@ -944,7 +944,7 @@ int CLimitProcess::modifyMapOrRdb(const SChangeAiData &stOneAiLimitData, string point_name_tmp = stOneAiLimitData.strPointName; //LOGDEBUG("CLimitProcess::modifyMapOrRdb, key_id_tag = %s, crossTime = %lld, delayTime = %d, curTime = %lld,limitType = %d, checkStatus = %d, oldStatus = %d, curValue = %f", - // stOneAiLimitData.strPointName.c_str(), stOneAiLimitData.ulTime, stCheckLimitInfo.alarm_delay_time,kbd_public::getUTCTimeMsec(), + // stOneAiLimitData.strPointName.c_str(), stOneAiLimitData.ulTime, stCheckLimitInfo.alarm_delay_time,iot_public::getUTCTimeMsec(), // stCheckLimitInfo.limit_type, checkStatus, oldStatus, stOneAiLimitData.dValue); //越限回复或者正常状态 @@ -989,7 +989,7 @@ int CLimitProcess::modifyMapOrRdb(const SChangeAiData &stOneAiLimitData, stCrossModifyInfo.value = stOneAiLimitData.dValue; stCrossModifyInfo.status = checkStatus; //stCrossModifyInfo.cross_time = stOneAiLimitData.ulTime; - stCrossModifyInfo.cross_time = kbd_public::getMonotonicMsec(); + stCrossModifyInfo.cross_time = iot_public::getMonotonicMsec(); stCrossModifyInfo.delay_time = stCheckLimitInfo.alarm_delay_time; stCrossModifyInfo.lock_data_type = m_nLockDataType;//延迟算法区别置数、取消置数等类型 stCrossModifyInfo.location_id = stCheckLimitInfo.location_id; diff --git a/platform/src/service/data_process/LimitProcess.h b/platform/src/service/data_process/LimitProcess.h index 745654e9..5a3a4d7e 100644 --- a/platform/src/service/data_process/LimitProcess.h +++ b/platform/src/service/data_process/LimitProcess.h @@ -12,12 +12,12 @@ #include "pub_sysinfo_api/SysInfoBase.h" #include "PointBase.h" -namespace kbd_service { +namespace iot_service { class CLimitProcess:public CPointBase { public: - CLimitProcess(kbd_public::SRunAppInfo stRunAppInfo,CDataProcessApiPtr ptrDataProcApi,\ + CLimitProcess(iot_public::SRunAppInfo stRunAppInfo,CDataProcessApiPtr ptrDataProcApi,\ CSrvDataPublishPtr ptrDataPublish); ~CLimitProcess(void); @@ -27,7 +27,7 @@ public: @brief ai 越线处理 @param SChangeAiData stOneAiLimitData 需要传人判读越限的点信息，加入需要处理点信息传入 std::map 存放延时数据，最外面定一个全局结构并清空传入即可 - kbd_idlfile::SAlmInfoFromApp 用来存放需要发报警的报文，最外面定一个结构清空传入即可 + iot_idl::SAlmInfoFromApp 用来存放需要发报警的报文，最外面定一个结构清空传入即可 SChangeAiInfo 传出是否越限以及最终的status,外面定一个结构传入即可不需要初始化函数内会处理 SSysInfo 传入app,source,ifcommap信息 nLockType ＝-1 公式不需要，处理AI点用。公式不用传 @@ -43,8 +43,8 @@ public: /** @brief 只需要取下当前时间gCurTime判断是否大于1S，大于调用这个接口，这个接口报警，变化报文，只需要发送报警 @param std::map传入前面用来记录延迟数据的MAP - kbd_idlfile::SAlmInfoFromApp传入报警结构，不需要初始化程序自动清空 - kbd_idlfile::SRealTimeDataPkg传入变化报文结构，不需初始化，程序自动清空 + iot_idl::SAlmInfoFromApp传入报警结构，不需要初始化程序自动清空 + iot_idl::SRealTimeDataPkg传入变化报文结构，不需初始化，程序自动清空 lCurTime 当前做1S判读时的当前时间 domain,由于可能是一机多域，每次处理一个域的数据 @return 无 diff --git a/platform/src/service/data_process/LimitStructDefine.h b/platform/src/service/data_process/LimitStructDefine.h index 07ae01ca..91ef0250 100644 --- a/platform/src/service/data_process/LimitStructDefine.h +++ b/platform/src/service/data_process/LimitStructDefine.h @@ -3,7 +3,7 @@ #include #include "DataType.h" -namespace kbd_service +namespace iot_service { //越限相关结构 diff --git a/platform/src/service/data_process/Main.cpp b/platform/src/service/data_process/Main.cpp index d36a8fea..cdbb507f 100644 --- a/platform/src/service/data_process/Main.cpp +++ b/platform/src/service/data_process/Main.cpp @@ -1,7 +1,7 @@  #include "DataProcessApp.h" -using namespace kbd_service; -using namespace kbd_sys; +using namespace iot_service; +using namespace iot_sys; int main(int argc, char *argv[]) { diff --git a/platform/src/service/data_process/MixProcess.cpp b/platform/src/service/data_process/MixProcess.cpp index 4ca80584..b805beb9 100644 --- a/platform/src/service/data_process/MixProcess.cpp +++ b/platform/src/service/data_process/MixProcess.cpp @@ -3,12 +3,12 @@ #include "pub_utility_api/TimeUtil.h" using namespace std; -using namespace kbd_service; -using namespace kbd_idlfile; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_service; +using namespace iot_idl; +using namespace iot_public; +using namespace iot_dbms; -CMixProcess::CMixProcess(kbd_public::SRunAppInfo stRunAppInfo, +CMixProcess::CMixProcess(iot_public::SRunAppInfo stRunAppInfo, CDataProcessApiPtr ptrDataProcApi,\ CSrvDataPublishPtr ptrDataPublish):CPointBase() { @@ -721,8 +721,8 @@ void CMixProcess::initChangeMixInfo() @return 无 @retval */ -void CMixProcess::initMixValueStatus(kbd_service::SMiOldValueStatus &stMiOldValueStatus, - kbd_service::SMiNewValueStatus &stMiNewValueStatus) +void CMixProcess::initMixValueStatus(iot_service::SMiOldValueStatus &stMiOldValueStatus, + iot_service::SMiNewValueStatus &stMiNewValueStatus) { stMiOldValueStatus.oldstatus = 0; stMiOldValueStatus.oldvalue = 0; diff --git a/platform/src/service/data_process/MixProcess.h b/platform/src/service/data_process/MixProcess.h index e34454cf..8d479522 100644 --- a/platform/src/service/data_process/MixProcess.h +++ b/platform/src/service/data_process/MixProcess.h @@ -18,13 +18,13 @@ #include "PointBase.h" -namespace kbd_service +namespace iot_service { class CMixProcess :public CPointBase { public: - CMixProcess(kbd_public::SRunAppInfo stRunAppInfo,\ + CMixProcess(iot_public::SRunAppInfo stRunAppInfo,\ CDataProcessApiPtr ptrDataProcApi,\ CSrvDataPublishPtr ptrDataPublish); ~CMixProcess(); @@ -61,20 +61,20 @@ public: @return 成功 true 失败 false @retval */ - int procMixChange(const kbd_idlfile::SFesChangeMiPkg &stFesChgMixPkg); + int procMixChange(const iot_idl::SFesChangeMiPkg &stFesChgMixPkg); /** @brief 模拟量全数据处理函数 @param chgAiPkg 变化数据包结构体 @return 成功 true 失败 false @retval */ - int procMixUpdate(const kbd_idlfile::SFesUpdateMiPkg &stFesUpMixPkg); + int procMixUpdate(const iot_idl::SFesUpdateMiPkg &stFesUpMixPkg); /** @brief 置数、取消置数、取消禁止刷新处理 @param stOptSetDataPkg OPT设置结构体 @return 成功 true 失败 false */ - int processOperate(const kbd_idlfile::SOptSetDataPkg &stOptSetDataPkg,const int nOperateType); + int processOperate(const iot_idl::SOptSetDataPkg &stOptSetDataPkg,const int nOperateType); private: //AI/AO diff --git a/platform/src/service/data_process/MixStructDefine.h b/platform/src/service/data_process/MixStructDefine.h index 8f58963b..49181315 100644 --- a/platform/src/service/data_process/MixStructDefine.h +++ b/platform/src/service/data_process/MixStructDefine.h @@ -4,7 +4,7 @@ #include #include "DataType.h" -namespace kbd_service +namespace iot_service { //混合量全结构定义 struct SMixPointAll diff --git a/platform/src/service/data_process/MixWorkThread.cpp b/platform/src/service/data_process/MixWorkThread.cpp index 71e58a9d..8cf5ec8d 100644 --- a/platform/src/service/data_process/MixWorkThread.cpp +++ b/platform/src/service/data_process/MixWorkThread.cpp @@ -9,15 +9,15 @@ #include "pub_logger_api/logger.h" #include "pub_utility_api/TimeUtil.h" -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_idlfile; -using namespace kbd_dbms; +using namespace iot_net; +using namespace iot_public; +using namespace iot_service; +using namespace iot_idl; +using namespace iot_dbms; using namespace std; -CMixWorkThread::CMixWorkThread(kbd_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue): +CMixWorkThread::CMixWorkThread(iot_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue): CTimerThreadBase("CMixWorkThread",15) { m_nMsgSeqNum = 0; @@ -117,13 +117,13 @@ int CMixWorkThread::processOptMessage() { //处理标签操作 //============================================================================================================= - std::deque deqOptManSetPkg; + std::deque deqOptManSetPkg; if(m_ptrPacketQueue->getOptManSetPkg(POINT_TYPE_MIX,deqOptManSetPkg)) { - std::deque::iterator it = deqOptManSetPkg.begin(); + std::deque::iterator it = deqOptManSetPkg.begin(); for( ;it!=deqOptManSetPkg.end();++it) { - kbd_idlfile::SOptSetDataPkg &objOptManSetPkg = *it ; + iot_idl::SOptSetDataPkg &objOptManSetPkg = *it ; m_ptrMixProcess->processOperate(objOptManSetPkg,OPERATE_TYPE ); LOGINFO("processFesMessage:处理标签操作 num=%d .",objOptManSetPkg.seq_set_data_info_size()); } @@ -131,13 +131,13 @@ int CMixWorkThread::processOptMessage() //处理计算点 //============================================================================================================= - std::deque deqOptCalSetPkg; + std::deque deqOptCalSetPkg; if(m_ptrPacketQueue->getOptCalSetPkg(POINT_TYPE_MIX,deqOptCalSetPkg)) { - std::deque::iterator it = deqOptCalSetPkg.begin(); + std::deque::iterator it = deqOptCalSetPkg.begin(); for( ;it!=deqOptCalSetPkg.end();++it) { - kbd_idlfile::SOptSetDataPkg &objOptCalSetPkg = *it ; + iot_idl::SOptSetDataPkg &objOptCalSetPkg = *it ; m_ptrMixProcess->processOperate(objOptCalSetPkg,OPT_TYPE_CAL_SET); //LOGINFO("processFesMessage:处理计算点 num=%d .",objOptCalSetPkg.seq_set_data_info_size()); } @@ -157,14 +157,14 @@ int CMixWorkThread::processFesMessage() //处理变化模拟量 //============================================================================================================= - std::deque deqFesChgMiPkg; + std::deque deqFesChgMiPkg; if(m_ptrPacketQueue->getFesChangeMixPkg(deqFesChgMiPkg)) //获得变化数据包队列 { - std::deque::iterator it = deqFesChgMiPkg.begin(); + std::deque::iterator it = deqFesChgMiPkg.begin(); for( ;it!=deqFesChgMiPkg.end();++it) { t1 = getMonotonicMsec() ; - kbd_idlfile::SFesChangeMiPkg &objFesChangeMiPkg = *it ; + iot_idl::SFesChangeMiPkg &objFesChangeMiPkg = *it ; m_ptrMixProcess->procMixChange(objFesChangeMiPkg); t2 = getMonotonicMsec() ; LOGDEBUG("processFesMessage:处理变化数字量 num=%d，用时=%lld(ms)",objFesChangeMiPkg.stmidata_size(),(long long)(t2-t1)); @@ -173,7 +173,7 @@ int CMixWorkThread::processFesMessage() //处理全数据 //============================================================================================================= - kbd_idlfile::SFesUpdateMiPkg objFesUpdMiPkg; + iot_idl::SFesUpdateMiPkg objFesUpdMiPkg; if(m_ptrPacketQueue->getFesUpdateMixPkg(objFesUpdMiPkg)) //获得全数据 { t1 = getMonotonicMsec() ; diff --git a/platform/src/service/data_process/MixWorkThread.h b/platform/src/service/data_process/MixWorkThread.h index 1485171d..4cb3af15 100644 --- a/platform/src/service/data_process/MixWorkThread.h +++ b/platform/src/service/data_process/MixWorkThread.h @@ -14,12 +14,12 @@ #include "PacketQueue.h" #include -namespace kbd_service +namespace iot_service { -class CMixWorkThread : public kbd_public::CTimerThreadBase +class CMixWorkThread : public iot_public::CTimerThreadBase { public: - CMixWorkThread(kbd_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue); + CMixWorkThread(iot_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue); virtual ~CMixWorkThread(); private: @@ -30,7 +30,7 @@ private: int64 m_lLastProAlmTime; int64 m_lLastTime; int64 m_lLastAllDataTime; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; private: CMixProcessPtr m_ptrMixProcess; diff --git a/platform/src/service/data_process/MsgRecvThread.cpp b/platform/src/service/data_process/MsgRecvThread.cpp index dabb39dd..1834fc7c 100644 --- a/platform/src/service/data_process/MsgRecvThread.cpp +++ b/platform/src/service/data_process/MsgRecvThread.cpp @@ -11,13 +11,13 @@ #include "common/Common.h" #include "pub_utility_api/TimeUtil.h" -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_idlfile; -using namespace kbd_service; +using namespace iot_net; +using namespace iot_public; +using namespace iot_idl; +using namespace iot_service; using namespace std; -CMsgRecvThread::CMsgRecvThread(kbd_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue): +CMsgRecvThread::CMsgRecvThread(iot_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue): CTimerThreadBase("CMsgRecvThread",1) { m_ptrPacketQueue = ptrPacketQueue ; @@ -125,7 +125,7 @@ void CMsgRecvThread::execute() return; } -int CMsgRecvThread::parseOptPackage(const kbd_net::CMbMessage &objRecvMsg) +int CMsgRecvThread::parseOptPackage(const iot_net::CMbMessage &objRecvMsg) { bool bRetCode = false; int nMessageType = objRecvMsg.getMsgType(); @@ -161,7 +161,7 @@ int CMsgRecvThread::parseOptPackage(const kbd_net::CMbMessage &objRecvMsg) @return 无 @retval */ -int CMsgRecvThread::parseFesPackage(const kbd_net::CMbMessage &objRecvMsg) +int CMsgRecvThread::parseFesPackage(const iot_net::CMbMessage &objRecvMsg) { //int64 t1,t2; bool bRetCode = false; diff --git a/platform/src/service/data_process/MsgRecvThread.h b/platform/src/service/data_process/MsgRecvThread.h index 3fa2377a..5e67025c 100644 --- a/platform/src/service/data_process/MsgRecvThread.h +++ b/platform/src/service/data_process/MsgRecvThread.h @@ -12,21 +12,21 @@ #include "PacketQueue.h" #include -namespace kbd_service +namespace iot_service { -class CMsgRecvThread : public kbd_public::CTimerThreadBase +class CMsgRecvThread : public iot_public::CTimerThreadBase { public: - CMsgRecvThread(kbd_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue); + CMsgRecvThread(iot_public::SRunAppInfo stRunAppInfo,CPacketQueuePtr ptrPacketQueue); virtual ~CMsgRecvThread(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; CNetMsgBusExPtr m_ptrNetMsgBus; CPacketQueuePtr m_ptrPacketQueue; //消息缓存类 - int parseOptPackage(const kbd_net::CMbMessage &objRecvMsg); - int parseFesPackage(const kbd_net::CMbMessage &objRecvMsg); + int parseOptPackage(const iot_net::CMbMessage &objRecvMsg); + int parseFesPackage(const iot_net::CMbMessage &objRecvMsg); public: /** @brief 消息接收线程初始化 diff --git a/platform/src/service/data_process/PacketQueue.cpp b/platform/src/service/data_process/PacketQueue.cpp index 69c85035..d73538af 100644 --- a/platform/src/service/data_process/PacketQueue.cpp +++ b/platform/src/service/data_process/PacketQueue.cpp @@ -6,10 +6,10 @@ #include "PacketQueue.h" #include "pub_logger_api/logger.h" -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_public; +using namespace iot_service; using namespace std; -using namespace kbd_idlfile; +using namespace iot_idl; CPacketQueue::CPacketQueue() { @@ -34,7 +34,7 @@ CPacketQueue::~CPacketQueue() /** @brief 模拟量数据到队列接口函数 */ -void CPacketQueue::addFesChangeAnaPkg(const kbd_idlfile::SFesChangeAiPkg &objFesChgAiPkg) +void CPacketQueue::addFesChangeAnaPkg(const iot_idl::SFesChangeAiPkg &objFesChgAiPkg) { boost::mutex::scoped_lock lock(m_objMutexChgAi); @@ -48,7 +48,7 @@ void CPacketQueue::addFesChangeAnaPkg(const kbd_idlfile::SFesChangeAiPkg &objFes return; } -bool CPacketQueue::getFesChangeAnaPkg(std::deque &deqFesChgAiPkg) +bool CPacketQueue::getFesChangeAnaPkg(std::deque &deqFesChgAiPkg) { if(m_deqFesChgAiPkg.empty()) { @@ -61,7 +61,7 @@ bool CPacketQueue::getFesChangeAnaPkg(std::deque & return true; } -void CPacketQueue::addFesUpdateAnaPkg(const kbd_idlfile::SFesUpdateAiPkg &objFesUpdAiPkg) +void CPacketQueue::addFesUpdateAnaPkg(const iot_idl::SFesUpdateAiPkg &objFesUpdAiPkg) { boost::mutex::scoped_lock lock(m_objMutexUpdAi); if(m_deqFesUpdAiPkg.size()>=MAX_UPD_QUEUE_NUM) @@ -73,7 +73,7 @@ void CPacketQueue::addFesUpdateAnaPkg(const kbd_idlfile::SFesUpdateAiPkg &objFes return; } -bool CPacketQueue::getFesUpdateAnaPkg(kbd_idlfile::SFesUpdateAiPkg &objFesUpdAiPkg) +bool CPacketQueue::getFesUpdateAnaPkg(iot_idl::SFesUpdateAiPkg &objFesUpdAiPkg) { if(m_deqFesUpdAiPkg.empty()) { @@ -89,7 +89,7 @@ bool CPacketQueue::getFesUpdateAnaPkg(kbd_idlfile::SFesUpdateAiPkg &objFesUpdAiP /** @brief 数字量数据到队列接口函数 */ -void CPacketQueue::addFesChangeDigPkg(const kbd_idlfile::SFesChangeDiPkg &objFesChgDiPkg) +void CPacketQueue::addFesChangeDigPkg(const iot_idl::SFesChangeDiPkg &objFesChgDiPkg) { boost::mutex::scoped_lock lock(m_objMutexChgDi); @@ -103,7 +103,7 @@ void CPacketQueue::addFesChangeDigPkg(const kbd_idlfile::SFesChangeDiPkg &objFes return; } -void CPacketQueue::addFesUpdateDigPkg(const kbd_idlfile::SFesUpdateDiPkg &objFesUpdDiPkg) +void CPacketQueue::addFesUpdateDigPkg(const iot_idl::SFesUpdateDiPkg &objFesUpdDiPkg) { boost::mutex::scoped_lock lock(m_objMutexUpdDi); if(m_deqFesUpdDiPkg.size()>=MAX_UPD_QUEUE_NUM) @@ -115,7 +115,7 @@ void CPacketQueue::addFesUpdateDigPkg(const kbd_idlfile::SFesUpdateDiPkg &objFes return; } -bool CPacketQueue::getFesChangeDigPkg(std::deque &deqFesChgDiPkg) +bool CPacketQueue::getFesChangeDigPkg(std::deque &deqFesChgDiPkg) { if(m_deqFesChgDiPkg.empty()) { @@ -127,7 +127,7 @@ bool CPacketQueue::getFesChangeDigPkg(std::deque return true; } -bool CPacketQueue::getFesUpdateDigPkg(kbd_idlfile::SFesUpdateDiPkg &objFesUpdDiPkg) +bool CPacketQueue::getFesUpdateDigPkg(iot_idl::SFesUpdateDiPkg &objFesUpdDiPkg) { if(m_deqFesUpdDiPkg.empty()) { @@ -140,7 +140,7 @@ bool CPacketQueue::getFesUpdateDigPkg(kbd_idlfile::SFesUpdateDiPkg &objFesUpdDiP return true; } -void CPacketQueue::addFesSoeEventPkg(const kbd_idlfile::SFesSoeEventPkg &objFesSoeEventPkg) +void CPacketQueue::addFesSoeEventPkg(const iot_idl::SFesSoeEventPkg &objFesSoeEventPkg) { boost::mutex::scoped_lock lock(m_objMutexSoeEvt); @@ -153,7 +153,7 @@ void CPacketQueue::addFesSoeEventPkg(const kbd_idlfile::SFesSoeEventPkg &objFesS return; } -bool CPacketQueue::getFesSoeEventPkg(std::deque &objFesSoeEventPkg) +bool CPacketQueue::getFesSoeEventPkg(std::deque &objFesSoeEventPkg) { if(m_deqFesSoeEventPkg.empty()) { @@ -169,7 +169,7 @@ bool CPacketQueue::getFesSoeEventPkg(std::deque & /** @brief 混合量数据到队列接口函数 */ -void CPacketQueue::addFesChangeMixPkg(const kbd_idlfile::SFesChangeMiPkg &objFesChgMiPkg) +void CPacketQueue::addFesChangeMixPkg(const iot_idl::SFesChangeMiPkg &objFesChgMiPkg) { boost::mutex::scoped_lock lock(m_objMutexChgMi); @@ -182,7 +182,7 @@ void CPacketQueue::addFesChangeMixPkg(const kbd_idlfile::SFesChangeMiPkg &objFes return; } -bool CPacketQueue::getFesChangeMixPkg(std::deque &deqFesChgMiPkg) +bool CPacketQueue::getFesChangeMixPkg(std::deque &deqFesChgMiPkg) { if(m_deqFesChgMiPkg.empty()) { @@ -195,7 +195,7 @@ bool CPacketQueue::getFesChangeMixPkg(std::deque return true; } -void CPacketQueue::addFesUpdateMixPkg(const kbd_idlfile::SFesUpdateMiPkg &objFesUpdMiPkg) +void CPacketQueue::addFesUpdateMixPkg(const iot_idl::SFesUpdateMiPkg &objFesUpdMiPkg) { boost::mutex::scoped_lock lock(m_objMutexUpdMi); @@ -208,7 +208,7 @@ void CPacketQueue::addFesUpdateMixPkg(const kbd_idlfile::SFesUpdateMiPkg &objFes return; } -bool CPacketQueue::getFesUpdateMixPkg(kbd_idlfile::SFesUpdateMiPkg &objFesUpdMiPkg) +bool CPacketQueue::getFesUpdateMixPkg(iot_idl::SFesUpdateMiPkg &objFesUpdMiPkg) { if(m_deqFesUpdMiPkg.empty()) { @@ -224,7 +224,7 @@ bool CPacketQueue::getFesUpdateMixPkg(kbd_idlfile::SFesUpdateMiPkg &objFesUpdMiP /** @brief 累计量数据到队列接口函数 */ -void CPacketQueue::addFesChangeAccPkg(const kbd_idlfile::SFesChangePiPkg &objFesChgPiPkg) +void CPacketQueue::addFesChangeAccPkg(const iot_idl::SFesChangePiPkg &objFesChgPiPkg) { boost::mutex::scoped_lock lock(m_objMutexChgPi); @@ -237,7 +237,7 @@ void CPacketQueue::addFesChangeAccPkg(const kbd_idlfile::SFesChangePiPkg &objFes return; } -void CPacketQueue::addFesUpdateAccPkg(const kbd_idlfile::SFesUpdatePiPkg &objFesUpdPiPkg) +void CPacketQueue::addFesUpdateAccPkg(const iot_idl::SFesUpdatePiPkg &objFesUpdPiPkg) { boost::mutex::scoped_lock lock(m_objMutexUpdPi); @@ -251,7 +251,7 @@ void CPacketQueue::addFesUpdateAccPkg(const kbd_idlfile::SFesUpdatePiPkg &objFes return; } -bool CPacketQueue::getFesChangeAccPkg(std::deque &objFesChgPiPkg) +bool CPacketQueue::getFesChangeAccPkg(std::deque &objFesChgPiPkg) { if(m_deqFesChgPiPkg.empty()) { @@ -264,7 +264,7 @@ bool CPacketQueue::getFesChangeAccPkg(std::deque return true; } -bool CPacketQueue::getFesUpdateAccPkg(kbd_idlfile::SFesUpdatePiPkg &objFesUpdPiPkg) +bool CPacketQueue::getFesUpdateAccPkg(iot_idl::SFesUpdatePiPkg &objFesUpdPiPkg) { if(m_deqFesUpdPiPkg.empty()) { diff --git a/platform/src/service/data_process/PacketQueue.h b/platform/src/service/data_process/PacketQueue.h index 71aa323e..6742e13d 100644 --- a/platform/src/service/data_process/PacketQueue.h +++ b/platform/src/service/data_process/PacketQueue.h @@ -18,7 +18,7 @@ #define MAX_UPD_QUEUE_NUM 20 //全数据最大队列数，如果超出，丢弃最老数据 （每种类型25*10000 20万点的容量） #define MAX_EVT_QUEUE_NUM 500000//变化事件，如果超出，丢弃最老数据(考虑15万YX点,10%变化率，30秒持续，共45万点不丢失事件) -namespace kbd_service +namespace iot_service { class CPacketQueue { @@ -31,67 +31,67 @@ private://变化数据 boost::mutex m_objMutexChgDi; //锁 boost::mutex m_objMutexChgMi; //锁 boost::mutex m_objMutexChgPi; //锁 - std::deque m_deqFesChgAiPkg; - std::deque m_deqFesChgDiPkg; - std::deque m_deqFesChgMiPkg; - std::deque m_deqFesChgPiPkg; + std::deque m_deqFesChgAiPkg; + std::deque m_deqFesChgDiPkg; + std::deque m_deqFesChgMiPkg; + std::deque m_deqFesChgPiPkg; private://全数据;保存最新全数据 boost::mutex m_objMutexUpdAi; //锁 boost::mutex m_objMutexUpdDi; //锁 boost::mutex m_objMutexUpdMi; //锁 boost::mutex m_objMutexUpdPi; //锁 - std::deque m_deqFesUpdAiPkg; - std::deque m_deqFesUpdDiPkg; - std::deque m_deqFesUpdMiPkg; - std::deque m_deqFesUpdPiPkg; + std::deque m_deqFesUpdAiPkg; + std::deque m_deqFesUpdDiPkg; + std::deque m_deqFesUpdMiPkg; + std::deque m_deqFesUpdPiPkg; private://操作+事件 boost::mutex m_objMutexCalSet; //锁 boost::mutex m_objMutexManSet; //锁 boost::mutex m_objMutexSoeEvt; //锁 - std::deque m_deqFesSoeEventPkg; - std::map> m_mapOptCalSetPkg; //计算设置 - std::map> m_mapOptManSetPkg; //人工设置 + std::deque m_deqFesSoeEventPkg; + std::map> m_mapOptCalSetPkg; //计算设置 + std::map> m_mapOptManSetPkg; //人工设置 public: /** @brief 从消息接受队列得到一条消息记录 */ - void addFesChangeAnaPkg(const kbd_idlfile::SFesChangeAiPkg &objFesChgAiPkg); - void addFesChangeDigPkg(const kbd_idlfile::SFesChangeDiPkg &objFesChgDiPkg); - void addFesChangeMixPkg(const kbd_idlfile::SFesChangeMiPkg &objFesChgMiPkg); - void addFesChangeAccPkg(const kbd_idlfile::SFesChangePiPkg &objFesChgPiPkg); + void addFesChangeAnaPkg(const iot_idl::SFesChangeAiPkg &objFesChgAiPkg); + void addFesChangeDigPkg(const iot_idl::SFesChangeDiPkg &objFesChgDiPkg); + void addFesChangeMixPkg(const iot_idl::SFesChangeMiPkg &objFesChgMiPkg); + void addFesChangeAccPkg(const iot_idl::SFesChangePiPkg &objFesChgPiPkg); - void addFesUpdateAnaPkg(const kbd_idlfile::SFesUpdateAiPkg &objFesUpdAiPkg); - void addFesUpdateDigPkg(const kbd_idlfile::SFesUpdateDiPkg &objFesUpdDiPkg); - void addFesUpdateMixPkg(const kbd_idlfile::SFesUpdateMiPkg &objFesUpdMiPkg); - void addFesUpdateAccPkg(const kbd_idlfile::SFesUpdatePiPkg &objFesUpdPiPkg); + void addFesUpdateAnaPkg(const iot_idl::SFesUpdateAiPkg &objFesUpdAiPkg); + void addFesUpdateDigPkg(const iot_idl::SFesUpdateDiPkg &objFesUpdDiPkg); + void addFesUpdateMixPkg(const iot_idl::SFesUpdateMiPkg &objFesUpdMiPkg); + void addFesUpdateAccPkg(const iot_idl::SFesUpdatePiPkg &objFesUpdPiPkg); /** @brief 从消息接受队列得到一条消息记录 */ - bool getFesChangeAnaPkg(std::deque &queFesChgAiPkg); - bool getFesChangeDigPkg(std::deque &queFesChgDiPkg); - bool getFesChangeMixPkg(std::deque &queFesChgMiPkg); - bool getFesChangeAccPkg(std::deque &queFesChgPiPkg); + bool getFesChangeAnaPkg(std::deque &queFesChgAiPkg); + bool getFesChangeDigPkg(std::deque &queFesChgDiPkg); + bool getFesChangeMixPkg(std::deque &queFesChgMiPkg); + bool getFesChangeAccPkg(std::deque &queFesChgPiPkg); - bool getFesUpdateAnaPkg(kbd_idlfile::SFesUpdateAiPkg &objFesUpdAiPkg); - bool getFesUpdateDigPkg(kbd_idlfile::SFesUpdateDiPkg &objFesUpdDiPkg); - bool getFesUpdateMixPkg(kbd_idlfile::SFesUpdateMiPkg &objFesUpdMiPkg); - bool getFesUpdateAccPkg(kbd_idlfile::SFesUpdatePiPkg &objFesUpdPiPkg); + bool getFesUpdateAnaPkg(iot_idl::SFesUpdateAiPkg &objFesUpdAiPkg); + bool getFesUpdateDigPkg(iot_idl::SFesUpdateDiPkg &objFesUpdDiPkg); + bool getFesUpdateMixPkg(iot_idl::SFesUpdateMiPkg &objFesUpdMiPkg); + bool getFesUpdateAccPkg(iot_idl::SFesUpdatePiPkg &objFesUpdPiPkg); /** @brief 从消息接受队列得到一条消息记录 */ - void addOptCalSetPkg(const kbd_idlfile::SOptSetDataPkg &objOptCalSetPkg); //计算设置 - void addOptManSetPkg(const kbd_idlfile::SOptSetDataPkg &objOptManSetPkg); //人工设置 + void addOptCalSetPkg(const iot_idl::SOptSetDataPkg &objOptCalSetPkg); //计算设置 + void addOptManSetPkg(const iot_idl::SOptSetDataPkg &objOptManSetPkg); //人工设置 - bool getOptCalSetPkg(const int nPointType,std::deque &queOptCalSetPkg); //计算设置 - bool getOptManSetPkg(const int nPointType,std::deque &queOptManSetPkg); //人工设置 + bool getOptCalSetPkg(const int nPointType,std::deque &queOptCalSetPkg); //计算设置 + bool getOptManSetPkg(const int nPointType,std::deque &queOptManSetPkg); //人工设置 /** @brief 从消息接受队列得到一条消息记录 */ - void addFesSoeEventPkg(const kbd_idlfile::SFesSoeEventPkg &objFesSoeEventPkg); - bool getFesSoeEventPkg(std::deque &queFesSoeEventPkg); + void addFesSoeEventPkg(const iot_idl::SFesSoeEventPkg &objFesSoeEventPkg); + bool getFesSoeEventPkg(std::deque &queFesSoeEventPkg); }; typedef boost::shared_ptr CPacketQueuePtr; diff --git a/platform/src/service/data_process/PointBase.cpp b/platform/src/service/data_process/PointBase.cpp index 0a0b4dcf..6e69749e 100644 --- a/platform/src/service/data_process/PointBase.cpp +++ b/platform/src/service/data_process/PointBase.cpp @@ -6,9 +6,9 @@ #include "PointBase.h" using namespace std; -using namespace kbd_service; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_service; +using namespace iot_public; +using namespace iot_dbms; CPointBase::CPointBase() diff --git a/platform/src/service/data_process/PointBase.h b/platform/src/service/data_process/PointBase.h index 8b2b98cd..d4f6a687 100644 --- a/platform/src/service/data_process/PointBase.h +++ b/platform/src/service/data_process/PointBase.h @@ -19,7 +19,7 @@ #include "service/common/CommonDefine.h" #include "rdb_api/RdbTableMng.h" -namespace kbd_service +namespace iot_service { class CPointBase { @@ -36,13 +36,13 @@ public://数据字典对象 std::map m_mapLimitStatus;//< 模拟量越限状态 public: - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; std::map m_mapTaginfo; //标签状态-值MAP ，人工置数保持上次状态和值 protected: CDataProcessApiPtr m_ptrDataProcApi; //数据字典基础类指针 CSrvDataPublishPtr m_ptrDataPublish; //数据发布类指针 - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng;//实时库内存管理基础类 + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng;//实时库内存管理基础类 private: /** diff --git a/platform/src/service/data_process/WorkThreadMng.cpp b/platform/src/service/data_process/WorkThreadMng.cpp index a09a881d..9020182a 100644 --- a/platform/src/service/data_process/WorkThreadMng.cpp +++ b/platform/src/service/data_process/WorkThreadMng.cpp @@ -5,11 +5,11 @@ */ #include "WorkThreadMng.h" -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_service; +using namespace iot_sys; -CWorkThreadMng::CWorkThreadMng(kbd_sys::CProcMngInterfacePtr ptrProc) +CWorkThreadMng::CWorkThreadMng(iot_sys::CProcMngInterfacePtr ptrProc) { m_ptrProcManage = ptrProc; } diff --git a/platform/src/service/data_process/WorkThreadMng.h b/platform/src/service/data_process/WorkThreadMng.h index 4806108c..1a47e1cb 100644 --- a/platform/src/service/data_process/WorkThreadMng.h +++ b/platform/src/service/data_process/WorkThreadMng.h @@ -16,13 +16,13 @@ #include "ChgWorkThread.h" #include "PacketQueue.h" -namespace kbd_service +namespace iot_service { class CWorkThreadMng : - public ::kbd_sys::CRedundantSwitchInterface + public ::iot_sys::CRedundantSwitchInterface { public: - CWorkThreadMng(kbd_sys::CProcMngInterfacePtr ptrProc); + CWorkThreadMng(iot_sys::CProcMngInterfacePtr ptrProc); ~CWorkThreadMng(void); private: @@ -33,7 +33,7 @@ private: CDigWorkThreadPtr m_ptrDigWorkThread; CMixWorkThreadPtr m_ptrMixWorkThread; CChgWorkThreadPtr m_ptrChgWorkThread; - kbd_sys::CProcMngInterfacePtr m_ptrProcManage; + iot_sys::CProcMngInterfacePtr m_ptrProcManage; public: /** @@ -48,7 +48,7 @@ public: @brief 初始化 @return 成功返回ture,失败返回false */ - bool initialize(const kbd_public::SRunAppInfo &stRunAppInfo); + bool initialize(const iot_public::SRunAppInfo &stRunAppInfo); /** @brief 业务资源释放 @return 成功返回ture,失败返回false diff --git a/platform/src/service/data_process_api/DataProcessApi.cpp b/platform/src/service/data_process_api/DataProcessApi.cpp index e7c032d6..99087c23 100644 --- a/platform/src/service/data_process_api/DataProcessApi.cpp +++ b/platform/src/service/data_process_api/DataProcessApi.cpp @@ -8,9 +8,9 @@ #include "DataProcessImpl.h" #include "data_process_api/DataProcessApi.h" -using namespace kbd_service; +using namespace iot_service; -SERVICE_DP_API CDataProcessApiPtr kbd_service::getDataProcInstance(std::string strAppName) +SERVICE_DP_API CDataProcessApiPtr iot_service::getDataProcInstance(std::string strAppName) { CDataProcessImplPtr ptrDataProcImpl = boost::make_shared(strAppName); if (ptrDataProcImpl != NULL) diff --git a/platform/src/service/data_process_api/DataProcessImpl.cpp b/platform/src/service/data_process_api/DataProcessImpl.cpp index 516863f7..6197c6af 100644 --- a/platform/src/service/data_process_api/DataProcessImpl.cpp +++ b/platform/src/service/data_process_api/DataProcessImpl.cpp @@ -9,9 +9,9 @@ #include "alarm_server_api/AlarmCommonDef.h" #include "public/pub_utility_api/TimeUtil.h" -using namespace kbd_dbms; -using namespace kbd_service; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_service; +using namespace iot_public; using namespace std; CDataProcessImpl::CDataProcessImpl(std::string strAppName) @@ -293,7 +293,7 @@ int CDataProcessImpl::getNewStatus(int nType, int &nNewStatus, int nOldStatus, i return -1; } - if (nOriType != kbd_service::STATUS_ORI_OPT && nOriType != kbd_service::STATUS_ORI_RECV) + if (nOriType != iot_service::STATUS_ORI_OPT && nOriType != iot_service::STATUS_ORI_RECV) { LOGINFO( "getNewStatus:error nOriType %d", nOriType); return -1; @@ -301,9 +301,9 @@ int CDataProcessImpl::getNewStatus(int nType, int &nNewStatus, int nOldStatus, i nNewStatus = nOldStatus; - if (nType == kbd_service::TYPE_STATUS_AI) + if (nType == iot_service::TYPE_STATUS_AI) { - if (nOriType == kbd_service::STATUS_ORI_OPT) + if (nOriType == iot_service::STATUS_ORI_OPT) { nNewStatus = nNewStatus & ~nDelStatus; if (isAngOverLimit(nDelStatus)) //删除越限状态 @@ -330,7 +330,7 @@ int CDataProcessImpl::getNewStatus(int nType, int &nNewStatus, int nOldStatus, i nNewStatus = nNewStatus | nAddStatus; } - if (isNormal(kbd_service::TYPE_STATUS_AI, nNewStatus, 0)) //越限属于不正常 + if (isNormal(iot_service::TYPE_STATUS_AI, nNewStatus, 0)) //越限属于不正常 { nNewStatus = nNewStatus | (1 << MENU_STATE_AI_NORMAL); } @@ -338,7 +338,7 @@ int CDataProcessImpl::getNewStatus(int nType, int &nNewStatus, int nOldStatus, i { nNewStatus = nNewStatus & ~(1 << MENU_STATE_AI_NORMAL); } - if (isValid(kbd_service::TYPE_STATUS_AI, nNewStatus, 0)) //判断是否有效 + if (isValid(iot_service::TYPE_STATUS_AI, nNewStatus, 0)) //判断是否有效 { nNewStatus = nNewStatus & ~(1 << MENU_STATE_AI_INVALID);//有效，去掉无效状态 } @@ -362,7 +362,7 @@ int CDataProcessImpl::getNewStatus(int nType, int &nNewStatus, int nOldStatus, i { nNewStatus = nNewStatus & ~(1 << MENU_STATE_AI_NORMAL); } - if (isValid(kbd_service::TYPE_STATUS_AI, nNewStatus, 0)) //判断是否有效 + if (isValid(iot_service::TYPE_STATUS_AI, nNewStatus, 0)) //判断是否有效 { nNewStatus = nNewStatus & ~(1 << MENU_STATE_AI_INVALID);//有效，去掉无效状态 } @@ -373,9 +373,9 @@ int CDataProcessImpl::getNewStatus(int nType, int &nNewStatus, int nOldStatus, i return 1; } } - else if (nType == kbd_service::TYPE_STATUS_DI) + else if (nType == iot_service::TYPE_STATUS_DI) { - if (nOriType == kbd_service::STATUS_ORI_OPT) + if (nOriType == iot_service::STATUS_ORI_OPT) { nNewStatus = nNewStatus & ~nDelStatus; nNewStatus = nNewStatus | nAddStatus; @@ -386,7 +386,7 @@ int CDataProcessImpl::getNewStatus(int nType, int &nNewStatus, int nOldStatus, i nNewStatus = nNewStatus & ~(1 << MENU_STATE_DI_INVALID); nNewStatus = nNewStatus & ~(1 << MENU_STATE_DI_NOT_REAL); } - if (isNormal(kbd_service::TYPE_STATUS_DI, nNewStatus, 0)) + if (isNormal(iot_service::TYPE_STATUS_DI, nNewStatus, 0)) { nNewStatus = nNewStatus | (1 << MENU_STATE_DI_NORMAL); } @@ -394,7 +394,7 @@ int CDataProcessImpl::getNewStatus(int nType, int &nNewStatus, int nOldStatus, i { nNewStatus = nNewStatus & ~(1 << MENU_STATE_DI_NORMAL); } - if (isValid(kbd_service::TYPE_STATUS_DI, nNewStatus, 0)) //有效 + if (isValid(iot_service::TYPE_STATUS_DI, nNewStatus, 0)) //有效 { nNewStatus = nNewStatus & ~(1 << MENU_STATE_DI_INVALID); } @@ -404,7 +404,7 @@ int CDataProcessImpl::getNewStatus(int nType, int &nNewStatus, int nOldStatus, i } return 1; } - else if (nOriType == kbd_service::STATUS_ORI_RECV) + else if (nOriType == iot_service::STATUS_ORI_RECV) { nNewStatus = nNewStatus & ~nDelStatus; nNewStatus = nNewStatus | nAddStatus; @@ -415,7 +415,7 @@ int CDataProcessImpl::getNewStatus(int nType, int &nNewStatus, int nOldStatus, i nNewStatus = nNewStatus & ~(1 << MENU_STATE_DI_GK_OFF); } - if (isNormal(kbd_service::TYPE_STATUS_DI, nNewStatus, 0)) //正常 + if (isNormal(iot_service::TYPE_STATUS_DI, nNewStatus, 0)) //正常 { nNewStatus = nNewStatus | (1 << MENU_STATE_DI_NORMAL); } @@ -423,7 +423,7 @@ int CDataProcessImpl::getNewStatus(int nType, int &nNewStatus, int nOldStatus, i { nNewStatus = nNewStatus & ~(1 << MENU_STATE_DI_NORMAL); } - if (isValid(kbd_service::TYPE_STATUS_DI, nNewStatus, 0)) //有效 + if (isValid(iot_service::TYPE_STATUS_DI, nNewStatus, 0)) //有效 { nNewStatus = nNewStatus & ~(1 << MENU_STATE_DI_INVALID); } diff --git a/platform/src/service/data_process_api/DataProcessImpl.h b/platform/src/service/data_process_api/DataProcessImpl.h index 2f16cdaf..414275b3 100644 --- a/platform/src/service/data_process_api/DataProcessImpl.h +++ b/platform/src/service/data_process_api/DataProcessImpl.h @@ -10,7 +10,7 @@ #include "data_process_api/DataProcessApi.h" #include "rdb_api/RdbTableMng.h" -namespace kbd_service +namespace iot_service { class CDataProcessImpl : public CDataProcessApi @@ -81,7 +81,7 @@ private: int MENU_DO_NOTHING; std::string m_strAppName; - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; std::map > m_mapStateText; public: @@ -151,7 +151,7 @@ public: @retval */ int getNewStatus(int nType, int &nNewStatus, int nOldStatus, int nAddStatus, int nDelStatus, - int nOriType = kbd_service::STATUS_ORI_OPT, int nUpdateType = 0); + int nOriType = iot_service::STATUS_ORI_OPT, int nUpdateType = 0); /** @brief 状态是否正常，nCalFlag==1时用于公式计算判断各分量是否正常，哪些状态位不正常在构造函数中配置 diff --git a/platform/src/service/dp_chg_data_api/CDpcdaForApp.cpp b/platform/src/service/dp_chg_data_api/CDpcdaForApp.cpp index f934a1b5..8bb4c6ea 100644 --- a/platform/src/service/dp_chg_data_api/CDpcdaForApp.cpp +++ b/platform/src/service/dp_chg_data_api/CDpcdaForApp.cpp @@ -13,7 +13,7 @@ #include "CDpcdaForAppGlobal.h" -namespace kbd_service +namespace iot_service { CDpcdaForAppGlobal *g_pDpcdaForAppGlobal = NULL; @@ -89,5 +89,5 @@ void CDpcdaForApp::unsubscribeAll() } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/dp_chg_data_api/CDpcdaForAppGlobal.cpp b/platform/src/service/dp_chg_data_api/CDpcdaForAppGlobal.cpp index 0f4d8115..3baede9b 100644 --- a/platform/src/service/dp_chg_data_api/CDpcdaForAppGlobal.cpp +++ b/platform/src/service/dp_chg_data_api/CDpcdaForAppGlobal.cpp @@ -20,7 +20,7 @@ #include "DpcdaCommon.h" #include "CDpcdaForAppGlobal.h" -namespace kbd_service +namespace iot_service { CDpcdaForAppGlobal::CDpcdaForAppGlobal(bool bFaultRecallState) : @@ -30,7 +30,7 @@ CDpcdaForAppGlobal::CDpcdaForAppGlobal(bool bFaultRecallState) : { //< 自动压缩阈值 const int nAutoZipSize = 512; - m_pMbComm = new kbd_net::CMbCommunicator(NULL, &nAutoZipSize); + m_pMbComm = new iot_net::CMbCommunicator(NULL, &nAutoZipSize); resume(); } @@ -52,7 +52,7 @@ void CDpcdaForAppGlobal::addSubtionOfSuber(const CDpcdaForApp *pSuber, const std { //< pSubInfo 无需释放，移交给智能指针 - kbd_idlfile::SDpcdaSubInfo *pSubInfo = new kbd_idlfile::SDpcdaSubInfo; + iot_idl::SDpcdaSubInfo *pSubInfo = new iot_idl::SDpcdaSubInfo; pSubInfo->set_tab_name(strTabName); pSubInfo->set_tag_name(strTagName); @@ -80,7 +80,7 @@ void CDpcdaForAppGlobal::delSubtionOfSuber(const CDpcdaForApp *pSuber, const std { //< pSubInfo 无需释放，移交给智能指针 - kbd_idlfile::SDpcdaSubInfo *pSubInfo = new kbd_idlfile::SDpcdaSubInfo; + iot_idl::SDpcdaSubInfo *pSubInfo = new iot_idl::SDpcdaSubInfo; pSubInfo->set_tab_name(strTabName); pSubInfo->set_tag_name(strTagName); pSubInfo->set_col_name(strColName); @@ -108,11 +108,11 @@ void CDpcdaForAppGlobal::pushCachedMsgToQueue(const CCachedMsg &objMsg) m_queFromSuber.push(objMsg); } -void CDpcdaForAppGlobal::sendAllSub(const kbd_net::CMbMessage *pSrcMsg) +void CDpcdaForAppGlobal::sendAllSub(const iot_net::CMbMessage *pSrcMsg) { if (m_strAllSub.empty()) { - kbd_idlfile::SDpcdaSubPkg objSubPkgAll; + iot_idl::SDpcdaSubPkg objSubPkgAll; ConstSubInfoPtrVecPtr ptrVecSubAll = m_objSubMng.getSubtionOfAll(); if (ptrVecSubAll) @@ -121,7 +121,7 @@ void CDpcdaForAppGlobal::sendAllSub(const kbd_net::CMbMessage *pSrcMsg) for (size_t i = 0; i < nSize; ++i) { const ConstSubInfoPtr &ptrSubInfo = (*ptrVecSubAll)[i]; - kbd_idlfile::SDpcdaSubInfo *pSubAdd = objSubPkgAll.add_add_sub(); + iot_idl::SDpcdaSubInfo *pSubAdd = objSubPkgAll.add_add_sub(); pSubAdd->CopyFrom(*ptrSubInfo); } } @@ -137,8 +137,8 @@ void CDpcdaForAppGlobal::sendAllSub(const kbd_net::CMbMessage *pSrcMsg) } //< else : - kbd_net::CMbMessage objMbMsgSend; - objMbMsgSend.setMsgType(kbd_idlfile::MT_DPCDA_APP2DP_ALL); + iot_net::CMbMessage objMbMsgSend; + objMbMsgSend.setMsgType(iot_idl::MT_DPCDA_APP2DP_ALL); objMbMsgSend.setSubject(CN_AppId_PUBLIC, m_nChannelOffset + CH_DPCDA_APP_TO_DP); objMbMsgSend.setData(m_strAllSub); objMbMsgSend.setPara1(m_nSubChgCnt); @@ -167,13 +167,13 @@ void CDpcdaForAppGlobal::afterResume() //< 启动后，发送一次全同步消息，虽然为空，但是避免了各个DP都来点对点请求全同步 sendAllSub(); - m_nLastMulticastTime = kbd_public::getMonotonicMsec(); + m_nLastMulticastTime = iot_public::getMonotonicMsec(); } void CDpcdaForAppGlobal::execute() { - boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); //< 消息接收超时时间，视是否sleep而变化 int nMbRcvTimeoutMs = 100; @@ -284,25 +284,25 @@ void CDpcdaForAppGlobal::execute() m_strAllSub.clear(); } - kbd_idlfile::SDpcdaSubPkg objSubPkgChg; + iot_idl::SDpcdaSubPkg objSubPkgChg; for (BOOST_AUTO(itAdd, mapGlobalAddedSub.begin()); mapGlobalAddedSub.end() != itAdd; ++itAdd) { - kbd_idlfile::SDpcdaSubInfo *pSubInfo = objSubPkgChg.add_add_sub(); + iot_idl::SDpcdaSubInfo *pSubInfo = objSubPkgChg.add_add_sub(); pSubInfo->CopyFrom(*(itAdd->second)); } for (BOOST_AUTO(itDel, mapGlobalDeledSub.begin()); mapGlobalDeledSub.end() != itDel; ++itDel) { - kbd_idlfile::SDpcdaSubInfo *pSubInfo = objSubPkgChg.add_del_sub(); + iot_idl::SDpcdaSubInfo *pSubInfo = objSubPkgChg.add_del_sub(); pSubInfo->CopyFrom(*(itDel->second)); } //< 消息 - kbd_net::CMbMessage objMbMsgSend; - objMbMsgSend.setMsgType(kbd_idlfile::MT_DPCDA_APP2DP_CHG); + iot_net::CMbMessage objMbMsgSend; + objMbMsgSend.setMsgType(iot_idl::MT_DPCDA_APP2DP_CHG); objMbMsgSend.setSubject(CN_AppId_PUBLIC, m_nChannelOffset + CH_DPCDA_APP_TO_DP); if (!objMbMsgSend.setData(objSubPkgChg)) { @@ -319,8 +319,8 @@ void CDpcdaForAppGlobal::execute() //< 频繁发送订阅变化，则无需发送订阅变化计数 if (m_nLastMulticastTime + 3000 <= nTimeNow) { - kbd_net::CMbMessage objMbMsgSend; - objMbMsgSend.setMsgType(kbd_idlfile::MT_DPCDA_APP2DP_CHG_CNT); + iot_net::CMbMessage objMbMsgSend; + objMbMsgSend.setMsgType(iot_idl::MT_DPCDA_APP2DP_CHG_CNT); objMbMsgSend.setSubject(CN_AppId_PUBLIC, m_nChannelOffset + CH_DPCDA_APP_TO_DP); objMbMsgSend.setData(std::string("DPCDA")); objMbMsgSend.setPara1(m_nSubChgCnt); @@ -331,12 +331,12 @@ void CDpcdaForAppGlobal::execute() //< 响应消息总线消息 { - kbd_net::CMbMessage objMbMsgRcv; + iot_net::CMbMessage objMbMsgRcv; while (m_pMbComm->recvMsg(objMbMsgRcv, nMbRcvTimeoutMs)) { switch (objMbMsgRcv.getMsgType()) { - case kbd_idlfile::MT_DPCDA_DP2APP_ALL_REQ: + case iot_idl::MT_DPCDA_DP2APP_ALL_REQ: { sendAllSub(&objMbMsgRcv); } @@ -352,5 +352,5 @@ void CDpcdaForAppGlobal::execute() } } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/dp_chg_data_api/CDpcdaForAppGlobal.h b/platform/src/service/dp_chg_data_api/CDpcdaForAppGlobal.h index 7644b35c..d533c463 100644 --- a/platform/src/service/dp_chg_data_api/CDpcdaForAppGlobal.h +++ b/platform/src/service/dp_chg_data_api/CDpcdaForAppGlobal.h @@ -20,12 +20,12 @@ #include "CDpcdaSubMng.h" -namespace kbd_service +namespace iot_service { class CDpcdaForApp; -class CDpcdaForAppGlobal : private kbd_public::CTimerThreadBase +class CDpcdaForAppGlobal : private iot_public::CTimerThreadBase { public: CDpcdaForAppGlobal(bool bFaultRecallState); @@ -45,7 +45,7 @@ private: //< 发送全同步消息 //< pSrcMsg: 原发消息（即DP发来的请求消息），以便点对点回复，为NULL则发送到本域 - void sendAllSub(const kbd_net::CMbMessage *pSrcMsg = NULL); + void sendAllSub(const iot_net::CMbMessage *pSrcMsg = NULL); enum enCachedMsgType { @@ -77,7 +77,7 @@ private: boost::int64_t m_nLastMulticastTime; //< 消息总线通讯器，动态UUID命名 - kbd_net::CMbCommunicator *m_pMbComm; + iot_net::CMbCommunicator *m_pMbComm; //< MT_DPCDA_APP2DP_ALL 消息序列化后的数据，全局订阅变化时清空 std::string m_strAllSub; @@ -91,5 +91,5 @@ private: std::queue m_queFromSuber; }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/dp_chg_data_api/CDpcdaForDp.cpp b/platform/src/service/dp_chg_data_api/CDpcdaForDp.cpp index 5ddd4952..e966675a 100644 --- a/platform/src/service/dp_chg_data_api/CDpcdaForDp.cpp +++ b/platform/src/service/dp_chg_data_api/CDpcdaForDp.cpp @@ -14,7 +14,7 @@ #include "CDpcdaForDpImpl.h" -namespace kbd_service +namespace iot_service { CDpcdaForDp::CDpcdaForDp(int nDomainID, int nAppID, const char *pszAppName, @@ -43,7 +43,7 @@ bool CDpcdaForDp::suspendThread() } -bool CDpcdaForDp::addChgData(kbd_idlfile::SRealTimeDataPkg &objChgData) +bool CDpcdaForDp::addChgData(iot_idl::SRealTimeDataPkg &objChgData) { return m_pImpl->addChgData(objChgData); } @@ -61,5 +61,5 @@ void CDpcdaForDp::onSubtionAdded(const ConstSubInfoPtrVec &vecSubAdded) boost::ignore_unused(vecSubAdded); } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/dp_chg_data_api/CDpcdaForDpImpl.cpp b/platform/src/service/dp_chg_data_api/CDpcdaForDpImpl.cpp index 995358d5..bb9c1826 100644 --- a/platform/src/service/dp_chg_data_api/CDpcdaForDpImpl.cpp +++ b/platform/src/service/dp_chg_data_api/CDpcdaForDpImpl.cpp @@ -16,7 +16,7 @@ #include "dp_chg_data_api/CDpcdaForDp.h" #include "CDpcdaForDpImpl.h" -namespace kbd_service +namespace iot_service { //< 靠接收消息超时时间控制运行周期 @@ -69,14 +69,14 @@ CDpcdaForDpImpl::CDpcdaForDpImpl(int nDomainID, int nAppID, const char *pszAppNa m_pQueChgData = new std::queue; - m_pRtdPkgSend = new kbd_idlfile::SRealTimeDataPkg; + m_pRtdPkgSend = new iot_idl::SRealTimeDataPkg; - m_pRtdb_AI = new kbd_dbms::CRdbAccess; - m_pRtdb_DI = new kbd_dbms::CRdbAccess; - m_pRtdb_MI = new kbd_dbms::CRdbAccess; - m_pRtdb_ACC = new kbd_dbms::CRdbAccess; + m_pRtdb_AI = new iot_dbms::CRdbAccess; + m_pRtdb_DI = new iot_dbms::CRdbAccess; + m_pRtdb_MI = new iot_dbms::CRdbAccess; + m_pRtdb_ACC = new iot_dbms::CRdbAccess; - m_ptrRdbTableMng = boost::make_shared(pszAppName); + m_ptrRdbTableMng = boost::make_shared(pszAppName); if (!m_ptrRdbTableMng) { LOGERROR("make_shared fail!\n"); @@ -203,7 +203,7 @@ bool CDpcdaForDpImpl::resumeThread() { //< 自动压缩阈值 const int nAutoZipSize = 512; - m_pMbComm = new kbd_net::CMbCommunicator(NULL, &nAutoZipSize); + m_pMbComm = new iot_net::CMbCommunicator(NULL, &nAutoZipSize); } //< 订阅，中心域需转发到非中心域 @@ -266,7 +266,7 @@ bool CDpcdaForDpImpl::suspendThread() } -bool CDpcdaForDpImpl::addChgData(kbd_idlfile::SRealTimeDataPkg &objChgData) +bool CDpcdaForDpImpl::addChgData(iot_idl::SRealTimeDataPkg &objChgData) { if (m_bFaultRecallState) { @@ -280,7 +280,7 @@ bool CDpcdaForDpImpl::addChgData(kbd_idlfile::SRealTimeDataPkg &objChgData) return false; } - SRealTimeDataPkgPtr ptrRtData(new kbd_idlfile::SRealTimeDataPkg()); + SRealTimeDataPkgPtr ptrRtData(new iot_idl::SRealTimeDataPkg()); ptrRtData->Swap(&objChgData); { @@ -317,7 +317,7 @@ ConstSubInfoPtrVecPtr CDpcdaForDpImpl::getSubtionOfAll() void CDpcdaForDpImpl::execute() { - m_nTimeNow = kbd_public::getMonotonicMsec(); + m_nTimeNow = iot_public::getMonotonicMsec(); //< 清理超时的app状态信息 cleanAppStatMap(); @@ -338,7 +338,7 @@ void CDpcdaForDpImpl::execute() void CDpcdaForDpImpl::handleMbMsg() { - kbd_net::CMbMessage objMbMsgRcv; + iot_net::CMbMessage objMbMsgRcv; int nTimeout = 100; while (m_pMbComm->recvMsg(objMbMsgRcv, nTimeout)) { @@ -347,17 +347,17 @@ void CDpcdaForDpImpl::handleMbMsg() //< 按类型处理 switch (objMbMsgRcv.getMsgType()) { - case kbd_idlfile::MT_DPCDA_APP2DP_CHG: + case iot_idl::MT_DPCDA_APP2DP_CHG: { handle_MT_DPCDA_APP2DP_CHG(objMbMsgRcv); } break; - case kbd_idlfile::MT_DPCDA_APP2DP_CHG_CNT: + case iot_idl::MT_DPCDA_APP2DP_CHG_CNT: { handle_MT_DPCDA_APP2DP_CHG_CNT(objMbMsgRcv); } break; - case kbd_idlfile::MT_DPCDA_APP2DP_ALL: + case iot_idl::MT_DPCDA_APP2DP_ALL: { handle_MT_DPCDA_APP2DP_ALL(objMbMsgRcv); } @@ -405,13 +405,13 @@ void CDpcdaForDpImpl::handleChgDataQue() //< 过滤 AI { - ::google::protobuf::RepeatedPtrField<::kbd_idlfile::SAiRealTimeData> * pRtdFieldSrc,*pRtdFieldSend; + ::google::protobuf::RepeatedPtrField<::iot_idl::SAiRealTimeData> * pRtdFieldSrc,*pRtdFieldSend; pRtdFieldSrc = ptrRtdPkgSrc->mutable_stairtd(); pRtdFieldSend = m_pRtdPkgSend->mutable_stairtd(); while (!pRtdFieldSrc->empty()) { //< 取最后一个 - const kbd_idlfile::SAiRealTimeData *pRtd = pRtdFieldSrc->Mutable(pRtdFieldSrc->size() - 1); + const iot_idl::SAiRealTimeData *pRtd = pRtdFieldSrc->Mutable(pRtdFieldSrc->size() - 1); if (m_pSubMng->hasSubtion(*pRtd)) { //< 有人订阅 @@ -427,13 +427,13 @@ void CDpcdaForDpImpl::handleChgDataQue() //< 过滤 DI { - ::google::protobuf::RepeatedPtrField<::kbd_idlfile::SDiRealTimeData> * pRtdFieldSrc,*pRtdFieldSend; + ::google::protobuf::RepeatedPtrField<::iot_idl::SDiRealTimeData> * pRtdFieldSrc,*pRtdFieldSend; pRtdFieldSrc = ptrRtdPkgSrc->mutable_stdirtd(); pRtdFieldSend = m_pRtdPkgSend->mutable_stdirtd(); while (!pRtdFieldSrc->empty()) { //< 取最后一个 - const kbd_idlfile::SDiRealTimeData *pRtd = pRtdFieldSrc->Mutable(pRtdFieldSrc->size() - 1); + const iot_idl::SDiRealTimeData *pRtd = pRtdFieldSrc->Mutable(pRtdFieldSrc->size() - 1); if (m_pSubMng->hasSubtion(*pRtd)) { //< 有人订阅 @@ -449,13 +449,13 @@ void CDpcdaForDpImpl::handleChgDataQue() //< 过滤 MI { - ::google::protobuf::RepeatedPtrField<::kbd_idlfile::SMiRealTimeData> * pRtdFieldSrc,*pRtdFieldSend; + ::google::protobuf::RepeatedPtrField<::iot_idl::SMiRealTimeData> * pRtdFieldSrc,*pRtdFieldSend; pRtdFieldSrc = ptrRtdPkgSrc->mutable_stmirtd(); pRtdFieldSend = m_pRtdPkgSend->mutable_stmirtd(); while (!pRtdFieldSrc->empty()) { //< 取最后一个 - const kbd_idlfile::SMiRealTimeData *pRtd = pRtdFieldSrc->Mutable(pRtdFieldSrc->size() - 1); + const iot_idl::SMiRealTimeData *pRtd = pRtdFieldSrc->Mutable(pRtdFieldSrc->size() - 1); if (m_pSubMng->hasSubtion(*pRtd)) { //< 有人订阅 @@ -471,13 +471,13 @@ void CDpcdaForDpImpl::handleChgDataQue() //< 过滤 ACC { - ::google::protobuf::RepeatedPtrField<::kbd_idlfile::SPiRealTimeData> * pRtdFieldSrc,*pRtdFieldSend; + ::google::protobuf::RepeatedPtrField<::iot_idl::SPiRealTimeData> * pRtdFieldSrc,*pRtdFieldSend; pRtdFieldSrc = ptrRtdPkgSrc->mutable_stpirtd(); pRtdFieldSend = m_pRtdPkgSend->mutable_stpirtd(); while (!pRtdFieldSrc->empty()) { //< 取最后一个 - const kbd_idlfile::SPiRealTimeData *pRtd = pRtdFieldSrc->Mutable(pRtdFieldSrc->size() - 1); + const iot_idl::SPiRealTimeData *pRtd = pRtdFieldSrc->Mutable(pRtdFieldSrc->size() - 1); if (m_pSubMng->hasSubtion(*pRtd)) { //< 有人订阅 @@ -494,10 +494,10 @@ void CDpcdaForDpImpl::handleChgDataQue() } -void CDpcdaForDpImpl::sendReqAllSub(const kbd_net::CMbMessage *pSrcMsg) +void CDpcdaForDpImpl::sendReqAllSub(const iot_net::CMbMessage *pSrcMsg) { - kbd_net::CMbMessage objMbMsgSend; - objMbMsgSend.setMsgType(kbd_idlfile::MT_DPCDA_DP2APP_ALL_REQ); + iot_net::CMbMessage objMbMsgSend; + objMbMsgSend.setMsgType(iot_idl::MT_DPCDA_DP2APP_ALL_REQ); objMbMsgSend.setSubject(m_nAppID, m_nChannelOffset + CH_DPCDA_DP_TO_APP); objMbMsgSend.setData(std::string("DPCDA")); @@ -548,10 +548,10 @@ void CDpcdaForDpImpl::cleanAppStatMap() } -void CDpcdaForDpImpl::handle_MT_DPCDA_APP2DP_CHG(kbd_net::CMbMessage &objMbMsg) +void CDpcdaForDpImpl::handle_MT_DPCDA_APP2DP_CHG(iot_net::CMbMessage &objMbMsg) { //< 反序列化 - kbd_idlfile::SDpcdaSubPkg objSubPkgChg; + iot_idl::SDpcdaSubPkg objSubPkgChg; if (!objSubPkgChg.ParseFromArray(objMbMsg.getDataPtr(), objMbMsg.getDataSize())) { LOGWARN("handle_MT_DPCDA_APP2DP_CHG(): 反序列化失败，忽略消息！"); @@ -605,7 +605,7 @@ void CDpcdaForDpImpl::handle_MT_DPCDA_APP2DP_CHG(kbd_net::CMbMessage &objMbMsg) //< 处理添加订阅 { //< 避免复制 - google::protobuf::RepeatedPtrField<::kbd_idlfile::SDpcdaSubInfo> *pSubInfoFieldAdd; + google::protobuf::RepeatedPtrField<::iot_idl::SDpcdaSubInfo> *pSubInfoFieldAdd; pSubInfoFieldAdd = objSubPkgChg.mutable_add_sub(); ConstSubInfoPtrVec vecAdded; @@ -636,7 +636,7 @@ void CDpcdaForDpImpl::handle_MT_DPCDA_APP2DP_CHG(kbd_net::CMbMessage &objMbMsg) //< 处理删除订阅 { //< 避免复制 - google::protobuf::RepeatedPtrField<::kbd_idlfile::SDpcdaSubInfo> *pSubInfoFieldDel; + google::protobuf::RepeatedPtrField<::iot_idl::SDpcdaSubInfo> *pSubInfoFieldDel; pSubInfoFieldDel = objSubPkgChg.mutable_del_sub(); while (!(pSubInfoFieldDel->empty())) @@ -649,7 +649,7 @@ void CDpcdaForDpImpl::handle_MT_DPCDA_APP2DP_CHG(kbd_net::CMbMessage &objMbMsg) } -void CDpcdaForDpImpl::handle_MT_DPCDA_APP2DP_CHG_CNT(kbd_net::CMbMessage &objMbMsg) +void CDpcdaForDpImpl::handle_MT_DPCDA_APP2DP_CHG_CNT(iot_net::CMbMessage &objMbMsg) { //< 消息验证 std::string strData((const char *)objMbMsg.getDataPtr(), objMbMsg.getDataSize()); @@ -693,10 +693,10 @@ void CDpcdaForDpImpl::handle_MT_DPCDA_APP2DP_CHG_CNT(kbd_net::CMbMessage &objMbM } -void CDpcdaForDpImpl::handle_MT_DPCDA_APP2DP_ALL(kbd_net::CMbMessage &objMbMsg) +void CDpcdaForDpImpl::handle_MT_DPCDA_APP2DP_ALL(iot_net::CMbMessage &objMbMsg) { //< 反序列化 - kbd_idlfile::SDpcdaSubPkg objSubPkgAll; + iot_idl::SDpcdaSubPkg objSubPkgAll; if (!objSubPkgAll.ParseFromArray(objMbMsg.getDataPtr(), objMbMsg.getDataSize())) { LOGWARN("handle_MT_DPCDA_APP2DP_ALL(): 反序列化失败，忽略消息！"); @@ -724,7 +724,7 @@ void CDpcdaForDpImpl::handle_MT_DPCDA_APP2DP_ALL(kbd_net::CMbMessage &objMbMsg) ConstSubInfoPtrVec vecSet, vecAdded, vecDeled; //< 避免复制 - google::protobuf::RepeatedPtrField<::kbd_idlfile::SDpcdaSubInfo> *pSubInfoFieldAll; + google::protobuf::RepeatedPtrField<::iot_idl::SDpcdaSubInfo> *pSubInfoFieldAll; pSubInfoFieldAll = objSubPkgAll.mutable_add_sub(); while (!(pSubInfoFieldAll->empty())) { @@ -796,14 +796,14 @@ void CDpcdaForDpImpl::sendRtdPkg() //< 设置消息头 { - kbd_idlfile::SRealTimePkgHead *pHead = m_pRtdPkgSend->mutable_sthead(); + iot_idl::SRealTimePkgHead *pHead = m_pRtdPkgSend->mutable_sthead(); pHead->set_strsrctag("data_process"); - pHead->set_ntimestamp(kbd_public::getUTCTimeMsec()); + pHead->set_ntimestamp(iot_public::getUTCTimeMsec()); } //< 序列化并发送消息 - kbd_net::CMbMessage objMbMsgSend; - objMbMsgSend.setMsgType(kbd_idlfile::MT_DP_CHANGE_DATA); + iot_net::CMbMessage objMbMsgSend; + objMbMsgSend.setMsgType(iot_idl::MT_DP_CHANGE_DATA); objMbMsgSend.setSubject(m_nAppID, m_nChannelOffset + CH_SCADA_TO_HMI_DATA_CHANGE); objMbMsgSend.setPara1(m_nDomainID); //< 按之前dp的代码设置 if (objMbMsgSend.setData(*m_pRtdPkgSend)) @@ -820,8 +820,8 @@ void CDpcdaForDpImpl::sendRtdPkg() } -bool CDpcdaForDpImpl::getDataFromRtdb(const kbd_idlfile::SDpcdaSubInfo &objSubInfo, - kbd_idlfile::SRealTimeDataPkg *pRtdPkg) +bool CDpcdaForDpImpl::getDataFromRtdb(const iot_idl::SDpcdaSubInfo &objSubInfo, + iot_idl::SRealTimeDataPkg *pRtdPkg) { if (m_bFaultRecallState) return false; @@ -856,7 +856,7 @@ bool CDpcdaForDpImpl::getDataFromRtdb(const kbd_idlfile::SDpcdaSubInfo &objSubIn } -bool CDpcdaForDpImpl::getAiDataFromRtdb(const std::string &strTagName, kbd_idlfile::SRealTimeDataPkg *pRtdPkg) +bool CDpcdaForDpImpl::getAiDataFromRtdb(const std::string &strTagName, iot_idl::SRealTimeDataPkg *pRtdPkg) { if (m_bFaultRecallState) return false; @@ -864,7 +864,7 @@ bool CDpcdaForDpImpl::getAiDataFromRtdb(const std::string &strTagName, kbd_idlfi //< 已在启动线程时判断了打开实时库表 //< 若没有打开表，不会运行到此处 - kbd_dbms::CTableLockGuard tableLock(*m_pRtdb_AI); + iot_dbms::CTableLockGuard tableLock(*m_pRtdb_AI); std::string strKey = strTagName; strKey.resize(64); @@ -878,8 +878,8 @@ bool CDpcdaForDpImpl::getAiDataFromRtdb(const std::string &strTagName, kbd_idlfi if (pRtdPkg) { - kbd_idlfile::SAiRealTimeData *pRtd = pRtdPkg->add_stairtd(); - kbd_dbms::CVarType objValue; + iot_idl::SAiRealTimeData *pRtd = pRtdPkg->add_stairtd(); + iot_dbms::CVarType objValue; //< location_id { @@ -937,7 +937,7 @@ bool CDpcdaForDpImpl::getAiDataFromRtdb(const std::string &strTagName, kbd_idlfi return true; } -bool CDpcdaForDpImpl::getDiDataFromRtdb(const std::string &strTagName, kbd_idlfile::SRealTimeDataPkg *pRtdPkg) +bool CDpcdaForDpImpl::getDiDataFromRtdb(const std::string &strTagName, iot_idl::SRealTimeDataPkg *pRtdPkg) { if (m_bFaultRecallState) return false; @@ -945,7 +945,7 @@ bool CDpcdaForDpImpl::getDiDataFromRtdb(const std::string &strTagName, kbd_idlfi //< 已在启动线程时判断了打开实时库表 //< 若没有打开表，不会运行到此处 - kbd_dbms::CTableLockGuard tableLock(*m_pRtdb_DI); + iot_dbms::CTableLockGuard tableLock(*m_pRtdb_DI); std::string strKey = strTagName; strKey.resize(64); @@ -959,8 +959,8 @@ bool CDpcdaForDpImpl::getDiDataFromRtdb(const std::string &strTagName, kbd_idlfi if (pRtdPkg) { - kbd_idlfile::SDiRealTimeData *pRtd = pRtdPkg->add_stdirtd(); - kbd_dbms::CVarType objValue; + iot_idl::SDiRealTimeData *pRtd = pRtdPkg->add_stdirtd(); + iot_dbms::CVarType objValue; //< location_id { @@ -1018,7 +1018,7 @@ bool CDpcdaForDpImpl::getDiDataFromRtdb(const std::string &strTagName, kbd_idlfi return true; } -bool CDpcdaForDpImpl::getMiDataFromRtdb(const std::string &strTagName, kbd_idlfile::SRealTimeDataPkg *pRtdPkg) +bool CDpcdaForDpImpl::getMiDataFromRtdb(const std::string &strTagName, iot_idl::SRealTimeDataPkg *pRtdPkg) { if (m_bFaultRecallState) return false; @@ -1026,7 +1026,7 @@ bool CDpcdaForDpImpl::getMiDataFromRtdb(const std::string &strTagName, kbd_idlfi //< 已在启动线程时判断了打开实时库表 //< 若没有打开表，不会运行到此处 - kbd_dbms::CTableLockGuard tableLock(*m_pRtdb_MI); + iot_dbms::CTableLockGuard tableLock(*m_pRtdb_MI); std::string strKey = strTagName; strKey.resize(64); @@ -1040,8 +1040,8 @@ bool CDpcdaForDpImpl::getMiDataFromRtdb(const std::string &strTagName, kbd_idlfi if (pRtdPkg) { - kbd_idlfile::SMiRealTimeData *pRtd = pRtdPkg->add_stmirtd(); - kbd_dbms::CVarType objValue; + iot_idl::SMiRealTimeData *pRtd = pRtdPkg->add_stmirtd(); + iot_dbms::CVarType objValue; //< location_id { @@ -1099,7 +1099,7 @@ bool CDpcdaForDpImpl::getMiDataFromRtdb(const std::string &strTagName, kbd_idlfi return true; } -bool CDpcdaForDpImpl::getAccDataFromRtdb(const std::string &strTagName, kbd_idlfile::SRealTimeDataPkg *pRtdPkg) +bool CDpcdaForDpImpl::getAccDataFromRtdb(const std::string &strTagName, iot_idl::SRealTimeDataPkg *pRtdPkg) { if (m_bFaultRecallState) return false; @@ -1107,7 +1107,7 @@ bool CDpcdaForDpImpl::getAccDataFromRtdb(const std::string &strTagName, kbd_idlf //< 已在启动线程时判断了打开实时库表 //< 若没有打开表，不会运行到此处 - kbd_dbms::CTableLockGuard tableLock(*m_pRtdb_ACC); + iot_dbms::CTableLockGuard tableLock(*m_pRtdb_ACC); std::string strKey = strTagName; strKey.resize(64); @@ -1121,8 +1121,8 @@ bool CDpcdaForDpImpl::getAccDataFromRtdb(const std::string &strTagName, kbd_idlf if (pRtdPkg) { - kbd_idlfile::SPiRealTimeData *pRtd = pRtdPkg->add_stpirtd(); - kbd_dbms::CVarType objValue; + iot_idl::SPiRealTimeData *pRtd = pRtdPkg->add_stpirtd(); + iot_dbms::CVarType objValue; //< location_id { @@ -1181,7 +1181,7 @@ bool CDpcdaForDpImpl::getAccDataFromRtdb(const std::string &strTagName, kbd_idlf } bool CDpcdaForDpImpl::getTableColumValue(const std::string &strTabName, const std::string &strTagName, const std::string &strColName, - kbd_idlfile::SRealTimeDataPkg *pRtdPkg) + iot_idl::SRealTimeDataPkg *pRtdPkg) { if (m_bFaultRecallState) return false; @@ -1199,7 +1199,7 @@ bool CDpcdaForDpImpl::getTableColumValue(const std::string &strTabName, const st return false; } - kbd_idlfile::STableRealTimeData stUtRealData; + iot_idl::STableRealTimeData stUtRealData; //< table tag colum name { @@ -1240,7 +1240,7 @@ bool CDpcdaForDpImpl::getTableColumValue(const std::string &strTabName, const st //< value { - kbd_idlfile::SVariable varValue; + iot_idl::SVariable varValue; if (getColumValue(strTabName, nRcdIndex, strColName, varValue)) { stUtRealData.mutable_varvalue()->CopyFrom(varValue); @@ -1262,7 +1262,7 @@ bool CDpcdaForDpImpl::getTableColumValue(const std::string &strTabName, const st } bool CDpcdaForDpImpl::getTableColumValue(const std::string &strTabName, const void* keyValue, const std::string &strColName, - kbd_idlfile::SRealTimeDataPkg *pRtdPkg) + iot_idl::SRealTimeDataPkg *pRtdPkg) { if (m_bFaultRecallState) return false; @@ -1278,7 +1278,7 @@ bool CDpcdaForDpImpl::getTableColumValue(const std::string &strTabName, const vo return false; } - kbd_idlfile::STableRealTimeData sTableRealData; + iot_idl::STableRealTimeData sTableRealData; //< table tag colum name { @@ -1319,7 +1319,7 @@ bool CDpcdaForDpImpl::getTableColumValue(const std::string &strTabName, const vo //< value { - kbd_idlfile::SVariable varValue; + iot_idl::SVariable varValue; if (getColumValue(strTabName, nRcdIndex, strColName, varValue)) { sTableRealData.mutable_varvalue()->CopyFrom(varValue); @@ -1342,7 +1342,7 @@ bool CDpcdaForDpImpl::getTableColumValue(const std::string &strTabName, const vo //获取实时库表列值 bool CDpcdaForDpImpl::getColumValue(const std::string &strTabName, const int nRcdIndex, - const std::string &strColName, kbd_idlfile::SVariable &varValue) + const std::string &strColName, iot_idl::SVariable &varValue) { if (m_bFaultRecallState) return false; @@ -1356,8 +1356,8 @@ bool CDpcdaForDpImpl::getColumValue(const std::string &strTabName, const int nR return false; } - kbd_dbms::CVarType objValue; - varValue.set_edatatype((kbd_idlfile::DataType)nDataType); + iot_dbms::CVarType objValue; + varValue.set_edatatype((iot_idl::DataType)nDataType); if (m_ptrRdbTableMng->getRecordOneColumnByIndex(strTabName, nRcdIndex, strColName, objValue) == false) { @@ -1370,5 +1370,5 @@ bool CDpcdaForDpImpl::getColumValue(const std::string &strTabName, const int nR } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/dp_chg_data_api/CDpcdaForDpImpl.h b/platform/src/service/dp_chg_data_api/CDpcdaForDpImpl.h index d7c4836f..83be3187 100644 --- a/platform/src/service/dp_chg_data_api/CDpcdaForDpImpl.h +++ b/platform/src/service/dp_chg_data_api/CDpcdaForDpImpl.h @@ -22,12 +22,12 @@ #include "DpcdaCommon.h" #include "CDpcdaSubMng.h" -namespace kbd_service +namespace iot_service { class CDpcdaForDp; //< 接口类 -class CDpcdaForDpImpl : private kbd_public::CTimerThreadBase +class CDpcdaForDpImpl : private iot_public::CTimerThreadBase { public: CDpcdaForDpImpl(int nDomainID, int nAppID, const char *pszAppName, @@ -38,7 +38,7 @@ public: bool suspendThread(); - bool addChgData(kbd_idlfile::SRealTimeDataPkg &objChgData); + bool addChgData(iot_idl::SRealTimeDataPkg &objChgData); ConstSubInfoPtrVecPtr getSubtionOfAll(); @@ -47,16 +47,16 @@ private: //< 发送请求全同步消息 //< pSrcMsg: 原发消息（即APP发来的消息），以便点对点回复，为NULL则发送到本域 - void sendReqAllSub(const kbd_net::CMbMessage *pSrcMsg = NULL); + void sendReqAllSub(const iot_net::CMbMessage *pSrcMsg = NULL); //< 清理m_mapAppStatus中超时的记录，并删除订阅者，为了处理异常断开 void cleanAppStatMap(); //< 消息处理函数 void handleMbMsg(); - void handle_MT_DPCDA_APP2DP_CHG(kbd_net::CMbMessage &objMbMsg); - void handle_MT_DPCDA_APP2DP_CHG_CNT(kbd_net::CMbMessage &objMbMsg); - void handle_MT_DPCDA_APP2DP_ALL(kbd_net::CMbMessage &objMbMsg); + void handle_MT_DPCDA_APP2DP_CHG(iot_net::CMbMessage &objMbMsg); + void handle_MT_DPCDA_APP2DP_CHG_CNT(iot_net::CMbMessage &objMbMsg); + void handle_MT_DPCDA_APP2DP_ALL(iot_net::CMbMessage &objMbMsg); //< 处理 m_queChgData void handleChgDataQue(); @@ -69,19 +69,19 @@ private: //< 在实时库中查询 objSubInfo 的测点，pRtdPkg不为NULL时则填充消息 //< 实时库中有该测点，返回true，没有则返回false - bool getDataFromRtdb(const kbd_idlfile::SDpcdaSubInfo &objSubInfo, - kbd_idlfile::SRealTimeDataPkg *pRtdPkg = NULL); + bool getDataFromRtdb(const iot_idl::SDpcdaSubInfo &objSubInfo, + iot_idl::SRealTimeDataPkg *pRtdPkg = NULL); - bool getAiDataFromRtdb(const std::string &strTagName, kbd_idlfile::SRealTimeDataPkg *pRtdPkg = NULL); - bool getDiDataFromRtdb(const std::string &strTagName, kbd_idlfile::SRealTimeDataPkg *pRtdPkg = NULL); - bool getMiDataFromRtdb(const std::string &strTagName, kbd_idlfile::SRealTimeDataPkg *pRtdPkg = NULL); - bool getAccDataFromRtdb(const std::string &strTagName, kbd_idlfile::SRealTimeDataPkg *pRtdPkg = NULL); + bool getAiDataFromRtdb(const std::string &strTagName, iot_idl::SRealTimeDataPkg *pRtdPkg = NULL); + bool getDiDataFromRtdb(const std::string &strTagName, iot_idl::SRealTimeDataPkg *pRtdPkg = NULL); + bool getMiDataFromRtdb(const std::string &strTagName, iot_idl::SRealTimeDataPkg *pRtdPkg = NULL); + bool getAccDataFromRtdb(const std::string &strTagName, iot_idl::SRealTimeDataPkg *pRtdPkg = NULL); bool getTableColumValue(const std::string &strTabName, const std::string &strTagName, const std::string &strColName, - kbd_idlfile::SRealTimeDataPkg *pRtdPkg = NULL); + iot_idl::SRealTimeDataPkg *pRtdPkg = NULL); bool getColumValue(const std::string &strTabName, const int nRcdIndex, - const std::string &strColName, kbd_idlfile::SVariable &varValue); + const std::string &strColName, iot_idl::SVariable &varValue); bool getTableColumValue(const std::string &strTabName, const void* keyValue, const std::string &strColName, - kbd_idlfile::SRealTimeDataPkg *pRtdPkg); + iot_idl::SRealTimeDataPkg *pRtdPkg); //< 订阅变化数据的APP的状态 class CAppStatus @@ -126,7 +126,7 @@ private: boost::int64_t m_nSendFullDataTime; //< 消息总线通讯器，动态UUID命名 - kbd_net::CMbCommunicator *m_pMbComm; + iot_net::CMbCommunicator *m_pMbComm; CDpcdaSubMng *m_pSubMng; //< 订阅管理 @@ -134,14 +134,14 @@ private: std::queue *m_pQueChgData; //< 需要发送的数据，包括变化数据、全数据、订阅后立即发送的数据 - kbd_idlfile::SRealTimeDataPkg *m_pRtdPkgSend; + iot_idl::SRealTimeDataPkg *m_pRtdPkgSend; //< 打开表的操作比较耗时，故一张表一个 CRtdbAccess，避免频繁打开表 - kbd_dbms::CRdbAccess *m_pRtdb_AI; - kbd_dbms::CRdbAccess *m_pRtdb_DI; - kbd_dbms::CRdbAccess *m_pRtdb_MI; - kbd_dbms::CRdbAccess *m_pRtdb_ACC; - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_dbms::CRdbAccess *m_pRtdb_AI; + iot_dbms::CRdbAccess *m_pRtdb_DI; + iot_dbms::CRdbAccess *m_pRtdb_MI; + iot_dbms::CRdbAccess *m_pRtdb_ACC; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; //< m_pSubMng 的锁 boost::mutex m_mutexSubMng; @@ -153,5 +153,5 @@ private: boost::unordered::unordered_map m_mapAppStatus; }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/dp_chg_data_api/CDpcdaSubMng.cpp b/platform/src/service/dp_chg_data_api/CDpcdaSubMng.cpp index ad059450..122ff723 100644 --- a/platform/src/service/dp_chg_data_api/CDpcdaSubMng.cpp +++ b/platform/src/service/dp_chg_data_api/CDpcdaSubMng.cpp @@ -15,7 +15,7 @@ #include "CDpcdaSubMng.h" -namespace kbd_service +namespace iot_service { class CDpcdaSubtion @@ -279,7 +279,7 @@ ConstSubInfoPtrVecPtr CDpcdaSubMng::delSuber(const std::string &strSuber) } -bool CDpcdaSubMng::hasSubtion(const kbd_idlfile::SAiRealTimeData &objRealTimeData) const +bool CDpcdaSubMng::hasSubtion(const iot_idl::SAiRealTimeData &objRealTimeData) const { std::string strSubtion; if (generateKey(objRealTimeData, strSubtion)) @@ -290,7 +290,7 @@ bool CDpcdaSubMng::hasSubtion(const kbd_idlfile::SAiRealTimeData &objRealTimeDat return false; } -bool CDpcdaSubMng::hasSubtion(const kbd_idlfile::SPiRealTimeData &objRealTimeData) const +bool CDpcdaSubMng::hasSubtion(const iot_idl::SPiRealTimeData &objRealTimeData) const { std::string strSubtion; if (generateKey(objRealTimeData, strSubtion)) @@ -301,7 +301,7 @@ bool CDpcdaSubMng::hasSubtion(const kbd_idlfile::SPiRealTimeData &objRealTimeDat return false; } -bool CDpcdaSubMng::hasSubtion(const kbd_idlfile::SDiRealTimeData &objRealTimeData) const +bool CDpcdaSubMng::hasSubtion(const iot_idl::SDiRealTimeData &objRealTimeData) const { std::string strSubtion; if (generateKey(objRealTimeData, strSubtion)) @@ -312,7 +312,7 @@ bool CDpcdaSubMng::hasSubtion(const kbd_idlfile::SDiRealTimeData &objRealTimeDat return false; } -bool CDpcdaSubMng::hasSubtion(const kbd_idlfile::SMiRealTimeData &objRealTimeData) const +bool CDpcdaSubMng::hasSubtion(const iot_idl::SMiRealTimeData &objRealTimeData) const { std::string strSubtion; if (generateKey(objRealTimeData, strSubtion)) @@ -468,5 +468,5 @@ bool CDpcdaSubMng::hasSubtion(const std::string &strSubtion) const return true; } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/dp_chg_data_api/CDpcdaSubMng.h b/platform/src/service/dp_chg_data_api/CDpcdaSubMng.h index 47f8b4de..3d67fdd6 100644 --- a/platform/src/service/dp_chg_data_api/CDpcdaSubMng.h +++ b/platform/src/service/dp_chg_data_api/CDpcdaSubMng.h @@ -21,7 +21,7 @@ class Roaring; typedef boost::shared_ptr RoaringPtr; -namespace kbd_service +namespace iot_service { //< 缩写说明： @@ -64,10 +64,10 @@ public: ConstSubInfoPtrVecPtr delSuber(const std::string &strSuber); //< 判断一个测点数据是否有人订阅 - bool hasSubtion(const kbd_idlfile::SAiRealTimeData &objRealTimeData) const; - bool hasSubtion(const kbd_idlfile::SPiRealTimeData &objRealTimeData) const; - bool hasSubtion(const kbd_idlfile::SDiRealTimeData &objRealTimeData) const; - bool hasSubtion(const kbd_idlfile::SMiRealTimeData &objRealTimeData) const; + bool hasSubtion(const iot_idl::SAiRealTimeData &objRealTimeData) const; + bool hasSubtion(const iot_idl::SPiRealTimeData &objRealTimeData) const; + bool hasSubtion(const iot_idl::SDiRealTimeData &objRealTimeData) const; + bool hasSubtion(const iot_idl::SMiRealTimeData &objRealTimeData) const; private: CDpcdaSuberPtr getSuberPtr(const std::string &strSuber, bool bAutoAdd = false, @@ -96,5 +96,5 @@ private: }; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/dp_chg_data_api/DpcdaCommon.h b/platform/src/service/dp_chg_data_api/DpcdaCommon.h index 6a7ce459..371efadc 100644 --- a/platform/src/service/dp_chg_data_api/DpcdaCommon.h +++ b/platform/src/service/dp_chg_data_api/DpcdaCommon.h @@ -36,23 +36,23 @@ #include "pub_logger_api/logger.h" -namespace kbd_service +namespace iot_service { -//typedef boost::shared_ptr SubInfoPtr; +//typedef boost::shared_ptr SubInfoPtr; //typedef std::vector SubInfoPtrVec; //typedef boost::shared_ptr SubInfoPtrVecPtr; -typedef boost::shared_ptr ConstSubInfoPtr; +typedef boost::shared_ptr ConstSubInfoPtr; typedef std::vector ConstSubInfoPtrVec; typedef boost::shared_ptr ConstSubInfoPtrVecPtr; -typedef boost::shared_ptr SRealTimeDataPkgPtr; +typedef boost::shared_ptr SRealTimeDataPkgPtr; typedef std::vector StrVec; typedef boost::shared_ptr StrVecPtr; -inline bool generateKey(const kbd_idlfile::SDpcdaSubInfo &objSubInfo, std::string &strKey) +inline bool generateKey(const iot_idl::SDpcdaSubInfo &objSubInfo, std::string &strKey) { if (!objSubInfo.IsInitialized()) { @@ -70,7 +70,7 @@ inline bool generateKey(const kbd_idlfile::SDpcdaSubInfo &objSubInfo, std::strin } -inline bool generateKey(const kbd_idlfile::SAiRealTimeData &objRealTimeData, std::string &strKey) +inline bool generateKey(const iot_idl::SAiRealTimeData &objRealTimeData, std::string &strKey) { if (!objRealTimeData.IsInitialized()) { @@ -89,7 +89,7 @@ inline bool generateKey(const kbd_idlfile::SAiRealTimeData &objRealTimeData, std return true; } -inline bool generateKey(const kbd_idlfile::SPiRealTimeData &objRealTimeData, std::string &strKey) +inline bool generateKey(const iot_idl::SPiRealTimeData &objRealTimeData, std::string &strKey) { if (!objRealTimeData.IsInitialized()) { @@ -108,7 +108,7 @@ inline bool generateKey(const kbd_idlfile::SPiRealTimeData &objRealTimeData, std return true; } -inline bool generateKey(const kbd_idlfile::SDiRealTimeData &objRealTimeData, std::string &strKey) +inline bool generateKey(const iot_idl::SDiRealTimeData &objRealTimeData, std::string &strKey) { if (!objRealTimeData.IsInitialized()) { @@ -127,7 +127,7 @@ inline bool generateKey(const kbd_idlfile::SDiRealTimeData &objRealTimeData, std return true; } -inline bool generateKey(const kbd_idlfile::SMiRealTimeData &objRealTimeData, std::string &strKey) +inline bool generateKey(const iot_idl::SMiRealTimeData &objRealTimeData, std::string &strKey) { if (!objRealTimeData.IsInitialized()) { @@ -148,5 +148,5 @@ inline bool generateKey(const kbd_idlfile::SMiRealTimeData &objRealTimeData, std //< todo SUtRealTimeData 现在没用 -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/intelli_alm_api/CIntelliAlmApi4Clt.cpp b/platform/src/service/intelli_alm_api/CIntelliAlmApi4Clt.cpp index 8cb6d38c..9f82de89 100644 --- a/platform/src/service/intelli_alm_api/CIntelliAlmApi4Clt.cpp +++ b/platform/src/service/intelli_alm_api/CIntelliAlmApi4Clt.cpp @@ -12,7 +12,7 @@ #include "CIntelliAlmApi4CltImpl.h" -namespace kbd_service +namespace iot_service { CIntelliAlmApi4Clt::CIntelliAlmApi4Clt(bool bFaultRecallState) @@ -47,20 +47,20 @@ bool CIntelliAlmApi4Clt::isThreadWorking() const return m_pImpl->isThreadWorking(); } -bool CIntelliAlmApi4Clt::requestDelAlm(const kbd_idlfile::SIntelliAlmDel &objDelAlm) +bool CIntelliAlmApi4Clt::requestDelAlm(const iot_idl::SIntelliAlmDel &objDelAlm) { return m_pImpl->requestDelAlm(objDelAlm); } -bool CIntelliAlmApi4Clt::requestSeprAlm(const kbd_idlfile::SIntelliAlmSepr &objSeprAlm) +bool CIntelliAlmApi4Clt::requestSeprAlm(const iot_idl::SIntelliAlmSepr &objSeprAlm) { return m_pImpl->requestSeprAlm(objSeprAlm); } -bool CIntelliAlmApi4Clt::requestMergeAlm(const kbd_idlfile::SIntelliAlmMerge &objMergeAlm) +bool CIntelliAlmApi4Clt::requestMergeAlm(const iot_idl::SIntelliAlmMerge &objMergeAlm) { return m_pImpl->requestMergeAlm(objMergeAlm); } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/intelli_alm_api/CIntelliAlmApi4CltImpl.cpp b/platform/src/service/intelli_alm_api/CIntelliAlmApi4CltImpl.cpp index a3b999fe..8ec3ff8f 100644 --- a/platform/src/service/intelli_alm_api/CIntelliAlmApi4CltImpl.cpp +++ b/platform/src/service/intelli_alm_api/CIntelliAlmApi4CltImpl.cpp @@ -18,7 +18,7 @@ #include "intelli_alm_api/CIntelliAlmApi4Clt.h" #include "CIntelliAlmApi4CltImpl.h" -namespace kbd_service +namespace iot_service { //< 全局变量，避免反复构造 @@ -31,7 +31,7 @@ CIntelliAlmApi4CltImpl::CIntelliAlmApi4CltImpl(CIntelliAlmApi4Clt &objParent, bo m_nChannelOffset(bFaultRecallState ? CH_FAULT_RECALL_OFFSET : 0), m_objParent(objParent), m_pMbComm(nullptr) { - m_nTimeNow = kbd_public::getMonotonicMsec(); + m_nTimeNow = iot_public::getMonotonicMsec(); m_nSrvStatCleanTime = m_nTimeNow; } @@ -49,7 +49,7 @@ bool CIntelliAlmApi4CltImpl::resumeThread() return true; if (nullptr == m_pMbComm) - m_pMbComm = new kbd_net::CMbCommunicator(); + m_pMbComm = new iot_net::CMbCommunicator(); //< 防止脏数据 m_objMsgRcv.clear(); @@ -68,8 +68,8 @@ bool CIntelliAlmApi4CltImpl::resumeThread() //< 向服务端请求当前序号 { - kbd_net::CMbMessage objMbMsg; - objMbMsg.setMsgType(kbd_idlfile::MT_IA_C2S_SEQNO_REQ); + iot_net::CMbMessage objMbMsg; + objMbMsg.setMsgType(iot_idl::MT_IA_C2S_SEQNO_REQ); objMbMsg.setSubject(CN_AppId_PUBLIC, m_nChannelOffset + CH_IA_CLT_TO_SRV); objMbMsg.setData(cn_strSignature); @@ -109,7 +109,7 @@ bool CIntelliAlmApi4CltImpl::isThreadWorking() const return m_bIsWorking && isRunning(); } -bool CIntelliAlmApi4CltImpl::requestDelAlm(const kbd_idlfile::SIntelliAlmDel &objDelAlm) +bool CIntelliAlmApi4CltImpl::requestDelAlm(const iot_idl::SIntelliAlmDel &objDelAlm) { if (!isThreadWorking()) { @@ -119,16 +119,16 @@ bool CIntelliAlmApi4CltImpl::requestDelAlm(const kbd_idlfile::SIntelliAlmDel &ob return false; } - kbd_net::CMbMessage objMsgSend; + iot_net::CMbMessage objMsgSend; if (!(objMsgSend.setData(objDelAlm))) { LOGERROR("SIntelliAlmDel 序列化失败，可能是有required字段未设值，请求删除失败！"); return false; } - objMsgSend.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMsgSend.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; - objMsgSend.setMsgType(kbd_idlfile::MT_IA_C2S_DEL_REQ); + objMsgSend.setMsgType(iot_idl::MT_IA_C2S_DEL_REQ); objMsgSend.setSubject(CN_AppId_PUBLIC, m_nChannelOffset + CH_IA_CLT_TO_SRV); if (!m_pMbComm->sendMsgToDomain(objMsgSend, objDelAlm.domain_id())) //< 发指定域 @@ -140,7 +140,7 @@ bool CIntelliAlmApi4CltImpl::requestDelAlm(const kbd_idlfile::SIntelliAlmDel &ob return true; } -bool CIntelliAlmApi4CltImpl::requestSeprAlm(const kbd_idlfile::SIntelliAlmSepr &objSeprAlm) +bool CIntelliAlmApi4CltImpl::requestSeprAlm(const iot_idl::SIntelliAlmSepr &objSeprAlm) { if (!isThreadWorking()) { @@ -150,16 +150,16 @@ bool CIntelliAlmApi4CltImpl::requestSeprAlm(const kbd_idlfile::SIntelliAlmSepr & return false; } - kbd_net::CMbMessage objMsgSend; + iot_net::CMbMessage objMsgSend; if (!(objMsgSend.setData(objSeprAlm))) { LOGERROR("SIntelliAlmSepr 序列化失败，可能是有required字段未设值，请求删除失败！"); return false; } - objMsgSend.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMsgSend.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; - objMsgSend.setMsgType(kbd_idlfile::MT_IA_C2S_SEPR_REQ); + objMsgSend.setMsgType(iot_idl::MT_IA_C2S_SEPR_REQ); objMsgSend.setSubject(CN_AppId_PUBLIC, m_nChannelOffset + CH_IA_CLT_TO_SRV); if (!m_pMbComm->sendMsgToDomain(objMsgSend, objSeprAlm.domain_id())) //< 发指定域 @@ -171,7 +171,7 @@ bool CIntelliAlmApi4CltImpl::requestSeprAlm(const kbd_idlfile::SIntelliAlmSepr & return true; } -bool CIntelliAlmApi4CltImpl::requestMergeAlm(const kbd_idlfile::SIntelliAlmMerge &objMergeAlm) +bool CIntelliAlmApi4CltImpl::requestMergeAlm(const iot_idl::SIntelliAlmMerge &objMergeAlm) { if (!isThreadWorking()) { @@ -181,16 +181,16 @@ bool CIntelliAlmApi4CltImpl::requestMergeAlm(const kbd_idlfile::SIntelliAlmMerge return false; } - kbd_net::CMbMessage objMsgSend; + iot_net::CMbMessage objMsgSend; if (!(objMsgSend.setData(objMergeAlm))) { LOGERROR("SIntelliAlmMerge 序列化失败，可能是有required字段未设值，请求删除失败！"); return false; } - objMsgSend.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMsgSend.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; - objMsgSend.setMsgType(kbd_idlfile::MT_IA_C2S_MERGE_REQ); + objMsgSend.setMsgType(iot_idl::MT_IA_C2S_MERGE_REQ); objMsgSend.setSubject(CN_AppId_PUBLIC, m_nChannelOffset + CH_IA_CLT_TO_SRV); if (!m_pMbComm->sendMsgToDomain(objMsgSend, objMergeAlm.domain_id())) //< 发指定域 @@ -212,44 +212,44 @@ void CIntelliAlmApi4CltImpl::execute() if (!m_pMbComm->recvMsg(m_objMsgRcv, 200)) return; - m_nTimeNow = kbd_public::getMonotonicMsec(); + m_nTimeNow = iot_public::getMonotonicMsec(); cleanSrvStatMap(); //< 按类型处理 switch (m_objMsgRcv.getMsgType()) { - case kbd_idlfile::MT_IA_S2C_SEQNO: + case iot_idl::MT_IA_S2C_SEQNO: { //LOGDEBUG("Received MT_IA_S2C_SEQNO"); handle_MT_IA_S2C_SEQNO(); } break; - case kbd_idlfile::MT_IA_S2C_ALL: + case iot_idl::MT_IA_S2C_ALL: { //LOGDEBUG("Received MT_IA_S2C_ALL"); handle_MT_IA_S2C_ALL(); } break; - case kbd_idlfile::MT_IA_S2C_ADD: + case iot_idl::MT_IA_S2C_ADD: { //LOGDEBUG("Received MT_IA_S2C_ADD"); handle_MT_IA_S2C_ADD(); } break; - case kbd_idlfile::MT_IA_S2C_DEL: + case iot_idl::MT_IA_S2C_DEL: { //LOGDEBUG("Received MT_IA_S2C_DEL"); handle_MT_IA_S2C_DEL(); } break; - case kbd_idlfile::MT_IA_S2C_BROKEN: + case iot_idl::MT_IA_S2C_BROKEN: { //LOGDEBUG("Received MT_IA_S2C_BROKEN"); handle_MT_IA_S2C_BROKEN(); } break; - case kbd_idlfile::MT_IA_S2C_RELEASE: + case iot_idl::MT_IA_S2C_RELEASE: { //LOGDEBUG("Received MT_IA_S2C_RELEASE"); handle_MT_IA_S2C_RELEASE(); @@ -282,8 +282,8 @@ void CIntelliAlmApi4CltImpl::cleanSrvStatMap() void CIntelliAlmApi4CltImpl::replyAllReq() { - kbd_net::CMbMessage objMsgSend; - objMsgSend.setMsgType(kbd_idlfile::MT_IA_C2S_ALL_REQ); + iot_net::CMbMessage objMsgSend; + objMsgSend.setMsgType(iot_idl::MT_IA_C2S_ALL_REQ); objMsgSend.setSubject(CN_AppId_PUBLIC, m_nChannelOffset + CH_IA_CLT_TO_SRV); objMsgSend.setData(cn_strSignature); @@ -298,8 +298,8 @@ void CIntelliAlmApi4CltImpl::replyRtReq(SItlAlmSrvStatus &objSrvStatus) LOGINFO("请求重传。"); - kbd_net::CMbMessage objMsgSend; - objMsgSend.setMsgType(kbd_idlfile::MT_IA_C2S_RT_REQ); + iot_net::CMbMessage objMsgSend; + objMsgSend.setMsgType(iot_idl::MT_IA_C2S_RT_REQ); objMsgSend.setSubject(CN_AppId_PUBLIC, m_nChannelOffset + CH_IA_CLT_TO_SRV); objMsgSend.setData(cn_strSignature); @@ -354,7 +354,7 @@ void CIntelliAlmApi4CltImpl::handle_MT_IA_S2C_SEQNO() void CIntelliAlmApi4CltImpl::handle_MT_IA_S2C_ALL() { //< 反序列化 - kbd_idlfile::SIntelliAlmAdd objAllAlm; + iot_idl::SIntelliAlmAdd objAllAlm; bool bRc = objAllAlm.ParseFromArray(m_objMsgRcv.getDataPtr(), (int) m_objMsgRcv.getDataSize()); if (!bRc) { @@ -375,7 +375,7 @@ void CIntelliAlmApi4CltImpl::handle_MT_IA_S2C_ALL() void CIntelliAlmApi4CltImpl::handle_MT_IA_S2C_ADD() { //< 反序列化 - kbd_idlfile::SIntelliAlmAdd objAddAlm; + iot_idl::SIntelliAlmAdd objAddAlm; bool bRc = objAddAlm.ParseFromArray(m_objMsgRcv.getDataPtr(), (int) m_objMsgRcv.getDataSize()); if (!bRc) { @@ -415,7 +415,7 @@ void CIntelliAlmApi4CltImpl::handle_MT_IA_S2C_ADD() void CIntelliAlmApi4CltImpl::handle_MT_IA_S2C_DEL() { //< 反序列化 - kbd_idlfile::SIntelliAlmDel objDelAlm; + iot_idl::SIntelliAlmDel objDelAlm; bool bRc = objDelAlm.ParseFromArray(m_objMsgRcv.getDataPtr(), (int) m_objMsgRcv.getDataSize()); if (!bRc) { @@ -455,7 +455,7 @@ void CIntelliAlmApi4CltImpl::handle_MT_IA_S2C_DEL() void CIntelliAlmApi4CltImpl::handle_MT_IA_S2C_BROKEN() { //< 反序列化 - kbd_idlfile::SIntelliAlmBroken objBrokenAlm; + iot_idl::SIntelliAlmBroken objBrokenAlm; bool bRc = objBrokenAlm.ParseFromArray(m_objMsgRcv.getDataPtr(), (int) m_objMsgRcv.getDataSize()); if (!bRc) { @@ -495,7 +495,7 @@ void CIntelliAlmApi4CltImpl::handle_MT_IA_S2C_BROKEN() void CIntelliAlmApi4CltImpl::handle_MT_IA_S2C_RELEASE() { //< 反序列化 - kbd_idlfile::SIntelliAlmRelease objReleaseAlm; + iot_idl::SIntelliAlmRelease objReleaseAlm; bool bRc = objReleaseAlm.ParseFromArray(m_objMsgRcv.getDataPtr(), (int) m_objMsgRcv.getDataSize()); if (!bRc) { @@ -532,5 +532,5 @@ void CIntelliAlmApi4CltImpl::handle_MT_IA_S2C_RELEASE() m_objParent.handleReleaseAlmMsg(objReleaseAlm); } -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/intelli_alm_api/CIntelliAlmApi4CltImpl.h b/platform/src/service/intelli_alm_api/CIntelliAlmApi4CltImpl.h index ff93a223..e4414ec9 100644 --- a/platform/src/service/intelli_alm_api/CIntelliAlmApi4CltImpl.h +++ b/platform/src/service/intelli_alm_api/CIntelliAlmApi4CltImpl.h @@ -36,12 +36,12 @@ #include "pub_utility_api/TimerThreadBase.h" #include "net_msg_bus_api/MsgBusApi.h" -namespace kbd_service +namespace iot_service { class CIntelliAlmApi4Clt; -class CIntelliAlmApi4CltImpl : private kbd_public::CTimerThreadBase +class CIntelliAlmApi4CltImpl : private iot_public::CTimerThreadBase { public: CIntelliAlmApi4CltImpl(CIntelliAlmApi4Clt &objParent, bool bFaultRecallState); @@ -56,11 +56,11 @@ public: bool isThreadWorking() const; - bool requestDelAlm(const kbd_idlfile::SIntelliAlmDel &objDelAlm); + bool requestDelAlm(const iot_idl::SIntelliAlmDel &objDelAlm); - bool requestSeprAlm(const kbd_idlfile::SIntelliAlmSepr &objSeprAlm); + bool requestSeprAlm(const iot_idl::SIntelliAlmSepr &objSeprAlm); - bool requestMergeAlm(const kbd_idlfile::SIntelliAlmMerge &objMergeAlm); + bool requestMergeAlm(const iot_idl::SIntelliAlmMerge &objMergeAlm); private: struct SItlAlmSrvStatus @@ -115,15 +115,15 @@ private: CIntelliAlmApi4Clt &m_objParent; //< 父对象引用 - kbd_net::CMbCommunicator *m_pMbComm; //< 消息总线通讯器，动态UUID命名 + iot_net::CMbCommunicator *m_pMbComm; //< 消息总线通讯器，动态UUID命名 boost::int64_t m_nTimeNow; //< 当前时间 boost::int64_t m_nSrvStatCleanTime; //< 上一次清理m_mapSrvStat的时间，开机后毫秒数 - kbd_net::CMbMessage m_objMsgRcv; //< 接收的消息总线消息 + iot_net::CMbMessage m_objMsgRcv; //< 接收的消息总线消息 std::map m_mapSrvStat; //< 服务端状态，key：DomainID }; -} //< namespace kbd_service +} //< namespace iot_service 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 45f4c601..ea77e5cf 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 @@ -4,7 +4,7 @@ #include "CItlAlmClt.h" -namespace kbd_service +namespace iot_service { CItlAlmClt::CItlAlmClt() @@ -17,7 +17,7 @@ CItlAlmClt::~CItlAlmClt() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } bool CItlAlmClt::start(int /*argc*/, char ** /*argv[]*/, int &/*nStatus*/) @@ -25,10 +25,10 @@ bool CItlAlmClt::start(int /*argc*/, char ** /*argv[]*/, int &/*nStatus*/) bool bRc = false; //< 1 - kbd_public::StartLogSystem("default", "itl_alm_test_fake_clt"); + iot_public::StartLogSystem("default", "itl_alm_test_fake_clt"); //< 2 - bRc = kbd_net::initMsgBus("itl_alm_test_fake_clt", "1", true); + bRc = iot_net::initMsgBus("itl_alm_test_fake_clt", "1", true); assert(bRc); //< 3 @@ -58,13 +58,13 @@ bool CItlAlmClt::stop() //< 2 { - bRc = kbd_net::releaseMsgBus(); + bRc = iot_net::releaseMsgBus(); //assert(bRc); } //< 1 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } diff --git a/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/CItlAlmClt.h b/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/CItlAlmClt.h index bcd7d61d..fa5a29a5 100644 --- a/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/CItlAlmClt.h +++ b/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/CItlAlmClt.h @@ -6,10 +6,10 @@ #include "CMsgThread.h" -namespace kbd_service +namespace iot_service { -class CItlAlmClt : public kbd_public::CBaseService, kbd_sys::CProcessQuitInterface +class CItlAlmClt : public iot_public::CBaseService, iot_sys::CProcessQuitInterface { public: CItlAlmClt(); diff --git a/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/CMsgThread.cpp b/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/CMsgThread.cpp index de4ff360..3d31c9c6 100644 --- a/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/CMsgThread.cpp +++ b/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/CMsgThread.cpp @@ -31,21 +31,21 @@ //#define VERBOSE_DEBUG_INFO -namespace kbd_service +namespace iot_service { CMsgThread::CMsgThread() { m_nAlmCnt = 0; - m_nStartTimeMs = kbd_public::getMonotonicMsec(); + m_nStartTimeMs = iot_public::getMonotonicMsec(); m_nLastEditTime = 0; } CMsgThread::~CMsgThread() { - boost::int64_t nTimeMs = kbd_public::getMonotonicMsec() - m_nStartTimeMs; + boost::int64_t nTimeMs = iot_public::getMonotonicMsec() - m_nStartTimeMs; double dSpeed = (double) m_nAlmCnt * 1000 / nTimeMs; @@ -56,9 +56,9 @@ CMsgThread::~CMsgThread() std::cout << "*********************************************************\n" << std::endl; } -void CMsgThread::editItlAlm(kbd_idlfile::SIntelliAlmAdd &objAddAlm) +void CMsgThread::editItlAlm(iot_idl::SIntelliAlmAdd &objAddAlm) { - boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); if (m_nLastEditTime + 5000 > nTimeNow) return; @@ -70,13 +70,13 @@ void CMsgThread::editItlAlm(kbd_idlfile::SIntelliAlmAdd &objAddAlm) const int nAlmInfoCnt = objAddAlm.alm_info_size(); bool bDoSeprMerge = false; - kbd_idlfile::SIntelliAlmSepr objPbMsg_Sepr; - kbd_idlfile::SIntelliAlmMerge objPbMsg_Merge; - kbd_idlfile::SIntelliAlmDel objPbMsg_Del; + iot_idl::SIntelliAlmSepr objPbMsg_Sepr; + iot_idl::SIntelliAlmMerge objPbMsg_Merge; + iot_idl::SIntelliAlmDel objPbMsg_Del; for (int i = 0; i < nAlmInfoCnt; ++i) { - const kbd_idlfile::SIntelliAlmInfo &objItlAlmInfo = objAddAlm.alm_info(i); + const iot_idl::SIntelliAlmInfo &objItlAlmInfo = objAddAlm.alm_info(i); if (!bDoSeprMerge && objItlAlmInfo.raw_alm_uuid_size() > 2) { @@ -117,7 +117,7 @@ void CMsgThread::editItlAlm(kbd_idlfile::SIntelliAlmAdd &objAddAlm) std::cout << "*********************************************************\n" << std::endl; } -void CMsgThread::handleAllAlmMsg(int nDomainID, kbd_idlfile::SIntelliAlmAdd &objAllAlm) +void CMsgThread::handleAllAlmMsg(int nDomainID, iot_idl::SIntelliAlmAdd &objAllAlm) { std::cout << "\nhandleAllAlmMsg() nDomainID == " << nDomainID << " , objAllAlm.alm_info_size() == " << objAllAlm.alm_info_size() << std::endl; @@ -127,11 +127,11 @@ void CMsgThread::handleAllAlmMsg(int nDomainID, kbd_idlfile::SIntelliAlmAdd &obj #ifdef VERBOSE_DEBUG_INFO // std::string strPrint; // google::protobuf::TextFormat::PrintToString(objAllAlm, &strPrint); - // std::cout << "kbd_idlfile::SAlmCltAddAlm : \n " << strPrint << "\n\n" << std::endl; + // std::cout << "iot_idl::SAlmCltAddAlm : \n " << strPrint << "\n\n" << std::endl; #endif } -void CMsgThread::handleAddAlmMsg(kbd_idlfile::SIntelliAlmAdd &objAddAlm) +void CMsgThread::handleAddAlmMsg(iot_idl::SIntelliAlmAdd &objAddAlm) { //std::cout << "\nhandleAddAlmMsg()" << std::endl; @@ -144,13 +144,13 @@ void CMsgThread::handleAddAlmMsg(kbd_idlfile::SIntelliAlmAdd &objAddAlm) google::protobuf::TextFormat::PrintToString(objAddAlm, &strPrint); - std::cout << "kbd_idlfile::SAlmCltAddAlm : \n " << strPrint << "\n\n" << std::endl; + std::cout << "iot_idl::SAlmCltAddAlm : \n " << strPrint << "\n\n" << std::endl; #else //boost::ignore_unused(objAddAlm); #endif } -void CMsgThread::handleDelAlmMsg(kbd_idlfile::SIntelliAlmDel &objDelAlm) +void CMsgThread::handleDelAlmMsg(iot_idl::SIntelliAlmDel &objDelAlm) { std::cout << "\n handleDelAlmMsg()" << std::endl; @@ -159,13 +159,13 @@ void CMsgThread::handleDelAlmMsg(kbd_idlfile::SIntelliAlmDel &objDelAlm) google::protobuf::TextFormat::PrintToString(objDelAlm, &strPrint); - std::cout << "kbd_idlfile::SAlmCltDelAlm : \n " << strPrint << "\n\n" << std::endl; + std::cout << "iot_idl::SAlmCltDelAlm : \n " << strPrint << "\n\n" << std::endl; #else boost::ignore_unused(objDelAlm); #endif } -void CMsgThread::handleBrokenAlmMsg(kbd_idlfile::SIntelliAlmBroken &objBrokenAlm) +void CMsgThread::handleBrokenAlmMsg(iot_idl::SIntelliAlmBroken &objBrokenAlm) { std::cout << "\n handleBrokenAlmMsg()" << std::endl; @@ -174,13 +174,13 @@ void CMsgThread::handleBrokenAlmMsg(kbd_idlfile::SIntelliAlmBroken &objBrokenAlm google::protobuf::TextFormat::PrintToString(objBrokenAlm, &strPrint); - std::cout << "kbd_idlfile::SIntelliAlmBroken : \n " << strPrint << "\n\n" << std::endl; + std::cout << "iot_idl::SIntelliAlmBroken : \n " << strPrint << "\n\n" << std::endl; #else boost::ignore_unused(objBrokenAlm); #endif } -void CMsgThread::handleReleaseAlmMsg(kbd_idlfile::SIntelliAlmRelease &objReleaseAlm) +void CMsgThread::handleReleaseAlmMsg(iot_idl::SIntelliAlmRelease &objReleaseAlm) { std::cout << "\n handleReleaseAlmMsg()" << std::endl; @@ -189,7 +189,7 @@ void CMsgThread::handleReleaseAlmMsg(kbd_idlfile::SIntelliAlmRelease &objRelease google::protobuf::TextFormat::PrintToString(objReleaseAlm, &strPrint); - std::cout << "kbd_idlfile::SIntelliAlmRelease : \n " << strPrint << "\n\n" << std::endl; + std::cout << "iot_idl::SIntelliAlmRelease : \n " << strPrint << "\n\n" << std::endl; #else boost::ignore_unused(objReleaseAlm); #endif diff --git a/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/CMsgThread.h b/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/CMsgThread.h index c74b6809..bcf3d5af 100644 --- a/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/CMsgThread.h +++ b/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/CMsgThread.h @@ -1,27 +1,27 @@  #include "intelli_alm_api/CIntelliAlmApi4Clt.h" -namespace kbd_service +namespace iot_service { -class CMsgThread : public kbd_service::CIntelliAlmApi4Clt +class CMsgThread : public iot_service::CIntelliAlmApi4Clt { public: CMsgThread(); ~CMsgThread(); - void handleAllAlmMsg(int nDomainID, kbd_idlfile::SIntelliAlmAdd &objAllAlm) override; + void handleAllAlmMsg(int nDomainID, iot_idl::SIntelliAlmAdd &objAllAlm) override; - void handleAddAlmMsg(kbd_idlfile::SIntelliAlmAdd &objAddAlm) override; + void handleAddAlmMsg(iot_idl::SIntelliAlmAdd &objAddAlm) override; - void handleDelAlmMsg(kbd_idlfile::SIntelliAlmDel &objDelAlm) override; + void handleDelAlmMsg(iot_idl::SIntelliAlmDel &objDelAlm) override; - void handleBrokenAlmMsg(kbd_idlfile::SIntelliAlmBroken &objBrokenAlm) override; + void handleBrokenAlmMsg(iot_idl::SIntelliAlmBroken &objBrokenAlm) override; - void handleReleaseAlmMsg(kbd_idlfile::SIntelliAlmRelease &objReleaseAlm) override; + void handleReleaseAlmMsg(iot_idl::SIntelliAlmRelease &objReleaseAlm) override; private: - void editItlAlm(kbd_idlfile::SIntelliAlmAdd &objAddAlm); + void editItlAlm(iot_idl::SIntelliAlmAdd &objAddAlm); private: int m_nAlmCnt; diff --git a/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/Main.cpp b/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/Main.cpp index 30a272d8..c377ea7e 100644 --- a/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/Main.cpp +++ b/platform/src/service/intelli_alm_api/test/itl_alm_test_fake_clt/Main.cpp @@ -3,6 +3,6 @@ int main(int argc, char *argv[]) { - kbd_service::CItlAlmClt objApp; + iot_service::CItlAlmClt objApp; return objApp.main(argc, argv); } \ No newline at end of file diff --git a/platform/src/service/intelli_alm_srv/CDataMng.cpp b/platform/src/service/intelli_alm_srv/CDataMng.cpp index eec839b8..b3d8ddca 100644 --- a/platform/src/service/intelli_alm_srv/CDataMng.cpp +++ b/platform/src/service/intelli_alm_srv/CDataMng.cpp @@ -27,7 +27,7 @@ //< m_objMsgCache中缓存数量上限 #define CN_MAX_MSG_CACHE_SIZE (unsigned int) 50 -namespace kbd_service +namespace iot_service { namespace intelli_alm_srv { @@ -47,7 +47,7 @@ CDataMng::CDataMng(CIntelliAlmSrvImpl &objParent) m_objDbInsert_Add.set_strtablename(DB_TABLE_NAME_HIS_INTELLI_ALM); //< 写本域和中心域 - m_objDbInsert_Add.set_ensaveaction(kbd_idlfile::SA_DSS_LOCAL_REMOTE); + m_objDbInsert_Add.set_ensaveaction(iot_idl::SA_DSS_LOCAL_REMOTE); //< 列名 m_objDbInsert_Add.mutable_strcolumnname()->Reserve(6); @@ -61,16 +61,16 @@ CDataMng::CDataMng(CIntelliAlmSrvImpl &objParent) //< m_objDbUpdateMulti_Add_Separate 避免后面频繁设置 { //< 需提交本域和中心 - m_objDbUpdateMulti_Add_Separate.set_ensaveaction(kbd_idlfile::SA_DSS_LOCAL_REMOTE); + m_objDbUpdateMulti_Add_Separate.set_ensaveaction(iot_idl::SA_DSS_LOCAL_REMOTE); //< 表名 m_objDbUpdateMulti_Add_Separate.set_strtablename(DB_TABLE_NAME_HIS_EVENT); //< 设置更新值 { - kbd_idlfile::DbUpdateValue *pDbUpdateVal = m_objDbUpdateMulti_Add_Separate.add_msgupdatevalue(); + iot_idl::DbUpdateValue *pDbUpdateVal = m_objDbUpdateMulti_Add_Separate.add_msgupdatevalue(); pDbUpdateVal->set_strcolumnname("IA_UUID"); - pDbUpdateVal->mutable_msgvalue()->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + pDbUpdateVal->mutable_msgvalue()->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); pDbUpdateVal->mutable_msgvalue()->set_strvalue(""); //< 后面填写 } @@ -78,19 +78,19 @@ CDataMng::CDataMng(CIntelliAlmSrvImpl &objParent) //< 等效于生成 where UUID_BASE64 = 'v1' and TIME_STAMP >= t11 and TIME_STAMP <= t12 or // UUID_BASE64 = 'v2' and TIME_STAMP >= t21 and TIME_STAMP <= t22 or ... { - kbd_idlfile::DbConditionHead *pDbCondHead = m_objDbUpdateMulti_Add_Separate.add_msgconditionhead(); - pDbCondHead->set_enlogic(kbd_idlfile::ENConditionLogic::enumCondAnd); //< 逻辑与 - pDbCondHead->set_enrelation(kbd_idlfile::ENConditionRelation::enumCondEqual); //< 等于 + iot_idl::DbConditionHead *pDbCondHead = m_objDbUpdateMulti_Add_Separate.add_msgconditionhead(); + pDbCondHead->set_enlogic(iot_idl::ENConditionLogic::enumCondAnd); //< 逻辑与 + pDbCondHead->set_enrelation(iot_idl::ENConditionRelation::enumCondEqual); //< 等于 pDbCondHead->set_strcolumnname("UUID_BASE64"); pDbCondHead = m_objDbUpdateMulti_Add_Separate.add_msgconditionhead(); - pDbCondHead->set_enlogic(kbd_idlfile::ENConditionLogic::enumCondAnd); //< 逻辑与 - pDbCondHead->set_enrelation(kbd_idlfile::ENConditionRelation::enumCondLargeEqual); //< 大于等于 + pDbCondHead->set_enlogic(iot_idl::ENConditionLogic::enumCondAnd); //< 逻辑与 + pDbCondHead->set_enrelation(iot_idl::ENConditionRelation::enumCondLargeEqual); //< 大于等于 pDbCondHead->set_strcolumnname("TIME_STAMP"); pDbCondHead = m_objDbUpdateMulti_Add_Separate.add_msgconditionhead(); - pDbCondHead->set_enlogic(kbd_idlfile::ENConditionLogic::enumCondOr); //< 逻辑或 - pDbCondHead->set_enrelation(kbd_idlfile::ENConditionRelation::enumCondSmallEqual); //< 小于等于 + pDbCondHead->set_enlogic(iot_idl::ENConditionLogic::enumCondOr); //< 逻辑或 + pDbCondHead->set_enrelation(iot_idl::ENConditionRelation::enumCondSmallEqual); //< 小于等于 pDbCondHead->set_strcolumnname("TIME_STAMP"); } } @@ -101,19 +101,19 @@ CDataMng::CDataMng(CIntelliAlmSrvImpl &objParent) m_objDbRemoveMulti_Separate.set_strtablename(DB_TABLE_NAME_HIS_INTELLI_ALM); //< 写本域和中心域 - m_objDbRemoveMulti_Separate.set_ensaveaction(kbd_idlfile::SA_DSS_LOCAL_REMOTE); + m_objDbRemoveMulti_Separate.set_ensaveaction(iot_idl::SA_DSS_LOCAL_REMOTE); //< 设置条件头，加时间条件为了命中分区，避免遍历分区 //< 等效于生成 where UUID_BASE64 = 'v1' and TIME_STAMP = t1 or UUID_BASE64 = 'v2' and TIME_STAMP = t2 or ... { - kbd_idlfile::DbConditionHead *pDbCondHead = m_objDbRemoveMulti_Separate.add_msgconditionhead(); - pDbCondHead->set_enlogic(kbd_idlfile::ENConditionLogic::enumCondAnd); //< 逻辑与 - pDbCondHead->set_enrelation(kbd_idlfile::ENConditionRelation::enumCondEqual); //< 等于 + iot_idl::DbConditionHead *pDbCondHead = m_objDbRemoveMulti_Separate.add_msgconditionhead(); + pDbCondHead->set_enlogic(iot_idl::ENConditionLogic::enumCondAnd); //< 逻辑与 + pDbCondHead->set_enrelation(iot_idl::ENConditionRelation::enumCondEqual); //< 等于 pDbCondHead->set_strcolumnname("UUID_BASE64"); pDbCondHead = m_objDbRemoveMulti_Separate.add_msgconditionhead(); - pDbCondHead->set_enlogic(kbd_idlfile::ENConditionLogic::enumCondOr); //< 逻辑或 - pDbCondHead->set_enrelation(kbd_idlfile::ENConditionRelation::enumCondEqual); //< 等于 + pDbCondHead->set_enlogic(iot_idl::ENConditionLogic::enumCondOr); //< 逻辑或 + pDbCondHead->set_enrelation(iot_idl::ENConditionRelation::enumCondEqual); //< 等于 pDbCondHead->set_strcolumnname("TIME_STAMP"); } } @@ -337,7 +337,7 @@ bool CDataMng::saveToFile(bool bForce) LOGWARN("saveToFile(): EN_STATE_NULL == m_enState，非预期，但可继续执行。"); } - const boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); if (!bForce && (m_nLastSaveTime + 60 * 1000 > nTimeNow)) { return false; @@ -352,7 +352,7 @@ bool CDataMng::saveToFile(bool bForce) //< 更新时间，不放在最后，防止错误时过于平凡尝试 m_nLastSaveTime = nTimeNow; - kbd_net::CMbMessage objBuff; + iot_net::CMbMessage objBuff; if (!getFullSyncMsg(objBuff)) { LOGERROR("saveToFile()：getFullSyncMsg()失败！"); @@ -509,13 +509,13 @@ void CDataMng::releaseRawAlm(const ConstSRawAlmInfoPtrVec &vecRelease) if (nCnt > 1) { - if (kbd_idlfile::IALS_BROKEN != ptrItlAlmInfo->logic_state()) + if (iot_idl::IALS_BROKEN != ptrItlAlmInfo->logic_state()) { //< 需要产生broken消息 vecItlAlmPtr_Broken.push_back(ptrRawAlm->m_ptrItlAlm); //< 现在就设置，防止 vecItlAlmPtr_Broken 中加入相同的智能告警 - ptrItlAlmInfo->set_logic_state(kbd_idlfile::IALS_BROKEN); + ptrItlAlmInfo->set_logic_state(iot_idl::IALS_BROKEN); } } else if (1 == nCnt) @@ -744,7 +744,7 @@ void CDataMng::addItlAlm_Master(const SItlAlmInfoPtrVec &vecItlAlmAdd, const boo if (bNew) { //< 设置消息其他信息 - ptrItlAlmMsg_Add->m_enMsgType = kbd_idlfile::MT_IA_S2C_ADD; + ptrItlAlmMsg_Add->m_enMsgType = iot_idl::MT_IA_S2C_ADD; ptrItlAlmMsg_Add->m_nSeqNo = ++m_nSeqNo; if (!(ptrItlAlmMsg_Add->isValid())) @@ -760,7 +760,7 @@ void CDataMng::addItlAlm_Master(const SItlAlmInfoPtrVec &vecItlAlmAdd, const boo } //< 更新时间 - m_nLastUpdateTime = kbd_public::getMonotonicMsec(); + m_nLastUpdateTime = iot_public::getMonotonicMsec(); saveDB_Add(*ptrItlAlmMsg_Add); } @@ -781,7 +781,7 @@ void CDataMng::addItlAlm_Master(const SItlAlmInfoPtrVec &vecItlAlmAdd, const boo } } -bool CDataMng::addItlAlm_Slave(const kbd_net::CMbMessage &objMbMsgInput) +bool CDataMng::addItlAlm_Slave(const iot_net::CMbMessage &objMbMsgInput) { //< 反序列化 if (!m_objItlAlmAdd.ParseFromArray(objMbMsgInput.getDataPtr(), (int) objMbMsgInput.getDataSize())) @@ -884,7 +884,7 @@ void CDataMng::addItlAlm_Slave(const SItlAlmInfoPtrVec &vecItlAlmAdd, const int } //< 设置消息其他信息 - ptrItlAlmMsg_Add->m_enMsgType = kbd_idlfile::MT_IA_S2C_ADD; + ptrItlAlmMsg_Add->m_enMsgType = iot_idl::MT_IA_S2C_ADD; ptrItlAlmMsg_Add->m_nSeqNo = nSeqNo; m_nSeqNo = nSeqNo; @@ -901,10 +901,10 @@ void CDataMng::addItlAlm_Slave(const SItlAlmInfoPtrVec &vecItlAlmAdd, const int } //< 更新时间 - m_nLastUpdateTime = kbd_public::getMonotonicMsec(); + m_nLastUpdateTime = iot_public::getMonotonicMsec(); } -bool CDataMng::delItlAlm(const kbd_net::CMbMessage &objMbMsgInput) +bool CDataMng::delItlAlm(const iot_net::CMbMessage &objMbMsgInput) { //< 反序列化 if (!m_objItlAlmDel.ParseFromArray(objMbMsgInput.getDataPtr(), (int) objMbMsgInput.getDataSize())) @@ -1005,12 +1005,12 @@ void CDataMng::delItlAlm(const SLiveItlAlmPtrVec &vecItlAlmPtr_Del, const int nS //< 不删除内存，修改 logic_state switch (ptrItlAlmInfo->logic_state()) { - case kbd_idlfile::IALS_NORMAL: + case iot_idl::IALS_NORMAL: bDoDel = true; - ptrItlAlmInfo->set_logic_state(kbd_idlfile::IALS_DELETED); + ptrItlAlmInfo->set_logic_state(iot_idl::IALS_DELETED); break; - case kbd_idlfile::IALS_DELETED: - case kbd_idlfile::IALS_BROKEN: //< Broken 时不要再切回 deleted + case iot_idl::IALS_DELETED: + case iot_idl::IALS_BROKEN: //< Broken 时不要再切回 deleted bDoDel = false; break; default: @@ -1032,7 +1032,7 @@ void CDataMng::delItlAlm(const SLiveItlAlmPtrVec &vecItlAlmPtr_Del, const int nS return; //< 注意 //< 设置消息其他信息 - ptrItlAlmMsg_Del->m_enMsgType = kbd_idlfile::MT_IA_S2C_DEL; + ptrItlAlmMsg_Del->m_enMsgType = iot_idl::MT_IA_S2C_DEL; if (EN_STATE_MASTER == m_enState) { ptrItlAlmMsg_Del->m_nSeqNo = ++m_nSeqNo; @@ -1056,10 +1056,10 @@ void CDataMng::delItlAlm(const SLiveItlAlmPtrVec &vecItlAlmPtr_Del, const int nS } //< 更新时间 - m_nLastUpdateTime = kbd_public::getMonotonicMsec(); + m_nLastUpdateTime = iot_public::getMonotonicMsec(); } -bool CDataMng::brokenItlAlm(const kbd_net::CMbMessage &objMbMsgInput) +bool CDataMng::brokenItlAlm(const iot_net::CMbMessage &objMbMsgInput) { //< 反序列化 if (!m_objItlAlmBroken.ParseFromArray(objMbMsgInput.getDataPtr(), (int) objMbMsgInput.getDataSize())) @@ -1152,12 +1152,12 @@ void CDataMng::brokenItlAlm(const SLiveItlAlmPtrVec &vecItlAlmPtr_Broken, const //< 不删除内存，修改 logic_state switch (ptrItlAlmInfo->logic_state()) { - case kbd_idlfile::IALS_NORMAL: - case kbd_idlfile::IALS_DELETED: + case iot_idl::IALS_NORMAL: + case iot_idl::IALS_DELETED: bDoBroken = true; - ptrItlAlmInfo->set_logic_state(kbd_idlfile::IALS_BROKEN); + ptrItlAlmInfo->set_logic_state(iot_idl::IALS_BROKEN); break; - case kbd_idlfile::IALS_BROKEN: + case iot_idl::IALS_BROKEN: bDoBroken = false; break; default: @@ -1179,7 +1179,7 @@ void CDataMng::brokenItlAlm(const SLiveItlAlmPtrVec &vecItlAlmPtr_Broken, const return; //< 注意 //< 设置消息其他信息 - ptrItlAlmMsg_Broken->m_enMsgType = kbd_idlfile::MT_IA_S2C_BROKEN; + ptrItlAlmMsg_Broken->m_enMsgType = iot_idl::MT_IA_S2C_BROKEN; if (EN_STATE_MASTER == m_enState) { ptrItlAlmMsg_Broken->m_nSeqNo = ++m_nSeqNo; @@ -1203,10 +1203,10 @@ void CDataMng::brokenItlAlm(const SLiveItlAlmPtrVec &vecItlAlmPtr_Broken, const } //< 更新时间 - m_nLastUpdateTime = kbd_public::getMonotonicMsec(); + m_nLastUpdateTime = iot_public::getMonotonicMsec(); } -bool CDataMng::releaseItlAlm(const kbd_net::CMbMessage &objMbMsgInput) +bool CDataMng::releaseItlAlm(const iot_net::CMbMessage &objMbMsgInput) { //< 反序列化 if (!m_objItlAlmRelease.ParseFromArray(objMbMsgInput.getDataPtr(), (int) objMbMsgInput.getDataSize())) @@ -1338,7 +1338,7 @@ const SItlAlmMsg *CDataMng::addMsg_ReleaseItlAlm(const ConstSItlAlmInfoPtrVec &v ptrItlAlmMsg_Release->m_vecItlAlmInfoPtr = vecItlAlmInfoPtr_Release; //< 设置消息其他信息 - ptrItlAlmMsg_Release->m_enMsgType = kbd_idlfile::MT_IA_S2C_RELEASE; + ptrItlAlmMsg_Release->m_enMsgType = iot_idl::MT_IA_S2C_RELEASE; if (EN_STATE_MASTER == m_enState) { ptrItlAlmMsg_Release->m_nSeqNo = ++m_nSeqNo; @@ -1362,7 +1362,7 @@ const SItlAlmMsg *CDataMng::addMsg_ReleaseItlAlm(const ConstSItlAlmInfoPtrVec &v } //< 更新时间 - m_nLastUpdateTime = kbd_public::getMonotonicMsec(); + m_nLastUpdateTime = iot_public::getMonotonicMsec(); return ptrItlAlmMsg_Release.get(); } @@ -1407,12 +1407,12 @@ bool CDataMng::getMsgFromSeqNo(int nSeqNo, ConstSItlAlmMsgPtrVec &vecOutput) con return true; } -bool CDataMng::getFullSyncMsg(kbd_net::CMbMessage &objMbMsgOutput) const +bool CDataMng::getFullSyncMsg(iot_net::CMbMessage &objMbMsgOutput) const { SItlAlmInfoPtrVec vecItlAlmInfo_All; getAllLiveItlAlmInfo(vecItlAlmInfo_All); - kbd_idlfile::SIntelliAlmAdd objPbMsg_All; + iot_idl::SIntelliAlmAdd objPbMsg_All; BOOST_AUTO(pAlmInfoField, objPbMsg_All.mutable_alm_info()); pAlmInfoField->Reserve(static_cast(vecItlAlmInfo_All.size()) + 1); @@ -1438,9 +1438,9 @@ bool CDataMng::getFullSyncMsg(kbd_net::CMbMessage &objMbMsgOutput) const LOGERROR("getFullSyncMsg(): SIntelliAlmAdd 序列化失败！"); return false; } - objMbMsgOutput.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMbMsgOutput.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; - objMbMsgOutput.setMsgType(kbd_idlfile::MT_IA_S2C_ALL); + objMbMsgOutput.setMsgType(iot_idl::MT_IA_S2C_ALL); objMbMsgOutput.setSubject(CN_AppId_PUBLIC, CH_IA_SRV_TO_CLT); objMbMsgOutput.setPara1(m_objParent.m_nDomainID); objMbMsgOutput.setPara2(m_nSeqNo); @@ -1448,7 +1448,7 @@ bool CDataMng::getFullSyncMsg(kbd_net::CMbMessage &objMbMsgOutput) const return true; } -bool CDataMng::setFullSyncMsg(const kbd_net::CMbMessage &objMbMsgInput) +bool CDataMng::setFullSyncMsg(const iot_net::CMbMessage &objMbMsgInput) { if (EN_STATE_SLAVE != m_enState) { @@ -1456,7 +1456,7 @@ bool CDataMng::setFullSyncMsg(const kbd_net::CMbMessage &objMbMsgInput) return false; } - if (kbd_idlfile::MT_IA_S2C_ALL != objMbMsgInput.getMsgType()) + if (iot_idl::MT_IA_S2C_ALL != objMbMsgInput.getMsgType()) { LOGERROR("setFullSyncMsg(): 错误的消息类型 %d ，检查程序！", objMbMsgInput.getMsgType()); @@ -1487,7 +1487,7 @@ bool CDataMng::setFullSyncMsg(const kbd_net::CMbMessage &objMbMsgInput) return true; } -void CDataMng::setFullSync(kbd_idlfile::SIntelliAlmAdd &objPbMsg_All, const int nSeqNo) +void CDataMng::setFullSync(iot_idl::SIntelliAlmAdd &objPbMsg_All, const int nSeqNo) { if (EN_STATE_MASTER == m_enState) { @@ -1536,7 +1536,7 @@ void CDataMng::setFullSync(kbd_idlfile::SIntelliAlmAdd &objPbMsg_All, const int m_nSeqNo = nSeqNo; //< 更新时间 - m_nLastUpdateTime = kbd_public::getMonotonicMsec(); + m_nLastUpdateTime = iot_public::getMonotonicMsec(); } void CDataMng::releaseTempMem() @@ -1550,7 +1550,7 @@ void CDataMng::releaseTempMem() if (m_objItlAlmAdd.mutable_alm_info()->Capacity() > nMaxCap) { - kbd_idlfile::SIntelliAlmAdd objNew; + iot_idl::SIntelliAlmAdd objNew; m_objItlAlmAdd.Swap(&objNew); if (m_objItlAlmAdd.mutable_alm_info()->Capacity() > 0) @@ -1562,40 +1562,40 @@ void CDataMng::releaseTempMem() if (m_objItlAlmDel.mutable_uuid_base64()->Capacity() > nMaxCap) { - kbd_idlfile::SIntelliAlmDel objNew; + iot_idl::SIntelliAlmDel objNew; m_objItlAlmDel.Swap(&objNew); } if (m_objItlAlmBroken.mutable_uuid_base64()->Capacity() > nMaxCap) { - kbd_idlfile::SIntelliAlmBroken objNew; + iot_idl::SIntelliAlmBroken objNew; m_objItlAlmBroken.Swap(&objNew); } if (m_objItlAlmRelease.mutable_uuid_base64()->Capacity() > nMaxCap) { - kbd_idlfile::SIntelliAlmRelease objNew; + iot_idl::SIntelliAlmRelease objNew; m_objItlAlmRelease.Swap(&objNew); } if (m_objDbInsert_Add.mutable_msgrecord()->Capacity() > nMaxCap) { //< 注意，不能整个清空 - google::protobuf::RepeatedPtrField objNew; + google::protobuf::RepeatedPtrField objNew; m_objDbInsert_Add.mutable_msgrecord()->Swap(&objNew); } if (m_objDbUpdateMulti_Add_Separate.mutable_msgconditionvalue()->Capacity() > nMaxCap) { //< 注意，不能整个清空 - google::protobuf::RepeatedPtrField<::kbd_idlfile::DbValueArray> objNew; + google::protobuf::RepeatedPtrField<::iot_idl::DbValueArray> objNew; m_objDbUpdateMulti_Add_Separate.mutable_msgconditionvalue()->Swap(&objNew); } if (m_objDbRemoveMulti_Separate.mutable_msgconditionvalue()->Capacity() > nMaxCap) { //< 注意，不能整个清空 - google::protobuf::RepeatedPtrField<::kbd_idlfile::DbValueArray> objNew; + google::protobuf::RepeatedPtrField<::iot_idl::DbValueArray> objNew; m_objDbRemoveMulti_Separate.mutable_msgconditionvalue()->Swap(&objNew); } } @@ -1604,7 +1604,7 @@ void CDataMng::shrinkSize(const int nLastSeqNo) { //< 活动告警由原始告警端管理 - const boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); const bool bTimeIsUp = m_nLastShrinkSizeTime + 3000 < nTimeNow; if (bTimeIsUp) @@ -1718,7 +1718,7 @@ void CDataMng::getAllLiveItlAlmInfo(SItlAlmInfoPtrVec &vecAll) const void CDataMng::saveDB_Add(const SItlAlmMsg &objMsgAdd) { - if (kbd_idlfile::MT_IA_S2C_ADD != objMsgAdd.m_enMsgType) + if (iot_idl::MT_IA_S2C_ADD != objMsgAdd.m_enMsgType) { LOGERROR("saveDB_Add(): 传入错误的消息类型，检查程序！"); return; @@ -1739,37 +1739,37 @@ void CDataMng::saveDB_Add(const SItlAlmMsg &objMsgAdd) for (size_t i = 0; i < nAlmSize; ++i) { - const kbd_idlfile::SIntelliAlmInfo &objAlmInfo = *(objMsgAdd.m_vecItlAlmInfoPtr[i]); + const iot_idl::SIntelliAlmInfo &objAlmInfo = *(objMsgAdd.m_vecItlAlmInfoPtr[i]); - kbd_idlfile::DbValueArray *pDbRcd_temp = m_objDbInsert_Add.add_msgrecord(); + iot_idl::DbValueArray *pDbRcd_temp = m_objDbInsert_Add.add_msgrecord(); //< 填充pDbRcd_temp的插入内容 { //< 下面加列时，同步修改该数字 pDbRcd_temp->mutable_msgvalue()->Reserve(6); - kbd_idlfile::SVariable *pColValue = nullptr; + iot_idl::SVariable *pColValue = nullptr; //< 顺序与列名保持一致 //< UUID_BASE64 pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); pColValue->set_strvalue(objAlmInfo.uuid_base64()); //< TIME_STAMP pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT64); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT64); pColValue->set_lvalue(objAlmInfo.time_stamp()); //< PRIORITY pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT32); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT32); pColValue->set_nvalue(objAlmInfo.priority()); //< MAIN_ALM_UUID pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); //< 第一个是主告警 if (objAlmInfo.raw_alm_uuid_size() > 0) pColValue->set_strvalue(objAlmInfo.raw_alm_uuid(0)); @@ -1781,7 +1781,7 @@ void CDataMng::saveDB_Add(const SItlAlmMsg &objMsgAdd) //< CONTENT pColValue = pDbRcd_temp->add_msgvalue(); - pColValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + pColValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); pColValue->set_strvalue(objAlmInfo.content()); } @@ -1812,19 +1812,19 @@ void CDataMng::saveDB_Add(const SItlAlmMsg &objMsgAdd) { //< 设置条件值 { - kbd_idlfile::DbValueArray *pDbCondVal = m_objDbUpdateMulti_Add_Separate.add_msgconditionvalue(); + iot_idl::DbValueArray *pDbCondVal = m_objDbUpdateMulti_Add_Separate.add_msgconditionvalue(); //< 顺序与条件头对应 - kbd_idlfile::SVariable *pValue = pDbCondVal->add_msgvalue(); - pValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + iot_idl::SVariable *pValue = pDbCondVal->add_msgvalue(); + pValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); pValue->set_strvalue(objAlmInfo.raw_alm_uuid(j)); pValue = pDbCondVal->add_msgvalue(); - pValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT64); + pValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT64); pValue->set_lvalue(nTimeMin); pValue = pDbCondVal->add_msgvalue(); - pValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT64); + pValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT64); pValue->set_lvalue(nTimeMax); } @@ -1832,9 +1832,9 @@ void CDataMng::saveDB_Add(const SItlAlmMsg &objMsgAdd) if ((m_objDbUpdateMulti_Add_Separate.msgconditionvalue_size() >= 100) || (j + 1 == nSize)) { //< 注意，m_objDbUpdateMulti_Add_Separate 不允许被外部修改 - const kbd_idlfile::DbUpdateMulti &objUpdateMulti_Const = m_objDbUpdateMulti_Add_Separate; + const iot_idl::DbUpdateMulti &objUpdateMulti_Const = m_objDbUpdateMulti_Add_Separate; - if (!kbd_dbms::saveHisData(objUpdateMulti_Const)) + if (!iot_dbms::saveHisData(objUpdateMulti_Const)) { LOGERROR("saveDB_Add(): saveHisData()失败，检查程序！"); } @@ -1851,9 +1851,9 @@ void CDataMng::saveDB_Add(const SItlAlmMsg &objMsgAdd) //< m_objDbInsert_Add 的其他信息已在本类构造函数中填写 //< 注意，m_objDbInsert_Add 不允许被外部修改 - const kbd_idlfile::DbInsert &objInsert_Const = m_objDbInsert_Add; + const iot_idl::DbInsert &objInsert_Const = m_objDbInsert_Add; - if (!kbd_dbms::saveHisData(objInsert_Const)) + if (!iot_dbms::saveHisData(objInsert_Const)) { LOGERROR("saveDB_Add(): saveHisData()失败，检查程序！"); } @@ -1864,7 +1864,7 @@ void CDataMng::saveDB_Add(const SItlAlmMsg &objMsgAdd) void CDataMng::saveDB_Separate(const SItlAlmMsg &objMsgRelease) { - if (kbd_idlfile::MT_IA_S2C_RELEASE != objMsgRelease.m_enMsgType) + if (iot_idl::MT_IA_S2C_RELEASE != objMsgRelease.m_enMsgType) { LOGERROR("saveDB_Separate(): 传入错误的消息类型，检查程序！"); return; @@ -1885,22 +1885,22 @@ void CDataMng::saveDB_Separate(const SItlAlmMsg &objMsgRelease) for (size_t i = 0; i < nAlmSize; ++i) { - const kbd_idlfile::SIntelliAlmInfo &objAlmInfo = *(objMsgRelease.m_vecItlAlmInfoPtr[i]); + const iot_idl::SIntelliAlmInfo &objAlmInfo = *(objMsgRelease.m_vecItlAlmInfoPtr[i]); //< 智能告警表 { //< m_objDbRemoveMulti_Separate 的其他信息已在本类构造函数中填写 //< 设置条件值 { - kbd_idlfile::DbValueArray *pDbCondVal = m_objDbRemoveMulti_Separate.add_msgconditionvalue(); + iot_idl::DbValueArray *pDbCondVal = m_objDbRemoveMulti_Separate.add_msgconditionvalue(); //< 顺序与条件头对应 - kbd_idlfile::SVariable *pValue = pDbCondVal->add_msgvalue(); - pValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + iot_idl::SVariable *pValue = pDbCondVal->add_msgvalue(); + pValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); pValue->set_strvalue(objAlmInfo.uuid_base64()); pValue = pDbCondVal->add_msgvalue(); - pValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT64); + pValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT64); pValue->set_lvalue(objAlmInfo.time_stamp()); } @@ -1908,9 +1908,9 @@ void CDataMng::saveDB_Separate(const SItlAlmMsg &objMsgRelease) if ((m_objDbRemoveMulti_Separate.msgconditionvalue_size() >= 100) || (i + 1 == nAlmSize)) { //< 注意，m_objDbRemoveMulti_Separate 不允许被外部修改 - const kbd_idlfile::DbRemoveMulti &objRemoveMulti_Const = m_objDbRemoveMulti_Separate; + const iot_idl::DbRemoveMulti &objRemoveMulti_Const = m_objDbRemoveMulti_Separate; - if (!kbd_dbms::saveHisData(objRemoveMulti_Const)) + if (!iot_dbms::saveHisData(objRemoveMulti_Const)) { LOGERROR("saveDB_Separate(): saveHisData()失败，检查程序！"); } @@ -1946,19 +1946,19 @@ void CDataMng::saveDB_Separate(const SItlAlmMsg &objMsgRelease) { //< 设置条件值 { - kbd_idlfile::DbValueArray *pDbCondVal = m_objDbUpdateMulti_Add_Separate.add_msgconditionvalue(); + iot_idl::DbValueArray *pDbCondVal = m_objDbUpdateMulti_Add_Separate.add_msgconditionvalue(); //< 顺序与条件头对应 - kbd_idlfile::SVariable *pValue = pDbCondVal->add_msgvalue(); - pValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + iot_idl::SVariable *pValue = pDbCondVal->add_msgvalue(); + pValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); pValue->set_strvalue(objAlmInfo.raw_alm_uuid(j)); pValue = pDbCondVal->add_msgvalue(); - pValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT64); + pValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT64); pValue->set_lvalue(nTimeMin); pValue = pDbCondVal->add_msgvalue(); - pValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_INT64); + pValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_INT64); pValue->set_lvalue(nTimeMax); } @@ -1966,9 +1966,9 @@ void CDataMng::saveDB_Separate(const SItlAlmMsg &objMsgRelease) if ((m_objDbUpdateMulti_Add_Separate.msgconditionvalue_size() >= 100) || (j + 1 == nSize)) { //< 注意，m_objDbUpdateMulti_Add_Separate 不允许被外部修改 - const kbd_idlfile::DbUpdateMulti &objUpdateMulti_Const = m_objDbUpdateMulti_Add_Separate; + const iot_idl::DbUpdateMulti &objUpdateMulti_Const = m_objDbUpdateMulti_Add_Separate; - if (!kbd_dbms::saveHisData(objUpdateMulti_Const)) + if (!iot_dbms::saveHisData(objUpdateMulti_Const)) { LOGERROR("saveDB_Separate(): saveHisData()失败，检查程序！"); } @@ -1981,4 +1981,4 @@ void CDataMng::saveDB_Separate(const SItlAlmMsg &objMsgRelease) } } //< namespace intelli_alm_srv -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/intelli_alm_srv/CDataMng.h b/platform/src/service/intelli_alm_srv/CDataMng.h index fd9be2f4..63d425d5 100644 --- a/platform/src/service/intelli_alm_srv/CDataMng.h +++ b/platform/src/service/intelli_alm_srv/CDataMng.h @@ -32,7 +32,7 @@ #include "ItlAlmSrvCommon.h" -namespace kbd_service +namespace iot_service { namespace intelli_alm_srv { @@ -111,23 +111,23 @@ public: void addItlAlm_Master(const SItlAlmInfoPtrVec &vecItlAlmAdd, const bool bNew); //< slave状态时添加智能告警 - bool addItlAlm_Slave(const kbd_net::CMbMessage &objMbMsgInput); + bool addItlAlm_Slave(const iot_net::CMbMessage &objMbMsgInput); void addItlAlm_Slave(const SItlAlmInfoPtrVec &vecItlAlmAdd, const int nSeqNo); //< 标记智能告警为删除状态，仅供 slave 状态使用 - bool delItlAlm(const kbd_net::CMbMessage &objMbMsgInput); + bool delItlAlm(const iot_net::CMbMessage &objMbMsgInput); //< vecUuidDel 输入，智能告警UUID //< nSeqNo 输入，消息序号，备机时使用，主机时无用 void delItlAlm(const std::vector &vecUuidDel, const int nSeqNo); //< 标记智能告警为 broken 状态，仅供 slave 状态使用 - bool brokenItlAlm(const kbd_net::CMbMessage &objMbMsgInput); + bool brokenItlAlm(const iot_net::CMbMessage &objMbMsgInput); //< vecUuidBroken 输入，智能告警UUID //< nSeqNo 输入，消息序号，备机时使用，主机时无用 void brokenItlAlm(const std::vector &vecUuidBroken, const int nSeqNo); //< 释放智能告警，同时释放原始告警记录 - bool releaseItlAlm(const kbd_net::CMbMessage &objMbMsgInput); + bool releaseItlAlm(const iot_net::CMbMessage &objMbMsgInput); //< vecItlAlmUuidBroken 输入，智能告警UUID //< nSeqNo 输入，消息序号，备机时使用，主机时无用 //< bIsSeparate 输入，是否为拆分智能告警，为true时会修改数据库。备机时无用（必须传false） @@ -141,11 +141,11 @@ public: bool getMsgFromSeqNo(int nSeqNo, ConstSItlAlmMsgPtrVec &vecOutput) const; //< 获取全同步消息 - bool getFullSyncMsg(kbd_net::CMbMessage &objMbMsgOutput) const; + bool getFullSyncMsg(iot_net::CMbMessage &objMbMsgOutput) const; //< 设置全同步，清空原有告警缓存，并以输入消息同步 //< 消息不正确，返回false，不修改任何数据 - bool setFullSyncMsg(const kbd_net::CMbMessage &objMbMsgInput); + bool setFullSyncMsg(const iot_net::CMbMessage &objMbMsgInput); //< 收缩容量 //< nLastSeqNo: 在此之前（更老的）消息可删除，此条以及之后的需保留。主机使用，防止冲掉还没发出的消息。 @@ -164,7 +164,7 @@ private: const SItlAlmMsg *addMsg_ReleaseItlAlm(const ConstSItlAlmInfoPtrVec &vecItlAlmInfoPtr_Release, const int nSeqNo); //< 设置全同步，注意：传入参数 objPbMsg_All 将被清空 - void setFullSync(kbd_idlfile::SIntelliAlmAdd &objPbMsg_All, const int nSeqNo); + void setFullSync(iot_idl::SIntelliAlmAdd &objPbMsg_All, const int nSeqNo); void saveDB_Add(const SItlAlmMsg &objMsgAdd); @@ -196,15 +196,15 @@ private: boost::int64_t m_nLastShrinkSizeTime; //< 为了性能作为成员变量，避免反复构造、析构 - kbd_idlfile::SIntelliAlmAdd m_objItlAlmAdd; - kbd_idlfile::SIntelliAlmDel m_objItlAlmDel; - kbd_idlfile::SIntelliAlmBroken m_objItlAlmBroken; - kbd_idlfile::SIntelliAlmRelease m_objItlAlmRelease; + iot_idl::SIntelliAlmAdd m_objItlAlmAdd; + iot_idl::SIntelliAlmDel m_objItlAlmDel; + iot_idl::SIntelliAlmBroken m_objItlAlmBroken; + iot_idl::SIntelliAlmRelease m_objItlAlmRelease; //< saveDb_Add() saveDB_Separate() 函数中使用，为了性能作为成员变量 - kbd_idlfile::DbInsert m_objDbInsert_Add; - kbd_idlfile::DbUpdateMulti m_objDbUpdateMulti_Add_Separate; - kbd_idlfile::DbRemoveMulti m_objDbRemoveMulti_Separate; + iot_idl::DbInsert m_objDbInsert_Add; + iot_idl::DbUpdateMulti m_objDbUpdateMulti_Add_Separate; + iot_idl::DbRemoveMulti m_objDbRemoveMulti_Separate; //< 活动告警缓存 SLiveRawAlmPtrCtnr m_objLiveCache; @@ -214,4 +214,4 @@ private: }; } //< namespace intelli_alm_srv -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/intelli_alm_srv/CIntelliAlmSrv.cpp b/platform/src/service/intelli_alm_srv/CIntelliAlmSrv.cpp index 3db25eab..9ad00205 100644 --- a/platform/src/service/intelli_alm_srv/CIntelliAlmSrv.cpp +++ b/platform/src/service/intelli_alm_srv/CIntelliAlmSrv.cpp @@ -31,7 +31,7 @@ static const int cn_nTopoClusterTimeout_Max = 100 * 1000; //< 100s static const int cn_nTopoClusterSizeThreshold_Min = 10; static const int cn_nTopoClusterSizeThreshold_Max = 1000; -namespace kbd_service +namespace iot_service { namespace intelli_alm_srv { @@ -89,7 +89,7 @@ bool CIntelliAlmSrv::initialize(int nDomainID) //< 加载 intelli_alm_cfg.xml { - const std::string strFileName = kbd_public::CFileUtil::getPathOfCfgFile("intelli_alm_cfg.xml"); + const std::string strFileName = iot_public::CFileUtil::getPathOfCfgFile("intelli_alm_cfg.xml"); boost::property_tree::ptree pt; try @@ -132,7 +132,7 @@ bool CIntelliAlmSrv::initialize(int nDomainID) std::string strCacheDir; std::string strCacheFileName; { - const std::string strCurDir = kbd_public::CFileUtil::getCurModuleDir(); + const std::string strCurDir = iot_public::CFileUtil::getCurModuleDir(); if (strCurDir.empty()) { LOGERROR("initialize(): 获取程序所在路径失败！"); @@ -329,5 +329,5 @@ void CIntelliAlmSrv::pushR2I_ReleaseAct(const ConstSRawAlmInfoPtrVec &vecPtrRele } } //< namespace intelli_alm_srv -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/intelli_alm_srv/CIntelliAlmSrvImpl.cpp b/platform/src/service/intelli_alm_srv/CIntelliAlmSrvImpl.cpp index 7ee54326..17c655d5 100644 --- a/platform/src/service/intelli_alm_srv/CIntelliAlmSrvImpl.cpp +++ b/platform/src/service/intelli_alm_srv/CIntelliAlmSrvImpl.cpp @@ -11,7 +11,7 @@ #include "CIntelliAlmSrvImpl.h" -namespace kbd_service +namespace iot_service { namespace intelli_alm_srv { @@ -138,4 +138,4 @@ bool CIntelliAlmSrvImpl::isSlaveThreadsWorking() const } } //< namespace intelli_alm_srv -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/intelli_alm_srv/CIntelliAlmSrvImpl.h b/platform/src/service/intelli_alm_srv/CIntelliAlmSrvImpl.h index 6328f209..e5b116fe 100644 --- a/platform/src/service/intelli_alm_srv/CIntelliAlmSrvImpl.h +++ b/platform/src/service/intelli_alm_srv/CIntelliAlmSrvImpl.h @@ -15,7 +15,7 @@ #include "CSlaveSyncThread.h" #include "CTopoThread.h" -namespace kbd_service +namespace iot_service { namespace intelli_alm_srv { @@ -68,4 +68,4 @@ private: }; } //< namespace intelli_alm_srv -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/intelli_alm_srv/CMainProcThread.cpp b/platform/src/service/intelli_alm_srv/CMainProcThread.cpp index 7f8120b4..a427b3b2 100644 --- a/platform/src/service/intelli_alm_srv/CMainProcThread.cpp +++ b/platform/src/service/intelli_alm_srv/CMainProcThread.cpp @@ -22,7 +22,7 @@ #include "CDataMng.h" #include "CMainProcThread.h" -namespace kbd_service +namespace iot_service { namespace intelli_alm_srv { @@ -79,7 +79,7 @@ bool CMainProcThread::resumeThread() } if (nullptr == m_pMbComm) - m_pMbComm = new kbd_net::CMbCommunicator(); + m_pMbComm = new iot_net::CMbCommunicator(); //< 订阅所有专业 if (!m_pMbComm->addSub(0, CH_IA_CLT_TO_SRV)) @@ -223,7 +223,7 @@ void CMainProcThread::execute() // LOGINFO("execute(): bSyncOnly == true"); // } - m_nTimeNow = kbd_public::getMonotonicMsec(); + m_nTimeNow = iot_public::getMonotonicMsec(); //< 定期发送序号 if (bSyncOnly) @@ -236,7 +236,7 @@ void CMainProcThread::execute() //< 不修改数据，响应告警同步请求 { - kbd_net::CMbMessage objAlmFullSyncMsg; + iot_net::CMbMessage objAlmFullSyncMsg; handleAllReq(objAlmFullSyncMsg); handleRtReq(objAlmFullSyncMsg); handleSeqNoReq(); @@ -313,8 +313,8 @@ void CMainProcThread::publishSeqNo(unsigned int nIntervalMs) { if (m_nLastPubSeqNoTime + nIntervalMs < m_nTimeNow) { - kbd_net::CMbMessage objMbMsg; - objMbMsg.setMsgType(kbd_idlfile::MT_IA_S2C_SEQNO); + iot_net::CMbMessage objMbMsg; + objMbMsg.setMsgType(iot_idl::MT_IA_S2C_SEQNO); objMbMsg.setSubject(CN_AppId_PUBLIC, CH_IA_SRV_TO_CLT); objMbMsg.setData(cn_strSignature); objMbMsg.setPara1(m_objParent.m_nDomainID); @@ -330,7 +330,7 @@ void CMainProcThread::receiveMbMsg(int nTimeoutMs, bool bSyncOnly) { while (true) { - CMbMessagePtr ptrMbMsgRcv(new kbd_net::CMbMessage()); + CMbMessagePtr ptrMbMsgRcv(new iot_net::CMbMessage()); if (!m_pMbComm->recvMsg(*ptrMbMsgRcv, nTimeoutMs)) { @@ -340,7 +340,7 @@ void CMainProcThread::receiveMbMsg(int nTimeoutMs, bool bSyncOnly) switch (ptrMbMsgRcv->getMsgType()) { - case kbd_idlfile::MT_IA_C2S_SEQNO_REQ: + case iot_idl::MT_IA_C2S_SEQNO_REQ: { LOGDEBUG("Received MT_IA_C2S_SEQNO_REQ"); @@ -358,7 +358,7 @@ void CMainProcThread::receiveMbMsg(int nTimeoutMs, bool bSyncOnly) } break; - case kbd_idlfile::MT_IA_C2S_ALL_REQ: + case iot_idl::MT_IA_C2S_ALL_REQ: { LOGDEBUG("Received MT_IA_C2S_ALL_REQ"); @@ -375,7 +375,7 @@ void CMainProcThread::receiveMbMsg(int nTimeoutMs, bool bSyncOnly) } } break; - case kbd_idlfile::MT_IA_C2S_RT_REQ: + case iot_idl::MT_IA_C2S_RT_REQ: { LOGDEBUG("Received MT_IA_C2S_RT_REQ"); @@ -392,7 +392,7 @@ void CMainProcThread::receiveMbMsg(int nTimeoutMs, bool bSyncOnly) } } break; - case kbd_idlfile::MT_IA_C2S_DEL_REQ: + case iot_idl::MT_IA_C2S_DEL_REQ: { LOGDEBUG("Received MT_IA_C2S_DEL_REQ"); @@ -402,7 +402,7 @@ void CMainProcThread::receiveMbMsg(int nTimeoutMs, bool bSyncOnly) } } break; - case kbd_idlfile::MT_IA_C2S_SEPR_REQ: + case iot_idl::MT_IA_C2S_SEPR_REQ: { LOGDEBUG("Received MT_IA_C2S_SEPR_REQ"); @@ -412,7 +412,7 @@ void CMainProcThread::receiveMbMsg(int nTimeoutMs, bool bSyncOnly) } } break; - case kbd_idlfile::MT_IA_C2S_MERGE_REQ: + case iot_idl::MT_IA_C2S_MERGE_REQ: { LOGDEBUG("Received MT_IA_C2S_MERGE_REQ"); @@ -432,7 +432,7 @@ void CMainProcThread::receiveMbMsg(int nTimeoutMs, bool bSyncOnly) } } -void CMainProcThread::handleAllReq(kbd_net::CMbMessage &objFullSyncMsg) +void CMainProcThread::handleAllReq(iot_net::CMbMessage &objFullSyncMsg) { for (size_t i = 0; i < m_vecAllReq.size(); ++i) { @@ -442,7 +442,7 @@ void CMainProcThread::handleAllReq(kbd_net::CMbMessage &objFullSyncMsg) } //< objFullSyncMsg还要用，先复制 - kbd_net::CMbMessage objMsgCopy = objFullSyncMsg; + iot_net::CMbMessage objMsgCopy = objFullSyncMsg; m_pMbComm->replyMsg(objMsgCopy, *(m_vecAllReq[i])); } @@ -450,7 +450,7 @@ void CMainProcThread::handleAllReq(kbd_net::CMbMessage &objFullSyncMsg) m_vecAllReq.clear(); } -void CMainProcThread::handleRtReq(kbd_net::CMbMessage &objFullSyncMsg) +void CMainProcThread::handleRtReq(iot_net::CMbMessage &objFullSyncMsg) { for (size_t i = 0; i < m_vecRtReq.size(); ++i) { @@ -467,7 +467,7 @@ void CMainProcThread::handleRtReq(kbd_net::CMbMessage &objFullSyncMsg) } //< objFullSyncMsg还要用，先复制 - kbd_net::CMbMessage objMsgCopy = objFullSyncMsg; + iot_net::CMbMessage objMsgCopy = objFullSyncMsg; m_pMbComm->replyMsg(objMsgCopy, *(ptrSrcMbMsg)); } @@ -475,7 +475,7 @@ void CMainProcThread::handleRtReq(kbd_net::CMbMessage &objFullSyncMsg) { for (size_t j = 0; j < vecCachedMsg.size(); ++j) { - kbd_net::CMbMessage objMbMsgRep; + iot_net::CMbMessage objMbMsgRep; if (vecCachedMsg[j]->serializeToMbMsg(m_objParent.m_nDomainID, objMbMsgRep)) { //< objMbMsgRep不再使用， 无需复制 @@ -497,8 +497,8 @@ void CMainProcThread::handleSeqNoReq() for (size_t i = 0; i < m_vecSeqNoReq.size(); ++i) { //< 绝大多数情况 m_vecSeqNoReq 中数量只有1个，没必要循环外填充消息然后循环内复制 - kbd_net::CMbMessage objMbMsgRep; - objMbMsgRep.setMsgType(kbd_idlfile::MT_IA_S2C_SEQNO); + iot_net::CMbMessage objMbMsgRep; + objMbMsgRep.setMsgType(iot_idl::MT_IA_S2C_SEQNO); objMbMsgRep.setSubject(CN_AppId_PUBLIC, CH_IA_SRV_TO_CLT); objMbMsgRep.setData(cn_strSignature); objMbMsgRep.setPara1(m_objParent.m_nDomainID); @@ -521,11 +521,11 @@ void CMainProcThread::handleDelReq() ConstSRawAlmInfoPtrVec vecPtrDel; vecPtrDel.reserve(m_vecDelReq.size() * 10); - kbd_idlfile::SIntelliAlmDel objIA_MsgDel; + iot_idl::SIntelliAlmDel objIA_MsgDel; for (size_t i = 0; i < m_vecDelReq.size(); ++i) { - const kbd_net::CMbMessage &objMbMsg = *(m_vecDelReq[i]); + const iot_net::CMbMessage &objMbMsg = *(m_vecDelReq[i]); //< 反序列化 bool bRc = objIA_MsgDel.ParseFromArray(objMbMsg.getDataPtr(), (int) objMbMsg.getDataSize()); @@ -570,11 +570,11 @@ void CMainProcThread::handleSeprReq() SItlAlmInfoPtrVec vecItlAlmAdd; vecItlAlmAdd.reserve(m_vecSeprReq.size() + 1); - kbd_idlfile::SIntelliAlmSepr objPbMsg_Sepr; + iot_idl::SIntelliAlmSepr objPbMsg_Sepr; for (size_t i = 0; i < m_vecSeprReq.size(); ++i) { - const kbd_net::CMbMessage &objMbMsg = *(m_vecSeprReq[i]); + const iot_net::CMbMessage &objMbMsg = *(m_vecSeprReq[i]); //< 操作是否有效 bool bIsValid = true; @@ -630,7 +630,7 @@ void CMainProcThread::handleSeprReq() { ptrItlAlmInfo_Old = pRawAlm->m_ptrItlAlm->getItlAlmInfo(); - if (kbd_idlfile::IALS_BROKEN == ptrItlAlmInfo_Old->logic_state()) + if (iot_idl::IALS_BROKEN == ptrItlAlmInfo_Old->logic_state()) { LOGWARN("handleSeprReq(): 申请被拆分的智能告警在内存中不完整（Broken），忽略本次操作！"); bIsValid = false; @@ -719,11 +719,11 @@ void CMainProcThread::handleMergeReq() SItlAlmInfoPtrVec vecItlAlmAdd; vecItlAlmAdd.reserve(m_vecMergeReq.size() + 1); - kbd_idlfile::SIntelliAlmMerge objPbMsg_Merge; + iot_idl::SIntelliAlmMerge objPbMsg_Merge; for (size_t i = 0; i < m_vecMergeReq.size(); ++i) { - const kbd_net::CMbMessage &objMbMsg = *(m_vecMergeReq[i]); + const iot_net::CMbMessage &objMbMsg = *(m_vecMergeReq[i]); //< 操作是否有效 bool bIsValid = true; @@ -918,10 +918,10 @@ void CMainProcThread::handleR2I_ReleaseReq(ConstSRawAlmInfoPtrVec &vecR2I_Releas { switch (pRawAlm->m_ptrItlAlm->getItlAlmInfo()->logic_state()) { - case kbd_idlfile::IALS_NORMAL: + case iot_idl::IALS_NORMAL: break; - case kbd_idlfile::IALS_DELETED: - case kbd_idlfile::IALS_BROKEN: + case iot_idl::IALS_DELETED: + case iot_idl::IALS_BROKEN: //< 允许释放 vecI2R_ReleaseAck.push_back(*it); break; @@ -969,7 +969,7 @@ void CMainProcThread::publishNewMsg() for (size_t j = 0; j < vecCachedMsg.size(); ++j) { - kbd_net::CMbMessage objMbMsgSend; + iot_net::CMbMessage objMbMsgSend; if (vecCachedMsg[j]->serializeToMbMsg(m_objParent.m_nDomainID, objMbMsgSend)) { //< objMbMsgSend 不再使用， 无需复制 @@ -1055,7 +1055,7 @@ SItlAlmInfoPtr CMainProcThread::generateItlAlm(const ConstSRawAlmInfoPtrVec &vec const ConstSRawAlmInfoPtr *pRawAlmInfoPtr_Main = nullptr; int nPriorityOrder_Main = 9999; - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; for (BOOST_AUTO(it, vecRawAlmInfo.cbegin()); vecRawAlmInfo.cend() != it; ++it) { @@ -1066,7 +1066,7 @@ SItlAlmInfoPtr CMainProcThread::generateItlAlm(const ConstSRawAlmInfoPtrVec &vec //< 通过 nPriorityID 获取 nPriorityOrder { - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_alarm_level_define); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_alarm_level_define); const int nRecIndex = m_objRtdb_alarm_level_define.searchRecordByKey(&nPriorityID); if (nRecIndex < 0) @@ -1114,9 +1114,9 @@ SItlAlmInfoPtr CMainProcThread::generateItlAlm(const ConstSRawAlmInfoPtrVec &vec const ConstSRawAlmInfoPtr &ptrRawAlmInfo_Main = *pRawAlmInfoPtr_Main; - SItlAlmInfoPtr ptrItlAlmInfo(new kbd_idlfile::SIntelliAlmInfo()); + SItlAlmInfoPtr ptrItlAlmInfo(new iot_idl::SIntelliAlmInfo()); - ptrItlAlmInfo->set_logic_state(kbd_idlfile::IALS_NORMAL); + ptrItlAlmInfo->set_logic_state(iot_idl::IALS_NORMAL); ptrItlAlmInfo->set_domain_id(ptrRawAlmInfo_Main->domain_id()); ptrItlAlmInfo->set_priority(ptrRawAlmInfo_Main->priority()); ptrItlAlmInfo->set_time_stamp(ptrRawAlmInfo_Main->time_stamp()); @@ -1128,7 +1128,7 @@ SItlAlmInfoPtr CMainProcThread::generateItlAlm(const ConstSRawAlmInfoPtrVec &vec // 通过 key_id_tag 获取处置预案 if (ptrRawAlmInfo_Main->has_key_id_tag() && !ptrRawAlmInfo_Main->key_id_tag().empty()) { - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_ia_disposal_plan); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_ia_disposal_plan); std::string strKeyIdTag = ptrRawAlmInfo_Main->key_id_tag(); strKeyIdTag.resize(128); @@ -1173,4 +1173,4 @@ SItlAlmInfoPtr CMainProcThread::generateItlAlm(const ConstSRawAlmInfoPtrVec &vec } } //< namespace intelli_alm_srv -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/intelli_alm_srv/CMainProcThread.h b/platform/src/service/intelli_alm_srv/CMainProcThread.h index d5029b23..1895ac3a 100644 --- a/platform/src/service/intelli_alm_srv/CMainProcThread.h +++ b/platform/src/service/intelli_alm_srv/CMainProcThread.h @@ -16,14 +16,14 @@ #include "net_msg_bus_api/MsgBusApi.h" #include "rdb_api/CRdbAccess.h" -namespace kbd_service +namespace iot_service { namespace intelli_alm_srv { class CIntelliAlmSrvImpl; -class CMainProcThread final : private kbd_public::CTimerThreadBase +class CMainProcThread final : private iot_public::CTimerThreadBase { public: explicit CMainProcThread(CIntelliAlmSrvImpl &objParent); @@ -63,8 +63,8 @@ private: void receiveMbMsg(int nTimeoutMs = 0, bool bSyncOnly = false); //< 处理来自 客户端 的消息 - void handleAllReq(kbd_net::CMbMessage &objFullSyncMsg); - void handleRtReq(kbd_net::CMbMessage &objFullSyncMsg); + void handleAllReq(iot_net::CMbMessage &objFullSyncMsg); + void handleRtReq(iot_net::CMbMessage &objFullSyncMsg); void handleSeqNoReq(); void handleDelReq(); void handleSeprReq(); @@ -102,7 +102,7 @@ private: //< 上一次发送 MT_IA_S2C_SEQNO 的时间，开机后ms数 boost::int64_t m_nLastPubSeqNoTime; - kbd_net::CMbCommunicator *m_pMbComm; //< 消息总线通讯器 + iot_net::CMbCommunicator *m_pMbComm; //< 消息总线通讯器 boost::mutex m_mutexFromRawAlm; //< 下面 m_vecFromRawAlmXXX 的锁 ConstSRawAlmInfoPtrVec m_vecR2I_AddAct; //< 原始告警端 添加告警 的动作 @@ -124,11 +124,11 @@ private: boost::uint8_t m_baBase64[24]{}; //< 实时库接口 - kbd_dbms::CRdbAccess m_objRtdb_alarm_level_define; - kbd_dbms::CRdbAccess m_objRtdb_ia_disposal_plan; + iot_dbms::CRdbAccess m_objRtdb_alarm_level_define; + iot_dbms::CRdbAccess m_objRtdb_ia_disposal_plan; }; } //< namespace intelli_alm_srv -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/intelli_alm_srv/CSlaveSyncThread.cpp b/platform/src/service/intelli_alm_srv/CSlaveSyncThread.cpp index e10a45b0..32e07118 100644 --- a/platform/src/service/intelli_alm_srv/CSlaveSyncThread.cpp +++ b/platform/src/service/intelli_alm_srv/CSlaveSyncThread.cpp @@ -16,7 +16,7 @@ #include "CDataMng.h" #include "CSlaveSyncThread.h" -namespace kbd_service +namespace iot_service { namespace intelli_alm_srv { @@ -58,7 +58,7 @@ bool CSlaveSyncThread::resumeThread() m_strMasterMbCommName = ""; if (nullptr == m_pMbComm) - m_pMbComm = new kbd_net::CMbCommunicator(); + m_pMbComm = new iot_net::CMbCommunicator(); //< 订阅 if (!m_pMbComm->addSub(CN_AppId_PUBLIC, CH_IA_SRV_TO_CLT)) @@ -73,8 +73,8 @@ bool CSlaveSyncThread::resumeThread() //< 向主机请求当前序号 { - kbd_net::CMbMessage objMbMsg; - objMbMsg.setMsgType(kbd_idlfile::MT_IA_C2S_SEQNO_REQ); + iot_net::CMbMessage objMbMsg; + objMbMsg.setMsgType(iot_idl::MT_IA_C2S_SEQNO_REQ); objMbMsg.setSubject(CN_AppId_PUBLIC, CH_IA_CLT_TO_SRV); objMbMsg.setData(cn_strSignature); //< 发送后消息内容被清空 @@ -82,7 +82,7 @@ bool CSlaveSyncThread::resumeThread() } if (nullptr == m_pMbMsgRcv) - m_pMbMsgRcv = new kbd_net::CMbMessage(); + m_pMbMsgRcv = new iot_net::CMbMessage(); //< 先赋值，后resume() m_bIsWorking = true; @@ -162,8 +162,8 @@ void CSlaveSyncThread::execute() void CSlaveSyncThread::replyAlmFullSyncReq() { - kbd_net::CMbMessage objMsgSend; - objMsgSend.setMsgType(kbd_idlfile::MT_IA_C2S_ALL_REQ); + iot_net::CMbMessage objMsgSend; + objMsgSend.setMsgType(iot_idl::MT_IA_C2S_ALL_REQ); objMsgSend.setSubject(CN_AppId_PUBLIC, CH_IA_CLT_TO_SRV); objMsgSend.setData(cn_strSignature); @@ -176,8 +176,8 @@ void CSlaveSyncThread::replyAlmRtReq() if ((0 != m_nLastRtTime) && (m_nLastRtTime + 3000 > m_nTimeNow)) return; - kbd_net::CMbMessage objMsgSend; - objMsgSend.setMsgType(kbd_idlfile::MT_IA_C2S_RT_REQ); + iot_net::CMbMessage objMsgSend; + objMsgSend.setMsgType(iot_idl::MT_IA_C2S_RT_REQ); objMsgSend.setSubject(CN_AppId_PUBLIC, CH_IA_CLT_TO_SRV); objMsgSend.setData(cn_strSignature); @@ -197,42 +197,42 @@ void CSlaveSyncThread::handleOneMbMsg() if (m_pMbMsgRcv->getPara1() != m_objParent.m_nDomainID) return; - m_nTimeNow = kbd_public::getMonotonicMsec(); + m_nTimeNow = iot_public::getMonotonicMsec(); //< 按类型处理 switch (m_pMbMsgRcv->getMsgType()) { - case kbd_idlfile::MT_IA_S2C_SEQNO: + case iot_idl::MT_IA_S2C_SEQNO: { //LOGDEBUG("Received MT_IA_S2C_SEQNO"); handle_MT_IA_S2C_SEQNO(); } break; - case kbd_idlfile::MT_IA_S2C_ALL: + case iot_idl::MT_IA_S2C_ALL: { //LOGDEBUG("Received MT_IA_S2C_ALL"); handle_MT_IA_S2C_ALL(); } break; - case kbd_idlfile::MT_IA_S2C_ADD: + case iot_idl::MT_IA_S2C_ADD: { //LOGDEBUG("Received MT_IA_S2C_ADD"); handle_MT_IA_S2C_ADD(); } break; - case kbd_idlfile::MT_IA_S2C_DEL: + case iot_idl::MT_IA_S2C_DEL: { //LOGDEBUG("Received MT_IA_S2C_DEL"); handle_MT_IA_S2C_DEL(); } break; - case kbd_idlfile::MT_IA_S2C_BROKEN: + case iot_idl::MT_IA_S2C_BROKEN: { //LOGDEBUG("Received MT_IA_S2C_BROKEN"); handle_MT_IA_S2C_BROKEN(); } break; - case kbd_idlfile::MT_IA_S2C_RELEASE: + case iot_idl::MT_IA_S2C_RELEASE: { //LOGDEBUG("Received MT_IA_S2C_RELEASE"); handle_MT_IA_S2C_RELEASE(); @@ -436,4 +436,4 @@ void CSlaveSyncThread::handle_MT_IA_S2C_RELEASE() } } //< namespace intelli_alm_srv -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/intelli_alm_srv/CSlaveSyncThread.h b/platform/src/service/intelli_alm_srv/CSlaveSyncThread.h index 2a9e990c..e8bd9e8a 100644 --- a/platform/src/service/intelli_alm_srv/CSlaveSyncThread.h +++ b/platform/src/service/intelli_alm_srv/CSlaveSyncThread.h @@ -12,14 +12,14 @@ #include "pub_utility_api/TimerThreadBase.h" #include "net_msg_bus_api/MsgBusApi.h" -namespace kbd_service +namespace iot_service { namespace intelli_alm_srv { class CIntelliAlmSrvImpl; -class CSlaveSyncThread final : private kbd_public::CTimerThreadBase +class CSlaveSyncThread final : private iot_public::CTimerThreadBase { public: explicit CSlaveSyncThread(CIntelliAlmSrvImpl &objParent); @@ -57,8 +57,8 @@ private: CIntelliAlmSrvImpl &m_objParent; - kbd_net::CMbCommunicator *m_pMbComm; //< 消息总线通讯器 - kbd_net::CMbMessage *m_pMbMsgRcv; //< 接收的消息总线消息 + iot_net::CMbCommunicator *m_pMbComm; //< 消息总线通讯器 + iot_net::CMbMessage *m_pMbMsgRcv; //< 接收的消息总线消息 boost::int64_t m_nTimeNow; //< 当前时间 @@ -70,4 +70,4 @@ private: }; } //< namespace intelli_alm_srv -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/intelli_alm_srv/CTopoThread.cpp b/platform/src/service/intelli_alm_srv/CTopoThread.cpp index 9b9c1b5c..11e31a17 100644 --- a/platform/src/service/intelli_alm_srv/CTopoThread.cpp +++ b/platform/src/service/intelli_alm_srv/CTopoThread.cpp @@ -19,7 +19,7 @@ #include "CIntelliAlmSrvImpl.h" #include "CTopoThread.h" -namespace kbd_service +namespace iot_service { namespace intelli_alm_srv { @@ -52,7 +52,7 @@ bool CTopoThread::initialize() return false; } - m_nTimeNow = kbd_public::getMonotonicMsec(); + m_nTimeNow = iot_public::getMonotonicMsec(); if (!(m_objRtdb_dev_topo_ver.isOpen())) { @@ -103,10 +103,10 @@ bool CTopoThread::updateTopoInfo() //< 默认5s检查一次 m_nNextCheckTopoVerTime = m_nTimeNow + 5000; - kbd_dbms::CVarType objValue = 0; + iot_dbms::CVarType objValue = 0; //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_dev_topo_ver); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_dev_topo_ver); const int nRcdCnt = m_objRtdb_dev_topo_ver.getRecordCount(); for (int nRcdIdx = 0; nRcdIdx < nRcdCnt; ++nRcdIdx) @@ -149,7 +149,7 @@ bool CTopoThread::loadTopoInfoFromDB() return false; } - kbd_dbms::CDbApi objDb(DB_CONN_MODEL_READ); + iot_dbms::CDbApi objDb(DB_CONN_MODEL_READ); if (!objDb.open()) { LOGERROR("loadTopoInfoFromDB(): 打开数据库失败！"); @@ -159,7 +159,7 @@ bool CTopoThread::loadTopoInfoFromDB() //< SQL条件 QString strWhereCase; { - std::vector vecLocationInfo; + std::vector vecLocationInfo; if (kbdSuccess != CDbSysInfo::m_ptrSysInfo-> getLocationListByDomainId(m_objParent.m_nDomainID, vecLocationInfo) || vecLocationInfo.empty()) @@ -400,7 +400,7 @@ void CTopoThread::execute() //< 是否准备停止线程，仅同步 const bool bSyncOnly = m_objParent.m_objParent.isMasterSyncOnly(); - m_nTimeNow = kbd_public::getMonotonicMsec(); + m_nTimeNow = iot_public::getMonotonicMsec(); updateTopoInfo(); @@ -620,4 +620,4 @@ bool CTopoThread::computeTopo(const bool bSyncOnly) } } //< namespace intelli_alm_srv -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/intelli_alm_srv/CTopoThread.h b/platform/src/service/intelli_alm_srv/CTopoThread.h index 74b1ff59..875adc34 100644 --- a/platform/src/service/intelli_alm_srv/CTopoThread.h +++ b/platform/src/service/intelli_alm_srv/CTopoThread.h @@ -21,14 +21,14 @@ #include "ItlAlmSrvCommon.h" -namespace kbd_service +namespace iot_service { namespace intelli_alm_srv { class CIntelliAlmSrvImpl; -class CTopoThread final : private kbd_public::CTimerThreadBase +class CTopoThread final : private iot_public::CTimerThreadBase { public: explicit CTopoThread(CIntelliAlmSrvImpl &objParent); @@ -222,9 +222,9 @@ private: SLiveVertexCtnr m_ctnrLiveVertex; //< 实时库接口 - kbd_dbms::CRdbAccess m_objRtdb_dev_topo_ver; + iot_dbms::CRdbAccess m_objRtdb_dev_topo_ver; }; } //< namespace intelli_alm_srv -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/intelli_alm_srv/ItlAlmSrvCommon.cpp b/platform/src/service/intelli_alm_srv/ItlAlmSrvCommon.cpp index c93782d7..ef089930 100644 --- a/platform/src/service/intelli_alm_srv/ItlAlmSrvCommon.cpp +++ b/platform/src/service/intelli_alm_srv/ItlAlmSrvCommon.cpp @@ -16,7 +16,7 @@ #include "ItlAlmSrvCommon.h" -namespace kbd_service +namespace iot_service { namespace intelli_alm_srv { @@ -64,17 +64,17 @@ SLiveRawAlm::SLiveRawAlm(const ConstSRawAlmInfoPtr &ptrRawAlmInfo) { switch (ptrRawAlmInfo->logic_state()) { - case kbd_idlfile::ALS_ALARM: - case kbd_idlfile::ALS_ALARM_CFM: - case kbd_idlfile::ALS_RETURN: - case kbd_idlfile::ALS_RETURN_CFM: + case iot_idl::ALS_ALARM: + case iot_idl::ALS_ALARM_CFM: + case iot_idl::ALS_RETURN: + case iot_idl::ALS_RETURN_CFM: m_enRawState = SLiveRawAlm::EN_RAW_UNDEL; break; - case kbd_idlfile::ALS_EVT_ONLY: - case kbd_idlfile::ALS_ALARM_DEL: - case kbd_idlfile::ALS_ALARM_CFM_DEL: - case kbd_idlfile::ALS_RETURN_DEL: - case kbd_idlfile::ALS_RETURN_CFM_DEL: + case iot_idl::ALS_EVT_ONLY: + case iot_idl::ALS_ALARM_DEL: + case iot_idl::ALS_ALARM_CFM_DEL: + case iot_idl::ALS_RETURN_DEL: + case iot_idl::ALS_RETURN_CFM_DEL: m_enRawState = SLiveRawAlm::EN_RAW_DEL; break; default: @@ -96,10 +96,10 @@ bool SItlAlmMsg::isValid() const //< 比 if 效率高 switch (m_enMsgType) { - case kbd_idlfile::MT_IA_S2C_ADD: - case kbd_idlfile::MT_IA_S2C_DEL: - case kbd_idlfile::MT_IA_S2C_BROKEN: - case kbd_idlfile::MT_IA_S2C_RELEASE: + case iot_idl::MT_IA_S2C_ADD: + case iot_idl::MT_IA_S2C_DEL: + case iot_idl::MT_IA_S2C_BROKEN: + case iot_idl::MT_IA_S2C_RELEASE: break; default: { @@ -119,7 +119,7 @@ bool SItlAlmMsg::isValid() const return true; } -bool SItlAlmMsg::serializeToMbMsg(const int nDomainID, kbd_net::CMbMessage &objMbMsgOutput) const +bool SItlAlmMsg::serializeToMbMsg(const int nDomainID, iot_net::CMbMessage &objMbMsgOutput) const { if (!isValid()) { @@ -132,9 +132,9 @@ bool SItlAlmMsg::serializeToMbMsg(const int nDomainID, kbd_net::CMbMessage &objM switch (m_enMsgType) { - case kbd_idlfile::MT_IA_S2C_ADD: + case iot_idl::MT_IA_S2C_ADD: { - kbd_idlfile::SIntelliAlmAdd objAddAlm; + iot_idl::SIntelliAlmAdd objAddAlm; BOOST_AUTO(pAlmInfoField, objAddAlm.mutable_alm_info()); pAlmInfoField->Reserve(nReserve); @@ -143,7 +143,7 @@ bool SItlAlmMsg::serializeToMbMsg(const int nDomainID, kbd_net::CMbMessage &objM { //< pAlmInfoField 获得所有权 //< 注意，objAddAlm 析构前必须释放所有权 - pAlmInfoField->AddAllocated(const_cast(m_vecItlAlmInfoPtr[i].get())); + pAlmInfoField->AddAllocated(const_cast(m_vecItlAlmInfoPtr[i].get())); } const bool bRc = objMbMsgOutput.setData(objAddAlm); @@ -159,12 +159,12 @@ bool SItlAlmMsg::serializeToMbMsg(const int nDomainID, kbd_net::CMbMessage &objM LOGERROR("SItlAlmMsg::serializeToMbMsg(): SIntelliAlmAdd 序列化失败！"); return false; } - objMbMsgOutput.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMbMsgOutput.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; } break; - case kbd_idlfile::MT_IA_S2C_DEL: + case iot_idl::MT_IA_S2C_DEL: { - kbd_idlfile::SIntelliAlmDel objDelAlm; + iot_idl::SIntelliAlmDel objDelAlm; objDelAlm.set_domain_id(nDomainID); @@ -180,12 +180,12 @@ bool SItlAlmMsg::serializeToMbMsg(const int nDomainID, kbd_net::CMbMessage &objM LOGERROR("SItlAlmMsg::serializeToMbMsg(): SIntelliAlmDel 序列化失败！"); return false; } - objMbMsgOutput.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMbMsgOutput.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; } break; - case kbd_idlfile::MT_IA_S2C_BROKEN: + case iot_idl::MT_IA_S2C_BROKEN: { - kbd_idlfile::SIntelliAlmBroken objBrokenAlm; + iot_idl::SIntelliAlmBroken objBrokenAlm; objBrokenAlm.mutable_uuid_base64()->Reserve(nReserve); @@ -199,12 +199,12 @@ bool SItlAlmMsg::serializeToMbMsg(const int nDomainID, kbd_net::CMbMessage &objM LOGERROR("SItlAlmMsg::serializeToMbMsg(): SIntelliAlmBroken 序列化失败！"); return false; } - objMbMsgOutput.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMbMsgOutput.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; } break; - case kbd_idlfile::MT_IA_S2C_RELEASE: + case iot_idl::MT_IA_S2C_RELEASE: { - kbd_idlfile::SIntelliAlmRelease objReleaseAlm; + iot_idl::SIntelliAlmRelease objReleaseAlm; objReleaseAlm.mutable_uuid_base64()->Reserve(nReserve); @@ -218,7 +218,7 @@ bool SItlAlmMsg::serializeToMbMsg(const int nDomainID, kbd_net::CMbMessage &objM LOGERROR("SItlAlmMsg::serializeToMbMsg(): SIntelliAlmRelease 序列化失败！"); return false; } - objMbMsgOutput.m_enZipWhenSend = kbd_net::EN_MB_ZIP_DISABLE; + objMbMsgOutput.m_enZipWhenSend = iot_net::EN_MB_ZIP_DISABLE; } break; default: @@ -240,4 +240,4 @@ bool SItlAlmMsg::serializeToMbMsg(const int nDomainID, kbd_net::CMbMessage &objM } //< namespace intelli_alm_srv -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/intelli_alm_srv/ItlAlmSrvCommon.h b/platform/src/service/intelli_alm_srv/ItlAlmSrvCommon.h index 7f5d408d..115afcfe 100644 --- a/platform/src/service/intelli_alm_srv/ItlAlmSrvCommon.h +++ b/platform/src/service/intelli_alm_srv/ItlAlmSrvCommon.h @@ -44,20 +44,20 @@ #pragma warning(pop) #endif -typedef boost::shared_ptr CMbMessagePtr; +typedef boost::shared_ptr CMbMessagePtr; typedef std::vector CMbMessagePtrVec; //< 在智能告警端，不允许修改原始告警，所以是const -typedef boost::shared_ptr ConstSRawAlmInfoPtr; +typedef boost::shared_ptr ConstSRawAlmInfoPtr; typedef std::vector ConstSRawAlmInfoPtrVec; -typedef boost::shared_ptr SItlAlmInfoPtr; +typedef boost::shared_ptr SItlAlmInfoPtr; typedef std::vector SItlAlmInfoPtrVec; -typedef boost::shared_ptr ConstSItlAlmInfoPtr; +typedef boost::shared_ptr ConstSItlAlmInfoPtr; typedef std::vector ConstSItlAlmInfoPtrVec; -namespace kbd_service +namespace iot_service { namespace intelli_alm_srv { @@ -194,13 +194,13 @@ public: bool isValid() const; //< 输出为消息总线消息 - bool serializeToMbMsg(const int nDomainID, kbd_net::CMbMessage &objMbMsgOutput) const; + bool serializeToMbMsg(const int nDomainID, iot_net::CMbMessage &objMbMsgOutput) const; //< 发送序号 int m_nSeqNo{-1}; //< 消息类型，添加、删除。初始值 MT_IA_C2S_SEQNO_REQ 为一个不可能出现的非法值 - kbd_idlfile::enIntelliAlmMsgType m_enMsgType{kbd_idlfile::MT_IA_C2S_SEQNO_REQ}; + iot_idl::enIntelliAlmMsgType m_enMsgType{iot_idl::MT_IA_C2S_SEQNO_REQ}; //< 本消息包含的告警信息 ConstSItlAlmInfoPtrVec m_vecItlAlmInfoPtr; @@ -243,4 +243,4 @@ typedef boost::multi_index_container > SItlAlmMsgPtrCtnr; } //< namespace intelli_alm_srv -} //< namespace kbd_service +} //< namespace iot_service diff --git a/platform/src/service/interlock_api/InterLockImpl.cpp b/platform/src/service/interlock_api/InterLockImpl.cpp index 0b1612e0..0b161cf4 100644 --- a/platform/src/service/interlock_api/InterLockImpl.cpp +++ b/platform/src/service/interlock_api/InterLockImpl.cpp @@ -11,11 +11,11 @@ #include "pub_utility_api/I18N.h" using namespace std; -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_service; +using namespace iot_dbms; -CInterLockImpl::CInterLockImpl(const kbd_public::SRunAppInfo &stRunAppInfo,const string &strProcess) +CInterLockImpl::CInterLockImpl(const iot_public::SRunAppInfo &stRunAppInfo,const string &strProcess) { m_stRunAppInfo = stRunAppInfo; m_strProcessName = strProcess; @@ -37,7 +37,7 @@ int CInterLockImpl::initialize() { LOGINFO("闭锁库参数初始化....."); - //kbd_public::initI18N("/interlock_api/translate", "interlock_api"); + //iot_public::initI18N("/interlock_api/translate", "interlock_api"); if(createSysInfoInstance(m_ptrSysInfoPtr) == false) { @@ -130,10 +130,10 @@ int CInterLockImpl::CheckCtrlInterlock(const char *strInterlockName, const doubl const vector &vecInterLockInPara, string &strInterlockResult, bool &bInterlockSuccess) { int nRetCode; - kbd_public::LuaVariantTypeSeq vecValue; //param 1 - kbd_public::LuaVariantTypeSeq vecStatus; - kbd_public::LuaVariantTypeSeq vecName; - kbd_public::LuaVariantTypeSeq vecTargValue; + iot_public::LuaVariantTypeSeq vecValue; //param 1 + iot_public::LuaVariantTypeSeq vecStatus; + iot_public::LuaVariantTypeSeq vecName; + iot_public::LuaVariantTypeSeq vecTargValue; vecTargValue.push_back(dTargValue); @@ -185,7 +185,7 @@ int CInterLockImpl::CheckCtrlInterlock(const char *strInterlockName, const doubl return -1; } string strInterLockScript = strInterlock; - kbd_public::CLuaEngineInterface m_objLuoInterface; + iot_public::CLuaEngineInterface m_objLuoInterface; if(m_objLuoInterface.initialize() != kbdSuccess) { LOGERROR("CInterLockImpl::initialize(),initialize lua interface fail !\n"); @@ -223,7 +223,7 @@ int CInterLockImpl::CheckCtrlInterlock(const char *strInterlockName, const doubl @return 成功返回kbdSucces,失败返回相应错误码 */ int CInterLockImpl::GetValueStatusName(const std::string &strTagName, SOptValueStatus &stValueStatus,\ - kbd_public::LuaVariantTypeSeq &vecValue, std::string& strName,int nDomainId ,int nAppNo) + iot_public::LuaVariantTypeSeq &vecValue, std::string& strName,int nDomainId ,int nAppNo) { int nRetCode; string strKeyTagName = strTagName ; diff --git a/platform/src/service/interlock_api/InterLockImpl.h b/platform/src/service/interlock_api/InterLockImpl.h index d393d9a8..c1145ebd 100644 --- a/platform/src/service/interlock_api/InterLockImpl.h +++ b/platform/src/service/interlock_api/InterLockImpl.h @@ -12,7 +12,7 @@ #include "service/common/CommonDefine.h" -namespace kbd_service +namespace iot_service { class CInterLockImpl : public CInterLockInterface { @@ -21,13 +21,13 @@ namespace kbd_service @brief 构造函数 @param const SProcessInfoKey & stProcKey 进程主键标识 */ - CInterLockImpl(const kbd_public::SRunAppInfo &stRunAppInfo,const string &strProces); + CInterLockImpl(const iot_public::SRunAppInfo &stRunAppInfo,const string &strProces); virtual ~CInterLockImpl(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; - kbd_public::CSysInfoInterfacePtr m_ptrSysInfoPtr; - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_public::SRunAppInfo m_stRunAppInfo; + iot_public::CSysInfoInterfacePtr m_ptrSysInfoPtr; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; std::string m_strProcessName; bool m_bIsInitProcInfo; //< 是否已经完成初始化 @@ -58,7 +58,7 @@ namespace kbd_service @return 成功返回kbdSucces,失败返回相应错误码 */ int GetValueStatusName(const std::string &strTagName, SOptValueStatus &stValueStatus,\ - kbd_public::LuaVariantTypeSeq &vecValue, std::string& strName,int nDomainId=-1 ,int nAppNo=-1); + iot_public::LuaVariantTypeSeq &vecValue, std::string& strName,int nDomainId=-1 ,int nAppNo=-1); /** @brief 通过LULA脚本计算连锁结果 @return 成功返回kbdSucces,失败返回相应错误码 @@ -85,5 +85,5 @@ namespace kbd_service typedef boost::shared_ptr CInterLockImplPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/service/interlock_api/InterLockInterface.cpp b/platform/src/service/interlock_api/InterLockInterface.cpp index f5f50c1e..91213421 100644 --- a/platform/src/service/interlock_api/InterLockInterface.cpp +++ b/platform/src/service/interlock_api/InterLockInterface.cpp @@ -9,10 +9,10 @@ #include "InterLockImpl.h" -using namespace kbd_service; +using namespace iot_service; -SERVICE_INTERLOCK_API CInterLockInterfacePtr kbd_service::getInterLockInstance( - const kbd_public::SRunAppInfo &stRunAppInfo,const std::string& strProcess) +SERVICE_INTERLOCK_API CInterLockInterfacePtr iot_service::getInterLockInstance( + const iot_public::SRunAppInfo &stRunAppInfo,const std::string& strProcess) { CInterLockImplPtr ptrInterLockImpl = boost::make_shared(stRunAppInfo,strProcess); if (ptrInterLockImpl != NULL) diff --git a/platform/src/service/iscs_wise_mnp/CAsyncRcvSubThread.cpp b/platform/src/service/iscs_wise_mnp/CAsyncRcvSubThread.cpp index d10fa823..4e00bd18 100644 --- a/platform/src/service/iscs_wise_mnp/CAsyncRcvSubThread.cpp +++ b/platform/src/service/iscs_wise_mnp/CAsyncRcvSubThread.cpp @@ -14,8 +14,8 @@ #endif -kbd_service::CAsyncRcvSubThread::CAsyncRcvSubThread(std::vector &_vecRedisInfo): - kbd_public::CTimerThreadBase("AsyncRcvSubThread",0), +iot_service::CAsyncRcvSubThread::CAsyncRcvSubThread(std::vector &_vecRedisInfo): + iot_public::CTimerThreadBase("AsyncRcvSubThread",0), m_vecRedisInfo(_vecRedisInfo), m_bConFlags(false), m_pRedisAsyncCon(NULL) @@ -28,7 +28,7 @@ kbd_service::CAsyncRcvSubThread::CAsyncRcvSubThread(std::vector &_vecRedisInfo); diff --git a/platform/src/service/iscs_wise_mnp/CRcvRDWrtRdsThread.cpp b/platform/src/service/iscs_wise_mnp/CRcvRDWrtRdsThread.cpp index 1f243d1a..1988a304 100644 --- a/platform/src/service/iscs_wise_mnp/CRcvRDWrtRdsThread.cpp +++ b/platform/src/service/iscs_wise_mnp/CRcvRDWrtRdsThread.cpp @@ -11,8 +11,8 @@ #include "boost/lexical_cast.hpp" #include "DataStructDef.h" -kbd_service::CRcvRDWrtRdsThread::CRcvRDWrtRdsThread(std::vector &_vecRedisInfo): - kbd_public::CTimerThreadBase("CRcvRDWrtRdsThread",10), +iot_service::CRcvRDWrtRdsThread::CRcvRDWrtRdsThread(std::vector &_vecRedisInfo): + iot_public::CTimerThreadBase("CRcvRDWrtRdsThread",10), m_vecRedisInfo(_vecRedisInfo), m_pMbCommunicator(NULL), m_pRedisConMng(NULL), @@ -21,7 +21,7 @@ kbd_service::CRcvRDWrtRdsThread::CRcvRDWrtRdsThread(std::vectorgetConnentStatus()) { LOGINFO("*********************连接redis****************"); @@ -134,10 +134,10 @@ void kbd_service::CRcvRDWrtRdsThread::execute() { if(CH_SCADA_TO_HMI_DATA_CHANGE == msg.getChannelID()) { - if(kbd_idlfile::MT_DP_CHANGE_DATA == msg.getMsgType()) + if(iot_idl::MT_DP_CHANGE_DATA == msg.getMsgType()) { m_vecRedisValue.clear(); - LOGINFO("接收到订阅的实时数据,通道：%d，类型:%d",CH_SCADA_TO_HMI_DATA_CHANGE,kbd_idlfile::MT_DP_CHANGE_DATA); + LOGINFO("接收到订阅的实时数据,通道：%d，类型:%d",CH_SCADA_TO_HMI_DATA_CHANGE,iot_idl::MT_DP_CHANGE_DATA); parserMsg(msg); pipeWriteToRedis(); } @@ -154,7 +154,7 @@ void kbd_service::CRcvRDWrtRdsThread::execute() } } -void kbd_service::CRcvRDWrtRdsThread::dealJsonAddSub(std::string &_jsonStr) +void iot_service::CRcvRDWrtRdsThread::dealJsonAddSub(std::string &_jsonStr) { //< 能源管理平台只在订阅测点发生变化时订阅，未做周期订阅，可能导致无效订阅 @@ -177,7 +177,7 @@ void kbd_service::CRcvRDWrtRdsThread::dealJsonAddSub(std::string &_jsonStr) } //< 添加订阅 - kbd_dbms::CDbApi objDbReader(DB_CONN_MODEL_READ); + iot_dbms::CDbApi objDbReader(DB_CONN_MODEL_READ); if(!objDbReader.open()) { LOGERROR("获取点描述,打开关系库连接失败: %s", objDbReader.getLastErrorString().toStdString().c_str()); @@ -197,7 +197,7 @@ void kbd_service::CRcvRDWrtRdsThread::dealJsonAddSub(std::string &_jsonStr) } } -void kbd_service::CRcvRDWrtRdsThread::delAllSub() +void iot_service::CRcvRDWrtRdsThread::delAllSub() { m_objDpcdaForApp.unsubscribeAll(); @@ -206,16 +206,16 @@ void kbd_service::CRcvRDWrtRdsThread::delAllSub() LOGINFO("取消全部订阅"); } -int kbd_service::CRcvRDWrtRdsThread::readConfig() +int iot_service::CRcvRDWrtRdsThread::readConfig() { initStatusWorthMap(); return kbdSuccess; } -bool kbd_service::CRcvRDWrtRdsThread::parserMsg(kbd_net::CMbMessage &_msg) +bool iot_service::CRcvRDWrtRdsThread::parserMsg(iot_net::CMbMessage &_msg) { - ::kbd_idlfile::SRealTimeDataPkg changeDataPackage; + ::iot_idl::SRealTimeDataPkg changeDataPackage; if(!changeDataPackage.ParseFromArray(_msg.getDataPtr(),(int)_msg.getDataSize())) { LOGWARN("解析实时变化数据包失败"); @@ -228,7 +228,7 @@ bool kbd_service::CRcvRDWrtRdsThread::parserMsg(kbd_net::CMbMessage &_msg) return true; } -bool kbd_service::CRcvRDWrtRdsThread::pipeWriteToRedis() +bool iot_service::CRcvRDWrtRdsThread::pipeWriteToRedis() { // LOGINFO("实时数据写入到redis的数量:%d",m_vecRedisKey.size()); if(m_vecRedisValue.empty()) @@ -269,7 +269,7 @@ bool kbd_service::CRcvRDWrtRdsThread::pipeWriteToRedis() return true; } -void kbd_service::CRcvRDWrtRdsThread::geneAiKV(kbd_idlfile::SRealTimeDataPkg &_pkg) +void iot_service::CRcvRDWrtRdsThread::geneAiKV(iot_idl::SRealTimeDataPkg &_pkg) { int aiSize = _pkg.stairtd_size(); if(aiSize<=0) @@ -282,7 +282,7 @@ void kbd_service::CRcvRDWrtRdsThread::geneAiKV(kbd_idlfile::SRealTimeDataPkg &_p for(int i = 0; i < aiSize;++i) { - const kbd_idlfile::SAiRealTimeData &refAiStru = _pkg.stairtd(i); + const iot_idl::SAiRealTimeData &refAiStru = _pkg.stairtd(i); strTableName = refAiStru.strtablename(); strTagName = refAiStru.strtagname(); @@ -301,7 +301,7 @@ void kbd_service::CRcvRDWrtRdsThread::geneAiKV(kbd_idlfile::SRealTimeDataPkg &_p } } -void kbd_service::CRcvRDWrtRdsThread::geneDiKV(kbd_idlfile::SRealTimeDataPkg &_pkg) +void iot_service::CRcvRDWrtRdsThread::geneDiKV(iot_idl::SRealTimeDataPkg &_pkg) { int diSize = _pkg.stdirtd_size(); if(diSize >0) @@ -310,7 +310,7 @@ void kbd_service::CRcvRDWrtRdsThread::geneDiKV(kbd_idlfile::SRealTimeDataPkg &_p for(int i = 0; i < diSize;++i) { - const kbd_idlfile::SDiRealTimeData &refDiStru = _pkg.stdirtd(i); + const iot_idl::SDiRealTimeData &refDiStru = _pkg.stdirtd(i); strTableName = refDiStru.strtablename(); strTagName = refDiStru.strtagname(); @@ -329,7 +329,7 @@ void kbd_service::CRcvRDWrtRdsThread::geneDiKV(kbd_idlfile::SRealTimeDataPkg &_p } } -void kbd_service::CRcvRDWrtRdsThread::geneMiKV(kbd_idlfile::SRealTimeDataPkg &_pkg) +void iot_service::CRcvRDWrtRdsThread::geneMiKV(iot_idl::SRealTimeDataPkg &_pkg) { int miSize = _pkg.stmirtd_size(); if(miSize >0) @@ -338,7 +338,7 @@ void kbd_service::CRcvRDWrtRdsThread::geneMiKV(kbd_idlfile::SRealTimeDataPkg &_p for(int i = 0; i < miSize;++i) { - const kbd_idlfile::SMiRealTimeData &refMiStru = _pkg.stmirtd(i); + const iot_idl::SMiRealTimeData &refMiStru = _pkg.stmirtd(i); strTableName = refMiStru.strtablename(); strTagName = refMiStru.strtagname(); @@ -358,7 +358,7 @@ void kbd_service::CRcvRDWrtRdsThread::geneMiKV(kbd_idlfile::SRealTimeDataPkg &_p } } -void kbd_service::CRcvRDWrtRdsThread::genePiKV(kbd_idlfile::SRealTimeDataPkg &_pkg) +void iot_service::CRcvRDWrtRdsThread::genePiKV(iot_idl::SRealTimeDataPkg &_pkg) { int piSize = _pkg.stpirtd_size(); if(piSize >0) @@ -367,7 +367,7 @@ void kbd_service::CRcvRDWrtRdsThread::genePiKV(kbd_idlfile::SRealTimeDataPkg &_p for(int i = 0; i < piSize;++i) { - const kbd_idlfile::SPiRealTimeData &refPiStru = _pkg.stpirtd(i); + const iot_idl::SPiRealTimeData &refPiStru = _pkg.stpirtd(i); strTableName = refPiStru.strtablename(); strTagName = refPiStru.strtagname(); if(getExistDescInFourCtlTable(strTableName,strTagName,strDesc)) @@ -385,59 +385,59 @@ void kbd_service::CRcvRDWrtRdsThread::genePiKV(kbd_idlfile::SRealTimeDataPkg &_p } } -std::string kbd_service::CRcvRDWrtRdsThread::SVariableToString(const kbd_idlfile::SVariable &_varValue) +std::string iot_service::CRcvRDWrtRdsThread::SVariableToString(const iot_idl::SVariable &_varValue) { std::string ret = ""; switch (_varValue.edatatype()) { - case kbd_idlfile::CN_DATATYPE_BOOL: + case iot_idl::CN_DATATYPE_BOOL: if(_varValue.has_bvalue()) { ret = std::to_string(_varValue.bvalue()); } break; - case kbd_idlfile::CN_DATATYPE_UINT32: + case iot_idl::CN_DATATYPE_UINT32: if(_varValue.has_uvalue()) { ret = std::to_string(_varValue.uvalue()); } break; - case kbd_idlfile::CN_DATATYPE_INT32: + case iot_idl::CN_DATATYPE_INT32: if(_varValue.has_nvalue()) { ret = std::to_string(_varValue.nvalue()); } break; - case kbd_idlfile::CN_DATATYPE_UINT64: + case iot_idl::CN_DATATYPE_UINT64: if(_varValue.has_ulvalue()) { ret = std::to_string(_varValue.ulvalue()); } break; - case kbd_idlfile::CN_DATATYPE_INT64: + case iot_idl::CN_DATATYPE_INT64: if(_varValue.has_lvalue()) { ret = std::to_string(_varValue.lvalue()); } break; - case kbd_idlfile::CN_DATATYPE_FLOAT: + case iot_idl::CN_DATATYPE_FLOAT: if(_varValue.has_fvalue()) { ret = std::to_string(_varValue.fvalue()); } break; - case kbd_idlfile::CN_DATATYPE_DOUBLE: + case iot_idl::CN_DATATYPE_DOUBLE: if(_varValue.has_dvalue()) { ret = std::to_string(_varValue.dvalue()); } break; - case kbd_idlfile::CN_DATATYPE_STRING: + case iot_idl::CN_DATATYPE_STRING: if(_varValue.has_dvalue()) { ret = std::to_string(_varValue.dvalue()); } break; - case kbd_idlfile::CN_DATATYPE_BYTES: + case iot_idl::CN_DATATYPE_BYTES: break; default: break; @@ -445,7 +445,7 @@ std::string kbd_service::CRcvRDWrtRdsThread::SVariableToString(const kbd_idlfile return ret; } -bool kbd_service::CRcvRDWrtRdsThread::initWiseItem(stWiseItem &wiseItem, const std::string &strTagName, int nWiseTableId) +bool iot_service::CRcvRDWrtRdsThread::initWiseItem(stWiseItem &wiseItem, const std::string &strTagName, int nWiseTableId) { std::vector vecKeyItem; std::string strWiseTag; @@ -468,11 +468,11 @@ bool kbd_service::CRcvRDWrtRdsThread::initWiseItem(stWiseItem &wiseItem, const s wiseItem.tagName = strWiseTag; wiseItem.tableId = nWiseTableId; wiseItem.precision = 3; - wiseItem.timestamp = kbd_public::getUTCTimeMsec(); + wiseItem.timestamp = iot_public::getUTCTimeMsec(); return true; } -void kbd_service::CRcvRDWrtRdsThread::fourCtlTableVSAddSub(const std::string &_table, const std::string &_tag) +void iot_service::CRcvRDWrtRdsThread::fourCtlTableVSAddSub(const std::string &_table, const std::string &_tag) { if(m_bMaster) { @@ -481,13 +481,13 @@ void kbd_service::CRcvRDWrtRdsThread::fourCtlTableVSAddSub(const std::string &_t } } -void kbd_service::CRcvRDWrtRdsThread::fourCtlTableVSDelSub(const std::string &_table, const std::string &_tag) +void iot_service::CRcvRDWrtRdsThread::fourCtlTableVSDelSub(const std::string &_table, const std::string &_tag) { m_objDpcdaForApp.unsubscribe(_table,_tag,CN_Four_Ctl_Col_Value); m_objDpcdaForApp.unsubscribe(_table,_tag,CN_Four_Ctl_Col_Status); } -bool kbd_service::CRcvRDWrtRdsThread::isBelongToFourCtlTableVS(const std::string &_table, const std::string &_col) +bool iot_service::CRcvRDWrtRdsThread::isBelongToFourCtlTableVS(const std::string &_table, const std::string &_col) { if(0 == _col.compare(CN_Four_Ctl_Col_Value) || 0 == _col.compare(CN_Four_Ctl_Col_Status)) { @@ -502,7 +502,7 @@ bool kbd_service::CRcvRDWrtRdsThread::isBelongToFourCtlTableVS(const std::string return false; } -bool kbd_service::CRcvRDWrtRdsThread::isBelongToFourCtlTableVS(const kbd_service::stSubItem &_item) +bool iot_service::CRcvRDWrtRdsThread::isBelongToFourCtlTableVS(const iot_service::stSubItem &_item) { if(0 == _item.columnName.compare(CN_Four_Ctl_Col_Value) || 0 == _item.columnName.compare(CN_Four_Ctl_Col_Status)) { @@ -517,7 +517,7 @@ bool kbd_service::CRcvRDWrtRdsThread::isBelongToFourCtlTableVS(const kbd_service return false; } -void kbd_service::CRcvRDWrtRdsThread::fourCtlTableVSSub(const kbd_service::stSubItem &_item) +void iot_service::CRcvRDWrtRdsThread::fourCtlTableVSSub(const iot_service::stSubItem &_item) { if(m_mapFourCtlSub.end() == m_mapFourCtlSub.find(_item.tableName)) { @@ -540,7 +540,7 @@ void kbd_service::CRcvRDWrtRdsThread::fourCtlTableVSSub(const kbd_service::stSub } } -void kbd_service::CRcvRDWrtRdsThread::fourCtlTableVSAllSub() +void iot_service::CRcvRDWrtRdsThread::fourCtlTableVSAllSub() { ctlTabTagMap::iterator tabIter = m_mapFourCtlSub.begin(); for(; tabIter != m_mapFourCtlSub.end(); tabIter++) @@ -555,7 +555,7 @@ void kbd_service::CRcvRDWrtRdsThread::fourCtlTableVSAllSub() } } -bool kbd_service::CRcvRDWrtRdsThread::getExistDescInFourCtlTable(const std::string &_table, const std::string &_tag, std::string &_desc) +bool iot_service::CRcvRDWrtRdsThread::getExistDescInFourCtlTable(const std::string &_table, const std::string &_tag, std::string &_desc) { if(m_mapFourCtlSub.end() == m_mapFourCtlSub.find(_table)) { @@ -570,14 +570,14 @@ bool kbd_service::CRcvRDWrtRdsThread::getExistDescInFourCtlTable(const std::stri return true; } -void kbd_service::CRcvRDWrtRdsThread::queryPointDesc(kbd_service::stSubItem &_stSubItem, kbd_dbms::CDbApi &objDbReader) +void iot_service::CRcvRDWrtRdsThread::queryPointDesc(iot_service::stSubItem &_stSubItem, iot_dbms::CDbApi &objDbReader) { QList listColName; listColName << "DESCRIPTION"; - kbd_dbms::CDbCondition objCondition; - objCondition.m_eCompare = kbd_dbms::CDbCondition::COMPARE_EQ; - objCondition.m_eLogic = kbd_dbms::CDbCondition::LOGIC_AND; + iot_dbms::CDbCondition objCondition; + objCondition.m_eCompare = iot_dbms::CDbCondition::COMPARE_EQ; + objCondition.m_eLogic = iot_dbms::CDbCondition::LOGIC_AND; objCondition.m_sColName = "TAG_NAME"; objCondition.m_value = QString::fromStdString(_stSubItem.tagName); @@ -595,7 +595,7 @@ void kbd_service::CRcvRDWrtRdsThread::queryPointDesc(kbd_service::stSubItem &_st _stSubItem.description = "null"; } -uint32_t kbd_service::CRcvRDWrtRdsThread::getWorthFromAnaStatus(uint32_t _status) +uint32_t iot_service::CRcvRDWrtRdsThread::getWorthFromAnaStatus(uint32_t _status) { uint32_t worth = 0; std::map::iterator iter; @@ -616,7 +616,7 @@ uint32_t kbd_service::CRcvRDWrtRdsThread::getWorthFromAnaStatus(uint32_t _status return worth; } -uint32_t kbd_service::CRcvRDWrtRdsThread::getWorthFromDigStatus(uint32_t _status) +uint32_t iot_service::CRcvRDWrtRdsThread::getWorthFromDigStatus(uint32_t _status) { uint32_t worth = 0; std::map::iterator iter; @@ -637,7 +637,7 @@ uint32_t kbd_service::CRcvRDWrtRdsThread::getWorthFromDigStatus(uint32_t _status return worth; } -void kbd_service::CRcvRDWrtRdsThread::initStatusWorthMap() +void iot_service::CRcvRDWrtRdsThread::initStatusWorthMap() { /* 能源管理数据状态worth，所有类型一致，未存关系库，从第0位开始 ['有效','无效','工况退出','不刷新','坏数据','突变','计算值','非实测值','非初始化','人工置数', diff --git a/platform/src/service/iscs_wise_mnp/CRcvRDWrtRdsThread.h b/platform/src/service/iscs_wise_mnp/CRcvRDWrtRdsThread.h index 5b4587e9..91edcd4f 100644 --- a/platform/src/service/iscs_wise_mnp/CRcvRDWrtRdsThread.h +++ b/platform/src/service/iscs_wise_mnp/CRcvRDWrtRdsThread.h @@ -20,10 +20,10 @@ */ typedef std::map> ctlTabTagMap; //一个表名，对应一张表 -namespace kbd_service { +namespace iot_service { - class CRcvRDWrtRdsThread : public kbd_public::CTimerThreadBase + class CRcvRDWrtRdsThread : public iot_public::CTimerThreadBase { public: CRcvRDWrtRdsThread(std::vector &_vecRedisInfo); @@ -45,20 +45,20 @@ namespace kbd_service { int readConfig(); - bool parserMsg(kbd_net::CMbMessage &_msg); + bool parserMsg(iot_net::CMbMessage &_msg); bool pipeWriteToRedis(); - void geneAiKV(kbd_idlfile::SRealTimeDataPkg &_pkg); + void geneAiKV(iot_idl::SRealTimeDataPkg &_pkg); - void geneDiKV(kbd_idlfile::SRealTimeDataPkg &_pkg); + void geneDiKV(iot_idl::SRealTimeDataPkg &_pkg); - void geneMiKV(kbd_idlfile::SRealTimeDataPkg &_pkg); + void geneMiKV(iot_idl::SRealTimeDataPkg &_pkg); - void genePiKV(kbd_idlfile::SRealTimeDataPkg &_pkg); + void genePiKV(iot_idl::SRealTimeDataPkg &_pkg); - std::string SVariableToString(const kbd_idlfile::SVariable &_varValue); + std::string SVariableToString(const iot_idl::SVariable &_varValue); bool initWiseItem(stWiseItem &wiseItem, const std::string &strTagName, int nWiseTableId); @@ -82,7 +82,7 @@ namespace kbd_service { bool getExistDescInFourCtlTable(const std::string &_table,const std::string &_tag, std::string &_desc); /*关系库查询点描述，未找到赋值为null*/ - void queryPointDesc(stSubItem &_stSubItem, kbd_dbms::CDbApi &objDbReader); + void queryPointDesc(stSubItem &_stSubItem, iot_dbms::CDbApi &objDbReader); /*将ISCS模拟量，累积量状态转换成能源管理状态*/ uint32_t getWorthFromAnaStatus(uint32_t _status); @@ -100,7 +100,7 @@ namespace kbd_service { CDpcdaForApp m_objDpcdaForApp; - kbd_net::CMbCommunicator * m_pMbCommunicator; + iot_net::CMbCommunicator * m_pMbCommunicator; CRedisConMng * m_pRedisConMng; diff --git a/platform/src/service/iscs_wise_mnp/CRealAlarmThread.cpp b/platform/src/service/iscs_wise_mnp/CRealAlarmThread.cpp index 0a2947b4..b2b54132 100644 --- a/platform/src/service/iscs_wise_mnp/CRealAlarmThread.cpp +++ b/platform/src/service/iscs_wise_mnp/CRealAlarmThread.cpp @@ -8,8 +8,8 @@ #include "pub_logger_api/logger.h" #include "alarm_server_api/CAlmApiForAlmClt.h" -kbd_service::CRealAlarmThread::CRealAlarmThread(std::vector &_vecRedisInfo): - kbd_service::CAlmApiForAlmClt(false), +iot_service::CRealAlarmThread::CRealAlarmThread(std::vector &_vecRedisInfo): + iot_service::CAlmApiForAlmClt(false), m_vecRedisInfo(_vecRedisInfo), m_nMaxId(0), m_pRedisCon(nullptr), @@ -18,7 +18,7 @@ kbd_service::CRealAlarmThread::CRealAlarmThread(std::vector vecDelAlmId; @@ -81,7 +81,7 @@ void kbd_service::CRealAlarmThread::handleReleaseAlmMsg(kbd_idlfile::SAlmCltRele } } -void kbd_service::CRealAlarmThread::handleAllAlmMsg(int /*nDomainID*/, kbd_idlfile::SAlmCltAddAlm &objAllAlm) +void iot_service::CRealAlarmThread::handleAllAlmMsg(int /*nDomainID*/, iot_idl::SAlmCltAddAlm &objAllAlm) { //< todo 当前代码有问题！！！ 只应清空nDomainID域的告警 @@ -95,11 +95,11 @@ void kbd_service::CRealAlarmThread::handleAllAlmMsg(int /*nDomainID*/, kbd_idlfi for(int i= 0; i < almSize;++i) { - const kbd_idlfile::SAlmInfoToAlmClt & almInfoItem = objAllAlm.alm_info(i); - kbd_idlfile::enAlmLogicState logic_state = almInfoItem.logic_state(); - if ( logic_state == kbd_idlfile::ALS_EVT_ONLY || - logic_state == kbd_idlfile::ALS_ALARM_DEL || logic_state == kbd_idlfile::ALS_ALARM_CFM_DEL || - logic_state == kbd_idlfile::ALS_RETURN_DEL || logic_state == kbd_idlfile::ALS_RETURN_CFM_DEL ) + const iot_idl::SAlmInfoToAlmClt & almInfoItem = objAllAlm.alm_info(i); + iot_idl::enAlmLogicState logic_state = almInfoItem.logic_state(); + if ( logic_state == iot_idl::ALS_EVT_ONLY || + logic_state == iot_idl::ALS_ALARM_DEL || logic_state == iot_idl::ALS_ALARM_CFM_DEL || + logic_state == iot_idl::ALS_RETURN_DEL || logic_state == iot_idl::ALS_RETURN_CFM_DEL ) { continue; } @@ -125,7 +125,7 @@ void kbd_service::CRealAlarmThread::handleAllAlmMsg(int /*nDomainID*/, kbd_idlfi } -void kbd_service::CRealAlarmThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm) +void iot_service::CRealAlarmThread::handleAddAlmMsg(iot_idl::SAlmCltAddAlm &objAddAlm) { LOGINFO("【报警线程】 收到报警【增加】"); std::vector vecDelAlmId; @@ -136,11 +136,11 @@ void kbd_service::CRealAlarmThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm & LOGDEBUG("CRealAlarmThread::handleCfmAlmMsg()添加数量:%d",almSize); for(int i= 0; i < almSize;++i) { - const kbd_idlfile::SAlmInfoToAlmClt & almInfoItem = objAddAlm.alm_info(i); - kbd_idlfile::enAlmLogicState logic_state = almInfoItem.logic_state(); - if ( logic_state == kbd_idlfile::ALS_EVT_ONLY || - logic_state == kbd_idlfile::ALS_ALARM_DEL || logic_state == kbd_idlfile::ALS_ALARM_CFM_DEL || - logic_state == kbd_idlfile::ALS_RETURN_DEL || logic_state == kbd_idlfile::ALS_RETURN_CFM_DEL ) + const iot_idl::SAlmInfoToAlmClt & almInfoItem = objAddAlm.alm_info(i); + iot_idl::enAlmLogicState logic_state = almInfoItem.logic_state(); + if ( logic_state == iot_idl::ALS_EVT_ONLY || + logic_state == iot_idl::ALS_ALARM_DEL || logic_state == iot_idl::ALS_ALARM_CFM_DEL || + logic_state == iot_idl::ALS_RETURN_DEL || logic_state == iot_idl::ALS_RETURN_CFM_DEL ) { continue; } @@ -165,7 +165,7 @@ void kbd_service::CRealAlarmThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm & } //确认报警，对于redis中的内容是删除旧ID对应的报警，并且增加新ID对应的报警 -void kbd_service::CRealAlarmThread::handleCfmAlmMsg(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) +void iot_service::CRealAlarmThread::handleCfmAlmMsg(iot_idl::SAlmCltCfmAlm &objCfmAlm) { LOGINFO("【报警线程】 收到报警【确认】"); std::vector vecDelAlmId; @@ -214,7 +214,7 @@ void kbd_service::CRealAlarmThread::handleCfmAlmMsg(kbd_idlfile::SAlmCltCfmAlm & } //收到删除报警命令 -void kbd_service::CRealAlarmThread::handleDelAlmMsg(kbd_idlfile::SAlmCltDelAlm &objDelAlm) +void iot_service::CRealAlarmThread::handleDelAlmMsg(iot_idl::SAlmCltDelAlm &objDelAlm) { //< todo 当前暂不考虑智能告警，所以直接删除。若考虑智能告警，则应打删除标记，而不是释放内存。 @@ -250,7 +250,7 @@ void kbd_service::CRealAlarmThread::handleDelAlmMsg(kbd_idlfile::SAlmCltDelAlm & } } -int kbd_service::CRealAlarmThread::realAlmRedisReconnect() +int iot_service::CRealAlarmThread::realAlmRedisReconnect() { if(m_pRedisCon->getConnentStatus()) { @@ -269,7 +269,7 @@ int kbd_service::CRealAlarmThread::realAlmRedisReconnect() } //web_server 到 redis 的全同步 -int kbd_service::CRealAlarmThread::webSrvToRedisAllSync() +int iot_service::CRealAlarmThread::webSrvToRedisAllSync() { if(!m_bRedisWriteFaild) //如果是非失败状态、那就不用进行全同步 { @@ -293,12 +293,12 @@ int kbd_service::CRealAlarmThread::webSrvToRedisAllSync() } } -int kbd_service::CRealAlarmThread::readConfig() +int iot_service::CRealAlarmThread::readConfig() { return kbdSuccess; } -int kbd_service::CRealAlarmThread::syncAllAlmLocalToRedis() +int iot_service::CRealAlarmThread::syncAllAlmLocalToRedis() { if(!m_pRedisCon->getConnentStatus()) { @@ -638,7 +638,7 @@ int kbd_service::CRealAlarmThread::syncAllAlmLocalToRedis() // return ret; } -void kbd_service::CRealAlarmThread::generateDelAllAlmInfoCmd(std::vector &_VecDelAlmId, std::string &_cmd) +void iot_service::CRealAlarmThread::generateDelAllAlmInfoCmd(std::vector &_VecDelAlmId, std::string &_cmd) { _cmd = "DEL"; //删除报警信息的命令。原则上 索引先删除，内容后删除，这里一起删除也OK _cmd.append(" "); @@ -661,7 +661,7 @@ void kbd_service::CRealAlarmThread::generateDelAllAlmInfoCmd(std::vector &_VecDelAlmId, std::string &_cmd) +void iot_service::CRealAlarmThread::generateDelAllAlmInfoCmd(std::vector &_VecDelAlmId, std::string &_cmd) { _cmd = "DEL"; //删除报警信息的命令。原则上 索引先删除，内容后删除，这里一起删除也OK _cmd.append(" "); @@ -685,7 +685,7 @@ void kbd_service::CRealAlarmThread::generateDelAllAlmInfoCmd(std::vector &_vecStAlmKv, uint64_t &_id, std::string &_almJson) +void iot_service::CRealAlarmThread::almKvPush(std::vector &_vecStAlmKv, uint64_t &_id, std::string &_almJson) { stAlmKv kv; kv.key = "alm:in:"; @@ -702,13 +702,13 @@ void kbd_service::CRealAlarmThread::almKvPush(std::vector _vecStAlmKv.push_back(kv); } -void kbd_service::CRealAlarmThread::delAlmIdJsonCmdPushBack(std::string &_cmd, uint64_t &_id) +void iot_service::CRealAlarmThread::delAlmIdJsonCmdPushBack(std::string &_cmd, uint64_t &_id) { _cmd.append(" alm:in:"); //注意第一个字符是空格 _cmd.append(std::to_string(_id)); } -void kbd_service::CRealAlarmThread::addAlmIdIndexCmdPushBack(std::string &_cmd, uint64_t &_id, int &_index) +void iot_service::CRealAlarmThread::addAlmIdIndexCmdPushBack(std::string &_cmd, uint64_t &_id, int &_index) { _cmd.append(" "); _cmd.append(std::to_string(_index)); @@ -716,7 +716,7 @@ void kbd_service::CRealAlarmThread::addAlmIdIndexCmdPushBack(std::string &_cmd, _cmd.append(std::to_string(_id)); } -void kbd_service::CRealAlarmThread::addAlmIdIndexCmdPushBack(std::string &_cmd, uint64_t &_id, int64_t &_index) +void iot_service::CRealAlarmThread::addAlmIdIndexCmdPushBack(std::string &_cmd, uint64_t &_id, int64_t &_index) { _cmd.append(" "); _cmd.append(std::to_string(_index)); @@ -724,7 +724,7 @@ void kbd_service::CRealAlarmThread::addAlmIdIndexCmdPushBack(std::string &_cmd, _cmd.append(std::to_string(_id)); } -void kbd_service::CRealAlarmThread::delAlmIdIndexCmdPushBack(std::string &_cmd, uint64_t &_id) +void iot_service::CRealAlarmThread::delAlmIdIndexCmdPushBack(std::string &_cmd, uint64_t &_id) { _cmd.append(" "); _cmd.append(std::to_string(_id)); @@ -733,7 +733,7 @@ void kbd_service::CRealAlarmThread::delAlmIdIndexCmdPushBack(std::string &_cmd, -bool kbd_service::CRealAlarmThread::almCfm(kbd_service::stAlmItem &_almItem, uint64_t &_newAlmId, uint64_t &_oldAlmId) +bool iot_service::CRealAlarmThread::almCfm(iot_service::stAlmItem &_almItem, uint64_t &_newAlmId, uint64_t &_oldAlmId) { bool ret = false; switch (_almItem.logicState) { @@ -755,7 +755,7 @@ bool kbd_service::CRealAlarmThread::almCfm(kbd_service::stAlmItem &_almItem, uin return ret; } -int kbd_service::CRealAlarmThread::getAllAlmIdFromRedis(std::vector &_vecAlmId) +int iot_service::CRealAlarmThread::getAllAlmIdFromRedis(std::vector &_vecAlmId) { _vecAlmId.clear(); @@ -791,7 +791,7 @@ int kbd_service::CRealAlarmThread::getAllAlmIdFromRedis(std::vector return kbdSuccess; } -int kbd_service::CRealAlarmThread::changeAlmLogicStatus(const int &_status) +int iot_service::CRealAlarmThread::changeAlmLogicStatus(const int &_status) { switch (_status) { case 0: @@ -813,7 +813,7 @@ int kbd_service::CRealAlarmThread::changeAlmLogicStatus(const int &_status) } -//int kbd_service::CRealAlarmThread::addAlmUpdateSelf(std::vector &_vecStAlmItem) +//int iot_service::CRealAlarmThread::addAlmUpdateSelf(std::vector &_vecStAlmItem) //{ // size_t itemSize = _vecStAlmItem.size(); // std::string key = ""; @@ -840,7 +840,7 @@ int kbd_service::CRealAlarmThread::changeAlmLogicStatus(const int &_status) // return kbdSuccess; //} /* -int kbd_service::CRealAlarmThread::addAlaUpdateRedis(std::vector &_vecStAlmItem) +int iot_service::CRealAlarmThread::addAlaUpdateRedis(std::vector &_vecStAlmItem) { size_t itemSize = _vecStAlmItem.size(); std::string cmd; @@ -851,7 +851,7 @@ int kbd_service::CRealAlarmThread::addAlaUpdateRedis(std::vector &_vecDelId, std::vector &_vecAddAlm) +int iot_service::CRealAlarmThread::updateRedisAlm(std::vector &_vecDelId, std::vector &_vecAddAlm) { if(!m_pRedisCon->getConnentStatus()) { @@ -1059,7 +1059,7 @@ int kbd_service::CRealAlarmThread::updateRedisAlm(std::vector &_vecDel return ret; } -void kbd_service::CRealAlarmThread::printAlmLog(kbd_idlfile::SAlmCltAddAlm &objAllAlm) +void iot_service::CRealAlarmThread::printAlmLog(iot_idl::SAlmCltAddAlm &objAllAlm) { for(int i = 0; i < objAllAlm.alm_info_size();++i) { @@ -1083,7 +1083,7 @@ void kbd_service::CRealAlarmThread::printAlmLog(kbd_idlfile::SAlmCltAddAlm &objA } } -int kbd_service::CRealAlarmThread::getAlmFromRedisPrintLog() +int iot_service::CRealAlarmThread::getAlmFromRedisPrintLog() { LOGINFO("print Region_Id !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); if(!m_pRedisCon->getConnentStatus()) diff --git a/platform/src/service/iscs_wise_mnp/CRealAlarmThread.h b/platform/src/service/iscs_wise_mnp/CRealAlarmThread.h index b1f1c2e9..20bd1d83 100644 --- a/platform/src/service/iscs_wise_mnp/CRealAlarmThread.h +++ b/platform/src/service/iscs_wise_mnp/CRealAlarmThread.h @@ -21,9 +21,9 @@ * 问题：怎么知道重联。需要对redis的连接指针加锁 */ -namespace kbd_service { +namespace iot_service { - class CRealAlarmThread : public kbd_service::CAlmApiForAlmClt + class CRealAlarmThread : public iot_service::CAlmApiForAlmClt { public: CRealAlarmThread(std::vector &_vecRedisInfo); @@ -32,19 +32,19 @@ namespace kbd_service { int initialize(); - virtual void handleAllAlmMsg(int nDomainID, kbd_idlfile::SAlmCltAddAlm &objAllAlm); + virtual void handleAllAlmMsg(int nDomainID, iot_idl::SAlmCltAddAlm &objAllAlm); - virtual void handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm); + virtual void handleAddAlmMsg(iot_idl::SAlmCltAddAlm &objAddAlm); - virtual void handleCfmAlmMsg(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm); + virtual void handleCfmAlmMsg(iot_idl::SAlmCltCfmAlm &objCfmAlm); - virtual void handleDelAlmMsg(kbd_idlfile::SAlmCltDelAlm &objDelAlm); + virtual void handleDelAlmMsg(iot_idl::SAlmCltDelAlm &objDelAlm); - virtual void handleReleaseAlmMsg(kbd_idlfile::SAlmCltReleaseAlm &objReleaseAlm); + virtual void handleReleaseAlmMsg(iot_idl::SAlmCltReleaseAlm &objReleaseAlm); /* * redis reconnect */ @@ -119,20 +119,20 @@ namespace kbd_service { -// int AllAlmMsgUpDateLocal(kbd_idlfile::SAlmCltAddAlm &objAllAlm); +// int AllAlmMsgUpDateLocal(iot_idl::SAlmCltAddAlm &objAllAlm); // int addAlmUpdateSelf(std::vector &_vecStAlmItem); // int addAlaUpdateRedis(std::vector &_vecStAlmItem); - void SAlmInfoToAlmClt2stAlmItem(const kbd_idlfile::SAlmInfoToAlmClt &_objAlmInfo,uint64_t id,stAlmItem &_objStAlmItem); + void SAlmInfoToAlmClt2stAlmItem(const iot_idl::SAlmInfoToAlmClt &_objAlmInfo,uint64_t id,stAlmItem &_objStAlmItem); int updateRedisAlm(std::vector &_vecDelId,std::vector &_vecAddAlm); /*仅仅用于测试*/ - void printAlmLog(kbd_idlfile::SAlmCltAddAlm &objAllAlm); + void printAlmLog(iot_idl::SAlmCltAddAlm &objAllAlm); diff --git a/platform/src/service/iscs_wise_mnp/CRealEventThread.cpp b/platform/src/service/iscs_wise_mnp/CRealEventThread.cpp index a02a3ae3..51f89b0a 100644 --- a/platform/src/service/iscs_wise_mnp/CRealEventThread.cpp +++ b/platform/src/service/iscs_wise_mnp/CRealEventThread.cpp @@ -6,8 +6,8 @@ -kbd_service::CRealEventThread::CRealEventThread(std::vector &_vecRedisInfo): - kbd_service::CAlmApiForEvtClt(false), +iot_service::CRealEventThread::CRealEventThread(std::vector &_vecRedisInfo): + iot_service::CAlmApiForEvtClt(false), m_vecRedisInfo(_vecRedisInfo), m_nMaxId(0), m_pRedisCon(nullptr), @@ -17,7 +17,7 @@ kbd_service::CRealEventThread::CRealEventThread(std::vector vecDelEvtId; std::vector vecAddEvt; @@ -90,7 +90,7 @@ void kbd_service::CRealEventThread::handleAddEvtMsg(kbd_idlfile::SEvtCltAddEvt & for(int i = startNum; i < addSize;++i) { m_nMaxId++; - const kbd_idlfile::SEvtInfoToEvtClt& refEvt = objAddEvt.evt_info(i); + const iot_idl::SEvtInfoToEvtClt& refEvt = objAddEvt.evt_info(i); stEvtItem stEvtItemObj; SEvtInfoToEvtClt2stEvtItem(refEvt,m_nMaxId,stEvtItemObj); vecAddEvt.push_back(stEvtItemObj); @@ -107,7 +107,7 @@ void kbd_service::CRealEventThread::handleAddEvtMsg(kbd_idlfile::SEvtCltAddEvt & } } -int kbd_service::CRealEventThread::realEvtRedisReconnect() +int iot_service::CRealEventThread::realEvtRedisReconnect() { if(m_pRedisCon->getConnentStatus()) { @@ -125,7 +125,7 @@ int kbd_service::CRealEventThread::realEvtRedisReconnect() } } -int kbd_service::CRealEventThread::initialize() +int iot_service::CRealEventThread::initialize() { if(kbdSuccess != readConfig()) { @@ -141,15 +141,15 @@ int kbd_service::CRealEventThread::initialize() return kbdSuccess; } -int kbd_service::CRealEventThread::readConfig() +int iot_service::CRealEventThread::readConfig() { //read config return kbdSuccess; } -void kbd_service::CRealEventThread::SEvtInfoToEvtClt2stEvtItem(const kbd_idlfile::SEvtInfoToEvtClt &_evtInfoClt, +void iot_service::CRealEventThread::SEvtInfoToEvtClt2stEvtItem(const iot_idl::SEvtInfoToEvtClt &_evtInfoClt, uint64_t &_evtId, - kbd_service::stEvtItem &_stEvtItem) + iot_service::stEvtItem &_stEvtItem) { _stEvtItem.evtId = _evtId; _stEvtItem.almType = _evtInfoClt.alm_type(); @@ -190,7 +190,7 @@ void kbd_service::CRealEventThread::SEvtInfoToEvtClt2stEvtItem(const kbd_idlfile } -int kbd_service::CRealEventThread::syncAllEvtLocalToRedis() +int iot_service::CRealEventThread::syncAllEvtLocalToRedis() { if(!m_pRedisCon->getConnentStatus()) { @@ -281,7 +281,7 @@ int kbd_service::CRealEventThread::syncAllEvtLocalToRedis() return ret; } -int kbd_service::CRealEventThread::updateEvtLocalToRedis(std::vector &_vecDelId, std::vector &_vecAddEvt) +int iot_service::CRealEventThread::updateEvtLocalToRedis(std::vector &_vecDelId, std::vector &_vecAddEvt) { if(!m_pRedisCon->getConnentStatus()) { @@ -399,7 +399,7 @@ int kbd_service::CRealEventThread::updateEvtLocalToRedis(std::vector & return ret; } -int kbd_service::CRealEventThread::getAllEvtIdFromRedis(std::vector &_vecEvtId) +int iot_service::CRealEventThread::getAllEvtIdFromRedis(std::vector &_vecEvtId) { _vecEvtId.clear(); std::string cmd = "ZRANGE "; @@ -434,7 +434,7 @@ int kbd_service::CRealEventThread::getAllEvtIdFromRedis(std::vector return kbdSuccess; } -int kbd_service::CRealEventThread::webSrvToRedisAllSync() +int iot_service::CRealEventThread::webSrvToRedisAllSync() { if(!m_bRedisWriteFaild) { @@ -458,7 +458,7 @@ int kbd_service::CRealEventThread::webSrvToRedisAllSync() } } -void kbd_service::CRealEventThread::generateDelAllEvtInfoCmd(std::vector &_VecDelEvtId, std::string &_cmd) +void iot_service::CRealEventThread::generateDelAllEvtInfoCmd(std::vector &_VecDelEvtId, std::string &_cmd) { _cmd = "DEL"; //删除报警信息的命令。原则上 索引先删除，内容后删除，这里一起删除也OK _cmd.append(" "); @@ -481,7 +481,7 @@ void kbd_service::CRealEventThread::generateDelAllEvtInfoCmd(std::vector &_vecStEvtKv, uint64_t &_id, std::string &_evtJson) +void iot_service::CRealEventThread::eventKvPush(std::vector &_vecStEvtKv, uint64_t &_id, std::string &_evtJson) { stAlmKv kv; kv.key = "evt:in:"; @@ -490,7 +490,7 @@ void kbd_service::CRealEventThread::eventKvPush(std::vector #include "CRedisConMng.h" -namespace kbd_service { - class CRealEventThread : public kbd_service::CAlmApiForEvtClt +namespace iot_service { + class CRealEventThread : public iot_service::CAlmApiForEvtClt { public: CRealEventThread(std::vector &_vecRedisInfo); ~CRealEventThread(); - void handleAllEvtMsg(int, kbd_idlfile::SEvtCltAddEvt &objAllEvt); + void handleAllEvtMsg(int, iot_idl::SEvtCltAddEvt &objAllEvt); - void handleAddEvtMsg(kbd_idlfile::SEvtCltAddEvt &objAddEvt); + void handleAddEvtMsg(iot_idl::SEvtCltAddEvt &objAddEvt); int realEvtRedisReconnect(); @@ -32,7 +32,7 @@ namespace kbd_service { int readConfig(); - void SEvtInfoToEvtClt2stEvtItem(const ::kbd_idlfile::SEvtInfoToEvtClt &_evtInfoClt,uint64_t &_evtId,stEvtItem &_stEvtItem); + void SEvtInfoToEvtClt2stEvtItem(const ::iot_idl::SEvtInfoToEvtClt &_evtInfoClt,uint64_t &_evtId,stEvtItem &_stEvtItem); int syncAllEvtLocalToRedis(); @@ -71,5 +71,5 @@ namespace kbd_service { }; typedef boost::shared_ptr CRealEventThreadPtr; -} //end namespace kbd_service +} //end namespace iot_service #endif // CREALEVENTTHREAD_H diff --git a/platform/src/service/iscs_wise_mnp/CRedisConMng.cpp b/platform/src/service/iscs_wise_mnp/CRedisConMng.cpp index a89a99d5..7cb80973 100644 --- a/platform/src/service/iscs_wise_mnp/CRedisConMng.cpp +++ b/platform/src/service/iscs_wise_mnp/CRedisConMng.cpp @@ -12,7 +12,7 @@ #include -kbd_service::CRedisConMng::CRedisConMng(std::vector &_vecRedisInfo): +iot_service::CRedisConMng::CRedisConMng(std::vector &_vecRedisInfo): m_vecRedisInfo(_vecRedisInfo), m_bConFlag(false), m_pCon(nullptr) @@ -20,7 +20,7 @@ kbd_service::CRedisConMng::CRedisConMng(std::vector } -kbd_service::CRedisConMng::~CRedisConMng() +iot_service::CRedisConMng::~CRedisConMng() { if(NULL != m_pCon && true == m_bConFlag ) { @@ -29,7 +29,7 @@ kbd_service::CRedisConMng::~CRedisConMng() m_pCon = NULL; } -int kbd_service::CRedisConMng::redisReCon() +int iot_service::CRedisConMng::redisReCon() { size_t maxSize = m_vecRedisInfo.size(); for(size_t i = 0; i < maxSize; ++i) @@ -83,7 +83,7 @@ int kbd_service::CRedisConMng::redisReCon() -void kbd_service::CRedisConMng::freeConnected() +void iot_service::CRedisConMng::freeConnected() { if(NULL != m_pCon && true == m_bConFlag) { @@ -101,7 +101,7 @@ void kbd_service::CRedisConMng::freeConnected() //#define REDIS_ERR -1 //#define REDIS_OK 0 -int kbd_service::CRedisConMng::exeRedisCmd(redisReply *&_reply, std::string &_cmd) +int iot_service::CRedisConMng::exeRedisCmd(redisReply *&_reply, std::string &_cmd) { if(NULL == m_pCon || false == m_bConFlag) { @@ -135,7 +135,7 @@ int kbd_service::CRedisConMng::exeRedisCmd(redisReply *&_reply, std::string &_cm return kbdFailed; } -int kbd_service::CRedisConMng::exeRedisPipeCmd(std::vector &_vecCmd) +int iot_service::CRedisConMng::exeRedisPipeCmd(std::vector &_vecCmd) { @@ -156,7 +156,7 @@ int kbd_service::CRedisConMng::exeRedisPipeCmd(std::vector &_vecCmd return redisGetReplyAll(_vecCmd.size()); } -int kbd_service::CRedisConMng::redisAppendCmd(std::string &_cmd) +int iot_service::CRedisConMng::redisAppendCmd(std::string &_cmd) { // LOGINFO("%s",_cmd.c_str()) const int nRc = redisAppendCommand(m_pCon,_cmd.c_str()); @@ -165,7 +165,7 @@ int kbd_service::CRedisConMng::redisAppendCmd(std::string &_cmd) return nRc; } -int kbd_service::CRedisConMng::redisAppendCmd(std::string &_cmd, std::string &_key) +int iot_service::CRedisConMng::redisAppendCmd(std::string &_cmd, std::string &_key) { const int nRc = redisAppendCommand(m_pCon,"%s %s",_cmd.c_str(),_key.c_str()); if(REDIS_OK != nRc) @@ -173,7 +173,7 @@ int kbd_service::CRedisConMng::redisAppendCmd(std::string &_cmd, std::string &_k return nRc; } -int kbd_service::CRedisConMng::redisAppendCmd(std::string &_cmd, std::string &_key, std::string &_value) +int iot_service::CRedisConMng::redisAppendCmd(std::string &_cmd, std::string &_key, std::string &_value) { // LOGINFO("%s %s %s",_cmd.c_str(),_key.c_str(),_value.c_str()); const int nRc = redisAppendCommand(m_pCon,"%s %s %s",_cmd.c_str(),_key.c_str(),_value.c_str()); @@ -182,7 +182,7 @@ int kbd_service::CRedisConMng::redisAppendCmd(std::string &_cmd, std::string &_k return nRc; } -int kbd_service::CRedisConMng::redisGetReplyAll(size_t replySize) +int iot_service::CRedisConMng::redisGetReplyAll(size_t replySize) { LOGDEBUG("redisGetReplyAll()size=%d",(int)replySize); @@ -247,22 +247,22 @@ int kbd_service::CRedisConMng::redisGetReplyAll(size_t replySize) return ret; } -bool kbd_service::CRedisConMng::getConnentStatus() +bool iot_service::CRedisConMng::getConnentStatus() { return m_bConFlag; } -std::string kbd_service::CRedisConMng::getMasterIp() +std::string iot_service::CRedisConMng::getMasterIp() { return m_stMasterRedis.strIp; } -int kbd_service::CRedisConMng::getMasterPort() +int iot_service::CRedisConMng::getMasterPort() { return m_stMasterRedis.nPort; } -void kbd_service::CRedisConMng::getMasterSrvInfo(kbd_service::stRedisSrvInfo &_stObj) +void iot_service::CRedisConMng::getMasterSrvInfo(iot_service::stRedisSrvInfo &_stObj) { // _stObj = m_stMasterRedis; _stObj.strIp = m_stMasterRedis.strIp; @@ -287,12 +287,12 @@ void kbd_service::CRedisConMng::getMasterSrvInfo(kbd_service::stRedisSrvInfo &_s -int kbd_service::CRedisConMng::RedisConWithTimeout(const std::string &_strIp, const int &_port, const timeval &_tv) +int iot_service::CRedisConMng::RedisConWithTimeout(const std::string &_strIp, const int &_port, const timeval &_tv) { m_pCon = NULL; - uint64_t startMsec = kbd_public::getUTCTimeMsec(); + uint64_t startMsec = iot_public::getUTCTimeMsec(); m_pCon = redisConnectWithTimeout(_strIp.c_str(),_port,_tv); - uint64_t endMsec = kbd_public::getUTCTimeMsec(); + uint64_t endMsec = iot_public::getUTCTimeMsec(); int intervalMsec = (int)(1000 - (endMsec - startMsec)); if(NULL == m_pCon) { @@ -317,7 +317,7 @@ int kbd_service::CRedisConMng::RedisConWithTimeout(const std::string &_strIp, co return kbdSuccess; } -int kbd_service::CRedisConMng::RedisConWithTimeoutVerifyPasswd(kbd_service::stRedisSrvInfo &_stObj) +int iot_service::CRedisConMng::RedisConWithTimeoutVerifyPasswd(iot_service::stRedisSrvInfo &_stObj) { if(0 == _stObj.strIp.compare("") || -1 == _stObj.nPort) { @@ -335,11 +335,11 @@ int kbd_service::CRedisConMng::RedisConWithTimeoutVerifyPasswd(kbd_service::stRe } m_pCon = NULL; - uint64_t startMsec = kbd_public::getUTCTimeMsec(); + uint64_t startMsec = iot_public::getUTCTimeMsec(); m_pCon = redisConnectWithTimeout(_stObj.strIp.c_str(),_stObj.nPort,_stObj.stTv); - uint64_t endMsec = kbd_public::getUTCTimeMsec(); + uint64_t endMsec = iot_public::getUTCTimeMsec(); int intervalMsec = (int)(1000 - (endMsec - startMsec)); if(NULL == m_pCon) { @@ -418,7 +418,7 @@ int kbd_service::CRedisConMng::RedisConWithTimeoutVerifyPasswd(kbd_service::stRe return kbdSuccess; } -int kbd_service::CRedisConMng::judgeMaster(kbd_service::stRedisSrvInfo &_stObj) +int iot_service::CRedisConMng::judgeMaster(iot_service::stRedisSrvInfo &_stObj) { //< yikn,不区分主备，都连本机redis干活，Java后台同步修改，始终连本机redis return kbdSuccess; @@ -491,7 +491,7 @@ int kbd_service::CRedisConMng::judgeMaster(kbd_service::stRedisSrvInfo &_stObj) */ } -int kbd_service::CRedisConMng::writeToMaster() +int iot_service::CRedisConMng::writeToMaster() { if(NULL == m_pCon) { @@ -539,7 +539,7 @@ int kbd_service::CRedisConMng::writeToMaster() } -void kbd_service::CRedisConMng::setRedisConnected() +void iot_service::CRedisConMng::setRedisConnected() { m_stMasterRedis = m_vecRedisInfo[0]; //除去ip地址和端口号。其他的都一样 @@ -551,7 +551,7 @@ void kbd_service::CRedisConMng::setRedisConnected() } -void kbd_service::CRedisConMng::setRedisDisConnected() +void iot_service::CRedisConMng::setRedisDisConnected() { LOGWARN("断开连接连接redis IP：%s port ：%d",m_stMasterRedis.strIp.c_str(),m_stMasterRedis.nPort); m_stMasterRedis.strIp = ""; diff --git a/platform/src/service/iscs_wise_mnp/CRedisConMng.h b/platform/src/service/iscs_wise_mnp/CRedisConMng.h index 9632aa51..e1378477 100644 --- a/platform/src/service/iscs_wise_mnp/CRedisConMng.h +++ b/platform/src/service/iscs_wise_mnp/CRedisConMng.h @@ -9,7 +9,7 @@ #include "hiredis/hiredis.h" -namespace kbd_service { +namespace iot_service { // 释放redisReply的辅助类，防止内存泄露 class CRedisReplyDestructor diff --git a/platform/src/service/iscs_wise_mnp/CRedisConnectThread.cpp b/platform/src/service/iscs_wise_mnp/CRedisConnectThread.cpp index 630ca751..7a313f74 100644 --- a/platform/src/service/iscs_wise_mnp/CRedisConnectThread.cpp +++ b/platform/src/service/iscs_wise_mnp/CRedisConnectThread.cpp @@ -6,8 +6,8 @@ //< 全同步可能耗时较长，死锁检测时间改为10分钟 #define MY_DEADLOCK_TIMEOUT_MS (int)10*60*1000 -kbd_service::CRedisConnectThread::CRedisConnectThread(kbd_service::CRealAlarmThreadPtr _realAlmThdPtr, CRealEventThreadPtr _realEvtThdPtr): - kbd_public::CTimerThreadBase("redisConnectThread",2000,MY_DEADLOCK_TIMEOUT_MS), +iot_service::CRedisConnectThread::CRedisConnectThread(iot_service::CRealAlarmThreadPtr _realAlmThdPtr, CRealEventThreadPtr _realEvtThdPtr): + iot_public::CTimerThreadBase("redisConnectThread",2000,MY_DEADLOCK_TIMEOUT_MS), m_ptrRealAlmThread(_realAlmThdPtr), m_ptrRealEvtThread(_realEvtThdPtr), m_nLastPrintTime(0) @@ -15,7 +15,7 @@ kbd_service::CRedisConnectThread::CRedisConnectThread(kbd_service::CRealAlarmThr } -kbd_service::CRedisConnectThread::~CRedisConnectThread() +iot_service::CRedisConnectThread::~CRedisConnectThread() { if(NULL != m_ptrRealAlmThread) { @@ -32,7 +32,7 @@ kbd_service::CRedisConnectThread::~CRedisConnectThread() LOGINFO("redis 连接线程退出"); } -void kbd_service::CRedisConnectThread::execute() +void iot_service::CRedisConnectThread::execute() { m_ptrRealAlmThread->realAlmRedisReconnect(); //实时报警的重联 @@ -43,7 +43,7 @@ void kbd_service::CRedisConnectThread::execute() m_ptrRealEvtThread->webSrvToRedisAllSync(); //实时事件的全同步 } -int kbd_service::CRedisConnectThread::initllize() +int iot_service::CRedisConnectThread::initllize() { return kbdSuccess; } diff --git a/platform/src/service/iscs_wise_mnp/CRedisConnectThread.h b/platform/src/service/iscs_wise_mnp/CRedisConnectThread.h index a64eb90c..89fbaff4 100644 --- a/platform/src/service/iscs_wise_mnp/CRedisConnectThread.h +++ b/platform/src/service/iscs_wise_mnp/CRedisConnectThread.h @@ -12,9 +12,9 @@ #include "CRealAlarmThread.h" #include "CRealEventThread.h" -namespace kbd_service { +namespace iot_service { - class CRedisConnectThread :public kbd_public::CTimerThreadBase + class CRedisConnectThread :public iot_public::CTimerThreadBase { public: CRedisConnectThread(CRealAlarmThreadPtr _realAlmThdPtr,CRealEventThreadPtr _realEvtThdPtr); diff --git a/platform/src/service/iscs_wise_mnp/CRelativeCallback.cpp b/platform/src/service/iscs_wise_mnp/CRelativeCallback.cpp index f10241fd..d7690415 100644 --- a/platform/src/service/iscs_wise_mnp/CRelativeCallback.cpp +++ b/platform/src/service/iscs_wise_mnp/CRelativeCallback.cpp @@ -7,7 +7,7 @@ -kbd_service::CRelativeCallback::CRelativeCallback(): +iot_service::CRelativeCallback::CRelativeCallback(): m_ptrCAsyncRcvSubThread(NULL), m_ptrRcvRDWrtRdsThread(NULL), m_nLastAllSubTime(0) @@ -15,12 +15,12 @@ kbd_service::CRelativeCallback::CRelativeCallback(): } -kbd_service::CRelativeCallback::~CRelativeCallback() +iot_service::CRelativeCallback::~CRelativeCallback() { // LOGINFO("单例被销毁了！！！！！！！！"); } -int kbd_service::CRelativeCallback::init(kbd_service::CAsyncRcvSubThreadPtr _ptrRedisAsyncRcv, kbd_service::CRcvRDWrtRdsThreadPtr _ptrRcvRealData) +int iot_service::CRelativeCallback::init(iot_service::CAsyncRcvSubThreadPtr _ptrRedisAsyncRcv, iot_service::CRcvRDWrtRdsThreadPtr _ptrRcvRealData) { if(NULL == _ptrRedisAsyncRcv || NULL == _ptrRcvRealData) { @@ -32,7 +32,7 @@ int kbd_service::CRelativeCallback::init(kbd_service::CAsyncRcvSubThreadPtr _ptr } -void kbd_service::CRelativeCallback::doConnect() +void iot_service::CRelativeCallback::doConnect() { if(NULL == m_ptrCAsyncRcvSubThread) { @@ -42,7 +42,7 @@ void kbd_service::CRelativeCallback::doConnect() LOGINFO("异步接口连接redis成功"); } -void kbd_service::CRelativeCallback::doDisconnect() +void iot_service::CRelativeCallback::doDisconnect() { if(NULL == m_ptrCAsyncRcvSubThread) { @@ -51,7 +51,7 @@ void kbd_service::CRelativeCallback::doDisconnect() m_ptrCAsyncRcvSubThread->doDisconnect(); } -void kbd_service::CRelativeCallback::doSub(std::string &_strJson) +void iot_service::CRelativeCallback::doSub(std::string &_strJson) { //收到的订阅信息直接交给 接收实时数据写入redis线程类处理 m_ptrRcvRDWrtRdsThread->dealJsonAddSub(_strJson); @@ -60,7 +60,7 @@ void kbd_service::CRelativeCallback::doSub(std::string &_strJson) -void kbd_service::CRelativeCallback::quitThread() +void iot_service::CRelativeCallback::quitThread() { if(NULL != m_ptrCAsyncRcvSubThread) { @@ -77,7 +77,7 @@ void kbd_service::CRelativeCallback::quitThread() } } #ifdef OS_WINDOWS -void kbd_service::CRelativeCallback::stopAeLoop() +void iot_service::CRelativeCallback::stopAeLoop() { m_ptrCAsyncRcvSubThread->stopLoopFunc(); } diff --git a/platform/src/service/iscs_wise_mnp/CRelativeCallback.h b/platform/src/service/iscs_wise_mnp/CRelativeCallback.h index 5258f01d..94d609a0 100644 --- a/platform/src/service/iscs_wise_mnp/CRelativeCallback.h +++ b/platform/src/service/iscs_wise_mnp/CRelativeCallback.h @@ -15,7 +15,7 @@ -namespace kbd_service { +namespace iot_service { class CRelativeCallback diff --git a/platform/src/service/iscs_wise_mnp/CWebServerMng.cpp b/platform/src/service/iscs_wise_mnp/CWebServerMng.cpp index d470e8c2..1f612f22 100644 --- a/platform/src/service/iscs_wise_mnp/CWebServerMng.cpp +++ b/platform/src/service/iscs_wise_mnp/CWebServerMng.cpp @@ -8,8 +8,8 @@ #include "pub_utility_api/FileUtil.h" #include "pub_utility_api/CommonConfigParse.h" -kbd_service::CWebServerMng::CWebServerMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng): +iot_service::CWebServerMng::CWebServerMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng): m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProcMng), m_ptrAsyncRcvSubThread(NULL), @@ -21,7 +21,7 @@ kbd_service::CWebServerMng::CWebServerMng(const kbd_public::SRunAppInfo &stRunAp } -kbd_service::CWebServerMng::~CWebServerMng() +iot_service::CWebServerMng::~CWebServerMng() { LOGINFO( "----------------------CWebServerMng 开始析构-------------------------" ); @@ -36,7 +36,7 @@ kbd_service::CWebServerMng::~CWebServerMng() LOGINFO( "web服务管理类线程退出" ); } -int kbd_service::CWebServerMng::redundantSwitch(bool bMaster, bool bSlave) +int iot_service::CWebServerMng::redundantSwitch(bool bMaster, bool bSlave) { LOGINFO("接收到冗余切换指令.Master=[%d],Slave=[%d]",bMaster,bSlave); @@ -47,7 +47,7 @@ int kbd_service::CWebServerMng::redundantSwitch(bool bMaster, bool bSlave) return kbdSuccess; } -int kbd_service::CWebServerMng::initialize() +int iot_service::CWebServerMng::initialize() { if(kbdSuccess != readConfig()) { @@ -123,7 +123,7 @@ int kbd_service::CWebServerMng::initialize() return kbdSuccess; } -int kbd_service::CWebServerMng::readConfig() +int iot_service::CWebServerMng::readConfig() { if(kbdSuccess != readConfigForGenerate()) { @@ -133,10 +133,10 @@ int kbd_service::CWebServerMng::readConfig() return kbdSuccess; } -int kbd_service::CWebServerMng::readConfigForGenerate() +int iot_service::CWebServerMng::readConfigForGenerate() { - kbd_public::CCommonConfigParse objCfgParse; - if(kbdSuccess != objCfgParse.load(kbd_public::CFileUtil::getPathOfCfgFile("iscs_wise_mnp.xml"))) + iot_public::CCommonConfigParse objCfgParse; + if(kbdSuccess != objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile("iscs_wise_mnp.xml"))) { LOGERROR("加载redis通用配置文件失败"); return kbdFailed; @@ -186,7 +186,7 @@ int kbd_service::CWebServerMng::readConfigForGenerate() return kbdSuccess; } -void kbd_service::CWebServerMng::allThreadRedundantSwitch(bool bMaster, bool bSlave) +void iot_service::CWebServerMng::allThreadRedundantSwitch(bool bMaster, bool bSlave) { if(bMaster && !bSlave) //为主 { diff --git a/platform/src/service/iscs_wise_mnp/CWebServerMng.h b/platform/src/service/iscs_wise_mnp/CWebServerMng.h index 23e557cd..bb48f3ca 100644 --- a/platform/src/service/iscs_wise_mnp/CWebServerMng.h +++ b/platform/src/service/iscs_wise_mnp/CWebServerMng.h @@ -11,13 +11,13 @@ #include "CRealEventThread.h" -namespace kbd_service { +namespace iot_service { - class CWebServerMng : public kbd_sys::CRedundantSwitchInterface + class CWebServerMng : public iot_sys::CRedundantSwitchInterface { public: - CWebServerMng(const kbd_public::SRunAppInfo &stRunAppInfo, const kbd_sys::CProcMngInterfacePtr &ptrProcMng); + CWebServerMng(const iot_public::SRunAppInfo &stRunAppInfo, const iot_sys::CProcMngInterfacePtr &ptrProcMng); virtual ~CWebServerMng(); @@ -37,8 +37,8 @@ namespace kbd_service { void allThreadRedundantSwitch(bool bMaster,bool bSlave); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; //进程管理访问库智能指针 + iot_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 + iot_sys::CProcMngInterfacePtr m_ptrProcMng; //进程管理访问库智能指针 std::vector m_vecRedisInfo; //redis的相关信息，ip，port，超时时间，是否需要密码，密码 @@ -51,6 +51,6 @@ namespace kbd_service { }; typedef boost::shared_ptr CWebServerMngPtr; -} //end namespace kbd_service +} //end namespace iot_service #endif // CWEBSERVERMNG_H diff --git a/platform/src/service/iscs_wise_mnp/CWebSrvApp.cpp b/platform/src/service/iscs_wise_mnp/CWebSrvApp.cpp index 80e70d30..9e243444 100644 --- a/platform/src/service/iscs_wise_mnp/CWebSrvApp.cpp +++ b/platform/src/service/iscs_wise_mnp/CWebSrvApp.cpp @@ -13,10 +13,10 @@ #include "pub_logger_api/logger.h" -using namespace kbd_public; +using namespace iot_public; using namespace std; -kbd_service::CWebSrvApp::CWebSrvApp(): +iot_service::CWebSrvApp::CWebSrvApp(): m_ptrSysInfo(NULL), m_ptrProcMng(NULL), m_ptrRedundancyMng(NULL) @@ -24,12 +24,12 @@ kbd_service::CWebSrvApp::CWebSrvApp(): m_ptrWebSrvMng = NULL; } -kbd_service::CWebSrvApp::~CWebSrvApp() +iot_service::CWebSrvApp::~CWebSrvApp() { stop(); } -bool kbd_service::CWebSrvApp::start(int argc, char *argv[], int &) +bool iot_service::CWebSrvApp::start(int argc, char *argv[], int &) { //1.解析启动参数 if(!parseCmdLine(argc, argv)) @@ -61,7 +61,7 @@ bool kbd_service::CWebSrvApp::start(int argc, char *argv[], int &) return false; } //7.创建冗余管理 - m_ptrRedundancyMng =kbd_sys::getRedundantMngInstance(m_stRunAppInfo.nDomainId,m_stRunAppInfo.nAppId,m_stRunAppInfo.strLocalNodeName); + m_ptrRedundancyMng =iot_sys::getRedundantMngInstance(m_stRunAppInfo.nDomainId,m_stRunAppInfo.nAppId,m_stRunAppInfo.strLocalNodeName); if(m_ptrRedundancyMng == NULL) { LOGERROR("创建冗余管理失败"); @@ -89,7 +89,7 @@ bool kbd_service::CWebSrvApp::start(int argc, char *argv[], int &) return true; } -bool kbd_service::CWebSrvApp::stop() +bool iot_service::CWebSrvApp::stop() { LOGINFO("stop"); //9.更新当前进程冗余状态 @@ -116,12 +116,12 @@ bool kbd_service::CWebSrvApp::stop() m_ptrProcMng.reset(); } //2.销毁日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return true; } -int kbd_service::CWebSrvApp::toQuit() +int iot_service::CWebSrvApp::toQuit() { LOGINFO("to Quit"); if(m_ptrProcMng != NULL) @@ -132,7 +132,7 @@ int kbd_service::CWebSrvApp::toQuit() return kbdSuccess; } -bool kbd_service::CWebSrvApp::parseCmdLine(int argc, char *argv[]) +bool iot_service::CWebSrvApp::parseCmdLine(int argc, char *argv[]) { //拼接参数 for(int i=1;ierrstr); @@ -67,7 +67,7 @@ void kbd_service::connectCallback(const redisAsyncContext *c, int status) return ; } -void kbd_service::disconnectCallback(const redisAsyncContext *c, int status) +void iot_service::disconnectCallback(const redisAsyncContext *c, int status) { { if (status != REDIS_OK) { @@ -83,7 +83,7 @@ void kbd_service::disconnectCallback(const redisAsyncContext *c, int status) #ifdef OS_WINDOWS -void kbd_service::stopAeLoop() +void iot_service::stopAeLoop() { CRelativeCallbackSingle::get_mutable_instance().stopAeLoop(); } diff --git a/platform/src/service/iscs_wise_mnp/RedisCallback.h b/platform/src/service/iscs_wise_mnp/RedisCallback.h index 631960e0..05b8a393 100644 --- a/platform/src/service/iscs_wise_mnp/RedisCallback.h +++ b/platform/src/service/iscs_wise_mnp/RedisCallback.h @@ -5,7 +5,7 @@ #include "pub_logger_api/logger.h" #include "WebSrvCommon.h" -namespace kbd_service { +namespace iot_service { /* * 接收到订阅的回调函数 diff --git a/platform/src/service/iscs_wise_mnp/WebSrvCommon.cpp b/platform/src/service/iscs_wise_mnp/WebSrvCommon.cpp index 89288802..1b151a0e 100644 --- a/platform/src/service/iscs_wise_mnp/WebSrvCommon.cpp +++ b/platform/src/service/iscs_wise_mnp/WebSrvCommon.cpp @@ -1,6 +1,6 @@ #include "WebSrvCommon.h" -void kbd_service::sleepMsec(unsigned long _Msec) +void iot_service::sleepMsec(unsigned long _Msec) { #ifdef OS_LINUX usleep(1000 * _Msec); @@ -10,7 +10,7 @@ void kbd_service::sleepMsec(unsigned long _Msec) return; } -std::string kbd_service::getTableNameByWiseId(int wiseId) +std::string iot_service::getTableNameByWiseId(int wiseId) { std::string strTable = ""; switch (wiseId) { diff --git a/platform/src/service/iscs_wise_mnp/WebSrvCommon.h b/platform/src/service/iscs_wise_mnp/WebSrvCommon.h index ec73b29c..b126f362 100644 --- a/platform/src/service/iscs_wise_mnp/WebSrvCommon.h +++ b/platform/src/service/iscs_wise_mnp/WebSrvCommon.h @@ -12,7 +12,7 @@ * 缩写 srv == server */ -namespace kbd_service { +namespace iot_service { //进程相关定义 #define OPT_DESC_APP "app" diff --git a/platform/src/service/iscs_wise_mnp/WebSrvJsonMsg.cpp b/platform/src/service/iscs_wise_mnp/WebSrvJsonMsg.cpp index 75f230b3..11d0a241 100644 --- a/platform/src/service/iscs_wise_mnp/WebSrvJsonMsg.cpp +++ b/platform/src/service/iscs_wise_mnp/WebSrvJsonMsg.cpp @@ -19,12 +19,12 @@ /***************************************分割线*****************************************************/ -kbd_service::CRealDataSubJson::CRealDataSubJson() +iot_service::CRealDataSubJson::CRealDataSubJson() { } -bool kbd_service::CRealDataSubJson::generate(const kbd_service::stWiseItem &_stWiseItem,std::string &_jsonStr) +bool iot_service::CRealDataSubJson::generate(const iot_service::stWiseItem &_stWiseItem,std::string &_jsonStr) { rapidjson::Document doc; doc.SetObject(); @@ -53,7 +53,7 @@ bool kbd_service::CRealDataSubJson::generate(const kbd_service::stWiseItem &_stW return false; } -bool kbd_service::CRealDataSubJson::parse(std::string &_jsonStr, kbd_service::stSubInfo &_stSubInfo,std::string &_errStr) +bool iot_service::CRealDataSubJson::parse(std::string &_jsonStr, iot_service::stSubInfo &_stSubInfo,std::string &_errStr) { rapidjson::Document doc; doc.Parse<0>(_jsonStr.c_str()); @@ -108,12 +108,12 @@ bool kbd_service::CRealDataSubJson::parse(std::string &_jsonStr, kbd_service::st } /***************************************分割线*****************************************************/ -kbd_service::CRealAlarmJson::CRealAlarmJson() +iot_service::CRealAlarmJson::CRealAlarmJson() { } -bool kbd_service::CRealAlarmJson::generate(kbd_service::stAlmItem &_stObj, std::string &_jsonStr) +bool iot_service::CRealAlarmJson::generate(iot_service::stAlmItem &_stObj, std::string &_jsonStr) { _jsonStr.clear(); rapidjson::Document doc; @@ -169,12 +169,12 @@ bool kbd_service::CRealAlarmJson::generate(kbd_service::stAlmItem &_stObj, std:: } -kbd_service::CRealEventJson::CRealEventJson() +iot_service::CRealEventJson::CRealEventJson() { } -bool kbd_service::CRealEventJson::generate(kbd_service::stEvtItem &_stObj, std::string &_jsonStr) +bool iot_service::CRealEventJson::generate(iot_service::stEvtItem &_stObj, std::string &_jsonStr) { _jsonStr.clear(); diff --git a/platform/src/service/iscs_wise_mnp/WebSrvJsonMsg.h b/platform/src/service/iscs_wise_mnp/WebSrvJsonMsg.h index 790fd752..b2d40a82 100644 --- a/platform/src/service/iscs_wise_mnp/WebSrvJsonMsg.h +++ b/platform/src/service/iscs_wise_mnp/WebSrvJsonMsg.h @@ -6,7 +6,7 @@ -namespace kbd_service +namespace iot_service { @@ -16,7 +16,7 @@ namespace kbd_service CRealDataSubJson(); public: bool generate(const stWiseItem& _stWiseItem,std::string &_jsonStr); - bool parse (std::string &_jsonStr,kbd_service::stSubInfo &_stSubInfo,std::string& _errStr); + bool parse (std::string &_jsonStr,iot_service::stSubInfo &_stSubInfo,std::string& _errStr); }; class CRealAlarmJson @@ -41,7 +41,7 @@ namespace kbd_service -} //end namspace kbd_service +} //end namspace iot_service diff --git a/platform/src/service/iscs_wise_mnp/main.cpp b/platform/src/service/iscs_wise_mnp/main.cpp index e530c644..c44e59bd 100644 --- a/platform/src/service/iscs_wise_mnp/main.cpp +++ b/platform/src/service/iscs_wise_mnp/main.cpp @@ -6,6 +6,6 @@ using namespace std; int main(int argc,char *argv[]) { - kbd_service::CWebSrvApp app; + iot_service::CWebSrvApp app; return app.main(argc,argv); } diff --git a/platform/src/service/operate_server/Main.cpp b/platform/src/service/operate_server/Main.cpp index a4f94a6c..95f2c990 100644 --- a/platform/src/service/operate_server/Main.cpp +++ b/platform/src/service/operate_server/Main.cpp @@ -1,8 +1,8 @@ #include #include "OperateServer.h" -using namespace kbd_service; -using namespace kbd_sys; +using namespace iot_service; +using namespace iot_sys; using namespace std; int main(int argc, char *argv[]) diff --git a/platform/src/service/operate_server/OperateServer.cpp b/platform/src/service/operate_server/OperateServer.cpp index 64efb8d9..6a665646 100644 --- a/platform/src/service/operate_server/OperateServer.cpp +++ b/platform/src/service/operate_server/OperateServer.cpp @@ -18,11 +18,11 @@ #define OPT_DESC_HELP "help" using namespace std; -using namespace kbd_net; -using namespace kbd_sys; -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_sys; +using namespace iot_public; +using namespace iot_service; +using namespace iot_idl; COperateServer::COperateServer() { @@ -93,7 +93,7 @@ bool COperateServer::isAlreadyRunning(std::string strProcessName) m_strInstName += " -a "; m_strInstName += m_strAppName; - return kbd_public::CSingleProcInstance::hasInstanceRunning(m_strInstName); + return iot_public::CSingleProcInstance::hasInstanceRunning(m_strInstName); } /** diff --git a/platform/src/service/operate_server/OperateServer.h b/platform/src/service/operate_server/OperateServer.h index 886ce0de..99514606 100644 --- a/platform/src/service/operate_server/OperateServer.h +++ b/platform/src/service/operate_server/OperateServer.h @@ -20,9 +20,9 @@ //=============================================================== #include "OptMainThread.h" -namespace kbd_service +namespace iot_service { -class COperateServer : public kbd_public::CBaseService,kbd_sys::CProcessQuitInterface +class COperateServer : public iot_public::CBaseService,iot_sys::CProcessQuitInterface { public: COperateServer(); @@ -47,16 +47,16 @@ public: private: //管理进程指针 - kbd_sys::CProcMngInterfacePtr m_ptrProcManage; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; - kbd_service::CRedundantSwitchPtr m_ptrRedundantSwitch; + iot_sys::CProcMngInterfacePtr m_ptrProcManage; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_service::CRedundantSwitchPtr m_ptrRedundantSwitch; //进程系统信息 std::string m_strStartArgs; //进程启动参数 std::string m_strAppName; std::string m_strProcessName; std::string m_strInstName; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; //工作线程指针 COptMainThreadPtr m_ptrOptMainThread; diff --git a/platform/src/service/operate_server/OperateServerClass.cpp b/platform/src/service/operate_server/OperateServerClass.cpp index 1d92ce4d..a589036e 100644 --- a/platform/src/service/operate_server/OperateServerClass.cpp +++ b/platform/src/service/operate_server/OperateServerClass.cpp @@ -9,12 +9,12 @@ #include "MessageChannel.h" using namespace std; -using namespace kbd_service; -using namespace kbd_idlfile; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_service; +using namespace iot_idl; +using namespace iot_public; +using namespace iot_dbms; -COperateServerClass::COperateServerClass(kbd_public::SRunAppInfo stRunAppInfo, +COperateServerClass::COperateServerClass(iot_public::SRunAppInfo stRunAppInfo, CNetMsgBusExPtr ptrOptCommon) { @@ -829,7 +829,7 @@ int COperateServerClass::getBasCraftModeName(const int nModeNo,string &strCraftN int nRetCode = 0 ; vector vecBasModeDef; - vector vecCondInfo; + vector vecCondInfo; CRdbPublic::addCondInfo(vecCondInfo,"mode_no",nModeNo); CRdbPublic::addCondInfo(vecCondInfo,"location_id" ,m_stRunAppInfo.nLocationId); diff --git a/platform/src/service/operate_server/OperateServerClass.h b/platform/src/service/operate_server/OperateServerClass.h index 4a02f8df..4c85f655 100644 --- a/platform/src/service/operate_server/OperateServerClass.h +++ b/platform/src/service/operate_server/OperateServerClass.h @@ -23,19 +23,19 @@ #include #include "string.h" -namespace kbd_service +namespace iot_service { class COperateServerClass { public: - COperateServerClass(kbd_public::SRunAppInfo stRunAppInfo, CNetMsgBusExPtr ptrNetMsgBus); + COperateServerClass(iot_public::SRunAppInfo stRunAppInfo, CNetMsgBusExPtr ptrNetMsgBus); virtual ~COperateServerClass(); private: //进程基础信息变量 //====================================================================================================== - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; string m_strProcessName; string m_strDomainName; string m_strSrcTagLocal; @@ -50,8 +50,8 @@ private: CDataProcessApiPtr m_ptrDataProcApi; CNetMsgBusExPtr m_ptrNetMsgBus; COptCommandPtr m_ptrOptComand; //数据发布类指针 - kbd_dbms::CDbApi* m_ptrModelCommit; //模型提交接口 - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_dbms::CDbApi* m_ptrModelCommit; //模型提交接口 + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; COptPlanShieldPtr m_ptrOptPlanShield;//计划屏蔽 private: @@ -112,18 +112,18 @@ public: //====================================================================================================== int optCtrlRequest(const string &strJson, string &strResult);//HMI遥控请求处理 int optCtrlSelect(const string &strJson);//HMI遥控选择处理 - int optCtrlSelectReply(const kbd_idlfile::SFesCtrlReplyPkg &stReplyPkg);//HMI遥控选择返校处理 + int optCtrlSelectReply(const iot_idl::SFesCtrlReplyPkg &stReplyPkg);//HMI遥控选择返校处理 int optCtrlCustom(const string &strJson);//HMI自定义命令处理 - int optCtrlCustomReply(const kbd_idlfile::SFesCustCmdReplyPkg &stFesCustReplyPkg);//自定义回复 - int optFesCtrlExecute(const kbd_idlfile::SFesChangeVirtualDataPkg objFesVirCtrlPkg) ; + int optCtrlCustomReply(const iot_idl::SFesCustCmdReplyPkg &stFesCustReplyPkg);//自定义回复 + int optFesCtrlExecute(const iot_idl::SFesChangeVirtualDataPkg objFesVirCtrlPkg) ; int optCtrlExecute(const string &strJson);//HMI遥控执行处理 int optCtrlCheckTargetVal() ;//带返信处理 - int optCtrlExecuteReply(const kbd_idlfile::SFesCtrlReplyPkg &stReplyPkg);//HMI遥控执行返校处理 + int optCtrlExecuteReply(const iot_idl::SFesCtrlReplyPkg &stReplyPkg);//HMI遥控执行返校处理 int optCtrlCancel(const string &strJson);//HMI遥控取消处理 - int optCtrlCancelReply(const kbd_idlfile::SFesCtrlReplyPkg &stReplyPkg);//HMI遥控取消返校处理 + int optCtrlCancelReply(const iot_idl::SFesCtrlReplyPkg &stReplyPkg);//HMI遥控取消返校处理 int optCtrlClose(const string &strJson);//HMI遥控取消处理，关闭遥控保留 - int optVirtCtrlExeReply(const kbd_idlfile::SOptVirtCtrlReply); - int optVirtCtrlSelReply(const kbd_idlfile::SOptVirtCtrlReply); + int optVirtCtrlExeReply(const iot_idl::SOptVirtCtrlReply); + int optVirtCtrlSelReply(const iot_idl::SOptVirtCtrlReply); //超时检查相关函数 //====================================================================================================== diff --git a/platform/src/service/operate_server/OptCommand.cpp b/platform/src/service/operate_server/OptCommand.cpp index a1a141fa..5daf4136 100644 --- a/platform/src/service/operate_server/OptCommand.cpp +++ b/platform/src/service/operate_server/OptCommand.cpp @@ -9,13 +9,13 @@ #include "rdb_api/FuncForNet.h" #include "MessageChannel.h" -using namespace kbd_service; -using namespace kbd_idlfile; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_service; +using namespace iot_idl; +using namespace iot_public; +using namespace iot_dbms; using namespace std; -COptCommand::COptCommand(kbd_public::SRunAppInfo stRunAppInfo) +COptCommand::COptCommand(iot_public::SRunAppInfo stRunAppInfo) { m_stRunAppInfo = stRunAppInfo; } @@ -78,7 +78,7 @@ void COptCommand::release() } void COptCommand::addOptSetData(const string strTagName, const int nAddStatus, const int nDelStatus, - const kbd_idlfile::SVariable &varValue,const bool bSendImme) + const iot_idl::SVariable &varValue,const bool bSendImme) { SOptSetDataMsg *OptSetData = m_stOptDataMsg.add_seq_set_data_info() ; diff --git a/platform/src/service/operate_server/OptCommand.h b/platform/src/service/operate_server/OptCommand.h index 2f9573ef..f4308578 100644 --- a/platform/src/service/operate_server/OptCommand.h +++ b/platform/src/service/operate_server/OptCommand.h @@ -19,20 +19,20 @@ #include "OperateServerDefine.h" -namespace kbd_service +namespace iot_service { class COptCommand { public: - COptCommand(kbd_public::SRunAppInfo stRunAppInfo); + COptCommand(iot_public::SRunAppInfo stRunAppInfo); virtual ~COptCommand(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; //data pkg - kbd_idlfile::SOptSetDataPkg m_stOptDataMsg; //操作数据 - kbd_idlfile::SAppAddAlm m_stAppAddAlarm; //告警消息 + iot_idl::SOptSetDataPkg m_stOptDataMsg; //操作数据 + iot_idl::SAppAddAlm m_stAppAddAlarm; //告警消息 CNetMsgBusExPtr m_ptrNetMsgBus; CAlmApiForAppPtr m_ptrAlmApiForApp; @@ -43,7 +43,7 @@ public: /*发送给DataProcess的控制命令*/ void addOptSetData(const string strTagName, const int nAddStatus, const int nDelStatus,\ - const kbd_idlfile::SVariable &varValue,const bool bSendImme =true); + const iot_idl::SVariable &varValue,const bool bSendImme =true); void sendOptData(const int nPointType,const bool bInit = false,const int nDstDomain=-1) ; @@ -54,7 +54,7 @@ public: int sendSetCtrlToFes(const SOptCtrlInfoAll &stOptCtrlInfo, const SOptCustCtrlRequest &stOptCustCtrlRequest,const string& strSrcTag); int sendRequestToFes(const SOptCtrlInfoAll &stOptCtrlInfo, const string &strSrcTag); //数据请求 - int sendVirCtrlToApp(const SOptCtrlInfoAll &stOptCtrlInfoAll, const kbd_idlfile::SVariable &varValue); + int sendVirCtrlToApp(const SOptCtrlInfoAll &stOptCtrlInfoAll, const iot_idl::SVariable &varValue); /*发送给HMI控制面板的反馈*/ void initUpOptPanel(SOptCtrlReply &stOptCtrlReply, const string strSourceTag,int nAppID,int nDomainID,\ diff --git a/platform/src/service/operate_server/OptControl.cpp b/platform/src/service/operate_server/OptControl.cpp index c071a087..1f31f90b 100644 --- a/platform/src/service/operate_server/OptControl.cpp +++ b/platform/src/service/operate_server/OptControl.cpp @@ -9,10 +9,10 @@ #include "pub_utility_api/I18N.h" #include -using namespace kbd_service; -using namespace kbd_idlfile; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_service; +using namespace iot_idl; +using namespace iot_public; +using namespace iot_dbms; using namespace std; //ture;正在执行； @@ -24,7 +24,7 @@ bool COperateServerClass::checkCtrlExecute(const string &strTagName) //============================================================================================ SOptCtrlInfoAll stOptCtrlInfo; - //vector vecCondInfo; + //vector vecCondInfo; //CRdbPublic::addCondInfo(vecCondInfo,"tag_name",strTagName); //CRdbPublic::addCondInfo(vecCondInfo,"msg_type" ,stOptCtrlInfo.msg_type); //bRetCode = m_ptrRdbTableMng->selectAllColumnMultiCondition(RT_OPT_CTRL_INFO,vecOptCtrlInfo,vecCondInfo); @@ -256,7 +256,7 @@ int COperateServerClass::getCtrlGroupInfo(const string &strCtrlGrpName, const in { int nRetCode = -1 ; vector vecCtrlActAll; - vector vecCondInfo; + vector vecCondInfo; if(nTargetValue < 0) { @@ -1263,7 +1263,7 @@ int COperateServerClass::optCtrlSelect(const string &strJson) } //虚拟控制返回；需要区分是选择还是执行返回； app->operate_server -int COperateServerClass::optVirtCtrlExeReply(const kbd_idlfile::SOptVirtCtrlReply stVirtCtrlReply) +int COperateServerClass::optVirtCtrlExeReply(const iot_idl::SOptVirtCtrlReply stVirtCtrlReply) { string strSourceTag = stVirtCtrlReply.str_source_tag(); string strSourceTagSend = strSourceTag + "#" + m_strSrcTagLocal + ":optVirtCtrlExeReply"; @@ -1412,7 +1412,7 @@ int COperateServerClass::optVirtCtrlExeReply(const kbd_idlfile::SOptVirtCtrlRepl //虚拟控制返回；需要区分是选择还是执行返回； app->operate_server -int COperateServerClass::optVirtCtrlSelReply(const kbd_idlfile::SOptVirtCtrlReply stVirtCtrlReply) +int COperateServerClass::optVirtCtrlSelReply(const iot_idl::SOptVirtCtrlReply stVirtCtrlReply) { string strSourceTag = stVirtCtrlReply.str_source_tag(); string strSourceTagSend = strSourceTag + "#" + m_strSrcTagLocal + ":optVirtCtrlSelReply"; @@ -2357,7 +2357,7 @@ int COperateServerClass::optFesCtrlExecute(const SFesChangeVirtualDataPkg objFes int nOffsetNo = objFesVirCtrlPkg.stdata(0).norder(); strRtuTag = objFesVirCtrlPkg.stdata(0).strrtutag(); - vector vecCondInfo; + vector vecCondInfo; CRdbPublic::addCondInfo(vecCondInfo,"rtu_tag",strRtuTag); if(POINT_TYPE_AO == nPointType ){ //AO 前置控制命令 strCtlTblName = RT_ANA_CTRL_TBL ; diff --git a/platform/src/service/operate_server/OptHandover.cpp b/platform/src/service/operate_server/OptHandover.cpp index 2a8df179..8b8a4f2d 100644 --- a/platform/src/service/operate_server/OptHandover.cpp +++ b/platform/src/service/operate_server/OptHandover.cpp @@ -11,10 +11,10 @@ #include "MessageChannel.h" #include "operate_server_api/JsonOptCommand.h" -using namespace kbd_dbms; -using namespace kbd_service; -using namespace kbd_idlfile; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_service; +using namespace iot_idl; +using namespace iot_public; using namespace std; /** diff --git a/platform/src/service/operate_server/OptMainThread.cpp b/platform/src/service/operate_server/OptMainThread.cpp index abe7a75f..02b935ef 100644 --- a/platform/src/service/operate_server/OptMainThread.cpp +++ b/platform/src/service/operate_server/OptMainThread.cpp @@ -13,14 +13,14 @@ #include "pub_utility_api/TimeUtil.h" #include "sys_node_mng_api/RedundantInfoInterface.h" -using namespace kbd_net; -using namespace kbd_sys; -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_sys; +using namespace iot_public; +using namespace iot_service; +using namespace iot_idl; using namespace std; -COptMainThread::COptMainThread(kbd_public::SRunAppInfo stRunAppInfo): +COptMainThread::COptMainThread(iot_public::SRunAppInfo stRunAppInfo): CTimerThreadBase("OptMainThread",0) { m_stRunAppInfo = stRunAppInfo ; @@ -84,7 +84,7 @@ void COptMainThread::release() } -void COptMainThread::processAppMessage(const kbd_net::CMbMessage &recvMsg) +void COptMainThread::processAppMessage(const iot_net::CMbMessage &recvMsg) { //1.从消息缓存队列读取消息并处理 //=================================================================== @@ -96,7 +96,7 @@ void COptMainThread::processAppMessage(const kbd_net::CMbMessage &recvMsg) case MT_APP2OPT_VIRT_CTRL_DIG_REPLY: case MT_APP2OPT_VIRT_CTRL_MIX_REPLY: { - kbd_idlfile::SOptVirtCtrlReply objAppVirtCtrlReply; + iot_idl::SOptVirtCtrlReply objAppVirtCtrlReply; objAppVirtCtrlReply.ParseFromArray(recvMsg.getDataPtr(),recvMsg.getDataSize()); LOGDEBUG("processAppMessage, APP控制命令返回: tagName = %s, nResult = %d,strError = %s ", objAppVirtCtrlReply.str_tag_name().c_str(),objAppVirtCtrlReply.n_ctrl_result(),objAppVirtCtrlReply.str_err().c_str()); @@ -119,7 +119,7 @@ void COptMainThread::processAppMessage(const kbd_net::CMbMessage &recvMsg) @return 无 @retval */ -void COptMainThread::processFesMessage(const kbd_net::CMbMessage &recvMsg) +void COptMainThread::processFesMessage(const iot_net::CMbMessage &recvMsg) { //1.从消息缓存队列读取消息并处理 //=================================================================== @@ -189,7 +189,7 @@ void COptMainThread::processFesMessage(const kbd_net::CMbMessage &recvMsg) @return 无 @retval */ -void COptMainThread::processHmiMessage(const kbd_net::CMbMessage &recvMsg) +void COptMainThread::processHmiMessage(const iot_net::CMbMessage &recvMsg) { //1.从消息缓存队列读取消息并处理 //=================================================================== diff --git a/platform/src/service/operate_server/OptMainThread.h b/platform/src/service/operate_server/OptMainThread.h index e5bccdb0..5555e8fd 100644 --- a/platform/src/service/operate_server/OptMainThread.h +++ b/platform/src/service/operate_server/OptMainThread.h @@ -13,12 +13,12 @@ #include "OperateServerClass.h" #include -namespace kbd_service +namespace iot_service { -class COptMainThread : public kbd_public::CTimerThreadBase +class COptMainThread : public iot_public::CTimerThreadBase { public: - COptMainThread(kbd_public::SRunAppInfo stRunAppInfo); + COptMainThread(iot_public::SRunAppInfo stRunAppInfo); virtual ~COptMainThread(); private: @@ -27,7 +27,7 @@ private: int64 m_lLastCheckTimeout; int64 m_lLastAutoCtrlTime; int64 m_lLastPlanShieldTimeout; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; COperateServerClassPtr m_ptrOperateServer; CNetMsgBusExPtr m_ptrNetMsgBusEx; @@ -35,15 +35,15 @@ private: /** @brief 处理FES发过来的消息 */ - void processFesMessage(const kbd_net::CMbMessage &recvMsg); + void processFesMessage(const iot_net::CMbMessage &recvMsg); /** @brief 处理HMI发过来的消息 */ - void processHmiMessage(const kbd_net::CMbMessage &recvMsg); + void processHmiMessage(const iot_net::CMbMessage &recvMsg); /** @brief 处理APP发过来的消息 */ - void processAppMessage(const kbd_net::CMbMessage &recvMsg); + void processAppMessage(const iot_net::CMbMessage &recvMsg); public: /** @brief 工作线程初始化 diff --git a/platform/src/service/operate_server/OptPlanShield.cpp b/platform/src/service/operate_server/OptPlanShield.cpp index 16c62c8e..1322dbc1 100644 --- a/platform/src/service/operate_server/OptPlanShield.cpp +++ b/platform/src/service/operate_server/OptPlanShield.cpp @@ -6,10 +6,10 @@ #include "pub_utility_api/TimeUtil.h" using namespace std; -using namespace kbd_service; -using namespace kbd_dbms; -using namespace kbd_public; -COptPlanShield::COptPlanShield(kbd_public::SRunAppInfo stRunAppInfo) +using namespace iot_service; +using namespace iot_dbms; +using namespace iot_public; +COptPlanShield::COptPlanShield(iot_public::SRunAppInfo stRunAppInfo) { m_stRunAppInfo = stRunAppInfo; init(); diff --git a/platform/src/service/operate_server/OptPlanShield.h b/platform/src/service/operate_server/OptPlanShield.h index eb5c347e..7f0801b1 100644 --- a/platform/src/service/operate_server/OptPlanShield.h +++ b/platform/src/service/operate_server/OptPlanShield.h @@ -5,13 +5,13 @@ #include "public/pub_sysinfo_api/SysInfoBase.h" #include "OperateServerStruct.h" -namespace kbd_service +namespace iot_service { class COptPlanShield { public: - explicit COptPlanShield(kbd_public::SRunAppInfo stRunAppInfo); + explicit COptPlanShield(iot_public::SRunAppInfo stRunAppInfo); void getShieldObj(int nShieldID); bool getTimeShieldResult(int nTimeID); void getAllDevShieldStatus(SOptShieldCfgInfo &stShieldPointInfo); @@ -26,8 +26,8 @@ private: private: - kbd_public::SRunAppInfo m_stRunAppInfo; - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_public::SRunAppInfo m_stRunAppInfo; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; SOptShieldCfgInfo m_oldShieldPointInfo; diff --git a/platform/src/service/operate_server/OptShieldSet.cpp b/platform/src/service/operate_server/OptShieldSet.cpp index 8e47b951..4e8272f5 100644 --- a/platform/src/service/operate_server/OptShieldSet.cpp +++ b/platform/src/service/operate_server/OptShieldSet.cpp @@ -8,10 +8,10 @@ #include "pub_logger_api/logger.h" #include "operate_server_api/JsonOptCommand.h" -using namespace kbd_service; -using namespace kbd_dbms; -using namespace kbd_idlfile; -using namespace kbd_public; +using namespace iot_service; +using namespace iot_dbms; +using namespace iot_idl; +using namespace iot_public; using namespace std; //得到屏蔽设备 diff --git a/platform/src/service/operate_server/OptTagSet.cpp b/platform/src/service/operate_server/OptTagSet.cpp index e724aa68..233a2e8c 100644 --- a/platform/src/service/operate_server/OptTagSet.cpp +++ b/platform/src/service/operate_server/OptTagSet.cpp @@ -8,10 +8,10 @@ #include "pub_logger_api/logger.h" #include "operate_server_api/JsonOptCommand.h" -using namespace kbd_service; -using namespace kbd_dbms; -using namespace kbd_idlfile; -using namespace kbd_public; +using namespace iot_service; +using namespace iot_dbms; +using namespace iot_idl; +using namespace iot_public; using namespace std; /** @@ -26,7 +26,7 @@ bool COperateServerClass::checkIsOptTag(int &nIsSet,const string &strKeyIdTag,co //Check 标签是否存在 //======================================================================================== - vector vecCondInfo; + vector vecCondInfo; vector vecOptTagInfo ; CRdbPublic::addCondInfo(vecCondInfo,"key_id_tag",strKeyIdTag); @@ -414,7 +414,7 @@ int COperateServerClass::updateTagInfo(const SOptCtrlInfoAll &stOptTagInfo,const // update rdb // ---------------------------------------------------------------------------------- /* - vector vecCondInfo; + vector vecCondInfo; CRdbPublic::addCondInfo(vecCondInfo,"tag_type", nTagType); CRdbPublic::addCondInfo(vecCondInfo,"key_id_tag",stOptTagInfo.key_id_tag); if(m_ptrRdbTableMng->removeMultiCondition(RT_OPT_TAG_INFO, vecCondInfo) == false) diff --git a/platform/src/service/operate_server/OptToken.cpp b/platform/src/service/operate_server/OptToken.cpp index 1b2ffcb8..e80b6d6d 100644 --- a/platform/src/service/operate_server/OptToken.cpp +++ b/platform/src/service/operate_server/OptToken.cpp @@ -7,10 +7,10 @@ #include "MessageChannel.h" #include "operate_server_api/JsonOptCommand.h" -using namespace kbd_service; -using namespace kbd_dbms; -using namespace kbd_idlfile; -using namespace kbd_public; +using namespace iot_service; +using namespace iot_dbms; +using namespace iot_idl; +using namespace iot_public; using namespace std; //TRUE:挂牌检查通过 FALSE：不通过 @@ -63,7 +63,7 @@ bool COperateServerClass::checkIsOptToken(const int nIsSet,const string &strDevT { //Check 标志牌是否存在 //======================================================================================== - vector vecCondInfo; + vector vecCondInfo; vector vecOptTokenInfo ; CRdbPublic::addCondInfo(vecCondInfo,"device",strDevTag); @@ -262,7 +262,7 @@ int COperateServerClass::updateTokenInfo(const STokenInfoAll &stOptTokenInfo, RT_OPT_TOKEN_INFO, stOptTokenInfo.key_id_tag,stOptTokenInfo.token_id); // -实时库更新 - vector vecCondInfo; + vector vecCondInfo; CRdbPublic::addCondInfo(vecCondInfo,"token_id", stOptTokenInfo.token_id); CRdbPublic::addCondInfo(vecCondInfo,"key_id_tag" ,stOptTokenInfo.key_id_tag); if(m_ptrRdbTableMng->removeMultiCondition(RT_OPT_TOKEN_INFO, vecCondInfo) == false) diff --git a/platform/src/service/operate_server/RedundantSwitch.cpp b/platform/src/service/operate_server/RedundantSwitch.cpp index 3ea134e9..133060de 100644 --- a/platform/src/service/operate_server/RedundantSwitch.cpp +++ b/platform/src/service/operate_server/RedundantSwitch.cpp @@ -5,10 +5,10 @@ */ #include "RedundantSwitch.h" -using namespace kbd_service; -using namespace kbd_sys; +using namespace iot_service; +using namespace iot_sys; -CRedundantSwitch::CRedundantSwitch(kbd_sys::CProcMngInterfacePtr ptrProc) +CRedundantSwitch::CRedundantSwitch(iot_sys::CProcMngInterfacePtr ptrProc) { m_ptrProcManage = ptrProc; m_ptrThreadOptMain = NULL; diff --git a/platform/src/service/operate_server/RedundantSwitch.h b/platform/src/service/operate_server/RedundantSwitch.h index 0aff8464..3233b654 100644 --- a/platform/src/service/operate_server/RedundantSwitch.h +++ b/platform/src/service/operate_server/RedundantSwitch.h @@ -10,17 +10,17 @@ #include "OptMainThread.h" -namespace kbd_service +namespace iot_service { class CRedundantSwitch : - public ::kbd_sys::CRedundantSwitchInterface + public ::iot_sys::CRedundantSwitchInterface { public: - CRedundantSwitch(kbd_sys::CProcMngInterfacePtr ptrProc); + CRedundantSwitch(iot_sys::CProcMngInterfacePtr ptrProc); ~CRedundantSwitch(void); private: COptMainThreadPtr m_ptrThreadOptMain; - kbd_sys::CProcMngInterfacePtr m_ptrProcManage; + iot_sys::CProcMngInterfacePtr m_ptrProcManage; public: /** diff --git a/platform/src/service/perm_mng_api/PermMngApi.cpp b/platform/src/service/perm_mng_api/PermMngApi.cpp index 619e14b3..94d78a0e 100644 --- a/platform/src/service/perm_mng_api/PermMngApi.cpp +++ b/platform/src/service/perm_mng_api/PermMngApi.cpp @@ -7,9 +7,9 @@ #include "perm_mng_api/PermMngApi.h" #include "PermMngImpl.h" -using namespace kbd_service; +using namespace iot_service; -SERVICE_PERM_MNG_API CPermMngApiPtr kbd_service::getPermMngInstance(const std::string &strAppName, bool bUseGlobalUserInfo) +SERVICE_PERM_MNG_API CPermMngApiPtr iot_service::getPermMngInstance(const std::string &strAppName, bool bUseGlobalUserInfo) { CPermMngImplPtr ptrPermMngImpl = boost::make_shared(strAppName, bUseGlobalUserInfo); if (ptrPermMngImpl != NULL) diff --git a/platform/src/service/perm_mng_api/PermMngImpl.cpp b/platform/src/service/perm_mng_api/PermMngImpl.cpp index 3e55e339..0af4983e 100644 --- a/platform/src/service/perm_mng_api/PermMngImpl.cpp +++ b/platform/src/service/perm_mng_api/PermMngImpl.cpp @@ -17,9 +17,9 @@ //< 生物识别消息 #include "BioIdentifyMsg.pb.h" -using namespace kbd_public; -using namespace kbd_dbms; -using namespace kbd_service; +using namespace iot_public; +using namespace iot_dbms; +using namespace iot_service; using namespace std; @@ -43,9 +43,9 @@ CPermMngImpl::~CPermMngImpl() CPermMngImpl::CBioIdentify::~CBioIdentify() { //< 发送取消生物识别的消息，防止服务端等到超时才停止识别 - kbd_net::CMbMessage objMsgReq; + iot_net::CMbMessage objMsgReq; objMsgReq.setSubject(CN_AppId_COMAPP, CH_APP_TO_BIS); - objMsgReq.setMsgType(kbd_idlfile::MT_BIS_CANCEL_ID); + objMsgReq.setMsgType(iot_idl::MT_BIS_CANCEL_ID); objMsgReq.setData("BIS"); m_objMbComm.sendMsgToDomain(objMsgReq, -1); @@ -205,9 +205,9 @@ void CPermMngImpl::startBioIdentify() delete m_pBioIdentify; m_pBioIdentify = new CBioIdentify; - kbd_net::CMbMessage objMsgReq; + iot_net::CMbMessage objMsgReq; objMsgReq.setSubject(CN_AppId_COMAPP, CH_APP_TO_BIS); - objMsgReq.setMsgType(kbd_idlfile::MT_BIS_START_ID_REQ); + objMsgReq.setMsgType(iot_idl::MT_BIS_START_ID_REQ); objMsgReq.setData("BIS"); m_pBioIdentify->m_objMbComm.sendMsgToDomain(objMsgReq, -1); @@ -288,7 +288,7 @@ int CPermMngImpl::getBioIdentifyResult(std::string &strUserName, std::string &st return 0; } - kbd_net::CMbMessage objMsgRcv; + iot_net::CMbMessage objMsgRcv; if (!(m_pBioIdentify->m_objMbComm.recvMsg(objMsgRcv, 0))) { //< 2 ： 识别过程中，暂未收到结果，请稍后再调用本函数，输出参数均无意义 @@ -303,7 +303,7 @@ int CPermMngImpl::getBioIdentifyResult(std::string &strUserName, std::string &st return 2; } - if (kbd_idlfile::MT_BIS_START_ID_REP == objMsgRcv.getMsgType()) + if (iot_idl::MT_BIS_START_ID_REP == objMsgRcv.getMsgType()) { //< Para1 为0表示成功，其他表示失败，暂不定义错误码体系 if (0 == objMsgRcv.getPara1()) @@ -323,12 +323,12 @@ int CPermMngImpl::getBioIdentifyResult(std::string &strUserName, std::string &st } } - if (kbd_idlfile::MT_BIS_ID_RESULT == objMsgRcv.getMsgType()) + if (iot_idl::MT_BIS_ID_RESULT == objMsgRcv.getMsgType()) { //< Para1 为0表示成功，其他表示失败，暂不定义错误码体系 if (0 == objMsgRcv.getPara1()) { - kbd_idlfile::SBisIdResult objResult; + iot_idl::SBisIdResult objResult; if (!objResult.ParseFromArray(objMsgRcv.getDataPtr(), (int)objMsgRcv.getDataSize())) { LOGERROR("getBioIdentifyResult(): SBisIdResult 反序列化失败"); diff --git a/platform/src/service/perm_mng_api/PermMngImpl.h b/platform/src/service/perm_mng_api/PermMngImpl.h index 17fd551c..86c73f06 100644 --- a/platform/src/service/perm_mng_api/PermMngImpl.h +++ b/platform/src/service/perm_mng_api/PermMngImpl.h @@ -18,7 +18,7 @@ #define RDBE_RECORD_GET_FAIL 0 -namespace kbd_service +namespace iot_service { class CPermMngImpl : public CPermMngApi @@ -318,7 +318,7 @@ private: public: int64 m_nStartTime; //< 启动生物识别的时间，开机后时间 - kbd_net::CMbCommunicator m_objMbComm; + iot_net::CMbCommunicator m_objMbComm; std::string m_strUserName; std::string m_strTempPasswd; std::string m_strAcsDevTag; @@ -327,7 +327,7 @@ private: private: CBioIdentify *m_pBioIdentify; //< 生物识别过程中使用 - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; boost::shared_ptr m_spUserInfo; const std::string m_strAppName; diff --git a/platform/src/service/sample_server_api/SampleServerApi.cpp b/platform/src/service/sample_server_api/SampleServerApi.cpp index e13e2cfd..2b072ca2 100644 --- a/platform/src/service/sample_server_api/SampleServerApi.cpp +++ b/platform/src/service/sample_server_api/SampleServerApi.cpp @@ -7,10 +7,10 @@ #include "sample_server_api/SampleServerApi.h" #include "SampleThreadImpl.h" -using namespace kbd_service; -using namespace kbd_public; +using namespace iot_service; +using namespace iot_public; -SERVICE_SAMPLE_SERVER_API CSampleServerApiPtr kbd_service::getSampleInstance(kbd_public::SRunAppInfo stRunAppInfo) +SERVICE_SAMPLE_SERVER_API CSampleServerApiPtr iot_service::getSampleInstance(iot_public::SRunAppInfo stRunAppInfo) { CSampleServerApiPtr ptrSampleServerImpl = boost::make_shared(stRunAppInfo); if (ptrSampleServerImpl != NULL) diff --git a/platform/src/service/sample_server_api/SampleThreadImpl.cpp b/platform/src/service/sample_server_api/SampleThreadImpl.cpp index 73e323a9..28ca19a2 100644 --- a/platform/src/service/sample_server_api/SampleThreadImpl.cpp +++ b/platform/src/service/sample_server_api/SampleThreadImpl.cpp @@ -16,16 +16,16 @@ #include "../data_process/DigStructDefine.h" #include "../data_process/MixStructDefine.h" -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_dbms; -using namespace kbd_idlfile; +using namespace iot_public; +using namespace iot_service; +using namespace iot_dbms; +using namespace iot_idl; using namespace std; #define MAX_SAVE_POINT_NUM 10000 -CSampleThreadImpl::CSampleThreadImpl(kbd_public::SRunAppInfo stRunAppInfo): +CSampleThreadImpl::CSampleThreadImpl(iot_public::SRunAppInfo stRunAppInfo): CTimerThreadBase("CSampleThread",20) { m_stRunAppInfo = stRunAppInfo ; @@ -122,7 +122,7 @@ void CSampleThreadImpl::release() } //调用INFLUEXDB API存盘数据到TSDB 中 -void CSampleThreadImpl::addToTsdbSever(kbd_idlfile::STssInsert &stTsdbData,const string&strTable) +void CSampleThreadImpl::addToTsdbSever(iot_idl::STssInsert &stTsdbData,const string&strTable) { if(stTsdbData.point_size() >0 ) { @@ -139,7 +139,7 @@ void CSampleThreadImpl::addToTsdbSever(kbd_idlfile::STssInsert &stTsdbData,const } //增加一个测点到TSDB队列 -void CSampleThreadImpl::addOneTsdbData(kbd_idlfile::STssInsert& stTsdbData,const string&strTagName,\ +void CSampleThreadImpl::addOneTsdbData(iot_idl::STssInsert& stTsdbData,const string&strTagName,\ const int64 nStatus,const int64 nValue, const int64 nTimeStamp) { STsdbPoint stPoint; @@ -163,7 +163,7 @@ void CSampleThreadImpl::addOneTsdbData(kbd_idlfile::STssInsert& stTsdbData,const } //增加一个测点到TSDB队列 -void CSampleThreadImpl::addOneTsdbData(kbd_idlfile::STssInsert& stTsdbData,const string&strTagName,\ +void CSampleThreadImpl::addOneTsdbData(iot_idl::STssInsert& stTsdbData,const string&strTagName,\ const int64 nStatus,const double fValue, const int64 nTimeStamp) { STsdbPoint stPoint; @@ -381,7 +381,7 @@ void CSampleThreadImpl::saveChgAnaPoint(const int64 nTimeStamp) { //save analog change data //==================================================================================== - kbd_idlfile::STssInsert stAnaTsdbData; + iot_idl::STssInsert stAnaTsdbData; std::vector stAnaChange; stAnaChange.clear(); getAnaChange(stAnaChange); @@ -404,7 +404,7 @@ void CSampleThreadImpl::saveChgDigPoint(const int64 nTimeStamp) { //save digital change data //==================================================================================== - kbd_idlfile::STssInsert stDigTsdbData; + iot_idl::STssInsert stDigTsdbData; std::vector stDigChange; stDigChange.clear(); getDigChange(stDigChange); @@ -426,7 +426,7 @@ void CSampleThreadImpl::saveChgMixPoint(const int64 nTimeStamp) { //save mix change data //==================================================================================== - kbd_idlfile::STssInsert stMixTsdbData; + iot_idl::STssInsert stMixTsdbData; std::vector stMixChange; stMixChange.clear(); getMixChange(stMixChange); @@ -448,7 +448,7 @@ void CSampleThreadImpl::saveChgAccPoint(const int64 nTimeStamp) { //save accuml change data //==================================================================================== - kbd_idlfile::STssInsert stAccTsdbData; + iot_idl::STssInsert stAccTsdbData; std::vector stAccChange; stAccChange.clear(); getAccChange(stAccChange); @@ -478,10 +478,10 @@ void CSampleThreadImpl::saveAllCfgPoint() return; } - kbd_idlfile::STssInsert stAnaTsdbData; - kbd_idlfile::STssInsert stDigTsdbData; - kbd_idlfile::STssInsert stMixTsdbData; - kbd_idlfile::STssInsert stAccTsdbData; + iot_idl::STssInsert stAnaTsdbData; + iot_idl::STssInsert stDigTsdbData; + iot_idl::STssInsert stMixTsdbData; + iot_idl::STssInsert stAccTsdbData; stAnaTsdbData.Clear(); stDigTsdbData.Clear(); diff --git a/platform/src/service/sample_server_api/SampleThreadImpl.h b/platform/src/service/sample_server_api/SampleThreadImpl.h index 283d3db4..40a3a678 100644 --- a/platform/src/service/sample_server_api/SampleThreadImpl.h +++ b/platform/src/service/sample_server_api/SampleThreadImpl.h @@ -19,19 +19,19 @@ #include "rdb_api/RdbTableMng.h" #include "tsdb_save_api/CTsdbSaveApi.h" -namespace kbd_service +namespace iot_service { -class CSampleThreadImpl : public kbd_public::CTimerThreadBase , - public kbd_service::CSampleServerApi +class CSampleThreadImpl : public iot_public::CTimerThreadBase , + public iot_service::CSampleServerApi { public: - CSampleThreadImpl(kbd_public::SRunAppInfo stRunAppInfo); + CSampleThreadImpl(iot_public::SRunAppInfo stRunAppInfo); virtual ~CSampleThreadImpl(); private: int64 m_lCurTime; int64 m_lLastTime; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; public: virtual void execute()override;//业务处理函数，必须继承实现自己的业务逻辑 public: @@ -69,15 +69,15 @@ private: void getDigChange(std::vector&stDigData) ;//处理变化测点 bool saveOneChange(const std::string &strTagName,const double dValue,const int nStatus, - kbd_idlfile::STssInsert &stTsdbData ,const int nType,const int64 uTimeStamp=0) ;//处理变化测点 + iot_idl::STssInsert &stTsdbData ,const int nType,const int64 uTimeStamp=0) ;//处理变化测点 bool saveOneChange(const std::string &strTagName,const int64 nValue,const int nStatus, - kbd_idlfile::STssInsert &stTsdbData, const int nType,const int64 uTimeStamp=0) ;//处理变化测点 + iot_idl::STssInsert &stTsdbData, const int nType,const int64 uTimeStamp=0) ;//处理变化测点 - void addOneTsdbData(kbd_idlfile::STssInsert& stTsdbData,const std::string&strKeyIdTag,\ + void addOneTsdbData(iot_idl::STssInsert& stTsdbData,const std::string&strKeyIdTag,\ const int64 nStatus,const int64 nValue, const int64 uTimeStamp); - void addOneTsdbData(kbd_idlfile::STssInsert& stTsdbData,const std::string&strKeyIdTag,\ + void addOneTsdbData(iot_idl::STssInsert& stTsdbData,const std::string&strKeyIdTag,\ const int64 nStatus,const double fValue, const int64 uTimeStamp); - void addToTsdbSever(kbd_idlfile::STssInsert&stTsdbData,const std::string&strTable=""); //提交数据到 tsdb Server + void addToTsdbSever(iot_idl::STssInsert&stTsdbData,const std::string&strTable=""); //提交数据到 tsdb Server private: boost::mutex m_AnaChgMutex; //< 互斥锁 @@ -90,8 +90,8 @@ private: std::vector m_stMixChange; std::vector m_stDigChange; - kbd_dbms::CTsdbSaveApiPtr m_ptrTsdbSaveApi; - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_dbms::CTsdbSaveApiPtr m_ptrTsdbSaveApi; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; }; typedef boost::shared_ptr CSampleThreadImplPtr; } diff --git a/platform/src/service/sample_server_api/Sdt.cpp b/platform/src/service/sample_server_api/Sdt.cpp index 4a06093e..14cc21d9 100644 --- a/platform/src/service/sample_server_api/Sdt.cpp +++ b/platform/src/service/sample_server_api/Sdt.cpp @@ -4,8 +4,8 @@ #include "pub_utility_api/TimeUtil.h" using namespace std; -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_public; +using namespace iot_service; CSdt::CSdt() { diff --git a/platform/src/service/sample_server_api/Sdt.h b/platform/src/service/sample_server_api/Sdt.h index 06e6668a..277038c8 100644 --- a/platform/src/service/sample_server_api/Sdt.h +++ b/platform/src/service/sample_server_api/Sdt.h @@ -3,7 +3,7 @@ #define MAX_DOUBLE 1.79769e+308 -namespace kbd_service +namespace iot_service { class CSdt { diff --git a/platform/src/service/web_server/include/ServerApi.h b/platform/src/service/web_server/include/ServerApi.h index 195b2a2c..25191b44 100644 --- a/platform/src/service/web_server/include/ServerApi.h +++ b/platform/src/service/web_server/include/ServerApi.h @@ -29,7 +29,7 @@ public: /** * @return 获取进程运行信息 */ - virtual const kbd_public::SRunAppInfo &getRunAppInfo() const = 0; + virtual const iot_public::SRunAppInfo &getRunAppInfo() const = 0; /** * @brief 添加（即产生）告警 @@ -38,7 +38,7 @@ public: * domain_id 和 app_id 无需填写，服务端管理 * @return 成功返回true，否则false */ - virtual bool addAlarm( kbd_idlfile::SAppAddAlm &objAlarm ) = 0; + virtual bool addAlarm( iot_idl::SAppAddAlm &objAlarm ) = 0; }; typedef boost::shared_ptr CServerApiPtr; diff --git a/platform/src/service/web_server/include/SessionApi.h b/platform/src/service/web_server/include/SessionApi.h index 2cdf25db..5636d753 100644 --- a/platform/src/service/web_server/include/SessionApi.h +++ b/platform/src/service/web_server/include/SessionApi.h @@ -25,8 +25,8 @@ class CSessionApi public: virtual ~CSessionApi() = default; - virtual kbd_service::CPermMngApiPtr getCurPermApi(const std::string &sessionId) = 0; - virtual kbd_service::CPermMngApiPtr getCurPermApi(const std::shared_ptr< oatpp::web::server::interceptor::RequestInterceptor::IncomingRequest>& request) = 0; + virtual iot_service::CPermMngApiPtr getCurPermApi(const std::string &sessionId) = 0; + virtual iot_service::CPermMngApiPtr getCurPermApi(const std::shared_ptr< oatpp::web::server::interceptor::RequestInterceptor::IncomingRequest>& request) = 0; static bool getSessionId(const std::string & cookieStr,std::string &id); }; diff --git a/platform/src/service/web_server/module_alarm/AlmCntWsLsnr.cpp b/platform/src/service/web_server/module_alarm/AlmCntWsLsnr.cpp index 89d9ba43..15d80d08 100644 --- a/platform/src/service/web_server/module_alarm/AlmCntWsLsnr.cpp +++ b/platform/src/service/web_server/module_alarm/AlmCntWsLsnr.cpp @@ -21,7 +21,7 @@ namespace web_server namespace module_alarm { -CAlmCntWsLsnr::CAlmCntWsLsnr( const kbd_service::CPermMngApiPtr &spPermApi, +CAlmCntWsLsnr::CAlmCntWsLsnr( const iot_service::CPermMngApiPtr &spPermApi, const std::shared_ptr &spSocket ) : m_spHolder( std::make_shared( spPermApi, spSocket )) { @@ -164,7 +164,7 @@ void CAlmCntWsLsnr::sendMessage() handleAllAlm(); } - const int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const int64_t nTimeNow = iot_public::getMonotonicMsec(); if ( m_nLastSendTime + 20000 <= nTimeNow ) {//< 需要发送 m_nLastSendTime = nTimeNow; @@ -337,7 +337,7 @@ void CAlmCntWsInstLsnr::onAfterCreate_NonBlocking( const std::shared_ptrfind( "SessID" ); diff --git a/platform/src/service/web_server/module_alarm/AlmCntWsLsnr.hpp b/platform/src/service/web_server/module_alarm/AlmCntWsLsnr.hpp index 0936dd4c..7af84ae1 100644 --- a/platform/src/service/web_server/module_alarm/AlmCntWsLsnr.hpp +++ b/platform/src/service/web_server/module_alarm/AlmCntWsLsnr.hpp @@ -27,7 +27,7 @@ namespace module_alarm class CAlmCntWsLsnr final : public oatpp::websocket::AsyncWebSocket::Listener { public: - explicit CAlmCntWsLsnr( const kbd_service::CPermMngApiPtr &spPermApi, + explicit CAlmCntWsLsnr( const iot_service::CPermMngApiPtr &spPermApi, const std::shared_ptr &spSocket ); ~CAlmCntWsLsnr() override; @@ -48,7 +48,7 @@ private: class holder { public: - explicit holder( kbd_service::CPermMngApiPtr spPermApi, std::shared_ptr spSocket ) + explicit holder( iot_service::CPermMngApiPtr spPermApi, std::shared_ptr spSocket ) : m_spPermApi( std::move( spPermApi )), m_spSocket( std::move( spSocket )) { //< 获取用户权限 @@ -77,7 +77,7 @@ private: return 0; } - const kbd_service::CPermMngApiPtr m_spPermApi; + const iot_service::CPermMngApiPtr m_spPermApi; const std::shared_ptr m_spSocket; std::atomic m_nVersion{0}; oatpp::async::Lock m_lockWrite; diff --git a/platform/src/service/web_server/module_alarm/AlmWsLsnr.cpp b/platform/src/service/web_server/module_alarm/AlmWsLsnr.cpp index 98a2f41b..c05e4fe5 100644 --- a/platform/src/service/web_server/module_alarm/AlmWsLsnr.cpp +++ b/platform/src/service/web_server/module_alarm/AlmWsLsnr.cpp @@ -24,7 +24,7 @@ namespace web_server namespace module_alarm { -CAlmWsLsnr::CAlmWsLsnr( int nEndPointType, const kbd_service::CPermMngApiPtr &spPermApi, +CAlmWsLsnr::CAlmWsLsnr( int nEndPointType, const iot_service::CPermMngApiPtr &spPermApi, const std::shared_ptr &spSocket ) : m_spHolder( std::make_shared( nEndPointType, spPermApi, spSocket )) { @@ -489,7 +489,7 @@ void CAlmWsLsnr::sendMessage() handleAllAlm(); } - const int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const int64_t nTimeNow = iot_public::getMonotonicMsec(); if ( m_nLastSendTime + 20000 <= nTimeNow ) {//< 需要发送 //< 前端有问题，有一定概率在收到第一帧回复时不显示，所以在此特殊处理一下，连发两帧 @@ -764,7 +764,7 @@ void CAlmWsInstLsnr::onAfterCreate_NonBlocking( const std::shared_ptrfind( "EndPoint" ); diff --git a/platform/src/service/web_server/module_alarm/AlmWsLsnr.hpp b/platform/src/service/web_server/module_alarm/AlmWsLsnr.hpp index 29bcd8cc..22ba96a5 100644 --- a/platform/src/service/web_server/module_alarm/AlmWsLsnr.hpp +++ b/platform/src/service/web_server/module_alarm/AlmWsLsnr.hpp @@ -27,7 +27,7 @@ namespace module_alarm class CAlmWsLsnr final : public oatpp::websocket::AsyncWebSocket::Listener { public: - explicit CAlmWsLsnr( int nEndPointType, const kbd_service::CPermMngApiPtr &spPermApi, + explicit CAlmWsLsnr( int nEndPointType, const iot_service::CPermMngApiPtr &spPermApi, const std::shared_ptr &spSocket ); ~CAlmWsLsnr() override; @@ -48,7 +48,7 @@ private: class holder { public: - explicit holder( int nEndPointType, kbd_service::CPermMngApiPtr spPermApi, + explicit holder( int nEndPointType, iot_service::CPermMngApiPtr spPermApi, std::shared_ptr spSocket ) : m_nEndPointType( nEndPointType ), m_spPermApi( std::move( spPermApi )), m_spSocket( std::move( spSocket )) @@ -137,7 +137,7 @@ private: std::unordered_set m_setUserPermLocationId; //< 用户管理的位置 const int m_nEndPointType; //< 用于区分来自哪个端点：0，告警；1，事件 - const kbd_service::CPermMngApiPtr m_spPermApi; + const iot_service::CPermMngApiPtr m_spPermApi; const std::shared_ptr m_spSocket; std::atomic m_nVersion{0}; oatpp::async::Lock m_lockWrite; diff --git a/platform/src/service/web_server/module_alarm/DataMngThread.cpp b/platform/src/service/web_server/module_alarm/DataMngThread.cpp index 9afc789c..74313251 100644 --- a/platform/src/service/web_server/module_alarm/DataMngThread.cpp +++ b/platform/src/service/web_server/module_alarm/DataMngThread.cpp @@ -171,7 +171,7 @@ bool CDataMngThread::getChgLogAfter( int nInVerNo, std::vector &ve /***********************************************************************************************/ -void CDataMngThread::handleAllAlmMsg( int nDomainID, kbd_idlfile::SAlmCltAddAlm &objAllAlm ) +void CDataMngThread::handleAllAlmMsg( int nDomainID, iot_idl::SAlmCltAddAlm &objAllAlm ) { //< 千万不要判，全同步允许为空 //if ( objAllAlm.alm_info().empty()) @@ -289,23 +289,23 @@ void CDataMngThread::handleAllAlmMsg( int nDomainID, kbd_idlfile::SAlmCltAddAlm //< 处理复归 { bool bIsReturn = false; - const kbd_idlfile::enAlmLogicState enLogicState = spAdded->getLogicState(); + const iot_idl::enAlmLogicState enLogicState = spAdded->getLogicState(); switch ( enLogicState ) { - case kbd_idlfile::ALS_ALARM : - case kbd_idlfile::ALS_ALARM_CFM : - case kbd_idlfile::ALS_ALARM_DEL : - case kbd_idlfile::ALS_ALARM_CFM_DEL : + case iot_idl::ALS_ALARM : + case iot_idl::ALS_ALARM_CFM : + case iot_idl::ALS_ALARM_DEL : + case iot_idl::ALS_ALARM_CFM_DEL : //EN_AS_ALARM; break; - case kbd_idlfile::ALS_RETURN : - case kbd_idlfile::ALS_RETURN_CFM : - case kbd_idlfile::ALS_RETURN_DEL : - case kbd_idlfile::ALS_RETURN_CFM_DEL : + case iot_idl::ALS_RETURN : + case iot_idl::ALS_RETURN_CFM : + case iot_idl::ALS_RETURN_DEL : + case iot_idl::ALS_RETURN_CFM_DEL : //EN_AS_ALARM_RTN; bIsReturn = true; break; - case kbd_idlfile::ALS_EVT_ONLY : + case iot_idl::ALS_EVT_ONLY : //EN_AS_EVENT_ONLY; break; default: @@ -364,7 +364,7 @@ void CDataMngThread::handleAllAlmMsg( int nDomainID, kbd_idlfile::SAlmCltAddAlm } -void CDataMngThread::handleAddAlmMsg( kbd_idlfile::SAlmCltAddAlm &objAddAlm ) +void CDataMngThread::handleAddAlmMsg( iot_idl::SAlmCltAddAlm &objAddAlm ) { if ( objAddAlm.alm_info().empty()) return; @@ -444,23 +444,23 @@ void CDataMngThread::handleAddAlmMsg( kbd_idlfile::SAlmCltAddAlm &objAddAlm ) //< 处理复归 { bool bIsReturn = false; - const kbd_idlfile::enAlmLogicState enLogicState = spAdded->getLogicState(); + const iot_idl::enAlmLogicState enLogicState = spAdded->getLogicState(); switch ( enLogicState ) { - case kbd_idlfile::ALS_ALARM : - case kbd_idlfile::ALS_ALARM_CFM : - case kbd_idlfile::ALS_ALARM_DEL : - case kbd_idlfile::ALS_ALARM_CFM_DEL : + case iot_idl::ALS_ALARM : + case iot_idl::ALS_ALARM_CFM : + case iot_idl::ALS_ALARM_DEL : + case iot_idl::ALS_ALARM_CFM_DEL : //EN_AS_ALARM; break; - case kbd_idlfile::ALS_RETURN : - case kbd_idlfile::ALS_RETURN_CFM : - case kbd_idlfile::ALS_RETURN_DEL : - case kbd_idlfile::ALS_RETURN_CFM_DEL : + case iot_idl::ALS_RETURN : + case iot_idl::ALS_RETURN_CFM : + case iot_idl::ALS_RETURN_DEL : + case iot_idl::ALS_RETURN_CFM_DEL : //EN_AS_ALARM_RTN; bIsReturn = true; break; - case kbd_idlfile::ALS_EVT_ONLY : + case iot_idl::ALS_EVT_ONLY : //EN_AS_EVENT_ONLY; break; default: @@ -492,7 +492,7 @@ void CDataMngThread::handleAddAlmMsg( kbd_idlfile::SAlmCltAddAlm &objAddAlm ) } -void CDataMngThread::handleCfmAlmMsg( kbd_idlfile::SAlmCltCfmAlm &objCfmAlm ) +void CDataMngThread::handleCfmAlmMsg( iot_idl::SAlmCltCfmAlm &objCfmAlm ) { const int nUuidSize = objCfmAlm.uuid_base64_size(); if ( nUuidSize <= 0 ) @@ -527,23 +527,23 @@ void CDataMngThread::handleCfmAlmMsg( kbd_idlfile::SAlmCltCfmAlm &objCfmAlm ) //< 注意，直接修改的内容不能为索引，否则使用replace()、modify() switch ( spPos->getLogicState()) { - case kbd_idlfile::ALS_ALARM: - spPos->setLogicState( kbd_idlfile::ALS_ALARM_CFM ); + case iot_idl::ALS_ALARM: + spPos->setLogicState( iot_idl::ALS_ALARM_CFM ); break; - case kbd_idlfile::ALS_ALARM_DEL: - spPos->setLogicState( kbd_idlfile::ALS_ALARM_CFM_DEL ); + case iot_idl::ALS_ALARM_DEL: + spPos->setLogicState( iot_idl::ALS_ALARM_CFM_DEL ); break; - case kbd_idlfile::ALS_RETURN: - spPos->setLogicState( kbd_idlfile::ALS_RETURN_CFM ); + case iot_idl::ALS_RETURN: + spPos->setLogicState( iot_idl::ALS_RETURN_CFM ); break; - case kbd_idlfile::ALS_RETURN_DEL: - spPos->setLogicState( kbd_idlfile::ALS_RETURN_CFM_DEL ); + case iot_idl::ALS_RETURN_DEL: + spPos->setLogicState( iot_idl::ALS_RETURN_CFM_DEL ); break; - case kbd_idlfile::ALS_ALARM_CFM: - case kbd_idlfile::ALS_RETURN_CFM: - case kbd_idlfile::ALS_EVT_ONLY: - case kbd_idlfile::ALS_ALARM_CFM_DEL: - case kbd_idlfile::ALS_RETURN_CFM_DEL: + case iot_idl::ALS_ALARM_CFM: + case iot_idl::ALS_RETURN_CFM: + case iot_idl::ALS_EVT_ONLY: + case iot_idl::ALS_ALARM_CFM_DEL: + case iot_idl::ALS_RETURN_CFM_DEL: //< 无需处理 bChanged = false; break; @@ -580,7 +580,7 @@ void CDataMngThread::handleCfmAlmMsg( kbd_idlfile::SAlmCltCfmAlm &objCfmAlm ) } -void CDataMngThread::handleDelAlmMsg( kbd_idlfile::SAlmCltDelAlm &objDelAlm ) +void CDataMngThread::handleDelAlmMsg( iot_idl::SAlmCltDelAlm &objDelAlm ) { const int nUuidSize = objDelAlm.uuid_base64_size(); if ( nUuidSize <= 0 ) @@ -608,23 +608,23 @@ void CDataMngThread::handleDelAlmMsg( kbd_idlfile::SAlmCltDelAlm &objDelAlm ) //< 注意，直接修改的内容不能为索引，否则使用replace()、modify() switch ( spPos->getLogicState()) { - case kbd_idlfile::ALS_ALARM: - spPos->setLogicState( kbd_idlfile::ALS_ALARM_DEL ); + case iot_idl::ALS_ALARM: + spPos->setLogicState( iot_idl::ALS_ALARM_DEL ); break; - case kbd_idlfile::ALS_ALARM_CFM: - spPos->setLogicState( kbd_idlfile::ALS_ALARM_CFM_DEL ); + case iot_idl::ALS_ALARM_CFM: + spPos->setLogicState( iot_idl::ALS_ALARM_CFM_DEL ); break; - case kbd_idlfile::ALS_RETURN: - spPos->setLogicState( kbd_idlfile::ALS_RETURN_DEL ); + case iot_idl::ALS_RETURN: + spPos->setLogicState( iot_idl::ALS_RETURN_DEL ); break; - case kbd_idlfile::ALS_RETURN_CFM: - spPos->setLogicState( kbd_idlfile::ALS_RETURN_CFM_DEL ); + case iot_idl::ALS_RETURN_CFM: + spPos->setLogicState( iot_idl::ALS_RETURN_CFM_DEL ); break; - case kbd_idlfile::ALS_EVT_ONLY: - case kbd_idlfile::ALS_ALARM_DEL: - case kbd_idlfile::ALS_ALARM_CFM_DEL: - case kbd_idlfile::ALS_RETURN_DEL: - case kbd_idlfile::ALS_RETURN_CFM_DEL: + case iot_idl::ALS_EVT_ONLY: + case iot_idl::ALS_ALARM_DEL: + case iot_idl::ALS_ALARM_CFM_DEL: + case iot_idl::ALS_RETURN_DEL: + case iot_idl::ALS_RETURN_CFM_DEL: //< 无需处理 bChanged = false; break; @@ -661,7 +661,7 @@ void CDataMngThread::handleDelAlmMsg( kbd_idlfile::SAlmCltDelAlm &objDelAlm ) } -void CDataMngThread::handleReleaseAlmMsg( kbd_idlfile::SAlmCltReleaseAlm &objReleaseAlm ) +void CDataMngThread::handleReleaseAlmMsg( iot_idl::SAlmCltReleaseAlm &objReleaseAlm ) { const int nUuidSize = objReleaseAlm.uuid_base64_size(); if ( nUuidSize <= 0 ) @@ -780,12 +780,12 @@ void CDataMngThread::addChgLog( const CAlmChgLogSp &spAdd ) void CDataMngThread::fillAlmDesc( const CLiveAlmSp &spAlm ) { - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; //< 告警类型 { const int nId = spAlm->getAlmType(); - kbd_dbms::CTableLockGuard tableLock( m_objRtdb_alarm_type_define ); + iot_dbms::CTableLockGuard tableLock( m_objRtdb_alarm_type_define ); const int nRecIndex = m_objRtdb_alarm_type_define.searchRecordByKey( &nId ); if ( nRecIndex < 0 ) @@ -809,7 +809,7 @@ void CDataMngThread::fillAlmDesc( const CLiveAlmSp &spAlm ) objKey.m_nAlmType = spAlm->getAlmType(); objKey.m_nStatus = spAlm->getAlmStatus(); - kbd_dbms::CTableLockGuard tableLock( m_objRtdb_alarm_status_define ); + iot_dbms::CTableLockGuard tableLock( m_objRtdb_alarm_status_define ); const int nRecIndex = m_objRtdb_alarm_status_define.searchRecordByKey( &objKey ); if ( nRecIndex < 0 ) @@ -826,7 +826,7 @@ void CDataMngThread::fillAlmDesc( const CLiveAlmSp &spAlm ) //< 域 { const int nId = spAlm->getDomainId(); - kbd_dbms::CTableLockGuard tableLock( m_objRtdb_sys_model_domain_info ); + iot_dbms::CTableLockGuard tableLock( m_objRtdb_sys_model_domain_info ); const int nRecIndex = m_objRtdb_sys_model_domain_info.searchRecordByKey( &nId ); if ( nRecIndex < 0 ) @@ -843,7 +843,7 @@ void CDataMngThread::fillAlmDesc( const CLiveAlmSp &spAlm ) //< 位置 { const int nId = spAlm->getLocationId(); - kbd_dbms::CTableLockGuard tableLock( m_objRtdb_sys_model_location_info ); + iot_dbms::CTableLockGuard tableLock( m_objRtdb_sys_model_location_info ); const int nRecIndex = m_objRtdb_sys_model_location_info.searchRecordByKey( &nId ); if ( nRecIndex < 0 ) @@ -860,7 +860,7 @@ void CDataMngThread::fillAlmDesc( const CLiveAlmSp &spAlm ) //< 告警等级 { const int nId = spAlm->getPriority(); - kbd_dbms::CTableLockGuard tableLock( m_objRtdb_alarm_level_define ); + iot_dbms::CTableLockGuard tableLock( m_objRtdb_alarm_level_define ); const int nRecIndex = m_objRtdb_alarm_level_define.searchRecordByKey( &nId ); if ( nRecIndex < 0 ) @@ -884,7 +884,7 @@ void CDataMngThread::fillAlmDesc( const CLiveAlmSp &spAlm ) const int nId = spAlm->getSubSystem(); if ( nId > 0 ) //< 专业为可选字段，大于0表示有效 { - kbd_dbms::CTableLockGuard tableLock( m_objRtdb_sys_model_sub_system_info ); + iot_dbms::CTableLockGuard tableLock( m_objRtdb_sys_model_sub_system_info ); const int nRecIndex = m_objRtdb_sys_model_sub_system_info.searchRecordByKey( &nId ); if ( nRecIndex < 0 ) @@ -904,7 +904,7 @@ void CDataMngThread::fillAlmDesc( const CLiveAlmSp &spAlm ) const int nId = spAlm->getDevType(); if ( nId > 0 ) //< 设备类型为可选字段，大于0表示有效 { - kbd_dbms::CTableLockGuard tableLock( m_objRtdb_dev_type_def ); + iot_dbms::CTableLockGuard tableLock( m_objRtdb_dev_type_def ); const int nRecIndex = m_objRtdb_dev_type_def.searchRecordByKey( &nId ); if ( nRecIndex < 0 ) @@ -924,7 +924,7 @@ void CDataMngThread::fillAlmDesc( const CLiveAlmSp &spAlm ) const int nId = spAlm->getRegionId(); if ( nId > 0 ) //< 责任区为可选字段，大于0表示有效 { - kbd_dbms::CTableLockGuard tableLock( m_objRtdb_region_info ); + iot_dbms::CTableLockGuard tableLock( m_objRtdb_region_info ); const int nRecIndex = m_objRtdb_region_info.searchRecordByKey( &nId ); if ( nRecIndex < 0 ) diff --git a/platform/src/service/web_server/module_alarm/DataMngThread.hpp b/platform/src/service/web_server/module_alarm/DataMngThread.hpp index ed3bc3cb..692d7824 100644 --- a/platform/src/service/web_server/module_alarm/DataMngThread.hpp +++ b/platform/src/service/web_server/module_alarm/DataMngThread.hpp @@ -40,7 +40,7 @@ namespace module_alarm { class CDataMngThread; typedef std::shared_ptr CDataMngThreadSp; -class CDataMngThread final : public kbd_service::CAlmApiForAlmClt +class CDataMngThread final : public iot_service::CAlmApiForAlmClt { public: static CDataMngThreadSp getInstance(); @@ -70,17 +70,17 @@ private: //< 单例，不允许外部构造 CDataMngThread(); - void handleAllAlmMsg( int nDomainID, kbd_idlfile::SAlmCltAddAlm &objAllAlm ) override; + void handleAllAlmMsg( int nDomainID, iot_idl::SAlmCltAddAlm &objAllAlm ) override; - void handleAddAlmMsg( kbd_idlfile::SAlmCltAddAlm &objAddAlm ) override; + void handleAddAlmMsg( iot_idl::SAlmCltAddAlm &objAddAlm ) override; - void handleCfmAlmMsg( kbd_idlfile::SAlmCltCfmAlm &objCfmAlm ) override; + void handleCfmAlmMsg( iot_idl::SAlmCltCfmAlm &objCfmAlm ) override; - void handleDelAlmMsg( kbd_idlfile::SAlmCltDelAlm &objDelAlm ) override; + void handleDelAlmMsg( iot_idl::SAlmCltDelAlm &objDelAlm ) override; - void handleReleaseAlmMsg( kbd_idlfile::SAlmCltReleaseAlm &objReleaseAlm ) override; + void handleReleaseAlmMsg( iot_idl::SAlmCltReleaseAlm &objReleaseAlm ) override; - //void handleLinkWave2AlmMsg( kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Alm) override; + //void handleLinkWave2AlmMsg( iot_idl::SAlmCltLinkWave2Alm &objWave2Alm) override; /***********************************************************************************************/ @@ -145,14 +145,14 @@ private: CAlmChgLogContainer m_objAlmChgLogTable; //< 打开表的操作比较耗时，故一张表一个 CRtdbAccess，避免频繁打开表 - kbd_dbms::CRdbAccess m_objRtdb_alarm_type_define; - kbd_dbms::CRdbAccess m_objRtdb_alarm_status_define; - kbd_dbms::CRdbAccess m_objRtdb_sys_model_domain_info; - kbd_dbms::CRdbAccess m_objRtdb_sys_model_location_info; - kbd_dbms::CRdbAccess m_objRtdb_alarm_level_define; - kbd_dbms::CRdbAccess m_objRtdb_sys_model_sub_system_info; - kbd_dbms::CRdbAccess m_objRtdb_dev_type_def; - kbd_dbms::CRdbAccess m_objRtdb_region_info; + iot_dbms::CRdbAccess m_objRtdb_alarm_type_define; + iot_dbms::CRdbAccess m_objRtdb_alarm_status_define; + iot_dbms::CRdbAccess m_objRtdb_sys_model_domain_info; + iot_dbms::CRdbAccess m_objRtdb_sys_model_location_info; + iot_dbms::CRdbAccess m_objRtdb_alarm_level_define; + iot_dbms::CRdbAccess m_objRtdb_sys_model_sub_system_info; + iot_dbms::CRdbAccess m_objRtdb_dev_type_def; + iot_dbms::CRdbAccess m_objRtdb_region_info; }; } //< namespace module_alarm diff --git a/platform/src/service/web_server/module_alarm/DataStruct.hpp b/platform/src/service/web_server/module_alarm/DataStruct.hpp index 285967db..735fe2ec 100644 --- a/platform/src/service/web_server/module_alarm/DataStruct.hpp +++ b/platform/src/service/web_server/module_alarm/DataStruct.hpp @@ -61,7 +61,7 @@ namespace web_server namespace module_alarm { -typedef std::shared_ptr SAlmInfoSp; +typedef std::shared_ptr SAlmInfoSp; //< 子类CLiveAlm会设置friend，不允许子类友元修改的内容放在此基类 class CLiveAlmBase @@ -119,7 +119,7 @@ public: return m_strAlmStatusDesc; } - inline kbd_idlfile::enAlmLogicState getLogicState() const + inline iot_idl::enAlmLogicState getLogicState() const { //< 读锁 boost::shared_lock lock( *m_pMutex ); @@ -266,17 +266,17 @@ public: boost::shared_lock lock( *m_pMutex ); switch ( m_spAlmInfo->logic_state()) { - case kbd_idlfile::ALS_ALARM: - case kbd_idlfile::ALS_ALARM_CFM: - case kbd_idlfile::ALS_RETURN: - case kbd_idlfile::ALS_RETURN_CFM: + case iot_idl::ALS_ALARM: + case iot_idl::ALS_ALARM_CFM: + case iot_idl::ALS_RETURN: + case iot_idl::ALS_RETURN_CFM: return true; //break; - case kbd_idlfile::ALS_EVT_ONLY: - case kbd_idlfile::ALS_ALARM_DEL: - case kbd_idlfile::ALS_ALARM_CFM_DEL: - case kbd_idlfile::ALS_RETURN_DEL: - case kbd_idlfile::ALS_RETURN_CFM_DEL: + case iot_idl::ALS_EVT_ONLY: + case iot_idl::ALS_ALARM_DEL: + case iot_idl::ALS_ALARM_CFM_DEL: + case iot_idl::ALS_RETURN_DEL: + case iot_idl::ALS_RETURN_CFM_DEL: default: break; } @@ -290,17 +290,17 @@ public: boost::shared_lock lock( *m_pMutex ); switch ( m_spAlmInfo->logic_state()) { - case kbd_idlfile::ALS_ALARM_CFM: - case kbd_idlfile::ALS_RETURN_CFM: - case kbd_idlfile::ALS_ALARM_CFM_DEL: - case kbd_idlfile::ALS_RETURN_CFM_DEL: + case iot_idl::ALS_ALARM_CFM: + case iot_idl::ALS_RETURN_CFM: + case iot_idl::ALS_ALARM_CFM_DEL: + case iot_idl::ALS_RETURN_CFM_DEL: return true; //break; - case kbd_idlfile::ALS_ALARM: - case kbd_idlfile::ALS_RETURN: - case kbd_idlfile::ALS_EVT_ONLY: - case kbd_idlfile::ALS_ALARM_DEL: - case kbd_idlfile::ALS_RETURN_DEL: + case iot_idl::ALS_ALARM: + case iot_idl::ALS_RETURN: + case iot_idl::ALS_EVT_ONLY: + case iot_idl::ALS_ALARM_DEL: + case iot_idl::ALS_RETURN_DEL: default: break; } @@ -315,7 +315,7 @@ public: private: friend class CDataMngThread; - inline void setLogicState( kbd_idlfile::enAlmLogicState enState ) + inline void setLogicState( iot_idl::enAlmLogicState enState ) { //< 写锁 boost::unique_lock lock( *m_pMutex ); diff --git a/platform/src/service/web_server/module_alarm/SimpleCtrl.cpp b/platform/src/service/web_server/module_alarm/SimpleCtrl.cpp index 98859eba..43cdb235 100644 --- a/platform/src/service/web_server/module_alarm/SimpleCtrl.cpp +++ b/platform/src/service/web_server/module_alarm/SimpleCtrl.cpp @@ -22,8 +22,8 @@ #include "DTOs.hpp" #include "SimpleCtrl.hpp" -using namespace kbd_dbms; -using namespace kbd_service; +using namespace iot_dbms; +using namespace iot_service; namespace web_server { @@ -41,7 +41,7 @@ static const std::vector g_vecDefaultAlmColor = {"ffff00", "ffBD00" std::shared_ptr CSimpleCtrl::findAlarmcolor() { //< 析构时会自动关闭连接 - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_READ ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_READ ); if ( !objDbConn.open()) { LOGERROR( "findAlarmcolor(): 打开数据库失败" ); @@ -128,7 +128,7 @@ std::shared_ptr CSimpleCtrl::ins return createResponse( Status::CODE_400, "请求json解析失败" ); } - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); if ( !objDbConn.open()) { LOGERROR( "insertColor(): 打开数据库失败" ); @@ -228,7 +228,7 @@ inline int64 getTime( const char *pCharTime ) sscanf( pCharTime, "%04d-%02d-%02d %02d:%02d", &year, &month, &day, &hour, &minute ); // std::cout << pCharTime <<"|||| "< CSimpleCtrl::queryEventMsFromMySql( @@ -371,7 +371,7 @@ std::shared_ptr CSimpleCtrl::que } } - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_READ ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_READ ); if ( !objDbConn.open()) { const char *szMsg = "打开数据库失败"; diff --git a/platform/src/service/web_server/module_general/CtrlGeneral.cpp b/platform/src/service/web_server/module_general/CtrlGeneral.cpp index 87631c4b..dc0f754a 100644 --- a/platform/src/service/web_server/module_general/CtrlGeneral.cpp +++ b/platform/src/service/web_server/module_general/CtrlGeneral.cpp @@ -9,7 +9,7 @@ namespace module_general bool CtrlGeneral::init() { - m_ptrRdbTableMng = boost::make_shared( + m_ptrRdbTableMng = boost::make_shared( getServerApi()->getRunAppInfo().strAppName.c_str()); //RDB管理实例 if ( m_ptrRdbTableMng == NULL ) { @@ -22,10 +22,10 @@ bool CtrlGeneral::init() std::shared_ptr CtrlGeneral::getSystemDateTime() { - kbd_dbms::CRdbNetApi netRdbApi; + iot_dbms::CRdbNetApi netRdbApi; netRdbApi.connect( getServerApi()->getRunAppInfo().nDomainId, 4 ); // 连接电力监控 - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; std::vector vecKey, vecColumn; vecKey.push_back( "safe_day" ); @@ -52,7 +52,7 @@ std::shared_ptr CtrlGeneral::get sysDto->safeDaysMs = {}; sysDto->safeDaysMs->push_back( safeDto ); - kbd_public::LOCALTIME dt = kbd_public::getLocalSystemTime(); + iot_public::LOCALTIME dt = iot_public::getLocalSystemTime(); char str[80] = {0}; // 2021-12-16 17:40:07 sprintf( str, "%04d-%02d-%02d %02d:%02d:%02d", dt.wYear, dt.wMonth, dt.wDay, dt.wHour, dt.wMinute, dt.wSecond ); @@ -88,7 +88,7 @@ CtrlGeneral::isPageAndReportAuthority( const oatpp::Int32 &type, const oatpp::St std::vector vecOneHmiTypeInfo; std::vector vecSelColumn = {"hmi_id", "hmi_name", "hmi_define"}; - kbd_dbms::CRdbTableMngLockGuard lock( *m_ptrRdbTableMng, RT_HMI_TYPE_INFO ); + iot_dbms::CRdbTableMngLockGuard lock( *m_ptrRdbTableMng, RT_HMI_TYPE_INFO ); bool ret = m_ptrRdbTableMng->selectSelColumnOneCondition( RT_HMI_TYPE_INFO, vecSelColumn, vecOneHmiTypeInfo, "hmi_name", strContent ); if ( !ret ) diff --git a/platform/src/service/web_server/module_general/CtrlGeneral.hpp b/platform/src/service/web_server/module_general/CtrlGeneral.hpp index 2e9b6994..da198037 100644 --- a/platform/src/service/web_server/module_general/CtrlGeneral.hpp +++ b/platform/src/service/web_server/module_general/CtrlGeneral.hpp @@ -45,7 +45,7 @@ class CtrlGeneral : public oatpp::web::server::api::ApiController { private: - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; public: diff --git a/platform/src/service/web_server/module_realTimeData/CListener.cpp b/platform/src/service/web_server/module_realTimeData/CListener.cpp index 5b93fe03..0c018491 100644 --- a/platform/src/service/web_server/module_realTimeData/CListener.cpp +++ b/platform/src/service/web_server/module_realTimeData/CListener.cpp @@ -12,7 +12,7 @@ using namespace web_server::module_realTimeData; CListener::CListener() : CTimerThreadBase( "realTimeData", 0 ) { // 创建通讯器 - m_pComm = new kbd_net::CMbCommunicator(); + m_pComm = new iot_net::CMbCommunicator(); // 创建互斥锁 m_pMutex = new QMutex(); @@ -55,11 +55,11 @@ int CListener::beforeExecute() void CListener::execute() { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; //< 最长 500ms * 120 = 1分钟出去一次，避免死锁检测机制动作 for(int i = 0; i < 120 && m_pComm->recvMsg(objMsg,500) ; ++i) { - if ( kbd_idlfile::MT_DP_CHANGE_DATA == objMsg.getMsgType() ) + if ( iot_idl::MT_DP_CHANGE_DATA == objMsg.getMsgType() ) { dealMsgFromNetMsgBus( objMsg ); } @@ -117,10 +117,10 @@ void CListener::onBeforeDestroy(const oatpp::websocket::WebSocket& socket) } } -void CListener::dealMsgFromNetMsgBus( const kbd_net::CMbMessage& objMsg ) +void CListener::dealMsgFromNetMsgBus( const iot_net::CMbMessage& objMsg ) { // 反序列化 - kbd_idlfile::SRealTimeDataPkg objPkg; + iot_idl::SRealTimeDataPkg objPkg; if ( !objPkg.ParseFromArray(objMsg.getDataPtr(),(int)objMsg.getDataSize()) ) { LOGERROR( "解析实时数据包失败" ); diff --git a/platform/src/service/web_server/module_realTimeData/CListener.h b/platform/src/service/web_server/module_realTimeData/CListener.h index 433d554a..fb7c2548 100644 --- a/platform/src/service/web_server/module_realTimeData/CListener.h +++ b/platform/src/service/web_server/module_realTimeData/CListener.h @@ -16,7 +16,7 @@ namespace web_server { namespace module_realTimeData * 多个客户端时，此类的对象只有一个 * 此类的对象在程序启动时创建，程序退出时析构 */ -class CListener : public kbd_public::CTimerThreadBase, public oatpp::websocket::ConnectionHandler::SocketInstanceListener +class CListener : public iot_public::CTimerThreadBase, public oatpp::websocket::ConnectionHandler::SocketInstanceListener { public: CListener(); @@ -45,11 +45,11 @@ public: void clean(); private: - void dealMsgFromNetMsgBus( const kbd_net::CMbMessage& objMsg ); + void dealMsgFromNetMsgBus( const iot_net::CMbMessage& objMsg ); private: QList listSocket; - kbd_net::CMbCommunicator* m_pComm; + iot_net::CMbCommunicator* m_pComm; QMutex* m_pMutex; }; diff --git a/platform/src/service/web_server/module_realTimeData/CModule.cpp b/platform/src/service/web_server/module_realTimeData/CModule.cpp index 2ef78c10..1e0ec649 100644 --- a/platform/src/service/web_server/module_realTimeData/CModule.cpp +++ b/platform/src/service/web_server/module_realTimeData/CModule.cpp @@ -16,7 +16,7 @@ bool CModule::init() //< todo 初始化业务资源，比如自己的线程 // 初始化变化数据订阅发布线程 - if( !kbd_service::CDpcdaForApp::initGlobalThread() ) + if( !iot_service::CDpcdaForApp::initGlobalThread() ) { LOGERROR("初始化变化数据订阅失败"); return false; @@ -44,7 +44,7 @@ bool CModule::clean() m_pController->suspendTimerThread(); m_pController.reset(); - if( !kbd_service::CDpcdaForApp::releaseGlobalThread() ) + if( !iot_service::CDpcdaForApp::releaseGlobalThread() ) { LOGERROR("释放变化数据订阅失败"); } diff --git a/platform/src/service/web_server/module_realTimeData/CSocket.cpp b/platform/src/service/web_server/module_realTimeData/CSocket.cpp index 2b71521a..4078d791 100644 --- a/platform/src/service/web_server/module_realTimeData/CSocket.cpp +++ b/platform/src/service/web_server/module_realTimeData/CSocket.cpp @@ -19,18 +19,18 @@ CSocket::CSocket() m_pSocket = nullptr; // 创建变化数据订阅器 - m_pDpSub = new kbd_service::CDpcdaForApp(); + m_pDpSub = new iot_service::CDpcdaForApp(); // 创建系统信息访问对象 - kbd_public::CSysInfoInterfacePtr pSysInfo; - if ( kbd_public::createSysInfoInstance(pSysInfo) == false || pSysInfo == NULL ) + iot_public::CSysInfoInterfacePtr pSysInfo; + if ( iot_public::createSysInfoInstance(pSysInfo) == false || pSysInfo == NULL ) { LOGERROR( "初始化CSysInfoInterface失败" ); return; } // 获取location信息 - std::vector vecLocationInfo; + std::vector vecLocationInfo; if ( kbdSuccess != pSysInfo->getAllLocationInfo(vecLocationInfo) ) { LOGERROR( "getAllLocationInfo失败" ); @@ -42,7 +42,7 @@ CSocket::CSocket() } // 获取subsystem信息 - std::vector vecSubsystemInfo; + std::vector vecSubsystemInfo; if ( kbdSuccess != pSysInfo->getAllSubsystemInfo(vecSubsystemInfo) ) { LOGERROR( "getAllSubsystemInfo失败" ); @@ -193,7 +193,7 @@ void CSocket::sendResponseMes( const int& nFlag, const oatpp::String& sMes ) } } -void CSocket::dealMsgFromNetMsgBus( const kbd_idlfile::SRealTimeDataPkg& objPkg ) +void CSocket::dealMsgFromNetMsgBus( const iot_idl::SRealTimeDataPkg& objPkg ) { if ( m_pSocket == nullptr ) return; @@ -208,7 +208,7 @@ void CSocket::dealMsgFromNetMsgBus( const kbd_idlfile::SRealTimeDataPkg& objPkg for ( int i=0; i m_listSubscribe; // 当前websocket订阅的所有测点 const WebSocket* m_pSocket; // websocket QMap m_mapLocation; // locationId -> locationName diff --git a/platform/src/service/web_server/module_trend/CController.cpp b/platform/src/service/web_server/module_trend/CController.cpp index 612e02e7..6ea3e94e 100644 --- a/platform/src/service/web_server/module_trend/CController.cpp +++ b/platform/src/service/web_server/module_trend/CController.cpp @@ -11,7 +11,7 @@ #include "CController.h" #include "../include/SessionApi.h" -using namespace kbd_dbms; +using namespace iot_dbms; using namespace web_server::module_trend; std::shared_ptr @@ -216,7 +216,7 @@ void CController::findStationLocationMS_impl( oatpp::data::mapping::type::DTOWra } // 根据locationId获取location信息 -bool CController::getLocationInfoByLocationId( kbd_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, QString sLocationId ) +bool CController::getLocationInfoByLocationId( iot_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, QString sLocationId ) { if ( sLocationId.isEmpty()) return true; @@ -239,7 +239,7 @@ bool CController::getLocationInfoByLocationId( kbd_dbms::CDbApi& objDb, oatpp::d } // 根据locationId获取deviceGroup信息 -bool CController::getDeviceGroupInfoByLocationId( kbd_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, +bool CController::getDeviceGroupInfoByLocationId( iot_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, QString sLocationId, QString& sDeviceGroupTagName ) { sDeviceGroupTagName = "";// 设备组id集合 @@ -267,7 +267,7 @@ bool CController::getDeviceGroupInfoByLocationId( kbd_dbms::CDbApi& objDb, oatpp } // 根据locationId获取device信息 -bool CController::getDeviceInfoByLocationId( kbd_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, +bool CController::getDeviceInfoByLocationId( iot_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, QString sLocationId, QString& sDeviceTagName ) { sDeviceTagName = "";// 设备组id集合 @@ -295,7 +295,7 @@ bool CController::getDeviceInfoByLocationId( kbd_dbms::CDbApi& objDb, oatpp::dat } // 根据deviceGroup信息获取device信息 -bool CController::getDeviceInfoByDeviceGroupTagName( kbd_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, +bool CController::getDeviceInfoByDeviceGroupTagName( iot_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, QString sDeviceGroupTagName, QString& sDeviceTagName ) { sDeviceTagName = ""; @@ -323,7 +323,7 @@ bool CController::getDeviceInfoByDeviceGroupTagName( kbd_dbms::CDbApi& objDb, oa } // 根据device信息获取测点信息 YM -bool CController::getYMInfoByDeviceTagName( kbd_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, +bool CController::getYMInfoByDeviceTagName( iot_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, QString sDeviceTagName ) { if ( sDeviceTagName.isEmpty()) @@ -361,7 +361,7 @@ bool CController::getYMInfoByDeviceTagName( kbd_dbms::CDbApi& objDb, oatpp::data } // 根据device信息获取测点信息 YC -bool CController::getYCInfoByDeviceTagName( kbd_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, +bool CController::getYCInfoByDeviceTagName( iot_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, QString sDeviceTagName ) { if ( sDeviceTagName.isEmpty()) @@ -488,7 +488,7 @@ void CController::queryTrendDataFromInfuxdb_impl( oatpp::data::mapping::type::DT QDateTime dtEnd = QDateTime::fromString(sEndTime+" 23:59:59","yyyy-MM-dd hh:mm:ss"); // 获取tsdb连接 - CTsdbConnPtr pTsdbConn = kbd_dbms::getOneUseableConn(true); + CTsdbConnPtr pTsdbConn = iot_dbms::getOneUseableConn(true); if ( !pTsdbConn ) { LOGERROR("getOneUseableConn() return NULL !"); @@ -617,7 +617,7 @@ void CController::queryBeforeHistoryByParams_impl( oatpp::data::mapping::type::D qint64 dtStart = dtEnd - nInterval * 60 * 1000; // 获取tsdb连接 - CTsdbConnPtr pTsdbConn = kbd_dbms::getOneUseableConn(true); + CTsdbConnPtr pTsdbConn = iot_dbms::getOneUseableConn(true); if ( !pTsdbConn ) { LOGERROR("getOneUseableConn() return NULL !"); diff --git a/platform/src/service/web_server/module_trend/CController.h b/platform/src/service/web_server/module_trend/CController.h index 17b20e66..1d669525 100644 --- a/platform/src/service/web_server/module_trend/CController.h +++ b/platform/src/service/web_server/module_trend/CController.h @@ -70,16 +70,16 @@ private: oatpp::Int32 interval, oatpp::String yc, oatpp::String ym, oatpp::String yx, oatpp::String mix ); - bool getLocationInfoByLocationId( kbd_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, QString sLocationId ); - bool getDeviceGroupInfoByLocationId( kbd_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, + bool getLocationInfoByLocationId( iot_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, QString sLocationId ); + bool getDeviceGroupInfoByLocationId( iot_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, QString sLocationId, QString& sDeviceGroupTagName ); - bool getDeviceInfoByLocationId( kbd_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, + bool getDeviceInfoByLocationId( iot_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, QString sLocationId, QString& sDeviceTagName ); - bool getDeviceInfoByDeviceGroupTagName( kbd_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, + bool getDeviceInfoByDeviceGroupTagName( iot_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, QString sDeviceGroupTagName, QString& sDeviceTagName ); - bool getYMInfoByDeviceTagName( kbd_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, + bool getYMInfoByDeviceTagName( iot_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, QString sDeviceTagName ); - bool getYCInfoByDeviceTagName( kbd_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, + bool getYCInfoByDeviceTagName( iot_dbms::CDbApi& objDb, oatpp::data::mapping::type::DTOWrapper pMapData, QString sDeviceTagName ); /** diff --git a/platform/src/service/web_server/module_user/CtrlUser.cpp b/platform/src/service/web_server/module_user/CtrlUser.cpp index dd9cae19..212ecb18 100644 --- a/platform/src/service/web_server/module_user/CtrlUser.cpp +++ b/platform/src/service/web_server/module_user/CtrlUser.cpp @@ -159,7 +159,7 @@ std::shared_ptr CtrlUser::delete return createResponse( Status::CODE_200, "{\"reflag\":\"fail\",\"reflagInfo\":\"查询失败\"}" ); } - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); if ( !objDbConn.open()) { LOGERROR( "deleteById(): 打开数据库失败" ); @@ -202,7 +202,7 @@ std::shared_ptr CtrlUser::operat std::vector vecGroupId; boost::split(vecGroupId,groupIdList,boost::is_any_of(";")); - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); if ( !objDbConn.open()) { LOGERROR( "打开数据库失败" ); @@ -366,7 +366,7 @@ std::shared_ptr CtrlUser::operat sql += QString( " where perm_id = %1" ).arg(nPermId); - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); if ( !objDbConn.open()) { LOGERROR( " 打开数据库失败" ); @@ -484,7 +484,7 @@ bool CtrlUser::fillUserDtos(oatpp::Object &selectUsers, int page bool CtrlUser::init() { - m_ptrRdbTableMng = boost::make_shared(CN_AppName_BASE.c_str()); //RDB管理实例 + m_ptrRdbTableMng = boost::make_shared(CN_AppName_BASE.c_str()); //RDB管理实例 if (m_ptrRdbTableMng == NULL) { LOGERROR(" make_shared fail!\n"); diff --git a/platform/src/service/web_server/module_user/CtrlUser.hpp b/platform/src/service/web_server/module_user/CtrlUser.hpp index 2ea444e0..5d4097eb 100644 --- a/platform/src/service/web_server/module_user/CtrlUser.hpp +++ b/platform/src/service/web_server/module_user/CtrlUser.hpp @@ -34,7 +34,7 @@ class CtrlUser : public oatpp::web::server::api::ApiController private: inline unsigned char from_hex (unsigned char ch); const std::string urldecode (const std::string& str); - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; bool fillUserDtos(oatpp::Object &loginSucc,int page,int pageSize); public: diff --git a/platform/src/service/web_server/server/GlobalMng.cpp b/platform/src/service/web_server/server/GlobalMng.cpp index c2b2d883..36ec50ab 100644 --- a/platform/src/service/web_server/server/GlobalMng.cpp +++ b/platform/src/service/web_server/server/GlobalMng.cpp @@ -66,8 +66,8 @@ CGlobalMng::~CGlobalMng() bool CGlobalMng::init( const std::string &strAppName ) { - kbd_public::CSysInfoInterfacePtr ptrSysInfo; - if ( kbd_public::createSysInfoInstance( ptrSysInfo ) == false ) + iot_public::CSysInfoInterfacePtr ptrSysInfo; + if ( iot_public::createSysInfoInstance( ptrSysInfo ) == false ) { LOGFATAL( "createSysInfoInstance() return false !" ); return false; @@ -81,7 +81,7 @@ bool CGlobalMng::init( const std::string &strAppName ) } //< 告警服务接口 - m_ptrAlmApi = boost::make_shared( m_stRunAppInfo.nDomainId, m_stRunAppInfo.nAppId ); + m_ptrAlmApi = boost::make_shared( m_stRunAppInfo.nDomainId, m_stRunAppInfo.nAppId ); if ( !m_ptrAlmApi->resumeThread()) { LOGFATAL( "告警服务接口初始化失败！" ); @@ -207,7 +207,7 @@ bool CGlobalMng::redundantSwitch( bool bMaster, bool bSlave ) return bRc; } -bool CGlobalMng::addAlarm( kbd_idlfile::SAppAddAlm &objAlarm ) +bool CGlobalMng::addAlarm( iot_idl::SAppAddAlm &objAlarm ) { if ( nullptr == m_ptrAlmApi ) { diff --git a/platform/src/service/web_server/server/GlobalMng.h b/platform/src/service/web_server/server/GlobalMng.h index 4af083d6..205b6839 100644 --- a/platform/src/service/web_server/server/GlobalMng.h +++ b/platform/src/service/web_server/server/GlobalMng.h @@ -41,13 +41,13 @@ public: bool redundantSwitch( bool bMaster, bool bSlave ); //< 获取进程运行信息 - const kbd_public::SRunAppInfo &getRunAppInfo() const override + const iot_public::SRunAppInfo &getRunAppInfo() const override { return m_stRunAppInfo; } //< 添加（即产生）告警 - bool addAlarm( kbd_idlfile::SAppAddAlm &objAlarm ) override; + bool addAlarm( iot_idl::SAppAddAlm &objAlarm ) override; private: CGlobalMng() = default; @@ -59,13 +59,13 @@ private: CAsyncSrvThreadPtr m_ptrAsyncSrvThread; //< 告警服务接口 - kbd_service::CAlmApiForAppPtr m_ptrAlmApi; + iot_service::CAlmApiForAppPtr m_ptrAlmApi; //< 模块 std::vector m_vecModules; //< 运行参数 - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; friend CGlobalMngPtr getGlobalMngInstance(); }; diff --git a/platform/src/service/web_server/server/WebServer.cpp b/platform/src/service/web_server/server/WebServer.cpp index a7c59245..3dfc12e1 100644 --- a/platform/src/service/web_server/server/WebServer.cpp +++ b/platform/src/service/web_server/server/WebServer.cpp @@ -33,7 +33,7 @@ bool controlJavaProc( bool bStart ) { QString strCmd; - strCmd = kbd_public::CFileUtil::getCurModuleDir().c_str(); + strCmd = iot_public::CFileUtil::getCurModuleDir().c_str(); if ( strCmd.isEmpty()) { LOGERROR( "获取程序所在路径失败" ); @@ -71,7 +71,7 @@ bool controlJavaProc( bool bStart ) CWebServer::~CWebServer() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } @@ -92,7 +92,7 @@ bool CWebServer::start( int argc, char *argv[], int & /*nStatus*/) } //< 启动日志 - kbd_public::StartLogSystem( strAppName.c_str(), WEB_SERVER_PROC_NAME ); + iot_public::StartLogSystem( strAppName.c_str(), WEB_SERVER_PROC_NAME ); //< 判断是否已启动 if ( isAlreadyRunning()) @@ -102,14 +102,14 @@ bool CWebServer::start( int argc, char *argv[], int & /*nStatus*/) } //< 消息总线 - if ( !kbd_net::initMsgBus( WEB_SERVER_PROC_NAME, "", true )) + if ( !iot_net::initMsgBus( WEB_SERVER_PROC_NAME, "", true )) { LOGFATAL( "消息总线初始化失败，程序启动失败！" ); return false; } //< 时序库接口库 - if ( !kbd_dbms::initTsdbApi()) + if ( !iot_dbms::initTsdbApi()) { LOGFATAL( "初始化时序库接口库失败，程序启动失败！" ); return false; @@ -142,14 +142,14 @@ bool CWebServer::start( int argc, char *argv[], int & /*nStatus*/) strStartArgs += argv[i]; } - kbd_sys::SProcessInfoKey objProcInfo; + iot_sys::SProcessInfoKey objProcInfo; objProcInfo.nAppId = m_ptrGlobalMng->getRunAppInfo().nAppId; objProcInfo.nDomainId = m_ptrGlobalMng->getRunAppInfo().nDomainId; objProcInfo.strNodeName = m_ptrGlobalMng->getRunAppInfo().strLocalNodeName; objProcInfo.strProcName = WEB_SERVER_PROC_NAME; objProcInfo.strProcParam = strStartArgs; - m_ptrProcMng = kbd_sys::getProcMngInstance( objProcInfo ); + m_ptrProcMng = iot_sys::getProcMngInstance( objProcInfo ); if ( !m_ptrProcMng ) { LOGFATAL( "getProcMngInstance return NULL" ); @@ -161,7 +161,7 @@ bool CWebServer::start( int argc, char *argv[], int & /*nStatus*/) //< 冗余管理 { - m_ptrRedundantMng = kbd_sys::getRedundantMngInstance( m_ptrGlobalMng->getRunAppInfo().nDomainId, + m_ptrRedundantMng = iot_sys::getRedundantMngInstance( m_ptrGlobalMng->getRunAppInfo().nDomainId, m_ptrGlobalMng->getRunAppInfo().nAppId, m_ptrGlobalMng->getRunAppInfo().strLocalNodeName ); if ( !m_ptrRedundantMng ) @@ -271,14 +271,14 @@ bool CWebServer::stop() } //< 释放时序库接口库 - kbd_dbms::releaseTsdbApi(); + iot_dbms::releaseTsdbApi(); //< 停止消息总线 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } @@ -304,7 +304,7 @@ int CWebServer::updateProcInfo( bool bActive, bool bMaster, bool bSlave ) bool CWebServer::isAlreadyRunning() { - return kbd_public::CSingleProcInstance::hasInstanceRunning( WEB_SERVER_PROC_NAME ); + return iot_public::CSingleProcInstance::hasInstanceRunning( WEB_SERVER_PROC_NAME ); } diff --git a/platform/src/service/web_server/server/WebServer.h b/platform/src/service/web_server/server/WebServer.h index 32ae3cc9..2cfb2a80 100644 --- a/platform/src/service/web_server/server/WebServer.h +++ b/platform/src/service/web_server/server/WebServer.h @@ -18,7 +18,7 @@ namespace web_server { -class CWebServer final : public kbd_public::CBaseService, kbd_sys::CProcessQuitInterface +class CWebServer final : public iot_public::CBaseService, iot_sys::CProcessQuitInterface { public: CWebServer() = default; @@ -60,8 +60,8 @@ private: private: CWebSrvRedunSwPtr m_ptrRedunSw; CGlobalMngPtr m_ptrGlobalMng = getGlobalMngInstance(); //< 作为成员在此持有，避免无人持有时被释放 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_sys::CProcMngInterfacePtr m_ptrProcMng; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; }; } //< namespace web_server diff --git a/platform/src/service/web_server/server/WebSrvRedunSw.h b/platform/src/service/web_server/server/WebSrvRedunSw.h index 416fd0fa..f53326db 100644 --- a/platform/src/service/web_server/server/WebSrvRedunSw.h +++ b/platform/src/service/web_server/server/WebSrvRedunSw.h @@ -16,7 +16,7 @@ namespace web_server class CWebServer; -class CWebSrvRedunSw final : public ::kbd_sys::CRedundantSwitchInterface +class CWebSrvRedunSw final : public ::iot_sys::CRedundantSwitchInterface { public: explicit CWebSrvRedunSw( CWebServer *pParent ); diff --git a/platform/src/service/web_server/server/auth/AuthInterceptor.cpp b/platform/src/service/web_server/server/auth/AuthInterceptor.cpp index 1d0ed2bc..5de235a1 100644 --- a/platform/src/service/web_server/server/auth/AuthInterceptor.cpp +++ b/platform/src/service/web_server/server/auth/AuthInterceptor.cpp @@ -60,8 +60,8 @@ static void generateUuidBase64(std::string &strOut) //获取地址访问白名单 bool getAddrAlwayAllow(std::string &strAddrAllow) { - kbd_public::CCommonConfigParse objCfgParse; - if(objCfgParse.load(kbd_public::CFileUtil::getPathOfCfgFile("web_server.xml"))==kbdFailed) + iot_public::CCommonConfigParse objCfgParse; + if(objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile("web_server.xml"))==kbdFailed) { LOGDEBUG("AuthInterceptor::getAddrAlawyAllow() web_server.xml load fail .\n"); return false; diff --git a/platform/src/service/web_server/server/auth/AuthRdbUtil.cpp b/platform/src/service/web_server/server/auth/AuthRdbUtil.cpp index 975442d3..1f6d1ae4 100644 --- a/platform/src/service/web_server/server/auth/AuthRdbUtil.cpp +++ b/platform/src/service/web_server/server/auth/AuthRdbUtil.cpp @@ -7,7 +7,7 @@ bool web_server::auth::CAuthRdbUtil::init() { - m_ptrRdbTableMng = boost::make_shared(CN_AppName_BASE.c_str()); //RDB管理实例 + m_ptrRdbTableMng = boost::make_shared(CN_AppName_BASE.c_str()); //RDB管理实例 if (m_ptrRdbTableMng == NULL) { LOGERROR(" make_shared fail!\n"); @@ -229,11 +229,11 @@ bool web_server::auth::CAuthRdbUtil::getLoginSuccDto(const oatpp::String &name, { // 用户组信息 std::vector vecUsergInfo; - std::vector vecCondInfo; + std::vector vecCondInfo; for(auto it = loginSucc->groupList->cbegin();it != loginSucc->groupList->cend();it++) { - kbd_dbms::CRdbPublic::addCondInfo(vecCondInfo,"perm_id",(int)*it,ATTRCOND_EQU,ATTRCOND_OR); + iot_dbms::CRdbPublic::addCondInfo(vecCondInfo,"perm_id",(int)*it,ATTRCOND_EQU,ATTRCOND_OR); } bool ret = m_ptrRdbTableMng->selectAllColumnMultiCondition(RT_RM_USERG_DEF,vecUsergInfo,vecCondInfo); @@ -279,7 +279,7 @@ bool web_server::auth::CAuthRdbUtil::getLoginSuccDto(const oatpp::String &name, std::string web_server::auth::CAuthRdbUtil::getCurrentDateTime() { - kbd_public::LOCALTIME dt = kbd_public::getLocalSystemTime(); + iot_public::LOCALTIME dt = iot_public::getLocalSystemTime(); char str[80] = {0}; diff --git a/platform/src/service/web_server/server/auth/AuthRdbUtil.h b/platform/src/service/web_server/server/auth/AuthRdbUtil.h index f2904ccb..31e2d597 100644 --- a/platform/src/service/web_server/server/auth/AuthRdbUtil.h +++ b/platform/src/service/web_server/server/auth/AuthRdbUtil.h @@ -29,7 +29,7 @@ public: bool getLoginSuccDto(const oatpp::String &name, oatpp::Object &loginSucc); std::string getCurrentDateTime(); private: - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; }; diff --git a/platform/src/service/web_server/server/auth/SesssionApiImpl.cpp b/platform/src/service/web_server/server/auth/SesssionApiImpl.cpp index 40327d8e..3372f7c9 100644 --- a/platform/src/service/web_server/server/auth/SesssionApiImpl.cpp +++ b/platform/src/service/web_server/server/auth/SesssionApiImpl.cpp @@ -73,7 +73,7 @@ void CSesssionApiImpl::execute() doSyncAll(); cnt = 0; } - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; //< 最长 500ms * 120 = 1分钟出去一次，避免死锁检测机制动作 for(int i = 0; i < 120 && m_comm.recvMsg(objMsg,500) ; ++i) @@ -84,7 +84,7 @@ void CSesssionApiImpl::execute() bool CSesssionApiImpl::init() { - m_ptrRdbTableMng = boost::make_shared(CN_AppName_BASE.c_str()); //RDB管理实例 + m_ptrRdbTableMng = boost::make_shared(CN_AppName_BASE.c_str()); //RDB管理实例 if (m_ptrRdbTableMng == NULL) { @@ -109,7 +109,7 @@ void CSesssionApiImpl::release() suspend(); } -kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_ptr< oatpp::web::server::interceptor::RequestInterceptor::IncomingRequest> &request) +iot_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_ptr< oatpp::web::server::interceptor::RequestInterceptor::IncomingRequest> &request) { auto cookie = request->getHeader("Cookie"); if( cookie == nullptr) @@ -128,7 +128,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt } } - kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::string & sessionId) + iot_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::string & sessionId) { boost::shared_lock lock( m_objMapSessionLock ); @@ -136,7 +136,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt if( it == m_mapSessionId2PermMngApi.end() ) { // 缓存中未查找到，从rdb_net查询 - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; std::vector vecKey,vecColumn; vecKey.push_back( sessionId ); @@ -174,26 +174,26 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt // 过期处理 - if( kbd_public::getMonotonicMsec() > sessionUnit.expiredDatetime ) + if( iot_public::getMonotonicMsec() > sessionUnit.expiredDatetime ) { - if( kbd_public::getMonotonicMsec() + ONE_WEEK_MS <= sessionUnit.expiredDatetime) + if( iot_public::getMonotonicMsec() + ONE_WEEK_MS <= sessionUnit.expiredDatetime) { // update rdb_net 鉴权时间 - kbd_idlfile::RdbUpdate rdbupdate; + iot_idl::RdbUpdate rdbupdate; rdbupdate.set_strtablename("web_auth"); rdbupdate.add_msgcondition(); - rdbupdate.mutable_msgcondition(0)->set_enlogic(kbd_idlfile::enumCondAnd); - rdbupdate.mutable_msgcondition(0)->set_enrelation(kbd_idlfile::enumCondEqual); + rdbupdate.mutable_msgcondition(0)->set_enlogic(iot_idl::enumCondAnd); + rdbupdate.mutable_msgcondition(0)->set_enrelation(iot_idl::enumCondEqual); rdbupdate.mutable_msgcondition(0)->set_strcolumnname("id"); - rdbupdate.mutable_msgcondition(0)->mutable_msgvalue()->set_edatatype(kbd_idlfile::CN_DATATYPE_STRING); + rdbupdate.mutable_msgcondition(0)->mutable_msgvalue()->set_edatatype(iot_idl::CN_DATATYPE_STRING); rdbupdate.mutable_msgcondition(0)->mutable_msgvalue()->set_strvalue(sessionId); rdbupdate.add_msgupdatevalue(); rdbupdate.mutable_msgupdatevalue(0)->set_strcolumnname("expired_time"); - rdbupdate.mutable_msgupdatevalue(0)->mutable_msgvalue()->set_edatatype(kbd_idlfile::CN_DATATYPE_INT64); + rdbupdate.mutable_msgupdatevalue(0)->mutable_msgvalue()->set_edatatype(iot_idl::CN_DATATYPE_INT64); rdbupdate.mutable_msgupdatevalue(0)->mutable_msgvalue()->set_lvalue(sessionUnit.expiredDatetime + EXPIRED_DURATION_MS); bool bRet = false; @@ -210,14 +210,14 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt } else { - kbd_idlfile::RdbRemove rdbremove; + iot_idl::RdbRemove rdbremove; rdbremove.set_strtablename("web_auth"); rdbremove.add_msgcondtionarray(); - rdbremove.mutable_msgcondtionarray(0)->set_enlogic(kbd_idlfile::enumCondAnd); - rdbremove.mutable_msgcondtionarray(0)->set_enrelation(kbd_idlfile::enumCondEqual); + rdbremove.mutable_msgcondtionarray(0)->set_enlogic(iot_idl::enumCondAnd); + rdbremove.mutable_msgcondtionarray(0)->set_enrelation(iot_idl::enumCondEqual); rdbremove.mutable_msgcondtionarray(0)->set_strcolumnname("id"); - rdbremove.mutable_msgcondtionarray(0)->mutable_msgvalue()->set_edatatype(kbd_idlfile::CN_DATATYPE_STRING); + rdbremove.mutable_msgcondtionarray(0)->mutable_msgvalue()->set_edatatype(iot_idl::CN_DATATYPE_STRING); rdbremove.mutable_msgcondtionarray(0)->mutable_msgvalue()->set_strvalue(sessionId); bool bRet = false; @@ -232,7 +232,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt auto delAuthRecord = auth::delAuthRecordDto::createShared(); delAuthRecord->session_id = sessionId; - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; const auto && strJson = spMapper->writeToString(delAuthRecord); msg.setData( strJson->c_str(), strJson->size() ); msg.setSubject(m_runAppInfo.nAppId,CH_WEB_AUTH_SRV_TO_OTHER); @@ -256,7 +256,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt bool CSesssionApiImpl::addSession(const std::string &sessionId, const std::string &username, const std::string &password, int groupId, const int64 expiredDuration) { - kbd_service::CPermMngApiPtr pPermMngApi = kbd_service::getPermMngInstance(CN_AppName_BASE,true); + iot_service::CPermMngApiPtr pPermMngApi = iot_service::getPermMngInstance(CN_AppName_BASE,true); if(nullptr == pPermMngApi) { LOGERROR("pPermMngApi is nullptr"); @@ -286,7 +286,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt return true; } - bool CSesssionApiImpl::addSession(const std::string &sessionId, kbd_service::CPermMngApiPtr pPermMngApi, const int64 expiredDuration) + bool CSesssionApiImpl::addSession(const std::string &sessionId, iot_service::CPermMngApiPtr pPermMngApi, const int64 expiredDuration) { if( nullptr == pPermMngApi) { @@ -303,7 +303,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt } // 新增鉴权信息添加到rdb_net中 - kbd_idlfile::RdbInsert rdbInsert; + iot_idl::RdbInsert rdbInsert; rdbInsert.set_strtablename("web_auth"); rdbInsert.add_strcolumnname("id"); @@ -313,16 +313,16 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt rdbInsert.add_msgdata(); rdbInsert.mutable_msgdata(0); rdbInsert.mutable_msgdata(0)->add_msgvaluearray(); - rdbInsert.mutable_msgdata(0)->mutable_msgvaluearray(0)->set_edatatype(kbd_idlfile::CN_DATATYPE_STRING); + rdbInsert.mutable_msgdata(0)->mutable_msgvaluearray(0)->set_edatatype(iot_idl::CN_DATATYPE_STRING); rdbInsert.mutable_msgdata(0)->mutable_msgvaluearray(0)->set_strvalue(sessionId); rdbInsert.mutable_msgdata(0)->add_msgvaluearray(); - rdbInsert.mutable_msgdata(0)->mutable_msgvaluearray(1)->set_edatatype(kbd_idlfile::CN_DATATYPE_INT32); + rdbInsert.mutable_msgdata(0)->mutable_msgvaluearray(1)->set_edatatype(iot_idl::CN_DATATYPE_INT32); rdbInsert.mutable_msgdata(0)->mutable_msgvaluearray(1)->set_nvalue(nUserId); int64 expiredDate = QDateTime::currentMSecsSinceEpoch() + expiredDuration; rdbInsert.mutable_msgdata(0)->add_msgvaluearray(); - rdbInsert.mutable_msgdata(0)->mutable_msgvaluearray(2)->set_edatatype(kbd_idlfile::CN_DATATYPE_INT64); + rdbInsert.mutable_msgdata(0)->mutable_msgvaluearray(2)->set_edatatype(iot_idl::CN_DATATYPE_INT64); rdbInsert.mutable_msgdata(0)->mutable_msgvaluearray(2)->set_lvalue(expiredDate); bool bRc = false; @@ -358,14 +358,14 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt void CSesssionApiImpl::removeSession(const std::string &sessionId) { - kbd_idlfile::RdbRemove rdbremove; + iot_idl::RdbRemove rdbremove; rdbremove.set_strtablename("web_auth"); rdbremove.add_msgcondtionarray(); - rdbremove.mutable_msgcondtionarray(0)->set_enlogic(kbd_idlfile::enumCondAnd); - rdbremove.mutable_msgcondtionarray(0)->set_enrelation(kbd_idlfile::enumCondEqual); + rdbremove.mutable_msgcondtionarray(0)->set_enlogic(iot_idl::enumCondAnd); + rdbremove.mutable_msgcondtionarray(0)->set_enrelation(iot_idl::enumCondEqual); rdbremove.mutable_msgcondtionarray(0)->set_strcolumnname("id"); - rdbremove.mutable_msgcondtionarray(0)->mutable_msgvalue()->set_edatatype(kbd_idlfile::CN_DATATYPE_STRING); + rdbremove.mutable_msgcondtionarray(0)->mutable_msgvalue()->set_edatatype(iot_idl::CN_DATATYPE_STRING); rdbremove.mutable_msgcondtionarray(0)->mutable_msgvalue()->set_strvalue(sessionId); bool bRet = false; @@ -379,7 +379,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt auto delAuthRecord = auth::delAuthRecordDto::createShared(); delAuthRecord->session_id = sessionId; - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; const auto && strJson = spMapper->writeToString(delAuthRecord); msg.setData( strJson->c_str(),strJson->size() ); msg.setSubject(m_runAppInfo.nAppId,CH_WEB_AUTH_SRV_TO_OTHER); @@ -412,7 +412,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt return true; } - kbd_service::CPermMngApiPtr pPermMngApi = getCurPermApi(sessionId); + iot_service::CPermMngApiPtr pPermMngApi = getCurPermApi(sessionId); if( nullptr == pPermMngApi ) { return false; @@ -422,7 +422,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt return true; } - void CSesssionApiImpl::dealMsg(const kbd_net::CMbMessage &objMsg) + void CSesssionApiImpl::dealMsg(const iot_net::CMbMessage &objMsg) { using namespace auth; @@ -456,7 +456,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; std::vector columns; columns.push_back("id"); columns.push_back("perm_id"); @@ -489,7 +489,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt } } - kbd_service::CPermMngApiPtr CSesssionApiImpl::getPermMngApi(int perm_id,const std::string & session_id) + iot_service::CPermMngApiPtr CSesssionApiImpl::getPermMngApi(int perm_id,const std::string & session_id) { @@ -529,7 +529,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt { grpId = j + 1 + i * 32; - kbd_service::CPermMngApiPtr pPermMngApi = kbd_service::getPermMngInstance(CN_AppName_BASE,true); + iot_service::CPermMngApiPtr pPermMngApi = iot_service::getPermMngInstance(CN_AppName_BASE,true); if(nullptr == pPermMngApi) { LOGERROR("pPermMngApi is nullptr"); diff --git a/platform/src/service/web_server/server/auth/SesssionApiImpl.h b/platform/src/service/web_server/server/auth/SesssionApiImpl.h index 4bc00186..d6b68269 100644 --- a/platform/src/service/web_server/server/auth/SesssionApiImpl.h +++ b/platform/src/service/web_server/server/auth/SesssionApiImpl.h @@ -16,10 +16,10 @@ static const int64 ONE_WEEK_MS = int64(7 * 24) * int64(3600 * 1000); typedef struct SessionUnit { - kbd_service::CPermMngApiPtr pPermMngApi; + iot_service::CPermMngApiPtr pPermMngApi; int64 expiredDatetime; - SessionUnit(kbd_service::CPermMngApiPtr pPermMngApi_, int64 expiredDuration) : - pPermMngApi(pPermMngApi_),expiredDatetime(kbd_public::getMonotonicMsec() + expiredDuration) + SessionUnit(iot_service::CPermMngApiPtr pPermMngApi_, int64 expiredDuration) : + pPermMngApi(pPermMngApi_),expiredDatetime(iot_public::getMonotonicMsec() + expiredDuration) { } @@ -32,7 +32,7 @@ namespace web_server class CSesssionApiImpl; typedef boost::shared_ptr CSesssionApiImplPtr; -class CSesssionApiImpl final : public CSessionApi, public kbd_public::CTimerThreadBase +class CSesssionApiImpl final : public CSessionApi, public iot_public::CTimerThreadBase { public: ~CSesssionApiImpl(); @@ -46,34 +46,34 @@ public: //< 释放资源 void release(); - kbd_service::CPermMngApiPtr getCurPermApi(const std::shared_ptr< oatpp::web::server::interceptor::RequestInterceptor::IncomingRequest>& request) override; - kbd_service::CPermMngApiPtr getCurPermApi(const std::string &sessionId) override; + iot_service::CPermMngApiPtr getCurPermApi(const std::shared_ptr< oatpp::web::server::interceptor::RequestInterceptor::IncomingRequest>& request) override; + iot_service::CPermMngApiPtr getCurPermApi(const std::string &sessionId) override; bool addSession(const std::string &sessionId,const std::string &username,const std::string & password,int groupId, const int64 expiredDuration = EXPIRED_DURATION_MS); - bool addSession(const std::string &sessionId,kbd_service::CPermMngApiPtr pPermMngApi,const int64 expiredDuration = EXPIRED_DURATION_MS); + bool addSession(const std::string &sessionId,iot_service::CPermMngApiPtr pPermMngApi,const int64 expiredDuration = EXPIRED_DURATION_MS); void removeSession(const std::string &sessionId); bool isSessionValid(const std::string &sessionId); private: CSesssionApiImpl() // 靠通讯器接收超时时间控制运行周期 - : kbd_public::CTimerThreadBase( "CSesssionApiImpl", 0 ) //TODO 测试结束后改为0 + : iot_public::CTimerThreadBase( "CSesssionApiImpl", 0 ) //TODO 测试结束后改为0 { } friend CSesssionApiImplPtr getSessionApiImplInstance(); - void dealMsg( const kbd_net::CMbMessage& objMsg ); + void dealMsg( const iot_net::CMbMessage& objMsg ); void doSyncAll(); - kbd_service::CPermMngApiPtr getPermMngApi(int perm_id, const std::string &session_id); + iot_service::CPermMngApiPtr getPermMngApi(int perm_id, const std::string &session_id); boost::shared_mutex m_objTableLock; //session boost::shared_mutex m_objMapSessionLock; //session std::map m_mapSessionId2PermMngApi; - kbd_net::CMbCommunicator m_comm; - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; - kbd_public::SRunAppInfo m_runAppInfo; - kbd_dbms::CRdbNetApi m_netWebAuthRdbApi; + iot_net::CMbCommunicator m_comm; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_public::SRunAppInfo m_runAppInfo; + iot_dbms::CRdbNetApi m_netWebAuthRdbApi; }; //< 获取单例 diff --git a/platform/src/service/web_server_bi/include/FileApi.h b/platform/src/service/web_server_bi/include/FileApi.h index cb0f39a6..a874a36e 100644 --- a/platform/src/service/web_server_bi/include/FileApi.h +++ b/platform/src/service/web_server_bi/include/FileApi.h @@ -80,7 +80,7 @@ public: * 示例：b0eg70yxqdczuznmk0tcga.json */ static QString uploadFile( const QString &strGroup, const QString &strOriginalName, - const QByteArray &baContent, kbd_dbms::CDbApi *pDbApi = nullptr,qint64 *nUploadTime = nullptr); + const QByteArray &baContent, iot_dbms::CDbApi *pDbApi = nullptr,qint64 *nUploadTime = nullptr); @@ -94,7 +94,7 @@ public: * @return 成返回true，否则返回false */ static bool updateFileByPath( const QString &strPath, const QString *pOriginalName = nullptr, - const QByteArray *pContent = nullptr, kbd_dbms::CDbApi *pDbApi = nullptr ); + const QByteArray *pContent = nullptr, iot_dbms::CDbApi *pDbApi = nullptr ); /** * 根据URL更新文件 @@ -106,7 +106,7 @@ public: * @return 成返回true，否则返回false */ static inline bool updateFileByUrl( const QString &strUrl, const QString *pOriginalName = nullptr, - const QByteArray *pContent = nullptr, kbd_dbms::CDbApi *pDbApi = nullptr ) + const QByteArray *pContent = nullptr, iot_dbms::CDbApi *pDbApi = nullptr ) { QUrlQuery objUrlQuery( QUrl::fromPercentEncoding( strUrl.split( "?" ).last().toUtf8())); return updateFileByPath( objUrlQuery.queryItemValue( "path" ), pOriginalName, pContent, pDbApi ); @@ -120,7 +120,7 @@ public: * @return 成功返回true，否则返回false * 注：文件不存在认为成功，返回true */ - static bool deleteFileByPath( const QString &strPath, kbd_dbms::CDbApi *pDbApi = nullptr ); + static bool deleteFileByPath( const QString &strPath, iot_dbms::CDbApi *pDbApi = nullptr ); /** * 根据path读取文件内容 diff --git a/platform/src/service/web_server_bi/include/ServerApi.h b/platform/src/service/web_server_bi/include/ServerApi.h index 4ed577ce..80e165df 100644 --- a/platform/src/service/web_server_bi/include/ServerApi.h +++ b/platform/src/service/web_server_bi/include/ServerApi.h @@ -35,7 +35,7 @@ public: /** * @return 获取进程运行信息 */ - virtual const kbd_public::SRunAppInfo &getRunAppInfo() const = 0; + virtual const iot_public::SRunAppInfo &getRunAppInfo() const = 0; /** * @brief 添加（即产生）告警 @@ -44,7 +44,7 @@ public: * domain_id 和 app_id 无需填写，服务端管理 * @return 成功返回true，否则false */ - virtual bool addAlarm( kbd_idlfile::SAppAddAlm &objAlarm ) = 0; + virtual bool addAlarm( iot_idl::SAppAddAlm &objAlarm ) = 0; }; typedef boost::shared_ptr CServerApiPtr; diff --git a/platform/src/service/web_server_bi/include/SessionApi.h b/platform/src/service/web_server_bi/include/SessionApi.h index e9d433ec..9f0e413c 100644 --- a/platform/src/service/web_server_bi/include/SessionApi.h +++ b/platform/src/service/web_server_bi/include/SessionApi.h @@ -25,8 +25,8 @@ class CSessionApi public: virtual ~CSessionApi() = default; - virtual kbd_service::CPermMngApiPtr getCurPermApi(const std::string &sessionId) = 0; - virtual kbd_service::CPermMngApiPtr getCurPermApi(const std::shared_ptr< oatpp::web::server::interceptor::RequestInterceptor::IncomingRequest>& request) = 0; + virtual iot_service::CPermMngApiPtr getCurPermApi(const std::string &sessionId) = 0; + virtual iot_service::CPermMngApiPtr getCurPermApi(const std::shared_ptr< oatpp::web::server::interceptor::RequestInterceptor::IncomingRequest>& request) = 0; static bool getSessionId(const std::string & cookieStr,std::string &id); }; diff --git a/platform/src/service/web_server_bi/module_history/CController.cpp b/platform/src/service/web_server_bi/module_history/CController.cpp index 8691737b..32b75519 100644 --- a/platform/src/service/web_server_bi/module_history/CController.cpp +++ b/platform/src/service/web_server_bi/module_history/CController.cpp @@ -9,7 +9,7 @@ #include "../include/ServerApi.h" using namespace web_server_bi::module_history; -using namespace kbd_dbms; +using namespace iot_dbms; using namespace oatpp; std::shared_ptr @@ -80,7 +80,7 @@ CController::getByTime( const Int32& interval, const Int64& startTime, const Int } // 获取tsdb连接 - CTsdbConnPtr pTsdbConn = kbd_dbms::getOneUseableConn(true); + CTsdbConnPtr pTsdbConn = iot_dbms::getOneUseableConn(true); if ( !pTsdbConn ) { pRep->code = 500; diff --git a/platform/src/service/web_server_bi/module_model/CController.cpp b/platform/src/service/web_server_bi/module_model/CController.cpp index e5e05971..e5230cc5 100644 --- a/platform/src/service/web_server_bi/module_model/CController.cpp +++ b/platform/src/service/web_server_bi/module_model/CController.cpp @@ -18,7 +18,7 @@ #define C_SEPARATOR ":" // 分隔符 -using namespace kbd_dbms; +using namespace iot_dbms; using namespace web_server_bi::module_model; using namespace oatpp; diff --git a/platform/src/service/web_server_bi/module_page/Common.cpp b/platform/src/service/web_server_bi/module_page/Common.cpp index 45fb0594..05fe1aa3 100644 --- a/platform/src/service/web_server_bi/module_page/Common.cpp +++ b/platform/src/service/web_server_bi/module_page/Common.cpp @@ -26,7 +26,7 @@ const QString &cn_strIconPathShort = QStringLiteral( "\"^@iconPath@^\":\"" ); const QString cn_strIconPathFull = QString( "\"iconPath\":\"" ) + CFileApi::getUrlPrefix() + "config/1/image/"; -dto::CCommonResp::Wrapper fillDbErrToResp( const kbd_dbms::CDbApi &objDbConn, dto::CCommonResp::Wrapper spResp ) +dto::CCommonResp::Wrapper fillDbErrToResp( const iot_dbms::CDbApi &objDbConn, dto::CCommonResp::Wrapper spResp ) { if ( spResp == nullptr ) spResp = dto::CCommonResp::createShared(); diff --git a/platform/src/service/web_server_bi/module_page/Common.hpp b/platform/src/service/web_server_bi/module_page/Common.hpp index 9fa9b124..7c437d09 100644 --- a/platform/src/service/web_server_bi/module_page/Common.hpp +++ b/platform/src/service/web_server_bi/module_page/Common.hpp @@ -33,7 +33,7 @@ extern const QString cn_strIconPathFull; * @return 填充的回复 */ dto::CCommonResp::Wrapper -fillDbErrToResp( const kbd_dbms::CDbApi &objDbConn, dto::CCommonResp::Wrapper spResp = nullptr ); +fillDbErrToResp( const iot_dbms::CDbApi &objDbConn, dto::CCommonResp::Wrapper spResp = nullptr ); //////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/platform/src/service/web_server_bi/module_page/SimpleCtrlPage.cpp b/platform/src/service/web_server_bi/module_page/SimpleCtrlPage.cpp index d628d694..de2adfe4 100644 --- a/platform/src/service/web_server_bi/module_page/SimpleCtrlPage.cpp +++ b/platform/src/service/web_server_bi/module_page/SimpleCtrlPage.cpp @@ -90,7 +90,7 @@ CSimpleCtrlPage::addPage( const std::shared_ptr &spRequest ) } } - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); if ( !objDbConn.open()) return createDtoResponse( Status::CODE_200, fillDbErrToResp( objDbConn, spResp )); //LOGINFO( "数据库地址=[%s],名称=[%s]", objDbConn.getCurrentDbPara().getHostName().toUtf8().data(), @@ -166,7 +166,7 @@ CSimpleCtrlPage::addPage( const std::shared_ptr &spRequest ) } } - const qint64 nTimeNow = kbd_public::getUTCTimeMsec(); + const qint64 nTimeNow = iot_public::getUTCTimeMsec(); bRc = false; //< 极低概率可能出现主键冲突，试2次 for ( int i = 0; i < 2; ++i ) @@ -269,7 +269,7 @@ CSimpleCtrlPage::bindModel( const std::shared_ptr &spRequest ) } } - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); if ( !objDbConn.open()) return createDtoResponse( Status::CODE_200, fillDbErrToResp( objDbConn, spResp )); //LOGINFO( "数据库地址=[%s],名称=[%s]", objDbConn.getCurrentDbPara().getHostName().toUtf8().data(), @@ -316,7 +316,7 @@ CSimpleCtrlPage::deletePageById( const std::shared_ptr &spReque return createDtoResponse( Status::CODE_200, spResp ); } - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); if ( !objDbConn.open()) return createDtoResponse( Status::CODE_200, fillDbErrToResp( objDbConn, spResp )); //LOGINFO( "数据库地址=[%s],名称=[%s]", objDbConn.getCurrentDbPara().getHostName().toUtf8().data(), @@ -413,7 +413,7 @@ CSimpleCtrlPage::selectList( const std::shared_ptr &spRequest ) nReqPageType = 0; //< 不带参请求，或参数非法，默认为0，即2D画面 } - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_READ ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_READ ); if ( !objDbConn.open()) return createDtoResponse( Status::CODE_200, fillDbErrToResp( objDbConn, spResp )); //LOGINFO( "数据库地址=[%s],名称=[%s]", objDbConn.getCurrentDbPara().getHostName().toUtf8().data(), @@ -655,7 +655,7 @@ CSimpleCtrlPage::selectPageById( const std::shared_ptr &spReque } } - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_READ ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_READ ); if ( !objDbConn.open()) return createDtoResponse( Status::CODE_200, fillDbErrToResp( objDbConn, spResp )); //LOGINFO( "数据库地址=[%s],名称=[%s]", objDbConn.getCurrentDbPara().getHostName().toUtf8().data(), @@ -735,17 +735,17 @@ CSimpleCtrlPage::updateById( const std::shared_ptr &spRequest ) std::tuple CSimpleCtrlPage::updateById ( const QString &strReqPageId, const QString &strReqPageName, const QByteArray &baReqPrimitiveJson, QString strReqIconInfo, const QString &strReqAreaCode, int nReqShowArea, - bool bFromAddPage, kbd_dbms::CDbApi *pDbConn ) + bool bFromAddPage, iot_dbms::CDbApi *pDbConn ) { //< 将iconPath内容缩短，详见常量定义注释 strReqIconInfo.replace( cn_strIconPathFull, cn_strIconPathShort ); auto spResp = dto::CCommonResp::createShared(); - std::shared_ptr spDbconn; //< 使用sp控制生命周期 + std::shared_ptr spDbconn; //< 使用sp控制生命周期 if ( nullptr == pDbConn ) { - spDbconn = std::make_shared( DB_CONN_MODEL_WRITE ); + spDbconn = std::make_shared( DB_CONN_MODEL_WRITE ); pDbConn = spDbconn.get(); if ( !pDbConn->open()) return std::make_tuple( Status::CODE_200, fillDbErrToResp( *pDbConn, spResp )); @@ -899,11 +899,11 @@ std::tuple CSimpleCtrlPage:: //if ( listUpdateCol.size() != listUpdateVal.size()) // const std::string strMsg = I18N( "更新列、值数量不一致，检查程序" ); - kbd_dbms::CDbCondition objCond; + iot_dbms::CDbCondition objCond; objCond.m_sColName = "id"; - objCond.m_eCompare = kbd_dbms::CDbCondition::COMPARE_EQ; + objCond.m_eCompare = iot_dbms::CDbCondition::COMPARE_EQ; objCond.m_value = strReqPageId; - objCond.m_eLogic = kbd_dbms::CDbCondition::LOGIC_AND; + objCond.m_eLogic = iot_dbms::CDbCondition::LOGIC_AND; if ( !pDbConn->update( "web_page", listUpdateCol, listUpdateVal, objCond )) return std::make_tuple( Status::CODE_200, fillDbErrToResp( *pDbConn, spResp )); diff --git a/platform/src/service/web_server_bi/module_page/SimpleCtrlPage.hpp b/platform/src/service/web_server_bi/module_page/SimpleCtrlPage.hpp index b897d39e..8f740b0c 100644 --- a/platform/src/service/web_server_bi/module_page/SimpleCtrlPage.hpp +++ b/platform/src/service/web_server_bi/module_page/SimpleCtrlPage.hpp @@ -66,7 +66,7 @@ private: static std::tuple updateById( const QString &strReqPageId, const QString &strReqPageName, const QByteArray &baReqPrimitiveJson, QString strReqIconInfo, const QString &strReqAreaCode, int nReqShowArea, - bool bFromAddPage, kbd_dbms::CDbApi *pDbConn ); + bool bFromAddPage, iot_dbms::CDbApi *pDbConn ); }; diff --git a/platform/src/service/web_server_bi/module_page/SimpleCtrlPrimitive.cpp b/platform/src/service/web_server_bi/module_page/SimpleCtrlPrimitive.cpp index 87afb05d..0eb9c6a4 100644 --- a/platform/src/service/web_server_bi/module_page/SimpleCtrlPrimitive.cpp +++ b/platform/src/service/web_server_bi/module_page/SimpleCtrlPrimitive.cpp @@ -58,7 +58,7 @@ CSimpleCtrlPrimitive::addPrimitive( const std::shared_ptr &spRe } } - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); if ( !objDbConn.open()) return createDtoResponse( Status::CODE_200, fillDbErrToResp( objDbConn, spResp )); //LOGINFO( "数据库地址=[%s],名称=[%s]", objDbConn.getCurrentDbPara().getHostName().toUtf8().data(), @@ -82,7 +82,7 @@ CSimpleCtrlPrimitive::addPrimitive( const std::shared_ptr &spRe } QByteArray baId; - const qint64 nTimeNow = kbd_public::getUTCTimeMsec(); + const qint64 nTimeNow = iot_public::getUTCTimeMsec(); bRc = false; //< 极低概率可能出现主键冲突，试2次 for ( int i = 0; i < 2; ++i ) @@ -160,7 +160,7 @@ CSimpleCtrlPrimitive::deleteById( const std::shared_ptr &spRequ return createDtoResponse( Status::CODE_200, spResp ); } - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); if ( !objDbConn.open()) return createDtoResponse( Status::CODE_200, fillDbErrToResp( objDbConn, spResp )); //LOGINFO( "数据库地址=[%s],名称=[%s]", objDbConn.getCurrentDbPara().getHostName().toUtf8().data(), @@ -284,7 +284,7 @@ std::tuple CSimpleCtrlP } } - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_READ ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_READ ); if ( !objDbConn.open()) return std::make_tuple( Status::CODE_200, fillDbErrToResp( objDbConn, spResp )); //LOGINFO( "数据库地址=[%s],名称=[%s]", objDbConn.getCurrentDbPara().getHostName().toUtf8().data(), @@ -386,7 +386,7 @@ std::tuple CSimpleCtrlP spRequest->getQueryParameter( "primitiveName" ).getValue( cn_strEmpty ).c_str()); } - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_READ ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_READ ); if ( !objDbConn.open()) return std::make_tuple( Status::CODE_200, fillDbErrToResp( objDbConn, spResp )); //LOGINFO( "数据库地址=[%s],名称=[%s]", objDbConn.getCurrentDbPara().getHostName().toUtf8().data(), @@ -576,7 +576,7 @@ CSimpleCtrlPrimitive::updateById( const std::shared_ptr &spRequ } } - kbd_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); + iot_dbms::CDbApi objDbConn( DB_CONN_MODEL_WRITE ); if ( !objDbConn.open()) return createDtoResponse( Status::CODE_200, fillDbErrToResp( objDbConn, spResp )); //LOGINFO( "数据库地址=[%s],名称=[%s]", objDbConn.getCurrentDbPara().getHostName().toUtf8().data(), @@ -717,11 +717,11 @@ CSimpleCtrlPrimitive::updateById( const std::shared_ptr &spRequ //if ( listUpdateCol.size() != listUpdateVal.size()) // const std::string strMsg = I18N( "更新列、值数量不一致，检查程序" ); - kbd_dbms::CDbCondition objCond; + iot_dbms::CDbCondition objCond; objCond.m_sColName = "id"; - objCond.m_eCompare = kbd_dbms::CDbCondition::COMPARE_EQ; + objCond.m_eCompare = iot_dbms::CDbCondition::COMPARE_EQ; objCond.m_value = strReqId; - objCond.m_eLogic = kbd_dbms::CDbCondition::LOGIC_AND; + objCond.m_eLogic = iot_dbms::CDbCondition::LOGIC_AND; if ( !objDbConn.update( "web_primitive", listUpdateCol, listUpdateVal, objCond )) return createDtoResponse( Status::CODE_200, fillDbErrToResp( objDbConn, spResp )); 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 d7e92220..9cdc8023 100644 --- a/platform/src/service/web_server_bi/module_realTimeData/CListener.cpp +++ b/platform/src/service/web_server_bi/module_realTimeData/CListener.cpp @@ -12,7 +12,7 @@ using namespace web_server_bi::module_realTimeData; CListener::CListener() : CTimerThreadBase( "realTimeData", 0 ) { // 创建通讯器 - m_pComm = new kbd_net::CMbCommunicator(); + m_pComm = new iot_net::CMbCommunicator(); // 创建互斥锁 m_pMutex = new QMutex(); @@ -55,11 +55,11 @@ int CListener::beforeExecute() void CListener::execute() { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; //< 最长 500ms * 120 = 1分钟出去一次，避免死锁检测机制动作 for(int i = 0; i < 120 && m_pComm->recvMsg(objMsg,500) ; ++i) { - if ( kbd_idlfile::MT_DP_CHANGE_DATA == objMsg.getMsgType() ) + if ( iot_idl::MT_DP_CHANGE_DATA == objMsg.getMsgType() ) { dealMsgFromNetMsgBus( objMsg ); } @@ -117,10 +117,10 @@ void CListener::onBeforeDestroy(const oatpp::websocket::WebSocket& socket) } } -void CListener::dealMsgFromNetMsgBus( const kbd_net::CMbMessage& objMsg ) +void CListener::dealMsgFromNetMsgBus( const iot_net::CMbMessage& objMsg ) { // 反序列化 - kbd_idlfile::SRealTimeDataPkg objPkg; + iot_idl::SRealTimeDataPkg objPkg; if ( !objPkg.ParseFromArray(objMsg.getDataPtr(),(int)objMsg.getDataSize()) ) { LOGERROR( "解析实时数据包失败" ); diff --git a/platform/src/service/web_server_bi/module_realTimeData/CListener.h b/platform/src/service/web_server_bi/module_realTimeData/CListener.h index 938d3751..bfcdb1d9 100644 --- a/platform/src/service/web_server_bi/module_realTimeData/CListener.h +++ b/platform/src/service/web_server_bi/module_realTimeData/CListener.h @@ -16,7 +16,7 @@ namespace web_server_bi { namespace module_realTimeData * 多个客户端时，此类的对象只有一个 * 此类的对象在程序启动时创建，程序退出时析构 */ -class CListener : public kbd_public::CTimerThreadBase, public oatpp::websocket::ConnectionHandler::SocketInstanceListener +class CListener : public iot_public::CTimerThreadBase, public oatpp::websocket::ConnectionHandler::SocketInstanceListener { public: CListener(); @@ -45,11 +45,11 @@ public: void clean(); private: - void dealMsgFromNetMsgBus( const kbd_net::CMbMessage& objMsg ); + void dealMsgFromNetMsgBus( const iot_net::CMbMessage& objMsg ); private: QList listSocket; - kbd_net::CMbCommunicator* m_pComm; + iot_net::CMbCommunicator* m_pComm; QMutex* m_pMutex; }; diff --git a/platform/src/service/web_server_bi/module_realTimeData/CModule.cpp b/platform/src/service/web_server_bi/module_realTimeData/CModule.cpp index 43addad0..af26895e 100644 --- a/platform/src/service/web_server_bi/module_realTimeData/CModule.cpp +++ b/platform/src/service/web_server_bi/module_realTimeData/CModule.cpp @@ -16,7 +16,7 @@ bool CModule::init() //< todo 初始化业务资源，比如自己的线程 // 初始化变化数据订阅发布线程 - if( !kbd_service::CDpcdaForApp::initGlobalThread() ) + if( !iot_service::CDpcdaForApp::initGlobalThread() ) { LOGERROR("初始化变化数据订阅失败"); return false; @@ -44,7 +44,7 @@ bool CModule::clean() m_pController->suspendTimerThread(); m_pController.reset(); - if( !kbd_service::CDpcdaForApp::releaseGlobalThread() ) + if( !iot_service::CDpcdaForApp::releaseGlobalThread() ) { LOGERROR("释放变化数据订阅失败"); } 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 be3f27aa..a8bbf533 100644 --- a/platform/src/service/web_server_bi/module_realTimeData/CSocket.cpp +++ b/platform/src/service/web_server_bi/module_realTimeData/CSocket.cpp @@ -19,18 +19,18 @@ CSocket::CSocket() m_pSocket = nullptr; // 创建变化数据订阅器 - m_pDpSub = new kbd_service::CDpcdaForApp(); + m_pDpSub = new iot_service::CDpcdaForApp(); // 创建系统信息访问对象 - kbd_public::CSysInfoInterfacePtr pSysInfo; - if ( kbd_public::createSysInfoInstance(pSysInfo) == false || pSysInfo == NULL ) + iot_public::CSysInfoInterfacePtr pSysInfo; + if ( iot_public::createSysInfoInstance(pSysInfo) == false || pSysInfo == NULL ) { LOGERROR( "初始化CSysInfoInterface失败" ); return; } // 获取location信息 - std::vector vecLocationInfo; + std::vector vecLocationInfo; if ( kbdSuccess != pSysInfo->getAllLocationInfo(vecLocationInfo) ) { LOGERROR( "getAllLocationInfo失败" ); @@ -42,7 +42,7 @@ CSocket::CSocket() } // 获取subsystem信息 - std::vector vecSubsystemInfo; + std::vector vecSubsystemInfo; if ( kbdSuccess != pSysInfo->getAllSubsystemInfo(vecSubsystemInfo) ) { LOGERROR( "getAllSubsystemInfo失败" ); @@ -186,7 +186,7 @@ void CSocket::sendHeartbeat() } } -void CSocket::dealMsgFromNetMsgBus( const kbd_idlfile::SRealTimeDataPkg& objPkg ) +void CSocket::dealMsgFromNetMsgBus( const iot_idl::SRealTimeDataPkg& objPkg ) { if ( m_pSocket == nullptr ) return; @@ -199,7 +199,7 @@ void CSocket::dealMsgFromNetMsgBus( const kbd_idlfile::SRealTimeDataPkg& objPkg int size = objPkg.stairtd_size(); for ( int i=0; i m_listSubscribe; // 当前websocket订阅的所有测点 const WebSocket* m_pSocket; // websocket QMap m_mapLocation; // locationId -> locationName diff --git a/platform/src/service/web_server_bi/server/FileApi.cpp b/platform/src/service/web_server_bi/server/FileApi.cpp index 2e729f23..164cf2bd 100644 --- a/platform/src/service/web_server_bi/server/FileApi.cpp +++ b/platform/src/service/web_server_bi/server/FileApi.cpp @@ -53,7 +53,7 @@ bool CFileApi::isValidId(const std::string& s) QString getWebAbsoluteFilePath(const QString & path,const QString& fileName) { static const QString rootPath = - QString(kbd_public::CFileUtil::getCurModuleDir().c_str()) + "../../data/" WEB_FILE_ROOT_PATH "/"; + QString(iot_public::CFileUtil::getCurModuleDir().c_str()) + "../../data/" WEB_FILE_ROOT_PATH "/"; QString dir = rootPath + path; if( QDir().mkpath(dir) ) { @@ -65,12 +65,12 @@ QString getWebAbsoluteFilePath(const QString & path,const QString& fileName) QString getWebFilePath(const QString &strPath) { static const QString rootPath = - QString(kbd_public::CFileUtil::getCurModuleDir().c_str()) + "../../data/" WEB_FILE_ROOT_PATH "/"; + QString(iot_public::CFileUtil::getCurModuleDir().c_str()) + "../../data/" WEB_FILE_ROOT_PATH "/"; return rootPath + strPath; } QString CFileApi::uploadFile(const QString &strGroup, const QString &strOriginalName, - const QByteArray &baContent, kbd_dbms::CDbApi *pDbApi , qint64 * nUploadTime) + const QByteArray &baContent, iot_dbms::CDbApi *pDbApi , qint64 * nUploadTime) { if( "" == strOriginalName) { @@ -91,8 +91,8 @@ QString CFileApi::uploadFile(const QString &strGroup, const QString &strOriginal } - kbd_dbms::CDbApi * usefulDbApi; - std::shared_ptr ptrDbApi; + iot_dbms::CDbApi * usefulDbApi; + std::shared_ptr ptrDbApi; if( pDbApi != nullptr) { if( !pDbApi->isOpen()) @@ -103,7 +103,7 @@ QString CFileApi::uploadFile(const QString &strGroup, const QString &strOriginal } else { - ptrDbApi = std::make_shared( DB_CONN_MODEL_WRITE ); + ptrDbApi = std::make_shared( DB_CONN_MODEL_WRITE ); usefulDbApi = ptrDbApi.get(); if( !usefulDbApi ) { @@ -185,7 +185,7 @@ QString CFileApi::uploadFile(const QString &strGroup, const QString &strOriginal } bool CFileApi::updateFileByPath( const QString &strPath, const QString *pOriginalName, - const QByteArray *pContent, kbd_dbms::CDbApi *pDbApi ) + const QByteArray *pContent, iot_dbms::CDbApi *pDbApi ) { if( nullptr == pContent && nullptr == pOriginalName ) { @@ -219,8 +219,8 @@ bool CFileApi::updateFileByPath( const QString &strPath, const QString *pOrigina } - kbd_dbms::CDbApi * usefulDbApi; - std::shared_ptr ptrDbApi; + iot_dbms::CDbApi * usefulDbApi; + std::shared_ptr ptrDbApi; if( pDbApi != nullptr) { if( !pDbApi->isOpen()) @@ -231,7 +231,7 @@ bool CFileApi::updateFileByPath( const QString &strPath, const QString *pOrigina } else { - ptrDbApi = std::make_shared( DB_CONN_MODEL_WRITE ); + ptrDbApi = std::make_shared( DB_CONN_MODEL_WRITE ); usefulDbApi = ptrDbApi.get(); if( !usefulDbApi ) { @@ -317,7 +317,7 @@ bool CFileApi::updateFileByPath( const QString &strPath, const QString *pOrigina return true; } -bool CFileApi::deleteFileByPath( const QString &strPath, kbd_dbms::CDbApi *pDbApi ) +bool CFileApi::deleteFileByPath( const QString &strPath, iot_dbms::CDbApi *pDbApi ) { QString strId,strFileName; @@ -353,8 +353,8 @@ bool CFileApi::deleteFileByPath( const QString &strPath, kbd_dbms::CDbApi *pDbAp return false; } - kbd_dbms::CDbApi *usefulDbApi; - std::shared_ptr ptrDbApi; + iot_dbms::CDbApi *usefulDbApi; + std::shared_ptr ptrDbApi; if( pDbApi != nullptr) { if( !pDbApi->isOpen()) @@ -365,7 +365,7 @@ bool CFileApi::deleteFileByPath( const QString &strPath, kbd_dbms::CDbApi *pDbAp } else { - ptrDbApi = std::make_shared( DB_CONN_MODEL_WRITE ); + ptrDbApi = std::make_shared( DB_CONN_MODEL_WRITE ); usefulDbApi = ptrDbApi.get(); if( !usefulDbApi ) { @@ -400,7 +400,7 @@ bool CFileApi::readFileByPath( const QString &strPath, QByteArray &baContent ) return false; } - QString filePathInRes = kbd_public::CFileUtil::getPathOfResFile( "web_server/" + strPath.toStdString() ).c_str(); + QString filePathInRes = iot_public::CFileUtil::getPathOfResFile( "web_server/" + strPath.toStdString() ).c_str(); QString filePath = filePathInRes; if( filePathInRes.isEmpty() ) diff --git a/platform/src/service/web_server_bi/server/GlobalMng.cpp b/platform/src/service/web_server_bi/server/GlobalMng.cpp index 7e55e746..a1e04a4a 100644 --- a/platform/src/service/web_server_bi/server/GlobalMng.cpp +++ b/platform/src/service/web_server_bi/server/GlobalMng.cpp @@ -76,8 +76,8 @@ bool CGlobalMng::init( const std::string &strAppName ) //< 作为全局变量初始化时国际化尚不可用，会变成空，所以只能在初始化时赋值 const_cast(cn_strSuccess) = I18N( "成功" ); - kbd_public::CSysInfoInterfacePtr ptrSysInfo; - if ( kbd_public::createSysInfoInstance( ptrSysInfo ) == false ) + iot_public::CSysInfoInterfacePtr ptrSysInfo; + if ( iot_public::createSysInfoInstance( ptrSysInfo ) == false ) { LOGFATAL( "createSysInfoInstance() return false !" ); return false; @@ -91,7 +91,7 @@ bool CGlobalMng::init( const std::string &strAppName ) } //< 告警服务接口 - m_ptrAlmApi = boost::make_shared( m_stRunAppInfo.nDomainId, m_stRunAppInfo.nAppId ); + m_ptrAlmApi = boost::make_shared( m_stRunAppInfo.nDomainId, m_stRunAppInfo.nAppId ); if ( !m_ptrAlmApi->resumeThread()) { LOGFATAL( "告警服务接口初始化失败！" ); @@ -223,7 +223,7 @@ bool CGlobalMng::redundantSwitch( bool bMaster, bool bSlave ) return bRc; } -bool CGlobalMng::addAlarm( kbd_idlfile::SAppAddAlm &objAlarm ) +bool CGlobalMng::addAlarm( iot_idl::SAppAddAlm &objAlarm ) { if ( nullptr == m_ptrAlmApi ) { diff --git a/platform/src/service/web_server_bi/server/GlobalMng.h b/platform/src/service/web_server_bi/server/GlobalMng.h index 9a9a6fbb..5a777b76 100644 --- a/platform/src/service/web_server_bi/server/GlobalMng.h +++ b/platform/src/service/web_server_bi/server/GlobalMng.h @@ -41,13 +41,13 @@ public: bool redundantSwitch( bool bMaster, bool bSlave ); //< 获取进程运行信息 - const kbd_public::SRunAppInfo &getRunAppInfo() const override + const iot_public::SRunAppInfo &getRunAppInfo() const override { return m_stRunAppInfo; } //< 添加（即产生）告警 - bool addAlarm( kbd_idlfile::SAppAddAlm &objAlarm ) override; + bool addAlarm( iot_idl::SAppAddAlm &objAlarm ) override; private: CGlobalMng() = default; @@ -59,13 +59,13 @@ private: CAsyncSrvThreadPtr m_ptrAsyncSrvThread; //< 告警服务接口 - kbd_service::CAlmApiForAppPtr m_ptrAlmApi; + iot_service::CAlmApiForAppPtr m_ptrAlmApi; //< 模块 std::vector m_vecModules; //< 运行参数 - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; friend CGlobalMngPtr getGlobalMngInstance(); }; diff --git a/platform/src/service/web_server_bi/server/WebServer.cpp b/platform/src/service/web_server_bi/server/WebServer.cpp index 5de7765f..aa385bb5 100644 --- a/platform/src/service/web_server_bi/server/WebServer.cpp +++ b/platform/src/service/web_server_bi/server/WebServer.cpp @@ -26,7 +26,7 @@ namespace web_server_bi CWebServer::~CWebServer() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } @@ -47,7 +47,7 @@ bool CWebServer::start( int argc, char *argv[], int & /*nStatus*/) } //< 启动日志 - kbd_public::StartLogSystem( strAppName.c_str(), WEB_SERVER_PROC_NAME ); + iot_public::StartLogSystem( strAppName.c_str(), WEB_SERVER_PROC_NAME ); //< 判断是否已启动 if ( isAlreadyRunning()) @@ -57,21 +57,21 @@ bool CWebServer::start( int argc, char *argv[], int & /*nStatus*/) } //< 消息总线 - if ( !kbd_net::initMsgBus( WEB_SERVER_PROC_NAME, "", true )) + if ( !iot_net::initMsgBus( WEB_SERVER_PROC_NAME, "", true )) { LOGFATAL( "消息总线初始化失败，程序启动失败！" ); return false; } //< 时序库接口库 - if ( !kbd_dbms::initTsdbApi()) + if ( !iot_dbms::initTsdbApi()) { LOGFATAL( "初始化时序库接口库失败，程序启动失败！" ); return false; } //< 初始化翻译 - if (kbd_public::initI18N("/web_server_bi/translate", "web_server_bi")) + if (iot_public::initI18N("/web_server_bi/translate", "web_server_bi")) { LOGDEBUG(I18N_C("I18N output test：\n This is src hardcode. \n int = [%d] , str = [%s]\n"), 123, "test"); } @@ -107,14 +107,14 @@ bool CWebServer::start( int argc, char *argv[], int & /*nStatus*/) strStartArgs += argv[i]; } - kbd_sys::SProcessInfoKey objProcInfo; + iot_sys::SProcessInfoKey objProcInfo; objProcInfo.nAppId = m_ptrGlobalMng->getRunAppInfo().nAppId; objProcInfo.nDomainId = m_ptrGlobalMng->getRunAppInfo().nDomainId; objProcInfo.strNodeName = m_ptrGlobalMng->getRunAppInfo().strLocalNodeName; objProcInfo.strProcName = WEB_SERVER_PROC_NAME; objProcInfo.strProcParam = strStartArgs; - m_ptrProcMng = kbd_sys::getProcMngInstance( objProcInfo ); + m_ptrProcMng = iot_sys::getProcMngInstance( objProcInfo ); if ( !m_ptrProcMng ) { LOGFATAL( "getProcMngInstance return NULL" ); @@ -126,7 +126,7 @@ bool CWebServer::start( int argc, char *argv[], int & /*nStatus*/) //< 冗余管理 { - m_ptrRedundantMng = kbd_sys::getRedundantMngInstance( m_ptrGlobalMng->getRunAppInfo().nDomainId, + m_ptrRedundantMng = iot_sys::getRedundantMngInstance( m_ptrGlobalMng->getRunAppInfo().nDomainId, m_ptrGlobalMng->getRunAppInfo().nAppId, m_ptrGlobalMng->getRunAppInfo().strLocalNodeName ); if ( !m_ptrRedundantMng ) @@ -228,14 +228,14 @@ bool CWebServer::stop() } //< 释放时序库接口库 - kbd_dbms::releaseTsdbApi(); + iot_dbms::releaseTsdbApi(); //< 停止消息总线 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } @@ -261,7 +261,7 @@ int CWebServer::updateProcInfo( bool bActive, bool bMaster, bool bSlave ) bool CWebServer::isAlreadyRunning() { - return kbd_public::CSingleProcInstance::hasInstanceRunning( WEB_SERVER_PROC_NAME ); + return iot_public::CSingleProcInstance::hasInstanceRunning( WEB_SERVER_PROC_NAME ); } diff --git a/platform/src/service/web_server_bi/server/WebServer.h b/platform/src/service/web_server_bi/server/WebServer.h index 83badd07..c70e8360 100644 --- a/platform/src/service/web_server_bi/server/WebServer.h +++ b/platform/src/service/web_server_bi/server/WebServer.h @@ -18,7 +18,7 @@ namespace web_server_bi { -class CWebServer final : public kbd_public::CBaseService, kbd_sys::CProcessQuitInterface +class CWebServer final : public iot_public::CBaseService, iot_sys::CProcessQuitInterface { public: CWebServer() = default; @@ -60,8 +60,8 @@ private: private: CWebSrvRedunSwPtr m_ptrRedunSw; CGlobalMngPtr m_ptrGlobalMng = getGlobalMngInstance(); //< 作为成员在此持有，避免无人持有时被释放 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_sys::CProcMngInterfacePtr m_ptrProcMng; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; }; } //< namespace web_server_bi diff --git a/platform/src/service/web_server_bi/server/WebSrvRedunSw.h b/platform/src/service/web_server_bi/server/WebSrvRedunSw.h index d18fcff6..bdd87d29 100644 --- a/platform/src/service/web_server_bi/server/WebSrvRedunSw.h +++ b/platform/src/service/web_server_bi/server/WebSrvRedunSw.h @@ -16,7 +16,7 @@ namespace web_server_bi class CWebServer; -class CWebSrvRedunSw final : public ::kbd_sys::CRedundantSwitchInterface +class CWebSrvRedunSw final : public ::iot_sys::CRedundantSwitchInterface { public: explicit CWebSrvRedunSw( CWebServer *pParent ); 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 6b76e1a1..1a0bd800 100644 --- a/platform/src/service/web_server_bi/server/auth/SesssionApiImpl.cpp +++ b/platform/src/service/web_server_bi/server/auth/SesssionApiImpl.cpp @@ -74,7 +74,7 @@ void CSesssionApiImpl::execute() cnt = 0; } - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; //< 最长 500ms * 120 = 1分钟出去一次，避免死锁检测机制动作 for(int i = 0; i < 120 && m_comm.recvMsg(objMsg,500); ++i) @@ -85,7 +85,7 @@ void CSesssionApiImpl::execute() bool CSesssionApiImpl::init() { - m_ptrRdbTableMng = boost::make_shared(CN_AppName_BASE.c_str()); //RDB管理实例 + m_ptrRdbTableMng = boost::make_shared(CN_AppName_BASE.c_str()); //RDB管理实例 if (m_ptrRdbTableMng == NULL) { LOGERROR(" make_shared fail!\n"); @@ -109,7 +109,7 @@ void CSesssionApiImpl::release() suspend(); } -kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_ptr< oatpp::web::server::interceptor::RequestInterceptor::IncomingRequest> &request) +iot_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_ptr< oatpp::web::server::interceptor::RequestInterceptor::IncomingRequest> &request) { auto cookie = request->getHeader("Cookie"); if( cookie == nullptr) @@ -128,7 +128,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt } } - kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::string & sessionId) + iot_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::string & sessionId) { boost::shared_lock lock( m_objMapSessionLock ); @@ -136,7 +136,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt if( it == m_mapSessionId2PermMngApi.end() ) { // 缓存中未查找到，从rdb_net查询 - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; std::vector vecKey,vecColumn; vecKey.push_back( sessionId ); @@ -174,26 +174,26 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt // 过期处理 - if( kbd_public::getMonotonicMsec() > sessionUnit.expiredDatetime ) + if( iot_public::getMonotonicMsec() > sessionUnit.expiredDatetime ) { - if( kbd_public::getMonotonicMsec() + ONE_WEEK_MS <= sessionUnit.expiredDatetime) + if( iot_public::getMonotonicMsec() + ONE_WEEK_MS <= sessionUnit.expiredDatetime) { // update rdb_net 鉴权时间 - kbd_idlfile::RdbUpdate rdbupdate; + iot_idl::RdbUpdate rdbupdate; rdbupdate.set_strtablename("web_auth"); rdbupdate.add_msgcondition(); - rdbupdate.mutable_msgcondition(0)->set_enlogic(kbd_idlfile::enumCondAnd); - rdbupdate.mutable_msgcondition(0)->set_enrelation(kbd_idlfile::enumCondEqual); + rdbupdate.mutable_msgcondition(0)->set_enlogic(iot_idl::enumCondAnd); + rdbupdate.mutable_msgcondition(0)->set_enrelation(iot_idl::enumCondEqual); rdbupdate.mutable_msgcondition(0)->set_strcolumnname("id"); - rdbupdate.mutable_msgcondition(0)->mutable_msgvalue()->set_edatatype(kbd_idlfile::CN_DATATYPE_STRING); + rdbupdate.mutable_msgcondition(0)->mutable_msgvalue()->set_edatatype(iot_idl::CN_DATATYPE_STRING); rdbupdate.mutable_msgcondition(0)->mutable_msgvalue()->set_strvalue(sessionId); rdbupdate.add_msgupdatevalue(); rdbupdate.mutable_msgupdatevalue(0)->set_strcolumnname("expired_time"); - rdbupdate.mutable_msgupdatevalue(0)->mutable_msgvalue()->set_edatatype(kbd_idlfile::CN_DATATYPE_INT64); + rdbupdate.mutable_msgupdatevalue(0)->mutable_msgvalue()->set_edatatype(iot_idl::CN_DATATYPE_INT64); rdbupdate.mutable_msgupdatevalue(0)->mutable_msgvalue()->set_lvalue(sessionUnit.expiredDatetime + EXPIRED_DURATION_MS); bool bRet = false; @@ -210,14 +210,14 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt } else { - kbd_idlfile::RdbRemove rdbremove; + iot_idl::RdbRemove rdbremove; rdbremove.set_strtablename("web_auth"); rdbremove.add_msgcondtionarray(); - rdbremove.mutable_msgcondtionarray(0)->set_enlogic(kbd_idlfile::enumCondAnd); - rdbremove.mutable_msgcondtionarray(0)->set_enrelation(kbd_idlfile::enumCondEqual); + rdbremove.mutable_msgcondtionarray(0)->set_enlogic(iot_idl::enumCondAnd); + rdbremove.mutable_msgcondtionarray(0)->set_enrelation(iot_idl::enumCondEqual); rdbremove.mutable_msgcondtionarray(0)->set_strcolumnname("id"); - rdbremove.mutable_msgcondtionarray(0)->mutable_msgvalue()->set_edatatype(kbd_idlfile::CN_DATATYPE_STRING); + rdbremove.mutable_msgcondtionarray(0)->mutable_msgvalue()->set_edatatype(iot_idl::CN_DATATYPE_STRING); rdbremove.mutable_msgcondtionarray(0)->mutable_msgvalue()->set_strvalue(sessionId); bool bRet = false; @@ -231,7 +231,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt auto delAuthRecord = auth::delAuthRecordDto::createShared(); delAuthRecord->session_id = sessionId; - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; const auto && strJson = spMapper->writeToString(delAuthRecord); msg.setData( strJson->c_str(), strJson->size() ); msg.setSubject(m_runAppInfo.nAppId,CH_WEB_AUTH_SRV_TO_OTHER); @@ -255,7 +255,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt bool CSesssionApiImpl::isSessionValid(const std::string &sessionId) { - kbd_service::CPermMngApiPtr pPermMngApi = getCurPermApi(sessionId); + iot_service::CPermMngApiPtr pPermMngApi = getCurPermApi(sessionId); if( nullptr == pPermMngApi ) { return false; @@ -266,7 +266,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getCurPermApi(const std::shared_pt return true; } -void CSesssionApiImpl::dealMsg(const kbd_net::CMbMessage &objMsg) +void CSesssionApiImpl::dealMsg(const iot_net::CMbMessage &objMsg) { using namespace auth; @@ -297,7 +297,7 @@ void CSesssionApiImpl::doSyncAll() // 开始通过rdb_net获取web_auth表，重置缓存 // TODO 后续优化，重置缓存频率降低，通过rdb_change_api更新缓存 // 估计这个频率很高...放在最后优化，先跑起来看看 - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; std::vector columns; columns.push_back("id"); columns.push_back("perm_id"); @@ -340,7 +340,7 @@ void CSesssionApiImpl::doSyncAll() } } -kbd_service::CPermMngApiPtr CSesssionApiImpl::getPermMngApi(int perm_id,const std::string & session_id) +iot_service::CPermMngApiPtr CSesssionApiImpl::getPermMngApi(int perm_id,const std::string & session_id) { std::vector vecUserInfo; @@ -379,7 +379,7 @@ kbd_service::CPermMngApiPtr CSesssionApiImpl::getPermMngApi(int perm_id,const st { grpId = j + 1 + i * 32; - kbd_service::CPermMngApiPtr pPermMngApi = kbd_service::getPermMngInstance(CN_AppName_BASE,true); + iot_service::CPermMngApiPtr pPermMngApi = iot_service::getPermMngInstance(CN_AppName_BASE,true); if(nullptr == pPermMngApi) { LOGERROR("pPermMngApi is nullptr"); diff --git a/platform/src/service/web_server_bi/server/auth/SesssionApiImpl.h b/platform/src/service/web_server_bi/server/auth/SesssionApiImpl.h index 785a585d..daf625f3 100644 --- a/platform/src/service/web_server_bi/server/auth/SesssionApiImpl.h +++ b/platform/src/service/web_server_bi/server/auth/SesssionApiImpl.h @@ -16,10 +16,10 @@ static const int64 ONE_WEEK_MS = int64(7 * 24) * int64(3600 * 1000); typedef struct SessionUnit { - kbd_service::CPermMngApiPtr pPermMngApi; + iot_service::CPermMngApiPtr pPermMngApi; int64 expiredDatetime; - SessionUnit(kbd_service::CPermMngApiPtr pPermMngApi_, int64 expiredDuration) : - pPermMngApi(pPermMngApi_),expiredDatetime(kbd_public::getMonotonicMsec() + expiredDuration) + SessionUnit(iot_service::CPermMngApiPtr pPermMngApi_, int64 expiredDuration) : + pPermMngApi(pPermMngApi_),expiredDatetime(iot_public::getMonotonicMsec() + expiredDuration) { } @@ -32,7 +32,7 @@ namespace web_server_bi class CSesssionApiImpl; typedef boost::shared_ptr CSesssionApiImplPtr; -class CSesssionApiImpl final : public CSessionApi, public kbd_public::CTimerThreadBase +class CSesssionApiImpl final : public CSessionApi, public iot_public::CTimerThreadBase { public: ~CSesssionApiImpl(); @@ -46,33 +46,33 @@ public: //< 释放资源 void release(); - kbd_service::CPermMngApiPtr getCurPermApi(const std::shared_ptr< oatpp::web::server::interceptor::RequestInterceptor::IncomingRequest>& request) override; - kbd_service::CPermMngApiPtr getCurPermApi(const std::string &sessionId) override; + iot_service::CPermMngApiPtr getCurPermApi(const std::shared_ptr< oatpp::web::server::interceptor::RequestInterceptor::IncomingRequest>& request) override; + iot_service::CPermMngApiPtr getCurPermApi(const std::string &sessionId) override; bool isSessionValid(const std::string &sessionId); private: CSesssionApiImpl() // 靠通讯器接收超时时间控制运行周期 - : kbd_public::CTimerThreadBase( "CSesssionApiImpl", 0 ) + : iot_public::CTimerThreadBase( "CSesssionApiImpl", 0 ) { } friend CSesssionApiImplPtr getSessionApiImplInstance(); - void dealMsg( const kbd_net::CMbMessage& objMsg ); + void dealMsg( const iot_net::CMbMessage& objMsg ); void doSyncAll(); - kbd_service::CPermMngApiPtr getPermMngApi(int perm_id, const std::string &session_id); + iot_service::CPermMngApiPtr getPermMngApi(int perm_id, const std::string &session_id); boost::shared_mutex m_objMapSessionLock; //session boost::shared_mutex m_objTableLock; //session std::map m_mapSessionId2PermMngApi; - kbd_net::CMbCommunicator m_comm; - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; - kbd_public::SRunAppInfo m_runAppInfo; - kbd_dbms::CRdbNetApi m_netWebAuthRdbApi; + iot_net::CMbCommunicator m_comm; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_public::SRunAppInfo m_runAppInfo; + iot_dbms::CRdbNetApi m_netWebAuthRdbApi; }; //< 获取单例 diff --git a/platform/src/sys/file_sync_auto/FileSyncAuto.cpp b/platform/src/sys/file_sync_auto/FileSyncAuto.cpp index 34188c54..73b86e19 100644 --- a/platform/src/sys/file_sync_auto/FileSyncAuto.cpp +++ b/platform/src/sys/file_sync_auto/FileSyncAuto.cpp @@ -8,9 +8,9 @@ using namespace std; -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_net; +using namespace iot_public; +using namespace iot_sys; const std::string g_sProcessName = "file_sync_auto"; //< 当前进程名 #define OPT_DESC_APP "app" diff --git a/platform/src/sys/file_sync_auto/FileSyncAuto.h b/platform/src/sys/file_sync_auto/FileSyncAuto.h index 03f99054..2b62a4a5 100644 --- a/platform/src/sys/file_sync_auto/FileSyncAuto.h +++ b/platform/src/sys/file_sync_auto/FileSyncAuto.h @@ -14,7 +14,7 @@ class CFileSyncAutoReSwMng; typedef boost::shared_ptr FileSyncAutoReSwMngPtr; -class CFileSyncAuto : public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface +class CFileSyncAuto : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CFileSyncAuto(); @@ -56,10 +56,10 @@ private: std::string m_sAppName; //< 应用名 std::string m_sStartArgs; //< 保存进程启动参数 - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_public::CSysInfoInterfacePtr m_pSysInfo; //< 系统信息访问库智能指针 - kbd_sys::CProcMngInterfacePtr m_pProcMng; //< 进程管理访问库智能指针 - kbd_sys::CRedundantMngInterfacePtr m_pRedundancyMng; //< 冗余管理类 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_public::CSysInfoInterfacePtr m_pSysInfo; //< 系统信息访问库智能指针 + iot_sys::CProcMngInterfacePtr m_pProcMng; //< 进程管理访问库智能指针 + iot_sys::CRedundantMngInterfacePtr m_pRedundancyMng; //< 冗余管理类 FileSyncAutoReSwMngPtr m_pFileSyncRedundantSwitchMng; //< 服务管理类 }; diff --git a/platform/src/sys/file_sync_auto/FileSyncAutoReSwMng.cpp b/platform/src/sys/file_sync_auto/FileSyncAutoReSwMng.cpp index b3aaa545..90d54037 100644 --- a/platform/src/sys/file_sync_auto/FileSyncAutoReSwMng.cpp +++ b/platform/src/sys/file_sync_auto/FileSyncAutoReSwMng.cpp @@ -2,7 +2,7 @@ #include "SyncthingMngThread.h" #include "pub_logger_api/logger.h" -CFileSyncAutoReSwMng::CFileSyncAutoReSwMng(const kbd_public::SRunAppInfo &stRunAppInfo, const kbd_sys::CProcMngInterfacePtr &ptrProcMng) +CFileSyncAutoReSwMng::CFileSyncAutoReSwMng(const iot_public::SRunAppInfo &stRunAppInfo, const iot_sys::CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), m_pProcMng(ptrProcMng) { @@ -33,8 +33,8 @@ int CFileSyncAutoReSwMng::initialize() { bool isSingleNode = false; { - kbd_public::CSysInfoInterfacePtr ptrSysInfo; - if ( kbd_public::createSysInfoInstance( ptrSysInfo ) == false ) + iot_public::CSysInfoInterfacePtr ptrSysInfo; + if ( iot_public::createSysInfoInstance( ptrSysInfo ) == false ) { LOGFATAL( "createSysInfoInstance() return false !" ); return kbdFailed; @@ -42,7 +42,7 @@ int CFileSyncAutoReSwMng::initialize() //< 获取本机域ID和主机名 { - kbd_public::SNodeInfo stLocalNodeInfo; + iot_public::SNodeInfo stLocalNodeInfo; if ( kbdSuccess != ptrSysInfo->getLocalNodeInfo( stLocalNodeInfo )) { LOGFATAL( "getLocalNodeInfo() failed !" ); diff --git a/platform/src/sys/file_sync_auto/FileSyncAutoReSwMng.h b/platform/src/sys/file_sync_auto/FileSyncAutoReSwMng.h index 75d6b461..47501aa2 100644 --- a/platform/src/sys/file_sync_auto/FileSyncAutoReSwMng.h +++ b/platform/src/sys/file_sync_auto/FileSyncAutoReSwMng.h @@ -10,11 +10,11 @@ class SyncthingMngThread; typedef boost::shared_ptr SyncthingMngThreadPtr; -class CFileSyncAutoReSwMng: public kbd_sys::CRedundantSwitchInterface +class CFileSyncAutoReSwMng: public iot_sys::CRedundantSwitchInterface { public: - CFileSyncAutoReSwMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng); + CFileSyncAutoReSwMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng); virtual ~CFileSyncAutoReSwMng(); /** @@ -31,8 +31,8 @@ public: */ int initialize(); - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_sys::CProcMngInterfacePtr m_pProcMng; //< 进程管理访问库智能指针 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_sys::CProcMngInterfacePtr m_pProcMng; //< 进程管理访问库智能指针 // 服务主线程 SyncthingMngThreadPtr m_ptrSyncthingMngThread = nullptr; diff --git a/platform/src/sys/file_sync_auto/SyncthingMngThread.cpp b/platform/src/sys/file_sync_auto/SyncthingMngThread.cpp index 1a9c39ee..46f8e3c9 100644 --- a/platform/src/sys/file_sync_auto/SyncthingMngThread.cpp +++ b/platform/src/sys/file_sync_auto/SyncthingMngThread.cpp @@ -35,13 +35,13 @@ #define FILE_SYNC_CFG_FILENAME "file_sync_cfg.xml" -SyncthingMngThread::SyncthingMngThread(const kbd_public::SRunAppInfo &stRunAppInfo): - kbd_public::CTimerThreadBase( "SyncthingMngThread", 1000 ), +SyncthingMngThread::SyncthingMngThread(const iot_public::SRunAppInfo &stRunAppInfo): + iot_public::CTimerThreadBase( "SyncthingMngThread", 1000 ), m_runAppInfo(stRunAppInfo) { - m_strSyncthingHomePath = kbd_public::CFileUtil::getSimplePath( kbd_public::CFileUtil::getCurModuleDir() + "../../data/syncthing_home").c_str(); - m_strWebserverDataPath = kbd_public::CFileUtil::getSimplePath(kbd_public::CFileUtil::getCurModuleDir() + "../../data/web_server_files"); - m_strDataPath = kbd_public::CFileUtil::getSimplePath(kbd_public::CFileUtil::getCurModuleDir() + "../../data").c_str(); + m_strSyncthingHomePath = iot_public::CFileUtil::getSimplePath( iot_public::CFileUtil::getCurModuleDir() + "../../data/syncthing_home").c_str(); + m_strWebserverDataPath = iot_public::CFileUtil::getSimplePath(iot_public::CFileUtil::getCurModuleDir() + "../../data/web_server_files"); + m_strDataPath = iot_public::CFileUtil::getSimplePath(iot_public::CFileUtil::getCurModuleDir() + "../../data").c_str(); } @@ -106,7 +106,7 @@ bool SyncthingMngThread::init() m_client = CSynctingRestOp::createShared(requestExecutor, m_objMapper); } - kbd_public::SNodeInfo stNodeInfo; + iot_public::SNodeInfo stNodeInfo; if ( kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(stNodeInfo) ) { LOGERROR( "getLocalNodeInfo failed!" ); @@ -116,7 +116,7 @@ bool SyncthingMngThread::init() m_sNodeDesc = stNodeInfo.strDesc; // 初始化告警接口 - m_pAlarmApi = new kbd_service::CAlmApiForApp(stNodeInfo.nDomainId, CN_AppId_BASE); + m_pAlarmApi = new iot_service::CAlmApiForApp(stNodeInfo.nDomainId, CN_AppId_BASE); m_pAlarmApi->resumeThread(); @@ -144,7 +144,7 @@ int SyncthingMngThread::beforeExecute() bool SyncthingMngThread::startSyncthing() { - QString syncthingPath = kbd_public::CFileUtil::getPathOfBinFile("syncthing").c_str(); + QString syncthingPath = iot_public::CFileUtil::getPathOfBinFile("syncthing").c_str(); QStringList args; args << QString("--home=%1").arg(m_strSyncthingHomePath) @@ -174,7 +174,7 @@ bool SyncthingMngThread::cleanSyncthingHome() bool SyncthingMngThread::stopSyncthing() { - QString syncthingPath = kbd_public::CFileUtil::getPathOfBinFile("syncthing").c_str(); + QString syncthingPath = iot_public::CFileUtil::getPathOfBinFile("syncthing").c_str(); QStringList args; args << "cli" @@ -204,7 +204,7 @@ bool SyncthingMngThread::loadCfg() // 再加载平台再加载产品 // 产品的配置可以覆盖平台 - if ( kbd_public::createSysInfoInstance( m_ptrSysInfo ) == false ) + if ( iot_public::createSysInfoInstance( m_ptrSysInfo ) == false ) { LOGFATAL( "createSysInfoInstance() return false !" ); return false; @@ -217,8 +217,8 @@ bool SyncthingMngThread::loadCfg() } - std::string sPlatFilePath = kbd_public::CFileUtil::getPathOfCfgFile(FILE_SYNC_CFG_FILENAME); - std::string sProdFilePath = kbd_public::CFileUtil::getPathOfCfgFile(FILE_SYNC_CFG_FILENAME,"product"); + std::string sPlatFilePath = iot_public::CFileUtil::getPathOfCfgFile(FILE_SYNC_CFG_FILENAME); + std::string sProdFilePath = iot_public::CFileUtil::getPathOfCfgFile(FILE_SYNC_CFG_FILENAME,"product"); if( !loadFileSyncConf( sPlatFilePath )) { @@ -238,7 +238,7 @@ bool SyncthingMngThread::loadCfg() bool SyncthingMngThread::getEnabledProcess() { - kbd_public::SNodeInfo stLocalNodeInfo; + iot_public::SNodeInfo stLocalNodeInfo; if ( kbdSuccess != m_ptrSysInfo->getLocalNodeInfo( stLocalNodeInfo )) { LOGFATAL( "getLocalNodeInfo() failed !" ); @@ -247,7 +247,7 @@ bool SyncthingMngThread::getEnabledProcess() // 获取本机部署的应用下的所有进程 - std::vector vecApp; + std::vector vecApp; if (kbdSuccess != m_ptrSysInfo->getLocalAppDeploy(vecApp)) { LOGFATAL("获取本机部署信息失败"); @@ -355,7 +355,7 @@ bool SyncthingMngThread::loadFileSyncConf(const std::string &strCfgPath) bool SyncthingMngThread::addEnableProcessByAppid(const int nAppId) { //1.获取应用信息 - kbd_public::SProcessInfoMAP mapProcInfo; + iot_public::SProcessInfoMAP mapProcInfo; if (kbdSuccess != m_ptrSysInfo->getProcInfoListByAppId(nAppId, mapProcInfo)) { LOGERROR("获取%d应用的进程列表失败", nAppId); @@ -364,7 +364,7 @@ bool SyncthingMngThread::addEnableProcessByAppid(const int nAppId) for (BOOST_AUTO(pProc, mapProcInfo[nAppId].begin()); pProc != mapProcInfo[nAppId].end(); ++pProc) { - const kbd_public::SProcessInfo &stProcInfo = *pProc; + const iot_public::SProcessInfo &stProcInfo = *pProc; if (stProcInfo.bNotUsed) { continue; @@ -375,11 +375,11 @@ bool SyncthingMngThread::addEnableProcessByAppid(const int nAppId) return true; } -bool SyncthingMngThread::sendAlarm(kbd_service::enAlarmStatus eStatus, kbd_idlfile::enAlmStyle eStyle, std::string sKeyIdTag, std::string sDesc) +bool SyncthingMngThread::sendAlarm(iot_service::enAlarmStatus eStatus, iot_idl::enAlmStyle eStyle, std::string sKeyIdTag, std::string sDesc) { - using namespace kbd_idlfile; - using namespace kbd_service; - using namespace kbd_public; + using namespace iot_idl; + using namespace iot_service; + using namespace iot_public; SAppAddAlm objAlarmMsg; @@ -409,7 +409,7 @@ bool SyncthingMngThread::sendAlarm(kbd_service::enAlarmStatus eStatus, kbd_idlfi void SyncthingMngThread::broadcast() { - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; msg.setData( m_strHandshake.c_str(), m_strHandshake.size() ); msg.setSubject(m_runAppInfo.nAppId,CH_WEB_FILE_SYNCTHING_BROADCAST); @@ -420,7 +420,7 @@ void SyncthingMngThread::broadcast() void SyncthingMngThread::recvBroadcastAndReConf() { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; bool bNeedRefresh = false; std::list listDeviceId; @@ -527,7 +527,7 @@ void SyncthingMngThread::getEventAndAlarm() { m_nLastEvtSeq = (*it)->id; QString alarmContent = QString("冲突 ") + m_sNodeName.c_str() + "(" + m_sNodeDesc.c_str() + ")" + (*it)->data->folder->c_str() + QDir::separator() + conflitFileName; - sendAlarm(kbd_service::ALM_STAT_SYS_FILE_CONFLICTS,kbd_idlfile::AS_ALARM,m_sNodeName+"_fileConflicts", alarmContent.toStdString()); + sendAlarm(iot_service::ALM_STAT_SYS_FILE_CONFLICTS,iot_idl::AS_ALARM,m_sNodeName+"_fileConflicts", alarmContent.toStdString()); m_setConflictFiles.insert(conflitFileName); if(m_setConflictFiles.size() > 10000) { @@ -620,7 +620,7 @@ void SyncthingMngThread::deleteDevice(const std::string &deviceId) bool SyncthingMngThread::getDeviceId() { - QString syncthingPath = kbd_public::CFileUtil::getPathOfBinFile("syncthing").c_str(); + QString syncthingPath = iot_public::CFileUtil::getPathOfBinFile("syncthing").c_str(); QStringList args; args << QString("--home=%1").arg(m_strSyncthingHomePath) diff --git a/platform/src/sys/file_sync_auto/SyncthingMngThread.h b/platform/src/sys/file_sync_auto/SyncthingMngThread.h index e0f226de..36ef2ece 100644 --- a/platform/src/sys/file_sync_auto/SyncthingMngThread.h +++ b/platform/src/sys/file_sync_auto/SyncthingMngThread.h @@ -25,11 +25,11 @@ -class SyncthingMngThread : public kbd_public::CTimerThreadBase +class SyncthingMngThread : public iot_public::CTimerThreadBase { public: - SyncthingMngThread(const kbd_public::SRunAppInfo &stRunAppInfo); + SyncthingMngThread(const iot_public::SRunAppInfo &stRunAppInfo); ~SyncthingMngThread(); @@ -48,7 +48,7 @@ private: bool addEnableProcessByAppid(const int nAppId ); - bool sendAlarm( kbd_service::enAlarmStatus eStatus, kbd_idlfile::enAlmStyle eStyle, std::string sKeyIdTag, std::string sDesc ); + bool sendAlarm( iot_service::enAlarmStatus eStatus, iot_idl::enAlmStyle eStyle, std::string sKeyIdTag, std::string sDesc ); void broadcast(); void recvBroadcastAndReConf(); @@ -71,11 +71,11 @@ private: std::string m_strWebserverDataPath; std::map m_mapDeviceId; - kbd_net::CMbCommunicator m_comm; - kbd_public::SRunAppInfo m_runAppInfo; + iot_net::CMbCommunicator m_comm; + iot_public::SRunAppInfo m_runAppInfo; std::shared_ptr m_client; - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; - kbd_service::CAlmApiForApp* m_pAlarmApi; // 告警服务接口 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_service::CAlmApiForApp* m_pAlarmApi; // 告警服务接口 std::string m_sNodeName; // 本机节点名 std::string m_sNodeDesc; // 本机描述 int m_nLastEvtSeq=0; diff --git a/platform/src/sys/show_node_info/ConsoleMng.cpp b/platform/src/sys/show_node_info/ConsoleMng.cpp index a4529a1d..614fd86f 100644 --- a/platform/src/sys/show_node_info/ConsoleMng.cpp +++ b/platform/src/sys/show_node_info/ConsoleMng.cpp @@ -1,7 +1,7 @@ #include "ConsoleMng.h" using namespace std; -using namespace kbd_sys; +using namespace iot_sys; CConsoleMng::CConsoleMng() { @@ -26,7 +26,7 @@ CConsoleMng::~CConsoleMng() #endif } -void kbd_sys::CConsoleMng::addConsoleUnderscore() +void iot_sys::CConsoleMng::addConsoleUnderscore() { #ifdef _WIN32 if (m_hConsole != NULL) @@ -38,7 +38,7 @@ void kbd_sys::CConsoleMng::addConsoleUnderscore() #endif } -void kbd_sys::CConsoleMng::printTable(const TwoDimensionArray &vecTable) +void iot_sys::CConsoleMng::printTable(const TwoDimensionArray &vecTable) { if (vecTable.empty()) { @@ -81,7 +81,7 @@ void kbd_sys::CConsoleMng::printTable(const TwoDimensionArray &vecTable) } } -void kbd_sys::CConsoleMng::resetConsoleAttr() +void iot_sys::CConsoleMng::resetConsoleAttr() { #ifdef _WIN32 if (m_hConsole != NULL) diff --git a/platform/src/sys/show_node_info/ConsoleMng.h b/platform/src/sys/show_node_info/ConsoleMng.h index a42a839b..5fd4c8f8 100644 --- a/platform/src/sys/show_node_info/ConsoleMng.h +++ b/platform/src/sys/show_node_info/ConsoleMng.h @@ -6,7 +6,7 @@ #endif #include "ShowNodeInfoCommon.h" -namespace kbd_sys +namespace iot_sys { typedef std::vector > TwoDimensionArray; class CConsoleMng @@ -35,4 +35,4 @@ namespace kbd_sys }; typedef boost::shared_ptr CConsoleMngPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/show_node_info/NodeMngShowApp.cpp b/platform/src/sys/show_node_info/NodeMngShowApp.cpp index bea09e6a..13263b52 100644 --- a/platform/src/sys/show_node_info/NodeMngShowApp.cpp +++ b/platform/src/sys/show_node_info/NodeMngShowApp.cpp @@ -6,11 +6,11 @@ #include "ShowNodeInfoCommon.h" using namespace std; -using namespace kbd_sys; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_sys; +using namespace iot_public; +using namespace iot_dbms; -kbd_sys::CNodeMngShowApp::CNodeMngShowApp() +iot_sys::CNodeMngShowApp::CNodeMngShowApp() :m_ptrConsoleMng(NULL), m_ptrShowNetworkInfo(NULL), m_ptrShowProcInfo(NULL), @@ -18,12 +18,12 @@ kbd_sys::CNodeMngShowApp::CNodeMngShowApp() { } -kbd_sys::CNodeMngShowApp::~CNodeMngShowApp() +iot_sys::CNodeMngShowApp::~CNodeMngShowApp() { stop(); } -bool kbd_sys::CNodeMngShowApp::start(int /*argc*/, char *[]/*argv*/, int &/*nStatus*/) +bool iot_sys::CNodeMngShowApp::start(int /*argc*/, char *[]/*argv*/, int &/*nStatus*/) { if (!isSystemRunning()) { @@ -90,7 +90,7 @@ bool kbd_sys::CNodeMngShowApp::start(int /*argc*/, char *[]/*argv*/, int &/*nSta return true; } -bool kbd_sys::CNodeMngShowApp::stop() +bool iot_sys::CNodeMngShowApp::stop() { m_ptrShowAppInfo.reset(); m_ptrShowProcInfo.reset(); @@ -99,7 +99,7 @@ bool kbd_sys::CNodeMngShowApp::stop() return true; } -bool kbd_sys::CNodeMngShowApp::initialize() +bool iot_sys::CNodeMngShowApp::initialize() { //1.创建控制台管理类，用于控制命令行输出的控制 m_ptrConsoleMng = boost::make_shared(); @@ -136,7 +136,7 @@ bool kbd_sys::CNodeMngShowApp::initialize() return true; } -bool kbd_sys::CNodeMngShowApp::isSystemRunning() +bool iot_sys::CNodeMngShowApp::isSystemRunning() { CRdbAccessEx objProcInfoTable; bool bRet = objProcInfoTable.open(CN_AppName_BASE.c_str(), CN_TN_SysRunProcInfo.c_str()); @@ -150,7 +150,7 @@ bool kbd_sys::CNodeMngShowApp::isSystemRunning() } -void kbd_sys::CNodeMngShowApp::showMenu() +void iot_sys::CNodeMngShowApp::showMenu() { cout << "###################################################" << endl; CUSTOM_PRINT("#\t\t0-----退出"); @@ -162,12 +162,12 @@ void kbd_sys::CNodeMngShowApp::showMenu() cout << "###################################################" << endl; } -void kbd_sys::CNodeMngShowApp::showProcInfo() +void iot_sys::CNodeMngShowApp::showProcInfo() { m_ptrShowProcInfo->showProcInfo(); } -void kbd_sys::CNodeMngShowApp::diagnose() +void iot_sys::CNodeMngShowApp::diagnose() { //1.检查网络状态(sys_network_check) if (!m_ptrShowNetworkInfo->diagnoseNetwork()) diff --git a/platform/src/sys/show_node_info/NodeMngShowApp.h b/platform/src/sys/show_node_info/NodeMngShowApp.h index bb82e1a0..cd650e4f 100644 --- a/platform/src/sys/show_node_info/NodeMngShowApp.h +++ b/platform/src/sys/show_node_info/NodeMngShowApp.h @@ -7,9 +7,9 @@ #include "ShowProcInfo.h" #include "ShowAppInfo.h" -namespace kbd_sys +namespace iot_sys { - class CNodeMngShowApp : public kbd_public::CBaseService + class CNodeMngShowApp : public iot_public::CBaseService { public: CNodeMngShowApp(); diff --git a/platform/src/sys/show_node_info/ShowAppInfo.cpp b/platform/src/sys/show_node_info/ShowAppInfo.cpp index 7c2626d2..eead0a7f 100644 --- a/platform/src/sys/show_node_info/ShowAppInfo.cpp +++ b/platform/src/sys/show_node_info/ShowAppInfo.cpp @@ -7,24 +7,24 @@ #include "SysModelDeployInfoTable.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_dbms; -kbd_sys::CShowAppInfo::CShowAppInfo(const CConsoleMngPtr &ptrConsoleMng, +iot_sys::CShowAppInfo::CShowAppInfo(const CConsoleMngPtr &ptrConsoleMng, const CShowProcInfoPtr &ptrProcInfo) :m_ptrConsoleMng(ptrConsoleMng), m_ptrShowProcInfo(ptrProcInfo) { } -kbd_sys::CShowAppInfo::~CShowAppInfo() +iot_sys::CShowAppInfo::~CShowAppInfo() { m_ptrShowProcInfo.reset(); m_ptrConsoleMng.reset(); } -bool kbd_sys::CShowAppInfo::diagnoseAllAppInfo() +bool iot_sys::CShowAppInfo::diagnoseAllAppInfo() { int nDomainId = CN_InvalidDomainId; string strNodeName; @@ -69,7 +69,7 @@ bool kbd_sys::CShowAppInfo::diagnoseAllAppInfo() return bRet; } -bool kbd_sys::CShowAppInfo::showLocalAppInfo() +bool iot_sys::CShowAppInfo::showLocalAppInfo() { //1. CRdbAccessEx objRunAppInfoTable; @@ -132,7 +132,7 @@ bool kbd_sys::CShowAppInfo::showLocalAppInfo() return bRet; } -bool kbd_sys::CShowAppInfo::showAllAppInfo() +bool iot_sys::CShowAppInfo::showAllAppInfo() { //1.获取本机所属域、节点名（通过进程信息表获取） int nDomainId = CN_InvalidDomainId; @@ -202,7 +202,7 @@ bool kbd_sys::CShowAppInfo::showAllAppInfo() return bRet; } -bool kbd_sys::CShowAppInfo::showReduncyCmdInfo() +bool iot_sys::CShowAppInfo::showReduncyCmdInfo() { //1. CRdbAccessEx objRedundancyCmdInfoTable; @@ -258,7 +258,7 @@ bool kbd_sys::CShowAppInfo::showReduncyCmdInfo() return bRet; } -bool kbd_sys::CShowAppInfo::diagnoseAppInfo(int nDomainId, int nAppId) +bool iot_sys::CShowAppInfo::diagnoseAppInfo(int nDomainId, int nAppId) { vector vecRecord; if (!m_ptrShowProcInfo->getRunProcInfo(nDomainId, nAppId, vecRecord)) @@ -307,7 +307,7 @@ bool kbd_sys::CShowAppInfo::diagnoseAppInfo(int nDomainId, int nAppId) return bRet; } -void kbd_sys::CShowAppInfo::showRedundancyInfoTitle(TwoDimensionArray &vecTable) +void iot_sys::CShowAppInfo::showRedundancyInfoTitle(TwoDimensionArray &vecTable) { vector vecRow; vecRow.push_back("domian_id"); @@ -325,7 +325,7 @@ void kbd_sys::CShowAppInfo::showRedundancyInfoTitle(TwoDimensionArray &vecTable) vecTable.push_back(vecRow); } -void kbd_sys::CShowAppInfo::showAppInfoTitle(TwoDimensionArray &vecTable) +void iot_sys::CShowAppInfo::showAppInfoTitle(TwoDimensionArray &vecTable) { vector vecRow; vecRow.push_back("domian_id"); @@ -345,7 +345,7 @@ void kbd_sys::CShowAppInfo::showAppInfoTitle(TwoDimensionArray &vecTable) vecTable.push_back(vecRow); } -void kbd_sys::CShowAppInfo::showRedundancyCmdTitle(TwoDimensionArray &vecTable) +void iot_sys::CShowAppInfo::showRedundancyCmdTitle(TwoDimensionArray &vecTable) { vector vecRow; vecRow.push_back("domian_id"); @@ -358,7 +358,7 @@ void kbd_sys::CShowAppInfo::showRedundancyCmdTitle(TwoDimensionArray &vecTable) vecTable.push_back(vecRow); } -bool kbd_sys::CShowAppInfo::getAppDeploy(int nDomainId, const std::string &strNodeName, std::vector &vecAppId) +bool iot_sys::CShowAppInfo::getAppDeploy(int nDomainId, const std::string &strNodeName, std::vector &vecAppId) { CRdbAccessEx objModelDeployInfoTable; if (!objModelDeployInfoTable.open(CN_AppName_BASE.c_str(), CN_TN_SysModelDeployInfo.c_str())) diff --git a/platform/src/sys/show_node_info/ShowAppInfo.h b/platform/src/sys/show_node_info/ShowAppInfo.h index c3e55634..ffe4df64 100644 --- a/platform/src/sys/show_node_info/ShowAppInfo.h +++ b/platform/src/sys/show_node_info/ShowAppInfo.h @@ -3,7 +3,7 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "ShowProcInfo.h" -namespace kbd_sys +namespace iot_sys { class CShowAppInfo { @@ -34,4 +34,4 @@ namespace kbd_sys typedef boost::shared_ptr CShowAppInfoPtr; -} //namespace kbd_sys \ No newline at end of file +} //namespace iot_sys \ No newline at end of file diff --git a/platform/src/sys/show_node_info/ShowNetworkInfo.cpp b/platform/src/sys/show_node_info/ShowNetworkInfo.cpp index 3750fcb2..a1f032b9 100644 --- a/platform/src/sys/show_node_info/ShowNetworkInfo.cpp +++ b/platform/src/sys/show_node_info/ShowNetworkInfo.cpp @@ -1,19 +1,19 @@ #include "ShowNetworkInfo.h" #include "ShowNodeInfoCommon.h" -using namespace kbd_sys; +using namespace iot_sys; -kbd_sys::CShowNetworkInfo::CShowNetworkInfo() +iot_sys::CShowNetworkInfo::CShowNetworkInfo() { } -kbd_sys::CShowNetworkInfo::~CShowNetworkInfo() +iot_sys::CShowNetworkInfo::~CShowNetworkInfo() { } -bool kbd_sys::CShowNetworkInfo::diagnoseNetwork() +bool iot_sys::CShowNetworkInfo::diagnoseNetwork() { CNetworkCheckInterfacePtr ptrNetwork = getNetworkCheckInstance(); if (ptrNetwork == NULL) diff --git a/platform/src/sys/show_node_info/ShowNetworkInfo.h b/platform/src/sys/show_node_info/ShowNetworkInfo.h index cf18f097..c90b3f6c 100644 --- a/platform/src/sys/show_node_info/ShowNetworkInfo.h +++ b/platform/src/sys/show_node_info/ShowNetworkInfo.h @@ -1,7 +1,7 @@ #pragma once #include "sys_network_check_api/NetworkCheckInterface.h" -namespace kbd_sys +namespace iot_sys { class CShowNetworkInfo { @@ -13,4 +13,4 @@ namespace kbd_sys }; typedef boost::shared_ptr CShowNetworkInfoPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/show_node_info/ShowNodeInfoCommon.h b/platform/src/sys/show_node_info/ShowNodeInfoCommon.h index cd0af27b..4509893f 100644 --- a/platform/src/sys/show_node_info/ShowNodeInfoCommon.h +++ b/platform/src/sys/show_node_info/ShowNodeInfoCommon.h @@ -6,7 +6,7 @@ #include "boost/format.hpp" #include "boost/locale.hpp" -namespace kbd_sys +namespace iot_sys { const std::string CN_TN_SysModelProcInfo = "sys_model_process_info"; diff --git a/platform/src/sys/show_node_info/ShowProcInfo.cpp b/platform/src/sys/show_node_info/ShowProcInfo.cpp index d91fbcce..d7eab6e2 100644 --- a/platform/src/sys/show_node_info/ShowProcInfo.cpp +++ b/platform/src/sys/show_node_info/ShowProcInfo.cpp @@ -1,21 +1,21 @@ #include "ShowProcInfo.h" using namespace std; -using namespace kbd_public; -using namespace kbd_dbms; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_dbms; +using namespace iot_sys; -kbd_sys::CShowProcInfo::CShowProcInfo(const CConsoleMngPtr &ptrConsoleMng) +iot_sys::CShowProcInfo::CShowProcInfo(const CConsoleMngPtr &ptrConsoleMng) :m_ptrConsoleMng(ptrConsoleMng) { } -kbd_sys::CShowProcInfo::~CShowProcInfo() +iot_sys::CShowProcInfo::~CShowProcInfo() { m_ptrConsoleMng.reset(); } -bool kbd_sys::CShowProcInfo::getRunProcInfo(int nDomainId, int nAppId, std::vector &vecProc) +bool iot_sys::CShowProcInfo::getRunProcInfo(int nDomainId, int nAppId, std::vector &vecProc) { CRdbAccessEx objProcInfoTable; if (!objProcInfoTable.open(CN_AppName_BASE.c_str(), CN_TN_SysRunProcInfo.c_str())) @@ -47,7 +47,7 @@ bool kbd_sys::CShowProcInfo::getRunProcInfo(int nDomainId, int nAppId, std::vect return bRet; } -bool kbd_sys::CShowProcInfo::getModelProcInfo(int nAppId, std::vector &vecProcName) +bool iot_sys::CShowProcInfo::getModelProcInfo(int nAppId, std::vector &vecProcName) { CRdbAccessEx objModelProcInfoTable; if (!objModelProcInfoTable.open(CN_AppName_BASE.c_str(), CN_TN_SysModelProcInfo.c_str())) @@ -92,7 +92,7 @@ bool kbd_sys::CShowProcInfo::getModelProcInfo(int nAppId, std::vector > &vecTable) +void iot_sys::CShowProcInfo::showProcInfoTitle(std::vector > &vecTable) { vector vecRow; vecRow.push_back("domian_id"); diff --git a/platform/src/sys/show_node_info/ShowProcInfo.h b/platform/src/sys/show_node_info/ShowProcInfo.h index c5c29bc7..006b760c 100644 --- a/platform/src/sys/show_node_info/ShowProcInfo.h +++ b/platform/src/sys/show_node_info/ShowProcInfo.h @@ -6,7 +6,7 @@ #include "ShowNodeInfoCommon.h" #include "ConsoleMng.h" -namespace kbd_sys +namespace iot_sys { class CShowProcInfo { @@ -14,7 +14,7 @@ namespace kbd_sys CShowProcInfo(const CConsoleMngPtr &ptrConsoleMng); virtual ~CShowProcInfo(); - bool getRunProcInfo(int nDomainId, int nAppId, std::vector &vecProc); + bool getRunProcInfo(int nDomainId, int nAppId, std::vector &vecProc); bool getModelProcInfo(int nAppId, std::vector &vecProcName); bool getLocalNodeInfoByRtdbTable(int &nDomainId, std::string &strNodeName); @@ -28,4 +28,4 @@ namespace kbd_sys }; typedef boost::shared_ptr CShowProcInfoPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/show_node_info/SysModelDeployInfoTable.h b/platform/src/sys/show_node_info/SysModelDeployInfoTable.h index 29812a4d..38d004a2 100644 --- a/platform/src/sys/show_node_info/SysModelDeployInfoTable.h +++ b/platform/src/sys/show_node_info/SysModelDeployInfoTable.h @@ -5,7 +5,7 @@ */ #pragma once -namespace kbd_sys +namespace iot_sys { const std::string CN_TN_SysModelDeployInfo = "sys_model_deploy_info"; @@ -48,4 +48,4 @@ namespace kbd_sys }SModelDeployInfo, *PSModelDeployInfo; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/show_node_info/main.cpp b/platform/src/sys/show_node_info/main.cpp index f7d59ea4..5b7c23b5 100644 --- a/platform/src/sys/show_node_info/main.cpp +++ b/platform/src/sys/show_node_info/main.cpp @@ -2,6 +2,6 @@ int main(int argc, char *argv[]) { - kbd_sys::CNodeMngShowApp objApp; + iot_sys::CNodeMngShowApp objApp; return objApp.main(argc, argv); } \ No newline at end of file diff --git a/platform/src/sys/sys_ctrl/BaseCfgParam.cpp b/platform/src/sys/sys_ctrl/BaseCfgParam.cpp index f7493f07..bbc69ad1 100644 --- a/platform/src/sys/sys_ctrl/BaseCfgParam.cpp +++ b/platform/src/sys/sys_ctrl/BaseCfgParam.cpp @@ -16,10 +16,10 @@ #include "SysCtrlCommon.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_sys; -kbd_sys::CBaseCfgParam::CBaseCfgParam(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo) +iot_sys::CBaseCfgParam::CBaseCfgParam(const iot_public::CSysInfoInterfacePtr &ptrSysInfo) :m_bShowConsole(false), m_bVerifyIP(true), m_nCheckInterval(50), @@ -28,13 +28,13 @@ kbd_sys::CBaseCfgParam::CBaseCfgParam(const kbd_public::CSysInfoInterfacePtr &pt { } -kbd_sys::CBaseCfgParam::~CBaseCfgParam() +iot_sys::CBaseCfgParam::~CBaseCfgParam() { m_ptrSysInfo.reset(); } /* @brief 加载配置 */ -bool kbd_sys::CBaseCfgParam::load() +bool iot_sys::CBaseCfgParam::load() { /* @brief 加载配置文件 */ if (!loadConfig()) @@ -51,44 +51,44 @@ bool kbd_sys::CBaseCfgParam::load() } /* @brief 获取进程列表 */ -kbd_sys::AppStartOderToProcInfoMAP kbd_sys::CBaseCfgParam::getProcessList() +iot_sys::AppStartOderToProcInfoMAP iot_sys::CBaseCfgParam::getProcessList() { return m_mapAppStartOderToProcInfo; } /* @brief 是否显示窗口 */ -bool kbd_sys::CBaseCfgParam::isShowConsole() +bool iot_sys::CBaseCfgParam::isShowConsole() { return m_bShowConsole; } /* @brief 是否检查计算机名和IP地址是否匹配 */ -bool kbd_sys::CBaseCfgParam::isVerifyIP() +bool iot_sys::CBaseCfgParam::isVerifyIP() { return m_bVerifyIP; } /* @brief 检查间隔 */ -int kbd_sys::CBaseCfgParam::getCheckInterval() +int iot_sys::CBaseCfgParam::getCheckInterval() { return m_nCheckInterval; } /* @brief 检查次数 */ -int kbd_sys::CBaseCfgParam::getCheckTime() +int iot_sys::CBaseCfgParam::getCheckTime() { return m_nCheckTime; } /* @brief 加载base_process.xml配置文件 */ -bool kbd_sys::CBaseCfgParam::loadBaseProcess() +bool iot_sys::CBaseCfgParam::loadBaseProcess() { CUSTOM_LOGERROR(I18N_C("未实现BASE应用信息加载逻辑")); return false; } /* @brief 加载sys_ctrl.xml */ -bool kbd_sys::CBaseCfgParam::loadConfig() +bool iot_sys::CBaseCfgParam::loadConfig() { CCommonConfigParse objCfg; if (kbdSuccess != objCfg.load(CFileUtil::getPathOfCfgFile("sys_ctrl.xml"))) @@ -111,7 +111,7 @@ bool kbd_sys::CBaseCfgParam::loadConfig() } } -bool kbd_sys::CBaseCfgParam::loadAppProcess() +bool iot_sys::CBaseCfgParam::loadAppProcess() { CUSTOM_LOGERROR(I18N_C("未实现应用信息加载逻辑")); return false; diff --git a/platform/src/sys/sys_ctrl/BaseCfgParam.h b/platform/src/sys/sys_ctrl/BaseCfgParam.h index 2b217a1e..6a39c485 100644 --- a/platform/src/sys/sys_ctrl/BaseCfgParam.h +++ b/platform/src/sys/sys_ctrl/BaseCfgParam.h @@ -6,9 +6,9 @@ #pragma once #include "pub_sysinfo_api/SysInfoApi.h" -namespace kbd_sys +namespace iot_sys { - typedef std::map > StartOrderToProcInfoMAP; //< 启动顺序->进程参数，升序排列 + typedef std::map > StartOrderToProcInfoMAP; //< 启动顺序->进程参数，升序排列 struct SAppIdAndProcInfoList { @@ -20,7 +20,7 @@ namespace kbd_sys class CBaseCfgParam { public: - CBaseCfgParam(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo); + CBaseCfgParam(const iot_public::CSysInfoInterfacePtr &ptrSysInfo); virtual ~CBaseCfgParam(); /** @@ -69,8 +69,8 @@ namespace kbd_sys int m_nCheckInterval; //< 检查间隔，单位ms int m_nCheckTime; //< 检查次数 AppStartOderToProcInfoMAP m_mapAppStartOderToProcInfo; //< <启动顺序，进程列表> - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库 }; typedef boost::shared_ptr CBaseCfgParamPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_ctrl/StartCfgParam.cpp b/platform/src/sys/sys_ctrl/StartCfgParam.cpp index 371bf488..7d7ffffd 100644 --- a/platform/src/sys/sys_ctrl/StartCfgParam.cpp +++ b/platform/src/sys/sys_ctrl/StartCfgParam.cpp @@ -10,26 +10,26 @@ #include "SysCtrlCommon.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_sys; -kbd_sys::CStartCfgParam::CStartCfgParam(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo) +iot_sys::CStartCfgParam::CStartCfgParam(const iot_public::CSysInfoInterfacePtr &ptrSysInfo) :CBaseCfgParam(ptrSysInfo) { } -kbd_sys::CStartCfgParam::~CStartCfgParam() +iot_sys::CStartCfgParam::~CStartCfgParam() { } -bool kbd_sys::CStartCfgParam::loadBaseProcess() +bool iot_sys::CStartCfgParam::loadBaseProcess() { return loadProcess(CN_AppId_BASE); } -bool kbd_sys::CStartCfgParam::loadAppProcess() +bool iot_sys::CStartCfgParam::loadAppProcess() { //1.仅为服务器类型才加载应用配置，防止工作站被部署上应用 SNodeInfo stNodeInfo; @@ -58,7 +58,7 @@ bool kbd_sys::CStartCfgParam::loadAppProcess() return true; } -bool kbd_sys::CStartCfgParam::loadProcess(const int nAppId) +bool iot_sys::CStartCfgParam::loadProcess(const int nAppId) { //1.获取应用信息 SAppInfo stAppInfo; diff --git a/platform/src/sys/sys_ctrl/StartCfgParam.h b/platform/src/sys/sys_ctrl/StartCfgParam.h index 27a73653..98071f01 100644 --- a/platform/src/sys/sys_ctrl/StartCfgParam.h +++ b/platform/src/sys/sys_ctrl/StartCfgParam.h @@ -6,12 +6,12 @@ #pragma once #include "BaseCfgParam.h" -namespace kbd_sys +namespace iot_sys { class CStartCfgParam : public CBaseCfgParam { public: - CStartCfgParam(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo); + CStartCfgParam(const iot_public::CSysInfoInterfacePtr &ptrSysInfo); virtual ~CStartCfgParam(); private: @@ -33,4 +33,4 @@ namespace kbd_sys bool loadProcess(const int nAppId); }; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_ctrl/StopCfgParam.cpp b/platform/src/sys/sys_ctrl/StopCfgParam.cpp index 04b83d46..e1f22f48 100644 --- a/platform/src/sys/sys_ctrl/StopCfgParam.cpp +++ b/platform/src/sys/sys_ctrl/StopCfgParam.cpp @@ -13,20 +13,20 @@ #include "SysCtrlCommon.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_dbms; -kbd_sys::CStopCfgParam::CStopCfgParam(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo) +iot_sys::CStopCfgParam::CStopCfgParam(const iot_public::CSysInfoInterfacePtr &ptrSysInfo) :CBaseCfgParam(ptrSysInfo) { } -kbd_sys::CStopCfgParam::~CStopCfgParam() +iot_sys::CStopCfgParam::~CStopCfgParam() { } -bool kbd_sys::CStopCfgParam::getLocalInfo(int &nDomainId, std::string &strNodeName) +bool iot_sys::CStopCfgParam::getLocalInfo(int &nDomainId, std::string &strNodeName) { /** * lww 2021-11-19 @@ -89,12 +89,12 @@ bool kbd_sys::CStopCfgParam::getLocalInfo(int &nDomainId, std::string &strNodeNa // return bRet; } -bool kbd_sys::CStopCfgParam::loadBaseProcess() +bool iot_sys::CStopCfgParam::loadBaseProcess() { return loadProcess(CN_AppId_BASE); } -bool kbd_sys::CStopCfgParam::loadAppProcess() +bool iot_sys::CStopCfgParam::loadAppProcess() { set setAppId; if (!getLocalAppIdList(setAppId)) //< 获取本机部署的应用ID列表 @@ -118,7 +118,7 @@ bool kbd_sys::CStopCfgParam::loadAppProcess() return true; } -bool kbd_sys::CStopCfgParam::getLocalAppIdList(std::set &setAppId) +bool iot_sys::CStopCfgParam::getLocalAppIdList(std::set &setAppId) { /** * lww 2021-11-19 @@ -176,7 +176,7 @@ bool kbd_sys::CStopCfgParam::getLocalAppIdList(std::set &setAppId) // return bRet; } -bool kbd_sys::CStopCfgParam::getAllAppIdList(std::set &setAppId) +bool iot_sys::CStopCfgParam::getAllAppIdList(std::set &setAppId) { /** * lww 2021-11-19 @@ -198,7 +198,7 @@ bool kbd_sys::CStopCfgParam::getAllAppIdList(std::set &setAppId) return true; } -bool kbd_sys::CStopCfgParam::getProcInfoByAppId(const int nAppId, std::vector &vecProcInfo) +bool iot_sys::CStopCfgParam::getProcInfoByAppId(const int nAppId, std::vector &vecProcInfo) { CRdbAccessEx objModelProcInfoTable; if (!objModelProcInfoTable.open(CN_AppId_BASE, CN_TN_SysModelProcInfo.c_str())) @@ -236,7 +236,7 @@ bool kbd_sys::CStopCfgParam::getProcInfoByAppId(const int nAppId, std::vector #include "pub_sysinfo_api/SysInfoApi.h" -namespace kbd_sys +namespace iot_sys { const std::string CN_ProcName_SysCtrl = "sys_ctrl"; //< 当前进程名 const std::string CN_TN_SysModelProcInfo = "sys_model_process_info"; diff --git a/platform/src/sys/sys_ctrl/SysCtrlStart.cpp b/platform/src/sys/sys_ctrl/SysCtrlStart.cpp index 629c830f..b32996c4 100644 --- a/platform/src/sys/sys_ctrl/SysCtrlStart.cpp +++ b/platform/src/sys/sys_ctrl/SysCtrlStart.cpp @@ -19,11 +19,11 @@ #include "StartCfgParam.h" using namespace std; -using namespace kbd_public; -using namespace kbd_dbms; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_dbms; +using namespace iot_sys; -kbd_sys::CSysCtrlStart::CSysCtrlStart(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo) +iot_sys::CSysCtrlStart::CSysCtrlStart(const iot_public::CSysInfoInterfacePtr &ptrSysInfo) :m_bShowConsole(false), m_bVerifyIP(true), m_nCheckInterval(50), @@ -32,13 +32,13 @@ kbd_sys::CSysCtrlStart::CSysCtrlStart(const kbd_public::CSysInfoInterfacePtr &pt { } -kbd_sys::CSysCtrlStart::~CSysCtrlStart() +iot_sys::CSysCtrlStart::~CSysCtrlStart() { m_objRunProcInfoTable.close(); m_ptrSysInfo.reset(); } -bool kbd_sys::CSysCtrlStart::initialize() +bool iot_sys::CSysCtrlStart::initialize() { if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) { @@ -59,7 +59,7 @@ bool kbd_sys::CSysCtrlStart::initialize() return true; } -bool kbd_sys::CSysCtrlStart::isSystemRunning() +bool iot_sys::CSysCtrlStart::isSystemRunning() { /** @brief 1.检查系统是否已经启动，判断表sys_run_proc_info是否存在 @@ -78,7 +78,7 @@ bool kbd_sys::CSysCtrlStart::isSystemRunning() } /* @brief 判断应用是否运行 */ -int kbd_sys::CSysCtrlStart::isAppRunning(int nAppId, bool &bRunning) +int iot_sys::CSysCtrlStart::isAppRunning(int nAppId, bool &bRunning) { bRunning = false; if (nAppId == CN_AppId_BASE) //< BASE应用，打不开表认为没有启动 @@ -122,7 +122,7 @@ int kbd_sys::CSysCtrlStart::isAppRunning(int nAppId, bool &bRunning) } /* @brief 启动整个系统 */ -bool kbd_sys::CSysCtrlStart::startSystem() +bool iot_sys::CSysCtrlStart::startSystem() { /* @brief 检查系统是否已启动 */ if (isSystemRunning()) @@ -148,7 +148,7 @@ bool kbd_sys::CSysCtrlStart::startSystem() } /* @brief 启动指定进程 */ -bool kbd_sys::CSysCtrlStart::startProcess(int nAppId, const std::string &strAppName, const kbd_public::SProcessInfo &stProcInfo) +bool iot_sys::CSysCtrlStart::startProcess(int nAppId, const std::string &strAppName, const iot_public::SProcessInfo &stProcInfo) { CUSTOM_LOGINFO(I18N_C("开始启动进程:%s"), stProcInfo.strProcName.c_str()); @@ -168,7 +168,7 @@ bool kbd_sys::CSysCtrlStart::startProcess(int nAppId, const std::string &strAppN } /* @brief 启动应用下所有进程 */ -bool kbd_sys::CSysCtrlStart::startAppProcess(int nAppId, const StartOrderToProcInfoMAP &mapProcInfo) +bool iot_sys::CSysCtrlStart::startAppProcess(int nAppId, const StartOrderToProcInfoMAP &mapProcInfo) { SAppInfo stAppInfo; if (kbdSuccess != m_ptrSysInfo->getAppInfoById(nAppId, stAppInfo)) @@ -193,7 +193,7 @@ bool kbd_sys::CSysCtrlStart::startAppProcess(int nAppId, const StartOrderToProcI } /* @brief 启动类型为单次运行的进程 */ -bool kbd_sys::CSysCtrlStart::startOnceProcess(int nAppId, const std::string &strAppName, const kbd_public::SProcessInfo &stProcInfo) +bool iot_sys::CSysCtrlStart::startOnceProcess(int nAppId, const std::string &strAppName, const iot_public::SProcessInfo &stProcInfo) { const string strModulePath = std::move(CFileUtil::getPathOfBinFile(stProcInfo.strProcName + CFileUtil::getProcSuffix())); if (strModulePath.empty()) @@ -228,7 +228,7 @@ bool kbd_sys::CSysCtrlStart::startOnceProcess(int nAppId, const std::string &str } /* @brief 启动进程启动类型为守护进程 的进程 */ -bool kbd_sys::CSysCtrlStart::startDaemonProcess(int nAppId, const std::string &strAppName, const kbd_public::SProcessInfo &stProcInfo) +bool iot_sys::CSysCtrlStart::startDaemonProcess(int nAppId, const std::string &strAppName, const iot_public::SProcessInfo &stProcInfo) { string strModulePath; CFileUtil::getPathOfBinFile(stProcInfo.strProcName + CFileUtil::getProcSuffix(), &strModulePath); @@ -270,7 +270,7 @@ bool kbd_sys::CSysCtrlStart::startDaemonProcess(int nAppId, const std::string &s } /* @brief 检查进程启动是否成功 */ -bool kbd_sys::CSysCtrlStart::checkProcessResult(int nAppId, const kbd_public::SProcessInfo &stProcInfo, const std::string &strParam) +bool iot_sys::CSysCtrlStart::checkProcessResult(int nAppId, const iot_public::SProcessInfo &stProcInfo, const std::string &strParam) { /* @brief 内存库服务启动成功前，打开表会失败 */ for (int i = 0; i < m_nCheckTime; ++i) @@ -328,7 +328,7 @@ bool kbd_sys::CSysCtrlStart::checkProcessResult(int nAppId, const kbd_public::SP } /* @brief 校验IP配置，防止计算机名和IP地址不匹配 */ -bool kbd_sys::CSysCtrlStart::verifyIP(const kbd_public::SNodeInfo &stLocalNodeInfo) +bool iot_sys::CSysCtrlStart::verifyIP(const iot_public::SNodeInfo &stLocalNodeInfo) { set setLocalIP; setLocalIP.insert("127.0.0.1"); //< 默认增加127.0.0.1，以支持未插网线时启动 @@ -458,7 +458,7 @@ bool kbd_sys::CSysCtrlStart::verifyIP(const kbd_public::SNodeInfo &stLocalNodeIn } /* @brief 启动指定应用 */ -bool kbd_sys::CSysCtrlStart::startApp(const std::string &strAppName) +bool iot_sys::CSysCtrlStart::startApp(const std::string &strAppName) { /* @brief 判断对应的应用是否已经启动 */ SAppInfo stAppInfo; @@ -517,7 +517,7 @@ bool kbd_sys::CSysCtrlStart::startApp(const std::string &strAppName) } /* @brief 加载配置文件 */ -bool kbd_sys::CSysCtrlStart::loadConfig() +bool iot_sys::CSysCtrlStart::loadConfig() { CStartCfgParam objCfg(m_ptrSysInfo); diff --git a/platform/src/sys/sys_ctrl/SysCtrlStart.h b/platform/src/sys/sys_ctrl/SysCtrlStart.h index 6dc908fd..3249c3e9 100644 --- a/platform/src/sys/sys_ctrl/SysCtrlStart.h +++ b/platform/src/sys/sys_ctrl/SysCtrlStart.h @@ -8,12 +8,12 @@ #include "rdb_api/CRdbAccessEx.h" #include "BaseCfgParam.h" -namespace kbd_sys +namespace iot_sys { class CSysCtrlStart { public: - CSysCtrlStart(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo); + CSysCtrlStart(const iot_public::CSysInfoInterfacePtr &ptrSysInfo); virtual ~CSysCtrlStart(); /** @@ -55,10 +55,10 @@ namespace kbd_sys @brief 启动应用下指定进程 @param int nAppId 应用ID @param const std::string & strAppName 应用名 - @param const kbd_public::SProcessInfo & stProcInfo 进程参数 + @param const iot_public::SProcessInfo & stProcInfo 进程参数 @return 成功返回true,失败返回false */ - bool startProcess(int nAppId, const std::string &strAppName, const kbd_public::SProcessInfo &stProcInfo); + bool startProcess(int nAppId, const std::string &strAppName, const iot_public::SProcessInfo &stProcInfo); /** @brief 启动应用下所有进程 @param int nAppId 应用ID @@ -70,44 +70,44 @@ namespace kbd_sys @brief 启动类型为单次运行的进程 @param int nAppId 应用ID @param const std::string & strAppName 应用名 - @param const kbd_public::SProcessInfo & stProcInfo 进程相关参数 + @param const iot_public::SProcessInfo & stProcInfo 进程相关参数 @return 成功返回true,失败返回false */ - bool startOnceProcess(int nAppId, const std::string &strAppName, const kbd_public::SProcessInfo &stProcInfo); + bool startOnceProcess(int nAppId, const std::string &strAppName, const iot_public::SProcessInfo &stProcInfo); /** @brief 启动进程启动类型为守护进程 的进程 @param int nAppId 应用ID @param const std::string & strAppName 应用名 - @param const kbd_public::SProcessInfo & stProcInfo 进程相关参数 + @param const iot_public::SProcessInfo & stProcInfo 进程相关参数 @return 成功返回true,失败返回false */ - bool startDaemonProcess(int nAppId, const std::string &strAppName, const kbd_public::SProcessInfo &stProcInfo); + bool startDaemonProcess(int nAppId, const std::string &strAppName, const iot_public::SProcessInfo &stProcInfo); /** @brief 检查进程启动是否成功 @param int nAppId 应用ID - @param const kbd_public::SProcessInfo & stProcInfo 进程相关参数 + @param const iot_public::SProcessInfo & stProcInfo 进程相关参数 @param const std::string & strParam 进程启动参数 @return 启动成功返回true，失败返回false */ - bool checkProcessResult(int nAppId, const kbd_public::SProcessInfo &stProcInfo, const std::string &strParam); + bool checkProcessResult(int nAppId, const iot_public::SProcessInfo &stProcInfo, const std::string &strParam); /** @brief 校验IP配置，防止计算机名和IP地址不匹配 - @param const kbd_public::SNodeInfo & stLocalNodeInfo 本节点配置信息 + @param const iot_public::SNodeInfo & stLocalNodeInfo 本节点配置信息 @return 匹配返回true，不匹配返回false */ - bool verifyIP(const kbd_public::SNodeInfo &stLocalNodeInfo); + bool verifyIP(const iot_public::SNodeInfo &stLocalNodeInfo); private: bool m_bShowConsole; //< 是否显示窗口 bool m_bVerifyIP; //< 是否校验计算机名和IP地址的匹配情况 int m_nCheckInterval; //< 检查间隔，单位ms int m_nCheckTime; //< 检查次数 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问 - kbd_dbms::CRdbAccessEx m_objRunProcInfoTable; //< 进程信息表 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问 + iot_dbms::CRdbAccessEx m_objRunProcInfoTable; //< 进程信息表 AppStartOderToProcInfoMAP m_mapAppStartOderToProcInfo; //< 本节点部署应用下的进程列表 - kbd_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 + iot_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 }; typedef boost::shared_ptr CSysCtrlStartPtr; -} //namespace kbd_sys \ No newline at end of file +} //namespace iot_sys \ No newline at end of file diff --git a/platform/src/sys/sys_ctrl/SysCtrlStop.cpp b/platform/src/sys/sys_ctrl/SysCtrlStop.cpp index 83c743e9..c25ded34 100644 --- a/platform/src/sys/sys_ctrl/SysCtrlStop.cpp +++ b/platform/src/sys/sys_ctrl/SysCtrlStop.cpp @@ -12,11 +12,11 @@ #include "StopCfgParam.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_dbms; -kbd_sys::CSysCtrlStop::CSysCtrlStop(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo) +iot_sys::CSysCtrlStop::CSysCtrlStop(const iot_public::CSysInfoInterfacePtr &ptrSysInfo) :m_nDomainId(CN_InvalidDomainId), m_strNodeName(""), m_nCheckInterval(50), @@ -25,14 +25,14 @@ kbd_sys::CSysCtrlStop::CSysCtrlStop(const kbd_public::CSysInfoInterfacePtr &ptrS { } -kbd_sys::CSysCtrlStop::~CSysCtrlStop() +iot_sys::CSysCtrlStop::~CSysCtrlStop() { m_objRunProcInfoTable.close(); m_ptrSysInfo.reset(); } /* @brief 初始化 */ -bool kbd_sys::CSysCtrlStop::initialize() +bool iot_sys::CSysCtrlStop::initialize() { //< 先判断系统是否已经启动，否则下一步的加载配置会失败 if (!isSystemRunning()) @@ -50,7 +50,7 @@ bool kbd_sys::CSysCtrlStop::initialize() } /* @brief 停止系统 */ -bool kbd_sys::CSysCtrlStop::stopSystem() +bool iot_sys::CSysCtrlStop::stopSystem() { /* @brief 检查系统是否已启动 */ if (!isSystemRunning()) @@ -75,7 +75,7 @@ bool kbd_sys::CSysCtrlStop::stopSystem() } /* @brief 停止指定应用 */ -bool kbd_sys::CSysCtrlStop::stopApp(const std::string &strAppName) +bool iot_sys::CSysCtrlStop::stopApp(const std::string &strAppName) { if (!isSystemRunning()) { @@ -127,7 +127,7 @@ bool kbd_sys::CSysCtrlStop::stopApp(const std::string &strAppName) } /* @brief 加载配置 */ -bool kbd_sys::CSysCtrlStop::loadConfig() +bool iot_sys::CSysCtrlStop::loadConfig() { CStopCfgParam objCfg(m_ptrSysInfo); @@ -152,7 +152,7 @@ bool kbd_sys::CSysCtrlStop::loadConfig() } /* @brief 系统是否已运行 */ -bool kbd_sys::CSysCtrlStop::isSystemRunning() +bool iot_sys::CSysCtrlStop::isSystemRunning() { if (!m_objRunProcInfoTable.open(CN_AppName_BASE.c_str(), CN_TN_SysRunProcInfo.c_str())) { @@ -165,7 +165,7 @@ bool kbd_sys::CSysCtrlStop::isSystemRunning() } /* @brief 除BASE应用外，是否有应用运行 */ -int kbd_sys::CSysCtrlStop::isAppRunningExcludeBASE(bool &bRunning) +int iot_sys::CSysCtrlStop::isAppRunningExcludeBASE(bool &bRunning) { bRunning = false; vector vecCond; @@ -191,7 +191,7 @@ int kbd_sys::CSysCtrlStop::isAppRunningExcludeBASE(bool &bRunning) } /* @brief 停止应用下的进程 */ -bool kbd_sys::CSysCtrlStop::stopAppProcess(int nAppId, const StartOrderToProcInfoMAP &mapProcInfo) +bool iot_sys::CSysCtrlStop::stopAppProcess(int nAppId, const StartOrderToProcInfoMAP &mapProcInfo) { SAppInfo stAppInfo; if (kbdSuccess != m_ptrSysInfo->getAppInfoById(nAppId, stAppInfo)) @@ -221,7 +221,7 @@ bool kbd_sys::CSysCtrlStop::stopAppProcess(int nAppId, const StartOrderToProcInf } /* @brief 停止进程 */ -bool kbd_sys::CSysCtrlStop::stopProcess(int nAppId, const std::string &strAppName, const kbd_public::SProcessInfo &stProcInfo) +bool iot_sys::CSysCtrlStop::stopProcess(int nAppId, const std::string &strAppName, const iot_public::SProcessInfo &stProcInfo) { CUSTOM_LOGINFO(I18N_C("开始停止进程:%s"), stProcInfo.strProcName.c_str()); @@ -253,7 +253,7 @@ bool kbd_sys::CSysCtrlStop::stopProcess(int nAppId, const std::string &strAppNam } /* @brief 停止进程启动类型为守护类型的进程 */ -bool kbd_sys::CSysCtrlStop::stopDaemonProcess(int nAppId, const std::string &strAppName, const kbd_public::SProcessInfo &stProcInfo) +bool iot_sys::CSysCtrlStop::stopDaemonProcess(int nAppId, const std::string &strAppName, const iot_public::SProcessInfo &stProcInfo) { if (!isProcessRunning(nAppId, strAppName, stProcInfo)) { @@ -275,7 +275,7 @@ bool kbd_sys::CSysCtrlStop::stopDaemonProcess(int nAppId, const std::string &str } /* @brief 进程是否正在运行 */ -bool kbd_sys::CSysCtrlStop::isProcessRunning(int nAppId, const std::string &strAppName, const kbd_public::SProcessInfo &stProcInfo) +bool iot_sys::CSysCtrlStop::isProcessRunning(int nAppId, const std::string &strAppName, const iot_public::SProcessInfo &stProcInfo) { string strArgs; if (nAppId != CN_AppId_BASE) @@ -292,7 +292,7 @@ bool kbd_sys::CSysCtrlStop::isProcessRunning(int nAppId, const std::string &strA } /* @brief 设置进程退出标识 */ -bool kbd_sys::CSysCtrlStop::setProcessToQuit(int nAppId, const kbd_public::SProcessInfo &stProcInfo) +bool iot_sys::CSysCtrlStop::setProcessToQuit(int nAppId, const iot_public::SProcessInfo &stProcInfo) { vector vecCond; CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_DOMAIN_ID, m_nDomainId); @@ -313,7 +313,7 @@ bool kbd_sys::CSysCtrlStop::setProcessToQuit(int nAppId, const kbd_public::SProc } /* @brief 等待进程退出 */ -bool kbd_sys::CSysCtrlStop::waitProcessQuit(int nAppId, const kbd_public::SProcessInfo &stProcInfo) +bool iot_sys::CSysCtrlStop::waitProcessQuit(int nAppId, const iot_public::SProcessInfo &stProcInfo) { vector vecCond; CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_DOMAIN_ID, m_nDomainId); @@ -348,7 +348,7 @@ bool kbd_sys::CSysCtrlStop::waitProcessQuit(int nAppId, const kbd_public::SProce } /* @brief 复位进程退出标识 */ -bool kbd_sys::CSysCtrlStop::resetProcessStartFlag(int nAppId, const kbd_public::SProcessInfo &stProcInfo) +bool iot_sys::CSysCtrlStop::resetProcessStartFlag(int nAppId, const iot_public::SProcessInfo &stProcInfo) { vector vecCol; CRdbPublic::addUpColumnInfo(vecCol, RUN_PROC_COL_PROC_ID, -1); diff --git a/platform/src/sys/sys_ctrl/SysCtrlStop.h b/platform/src/sys/sys_ctrl/SysCtrlStop.h index fb29ba48..4aab6dab 100644 --- a/platform/src/sys/sys_ctrl/SysCtrlStop.h +++ b/platform/src/sys/sys_ctrl/SysCtrlStop.h @@ -9,12 +9,12 @@ #include "rdb_api/CRdbMngInterface.h" #include "BaseCfgParam.h" -namespace kbd_sys +namespace iot_sys { class CSysCtrlStop { public: - CSysCtrlStop(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo); + CSysCtrlStop(const iot_public::CSysInfoInterfacePtr &ptrSysInfo); virtual ~CSysCtrlStop(); /** @@ -63,56 +63,56 @@ namespace kbd_sys @brief 停止进程 @param int nAppId 应用ID @param const std::string & strAppName 应用名 - @param const kbd_public::SProcessInfo & stProcInfo 进程参数 + @param const iot_public::SProcessInfo & stProcInfo 进程参数 @return 成功返回true,失败返回false */ - bool stopProcess(int nAppId, const std::string &strAppName, const kbd_public::SProcessInfo &stProcInfo); + bool stopProcess(int nAppId, const std::string &strAppName, const iot_public::SProcessInfo &stProcInfo); /** @brief 停止进程启动类型为守护类型的进程 @param int nAppId 应用ID @param const std::string & strAppName 应用名 - @param const kbd_public::SProcessInfo & stProcInfo 进程参数 + @param const iot_public::SProcessInfo & stProcInfo 进程参数 @return 成功返回true,失败返回false */ - bool stopDaemonProcess(int nAppId, const std::string &strAppName, const kbd_public::SProcessInfo &stProcInfo); + bool stopDaemonProcess(int nAppId, const std::string &strAppName, const iot_public::SProcessInfo &stProcInfo); /** @brief 进程是否正在运行 @param int nAppId 应用ID @param const std::string & strAppName 应用名 - @param const kbd_public::SProcessInfo & stProcInfo 进程参数 + @param const iot_public::SProcessInfo & stProcInfo 进程参数 @return true-运行,false-未运行 */ - bool isProcessRunning(int nAppId, const std::string &strAppName, const kbd_public::SProcessInfo &stProcInfo); + bool isProcessRunning(int nAppId, const std::string &strAppName, const iot_public::SProcessInfo &stProcInfo); /** @brief 设置进程退出标识 @param int nAppId 应用ID - @param const kbd_public::SProcessInfo & stProcInfo 进程列表 + @param const iot_public::SProcessInfo & stProcInfo 进程列表 @return 成功返回true,失败返回false */ - bool setProcessToQuit(int nAppId, const kbd_public::SProcessInfo &stProcInfo); + bool setProcessToQuit(int nAppId, const iot_public::SProcessInfo &stProcInfo); /** @brief 等待进程退出 @param int nAppId 应用ID - @param const kbd_public::SProcessInfo & stProcInfo 进程列表 + @param const iot_public::SProcessInfo & stProcInfo 进程列表 @return 成功返回true,失败返回false */ - bool waitProcessQuit(int nAppId, const kbd_public::SProcessInfo &stProcInfo); + bool waitProcessQuit(int nAppId, const iot_public::SProcessInfo &stProcInfo); /** @brief 复位进程退出标识 @param int nAppId 应用ID - @param const kbd_public::SProcessInfo & stProcInfo 进程列表 + @param const iot_public::SProcessInfo & stProcInfo 进程列表 @return 成功返回true,失败返回false */ - bool resetProcessStartFlag(int nAppId, const kbd_public::SProcessInfo &stProcInfo); + bool resetProcessStartFlag(int nAppId, const iot_public::SProcessInfo &stProcInfo); private: int m_nDomainId; //< 本机所属域 std::string m_strNodeName; //< 本机节点名 int m_nCheckInterval; //< 检查间隔，单位ms int m_nCheckTime; //< 检查次数 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问 AppStartOderToProcInfoMAP m_mapAppStartOderToProcInfo; //< 本节点部署应用下的进程列表 - kbd_dbms::CRdbAccessEx m_objRunProcInfoTable; //< 进程信息表 + iot_dbms::CRdbAccessEx m_objRunProcInfoTable; //< 进程信息表 }; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_ctrl/main.cpp b/platform/src/sys/sys_ctrl/main.cpp index f456e711..41478fe2 100644 --- a/platform/src/sys/sys_ctrl/main.cpp +++ b/platform/src/sys/sys_ctrl/main.cpp @@ -2,6 +2,6 @@ int main(int argc, char *argv[]) { - kbd_sys::CSysCtrlApp objApp; + iot_sys::CSysCtrlApp objApp; return objApp.main(argc, argv); } diff --git a/platform/src/sys/sys_dog_auth_api/DogAuthImpl.cpp b/platform/src/sys/sys_dog_auth_api/DogAuthImpl.cpp index bfb34ccc..c5497c81 100644 --- a/platform/src/sys/sys_dog_auth_api/DogAuthImpl.cpp +++ b/platform/src/sys/sys_dog_auth_api/DogAuthImpl.cpp @@ -32,7 +32,7 @@ #define PRODUCT_ID_EMS 43 #define PRODUCT_ID_PSMS 44 -kbd_sys::CDogAuthImpl::CDogAuthImpl() +iot_sys::CDogAuthImpl::CDogAuthImpl() { #ifndef DISABLE_DOG_AUTH m_nProductId = PRODUCT_ID_PSCADA; @@ -45,7 +45,7 @@ kbd_sys::CDogAuthImpl::CDogAuthImpl() #endif } -kbd_sys::CDogAuthImpl::~CDogAuthImpl() +iot_sys::CDogAuthImpl::~CDogAuthImpl() { #ifndef DISABLE_DOG_AUTH #ifdef KBD_X86 @@ -60,7 +60,7 @@ kbd_sys::CDogAuthImpl::~CDogAuthImpl() } //检查系统授权状态 -int kbd_sys::CDogAuthImpl::checkAuthStatus() +int iot_sys::CDogAuthImpl::checkAuthStatus() { if(m_nAuthModel == AUTH_MODEL_LICENCE) { @@ -77,14 +77,14 @@ int kbd_sys::CDogAuthImpl::checkAuthStatus() @brief 检查License授权状态 @return 成功返回kbdSucces,失败返回相应错误码 */ -int kbd_sys::CDogAuthImpl::checLicenseAuthStatus() +int iot_sys::CDogAuthImpl::checLicenseAuthStatus() { #ifndef DISABLE_DOG_AUTH QString strTemp ; QDate objCurDate = QDate::currentDate(); //当前日期 - std::string strLicensePath = kbd_public::CFileUtil::getAbsolutePath( "../../product/common/license/" ) ; + std::string strLicensePath = iot_public::CFileUtil::getAbsolutePath( "../../product/common/license/" ) ; if(!m_ptrLicenseAuth->checkRegistration(QString::fromStdString(strLicensePath), "license.txt",strTemp) ) { LOGINFO("授权校验失败,AppId:Time=[%s]！\n",strTemp.toStdString().c_str()); @@ -120,7 +120,7 @@ int kbd_sys::CDogAuthImpl::checLicenseAuthStatus() @brief 检查超级狗授权状态 @return 成功返回kbdSucces,失败返回相应错误码 */ -int kbd_sys::CDogAuthImpl::checkDogAuthStatus() +int iot_sys::CDogAuthImpl::checkDogAuthStatus() { #ifndef DISABLE_DOG_AUTH #ifdef KBD_X86 @@ -172,16 +172,16 @@ int kbd_sys::CDogAuthImpl::checkDogAuthStatus() } /* @brief 初始化 */ -int kbd_sys::CDogAuthImpl::initialize() +int iot_sys::CDogAuthImpl::initialize() { #ifndef DISABLE_DOG_AUTH //获取软件产品编号 不同编号对应不同ID //==================================================================================== - kbd_public::CCommonConfigParse objCfgParse; + iot_public::CCommonConfigParse objCfgParse; //加载配置文件，失败则使用默认值，构造函数中已设置 m_nProductId = PRODUCT_ID_PSCADA if(kbdSuccess == objCfgParse.load( - kbd_public::CFileUtil::getPathOfCfgFile("setup_config.xml",CN_DIR_PRODUCT))) + iot_public::CFileUtil::getPathOfCfgFile("setup_config.xml",CN_DIR_PRODUCT))) { //获取产品ID if(kbdSuccess != objCfgParse.getIntValue("setup_config","software_product_id", m_nProductId)) @@ -214,7 +214,7 @@ int kbd_sys::CDogAuthImpl::initialize() * 超级狗登录 * @return 成功返回kbdSuccess，失败返回kbdFailed */ -int kbd_sys::CDogAuthImpl::loginSupperDog(int nProductId) +int iot_sys::CDogAuthImpl::loginSupperDog(int nProductId) { #ifndef DISABLE_DOG_AUTH #ifdef KBD_X86 diff --git a/platform/src/sys/sys_dog_auth_api/DogAuthImpl.h b/platform/src/sys/sys_dog_auth_api/DogAuthImpl.h index 5506ce6b..044d6aaf 100644 --- a/platform/src/sys/sys_dog_auth_api/DogAuthImpl.h +++ b/platform/src/sys/sys_dog_auth_api/DogAuthImpl.h @@ -13,7 +13,7 @@ #endif #endif -namespace kbd_sys +namespace iot_sys { class CDogAuthImpl : public CDogAuthInterface { @@ -67,5 +67,5 @@ namespace kbd_sys typedef boost::shared_ptr CDogAuthImplPtr; } -//namespace kbd_sys +//namespace iot_sys diff --git a/platform/src/sys/sys_dog_auth_api/DogAuthInterface.cpp b/platform/src/sys/sys_dog_auth_api/DogAuthInterface.cpp index 32aeb081..e3e84351 100644 --- a/platform/src/sys/sys_dog_auth_api/DogAuthInterface.cpp +++ b/platform/src/sys/sys_dog_auth_api/DogAuthInterface.cpp @@ -7,9 +7,9 @@ #include "Common.h" #include "DogAuthImpl.h" -using namespace kbd_sys; +using namespace iot_sys; -SYS_DOG_AUTH_API CDogAuthInterfacePtr kbd_sys::getDogAuthInstance() +SYS_DOG_AUTH_API CDogAuthInterfacePtr iot_sys::getDogAuthInstance() { CDogAuthImplPtr ptrDogAuthImp = boost::make_shared(); if (ptrDogAuthImp != NULL) diff --git a/platform/src/sys/sys_dog_auth_check/mainwindow.cpp b/platform/src/sys/sys_dog_auth_check/mainwindow.cpp index a0219430..0729aa4e 100644 --- a/platform/src/sys/sys_dog_auth_check/mainwindow.cpp +++ b/platform/src/sys/sys_dog_auth_check/mainwindow.cpp @@ -4,7 +4,7 @@ #include "pub_logger_api/logger.h" #include "common/Common.h" -using namespace kbd_sys; +using namespace iot_sys; MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) @@ -16,7 +16,7 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->recheckBtn, &QPushButton::clicked, this, &MainWindow::slot_recheckBtn); - kbd_public::StartLogSystem(CN_AppName_BASE.c_str(), "sys_dog_auth_check"); + iot_public::StartLogSystem(CN_AppName_BASE.c_str(), "sys_dog_auth_check"); } diff --git a/platform/src/sys/sys_launcher_srv/CSysLauncher.cpp b/platform/src/sys/sys_launcher_srv/CSysLauncher.cpp index e8c9de67..e0d81ada 100644 --- a/platform/src/sys/sys_launcher_srv/CSysLauncher.cpp +++ b/platform/src/sys/sys_launcher_srv/CSysLauncher.cpp @@ -15,7 +15,7 @@ #include "CSysLauncher.h" -namespace kbd_sys +namespace iot_sys { CSysLauncher::CSysLauncher() @@ -125,15 +125,15 @@ bool CSysLauncher::doStart() { LOGINFO("doStart(): 开始启动系统"); - const std::string strPath = std::move(kbd_public::CFileUtil::getPathOfBinFile( - std::string("sys_ctrl") + kbd_public::CFileUtil::getProcSuffix())); + const std::string strPath = std::move(iot_public::CFileUtil::getPathOfBinFile( + std::string("sys_ctrl") + iot_public::CFileUtil::getProcSuffix())); if (strPath.empty()) { LOGERROR("未找到可执行文件sys_ctrl"); return false; } - const int nRc = kbd_public::CProcUtil::execScript(strPath, "-l"); + const int nRc = iot_public::CProcUtil::execScript(strPath, "-l"); if (kbdSuccess != nRc) { LOGERROR("doStart(): 启动系统失败\n%s\nRetrun value == %d", @@ -152,15 +152,15 @@ bool CSysLauncher::doStop() { LOGINFO("doStop(): 开始停止系统"); - const std::string strPath = std::move(kbd_public::CFileUtil::getPathOfBinFile( - std::string("sys_ctrl") + kbd_public::CFileUtil::getProcSuffix())); + const std::string strPath = std::move(iot_public::CFileUtil::getPathOfBinFile( + std::string("sys_ctrl") + iot_public::CFileUtil::getProcSuffix())); if (strPath.empty()) { LOGERROR("未找到可执行文件sys_ctrl"); return false; } - const int nRc = kbd_public::CProcUtil::execScript(strPath, "-s"); + const int nRc = iot_public::CProcUtil::execScript(strPath, "-s"); if (kbdSuccess != nRc) { LOGERROR("doStop(): 停止系统失败\n%s\nRetrun value == %d", @@ -175,5 +175,5 @@ bool CSysLauncher::doStop() return true; } -} //< kbd_sys +} //< iot_sys diff --git a/platform/src/sys/sys_launcher_srv/CSysLauncher.h b/platform/src/sys/sys_launcher_srv/CSysLauncher.h index ca59ad9f..f9a30a67 100644 --- a/platform/src/sys/sys_launcher_srv/CSysLauncher.h +++ b/platform/src/sys/sys_launcher_srv/CSysLauncher.h @@ -9,7 +9,7 @@ #pragma once -namespace kbd_sys +namespace iot_sys { //< 主窗口类 @@ -49,5 +49,5 @@ private: int m_nRetryCntBeforeStart; }; -} //< kbd_sys +} //< iot_sys diff --git a/platform/src/sys/sys_launcher_srv/MainLinux.cpp b/platform/src/sys/sys_launcher_srv/MainLinux.cpp index 063019d4..72152335 100644 --- a/platform/src/sys/sys_launcher_srv/MainLinux.cpp +++ b/platform/src/sys/sys_launcher_srv/MainLinux.cpp @@ -35,7 +35,7 @@ int main(int /*argc*/, char ** /*argv[]*/) signal(SIGQUIT, signalCallback); //< 启动日志 - kbd_public::StartLogSystem(CN_AppName_BASE.c_str(), "sys_launcher_srv"); + iot_public::StartLogSystem(CN_AppName_BASE.c_str(), "sys_launcher_srv"); //< 只允许以服务方式启动 { @@ -45,7 +45,7 @@ int main(int /*argc*/, char ** /*argv[]*/) LOGERROR("1 != nPPID, exit !"); //< 停止日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return EXIT_FAILURE; } @@ -53,7 +53,7 @@ int main(int /*argc*/, char ** /*argv[]*/) //< 处理业务 { - kbd_sys::CSysLauncher objLauncher; + iot_sys::CSysLauncher objLauncher; while (1) { @@ -68,7 +68,7 @@ int main(int /*argc*/, char ** /*argv[]*/) } //< 停止日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return EXIT_SUCCESS; } diff --git a/platform/src/sys/sys_launcher_srv/MainWindows.cpp b/platform/src/sys/sys_launcher_srv/MainWindows.cpp index 1a8f30a3..cdbbcf27 100644 --- a/platform/src/sys/sys_launcher_srv/MainWindows.cpp +++ b/platform/src/sys/sys_launcher_srv/MainWindows.cpp @@ -28,7 +28,7 @@ static SERVICE_STATUS g_stStatus; int main(int /*argc*/, char ** /*argv[]*/) { //< 启动日志 - kbd_public::StartLogSystem(CN_AppName_BASE.c_str(), "sys_launcher_srv"); + iot_public::StartLogSystem(CN_AppName_BASE.c_str(), "sys_launcher_srv"); //< 设置全局变量初始值 { @@ -56,7 +56,7 @@ int main(int /*argc*/, char ** /*argv[]*/) } //< 停止日志 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } @@ -88,7 +88,7 @@ void WINAPI serviceMain() //< 处理业务 { Sleep(15000); - kbd_sys::CSysLauncher objLauncher; + iot_sys::CSysLauncher objLauncher; while (1) { diff --git a/platform/src/sys/sys_license_auth_api/LicenseAuthImpl.cpp b/platform/src/sys/sys_license_auth_api/LicenseAuthImpl.cpp index 9b1522c5..1e4275c3 100644 --- a/platform/src/sys/sys_license_auth_api/LicenseAuthImpl.cpp +++ b/platform/src/sys/sys_license_auth_api/LicenseAuthImpl.cpp @@ -21,7 +21,7 @@ //#include "public/pub_logger_api/logger.h" //#include "pub_utility_api/CommonConfigParse.h" -namespace kbd_sys +namespace iot_sys { //< 注意：私钥不能写在发布出去的代码中，不排除通过分析编译后的二进制文件可以获得 diff --git a/platform/src/sys/sys_license_auth_api/LicenseAuthImpl.h b/platform/src/sys/sys_license_auth_api/LicenseAuthImpl.h index 5821dc35..409b9ad0 100644 --- a/platform/src/sys/sys_license_auth_api/LicenseAuthImpl.h +++ b/platform/src/sys/sys_license_auth_api/LicenseAuthImpl.h @@ -16,7 +16,7 @@ #include "sys_license_auth_api/LicenseAuthInterface.h" #include -namespace kbd_sys +namespace iot_sys { class CLicenseAuthImpl : public CLicenseAuthInterface { diff --git a/platform/src/sys/sys_license_auth_api/LicenseAuthInterface.cpp b/platform/src/sys/sys_license_auth_api/LicenseAuthInterface.cpp index bdaf0855..88ed061a 100644 --- a/platform/src/sys/sys_license_auth_api/LicenseAuthInterface.cpp +++ b/platform/src/sys/sys_license_auth_api/LicenseAuthInterface.cpp @@ -7,9 +7,9 @@ #include "Common.h" #include "LicenseAuthImpl.h" -using namespace kbd_sys; +using namespace iot_sys; -SYS_LICENSE_AUTH_API CLicenseAuthInterfacePtr kbd_sys::getLicenseAuthInstance() +SYS_LICENSE_AUTH_API CLicenseAuthInterfacePtr iot_sys::getLicenseAuthInstance() { CLicenseAuthImplPtr ptrLicenseAuthImp = boost::make_shared(); if (ptrLicenseAuthImp != NULL) diff --git a/platform/src/sys/sys_login_api/CLoginDlg.cpp b/platform/src/sys/sys_login_api/CLoginDlg.cpp index 6363c13e..1e8999f9 100644 --- a/platform/src/sys/sys_login_api/CLoginDlg.cpp +++ b/platform/src/sys/sys_login_api/CLoginDlg.cpp @@ -16,9 +16,9 @@ CLoginDlg::CLoginDlg(QWidget *parent) : ui(new Ui::CLoginDlg), m_pReadDb(Q_NULLPTR) { - const std::string strLanguage = std::move(kbd_public::getCurLanguage()); + const std::string strLanguage = std::move(iot_public::getCurLanguage()); const std::string strQmFile = std::move( - kbd_public::CFileUtil::getPathOfResFile( "sys_login_api/translate/" + strLanguage + ".qm" )); + iot_public::CFileUtil::getPathOfResFile( "sys_login_api/translate/" + strLanguage + ".qm" )); if ( !strQmFile.empty()) { auto *pTrans = new QTranslator; @@ -172,7 +172,7 @@ int CLoginDlg::initMember() { if(!m_pReadDb) { - m_pReadDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + m_pReadDb = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(!m_pReadDb) { qDebug()<<"create db object failed!"; diff --git a/platform/src/sys/sys_network_check/NetworkCfgParam.cpp b/platform/src/sys/sys_network_check/NetworkCfgParam.cpp index a6fe2b71..2eec3ce3 100644 --- a/platform/src/sys/sys_network_check/NetworkCfgParam.cpp +++ b/platform/src/sys/sys_network_check/NetworkCfgParam.cpp @@ -10,27 +10,27 @@ #include "NetworkCheckCommon.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_sys; #define PING_TIMEOUT "ping_timeout" #define PING_PERIOD "ping_period" #define PING_RETRY_TIME "ping_retry_time" -int kbd_sys::CNetworkCfgParam::m_nPingTimeoutMsec = 1000; -int kbd_sys::CNetworkCfgParam::m_nPingCheckIntervalMsec = 500; -int kbd_sys::CNetworkCfgParam::m_nPingRetryTime = 3; +int iot_sys::CNetworkCfgParam::m_nPingTimeoutMsec = 1000; +int iot_sys::CNetworkCfgParam::m_nPingCheckIntervalMsec = 500; +int iot_sys::CNetworkCfgParam::m_nPingRetryTime = 3; -kbd_sys::CNetworkCfgParam::CNetworkCfgParam() +iot_sys::CNetworkCfgParam::CNetworkCfgParam() { } -kbd_sys::CNetworkCfgParam::~CNetworkCfgParam() +iot_sys::CNetworkCfgParam::~CNetworkCfgParam() { } /* @brief 加载相关参数 */ -int kbd_sys::CNetworkCfgParam::load() +int iot_sys::CNetworkCfgParam::load() { CCommonConfigParse objCfgParse; if (kbdSuccess != objCfgParse.load(CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) @@ -54,19 +54,19 @@ int kbd_sys::CNetworkCfgParam::load() } /* @brief 获取ping超时时间，单位ms */ -int kbd_sys::CNetworkCfgParam::getPingTimeoutMsec() +int iot_sys::CNetworkCfgParam::getPingTimeoutMsec() { return m_nPingTimeoutMsec; } /* @brief 获取ping周期，单位ms */ -int kbd_sys::CNetworkCfgParam::getPingCheckIntervalMsec() +int iot_sys::CNetworkCfgParam::getPingCheckIntervalMsec() { return m_nPingCheckIntervalMsec; } /* @brief 获取ping失败时的重试次数 */ -int kbd_sys::CNetworkCfgParam::getPingRetryTime() +int iot_sys::CNetworkCfgParam::getPingRetryTime() { return m_nPingRetryTime; } diff --git a/platform/src/sys/sys_network_check/NetworkCfgParam.h b/platform/src/sys/sys_network_check/NetworkCfgParam.h index 765b571d..d1ea6afb 100644 --- a/platform/src/sys/sys_network_check/NetworkCfgParam.h +++ b/platform/src/sys/sys_network_check/NetworkCfgParam.h @@ -6,7 +6,7 @@ #pragma once #include "pub_sysinfo_api/SysInfoApi.h" -namespace kbd_sys +namespace iot_sys { class CNetworkCfgParam { @@ -41,4 +41,4 @@ namespace kbd_sys static int m_nPingRetryTime; //< ping失败时的重试次数 }; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_network_check/NetworkCheckApp.cpp b/platform/src/sys/sys_network_check/NetworkCheckApp.cpp index 2cf87ef2..22c0c859 100644 --- a/platform/src/sys/sys_network_check/NetworkCheckApp.cpp +++ b/platform/src/sys/sys_network_check/NetworkCheckApp.cpp @@ -7,22 +7,22 @@ #include "NetworkCfgParam.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_sys; -kbd_sys::CNetworkCheckApp::CNetworkCheckApp() +iot_sys::CNetworkCheckApp::CNetworkCheckApp() :m_ptrSysInfo(NULL), m_ptrProcMng(NULL), m_ptrNetworkTable(NULL) { } -kbd_sys::CNetworkCheckApp::~CNetworkCheckApp() +iot_sys::CNetworkCheckApp::~CNetworkCheckApp() { stop(); } -bool kbd_sys::CNetworkCheckApp::start(int argc, char *argv[], int &/*nStatus*/) +bool iot_sys::CNetworkCheckApp::start(int argc, char *argv[], int &/*nStatus*/) { //1.解析启动参数 if (!parseCmdLine(argc, argv)) @@ -73,7 +73,7 @@ bool kbd_sys::CNetworkCheckApp::start(int argc, char *argv[], int &/*nStatus*/) return true; } -bool kbd_sys::CNetworkCheckApp::stop() +bool iot_sys::CNetworkCheckApp::stop() { //6.清理业务资源 clean(); @@ -90,21 +90,21 @@ bool kbd_sys::CNetworkCheckApp::stop() } /* @brief 阻塞等待Service的关闭 */ -void kbd_sys::CNetworkCheckApp::waitForShutdown() +void iot_sys::CNetworkCheckApp::waitForShutdown() { m_objIOService.run(); return CBaseService::waitForShutdown(); } /* @brief 接收到信号时的回调 */ -void kbd_sys::CNetworkCheckApp::handleInterrupt(int nSignal) +void iot_sys::CNetworkCheckApp::handleInterrupt(int nSignal) { m_objIOService.stop(); return CBaseService::handleInterrupt(nSignal); } /* @brief 用来通知进程退出 */ -int kbd_sys::CNetworkCheckApp::toQuit() +int iot_sys::CNetworkCheckApp::toQuit() { LOGINFO("接收到进程退出通知"); if (m_ptrProcMng != NULL) @@ -117,27 +117,27 @@ int kbd_sys::CNetworkCheckApp::toQuit() } /* @brief 解析启动参数 */ -bool kbd_sys::CNetworkCheckApp::parseCmdLine(int /*argc*/, char *[]) +bool iot_sys::CNetworkCheckApp::parseCmdLine(int /*argc*/, char *[]) { m_strAppName = CN_AppName_BASE; return true; } /* @brief 判断同名同参数进程是否已经有实例在运行 */ -bool kbd_sys::CNetworkCheckApp::isAlreadyRunning() +bool iot_sys::CNetworkCheckApp::isAlreadyRunning() { return CSingleProcInstance::hasInstanceRunning(CN_ProcName_NetworkCheck); } /* @brief 初始化日志 */ -bool kbd_sys::CNetworkCheckApp::initLog() +bool iot_sys::CNetworkCheckApp::initLog() { StartLogSystem(m_strAppName.c_str(), CN_ProcName_NetworkCheck.c_str()); return true; } /* @brief 获取系统配置相关信息 */ -bool kbd_sys::CNetworkCheckApp::getSystemInfo() +bool iot_sys::CNetworkCheckApp::getSystemInfo() { if (!createSysInfoInstance(m_ptrSysInfo)) { @@ -155,7 +155,7 @@ bool kbd_sys::CNetworkCheckApp::getSystemInfo() } /* @brief 向进程管理注册 */ -bool kbd_sys::CNetworkCheckApp::registToProcMng() +bool iot_sys::CNetworkCheckApp::registToProcMng() { SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stLocalNodeInfo.nDomainId; @@ -181,7 +181,7 @@ bool kbd_sys::CNetworkCheckApp::registToProcMng() } /* @brief 取消向进程管理的注册 */ -bool kbd_sys::CNetworkCheckApp::unregistProcMng() +bool iot_sys::CNetworkCheckApp::unregistProcMng() { if (m_ptrProcMng != NULL) { @@ -193,7 +193,7 @@ bool kbd_sys::CNetworkCheckApp::unregistProcMng() } /* @brief 初始化业务资源 */ -bool kbd_sys::CNetworkCheckApp::initialize() +bool iot_sys::CNetworkCheckApp::initialize() { //1.加载配置文件 if (kbdSuccess != CNetworkCfgParam::load()) @@ -226,7 +226,7 @@ bool kbd_sys::CNetworkCheckApp::initialize() } /* @brief 清理业务资源 */ -bool kbd_sys::CNetworkCheckApp::clean() +bool iot_sys::CNetworkCheckApp::clean() { for (size_t i = 0; i < m_vecPingerPtr.size(); ++i) { @@ -239,7 +239,7 @@ bool kbd_sys::CNetworkCheckApp::clean() } /* @brief 初始化ping操作类 */ -bool kbd_sys::CNetworkCheckApp::initPinger() +bool iot_sys::CNetworkCheckApp::initPinger() { if (m_stLocalNodeInfo.nNicNum < 1) { diff --git a/platform/src/sys/sys_network_check/NetworkCheckApp.h b/platform/src/sys/sys_network_check/NetworkCheckApp.h index 759d5bd8..885b3a22 100644 --- a/platform/src/sys/sys_network_check/NetworkCheckApp.h +++ b/platform/src/sys/sys_network_check/NetworkCheckApp.h @@ -3,9 +3,9 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "Ping.h" -namespace kbd_sys +namespace iot_sys { - class CNetworkCheckApp : public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface + class CNetworkCheckApp : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CNetworkCheckApp(); @@ -100,11 +100,11 @@ namespace kbd_sys private: std::string m_strAppName; //< 应用名 - kbd_public::SNodeInfo m_stLocalNodeInfo; //< 本节点信息 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 + iot_public::SNodeInfo m_stLocalNodeInfo; //< 本节点信息 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库 + iot_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 CNetworkTableOperatePtr m_ptrNetworkTable; //< sys_run_network_info表操作类 boost::asio::io_service m_objIOService; //< asio服务类 std::vector m_vecPingerPtr; //< 需要ping的IP类列表 }; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_network_check/NetworkCheckCommon.h b/platform/src/sys/sys_network_check/NetworkCheckCommon.h index cbd1723a..a2dbab2e 100644 --- a/platform/src/sys/sys_network_check/NetworkCheckCommon.h +++ b/platform/src/sys/sys_network_check/NetworkCheckCommon.h @@ -6,7 +6,7 @@ #pragma once #include -namespace kbd_sys +namespace iot_sys { const std::string CN_ProcName_NetworkCheck = "sys_network_check"; //< 当前进程名 } diff --git a/platform/src/sys/sys_network_check/NetworkTableOperate.cpp b/platform/src/sys/sys_network_check/NetworkTableOperate.cpp index 8ae5f373..3e682f3c 100644 --- a/platform/src/sys/sys_network_check/NetworkTableOperate.cpp +++ b/platform/src/sys/sys_network_check/NetworkTableOperate.cpp @@ -6,16 +6,16 @@ #include "NetworkTableOperate.h" #include "sys_network_check_api/SysRunNetworkInfoTable.h" -using namespace kbd_sys; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_sys; +using namespace iot_public; +using namespace iot_dbms; -kbd_sys::CNetworkTableOperate::CNetworkTableOperate(const kbd_public::SNodeInfo &stLocalNodeInfo) +iot_sys::CNetworkTableOperate::CNetworkTableOperate(const iot_public::SNodeInfo &stLocalNodeInfo) :m_stLocalNodeInfo(stLocalNodeInfo) { } -kbd_sys::CNetworkTableOperate::~CNetworkTableOperate() +iot_sys::CNetworkTableOperate::~CNetworkTableOperate() { if (m_objNetworkTable.close()) { @@ -29,7 +29,7 @@ kbd_sys::CNetworkTableOperate::~CNetworkTableOperate() } /* @brief 初始化，主要打开内存表 */ -int kbd_sys::CNetworkTableOperate::initialize() +int iot_sys::CNetworkTableOperate::initialize() { /* @brief 打开表 */ if (kbdSuccess != openTable()) @@ -47,7 +47,7 @@ int kbd_sys::CNetworkTableOperate::initialize() } /* @brief 更新IP状态 */ -int kbd_sys::CNetworkTableOperate::updateState(const std::string &strGatewayIP, bool bNormal) +int iot_sys::CNetworkTableOperate::updateState(const std::string &strGatewayIP, bool bNormal) { CTableLockGuard tableLock(m_objNetworkTable); @@ -78,7 +78,7 @@ int kbd_sys::CNetworkTableOperate::updateState(const std::string &strGatewayIP, } /* @brief 打开表sys_run_network_info */ -int kbd_sys::CNetworkTableOperate::openTable() +int iot_sys::CNetworkTableOperate::openTable() { if (m_objNetworkTable.open(CN_AppName_BASE.c_str(), CN_TN_SysRunNetworkInfo.c_str())) { @@ -95,7 +95,7 @@ int kbd_sys::CNetworkTableOperate::openTable() } /* @brief 初始化表内容 */ -int kbd_sys::CNetworkTableOperate::initTable() +int iot_sys::CNetworkTableOperate::initTable() { CTableLockGuard tableLock(m_objNetworkTable); diff --git a/platform/src/sys/sys_network_check/NetworkTableOperate.h b/platform/src/sys/sys_network_check/NetworkTableOperate.h index a4b08b91..4a9aae26 100644 --- a/platform/src/sys/sys_network_check/NetworkTableOperate.h +++ b/platform/src/sys/sys_network_check/NetworkTableOperate.h @@ -7,16 +7,16 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "rdb_api/CRdbAccessEx.h" -namespace kbd_sys +namespace iot_sys { class CNetworkTableOperate { public: /** @brief 构造函数 - @param const kbd_public::SNodeInfo & stLocalNodeInfo 本机节点信息 + @param const iot_public::SNodeInfo & stLocalNodeInfo 本机节点信息 */ - CNetworkTableOperate(const kbd_public::SNodeInfo &stLocalNodeInfo); + CNetworkTableOperate(const iot_public::SNodeInfo &stLocalNodeInfo); virtual ~CNetworkTableOperate(); /** @@ -45,10 +45,10 @@ namespace kbd_sys int initTable(); private: - kbd_public::SNodeInfo m_stLocalNodeInfo; //< 本节点信息 - kbd_dbms::CRdbAccessEx m_objNetworkTable; //< sys_run_network_info内存表，暂时单线程操作，未加锁 + iot_public::SNodeInfo m_stLocalNodeInfo; //< 本节点信息 + iot_dbms::CRdbAccessEx m_objNetworkTable; //< sys_run_network_info内存表，暂时单线程操作，未加锁 }; typedef boost::shared_ptr CNetworkTableOperatePtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_network_check/Ping.cpp b/platform/src/sys/sys_network_check/Ping.cpp index 50f913ea..45755e9a 100644 --- a/platform/src/sys/sys_network_check/Ping.cpp +++ b/platform/src/sys/sys_network_check/Ping.cpp @@ -19,10 +19,10 @@ using boost::asio::ip::icmp_nonroot; using boost::asio::deadline_timer; namespace posix_time = boost::posix_time; -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_sys; -kbd_sys::CPinger::CPinger(boost::asio::io_service& ioService, +iot_sys::CPinger::CPinger(boost::asio::io_service& ioService, const std::string &strDstIP, const size_t nInitSequenceNum, const size_t nSequenceStep, @@ -50,7 +50,7 @@ kbd_sys::CPinger::CPinger(boost::asio::io_service& ioService, } -kbd_sys::CPinger::~CPinger() +iot_sys::CPinger::~CPinger() { m_bIsExit = true; boost::system::error_code ec; @@ -59,7 +59,7 @@ kbd_sys::CPinger::~CPinger() } /* @brief 初始化 */ -int kbd_sys::CPinger::initialize() +int iot_sys::CPinger::initialize() { m_nTimeoutMsec = CNetworkCfgParam::getPingTimeoutMsec(); //< ping超时时间 m_nCheckInterval = CNetworkCfgParam::getPingCheckIntervalMsec(); //< ping检查周期 @@ -90,7 +90,7 @@ int kbd_sys::CPinger::initialize() } /* @brief 启动发送 */ -void kbd_sys::CPinger::startSend() +void iot_sys::CPinger::startSend() { if (m_bIsExit) //< 退出 { @@ -147,7 +147,7 @@ void kbd_sys::CPinger::startSend() } /* @brief 超时处理 */ -void kbd_sys::CPinger::handleTimeout() +void iot_sys::CPinger::handleTimeout() { if (m_bIsExit) //< 退出 { @@ -210,7 +210,7 @@ void kbd_sys::CPinger::handleTimeout() } /* @brief 启动接收 */ -void kbd_sys::CPinger::startReceive() +void iot_sys::CPinger::startReceive() { // Discard any data already in the buffer. m_objReplyBuf.consume(m_objReplyBuf.size()); @@ -219,7 +219,7 @@ void kbd_sys::CPinger::startReceive() m_objSocket.async_receive(m_objReplyBuf.prepare(65536), boost::bind(&CPinger::handleReceive, this, _2)); } -void kbd_sys::CPinger::handleReceive(std::size_t ulLength) +void iot_sys::CPinger::handleReceive(std::size_t ulLength) { // The actual number of bytes received is committed to the buffer so that we // can extract it using a std::istream object. @@ -267,7 +267,7 @@ void kbd_sys::CPinger::handleReceive(std::size_t ulLength) } /* @brief 用来生成唯一索引 */ -uint16 kbd_sys::CPinger::getIdentifier() +uint16 iot_sys::CPinger::getIdentifier() { #if defined(BOOST_ASIO_WINDOWS) return static_cast(::GetCurrentProcessId()); diff --git a/platform/src/sys/sys_network_check/Ping.h b/platform/src/sys/sys_network_check/Ping.h index 8dbccbd3..02441e1f 100644 --- a/platform/src/sys/sys_network_check/Ping.h +++ b/platform/src/sys/sys_network_check/Ping.h @@ -13,7 +13,7 @@ #include "icmp_header.hpp" #include "ipv4_header.hpp" #include "NetworkTableOperate.h" -namespace kbd_sys +namespace iot_sys { class CPinger { @@ -83,4 +83,4 @@ namespace kbd_sys typedef boost::shared_ptr CPingerPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_network_check/main.cpp b/platform/src/sys/sys_network_check/main.cpp index 3803175f..5df156c8 100644 --- a/platform/src/sys/sys_network_check/main.cpp +++ b/platform/src/sys/sys_network_check/main.cpp @@ -7,6 +7,6 @@ int main(int argc, char *argv[]) { - kbd_sys::CNetworkCheckApp objApp; + iot_sys::CNetworkCheckApp objApp; return objApp.main(argc, argv); } diff --git a/platform/src/sys/sys_network_check_api/NetworkCheckImpl.cpp b/platform/src/sys/sys_network_check_api/NetworkCheckImpl.cpp index eab789c9..626cca35 100644 --- a/platform/src/sys/sys_network_check_api/NetworkCheckImpl.cpp +++ b/platform/src/sys/sys_network_check_api/NetworkCheckImpl.cpp @@ -7,16 +7,16 @@ #include "pub_logger_api/logger.h" #include "sys_network_check_api/SysRunNetworkInfoTable.h" -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_dbms; -kbd_sys::CNetworkCheckImpl::CNetworkCheckImpl() +iot_sys::CNetworkCheckImpl::CNetworkCheckImpl() { } -kbd_sys::CNetworkCheckImpl::~CNetworkCheckImpl() +iot_sys::CNetworkCheckImpl::~CNetworkCheckImpl() { if (m_objRunNetworkInfoTable.close()) { @@ -31,7 +31,7 @@ kbd_sys::CNetworkCheckImpl::~CNetworkCheckImpl() } /* @brief 获取当前网络是否正常 */ -bool kbd_sys::CNetworkCheckImpl::isNormal() +bool iot_sys::CNetworkCheckImpl::isNormal() { SNetworkState stNetSta; if (kbdSuccess != getLocalNetStatus(stNetSta)) @@ -51,7 +51,7 @@ bool kbd_sys::CNetworkCheckImpl::isNormal() } /* @brief 获取本节点网络状态 */ -int kbd_sys::CNetworkCheckImpl::getLocalNetStatus(SNetworkState &stNetSta) +int iot_sys::CNetworkCheckImpl::getLocalNetStatus(SNetworkState &stNetSta) { boost::mutex::scoped_lock lock(m_objMutex); CTableLockGuard tableLock(m_objRunNetworkInfoTable); @@ -76,7 +76,7 @@ int kbd_sys::CNetworkCheckImpl::getLocalNetStatus(SNetworkState &stNetSta) } /* @brief 初始化本类资源，主要打开内存表 */ -int kbd_sys::CNetworkCheckImpl::initialize() +int iot_sys::CNetworkCheckImpl::initialize() { //< 打开sys_run_network_info表 if (m_objRunNetworkInfoTable.open(CN_AppName_BASE.c_str(), CN_TN_SysRunNetworkInfo.c_str())) diff --git a/platform/src/sys/sys_network_check_api/NetworkCheckImpl.h b/platform/src/sys/sys_network_check_api/NetworkCheckImpl.h index c77ea0e1..825d3a0a 100644 --- a/platform/src/sys/sys_network_check_api/NetworkCheckImpl.h +++ b/platform/src/sys/sys_network_check_api/NetworkCheckImpl.h @@ -8,7 +8,7 @@ #include "sys_network_check_api/NetworkCheckInterface.h" #include "rdb_api/CRdbAccessEx.h" -namespace kbd_sys +namespace iot_sys { class CNetworkCheckImpl : public CNetworkCheckInterface { @@ -36,10 +36,10 @@ namespace kbd_sys int initialize(); private: - kbd_dbms::CRdbAccessEx m_objRunNetworkInfoTable; //< 管理内存表sys_network_info + iot_dbms::CRdbAccessEx m_objRunNetworkInfoTable; //< 管理内存表sys_network_info boost::mutex m_objMutex; //< 互斥量 }; typedef boost::shared_ptr CNetworkCheckImplPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_network_check_api/NetworkCheckInterface.cpp b/platform/src/sys/sys_network_check_api/NetworkCheckInterface.cpp index 177fe4aa..89149765 100644 --- a/platform/src/sys/sys_network_check_api/NetworkCheckInterface.cpp +++ b/platform/src/sys/sys_network_check_api/NetworkCheckInterface.cpp @@ -6,9 +6,9 @@ #include "sys_network_check_api/NetworkCheckInterface.h" #include "NetworkCheckImpl.h" -using namespace kbd_sys; +using namespace iot_sys; -NETWORK_CHECK_API CNetworkCheckInterfacePtr kbd_sys::getNetworkCheckInstance() +NETWORK_CHECK_API CNetworkCheckInterfacePtr iot_sys::getNetworkCheckInstance() { CNetworkCheckImplPtr ptrNetworkCheck = boost::make_shared(); if (ptrNetworkCheck != NULL) diff --git a/platform/src/sys/sys_node_mng/AppLevelArbitrate.cpp b/platform/src/sys/sys_node_mng/AppLevelArbitrate.cpp index 6d6bb08b..fcd54daa 100644 --- a/platform/src/sys/sys_node_mng/AppLevelArbitrate.cpp +++ b/platform/src/sys/sys_node_mng/AppLevelArbitrate.cpp @@ -9,13 +9,13 @@ #include "NodeMngMessage.pb.h" using namespace std; -using namespace kbd_sys; -using namespace kbd_public; -using namespace kbd_net; -using namespace kbd_idlfile; +using namespace iot_sys; +using namespace iot_public; +using namespace iot_net; +using namespace iot_idl; -kbd_sys::CAppLevelArbitrate::CAppLevelArbitrate(const kbd_public::SAppDeploy &stAppDeploy, - const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, +iot_sys::CAppLevelArbitrate::CAppLevelArbitrate(const iot_public::SAppDeploy &stAppDeploy, + const iot_public::CSysInfoInterfacePtr &ptrSysInfo, const CRdbOperatePtr &ptrRtdbOperate, const CNodeInfoMngPtr &ptrNodeInfoMng, const CLocalAppInfoMngPtr &ptrLocalAppInfoMng, @@ -41,7 +41,7 @@ kbd_sys::CAppLevelArbitrate::CAppLevelArbitrate(const kbd_public::SAppDeploy &st { } -kbd_sys::CAppLevelArbitrate::~CAppLevelArbitrate() +iot_sys::CAppLevelArbitrate::~CAppLevelArbitrate() { m_vecArbiterNodeInfo.clear(); m_ptrNetworkCheck.reset(); @@ -52,7 +52,7 @@ kbd_sys::CAppLevelArbitrate::~CAppLevelArbitrate() m_ptrSysInfo.reset(); } -int kbd_sys::CAppLevelArbitrate::initialize() +int iot_sys::CAppLevelArbitrate::initialize() { /* @brief 获取本类需要的相关的配置参数 */ m_nRedundancyStableThreshold = CNodeMngCfgParam::getRedundancyStableThreshold(); @@ -109,7 +109,7 @@ int kbd_sys::CAppLevelArbitrate::initialize() } /* @brief 处理接收的冗余切换指令 */ -int kbd_sys::CAppLevelArbitrate::handleRecvRedundancyCmd(const SRedundancyCmd &stRedundancyCmd) +int iot_sys::CAppLevelArbitrate::handleRecvRedundancyCmd(const SRedundancyCmd &stRedundancyCmd) { if (m_stAppInfoKey.strNodeName == stRedundancyCmd.strArbiterNode) { @@ -123,7 +123,7 @@ int kbd_sys::CAppLevelArbitrate::handleRecvRedundancyCmd(const SRedundancyCmd &s } /* @brief 进行裁决 */ -int kbd_sys::CAppLevelArbitrate::arbitrate() +int iot_sys::CAppLevelArbitrate::arbitrate() { /* @brief 先执行切换命令，如果当前没有切换命令，直接返回 */ doSwitch(); @@ -164,7 +164,7 @@ int kbd_sys::CAppLevelArbitrate::arbitrate() } /* @brief 更新本应用的冗余状态信息 */ -int kbd_sys::CAppLevelArbitrate::updateAppRedundancyInfo(bool &bLocalNodeIsActive) +int iot_sys::CAppLevelArbitrate::updateAppRedundancyInfo(bool &bLocalNodeIsActive) { /* @brief 遍历本应用所有部署的节点 */ int nRet = kbdSuccess; @@ -202,7 +202,7 @@ int kbd_sys::CAppLevelArbitrate::updateAppRedundancyInfo(bool &bLocalNodeIsActiv } /* @brief 更新本机的网络状态 */ -int kbd_sys::CAppLevelArbitrate::updateLocalNetworkState() +int iot_sys::CAppLevelArbitrate::updateLocalNetworkState() { if (m_ptrNetworkCheck->isNormal()) { @@ -225,7 +225,7 @@ int kbd_sys::CAppLevelArbitrate::updateLocalNetworkState() } /* @brief 判断本机是否裁决者 */ -bool kbd_sys::CAppLevelArbitrate::isArbiter() +bool iot_sys::CAppLevelArbitrate::isArbiter() { bool bRet = false; /* @brief 查找节点可用，并且优先级最高的节点 */ @@ -246,7 +246,7 @@ bool kbd_sys::CAppLevelArbitrate::isArbiter() } /* @brief 判断当前是否需要执行裁决 */ -bool kbd_sys::CAppLevelArbitrate::isNeedArbitrate() +bool iot_sys::CAppLevelArbitrate::isNeedArbitrate() { if (!isArbiter()) { @@ -278,7 +278,7 @@ bool kbd_sys::CAppLevelArbitrate::isNeedArbitrate() } /* @brief 收集节点的状态 */ -void kbd_sys::CAppLevelArbitrate::collectNodeStatus() +void iot_sys::CAppLevelArbitrate::collectNodeStatus() { m_nActiveNodeCount = 0; m_nMasterNodeCount = 0; @@ -316,7 +316,7 @@ void kbd_sys::CAppLevelArbitrate::collectNodeStatus() } /* @brief 进行裁决 */ -int kbd_sys::CAppLevelArbitrate::doArbitrate() +int iot_sys::CAppLevelArbitrate::doArbitrate() { int nRet = kbdFailed; if (m_nMasterNodeCount == 0) @@ -336,7 +336,7 @@ int kbd_sys::CAppLevelArbitrate::doArbitrate() } /* @brief 当前所有节点的状态是否已经稳定 */ -bool kbd_sys::CAppLevelArbitrate::isAllNodeStatusAlreadySteady() +bool iot_sys::CAppLevelArbitrate::isAllNodeStatusAlreadySteady() { /** @brief 同时满足以下条件认为节点不稳定 @@ -367,7 +367,7 @@ bool kbd_sys::CAppLevelArbitrate::isAllNodeStatusAlreadySteady() } /* @brief 无主时的裁决 */ -int kbd_sys::CAppLevelArbitrate::arbitrateWhenNoMaster() +int iot_sys::CAppLevelArbitrate::arbitrateWhenNoMaster() { int nRet = kbdFailed; if (m_nHasMasterNodeCount == 0) @@ -387,7 +387,7 @@ int kbd_sys::CAppLevelArbitrate::arbitrateWhenNoMaster() } /* @brief 无 有主 时的裁决 */ -int kbd_sys::CAppLevelArbitrate::arbitrateWhenNoHasMaster() +int iot_sys::CAppLevelArbitrate::arbitrateWhenNoHasMaster() { /* @brief 节点状态稳定情况下，选举优先级最高的节点升主，否则等待下一轮 */ if (isAllNodeStatusAlreadySteady()) @@ -424,7 +424,7 @@ int kbd_sys::CAppLevelArbitrate::arbitrateWhenNoHasMaster() } /* @brief 有一个主时的裁决 */ -int kbd_sys::CAppLevelArbitrate::arbitrateWhenOneMaster() +int iot_sys::CAppLevelArbitrate::arbitrateWhenOneMaster() { /** @brief 处理如下情况： @@ -474,7 +474,7 @@ int kbd_sys::CAppLevelArbitrate::arbitrateWhenOneMaster() } /* @brief 有一个有主时的裁决 */ -int kbd_sys::CAppLevelArbitrate::arbitrateWhenOneHasMaster() +int iot_sys::CAppLevelArbitrate::arbitrateWhenOneHasMaster() { /* @brief 找到有主运行的节点 */ for (size_t i = 0; i < m_vecArbiterNodeInfo.size(); ++i) @@ -517,7 +517,7 @@ int kbd_sys::CAppLevelArbitrate::arbitrateWhenOneHasMaster() } /* @brief 有多主时的裁决 */ -int kbd_sys::CAppLevelArbitrate::arbitrateWhenMultiMaster() +int iot_sys::CAppLevelArbitrate::arbitrateWhenMultiMaster() { /* @brief 多主情况下，将优先级低的为主的节点降为非主非备状态 */ for (int i = static_cast(m_vecArbiterNodeInfo.size()) - 1; i > 0; --i) @@ -537,7 +537,7 @@ int kbd_sys::CAppLevelArbitrate::arbitrateWhenMultiMaster() } /* @brief 有多个 有主 时的裁决 */ -int kbd_sys::CAppLevelArbitrate::arbitrateWhenMultiHasMater() +int iot_sys::CAppLevelArbitrate::arbitrateWhenMultiHasMater() { /* @brief 有多个有主节点（可用的情况下），将低优先级的节点先降为非主非备(可用)，最高优先级的节点升主 */ for (int i = static_cast(m_vecArbiterNodeInfo.size()) - 1; i > 0; --i) @@ -559,7 +559,7 @@ int kbd_sys::CAppLevelArbitrate::arbitrateWhenMultiHasMater() } /* @brief 本机网络不正常时的裁决 */ -int kbd_sys::CAppLevelArbitrate::arbitrateWhenLocalNotAvailable() +int iot_sys::CAppLevelArbitrate::arbitrateWhenLocalNotAvailable() { for (size_t i = 0; i < m_vecArbiterNodeInfo.size(); ++i) { @@ -583,7 +583,7 @@ int kbd_sys::CAppLevelArbitrate::arbitrateWhenLocalNotAvailable() } /* @brief 调度应用的主备状态 */ -int kbd_sys::CAppLevelArbitrate::scheduleNode(const SAppInfoKey &stAppKey, bool bMaster, bool bSlave) +int iot_sys::CAppLevelArbitrate::scheduleNode(const SAppInfoKey &stAppKey, bool bMaster, bool bSlave) { SRedundancyCmd stRedundancyCmd; stRedundancyCmd.nDomainId = stAppKey.nDomainId; @@ -610,13 +610,13 @@ int kbd_sys::CAppLevelArbitrate::scheduleNode(const SAppInfoKey &stAppKey, bool } /* @brief 从表sys_redundancy_cmd中删除指定记录 */ -int kbd_sys::CAppLevelArbitrate::deleteRedundancyCmdFromTable(const SAppInfoKey &stAppInfoKey) +int iot_sys::CAppLevelArbitrate::deleteRedundancyCmdFromTable(const SAppInfoKey &stAppInfoKey) { SRunRedundancyCmdKey stKey(stAppInfoKey.nDomainId, stAppInfoKey.nAppId, stAppInfoKey.strNodeName.c_str()); return m_ptrRtdbOperate->deleteFromRedundancyCmd(stKey); } -int kbd_sys::CAppLevelArbitrate::handleRedundancyCmd(const SRedundancyCmd &stRedundancyCmd) +int iot_sys::CAppLevelArbitrate::handleRedundancyCmd(const SRedundancyCmd &stRedundancyCmd) { LOGINFO("处理冗余切换命令.域[%d],应用[%d],切换节点[%s],仲裁节点[%s],可用[%d],为主[%d],为备[%d]", stRedundancyCmd.nDomainId, stRedundancyCmd.nAppId, stRedundancyCmd.strSwitchNode.c_str(), @@ -653,7 +653,7 @@ int kbd_sys::CAppLevelArbitrate::handleRedundancyCmd(const SRedundancyCmd &stRed } /* @brief 将冗余切换指令写入内存表中，供各个应用程序进行冗余切换 */ -int kbd_sys::CAppLevelArbitrate::insertRedundancyCmdToTable(const SRedundancyCmd &stRedundancyCmd) +int iot_sys::CAppLevelArbitrate::insertRedundancyCmdToTable(const SRedundancyCmd &stRedundancyCmd) { SRunRedundancyCmdKey stKey(stRedundancyCmd.nDomainId, stRedundancyCmd.nAppId, stRedundancyCmd.strSwitchNode); SRunRedundancyCmd stRecord; @@ -666,7 +666,7 @@ int kbd_sys::CAppLevelArbitrate::insertRedundancyCmdToTable(const SRedundancyCmd } /* @brief 处理切换过程中，又接收到的变化的冗余切换命令 */ -int kbd_sys::CAppLevelArbitrate::handleChangedSwtichCmd(const SRedundancyCmd &stRedundancyCmd) +int iot_sys::CAppLevelArbitrate::handleChangedSwtichCmd(const SRedundancyCmd &stRedundancyCmd) { int nRet = kbdSuccess; /* @brief 正在切换中，如果冗余指令发生变化 */ @@ -726,7 +726,7 @@ int kbd_sys::CAppLevelArbitrate::handleChangedSwtichCmd(const SRedundancyCmd &st } /* @brief 执行切换 */ -void kbd_sys::CAppLevelArbitrate::doSwitch() +void iot_sys::CAppLevelArbitrate::doSwitch() { /* @brief 未执行切换，直接返回成功 */ if (!m_bSwitching) @@ -798,7 +798,7 @@ void kbd_sys::CAppLevelArbitrate::doSwitch() } /* @brief 本节点是裁决节点时，将裁决命令通过消息总线发送出去 */ -int kbd_sys::CAppLevelArbitrate::sendScheduleCmd(const SRedundancyCmd &stRedundancyCmd) +int iot_sys::CAppLevelArbitrate::sendScheduleCmd(const SRedundancyCmd &stRedundancyCmd) { /* @brief 如果是本机是 被调度节点，则不需要发送，因为已经将切换命令插入到内存表中了 */ if (stRedundancyCmd.strSwitchNode == m_stLocalNodeInfo.strName) @@ -844,7 +844,7 @@ int kbd_sys::CAppLevelArbitrate::sendScheduleCmd(const SRedundancyCmd &stRedunda } /* @brief 接收切换，进行相关清理 */ -void kbd_sys::CAppLevelArbitrate::endSwitch() +void iot_sys::CAppLevelArbitrate::endSwitch() { /* @brief 切换完成，复位切换标识，目前只有在切换完成和切换超时时，才会复位该标识 */ m_bSwitching = false; diff --git a/platform/src/sys/sys_node_mng/AppLevelArbitrate.h b/platform/src/sys/sys_node_mng/AppLevelArbitrate.h index ed905d99..32ddfab2 100644 --- a/platform/src/sys/sys_node_mng/AppLevelArbitrate.h +++ b/platform/src/sys/sys_node_mng/AppLevelArbitrate.h @@ -13,22 +13,22 @@ #include "LocalAppInfoMng.h" #include "RemoteAppInfoMng.h" -namespace kbd_sys +namespace iot_sys { class CAppLevelArbitrate { public: /** @brief 应用裁决类 - @param const kbd_public::CSysInfoInterfacePtr & ptrSysInfo 系统信息访问库 + @param const iot_public::CSysInfoInterfacePtr & ptrSysInfo 系统信息访问库 @param const CRdbOperatePtr & ptrRtdbOperate 内存表操作类 - @param const kbd_public::SAppDeploy & stAppDeploy 需要管理的应用的配置信息 + @param const iot_public::SAppDeploy & stAppDeploy 需要管理的应用的配置信息 @param const CNodeInfoMngPtr & ptrNodeInfoMng 应用冗余状态管理类 @param const CLocalAppInfoMngPtr & ptrLocalAppInfoMng 本机应用状态管理类 @param const CRemoteAppInfoMngPtr & ptrRemoteAppInfoMng 非本机应用状态管理类 */ - CAppLevelArbitrate(const kbd_public::SAppDeploy &stAppDeploy, - const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, + CAppLevelArbitrate(const iot_public::SAppDeploy &stAppDeploy, + const iot_public::CSysInfoInterfacePtr &ptrSysInfo, const CRdbOperatePtr &ptrRtdbOperate, const CNodeInfoMngPtr &ptrNodeInfoMng, const CLocalAppInfoMngPtr &ptrLocalAppInfoMng, @@ -164,13 +164,13 @@ namespace kbd_sys void endSwitch(); private: - kbd_public::SAppDeploy m_stAppDeploy; //< 要管理的应用的配置信息 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库 + iot_public::SAppDeploy m_stAppDeploy; //< 要管理的应用的配置信息 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库 CRdbOperatePtr m_ptrRtdbOperate; //< 内存表操作类 CNodeInfoMngPtr m_ptrNodeInfoMng; //< 应用冗余状态管理类 CLocalAppInfoMngPtr m_ptrLocalAppInfoMng; //< 本机的应用冗余状态管理类 CRemoteAppInfoMngPtr m_ptrRemoteAppInfoMng; //< 非本机的应用冗余状态管理类 - kbd_sys::CNetworkCheckInterfacePtr m_ptrNetworkCheck; //< 网络检测访问库 + iot_sys::CNetworkCheckInterfacePtr m_ptrNetworkCheck; //< 网络检测访问库 int m_nRedundancyStableThreshold; //< 冗余状态稳定次数限制，超过此数才认为冗余状态已经稳定 int m_nNetworkStableThreshold; //< 网络状态稳定持续次数，超过此数才认为该节点的网络状态稳定 @@ -185,10 +185,10 @@ namespace kbd_sys int64 m_lSwitchStartTime; //< 切换起始时间，用于计算是否切换超时 SAppInfoKey m_stAppInfoKey; //< 本类管理的应用主键 - kbd_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 + iot_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 ArbiterNodeInfoSeq m_vecArbiterNodeInfo; //< 记录着部署中的8机冗余(仅填充配置的) SRedundancyCmd m_stCurRedundancyCmd; //< 当前正在执行的切换命令 - kbd_net::CMbCommunicator m_objCommunicator; //< 消息总线通信器 + iot_net::CMbCommunicator m_objCommunicator; //< 消息总线通信器 }; typedef boost::shared_ptr CAppLevelArbitratePtr; diff --git a/platform/src/sys/sys_node_mng/HeartbeatCheckThread.cpp b/platform/src/sys/sys_node_mng/HeartbeatCheckThread.cpp index b49f85eb..1d2bfba0 100644 --- a/platform/src/sys/sys_node_mng/HeartbeatCheckThread.cpp +++ b/platform/src/sys/sys_node_mng/HeartbeatCheckThread.cpp @@ -5,7 +5,7 @@ */ #include "HeartbeatCheckThread.h" -kbd_sys::CHeartbeatCheckThread::CHeartbeatCheckThread(const CLocalAppInfoMngPtr &ptrLocalAppInfoMng, +iot_sys::CHeartbeatCheckThread::CHeartbeatCheckThread(const CLocalAppInfoMngPtr &ptrLocalAppInfoMng, const CRemoteAppInfoMngPtr &ptrRemoteAppInfoMng) :CTimerThreadBase("CHeartbeatCheckThread", 200), m_ptrLocalAppInfoMng(ptrLocalAppInfoMng), @@ -13,13 +13,13 @@ kbd_sys::CHeartbeatCheckThread::CHeartbeatCheckThread(const CLocalAppInfoMngPtr { } -kbd_sys::CHeartbeatCheckThread::~CHeartbeatCheckThread() +iot_sys::CHeartbeatCheckThread::~CHeartbeatCheckThread() { m_ptrRemoteAppInfoMng.reset(); m_ptrLocalAppInfoMng.reset(); } -void kbd_sys::CHeartbeatCheckThread::execute() +void iot_sys::CHeartbeatCheckThread::execute() { if (m_ptrLocalAppInfoMng != NULL) { @@ -32,7 +32,7 @@ void kbd_sys::CHeartbeatCheckThread::execute() } } -int kbd_sys::CHeartbeatCheckThread::initialize() +int iot_sys::CHeartbeatCheckThread::initialize() { m_nRunPeriodMsec = CNodeMngCfgParam::getHeartbeatCheckPeriod(); //< 线程运行周期 return kbdSuccess; diff --git a/platform/src/sys/sys_node_mng/HeartbeatCheckThread.h b/platform/src/sys/sys_node_mng/HeartbeatCheckThread.h index ce0ec559..7f7680f6 100644 --- a/platform/src/sys/sys_node_mng/HeartbeatCheckThread.h +++ b/platform/src/sys/sys_node_mng/HeartbeatCheckThread.h @@ -8,9 +8,9 @@ #include "LocalAppInfoMng.h" #include "RemoteAppInfoMng.h" -namespace kbd_sys +namespace iot_sys { - class CHeartbeatCheckThread : public kbd_public::CTimerThreadBase + class CHeartbeatCheckThread : public iot_public::CTimerThreadBase { public: CHeartbeatCheckThread(const CLocalAppInfoMngPtr &ptrLocalAppInfoMng, const CRemoteAppInfoMngPtr &ptrRemoteAppInfoMng); @@ -33,4 +33,4 @@ namespace kbd_sys }; typedef boost::shared_ptr CHeartbeatCheckThreadPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_node_mng/LocalAppInfoMng.cpp b/platform/src/sys/sys_node_mng/LocalAppInfoMng.cpp index aeb2f196..3cb4b4e9 100644 --- a/platform/src/sys/sys_node_mng/LocalAppInfoMng.cpp +++ b/platform/src/sys/sys_node_mng/LocalAppInfoMng.cpp @@ -10,12 +10,12 @@ #include "common/MessageChannel.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_net; -using namespace kbd_idlfile; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_net; +using namespace iot_idl; -kbd_sys::CLocalAppInfoMng::CLocalAppInfoMng(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, +iot_sys::CLocalAppInfoMng::CLocalAppInfoMng(const iot_public::CSysInfoInterfacePtr &ptrSysInfo, const CRdbOperatePtr &ptrRtdbOperate, const CNodeInfoMngPtr &ptrNodeInfoMng) :m_ptrSysInfo(ptrSysInfo), @@ -26,14 +26,14 @@ kbd_sys::CLocalAppInfoMng::CLocalAppInfoMng(const kbd_public::CSysInfoInterfaceP { } -kbd_sys::CLocalAppInfoMng::~CLocalAppInfoMng() +iot_sys::CLocalAppInfoMng::~CLocalAppInfoMng() { m_ptrNodeInfoMng.reset(); m_ptrRtdbOperate.reset(); m_ptrSysInfo.reset(); } -void kbd_sys::CLocalAppInfoMng::checkLocalHeartbeat() +void iot_sys::CLocalAppInfoMng::checkLocalHeartbeat() { /* @brief 遍历本机的的所有应用，同时打包成protobuf消息，然后发送到消息总线 */ SNodeHeartbeatMsg stHeartbeat; @@ -65,7 +65,7 @@ void kbd_sys::CLocalAppInfoMng::checkLocalHeartbeat() sendLocalNodeInfo(stHeartbeat); } -int kbd_sys::CLocalAppInfoMng::initialize() +int iot_sys::CLocalAppInfoMng::initialize() { m_nLocalHeartbeatTimeoutMsec = CNodeMngCfgParam::getLocalHeartbeatTimeoutMsec(); m_nCheckPeriodMsec = CNodeMngCfgParam::getHeartbeatCheckPeriod(); @@ -124,7 +124,7 @@ int kbd_sys::CLocalAppInfoMng::initialize() } /* @brief 设置切换失败标识 */ -int kbd_sys::CLocalAppInfoMng::setSwitchFailedFlag(const SAppInfoKey &stKey) +int iot_sys::CLocalAppInfoMng::setSwitchFailedFlag(const SAppInfoKey &stKey) { boost::mutex::scoped_lock lock(m_objNodeInfoMutex); if (stKey.nAppId == CN_AppId_All) @@ -159,7 +159,7 @@ int kbd_sys::CLocalAppInfoMng::setSwitchFailedFlag(const SAppInfoKey &stKey) } /* @brief 更新传入的应用的冗余状态信息 */ -int kbd_sys::CLocalAppInfoMng::updateLocalNodeInfo(SAppHeartbeatInfo &stLocalNodeInfo) +int iot_sys::CLocalAppInfoMng::updateLocalNodeInfo(SAppHeartbeatInfo &stLocalNodeInfo) { /* @brief 从sys_run_app_info获取应用信息 */ STableRunAppInfo stRunAppInfo; @@ -268,14 +268,14 @@ int kbd_sys::CLocalAppInfoMng::updateLocalNodeInfo(SAppHeartbeatInfo &stLocalNod } /* @brief 获取本机各个应用的冗余状态信息 */ -int kbd_sys::CLocalAppInfoMng::getLocalRunAppInfo(const SAppInfoKey &stAppInfoKey, STableRunAppInfo &stRunAppInfo) +int iot_sys::CLocalAppInfoMng::getLocalRunAppInfo(const SAppInfoKey &stAppInfoKey, STableRunAppInfo &stRunAppInfo) { STableRunAppInfoKey stKey(stAppInfoKey.nDomainId, stAppInfoKey.nAppId, stAppInfoKey.strNodeName); return m_ptrRtdbOperate->getLocalRunAppInfo(stKey, stRunAppInfo); } /* @brief 发送本节点的应用的冗余状态信息 */ -void kbd_sys::CLocalAppInfoMng::sendLocalNodeInfo(const kbd_idlfile::SNodeHeartbeatMsg &stHeartbeat) +void iot_sys::CLocalAppInfoMng::sendLocalNodeInfo(const iot_idl::SNodeHeartbeatMsg &stHeartbeat) { if (stHeartbeat.vecappheartbeat().empty()) { diff --git a/platform/src/sys/sys_node_mng/LocalAppInfoMng.h b/platform/src/sys/sys_node_mng/LocalAppInfoMng.h index 0fbf6985..fbe5f564 100644 --- a/platform/src/sys/sys_node_mng/LocalAppInfoMng.h +++ b/platform/src/sys/sys_node_mng/LocalAppInfoMng.h @@ -10,18 +10,18 @@ #include "NodeMngMessage.pb.h" #include "NodeInfoMng.h" -namespace kbd_sys +namespace iot_sys { class CLocalAppInfoMng { public: /** @brief 构造函数 - @param const kbd_public::CSysInfoInterfacePtr & ptrSysInfo 系统信息访问库 + @param const iot_public::CSysInfoInterfacePtr & ptrSysInfo 系统信息访问库 @param const CRdbOperatePtr & ptrRtdbOperate 内存表操作类 @param const CNodeInfoMngPtr & ptrNodeInfoMng 节点的冗余状态管理类 */ - CLocalAppInfoMng(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, + CLocalAppInfoMng(const iot_public::CSysInfoInterfacePtr &ptrSysInfo, const CRdbOperatePtr &ptrRtdbOperate, const CNodeInfoMngPtr &ptrNodeInfoMng); virtual ~CLocalAppInfoMng(); @@ -56,23 +56,23 @@ namespace kbd_sys int getLocalRunAppInfo(const SAppInfoKey &stAppInfoKey, STableRunAppInfo &stRunAppInfo); /** @brief 发送本节点的应用的冗余状态信息 - @param const kbd_idlfile::SNodeHeartbeatMsg & stHeartbeat 本节点的应用的冗余信息 + @param const iot_idl::SNodeHeartbeatMsg & stHeartbeat 本节点的应用的冗余信息 @return 成功返回kbdSuccess,失败返回kbdFailed */ - void sendLocalNodeInfo(const kbd_idlfile::SNodeHeartbeatMsg &stHeartbeat); + void sendLocalNodeInfo(const iot_idl::SNodeHeartbeatMsg &stHeartbeat); private: - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库 CRdbOperatePtr m_ptrRtdbOperate; //< 内存表操作类 CNodeInfoMngPtr m_ptrNodeInfoMng; //< 节点的冗余状态管理类 int m_nLocalHeartbeatTimeoutMsec; //< 心跳超时时间 int m_nCheckPeriodMsec; //< 心跳检查周期 - kbd_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 + iot_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 AppKeyToHeartbeatMAP m_mapLocalAppInfo; //< 保存本机各个应用的冗余状态 boost::mutex m_objNodeInfoMutex; //< 保护m_mapLocalNodeInfo - kbd_net::CMbCommunicator m_objCommunicator; //< 消息总线通信器 + iot_net::CMbCommunicator m_objCommunicator; //< 消息总线通信器 }; typedef boost::shared_ptr CLocalAppInfoMngPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_node_mng/MsgBusMngThread.cpp b/platform/src/sys/sys_node_mng/MsgBusMngThread.cpp index c153837a..15338dc0 100644 --- a/platform/src/sys/sys_node_mng/MsgBusMngThread.cpp +++ b/platform/src/sys/sys_node_mng/MsgBusMngThread.cpp @@ -11,13 +11,13 @@ #include "NodeMngCommon.h" #include "NodeMngMessage.pb.h" -using namespace kbd_idlfile; -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_net; +using namespace iot_idl; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_net; /* @brief 线程周期要设置为0，线程休眠使用消息总线的recv超时时间 */ -kbd_sys::CMsgBusMngThread::CMsgBusMngThread(const kbd_public::SNodeInfo &stLocalNodeInfo, +iot_sys::CMsgBusMngThread::CMsgBusMngThread(const iot_public::SNodeInfo &stLocalNodeInfo, const CRemoteAppInfoMngPtr &ptrRemoteAppInfoMng, const CRedundancyArbitrateThreadPtr &ptrRedundancyArbitrateThread) :CTimerThreadBase("CRecvMsgThread", 0), @@ -28,7 +28,7 @@ kbd_sys::CMsgBusMngThread::CMsgBusMngThread(const kbd_public::SNodeInfo &stLocal { } -kbd_sys::CMsgBusMngThread::~CMsgBusMngThread() +iot_sys::CMsgBusMngThread::~CMsgBusMngThread() { unsubscribeMessage(); m_ptrRedundancyArbitrateThread.reset(); @@ -36,7 +36,7 @@ kbd_sys::CMsgBusMngThread::~CMsgBusMngThread() } /* @brief 处理单个节点心跳信息 */ -int kbd_sys::CMsgBusMngThread::handleSingleNodeHeartbeatInfo(const CMbMessage &objMsg) +int iot_sys::CMsgBusMngThread::handleSingleNodeHeartbeatInfo(const CMbMessage &objMsg) { SNodeHeartbeatMsg stHeartbeat; if (!stHeartbeat.ParseFromArray(objMsg.getDataPtr(), static_cast(objMsg.getDataSize()))) @@ -49,7 +49,7 @@ int kbd_sys::CMsgBusMngThread::handleSingleNodeHeartbeatInfo(const CMbMessage &o } /* @brief 处理多个节点心跳信息 */ -int kbd_sys::CMsgBusMngThread::handleMultiNodeHeartbeatInfo(const CMbMessage &objMsg) +int iot_sys::CMsgBusMngThread::handleMultiNodeHeartbeatInfo(const CMbMessage &objMsg) { SMultiNodeHeartbeatMsg stMultiNodeHeartbeat; if (!stMultiNodeHeartbeat.ParseFromArray(objMsg.getDataPtr(), static_cast(objMsg.getDataSize()))) @@ -67,7 +67,7 @@ int kbd_sys::CMsgBusMngThread::handleMultiNodeHeartbeatInfo(const CMbMessage &ob } /* @brief 解析单个节点心跳信息 */ -int kbd_sys::CMsgBusMngThread::parseNodeHeartbeatInfo(const SNodeHeartbeatMsg &stHeartbeat) +int iot_sys::CMsgBusMngThread::parseNodeHeartbeatInfo(const SNodeHeartbeatMsg &stHeartbeat) { SAppHeartbeatInfo stAppInfo; stAppInfo.stKey.nDomainId = stHeartbeat.ndomainid(); @@ -96,7 +96,7 @@ int kbd_sys::CMsgBusMngThread::parseNodeHeartbeatInfo(const SNodeHeartbeatMsg &s } /* @brief 处理冗余裁决命令 */ -int kbd_sys::CMsgBusMngThread::handleRedundancyCmd(const CMbMessage &objMsg) +int iot_sys::CMsgBusMngThread::handleRedundancyCmd(const CMbMessage &objMsg) { if (m_ptrRedundancyArbitrateThread == NULL) { @@ -129,7 +129,7 @@ int kbd_sys::CMsgBusMngThread::handleRedundancyCmd(const CMbMessage &objMsg) return m_ptrRedundancyArbitrateThread->addRedundancyCmd(stSwitchCmd); } -void kbd_sys::CMsgBusMngThread::execute() +void iot_sys::CMsgBusMngThread::execute() { CMbMessage objMsg; if (m_objCommunicator.recvMsg(objMsg, m_nMsgRecvTimeoutMsec)) @@ -166,7 +166,7 @@ void kbd_sys::CMsgBusMngThread::execute() } /* @brief 初始化 */ -int kbd_sys::CMsgBusMngThread::initialize() +int iot_sys::CMsgBusMngThread::initialize() { m_nMsgRecvTimeoutMsec = CNodeMngCfgParam::getMsgRecvTimeoutMsec(); if (kbdSuccess != subscribeMessage()) @@ -178,7 +178,7 @@ int kbd_sys::CMsgBusMngThread::initialize() } /* @brief 订阅相关消息通道 */ -int kbd_sys::CMsgBusMngThread::subscribeMessage() +int iot_sys::CMsgBusMngThread::subscribeMessage() { if (!m_objCommunicator.addSub(CN_AppId_BASE, CH_NODE_MNG_INTRA_DOMAIN)) { @@ -193,7 +193,7 @@ int kbd_sys::CMsgBusMngThread::subscribeMessage() } /* @brief 取消订阅相关消息通道 */ -int kbd_sys::CMsgBusMngThread::unsubscribeMessage() +int iot_sys::CMsgBusMngThread::unsubscribeMessage() { if (!m_objCommunicator.delSub(CN_AppId_BASE, CH_NODE_MNG_INTRA_DOMAIN)) { diff --git a/platform/src/sys/sys_node_mng/MsgBusMngThread.h b/platform/src/sys/sys_node_mng/MsgBusMngThread.h index 64cd62f9..231b4e01 100644 --- a/platform/src/sys/sys_node_mng/MsgBusMngThread.h +++ b/platform/src/sys/sys_node_mng/MsgBusMngThread.h @@ -9,9 +9,9 @@ #include "RemoteAppInfoMng.h" #include "RedundancyArbitrateThread.h" -namespace kbd_sys +namespace iot_sys { - class CMsgBusMngThread :public kbd_public::CTimerThreadBase + class CMsgBusMngThread :public iot_public::CTimerThreadBase { public: /** @@ -19,7 +19,7 @@ namespace kbd_sys @param const CRemoteAppInfoMngPtr & ptrRemoteAppInfoMng 远程节点管理类 @param const CRedundancyArbitrateThreadPtr & ptrRedundancyArbitrateThread 冗余裁决管理类 */ - CMsgBusMngThread(const kbd_public::SNodeInfo &stLocalNodeInfo, + CMsgBusMngThread(const iot_public::SNodeInfo &stLocalNodeInfo, const CRemoteAppInfoMngPtr &ptrRemoteAppInfoMng, const CRedundancyArbitrateThreadPtr &ptrRedundancyArbitrateThread); virtual ~CMsgBusMngThread(); @@ -47,36 +47,36 @@ namespace kbd_sys int unsubscribeMessage(); /** @brief 处理单个节点心跳信息 - @param const kbd_net::CMbMessage & objMsg 接收到的消息 + @param const iot_net::CMbMessage & objMsg 接收到的消息 @return 成功返回kbdSuccess,失败返回kbdFailed */ - int handleSingleNodeHeartbeatInfo(const kbd_net::CMbMessage &objMsg); + int handleSingleNodeHeartbeatInfo(const iot_net::CMbMessage &objMsg); /** @brief 处理多个节点心跳信息 - @param const kbd_net::CMbMessage & objMsg 接收到的消息 + @param const iot_net::CMbMessage & objMsg 接收到的消息 @return 成功返回kbdSuccess,失败返回kbdFailed */ - int handleMultiNodeHeartbeatInfo(const kbd_net::CMbMessage &objMsg); + int handleMultiNodeHeartbeatInfo(const iot_net::CMbMessage &objMsg); /** @brief 解析单个节点心跳信息 - @param const kbd_idlfile::SNodeHeartbeatMsg & stHeartbeat 返回的节点心跳信息 + @param const iot_idl::SNodeHeartbeatMsg & stHeartbeat 返回的节点心跳信息 @return 成功返回kbdSuccess,失败返回kbdFailed */ - int parseNodeHeartbeatInfo(const kbd_idlfile::SNodeHeartbeatMsg &stHeartbeat); + int parseNodeHeartbeatInfo(const iot_idl::SNodeHeartbeatMsg &stHeartbeat); /** @brief 处理冗余裁决命令 - @param const kbd_net::CMbMessage & objMsg 裁决消息 + @param const iot_net::CMbMessage & objMsg 裁决消息 @return 成功返回kbdSuccess,失败返回kbdFailed */ - int handleRedundancyCmd(const kbd_net::CMbMessage &objMsg); + int handleRedundancyCmd(const iot_net::CMbMessage &objMsg); private: - kbd_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 + iot_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 CRemoteAppInfoMngPtr m_ptrRemoteAppInfoMng; //< 远程节点管理线程 CRedundancyArbitrateThreadPtr m_ptrRedundancyArbitrateThread; //< 冗余仲裁线程 int m_nMsgRecvTimeoutMsec; //< 消息接收超时时间，单位ms - kbd_net::CMbCommunicator m_objCommunicator; //< 消息总线通信器 + iot_net::CMbCommunicator m_objCommunicator; //< 消息总线通信器 }; typedef boost::shared_ptr CMsgBusMngThreadPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_node_mng/NodeInfoMng.cpp b/platform/src/sys/sys_node_mng/NodeInfoMng.cpp index eafb9fd4..8bf6c66c 100644 --- a/platform/src/sys/sys_node_mng/NodeInfoMng.cpp +++ b/platform/src/sys/sys_node_mng/NodeInfoMng.cpp @@ -7,25 +7,25 @@ #include "pub_logger_api/logger.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_dbms; -kbd_sys::CNodeInfoMng::CNodeInfoMng(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, +iot_sys::CNodeInfoMng::CNodeInfoMng(const iot_public::CSysInfoInterfacePtr &ptrSysInfo, const CRdbOperatePtr &ptrRtdbOperate) :m_ptrSysInfo(ptrSysInfo), m_ptrRtdbOperate(ptrRtdbOperate) { } -kbd_sys::CNodeInfoMng::~CNodeInfoMng() +iot_sys::CNodeInfoMng::~CNodeInfoMng() { m_mapNodeInfo.clear(); m_ptrRtdbOperate.reset(); m_ptrSysInfo.reset(); } -int kbd_sys::CNodeInfoMng::initialize() +int iot_sys::CNodeInfoMng::initialize() { //1.获取本节点信息 if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) @@ -51,7 +51,7 @@ int kbd_sys::CNodeInfoMng::initialize() } /* @brief 更新应用的冗余信息 */ -int kbd_sys::CNodeInfoMng::updateAppRedundancyInfo(const SAppHeartbeatInfo &stLocalNodeInfo) +int iot_sys::CNodeInfoMng::updateAppRedundancyInfo(const SAppHeartbeatInfo &stLocalNodeInfo) { boost::mutex::scoped_lock lock(m_objNodeInfoMutex); AppKeyToRedundancyInfoMAP::iterator pNode = m_mapNodeInfo.find(stLocalNodeInfo.stKey); @@ -88,7 +88,7 @@ int kbd_sys::CNodeInfoMng::updateAppRedundancyInfo(const SAppHeartbeatInfo &stLo } /* @brief 设置指定应用心跳超时 */ -int kbd_sys::CNodeInfoMng::heartbeatTimeout(const SAppHeartbeatInfo &stLocalNodeInfo, int nTimeoutCount) +int iot_sys::CNodeInfoMng::heartbeatTimeout(const SAppHeartbeatInfo &stLocalNodeInfo, int nTimeoutCount) { boost::mutex::scoped_lock lock(m_objNodeInfoMutex); AppKeyToRedundancyInfoMAP::iterator pNode = m_mapNodeInfo.find(stLocalNodeInfo.stKey); @@ -140,7 +140,7 @@ int kbd_sys::CNodeInfoMng::heartbeatTimeout(const SAppHeartbeatInfo &stLocalNode } /* @brief 更新应用的冗余相关状态 */ -void kbd_sys::CNodeInfoMng::updateRedundancyState(const SAppHeartbeatInfo& stLocalNodeInfo, SAppRedundancyInfo& stAppRedundancyInfo) +void iot_sys::CNodeInfoMng::updateRedundancyState(const SAppHeartbeatInfo& stLocalNodeInfo, SAppRedundancyInfo& stAppRedundancyInfo) { /* @brief 缓存之前的状态，用于冗余裁决 */ stAppRedundancyInfo.bLastActive = stLocalNodeInfo.bActive; @@ -171,7 +171,7 @@ void kbd_sys::CNodeInfoMng::updateRedundancyState(const SAppHeartbeatInfo& stLoc } /* @brief 更新应用的网络相关状态 */ -void kbd_sys::CNodeInfoMng::updateAccessStatus(const SAppHeartbeatInfo& stLocalNodeInfo, SAppRedundancyInfo& stAppRedundancyInfo) +void iot_sys::CNodeInfoMng::updateAccessStatus(const SAppHeartbeatInfo& stLocalNodeInfo, SAppRedundancyInfo& stAppRedundancyInfo) { stAppRedundancyInfo.bIP1Active = stLocalNodeInfo.bIP1Active; stAppRedundancyInfo.bIP2Active = stLocalNodeInfo.bIP2Active; @@ -186,7 +186,7 @@ void kbd_sys::CNodeInfoMng::updateAccessStatus(const SAppHeartbeatInfo& stLocalN } /* @brief 增加冗余状态持续次数 */ -int kbd_sys::CNodeInfoMng::increasePersistCount(const SAppInfoKey &stKey) +int iot_sys::CNodeInfoMng::increasePersistCount(const SAppInfoKey &stKey) { boost::mutex::scoped_lock lock(m_objNodeInfoMutex); AppKeyToRedundancyInfoMAP::iterator pNode = m_mapNodeInfo.find(stKey); @@ -206,7 +206,7 @@ int kbd_sys::CNodeInfoMng::increasePersistCount(const SAppInfoKey &stKey) } /* @brief 获取应用冗余信息 */ -int kbd_sys::CNodeInfoMng::getAppInfo(const SAppInfoKey &stKey, SAppRedundancyInfo &stAppInfo) +int iot_sys::CNodeInfoMng::getAppInfo(const SAppInfoKey &stKey, SAppRedundancyInfo &stAppInfo) { if (stKey.nAppId == CN_AppId_All) { @@ -281,7 +281,7 @@ int kbd_sys::CNodeInfoMng::getAppInfo(const SAppInfoKey &stKey, SAppRedundancyIn } /* @brief 设置冗余失败的切换标识 */ -int kbd_sys::CNodeInfoMng::setSwitchFailedFlagByKey(const SAppInfoKey &stKey) +int iot_sys::CNodeInfoMng::setSwitchFailedFlagByKey(const SAppInfoKey &stKey) { boost::mutex::scoped_lock lock(m_objNodeInfoMutex); AppKeyToRedundancyInfoMAP::iterator pIter = m_mapNodeInfo.find(stKey); @@ -300,7 +300,7 @@ int kbd_sys::CNodeInfoMng::setSwitchFailedFlagByKey(const SAppInfoKey &stKey) } /* @brief 设置冗余切换失败标识 */ -int kbd_sys::CNodeInfoMng::setSwitchFailedFlag(const SAppInfoKey &stKey) +int iot_sys::CNodeInfoMng::setSwitchFailedFlag(const SAppInfoKey &stKey) { if (stKey.nAppId == CN_AppId_All) { @@ -322,12 +322,12 @@ int kbd_sys::CNodeInfoMng::setSwitchFailedFlag(const SAppInfoKey &stKey) return kbdSuccess; } -kbd_sys::AppKeyToRedundancyInfoMAP kbd_sys::CNodeInfoMng::getAllAppInfo() +iot_sys::AppKeyToRedundancyInfoMAP iot_sys::CNodeInfoMng::getAllAppInfo() { return m_mapNodeInfo; } -int kbd_sys::CNodeInfoMng::initializeAppInfoMAP() +int iot_sys::CNodeInfoMng::initializeAppInfoMAP() { /* @brief 获取跟本域有关联的域列表 */ std::vector vecMbRelayInfo; @@ -360,7 +360,7 @@ int kbd_sys::CNodeInfoMng::initializeAppInfoMAP() return kbdSuccess; } -int kbd_sys::CNodeInfoMng::insertAppInfoToMap(const std::vector &vecNodeInfo) +int iot_sys::CNodeInfoMng::insertAppInfoToMap(const std::vector &vecNodeInfo) { for (vector::const_iterator pNode = vecNodeInfo.begin(); pNode != vecNodeInfo.end(); ++pNode) { @@ -419,7 +419,7 @@ int kbd_sys::CNodeInfoMng::insertAppInfoToMap(const std::vector & vecNodeInfo 节点列表 + @param const std::vector & vecNodeInfo 节点列表 @return 成功返回kbdSuccess,失败返回kbdFailed */ - int insertAppInfoToMap(const std::vector &vecNodeInfo); + int insertAppInfoToMap(const std::vector &vecNodeInfo); /** @brief 添加记录到sys_redundancy_info表中 @@ -114,16 +114,16 @@ namespace kbd_sys int setSwitchFailedFlagByKey(const SAppInfoKey &stKey); private: - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库 - kbd_public::SNodeInfo m_stLocalNodeInfo; //< 本节点信息 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库 + iot_public::SNodeInfo m_stLocalNodeInfo; //< 本节点信息 CRdbOperatePtr m_ptrRtdbOperate; //< 内存表操作类 AppKeyToRedundancyInfoMAP m_mapNodeInfo; //< 应用冗余状态管理 boost::mutex m_objNodeInfoMutex; //< 保护m_mapNodeInfo - std::vector m_vecLocalAppDeploy; //< 本节点部署的应用列表 + std::vector m_vecLocalAppDeploy; //< 本节点部署的应用列表 }; typedef boost::shared_ptr CNodeInfoMngPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_node_mng/NodeMngApp.cpp b/platform/src/sys/sys_node_mng/NodeMngApp.cpp index f0e5bc4f..63de4070 100644 --- a/platform/src/sys/sys_node_mng/NodeMngApp.cpp +++ b/platform/src/sys/sys_node_mng/NodeMngApp.cpp @@ -10,11 +10,11 @@ #include "net_msg_bus_api/MsgBusApi.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_net; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_net; -kbd_sys::CNodeMngApp::CNodeMngApp() +iot_sys::CNodeMngApp::CNodeMngApp() :m_strAppName(""), m_ptrSysInfo(NULL), m_ptrProcMng(NULL), @@ -28,12 +28,12 @@ kbd_sys::CNodeMngApp::CNodeMngApp() { } -kbd_sys::CNodeMngApp::~CNodeMngApp() +iot_sys::CNodeMngApp::~CNodeMngApp() { stop(); } -bool kbd_sys::CNodeMngApp::start(int argc, char *argv[], int &/*nStatus*/) +bool iot_sys::CNodeMngApp::start(int argc, char *argv[], int &/*nStatus*/) { //1.解析启动参数 if (!parseCmdLine(argc, argv)) @@ -83,7 +83,7 @@ bool kbd_sys::CNodeMngApp::start(int argc, char *argv[], int &/*nStatus*/) return true; } -bool kbd_sys::CNodeMngApp::stop() +bool iot_sys::CNodeMngApp::stop() { LOGINFO("进程退出"); //6.清理业务资源 @@ -101,7 +101,7 @@ bool kbd_sys::CNodeMngApp::stop() } /* @brief 用来通知进程退出 */ -int kbd_sys::CNodeMngApp::toQuit() +int iot_sys::CNodeMngApp::toQuit() { LOGINFO("接收到进程退出通知"); if (m_ptrProcMng != NULL) @@ -113,24 +113,24 @@ int kbd_sys::CNodeMngApp::toQuit() return kbdSuccess; } -bool kbd_sys::CNodeMngApp::parseCmdLine(int /*argc*/, char *[]) +bool iot_sys::CNodeMngApp::parseCmdLine(int /*argc*/, char *[]) { m_strAppName = CN_AppName_BASE; return true; } -bool kbd_sys::CNodeMngApp::isAlreadyRunning() +bool iot_sys::CNodeMngApp::isAlreadyRunning() { return CSingleProcInstance::hasInstanceRunning(CN_ProcName_NodeMng); } -bool kbd_sys::CNodeMngApp::initLog() +bool iot_sys::CNodeMngApp::initLog() { StartLogSystem(m_strAppName.c_str(), CN_ProcName_NodeMng.c_str()); return true; } -bool kbd_sys::CNodeMngApp::getSystemInfo() +bool iot_sys::CNodeMngApp::getSystemInfo() { if (!createSysInfoInstance(m_ptrSysInfo)) { @@ -147,7 +147,7 @@ bool kbd_sys::CNodeMngApp::getSystemInfo() return true; } -bool kbd_sys::CNodeMngApp::registToProcMng() +bool iot_sys::CNodeMngApp::registToProcMng() { SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stLocalNodeInfo.nDomainId; @@ -174,7 +174,7 @@ bool kbd_sys::CNodeMngApp::registToProcMng() } /* @brief 取消向进程管理的注册 */ -bool kbd_sys::CNodeMngApp::unregistProcMng() +bool iot_sys::CNodeMngApp::unregistProcMng() { if (m_ptrProcMng != NULL) { @@ -185,7 +185,7 @@ bool kbd_sys::CNodeMngApp::unregistProcMng() return true; } -bool kbd_sys::CNodeMngApp::initialize() +bool iot_sys::CNodeMngApp::initialize() { //1.加载节点管理相关配置 if (kbdSuccess != CNodeMngCfgParam::load()) @@ -316,7 +316,7 @@ bool kbd_sys::CNodeMngApp::initialize() return true; } -bool kbd_sys::CNodeMngApp::clean() +bool iot_sys::CNodeMngApp::clean() { //9.消息接收线程 if (m_ptrMsgBusMngThread != NULL) diff --git a/platform/src/sys/sys_node_mng/NodeMngApp.h b/platform/src/sys/sys_node_mng/NodeMngApp.h index 189ded30..a75c9c5f 100644 --- a/platform/src/sys/sys_node_mng/NodeMngApp.h +++ b/platform/src/sys/sys_node_mng/NodeMngApp.h @@ -13,9 +13,9 @@ #include "RedundancyArbitrateThread.h" #include "MsgBusMngThread.h" -namespace kbd_sys +namespace iot_sys { - class CNodeMngApp : public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface + class CNodeMngApp : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CNodeMngApp(); @@ -92,9 +92,9 @@ namespace kbd_sys private: std::string m_strAppName; //< 应用名 - kbd_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 + iot_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 CRdbOperatePtr m_ptrRtdbOperate; //< 内存表操作类 @@ -106,4 +106,4 @@ namespace kbd_sys CRedundancyArbitrateThreadPtr m_ptrRedundancyArbitrateThread; //< 冗余仲裁线程 }; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_node_mng/NodeMngCfgParam.cpp b/platform/src/sys/sys_node_mng/NodeMngCfgParam.cpp index 3e577443..91ff7f75 100644 --- a/platform/src/sys/sys_node_mng/NodeMngCfgParam.cpp +++ b/platform/src/sys/sys_node_mng/NodeMngCfgParam.cpp @@ -10,8 +10,8 @@ #include "NodeMngCommon.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_sys; #define APP_REDUNDANCY "app_redundancy" #define HEARTBEAT_CHECK_PERIOD "heartbeat_check_period" @@ -23,25 +23,25 @@ using namespace kbd_sys; #define NETWORK_STABLE_THRESHOLD "network_stable_threshold" #define MSG_RECV_TIMEOUT "msg_recv_timeout" -int kbd_sys::CNodeMngCfgParam::m_nLocalHeartbeatTimeoutMsec = 2000; //< 本机节点信息心跳超时时间 -int kbd_sys::CNodeMngCfgParam::m_nRemoteHeartbeatTimeoutMsec = 4000; //< 其它节点信息管理线程运行周期 -int kbd_sys::CNodeMngCfgParam::m_nRedundancyCheckPeriod = 100; //< 冗余检测周期 -int kbd_sys::CNodeMngCfgParam::m_nHeartbeatCheckPeriod = 200; //< 心跳线程运行周期 -int kbd_sys::CNodeMngCfgParam::m_nSwitchTimeoutMsec = 6000; //< 冗余切换超时时间 -bool kbd_sys::CNodeMngCfgParam::m_bIsAppRedundancy = true; //< 是否应用级冗余 -int kbd_sys::CNodeMngCfgParam::m_nRedundancyStableThreshold = 5; //< 冗余状态稳定持续次数 -int kbd_sys::CNodeMngCfgParam::m_nNetworkStableThreshold = 10; //< 网络状态稳定持续次数 -int kbd_sys::CNodeMngCfgParam::m_nMsgRecvTimeoutMsec = 200; //< 消息接收超时时间 +int iot_sys::CNodeMngCfgParam::m_nLocalHeartbeatTimeoutMsec = 2000; //< 本机节点信息心跳超时时间 +int iot_sys::CNodeMngCfgParam::m_nRemoteHeartbeatTimeoutMsec = 4000; //< 其它节点信息管理线程运行周期 +int iot_sys::CNodeMngCfgParam::m_nRedundancyCheckPeriod = 100; //< 冗余检测周期 +int iot_sys::CNodeMngCfgParam::m_nHeartbeatCheckPeriod = 200; //< 心跳线程运行周期 +int iot_sys::CNodeMngCfgParam::m_nSwitchTimeoutMsec = 6000; //< 冗余切换超时时间 +bool iot_sys::CNodeMngCfgParam::m_bIsAppRedundancy = true; //< 是否应用级冗余 +int iot_sys::CNodeMngCfgParam::m_nRedundancyStableThreshold = 5; //< 冗余状态稳定持续次数 +int iot_sys::CNodeMngCfgParam::m_nNetworkStableThreshold = 10; //< 网络状态稳定持续次数 +int iot_sys::CNodeMngCfgParam::m_nMsgRecvTimeoutMsec = 200; //< 消息接收超时时间 -kbd_sys::CNodeMngCfgParam::CNodeMngCfgParam() +iot_sys::CNodeMngCfgParam::CNodeMngCfgParam() { } -kbd_sys::CNodeMngCfgParam::~CNodeMngCfgParam() +iot_sys::CNodeMngCfgParam::~CNodeMngCfgParam() { } -int kbd_sys::CNodeMngCfgParam::load() +int iot_sys::CNodeMngCfgParam::load() { CCommonConfigParse objCfgParse; if (kbdSuccess != objCfgParse.load(CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) @@ -71,54 +71,54 @@ int kbd_sys::CNodeMngCfgParam::load() } /* @brief 其它节点信息管理线程运行周期 */ -int kbd_sys::CNodeMngCfgParam::getHeartbeatCheckPeriod() +int iot_sys::CNodeMngCfgParam::getHeartbeatCheckPeriod() { return m_nHeartbeatCheckPeriod; } /* @brief 本机节点信息心跳超时时间 */ -int kbd_sys::CNodeMngCfgParam::getLocalHeartbeatTimeoutMsec() +int iot_sys::CNodeMngCfgParam::getLocalHeartbeatTimeoutMsec() { return m_nLocalHeartbeatTimeoutMsec; } /* @brief 冗余切换超时时间 */ -int kbd_sys::CNodeMngCfgParam::getSwitchTimeoutMsec() +int iot_sys::CNodeMngCfgParam::getSwitchTimeoutMsec() { return m_nSwitchTimeoutMsec; } -int kbd_sys::CNodeMngCfgParam::getRedundancyCheckPeriod() +int iot_sys::CNodeMngCfgParam::getRedundancyCheckPeriod() { return m_nRedundancyCheckPeriod; } /* @brief 远程节点信息心跳超时时间 */ -int kbd_sys::CNodeMngCfgParam::getRemoteHeartbeatTimeoutMsec() +int iot_sys::CNodeMngCfgParam::getRemoteHeartbeatTimeoutMsec() { return m_nRemoteHeartbeatTimeoutMsec; } /* @brief 是否应用级冗余 */ -bool kbd_sys::CNodeMngCfgParam::isAppRedundancy() +bool iot_sys::CNodeMngCfgParam::isAppRedundancy() { return m_bIsAppRedundancy; } /* @brief 冗余状态稳定持续次数 */ -int kbd_sys::CNodeMngCfgParam::getRedundancyStableThreshold() +int iot_sys::CNodeMngCfgParam::getRedundancyStableThreshold() { return m_nRedundancyStableThreshold; } /* @brief 网络状态稳定持续次数 */ -int kbd_sys::CNodeMngCfgParam::getNetworkStableThreshold() +int iot_sys::CNodeMngCfgParam::getNetworkStableThreshold() { return m_nNetworkStableThreshold; } /* @brief 消息接收超时时间 */ -int kbd_sys::CNodeMngCfgParam::getMsgRecvTimeoutMsec() +int iot_sys::CNodeMngCfgParam::getMsgRecvTimeoutMsec() { return m_nMsgRecvTimeoutMsec; } diff --git a/platform/src/sys/sys_node_mng/NodeMngCfgParam.h b/platform/src/sys/sys_node_mng/NodeMngCfgParam.h index f33e8d41..9c6cd75b 100644 --- a/platform/src/sys/sys_node_mng/NodeMngCfgParam.h +++ b/platform/src/sys/sys_node_mng/NodeMngCfgParam.h @@ -6,7 +6,7 @@ #pragma once #include "pub_sysinfo_api/SysInfoApi.h" -namespace kbd_sys +namespace iot_sys { class CNodeMngCfgParam { @@ -58,4 +58,4 @@ namespace kbd_sys static int m_nMsgRecvTimeoutMsec; //< 消息接收超时时间，即消息接收线程的运行周期，单位ms }; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_node_mng/NodeMngCommon.cpp b/platform/src/sys/sys_node_mng/NodeMngCommon.cpp index c00d145d..8e7bcb61 100644 --- a/platform/src/sys/sys_node_mng/NodeMngCommon.cpp +++ b/platform/src/sys/sys_node_mng/NodeMngCommon.cpp @@ -7,21 +7,21 @@ #include "common/Common.h" using namespace std; -using namespace kbd_sys; +using namespace iot_sys; -kbd_sys::SAppInfoKey::SAppInfoKey() +iot_sys::SAppInfoKey::SAppInfoKey() :nDomainId(CN_InvalidDomainId), nAppId(CN_InvalidAppId) { } -kbd_sys::SAppInfoKey::SAppInfoKey(int nDomainIdTemp, int nAppIdTemp, const std::string &strNodeNameTemp) +iot_sys::SAppInfoKey::SAppInfoKey(int nDomainIdTemp, int nAppIdTemp, const std::string &strNodeNameTemp) : nDomainId(nDomainIdTemp), nAppId(nAppIdTemp), strNodeName(strNodeNameTemp) { } -bool kbd_sys::SAppInfoKey::operator<(const SAppInfoKey& __rhs) const +bool iot_sys::SAppInfoKey::operator<(const SAppInfoKey& __rhs) const { if (this == &__rhs) { @@ -58,27 +58,27 @@ bool kbd_sys::SAppInfoKey::operator<(const SAppInfoKey& __rhs) const return false; } -bool kbd_sys::SAppInfoKey::operator>(const SAppInfoKey& __rhs) const +bool iot_sys::SAppInfoKey::operator>(const SAppInfoKey& __rhs) const { return !operator<(__rhs) && !operator==(__rhs); } -bool kbd_sys::SAppInfoKey::operator>=(const SAppInfoKey& __rhs) const +bool iot_sys::SAppInfoKey::operator>=(const SAppInfoKey& __rhs) const { return !operator<(__rhs); } -bool kbd_sys::SAppInfoKey::operator<=(const SAppInfoKey& __rhs) const +bool iot_sys::SAppInfoKey::operator<=(const SAppInfoKey& __rhs) const { return operator<(__rhs) || operator==(__rhs); } -bool kbd_sys::SAppInfoKey::operator!=(const SAppInfoKey& __rhs) const +bool iot_sys::SAppInfoKey::operator!=(const SAppInfoKey& __rhs) const { return !operator==(__rhs); } -bool kbd_sys::SAppInfoKey::operator==(const SAppInfoKey& __rhs) const +bool iot_sys::SAppInfoKey::operator==(const SAppInfoKey& __rhs) const { if (this == &__rhs) { @@ -103,7 +103,7 @@ bool kbd_sys::SAppInfoKey::operator==(const SAppInfoKey& __rhs) const return true; } -kbd_sys::SAppHeartbeatInfo::SAppHeartbeatInfo() : +iot_sys::SAppHeartbeatInfo::SAppHeartbeatInfo() : // nDomainId(CN_InvalidDomainId), // nAppId(CN_InvalidAppId), // strNodeName(""), @@ -124,7 +124,7 @@ kbd_sys::SAppHeartbeatInfo::SAppHeartbeatInfo() : { } -kbd_sys::SAppRedundancyInfo::SAppRedundancyInfo() +iot_sys::SAppRedundancyInfo::SAppRedundancyInfo() :nPriority(CN_InvalidNodePriority), strIP1(""), bIP1Active(false), @@ -145,7 +145,7 @@ kbd_sys::SAppRedundancyInfo::SAppRedundancyInfo() { } -kbd_sys::SArbiterAppInfo::SArbiterAppInfo() : +iot_sys::SArbiterAppInfo::SArbiterAppInfo() : bAvailable(false), bActive(false), bMaster(false), @@ -156,7 +156,7 @@ kbd_sys::SArbiterAppInfo::SArbiterAppInfo() : { } -kbd_sys::SRedundancyCmd::SRedundancyCmd() : +iot_sys::SRedundancyCmd::SRedundancyCmd() : nDomainId(CN_InvalidDomainId), nAppId(CN_InvalidAppId), strSwitchNode(""), @@ -169,12 +169,12 @@ kbd_sys::SRedundancyCmd::SRedundancyCmd() : { } -bool kbd_sys::SRedundancyCmd::operator!=(const SRedundancyCmd& __rhs) const +bool iot_sys::SRedundancyCmd::operator!=(const SRedundancyCmd& __rhs) const { return !operator==(__rhs); } -bool kbd_sys::SRedundancyCmd::operator==(const SRedundancyCmd& __rhs) const +bool iot_sys::SRedundancyCmd::operator==(const SRedundancyCmd& __rhs) const { if (this == &__rhs) { diff --git a/platform/src/sys/sys_node_mng/NodeMngCommon.h b/platform/src/sys/sys_node_mng/NodeMngCommon.h index b48ffd5a..fe5fdeae 100644 --- a/platform/src/sys/sys_node_mng/NodeMngCommon.h +++ b/platform/src/sys/sys_node_mng/NodeMngCommon.h @@ -9,7 +9,7 @@ #include "boost/thread.hpp" #include "common/Common.h" -namespace kbd_sys +namespace iot_sys { const std::string CN_ProcName_NodeMng = "sys_node_mng"; //< 当前进程名 const int CN_MaxPersistCount = 99; //< 当前状态持续次数最大值 @@ -122,4 +122,4 @@ namespace kbd_sys typedef std::vector SRedundancyCmdSeq; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_node_mng/RedundancyArbitrateThread.cpp b/platform/src/sys/sys_node_mng/RedundancyArbitrateThread.cpp index b7deddbb..d42ecbda 100644 --- a/platform/src/sys/sys_node_mng/RedundancyArbitrateThread.cpp +++ b/platform/src/sys/sys_node_mng/RedundancyArbitrateThread.cpp @@ -7,10 +7,10 @@ #include "pub_logger_api/logger.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_sys; -kbd_sys::CRedundancyArbitrateThread::CRedundancyArbitrateThread(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, +iot_sys::CRedundancyArbitrateThread::CRedundancyArbitrateThread(const iot_public::CSysInfoInterfacePtr &ptrSysInfo, const CRdbOperatePtr &ptrRtdbOperate, const CNodeInfoMngPtr &ptrNodeInfoMng, const CLocalAppInfoMngPtr &ptrLocalAppInfoMng, @@ -25,7 +25,7 @@ kbd_sys::CRedundancyArbitrateThread::CRedundancyArbitrateThread(const kbd_public { } -kbd_sys::CRedundancyArbitrateThread::~CRedundancyArbitrateThread() +iot_sys::CRedundancyArbitrateThread::~CRedundancyArbitrateThread() { m_vecRedundancyCmd.clear(); m_mapAppLevelArbitrate.clear(); @@ -36,7 +36,7 @@ kbd_sys::CRedundancyArbitrateThread::~CRedundancyArbitrateThread() m_ptrSysInfo.reset(); } -void kbd_sys::CRedundancyArbitrateThread::execute() +void iot_sys::CRedundancyArbitrateThread::execute() { /* @brief 先处理接收到的冗余裁决命令 */ handleRecvRedundancyCmd(); @@ -46,7 +46,7 @@ void kbd_sys::CRedundancyArbitrateThread::execute() } /* @brief 初始化 */ -int kbd_sys::CRedundancyArbitrateThread::initialize() +int iot_sys::CRedundancyArbitrateThread::initialize() { m_bIsAppRedundancy = CNodeMngCfgParam::isAppRedundancy(); //< 是否应用级冗余 m_nRunPeriodMsec = CNodeMngCfgParam::getRedundancyCheckPeriod(); //< 线程运行周期 @@ -62,7 +62,7 @@ int kbd_sys::CRedundancyArbitrateThread::initialize() } /* @brief 将冗余指令添加到缓冲区 */ -int kbd_sys::CRedundancyArbitrateThread::addRedundancyCmd(const SRedundancyCmd& stRedundancyCmd) +int iot_sys::CRedundancyArbitrateThread::addRedundancyCmd(const SRedundancyCmd& stRedundancyCmd) { { boost::mutex::scoped_lock lock(m_objRedundancyCmdMutex); @@ -74,7 +74,7 @@ int kbd_sys::CRedundancyArbitrateThread::addRedundancyCmd(const SRedundancyCmd& } /* @brief 初始化整机冗余 */ -int kbd_sys::CRedundancyArbitrateThread::initNodeRedundancy() +int iot_sys::CRedundancyArbitrateThread::initNodeRedundancy() { SNodeInfo stLocalNodeInfo; if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) @@ -124,7 +124,7 @@ int kbd_sys::CRedundancyArbitrateThread::initNodeRedundancy() } /* @brief 初始化应用级冗余 */ -int kbd_sys::CRedundancyArbitrateThread::initAppRedundancy() +int iot_sys::CRedundancyArbitrateThread::initAppRedundancy() { SNodeInfo stLocalNodeInfo; if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) @@ -170,7 +170,7 @@ int kbd_sys::CRedundancyArbitrateThread::initAppRedundancy() } /* @brief 处理接收到的冗余切换指令 */ -int kbd_sys::CRedundancyArbitrateThread::handleRecvRedundancyCmd() +int iot_sys::CRedundancyArbitrateThread::handleRecvRedundancyCmd() { SRedundancyCmdSeq vecRedundancyCmd; { @@ -197,7 +197,7 @@ int kbd_sys::CRedundancyArbitrateThread::handleRecvRedundancyCmd() } /* @brief 驱动裁决 */ -int kbd_sys::CRedundancyArbitrateThread::appArbitrate() +int iot_sys::CRedundancyArbitrateThread::appArbitrate() { for (AppLevelArbitrateMAP::iterator pIter = m_mapAppLevelArbitrate.begin(); pIter != m_mapAppLevelArbitrate.end(); ++pIter) { diff --git a/platform/src/sys/sys_node_mng/RedundancyArbitrateThread.h b/platform/src/sys/sys_node_mng/RedundancyArbitrateThread.h index f8ac93b8..a4219965 100644 --- a/platform/src/sys/sys_node_mng/RedundancyArbitrateThread.h +++ b/platform/src/sys/sys_node_mng/RedundancyArbitrateThread.h @@ -8,12 +8,12 @@ #include "NodeMngCfgParam.h" #include "AppLevelArbitrate.h" -namespace kbd_sys +namespace iot_sys { - class CRedundancyArbitrateThread : public kbd_public::CTimerThreadBase + class CRedundancyArbitrateThread : public iot_public::CTimerThreadBase { public: - CRedundancyArbitrateThread(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, + CRedundancyArbitrateThread(const iot_public::CSysInfoInterfacePtr &ptrSysInfo, const CRdbOperatePtr &ptrRtdbOperate, const CNodeInfoMngPtr &ptrNodeInfoMng, const CLocalAppInfoMngPtr &ptrLocalAppInfoMng, @@ -57,7 +57,7 @@ namespace kbd_sys int appArbitrate(); private: - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库 CRdbOperatePtr m_ptrRtdbOperate; //< 内存表操作类 CNodeInfoMngPtr m_ptrNodeInfoMng; //< 应用的冗余状态管理类 CLocalAppInfoMngPtr m_ptrLocalAppInfoMng; //< 本机应用的冗余状态管理类 @@ -70,4 +70,4 @@ namespace kbd_sys typedef boost::shared_ptr CRedundancyArbitrateThreadPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_node_mng/RemoteAppInfoMng.cpp b/platform/src/sys/sys_node_mng/RemoteAppInfoMng.cpp index 2e972adf..6a7133f9 100644 --- a/platform/src/sys/sys_node_mng/RemoteAppInfoMng.cpp +++ b/platform/src/sys/sys_node_mng/RemoteAppInfoMng.cpp @@ -8,11 +8,11 @@ #include "NodeMngMessage.pb.h" using namespace std; -using namespace kbd_idlfile; -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_idl; +using namespace iot_public; +using namespace iot_sys; -kbd_sys::CRemoteAppInfoMng::CRemoteAppInfoMng(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, +iot_sys::CRemoteAppInfoMng::CRemoteAppInfoMng(const iot_public::CSysInfoInterfacePtr &ptrSysInfo, const CNodeInfoMngPtr &ptrNodeInfoMng) :m_bLastNetworkIsActive(false), m_ptrSysInfo(ptrSysInfo), @@ -23,14 +23,14 @@ kbd_sys::CRemoteAppInfoMng::CRemoteAppInfoMng(const kbd_public::CSysInfoInterfac { } -kbd_sys::CRemoteAppInfoMng::~CRemoteAppInfoMng() +iot_sys::CRemoteAppInfoMng::~CRemoteAppInfoMng() { m_ptrNetworkCheck.reset(); m_ptrNodeInfoMng.reset(); m_ptrSysInfo.reset(); } -int kbd_sys::CRemoteAppInfoMng::initialize() +int iot_sys::CRemoteAppInfoMng::initialize() { //1.获取本节点信息 if (kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo)) @@ -70,7 +70,7 @@ int kbd_sys::CRemoteAppInfoMng::initialize() } /* @brief 初始化要管理的应用列表 */ -int kbd_sys::CRemoteAppInfoMng::initializeAppInfoMAP() +int iot_sys::CRemoteAppInfoMng::initializeAppInfoMAP() { int64 lCurTime = getMonotonicMsec(); @@ -106,7 +106,7 @@ int kbd_sys::CRemoteAppInfoMng::initializeAppInfoMAP() } /* @brief 检查接收到的应用的冗余状态信息，判断是否有超时的 */ -int kbd_sys::CRemoteAppInfoMng::checkRemoteBuffer() +int iot_sys::CRemoteAppInfoMng::checkRemoteBuffer() { boost::mutex::scoped_lock lock(m_objRecvBufMutex); @@ -181,7 +181,7 @@ int kbd_sys::CRemoteAppInfoMng::checkRemoteBuffer() } /* @brief 设置冗余切换失败标识 */ -int kbd_sys::CRemoteAppInfoMng::setSwitchFailedFlag(const SAppInfoKey &stKey) +int iot_sys::CRemoteAppInfoMng::setSwitchFailedFlag(const SAppInfoKey &stKey) { if (stKey.nAppId == CN_AppId_All) { @@ -205,7 +205,7 @@ int kbd_sys::CRemoteAppInfoMng::setSwitchFailedFlag(const SAppInfoKey &stKey) //TODO:可以考虑直接更新nodemngbuf，而不是通过本类的线程扫描然后更新 /* @brief 更新接收到的应用冗余心跳信息 */ -int kbd_sys::CRemoteAppInfoMng::updateRecvHeartbeatInfo(const SAppHeartbeatInfo &stHeartbeat) +int iot_sys::CRemoteAppInfoMng::updateRecvHeartbeatInfo(const SAppHeartbeatInfo &stHeartbeat) { boost::mutex::scoped_lock lock(m_objRecvBufMutex); AppKeyToHeartbeatMAP::iterator pIter = m_mapRecvAppInfo.find(stHeartbeat.stKey); @@ -287,7 +287,7 @@ int kbd_sys::CRemoteAppInfoMng::updateRecvHeartbeatInfo(const SAppHeartbeatInfo } /* @brief 设置指定应用的冗余切换失败标识 */ -int kbd_sys::CRemoteAppInfoMng::setSwitchFailedFlagByKey(const SAppInfoKey &stKey) +int iot_sys::CRemoteAppInfoMng::setSwitchFailedFlagByKey(const SAppInfoKey &stKey) { boost::mutex::scoped_lock lock(m_objRecvBufMutex); AppKeyToHeartbeatMAP::iterator pIter = m_mapRecvAppInfo.find(stKey); diff --git a/platform/src/sys/sys_node_mng/RemoteAppInfoMng.h b/platform/src/sys/sys_node_mng/RemoteAppInfoMng.h index 9d90486f..4a8f9ec6 100644 --- a/platform/src/sys/sys_node_mng/RemoteAppInfoMng.h +++ b/platform/src/sys/sys_node_mng/RemoteAppInfoMng.h @@ -12,17 +12,17 @@ #include "NodeInfoMng.h" #include "NodeMngCfgParam.h" -namespace kbd_sys +namespace iot_sys { class CRemoteAppInfoMng { public: /** @brief 构造函数 - @param const kbd_public::CSysInfoInterfacePtr & ptrSysInfo 系统信息访问库 + @param const iot_public::CSysInfoInterfacePtr & ptrSysInfo 系统信息访问库 @param const CNodeInfoMngPtr & ptrNodeInfoMng 应用冗余状态管理类 */ - CRemoteAppInfoMng(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, + CRemoteAppInfoMng(const iot_public::CSysInfoInterfacePtr &ptrSysInfo, const CNodeInfoMngPtr &ptrNodeInfoMng); virtual ~CRemoteAppInfoMng(); @@ -60,16 +60,16 @@ namespace kbd_sys private: bool m_bLastNetworkIsActive; //< 上一次网络是否可用 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库 - kbd_public::SNodeInfo m_stLocalNodeInfo; //< 本节点信息 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库 + iot_public::SNodeInfo m_stLocalNodeInfo; //< 本节点信息 CNodeInfoMngPtr m_ptrNodeInfoMng; //< 应用的冗余状态信息管理类 CNetworkCheckInterfacePtr m_ptrNetworkCheck; //< 网络管理访问库 int m_nRecvHeartbeatTimeoutMsec; //< 心跳超时时间 int m_nCheckPeriodMsec; //< 心跳检查周期 AppKeyToHeartbeatMAP m_mapRecvAppInfo; //< 管理接收到的其它节点的应用冗余信息 boost::mutex m_objRecvBufMutex; //< 保护m_mapRecvNodeInfo - std::vector m_vecLocalAppDeploy; //< 本节点的应用部署信息 + std::vector m_vecLocalAppDeploy; //< 本节点的应用部署信息 }; typedef boost::shared_ptr CRemoteAppInfoMngPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_node_mng/RtdbOperate.cpp b/platform/src/sys/sys_node_mng/RtdbOperate.cpp index 6350b315..de0cd11b 100644 --- a/platform/src/sys/sys_node_mng/RtdbOperate.cpp +++ b/platform/src/sys/sys_node_mng/RtdbOperate.cpp @@ -6,21 +6,21 @@ #include "RtdbOperate.h" #include "pub_logger_api/logger.h" -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_dbms; -kbd_sys::CRdbOperate::CRdbOperate() +iot_sys::CRdbOperate::CRdbOperate() { } -kbd_sys::CRdbOperate::~CRdbOperate() +iot_sys::CRdbOperate::~CRdbOperate() { cleanAndCloseAllTable(); } /* @brief 初始化 */ -int kbd_sys::CRdbOperate::initialize() +int iot_sys::CRdbOperate::initialize() { /* @brief 打开表sys_run_redundancy_cmd */ if (m_objRunRedundancyCmdTable.open(CN_AppName_BASE.c_str(), CN_TN_SysRunRedundancyCmd.c_str())) @@ -62,7 +62,7 @@ int kbd_sys::CRdbOperate::initialize() } /* @brief 删除表sys_run_redundancy_cmd记录 */ -int kbd_sys::CRdbOperate::deleteFromRedundancyCmd(const SRunRedundancyCmdKey &stKey) +int iot_sys::CRdbOperate::deleteFromRedundancyCmd(const SRunRedundancyCmdKey &stKey) { boost::mutex::scoped_lock lock(m_objRedundancyCmdMutex); CTableLockGuard tableLock(m_objRunRedundancyCmdTable); @@ -82,7 +82,7 @@ int kbd_sys::CRdbOperate::deleteFromRedundancyCmd(const SRunRedundancyCmdKey &st } /* @brief 表sys_run_redundancy_cmd中增加记录 */ -int kbd_sys::CRdbOperate::insertToRedundancyCmd(const SRunRedundancyCmd &stRecord, const bool bDelBeforeInsert) +int iot_sys::CRdbOperate::insertToRedundancyCmd(const SRunRedundancyCmd &stRecord, const bool bDelBeforeInsert) { boost::mutex::scoped_lock lock(m_objRedundancyCmdMutex); CTableLockGuard tableLock(m_objRunRedundancyCmdTable); @@ -126,7 +126,7 @@ int kbd_sys::CRdbOperate::insertToRedundancyCmd(const SRunRedundancyCmd &stRecor } /* @brief 表sys_run_redundancy_info中增加记录 */ -int kbd_sys::CRdbOperate::insertToRedundancyInfo(const SRunRedundancyInfo &stRecord, const bool bDelBeforeInsert) +int iot_sys::CRdbOperate::insertToRedundancyInfo(const SRunRedundancyInfo &stRecord, const bool bDelBeforeInsert) { boost::mutex::scoped_lock lock(m_objRedundancyInfoMutex); CTableLockGuard tableLock(m_objRunRedundancyInfoTable); @@ -165,7 +165,7 @@ int kbd_sys::CRdbOperate::insertToRedundancyInfo(const SRunRedundancyInfo &stRec } /* @brief 更新表sys_run_redundancy_info记录 */ -int kbd_sys::CRdbOperate::updateRedundancyInfo(const SRunRedundancyInfoKey &stKey, std::vector vecCol) +int iot_sys::CRdbOperate::updateRedundancyInfo(const SRunRedundancyInfoKey &stKey, std::vector vecCol) { boost::mutex::scoped_lock lock(m_objRedundancyInfoMutex); CTableLockGuard tableLock(m_objRunRedundancyInfoTable); @@ -180,7 +180,7 @@ int kbd_sys::CRdbOperate::updateRedundancyInfo(const SRunRedundancyInfoKey &stKe } /* @brief 获取表sys_run_app_info指定记录信息 */ -int kbd_sys::CRdbOperate::getLocalRunAppInfo(const STableRunAppInfoKey &stAppInfoKey, STableRunAppInfo &stRunAppInfo) +int iot_sys::CRdbOperate::getLocalRunAppInfo(const STableRunAppInfoKey &stAppInfoKey, STableRunAppInfo &stRunAppInfo) { boost::mutex::scoped_lock lock(m_objAppInfoMutex); CTableLockGuard tableLock(m_objRunAppInfoTable); @@ -196,7 +196,7 @@ int kbd_sys::CRdbOperate::getLocalRunAppInfo(const STableRunAppInfoKey &stAppInf } /* @brief 清理表中所有数据并关闭 */ -void kbd_sys::CRdbOperate::cleanAndCloseAllTable() +void iot_sys::CRdbOperate::cleanAndCloseAllTable() { std::vector condInfop; { diff --git a/platform/src/sys/sys_node_mng/RtdbOperate.h b/platform/src/sys/sys_node_mng/RtdbOperate.h index 4904cf2d..f34664f5 100644 --- a/platform/src/sys/sys_node_mng/RtdbOperate.h +++ b/platform/src/sys/sys_node_mng/RtdbOperate.h @@ -10,7 +10,7 @@ #include "sys_node_mng_api/SysRunRedundantCmdTable.h" #include "sys_proc_mng_api/SysRunAppInfoTable.h" -namespace kbd_sys +namespace iot_sys { class CRdbOperate { @@ -46,10 +46,10 @@ namespace kbd_sys /** @brief 更新表sys_run_redundancy_info记录 @param const SRunRedundancyInfoKey & stKey 主键 - @param std::vector vecCol 要更新的字段 + @param std::vector vecCol 要更新的字段 @return 成功返回kbdSuccess,失败返回kbdFailed */ - int updateRedundancyInfo(const SRunRedundancyInfoKey &stKey, std::vector vecCol); + int updateRedundancyInfo(const SRunRedundancyInfoKey &stKey, std::vector vecCol); /** @brief 获取表sys_run_app_info指定记录信息 @param const STableRunAppInfoKey & stAppInfoKey 主键 @@ -66,15 +66,15 @@ namespace kbd_sys void cleanAndCloseAllTable(); private: - kbd_dbms::CRdbAccessEx m_objRunRedundancyCmdTable; //< sys_run_redundancy_cmd表 + iot_dbms::CRdbAccessEx m_objRunRedundancyCmdTable; //< sys_run_redundancy_cmd表 boost::mutex m_objRedundancyCmdMutex; //< sys_run_redundancy_cmd互斥量 - kbd_dbms::CRdbAccessEx m_objRunRedundancyInfoTable; //< sys_run_redundancy_info表 + iot_dbms::CRdbAccessEx m_objRunRedundancyInfoTable; //< sys_run_redundancy_info表 boost::mutex m_objRedundancyInfoMutex; //< sys_run_redundancy_info互斥量 - kbd_dbms::CRdbAccessEx m_objRunAppInfoTable; //< sys_run_app_info表 + iot_dbms::CRdbAccessEx m_objRunAppInfoTable; //< sys_run_app_info表 boost::mutex m_objAppInfoMutex; //< sys_run_app_info互斥量 }; typedef boost::shared_ptr CRdbOperatePtr; -}//namespace kbd_sys +}//namespace iot_sys diff --git a/platform/src/sys/sys_node_mng/main.cpp b/platform/src/sys/sys_node_mng/main.cpp index 36139f97..f6f2ae7d 100644 --- a/platform/src/sys/sys_node_mng/main.cpp +++ b/platform/src/sys/sys_node_mng/main.cpp @@ -7,6 +7,6 @@ int main(int argc, char *argv[]) { - kbd_sys::CNodeMngApp objApp; + iot_sys::CNodeMngApp objApp; return objApp.main(argc, argv); } diff --git a/platform/src/sys/sys_node_mng_api/NodeMngInterface.cpp b/platform/src/sys/sys_node_mng_api/NodeMngInterface.cpp index e00bf768..d1a24802 100644 --- a/platform/src/sys/sys_node_mng_api/NodeMngInterface.cpp +++ b/platform/src/sys/sys_node_mng_api/NodeMngInterface.cpp @@ -7,10 +7,10 @@ #include "RedundantMngImpl.h" #include "RedundantInfoImpl.h" -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_sys; -SYS_NODE_MNG_API CRedundantMngInterfacePtr kbd_sys::getRedundantMngInstance(int nDomainId, +SYS_NODE_MNG_API CRedundantMngInterfacePtr iot_sys::getRedundantMngInstance(int nDomainId, int nAppId, const std::string &strNodeName) { @@ -27,7 +27,7 @@ SYS_NODE_MNG_API CRedundantMngInterfacePtr kbd_sys::getRedundantMngInstance(int return ptrRedundantMng; } -SYS_NODE_MNG_API CRedundantInfoInterfacePtr kbd_sys::getRedundantInfoInstance() +SYS_NODE_MNG_API CRedundantInfoInterfacePtr iot_sys::getRedundantInfoInstance() { CRedundantInfoImplPtr ptrRedundantInfo = boost::make_shared(); if (ptrRedundantInfo != NULL) diff --git a/platform/src/sys/sys_node_mng_api/RedundantInfoImpl.cpp b/platform/src/sys/sys_node_mng_api/RedundantInfoImpl.cpp index cee5c262..3b8742e4 100644 --- a/platform/src/sys/sys_node_mng_api/RedundantInfoImpl.cpp +++ b/platform/src/sys/sys_node_mng_api/RedundantInfoImpl.cpp @@ -8,15 +8,15 @@ #include "rdb_api/CRdbAccessEx.h" #include "sys_node_mng_api/SysRunRedundantInfoTable.h" -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_dbms; -kbd_sys::CRedundantInfoImpl::CRedundantInfoImpl() +iot_sys::CRedundantInfoImpl::CRedundantInfoImpl() { } -kbd_sys::CRedundantInfoImpl::~CRedundantInfoImpl() +iot_sys::CRedundantInfoImpl::~CRedundantInfoImpl() { if (m_objRunRedundantInfo.close()) { @@ -31,7 +31,7 @@ kbd_sys::CRedundantInfoImpl::~CRedundantInfoImpl() } /* @brief 获取指定域、应用的主节点信息 */ -int kbd_sys::CRedundantInfoImpl::getMasterNodeInfo(int nDomainId, int nAppId, SNodeRedundantInfo &stMasterNodeInfo) +int iot_sys::CRedundantInfoImpl::getMasterNodeInfo(int nDomainId, int nAppId, SNodeRedundantInfo &stMasterNodeInfo) { boost::mutex::scoped_lock lock(m_objMutex); CTableLockGuard tableLock(m_objRunRedundantInfo); @@ -83,7 +83,7 @@ int kbd_sys::CRedundantInfoImpl::getMasterNodeInfo(int nDomainId, int nAppId, SN } /* @brief 指定域、应用、节点的是否为主 */ -bool kbd_sys::CRedundantInfoImpl::isMaster(int nDomainId, int nAppId, const std::string &strNodeName) +bool iot_sys::CRedundantInfoImpl::isMaster(int nDomainId, int nAppId, const std::string &strNodeName) { boost::mutex::scoped_lock lock(m_objMutex); CTableLockGuard tableLock(m_objRunRedundantInfo); @@ -102,7 +102,7 @@ bool kbd_sys::CRedundantInfoImpl::isMaster(int nDomainId, int nAppId, const std: } /* @brief 指定域、应用、节点的是否为备 */ -bool kbd_sys::CRedundantInfoImpl::isSlave(int nDomainId, int nAppId, const std::string &strNodeName) +bool iot_sys::CRedundantInfoImpl::isSlave(int nDomainId, int nAppId, const std::string &strNodeName) { boost::mutex::scoped_lock lock(m_objMutex); CTableLockGuard tableLock(m_objRunRedundantInfo); @@ -121,7 +121,7 @@ bool kbd_sys::CRedundantInfoImpl::isSlave(int nDomainId, int nAppId, const std:: } /* @brief 初始化，主要用来打开内存库 */ -int kbd_sys::CRedundantInfoImpl::initialize() +int iot_sys::CRedundantInfoImpl::initialize() { if (m_objRunRedundantInfo.open(CN_AppName_BASE.c_str(), CN_TN_SysRunRedundancyInfo.c_str())) { diff --git a/platform/src/sys/sys_node_mng_api/RedundantInfoImpl.h b/platform/src/sys/sys_node_mng_api/RedundantInfoImpl.h index 4742744a..e30116e9 100644 --- a/platform/src/sys/sys_node_mng_api/RedundantInfoImpl.h +++ b/platform/src/sys/sys_node_mng_api/RedundantInfoImpl.h @@ -8,7 +8,7 @@ #include "rdb_api/CRdbAccessEx.h" #include "sys_node_mng_api/RedundantInfoInterface.h" -namespace kbd_sys +namespace iot_sys { /* @brief 冗余信息状态获取接口实现类 */ class CRedundantInfoImpl :public CRedundantInfoInterface @@ -51,10 +51,10 @@ namespace kbd_sys int initialize(); private: - kbd_dbms::CRdbAccessEx m_objRunRedundantInfo; //< 管理内存表sys_run_redundancy_info + iot_dbms::CRdbAccessEx m_objRunRedundantInfo; //< 管理内存表sys_run_redundancy_info boost::mutex m_objMutex; //< 保护内存表，避免多线程竞争 }; typedef boost::shared_ptr CRedundantInfoImplPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_node_mng_api/RedundantMngImpl.cpp b/platform/src/sys/sys_node_mng_api/RedundantMngImpl.cpp index 86dee40c..bc1726f3 100644 --- a/platform/src/sys/sys_node_mng_api/RedundantMngImpl.cpp +++ b/platform/src/sys/sys_node_mng_api/RedundantMngImpl.cpp @@ -6,10 +6,10 @@ #include "RedundantMngImpl.h" #include "pub_logger_api/logger.h" -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_sys; -kbd_sys::CRedundantMngImpl::CRedundantMngImpl(int nDomainId, int nAppId, const std::string &strNodeName) +iot_sys::CRedundantMngImpl::CRedundantMngImpl(int nDomainId, int nAppId, const std::string &strNodeName) :m_nDomainId(nDomainId), m_nAppId(nAppId), m_strNodeName(strNodeName) @@ -17,7 +17,7 @@ kbd_sys::CRedundantMngImpl::CRedundantMngImpl(int nDomainId, int nAppId, const s m_ptrRedundantMngThread.reset(); } -kbd_sys::CRedundantMngImpl::~CRedundantMngImpl() +iot_sys::CRedundantMngImpl::~CRedundantMngImpl() { if (m_ptrRedundantMngThread != NULL) { @@ -27,7 +27,7 @@ kbd_sys::CRedundantMngImpl::~CRedundantMngImpl() } /* @brief 设置冗余切换处理回调 */ -int kbd_sys::CRedundantMngImpl::setCallback(const CRedundantSwitchInterfacePtr &ptrSwitch) +int iot_sys::CRedundantMngImpl::setCallback(const CRedundantSwitchInterfacePtr &ptrSwitch) { if (m_ptrRedundantMngThread == NULL) { @@ -45,13 +45,13 @@ int kbd_sys::CRedundantMngImpl::setCallback(const CRedundantSwitchInterfacePtr & } /* @brief 清除冗余切换回调 */ -void kbd_sys::CRedundantMngImpl::unsetCallback() +void iot_sys::CRedundantMngImpl::unsetCallback() { m_ptrRedundantMngThread->unsetCallback(); } /* @brief 初始化本类所需资源 */ -int kbd_sys::CRedundantMngImpl::initialize() +int iot_sys::CRedundantMngImpl::initialize() { m_ptrRedundantMngThread = boost::make_shared(m_nDomainId, m_nAppId, m_strNodeName); if (m_ptrRedundantMngThread == NULL) diff --git a/platform/src/sys/sys_node_mng_api/RedundantMngImpl.h b/platform/src/sys/sys_node_mng_api/RedundantMngImpl.h index 1840383b..6bf45876 100644 --- a/platform/src/sys/sys_node_mng_api/RedundantMngImpl.h +++ b/platform/src/sys/sys_node_mng_api/RedundantMngImpl.h @@ -7,7 +7,7 @@ #include "sys_node_mng_api/NodeMngInterface.h" #include "RedundantMngThread.h" -namespace kbd_sys +namespace iot_sys { /* @brief 冗余管理接口实现类 */ class CRedundantMngImpl :public CRedundantMngInterface @@ -54,4 +54,4 @@ namespace kbd_sys typedef boost::shared_ptr CRedundantMngImplPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_node_mng_api/RedundantMngThread.cpp b/platform/src/sys/sys_node_mng_api/RedundantMngThread.cpp index 2d14e207..8dd00aa5 100644 --- a/platform/src/sys/sys_node_mng_api/RedundantMngThread.cpp +++ b/platform/src/sys/sys_node_mng_api/RedundantMngThread.cpp @@ -6,11 +6,11 @@ #include "RedundantMngThread.h" #include "pub_logger_api/logger.h" -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_dbms; -kbd_sys::CRedundantMngThread::CRedundantMngThread(int nDomainId, int nAppId, const std::string &strNodeName) +iot_sys::CRedundantMngThread::CRedundantMngThread(int nDomainId, int nAppId, const std::string &strNodeName) :CTimerThreadBase("RedundantMngThread", 200), m_nDomainId(nDomainId), m_nAppId(nAppId), @@ -22,7 +22,7 @@ kbd_sys::CRedundantMngThread::CRedundantMngThread(int nDomainId, int nAppId, con m_ptrSwitch.reset(); } -kbd_sys::CRedundantMngThread::~CRedundantMngThread() +iot_sys::CRedundantMngThread::~CRedundantMngThread() { m_ptrSwitch.reset(); if (m_objRunRedundantCmdTable.close()) @@ -38,7 +38,7 @@ kbd_sys::CRedundantMngThread::~CRedundantMngThread() } /* @brief 业务处理函数,检测是否需要进行冗余切换 */ -void kbd_sys::CRedundantMngThread::execute() +void iot_sys::CRedundantMngThread::execute() { SRunRedundancyCmd stRunRedundantCmd; if (!getRunRedundantCmd(stRunRedundantCmd)) @@ -83,7 +83,7 @@ void kbd_sys::CRedundantMngThread::execute() } /* @brief 设置冗余切换处理回调 */ -int kbd_sys::CRedundantMngThread::setCallback(const CRedundantSwitchInterfacePtr &ptrSwitch) +int iot_sys::CRedundantMngThread::setCallback(const CRedundantSwitchInterfacePtr &ptrSwitch) { /* @brief 加锁保护 */ boost::mutex::scoped_lock lock(m_objMutex); @@ -99,7 +99,7 @@ int kbd_sys::CRedundantMngThread::setCallback(const CRedundantSwitchInterfacePtr } /* @brief 清除冗余切换回调 */ -void kbd_sys::CRedundantMngThread::unsetCallback() +void iot_sys::CRedundantMngThread::unsetCallback() { /* @brief 加锁保护 */ boost::mutex::scoped_lock lock(m_objMutex); @@ -108,7 +108,7 @@ void kbd_sys::CRedundantMngThread::unsetCallback() } /* @brief 初始化，主要用来打开内存表 */ -int kbd_sys::CRedundantMngThread::initialize() +int iot_sys::CRedundantMngThread::initialize() { if (m_objRunRedundantCmdTable.open(CN_AppName_BASE.c_str(), CN_TN_SysRunRedundancyCmd.c_str())) { @@ -125,7 +125,7 @@ int kbd_sys::CRedundantMngThread::initialize() } /* @brief 获取当前是否存在冗余切换指令 */ -bool kbd_sys::CRedundantMngThread::getRunRedundantCmd(SRunRedundancyCmd &stRunRedundantCmd) +bool iot_sys::CRedundantMngThread::getRunRedundantCmd(SRunRedundancyCmd &stRunRedundantCmd) { CTableLockGuard tableLock(m_objRunRedundantCmdTable); diff --git a/platform/src/sys/sys_node_mng_api/RedundantMngThread.h b/platform/src/sys/sys_node_mng_api/RedundantMngThread.h index 2424d820..0dcf5ea0 100644 --- a/platform/src/sys/sys_node_mng_api/RedundantMngThread.h +++ b/platform/src/sys/sys_node_mng_api/RedundantMngThread.h @@ -9,10 +9,10 @@ #include "rdb_api/CRdbAccessEx.h" #include "sys_node_mng_api/SysRunRedundantCmdTable.h" -namespace kbd_sys +namespace iot_sys { /* @brief */ - class CRedundantMngThread : public kbd_public::CTimerThreadBase + class CRedundantMngThread : public iot_public::CTimerThreadBase { public: /** @@ -69,9 +69,9 @@ namespace kbd_sys int m_nIsSlave; //< 是否为备 boost::mutex m_objMutex; //< 保护m_ptrSwitch CRedundantSwitchInterfacePtr m_ptrSwitch; //< 冗余切换时要通知的对象指针 - kbd_dbms::CRdbAccessEx m_objRunRedundantCmdTable; //单线程操作，暂无需加锁 + iot_dbms::CRdbAccessEx m_objRunRedundantCmdTable; //单线程操作，暂无需加锁 }; typedef boost::shared_ptr CCRedundantMngThreadPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoRecvThread.cpp b/platform/src/sys/sys_nodeinfo_tran/NodeInfoRecvThread.cpp index bd6f2263..6b93cbd0 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoRecvThread.cpp +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoRecvThread.cpp @@ -7,15 +7,15 @@ #include "MessageChannel.h" #include "pub_logger_api/logger.h" -using namespace kbd_idlfile; -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_net; +using namespace iot_idl; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_net; -kbd_sys::CNodeInfoRecvThread::CNodeInfoRecvThread(const kbd_public::SRunAppInfo &stRunAppInfo, +iot_sys::CNodeInfoRecvThread::CNodeInfoRecvThread(const iot_public::SRunAppInfo &stRunAppInfo, const CNodeInfoTranCfgParamPtr &ptrCfgParam, const CNodeInfoSendThreadPtr &ptrSendThread) - :kbd_public::CTimerThreadBase("CNodeInfoRecvThread", 0), + :iot_public::CTimerThreadBase("CNodeInfoRecvThread", 0), m_nMsgRecvTimeoutMsec(200), m_stRunAppInfo(stRunAppInfo), m_ptrCfgParam(ptrCfgParam), @@ -24,14 +24,14 @@ kbd_sys::CNodeInfoRecvThread::CNodeInfoRecvThread(const kbd_public::SRunAppInfo } -kbd_sys::CNodeInfoRecvThread::~CNodeInfoRecvThread() +iot_sys::CNodeInfoRecvThread::~CNodeInfoRecvThread() { unsubscribeMessage(); m_ptrSendThread.reset(); m_ptrCfgParam.reset(); } -void kbd_sys::CNodeInfoRecvThread::execute() +void iot_sys::CNodeInfoRecvThread::execute() { CMbMessage objMsg; if (m_objCommunicator.recvMsg(objMsg, m_nMsgRecvTimeoutMsec)) @@ -53,14 +53,14 @@ void kbd_sys::CNodeInfoRecvThread::execute() } /* @brief 初始化 */ -int kbd_sys::CNodeInfoRecvThread::initialize() +int iot_sys::CNodeInfoRecvThread::initialize() { m_nMsgRecvTimeoutMsec = m_ptrCfgParam->getMsgRecvTimeoutMsec(); //< 消息接收超时时间 return kbdSuccess; } /* @brief 订阅相关消息通道 */ -int kbd_sys::CNodeInfoRecvThread::subscribeMessage() +int iot_sys::CNodeInfoRecvThread::subscribeMessage() { /* @brief 接收域内的心跳信息 */ if (!m_objCommunicator.addSub(CN_AppId_BASE, CH_NODE_MNG_INTRA_DOMAIN)) @@ -88,7 +88,7 @@ int kbd_sys::CNodeInfoRecvThread::subscribeMessage() } /* @brief 取消订阅相关消息通道 */ -int kbd_sys::CNodeInfoRecvThread::unsubscribeMessage() +int iot_sys::CNodeInfoRecvThread::unsubscribeMessage() { m_objCommunicator.delSub(0, 0); @@ -102,7 +102,7 @@ int kbd_sys::CNodeInfoRecvThread::unsubscribeMessage() } /* @brief 转发心跳信息到其它域 */ -int kbd_sys::CNodeInfoRecvThread::transmitHeartbeatToInterDomain(const kbd_net::CMbMessage &objMsg) +int iot_sys::CNodeInfoRecvThread::transmitHeartbeatToInterDomain(const iot_net::CMbMessage &objMsg) { SNodeHeartbeatMsg stHeartbeat; if (!stHeartbeat.ParseFromArray(objMsg.getDataPtr(), static_cast(objMsg.getDataSize()))) @@ -117,7 +117,7 @@ int kbd_sys::CNodeInfoRecvThread::transmitHeartbeatToInterDomain(const kbd_net:: } /* @brief 转发心跳信息到本域 */ -int kbd_sys::CNodeInfoRecvThread::transmitHeartbeatToIntraDomain(const kbd_net::CMbMessage &objMsg) +int iot_sys::CNodeInfoRecvThread::transmitHeartbeatToIntraDomain(const iot_net::CMbMessage &objMsg) { m_ptrSendThread->addMsgToIntraDomain(objMsg); return kbdSuccess; diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoRecvThread.h b/platform/src/sys/sys_nodeinfo_tran/NodeInfoRecvThread.h index 69675b99..2d48120d 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoRecvThread.h +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoRecvThread.h @@ -9,12 +9,12 @@ #include "NodeInfoTranCfgParam.h" #include "NodeInfoSendThread.h" -namespace kbd_sys +namespace iot_sys { - class CNodeInfoRecvThread : public kbd_public::CTimerThreadBase + class CNodeInfoRecvThread : public iot_public::CTimerThreadBase { public: - CNodeInfoRecvThread(const kbd_public::SRunAppInfo &stRunAppInfo, + CNodeInfoRecvThread(const iot_public::SRunAppInfo &stRunAppInfo, const CNodeInfoTranCfgParamPtr &ptrCfgParam, const CNodeInfoSendThreadPtr &ptrSendThread); virtual ~CNodeInfoRecvThread(); @@ -43,24 +43,24 @@ namespace kbd_sys /** @brief 转发心跳信息到其它域 - @param const kbd_net::CMbMessage & objMsg 接收到的消息 + @param const iot_net::CMbMessage & objMsg 接收到的消息 @return 成功返回kbdSuccess,失败返回kbdFailed */ - int transmitHeartbeatToInterDomain(const kbd_net::CMbMessage &objMsg); + int transmitHeartbeatToInterDomain(const iot_net::CMbMessage &objMsg); /** @brief 转发心跳信息到本域 - @param const kbd_net::CMbMessage & objMsg 接收到的消息 + @param const iot_net::CMbMessage & objMsg 接收到的消息 @return 成功返回kbdSuccess,失败返回kbdFailed */ - int transmitHeartbeatToIntraDomain(const kbd_net::CMbMessage &objMsg); + int transmitHeartbeatToIntraDomain(const iot_net::CMbMessage &objMsg); private: int m_nMsgRecvTimeoutMsec; //< 消息接收超时时间 - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用的运行信息 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用的运行信息 CNodeInfoTranCfgParamPtr m_ptrCfgParam; //< 参数配置类 CNodeInfoSendThreadPtr m_ptrSendThread; //< 消息发送线程 - kbd_net::CMbCommunicator m_objCommunicator; //< 消息总线通信器 + iot_net::CMbCommunicator m_objCommunicator; //< 消息总线通信器 }; typedef boost::shared_ptr CNodeInfoRecvThreadPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoSendThread.cpp b/platform/src/sys/sys_nodeinfo_tran/NodeInfoSendThread.cpp index d4260da8..58cc0db0 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoSendThread.cpp +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoSendThread.cpp @@ -9,33 +9,33 @@ #include "pub_logger_api/logger.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_idlfile; -using namespace kbd_net; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_idl; +using namespace iot_net; -kbd_sys::CNodeInfoSendThread::CNodeInfoSendThread(const kbd_public::SRunAppInfo &stRunAppInfo, +iot_sys::CNodeInfoSendThread::CNodeInfoSendThread(const iot_public::SRunAppInfo &stRunAppInfo, const CNodeInfoTranCfgParamPtr &ptrCfgParam) - :kbd_public::CTimerThreadBase("CNodeInfoSendThread", 200), + :iot_public::CTimerThreadBase("CNodeInfoSendThread", 200), m_stRunAppInfo(stRunAppInfo), m_ptrCfgParam(ptrCfgParam) { } -kbd_sys::CNodeInfoSendThread::~CNodeInfoSendThread() +iot_sys::CNodeInfoSendThread::~CNodeInfoSendThread() { m_ptrCfgParam.reset(); } -void kbd_sys::CNodeInfoSendThread::execute() +void iot_sys::CNodeInfoSendThread::execute() { sendNodeInfoToInterDomain(); sendNodeInfoToIntraDomain(); } /* @brief 初始化 */ -int kbd_sys::CNodeInfoSendThread::initialize() +int iot_sys::CNodeInfoSendThread::initialize() { m_nRunPeriodMsec = m_ptrCfgParam->getSendMsgPeriodMsec(); //< 发送间隔时间 m_vecDstDomainId = m_ptrCfgParam->getDstDomainId(); @@ -43,14 +43,14 @@ int kbd_sys::CNodeInfoSendThread::initialize() } /* @brief 添加心跳信息到域间缓冲区 */ -void kbd_sys::CNodeInfoSendThread::addMsgToInterDomain(const kbd_idlfile::SNodeHeartbeatMsg &stNodeHeartbeat) +void iot_sys::CNodeInfoSendThread::addMsgToInterDomain(const iot_idl::SNodeHeartbeatMsg &stNodeHeartbeat) { boost::mutex::scoped_lock lock(m_objMutex); m_mapNodeHeartbeatMsg[stNodeHeartbeat.strnodename()] = stNodeHeartbeat; } /* @brief 添加心跳信息到域内缓冲区 */ -void kbd_sys::CNodeInfoSendThread::addMsgToIntraDomain(const kbd_net::CMbMessage &objMsg) +void iot_sys::CNodeInfoSendThread::addMsgToIntraDomain(const iot_net::CMbMessage &objMsg) { boost::mutex::scoped_lock lock(m_objMutex); m_vecDomainHeartbeatMsg.push_back(objMsg); @@ -58,7 +58,7 @@ void kbd_sys::CNodeInfoSendThread::addMsgToIntraDomain(const kbd_net::CMbMessage } /* @brief 发送心跳信息到域间 */ -int kbd_sys::CNodeInfoSendThread::sendNodeInfoToInterDomain() +int iot_sys::CNodeInfoSendThread::sendNodeInfoToInterDomain() { NodeNameToHeartbeatMsgMAP mapHeartbeatMsg; { @@ -108,7 +108,7 @@ int kbd_sys::CNodeInfoSendThread::sendNodeInfoToInterDomain() } /* @brief 发送心跳信息到域内 */ -int kbd_sys::CNodeInfoSendThread::sendNodeInfoToIntraDomain() +int iot_sys::CNodeInfoSendThread::sendNodeInfoToIntraDomain() { DomainIdToMsgSeq vecDomainHeartbeatMsg; { diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoSendThread.h b/platform/src/sys/sys_nodeinfo_tran/NodeInfoSendThread.h index 93096c07..af0a31cb 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoSendThread.h +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoSendThread.h @@ -9,12 +9,12 @@ #include "NodeInfoTranCfgParam.h" #include "NodeMngMessage.pb.h" -namespace kbd_sys +namespace iot_sys { - class CNodeInfoSendThread : public kbd_public::CTimerThreadBase + class CNodeInfoSendThread : public iot_public::CTimerThreadBase { public: - CNodeInfoSendThread(const kbd_public::SRunAppInfo &stRunAppInfo, + CNodeInfoSendThread(const iot_public::SRunAppInfo &stRunAppInfo, const CNodeInfoTranCfgParamPtr &ptrCfgParam); virtual ~CNodeInfoSendThread(); @@ -29,14 +29,14 @@ namespace kbd_sys int initialize(); /** @brief 添加心跳信息到域间缓冲区 - @param const kbd_idlfile::SNodeHeartbeatMsg & stNodeHeartbeat 节点心跳信息 + @param const iot_idl::SNodeHeartbeatMsg & stNodeHeartbeat 节点心跳信息 */ - void addMsgToInterDomain(const kbd_idlfile::SNodeHeartbeatMsg &stNodeHeartbeat); + void addMsgToInterDomain(const iot_idl::SNodeHeartbeatMsg &stNodeHeartbeat); /** @brief 添加心跳信息到域内缓冲区 - @param const kbd_net::CMbMessage & objMsg 接收到的域间发送的消息 + @param const iot_net::CMbMessage & objMsg 接收到的域间发送的消息 */ - void addMsgToIntraDomain(const kbd_net::CMbMessage &objMsg); + void addMsgToIntraDomain(const iot_net::CMbMessage &objMsg); private: /** @@ -51,18 +51,18 @@ namespace kbd_sys int sendNodeInfoToIntraDomain(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用的运行信息 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用的运行信息 CNodeInfoTranCfgParamPtr m_ptrCfgParam; //< 配置文件解析类 - kbd_net::CMbCommunicator m_objCommunicator; //< 消息总线通信器 + iot_net::CMbCommunicator m_objCommunicator; //< 消息总线通信器 std::vector m_vecDstDomainId; //< 本域的心跳信息需要转发到的域ID列表 boost::mutex m_objMutex; - typedef std::map NodeNameToHeartbeatMsgMAP; + typedef std::map NodeNameToHeartbeatMsgMAP; NodeNameToHeartbeatMsgMAP m_mapNodeHeartbeatMsg; //< 缓存域内节点心跳信息 - typedef std::vector DomainIdToMsgSeq; + typedef std::vector DomainIdToMsgSeq; DomainIdToMsgSeq m_vecDomainHeartbeatMsg; //< 缓存域间心跳信息 }; typedef boost::shared_ptr CNodeInfoSendThreadPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranApp.cpp b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranApp.cpp index 906cc585..8c62d17d 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranApp.cpp +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranApp.cpp @@ -10,14 +10,14 @@ #include "NodeInfoTranCommon.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_net; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_net; #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" -kbd_sys::CNodeInfoTranApp::CNodeInfoTranApp() +iot_sys::CNodeInfoTranApp::CNodeInfoTranApp() :m_ptrSysInfo(NULL), m_ptrProcMng(NULL), m_ptrRedundancyMng(NULL), @@ -25,12 +25,12 @@ kbd_sys::CNodeInfoTranApp::CNodeInfoTranApp() { } -kbd_sys::CNodeInfoTranApp::~CNodeInfoTranApp() +iot_sys::CNodeInfoTranApp::~CNodeInfoTranApp() { stop(); } -bool kbd_sys::CNodeInfoTranApp::start(int argc, char *argv[], int &/*nStatus*/) +bool iot_sys::CNodeInfoTranApp::start(int argc, char *argv[], int &/*nStatus*/) { //1.解析启动参数 if (!parseCmdLine(argc, argv)) @@ -96,7 +96,7 @@ bool kbd_sys::CNodeInfoTranApp::start(int argc, char *argv[], int &/*nStatus*/) return true; } -bool kbd_sys::CNodeInfoTranApp::stop() +bool iot_sys::CNodeInfoTranApp::stop() { //9.更新当前进程冗余状态 if (m_ptrProcMng != NULL) @@ -129,7 +129,7 @@ bool kbd_sys::CNodeInfoTranApp::stop() return true; } -int kbd_sys::CNodeInfoTranApp::toQuit() +int iot_sys::CNodeInfoTranApp::toQuit() { if (m_ptrProcMng != NULL) { @@ -140,7 +140,7 @@ int kbd_sys::CNodeInfoTranApp::toQuit() return kbdSuccess; } -bool kbd_sys::CNodeInfoTranApp::parseCmdLine(int argc, char *argv[]) +bool iot_sys::CNodeInfoTranApp::parseCmdLine(int argc, char *argv[]) { /* @brief 拼接启动参数，用于向进程管理注册 */ for (int i = 1; i < argc; ++i) @@ -202,14 +202,14 @@ bool kbd_sys::CNodeInfoTranApp::parseCmdLine(int argc, char *argv[]) } /* @brief 显示帮助信息 */ -void kbd_sys::CNodeInfoTranApp::showHelp(const boost::program_options::options_description &objDesc) +void iot_sys::CNodeInfoTranApp::showHelp(const boost::program_options::options_description &objDesc) { std::cout << CN_ProcName_NodeInfoTran << " [-h] | [-a app]" << std::endl; std::cout << objDesc << std::endl; } /* @brief 判断同名同参数进程是否已经有实例在运行 */ -bool kbd_sys::CNodeInfoTranApp::isAlreadyRunning() +bool iot_sys::CNodeInfoTranApp::isAlreadyRunning() { string strUniqueName = CN_ProcName_NodeInfoTran; strUniqueName += " -a " + m_strAppName; @@ -217,14 +217,14 @@ bool kbd_sys::CNodeInfoTranApp::isAlreadyRunning() } /* @brief 初始化日志 */ -bool kbd_sys::CNodeInfoTranApp::initLog() +bool iot_sys::CNodeInfoTranApp::initLog() { StartLogSystem(m_strAppName.c_str(), CN_ProcName_NodeInfoTran.c_str()); return true; } /* @brief 获取系统配置相关信息 */ -bool kbd_sys::CNodeInfoTranApp::getSystemInfo() +bool iot_sys::CNodeInfoTranApp::getSystemInfo() { if (!createSysInfoInstance(m_ptrSysInfo)) { @@ -242,7 +242,7 @@ bool kbd_sys::CNodeInfoTranApp::getSystemInfo() } /* @brief 向进程管理注册 */ -bool kbd_sys::CNodeInfoTranApp::registToProcMng() +bool iot_sys::CNodeInfoTranApp::registToProcMng() { SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stRunAppInfo.nDomainId; @@ -268,7 +268,7 @@ bool kbd_sys::CNodeInfoTranApp::registToProcMng() } /* @brief 初始化业务资源 */ -bool kbd_sys::CNodeInfoTranApp::initialize() +bool iot_sys::CNodeInfoTranApp::initialize() { /* @brief 初始化消息总线 */ if (!initMsgBus(CN_ProcName_NodeInfoTran.c_str(), "")) @@ -295,7 +295,7 @@ bool kbd_sys::CNodeInfoTranApp::initialize() } /* @brief 清理业务资源 */ -bool kbd_sys::CNodeInfoTranApp::clean() +bool iot_sys::CNodeInfoTranApp::clean() { if (m_ptrNodeInfoTranMng != NULL) { diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranApp.h b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranApp.h index cd65c795..ec2f9b8f 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranApp.h +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranApp.h @@ -11,9 +11,9 @@ #include "sys_node_mng_api/NodeMngInterface.h" #include "NodeInfoTranMng.h" -namespace kbd_sys +namespace iot_sys { - class CNodeInfoTranApp : public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface + class CNodeInfoTranApp : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CNodeInfoTranApp(); @@ -92,12 +92,12 @@ namespace kbd_sys private: std::string m_strAppName; //< 应用名 std::string m_strStartArgs; //< 保存进程启动参数 - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用的运行信息 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用的运行信息 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 CRedundantMngInterfacePtr m_ptrRedundancyMng; //< 冗余管理类 CNodeInfoTranMngPtr m_ptrNodeInfoTranMng; //< 域间节点状态转发管理类 }; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranCfgParam.cpp b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranCfgParam.cpp index c572862a..4ee50c2a 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranCfgParam.cpp +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranCfgParam.cpp @@ -7,24 +7,24 @@ #include "pub_utility_api/FileUtil.h" #include "pub_utility_api/CommonConfigParse.h" -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_sys; using namespace std; -kbd_sys::CNodeInfoTranCfgParam::CNodeInfoTranCfgParam(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo) +iot_sys::CNodeInfoTranCfgParam::CNodeInfoTranCfgParam(const iot_public::CSysInfoInterfacePtr &ptrSysInfo) :m_ptrSysInfo(ptrSysInfo), m_nMsgRecvTimeoutMsec(200), m_nSendMsgPeriodMsec(200) { } -kbd_sys::CNodeInfoTranCfgParam::~CNodeInfoTranCfgParam() +iot_sys::CNodeInfoTranCfgParam::~CNodeInfoTranCfgParam() { m_ptrSysInfo.reset(); } /* @brief 加载解析配置 */ -bool kbd_sys::CNodeInfoTranCfgParam::load() +bool iot_sys::CNodeInfoTranCfgParam::load() { //1.加载程序配置信息 CCommonConfigParse objCfg; @@ -49,7 +49,7 @@ bool kbd_sys::CNodeInfoTranCfgParam::load() return false; } - vector vecRelayInfo; + vector vecRelayInfo; if (kbdSuccess != m_ptrSysInfo->getMbRelayInfoBySrcDomainID(stNodeInfo.nDomainId, vecRelayInfo)) { LOGERROR("获取域转发信息失败"); @@ -57,7 +57,7 @@ bool kbd_sys::CNodeInfoTranCfgParam::load() } m_vecDomainId.clear(); - for (vector::const_iterator pIter = vecRelayInfo.begin(); pIter != vecRelayInfo.end(); ++pIter) + for (vector::const_iterator pIter = vecRelayInfo.begin(); pIter != vecRelayInfo.end(); ++pIter) { m_vecDomainId.push_back(pIter->m_nDstDomainID); } @@ -66,19 +66,19 @@ bool kbd_sys::CNodeInfoTranCfgParam::load() } /* @brief 获取消息接收超时时间 */ -int kbd_sys::CNodeInfoTranCfgParam::getMsgRecvTimeoutMsec() +int iot_sys::CNodeInfoTranCfgParam::getMsgRecvTimeoutMsec() { return m_nMsgRecvTimeoutMsec; } /* @brief 获取需要转发到的域ID列表 */ -int kbd_sys::CNodeInfoTranCfgParam::getSendMsgPeriodMsec() +int iot_sys::CNodeInfoTranCfgParam::getSendMsgPeriodMsec() { return m_nSendMsgPeriodMsec; } /* @brief 获取需要转发到的域ID列表 */ -std::vector kbd_sys::CNodeInfoTranCfgParam::getDstDomainId() +std::vector iot_sys::CNodeInfoTranCfgParam::getDstDomainId() { return m_vecDomainId; } diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranCfgParam.h b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranCfgParam.h index 24b2c775..d97567d5 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranCfgParam.h +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranCfgParam.h @@ -7,12 +7,12 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "NodeInfoTranCommon.h" -namespace kbd_sys +namespace iot_sys { class CNodeInfoTranCfgParam { public: - CNodeInfoTranCfgParam(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo); + CNodeInfoTranCfgParam(const iot_public::CSysInfoInterfacePtr &ptrSysInfo); virtual ~CNodeInfoTranCfgParam(); /** @@ -36,11 +36,11 @@ namespace kbd_sys std::vector getDstDomainId(); private: - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息接口库 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息接口库 int m_nMsgRecvTimeoutMsec; //< 消息接收超时时间 int m_nSendMsgPeriodMsec; //< 消息发送间隔 std::vector m_vecDomainId; //< 需要转发到的域ID列表 }; typedef boost::shared_ptr CNodeInfoTranCfgParamPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranCommon.h b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranCommon.h index 006e27ee..661e23ed 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranCommon.h +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranCommon.h @@ -7,7 +7,7 @@ #include #include "pub_logger_api/logger.h" -namespace kbd_sys +namespace iot_sys { const std::string CN_ProcName_NodeInfoTran = "sys_nodeinfo_tran"; //< 当前进程名 } diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranMng.cpp b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranMng.cpp index 4377c2fb..373eff97 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranMng.cpp +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranMng.cpp @@ -6,8 +6,8 @@ #include "NodeInfoTranMng.h" #include "pub_logger_api/logger.h" -kbd_sys::CNodeInfoTranMng::CNodeInfoTranMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, +iot_sys::CNodeInfoTranMng::CNodeInfoTranMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_public::CSysInfoInterfacePtr &ptrSysInfo, const CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), m_ptrSysInfo(ptrSysInfo), @@ -18,7 +18,7 @@ kbd_sys::CNodeInfoTranMng::CNodeInfoTranMng(const kbd_public::SRunAppInfo &stRun { } -kbd_sys::CNodeInfoTranMng::~CNodeInfoTranMng() +iot_sys::CNodeInfoTranMng::~CNodeInfoTranMng() { if (m_ptrRecvThread != NULL) { @@ -37,7 +37,7 @@ kbd_sys::CNodeInfoTranMng::~CNodeInfoTranMng() m_ptrSysInfo.reset(); } -int kbd_sys::CNodeInfoTranMng::redundantSwitch(bool bMaster, bool bSlave) +int iot_sys::CNodeInfoTranMng::redundantSwitch(bool bMaster, bool bSlave) { int nRet = kbdSuccess; LOGWARN("接收到冗余切换指令.Master=[%d],Slave=[%d]", bMaster, bSlave); @@ -63,7 +63,7 @@ int kbd_sys::CNodeInfoTranMng::redundantSwitch(bool bMaster, bool bSlave) } /* @brief 初始化 */ -int kbd_sys::CNodeInfoTranMng::initialize() +int iot_sys::CNodeInfoTranMng::initialize() { /* @brief 1.加载配置文件 */ m_ptrCfgParam = boost::make_shared(m_ptrSysInfo); diff --git a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranMng.h b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranMng.h index 9ede0796..b73ea442 100644 --- a/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranMng.h +++ b/platform/src/sys/sys_nodeinfo_tran/NodeInfoTranMng.h @@ -9,13 +9,13 @@ #include "NodeInfoRecvThread.h" #include "NodeInfoSendThread.h" -namespace kbd_sys +namespace iot_sys { - class CNodeInfoTranMng : public kbd_sys::CRedundantSwitchInterface + class CNodeInfoTranMng : public iot_sys::CRedundantSwitchInterface { public: - CNodeInfoTranMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, + CNodeInfoTranMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_public::CSysInfoInterfacePtr &ptrSysInfo, const CProcMngInterfacePtr &ptrProcMng); virtual ~CNodeInfoTranMng(); @@ -34,8 +34,8 @@ namespace kbd_sys int initialize(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 应用运行信息 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息接口库 + iot_public::SRunAppInfo m_stRunAppInfo; //< 应用运行信息 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息接口库 CProcMngInterfacePtr m_ptrProcMng; //< 进程管理接口库 CNodeInfoTranCfgParamPtr m_ptrCfgParam; //< 参数解析类 CNodeInfoSendThreadPtr m_ptrSendThread; //< 消息发送线程 @@ -43,4 +43,4 @@ namespace kbd_sys }; typedef boost::shared_ptr CNodeInfoTranMngPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_nodeinfo_tran/main.cpp b/platform/src/sys/sys_nodeinfo_tran/main.cpp index 56d81787..f9c51077 100644 --- a/platform/src/sys/sys_nodeinfo_tran/main.cpp +++ b/platform/src/sys/sys_nodeinfo_tran/main.cpp @@ -3,6 +3,6 @@ int main(int argc, char *argv[]) { - kbd_sys::CNodeInfoTranApp objApp; + iot_sys::CNodeInfoTranApp objApp; return objApp.main(argc, argv); } \ No newline at end of file diff --git a/platform/src/sys/sys_proc_mng/ProcMngApp.cpp b/platform/src/sys/sys_proc_mng/ProcMngApp.cpp index 19d8e1e9..ad4dfbe8 100644 --- a/platform/src/sys/sys_proc_mng/ProcMngApp.cpp +++ b/platform/src/sys/sys_proc_mng/ProcMngApp.cpp @@ -11,22 +11,22 @@ #include "sys_proc_mng_api/ProcMngInterface.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_sys; -kbd_sys::CProcMngApp::CProcMngApp() +iot_sys::CProcMngApp::CProcMngApp() { m_ptrSysInfo.reset(); m_ptrProcMng.reset(); m_ptrProcMngThread.reset(); } -kbd_sys::CProcMngApp::~CProcMngApp() +iot_sys::CProcMngApp::~CProcMngApp() { stop(); } -bool kbd_sys::CProcMngApp::start(int argc, char *argv[], int &/*nStatus*/) +bool iot_sys::CProcMngApp::start(int argc, char *argv[], int &/*nStatus*/) { //1.解析启动参数 if (!parseCmdLine(argc, argv)) @@ -77,7 +77,7 @@ bool kbd_sys::CProcMngApp::start(int argc, char *argv[], int &/*nStatus*/) return true; } -bool kbd_sys::CProcMngApp::stop() +bool iot_sys::CProcMngApp::stop() { //6.销毁业务资源 clean(); @@ -106,7 +106,7 @@ bool kbd_sys::CProcMngApp::stop() } /* @brief 用来通知进程退出，一般应用继承后调用service::shutdown() */ -int kbd_sys::CProcMngApp::toQuit() +int iot_sys::CProcMngApp::toQuit() { LOGINFO("接收到进程退出通知"); if (m_ptrProcMng != NULL) @@ -119,27 +119,27 @@ int kbd_sys::CProcMngApp::toQuit() } /* @brief 解析启动参数 */ -bool kbd_sys::CProcMngApp::parseCmdLine(int /*argc*/, char *[]) +bool iot_sys::CProcMngApp::parseCmdLine(int /*argc*/, char *[]) { m_strAppName = CN_AppName_BASE; return true; } /* @brief 判断同名同参数进程是否已经有实例在运行 */ -bool kbd_sys::CProcMngApp::isAlreadyRunning() +bool iot_sys::CProcMngApp::isAlreadyRunning() { return CSingleProcInstance::hasInstanceRunning(CN_ProcName_ProcMng); } /* @brief 初始化日志 */ -bool kbd_sys::CProcMngApp::initLog() +bool iot_sys::CProcMngApp::initLog() { StartLogSystem(m_strAppName.c_str(), CN_ProcName_ProcMng.c_str()); return true; } /* @brief 获取系统配置相关信息 */ -bool kbd_sys::CProcMngApp::getSystemInfo() +bool iot_sys::CProcMngApp::getSystemInfo() { if (!createSysInfoInstance(m_ptrSysInfo)) { @@ -157,7 +157,7 @@ bool kbd_sys::CProcMngApp::getSystemInfo() } /* @brief 向进程管理注册 */ -bool kbd_sys::CProcMngApp::registToProcMng() +bool iot_sys::CProcMngApp::registToProcMng() { SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stLocalNodeInfo.nDomainId; @@ -183,7 +183,7 @@ bool kbd_sys::CProcMngApp::registToProcMng() } /* @brief 初始化业务资源 */ -bool kbd_sys::CProcMngApp::initialize() +bool iot_sys::CProcMngApp::initialize() { m_ptrProcMngThread = boost::make_shared(m_ptrSysInfo, m_stLocalNodeInfo); if (m_ptrProcMngThread == NULL) @@ -203,7 +203,7 @@ bool kbd_sys::CProcMngApp::initialize() } /* @brief 清理业务资源 */ -bool kbd_sys::CProcMngApp::clean() +bool iot_sys::CProcMngApp::clean() { if (m_ptrProcMngThread != NULL) { diff --git a/platform/src/sys/sys_proc_mng/ProcMngApp.h b/platform/src/sys/sys_proc_mng/ProcMngApp.h index 4289358f..d4deb0b7 100644 --- a/platform/src/sys/sys_proc_mng/ProcMngApp.h +++ b/platform/src/sys/sys_proc_mng/ProcMngApp.h @@ -9,10 +9,10 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "ProcMngThread.h" -namespace kbd_sys +namespace iot_sys { /* @brief 进程管理业务管理类，程序入口 */ - class CProcMngApp : public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface + class CProcMngApp : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CProcMngApp(); @@ -84,8 +84,8 @@ namespace kbd_sys private: std::string m_strAppName; //< 应用名 - kbd_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 + iot_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 CProcMngThreadPtr m_ptrProcMngThread; //< 进程管理业务处理线程类 }; diff --git a/platform/src/sys/sys_proc_mng/ProcMngCommon.h b/platform/src/sys/sys_proc_mng/ProcMngCommon.h index b13ea31e..a9441bfa 100644 --- a/platform/src/sys/sys_proc_mng/ProcMngCommon.h +++ b/platform/src/sys/sys_proc_mng/ProcMngCommon.h @@ -10,7 +10,7 @@ #include "common/DataType.h" #include "sys_proc_mng_api/ProcMngApiCommon.h" -namespace kbd_sys +namespace iot_sys { const std::string CN_ProcName_ProcMng = "sys_proc_mng"; //< 当前进程名 @@ -37,7 +37,7 @@ namespace kbd_sys SProcessInfoKey stProcKey; int64 lProcId; //< 进程Id EProcPriority eProcPriority; //< 进程优先级 - kbd_public::EProcStartType eProcStartType; //< 进程启动类型 + iot_public::EProcStartType eProcStartType; //< 进程启动类型 bool bActive; //< 是否可用 bool bMaster; //< 是否为主 @@ -61,7 +61,7 @@ namespace kbd_sys SProcInfoMngParam() :lProcId(CN_InvalidProcessId), eProcPriority(EProcPriority_Medium), - eProcStartType(kbd_public::EProcStartType_Invalid), + eProcStartType(iot_public::EProcStartType_Invalid), bActive(false), bMaster(false), bSlave(false), @@ -85,4 +85,4 @@ namespace kbd_sys typedef std::vector SProcInfoMngParamSeq; //< 进程信息参数列表 typedef std::map AppIdToProcInfoMAP; //< <应用ID，该应用下进程信息参数列表> -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_proc_mng/ProcMngConfigParam.cpp b/platform/src/sys/sys_proc_mng/ProcMngConfigParam.cpp index c0421e51..22e8020b 100644 --- a/platform/src/sys/sys_proc_mng/ProcMngConfigParam.cpp +++ b/platform/src/sys/sys_proc_mng/ProcMngConfigParam.cpp @@ -13,10 +13,10 @@ #include "pub_utility_api/FileUtil.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; -kbd_sys::CProcMngConfigParam::CProcMngConfigParam(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, - const kbd_public::SNodeInfo &stLocalNodeInfo) +iot_sys::CProcMngConfigParam::CProcMngConfigParam(const iot_public::CSysInfoInterfacePtr &ptrSysInfo, + const iot_public::SNodeInfo &stLocalNodeInfo) :m_ptrSysInfo(ptrSysInfo), m_stLocalNodeInfo(stLocalNodeInfo), m_bShowWindow(false), @@ -28,14 +28,14 @@ kbd_sys::CProcMngConfigParam::CProcMngConfigParam(const kbd_public::CSysInfoInte { } -kbd_sys::CProcMngConfigParam::~CProcMngConfigParam() +iot_sys::CProcMngConfigParam::~CProcMngConfigParam() { m_mapAppIdToProcInfo.clear(); m_ptrSysInfo.reset(); } /* @brief 加载相关参数 */ -int kbd_sys::CProcMngConfigParam::load() +int iot_sys::CProcMngConfigParam::load() { m_mapAppIdToProcInfo.clear(); //1.首先加载系统启停的配置参数，加载完成后，后面的加载函数会依赖加载的结果 @@ -56,43 +56,43 @@ int kbd_sys::CProcMngConfigParam::load() } /* @brief 获取各应用下进程信息 */ -void kbd_sys::CProcMngConfigParam::getAppIdToProcInfo(AppIdToProcInfoMAP &mapAppIdToProcInfo) +void iot_sys::CProcMngConfigParam::getAppIdToProcInfo(AppIdToProcInfoMAP &mapAppIdToProcInfo) { mapAppIdToProcInfo = m_mapAppIdToProcInfo; } /* @brief 获取进程心跳超时时间 */ -int kbd_sys::CProcMngConfigParam::getHeartbeatTimeoutMsec() +int iot_sys::CProcMngConfigParam::getHeartbeatTimeoutMsec() { return m_nHeartbeatTimeoutMsec; } /* @brief 获取失败累计时间 */ -int kbd_sys::CProcMngConfigParam::getFailureCumulativeTimeMsec() +int iot_sys::CProcMngConfigParam::getFailureCumulativeTimeMsec() { return m_nFailureCumulativeTimeMsec; } /* @brief 获取最大失败次数 */ -int kbd_sys::CProcMngConfigParam::getMaxFailureCount() +int iot_sys::CProcMngConfigParam::getMaxFailureCount() { return m_nMaxFailureCount; } /* @brief 最大单次故障持续次数 */ -int kbd_sys::CProcMngConfigParam::getMaxOnceFailureCount() +int iot_sys::CProcMngConfigParam::getMaxOnceFailureCount() { return m_nMaxOnceFailureCount; } /* @brief 获取进程管理业务线程运行周期 */ -int kbd_sys::CProcMngConfigParam::getProcMngThreadInterval() +int iot_sys::CProcMngConfigParam::getProcMngThreadInterval() { return m_nProcMngThreadIntervalMsec; } /* @brief 加载系统启停配置文件,主要用来加载m_bShowWindows参数 */ -int kbd_sys::CProcMngConfigParam::loadSysControlConfigFile() +int iot_sys::CProcMngConfigParam::loadSysControlConfigFile() { /* @brief 主要用来加载m_bShowWindows参数 */ LOGINFO("开始加载配置文件sys_ctrl.xml"); @@ -110,7 +110,7 @@ int kbd_sys::CProcMngConfigParam::loadSysControlConfigFile() } /* @brief 加载进程管理配置文件 */ -int kbd_sys::CProcMngConfigParam::loadProcMngConfigFile() +int iot_sys::CProcMngConfigParam::loadProcMngConfigFile() { LOGINFO("开始加载配置文件proc_param_cfg.xml"); @@ -161,7 +161,7 @@ int kbd_sys::CProcMngConfigParam::loadProcMngConfigFile() } /* @brief 加载基础进程配置文件 */ -int kbd_sys::CProcMngConfigParam::loadBaseProcInfo() +int iot_sys::CProcMngConfigParam::loadBaseProcInfo() { SProcessInfoMAP mapProcInfo; if (kbdSuccess != m_ptrSysInfo->getProcInfoListByAppId(CN_AppId_BASE, mapProcInfo)) @@ -192,7 +192,7 @@ int kbd_sys::CProcMngConfigParam::loadBaseProcInfo() } /* @brief 加载应用进程信息 */ -int kbd_sys::CProcMngConfigParam::loadAppProcInfo() +int iot_sys::CProcMngConfigParam::loadAppProcInfo() { //1.仅为服务器类型才加载应用配置，防止工作站被部署上应用 if (m_stLocalNodeInfo.eNodeType != ENodeType_ApplicationServer) @@ -245,7 +245,7 @@ int kbd_sys::CProcMngConfigParam::loadAppProcInfo() } /* @brief 获取配置文件的绝对路径 */ -std::string kbd_sys::CProcMngConfigParam::getConfigAbsolutePath(const std::string &strRelativePath, +std::string iot_sys::CProcMngConfigParam::getConfigAbsolutePath(const std::string &strRelativePath, const std::string &strFileName) { string strCurDir = CFileUtil::getCurModuleDir(); diff --git a/platform/src/sys/sys_proc_mng/ProcMngConfigParam.h b/platform/src/sys/sys_proc_mng/ProcMngConfigParam.h index 2f6a4976..4e7c9114 100644 --- a/platform/src/sys/sys_proc_mng/ProcMngConfigParam.h +++ b/platform/src/sys/sys_proc_mng/ProcMngConfigParam.h @@ -9,7 +9,7 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "ProcMngCommon.h" -namespace kbd_sys +namespace iot_sys { /* @brief 进程管理相关的配置信息解析类 */ class CProcMngConfigParam @@ -17,11 +17,11 @@ namespace kbd_sys public: /** @brief 构造函数 - @param const kbd_public::CSysInfoInterfacePtr & ptrSysInfo 系统信息访问库指针 - @param const kbd_public::SRunAppInfo & stRunAppInfo 进程运行相关参数 + @param const iot_public::CSysInfoInterfacePtr & ptrSysInfo 系统信息访问库指针 + @param const iot_public::SRunAppInfo & stRunAppInfo 进程运行相关参数 */ - CProcMngConfigParam(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, - const kbd_public::SNodeInfo &stLocalNodeInfo); + CProcMngConfigParam(const iot_public::CSysInfoInterfacePtr &ptrSysInfo, + const iot_public::SNodeInfo &stLocalNodeInfo); virtual ~CProcMngConfigParam(); /** @brief 加载相关参数 @@ -85,8 +85,8 @@ namespace kbd_sys private: AppIdToProcInfoMAP m_mapAppIdToProcInfo; //< 各应用下进程列表 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库指针 - kbd_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库指针 + iot_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 bool m_bShowWindow; //< 后台服务启动时是否启动console窗口，仅对win平台有效 int m_nHeartbeatTimeoutMsec; //< 进程心跳的超时时间，单位：ms @@ -99,4 +99,4 @@ namespace kbd_sys }; typedef boost::shared_ptr CProcMngConfigParamPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_proc_mng/ProcMngThread.cpp b/platform/src/sys/sys_proc_mng/ProcMngThread.cpp index 2eb74bb7..d3aeafd4 100644 --- a/platform/src/sys/sys_proc_mng/ProcMngThread.cpp +++ b/platform/src/sys/sys_proc_mng/ProcMngThread.cpp @@ -12,11 +12,11 @@ #include "pub_utility_api/ProcUtil.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_sys; -kbd_sys::CProcMngThread::CProcMngThread(const CSysInfoInterfacePtr &ptrSysInfo, - const kbd_public::SNodeInfo &stLocalNodeInfo) +iot_sys::CProcMngThread::CProcMngThread(const CSysInfoInterfacePtr &ptrSysInfo, + const iot_public::SNodeInfo &stLocalNodeInfo) :CTimerThreadBase("ProcMngThread", 100), m_stLocalNodeInfo(stLocalNodeInfo), m_ptrSysInfo(ptrSysInfo), @@ -27,7 +27,7 @@ kbd_sys::CProcMngThread::CProcMngThread(const CSysInfoInterfacePtr &ptrSysInfo, { } -kbd_sys::CProcMngThread::~CProcMngThread() +iot_sys::CProcMngThread::~CProcMngThread() { m_ptrRunProcInfoOpt.reset(); m_ptrRunAppInfoOpt.reset(); @@ -37,7 +37,7 @@ kbd_sys::CProcMngThread::~CProcMngThread() } /* @brief 本线程的业务处理函数 */ -void kbd_sys::CProcMngThread::execute() +void iot_sys::CProcMngThread::execute() { /* * 1.检测进程是否正常心跳 @@ -53,7 +53,7 @@ void kbd_sys::CProcMngThread::execute() } /* @brief 初始化相关资源 */ -int kbd_sys::CProcMngThread::initialize() +int iot_sys::CProcMngThread::initialize() { //< 1.参数解析类，解析本进程相关配置文件参数 m_ptrProcMngConfig = boost::make_shared(m_ptrSysInfo, m_stLocalNodeInfo); @@ -111,7 +111,7 @@ int kbd_sys::CProcMngThread::initialize() } /* @brief 收集所有的进程信息 */ -void kbd_sys::CProcMngThread::collectAllProcessInfo() +void iot_sys::CProcMngThread::collectAllProcessInfo() { for (AppIdToProcInfoMAP::iterator pApp = m_mapAppIdToProcInfo.begin(); pApp != m_mapAppIdToProcInfo.end(); ++pApp) @@ -126,7 +126,7 @@ void kbd_sys::CProcMngThread::collectAllProcessInfo() } /* @brief 收集单个进程信息 */ -int kbd_sys::CProcMngThread::collectSingleProcessInfo(SProcInfoMngParam &stProcInfo) +int iot_sys::CProcMngThread::collectSingleProcessInfo(SProcInfoMngParam &stProcInfo) { //< 如果获取失败，暂不处理，依赖心跳超时进行异常处理 STableRunProcInfo stRunProcInfo; @@ -161,7 +161,7 @@ int kbd_sys::CProcMngThread::collectSingleProcessInfo(SProcInfoMngParam &stProcI } /* @brief 检测所有进程是否超时，并进行管理 */ -int kbd_sys::CProcMngThread::checkAllProcess() +int iot_sys::CProcMngThread::checkAllProcess() { for (AppIdToProcInfoMAP::iterator pApp = m_mapAppIdToProcInfo.begin(); pApp != m_mapAppIdToProcInfo.end(); ++pApp) @@ -179,7 +179,7 @@ int kbd_sys::CProcMngThread::checkAllProcess() } /* @brief 检测基础进程是否超时，并进行管理 */ -int kbd_sys::CProcMngThread::checkBaseProcess(SProcInfoMngParamSeq &vecProc) +int iot_sys::CProcMngThread::checkBaseProcess(SProcInfoMngParamSeq &vecProc) { for (SProcInfoMngParamSeq::iterator pProc = vecProc.begin(); pProc != vecProc.end(); ++pProc) { @@ -201,7 +201,7 @@ int kbd_sys::CProcMngThread::checkBaseProcess(SProcInfoMngParamSeq &vecProc) } /* @brief 检测应用进程是否超时，并进行管理 */ -int kbd_sys::CProcMngThread::checkAppProcess(SProcInfoMngParamSeq &vecProc) +int iot_sys::CProcMngThread::checkAppProcess(SProcInfoMngParamSeq &vecProc) { for (SProcInfoMngParamSeq::iterator pProc = vecProc.begin(); pProc != vecProc.end(); ++pProc) { @@ -256,7 +256,7 @@ int kbd_sys::CProcMngThread::checkAppProcess(SProcInfoMngParamSeq &vecProc) } /* @brief 检测进程心跳是否超时 */ -bool kbd_sys::CProcMngThread::heartbeatIsTimeout(const SProcInfoMngParam &stProcInfo) +bool iot_sys::CProcMngThread::heartbeatIsTimeout(const SProcInfoMngParam &stProcInfo) { //TODO:后续应该判断几次超时之后才认为超时，此时才将应用状态置为无主状态，否则进程异常时首先拉起的逻辑就失效了 //一旦发生超时，就可能会造成冗余裁决 @@ -278,7 +278,7 @@ bool kbd_sys::CProcMngThread::heartbeatIsTimeout(const SProcInfoMngParam &stProc } /* @brief 启动基础组件 */ -int kbd_sys::CProcMngThread::startBaseProcess(const SProcInfoMngParam &stProcInfo) +int iot_sys::CProcMngThread::startBaseProcess(const SProcInfoMngParam &stProcInfo) { const string &strProcName = stProcInfo.stProcKey.strProcName; const string &strProcArgs = stProcInfo.stProcKey.strProcParam; @@ -296,7 +296,7 @@ int kbd_sys::CProcMngThread::startBaseProcess(const SProcInfoMngParam &stProcInf } /* @brief 处理心跳超时的应用进程 */ -int kbd_sys::CProcMngThread::handelAppProcessWhenTimeout(SProcInfoMngParam &stProcInfo) +int iot_sys::CProcMngThread::handelAppProcessWhenTimeout(SProcInfoMngParam &stProcInfo) { const string &strProcName = stProcInfo.stProcKey.strProcName; const string &strProcArgs = stProcInfo.stProcKey.strProcParam; @@ -335,7 +335,7 @@ int kbd_sys::CProcMngThread::handelAppProcessWhenTimeout(SProcInfoMngParam &stPr } /* @brief 启动应用进程,不同进程优先级处理不同 */ -int kbd_sys::CProcMngThread::startAppProcessWithPriority(SProcInfoMngParam &stProcInfo) +int iot_sys::CProcMngThread::startAppProcessWithPriority(SProcInfoMngParam &stProcInfo) { const string &strProcName = stProcInfo.stProcKey.strProcName; const string &strProcArgs = stProcInfo.stProcKey.strProcParam; @@ -378,7 +378,7 @@ int kbd_sys::CProcMngThread::startAppProcessWithPriority(SProcInfoMngParam &stPr } /* @brief 启动进程 */ -int kbd_sys::CProcMngThread::startProcess(const SProcInfoMngParam &stProcInfo) +int iot_sys::CProcMngThread::startProcess(const SProcInfoMngParam &stProcInfo) { const string &strProcName = stProcInfo.stProcKey.strProcName; const string &strProcArgs = stProcInfo.stProcKey.strProcParam; @@ -407,7 +407,7 @@ int kbd_sys::CProcMngThread::startProcess(const SProcInfoMngParam &stProcInfo) } /* @brief 汇总进程信息，更新应用信息sys_run_app_info */ -int kbd_sys::CProcMngThread::updateRunAppInfos() +int iot_sys::CProcMngThread::updateRunAppInfos() { for (AppIdToProcInfoMAP::iterator pApp = m_mapAppIdToProcInfo.begin(); pApp != m_mapAppIdToProcInfo.end(); ++pApp) @@ -418,7 +418,7 @@ int kbd_sys::CProcMngThread::updateRunAppInfos() } /* @brief 汇总单个应用信息，更新应用信息sys_run_app_info */ -int kbd_sys::CProcMngThread::updateSingleAppInfo(int nAppId, const SProcInfoMngParamSeq &vecProc) +int iot_sys::CProcMngThread::updateSingleAppInfo(int nAppId, const SProcInfoMngParamSeq &vecProc) { /* @brief 仅更新记录的动态字段，静态配置字段无需更新，所以临时变量stAppInfo中不填充静态字段 */ STableRunAppInfo stAppInfo; diff --git a/platform/src/sys/sys_proc_mng/ProcMngThread.h b/platform/src/sys/sys_proc_mng/ProcMngThread.h index ac3ed1d8..cd0cb86c 100644 --- a/platform/src/sys/sys_proc_mng/ProcMngThread.h +++ b/platform/src/sys/sys_proc_mng/ProcMngThread.h @@ -12,18 +12,18 @@ #include "RunProcInfoTableOperate.h" #include "RunAppInfoTableOperate.h" -namespace kbd_sys +namespace iot_sys { /* @brief 进程管理业务处理线程类 */ - class CProcMngThread : public kbd_public::CTimerThreadBase + class CProcMngThread : public iot_public::CTimerThreadBase { public: /** @brief 构造函数 - @param const kbd_public::CSysInfoInterfacePtr & ptrSysInfo 系统信息访问库指针 - @param const kbd_public::SRunAppInfo & stRunAppInfo 进程运行相关参数 + @param const iot_public::CSysInfoInterfacePtr & ptrSysInfo 系统信息访问库指针 + @param const iot_public::SRunAppInfo & stRunAppInfo 进程运行相关参数 */ - CProcMngThread(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, const kbd_public::SNodeInfo &stLocalNodeInfo); + CProcMngThread(const iot_public::CSysInfoInterfacePtr &ptrSysInfo, const iot_public::SNodeInfo &stLocalNodeInfo); virtual ~CProcMngThread(); /** @brief 业务处理函数，必须继承实现自己的业务逻辑 @@ -114,10 +114,10 @@ namespace kbd_sys int updateSingleAppInfo(int nAppId, const SProcInfoMngParamSeq &vecProc); private: - kbd_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 + iot_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 AppIdToProcInfoMAP m_mapAppIdToProcInfo; //< 各应用下的进程列表 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统系统访问库接口指针 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统系统访问库接口指针 CProcMngConfigParamPtr m_ptrProcMngConfig; //< 进程管理相关的配置参数 CRunAppInfoTableOperatePtr m_ptrRunAppInfoOpt; //< 应用信息内存表操作类sys_run_app_info CRunProcInfoTableOperatePtr m_ptrRunProcInfoOpt; //< 进程信息内存表操作类sys_run_proc_info @@ -125,4 +125,4 @@ namespace kbd_sys }; typedef boost::shared_ptr CProcMngThreadPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_proc_mng/RunAppInfoTableOperate.cpp b/platform/src/sys/sys_proc_mng/RunAppInfoTableOperate.cpp index dce46f0c..1ac6eaf0 100644 --- a/platform/src/sys/sys_proc_mng/RunAppInfoTableOperate.cpp +++ b/platform/src/sys/sys_proc_mng/RunAppInfoTableOperate.cpp @@ -10,19 +10,19 @@ #include "sys_proc_mng_api/SysRunAppInfoTable.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_dbms; -kbd_sys::CRunAppInfoTableOperate::CRunAppInfoTableOperate(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, - const kbd_public::SNodeInfo &stLocalNodeInfo) +iot_sys::CRunAppInfoTableOperate::CRunAppInfoTableOperate(const iot_public::CSysInfoInterfacePtr &ptrSysInfo, + const iot_public::SNodeInfo &stLocalNodeInfo) :m_ptrSysInfo(ptrSysInfo), m_stLocalNodeInfo(stLocalNodeInfo) { } -kbd_sys::CRunAppInfoTableOperate::~CRunAppInfoTableOperate() +iot_sys::CRunAppInfoTableOperate::~CRunAppInfoTableOperate() { if (m_objRunAppInfoTable.close()) { @@ -39,7 +39,7 @@ kbd_sys::CRunAppInfoTableOperate::~CRunAppInfoTableOperate() } /* @brief 初始化 */ -int kbd_sys::CRunAppInfoTableOperate::initialize() +int iot_sys::CRunAppInfoTableOperate::initialize() { /* @brief 打开内存库 */ if (m_objRunAppInfoTable.open(CN_AppName_BASE.c_str(), CN_TN_SysRunAppInfo.c_str())) @@ -117,7 +117,7 @@ int kbd_sys::CRunAppInfoTableOperate::initialize() } /* @brief 更新应用运行信息（传入参数仅包含动态参数，静态参数(除了主键)未赋值 */ -int kbd_sys::CRunAppInfoTableOperate::updateRunAppInfo(const STableRunAppInfo &stRunAppInfo) +int iot_sys::CRunAppInfoTableOperate::updateRunAppInfo(const STableRunAppInfo &stRunAppInfo) { CTableLockGuard tableLock(m_objRunAppInfoTable); //< 加锁保护表 diff --git a/platform/src/sys/sys_proc_mng/RunAppInfoTableOperate.h b/platform/src/sys/sys_proc_mng/RunAppInfoTableOperate.h index 0541c17b..d6426d67 100644 --- a/platform/src/sys/sys_proc_mng/RunAppInfoTableOperate.h +++ b/platform/src/sys/sys_proc_mng/RunAppInfoTableOperate.h @@ -10,14 +10,14 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "sys_proc_mng_api/SysRunAppInfoTable.h" -namespace kbd_sys +namespace iot_sys { /* @brief 应用信息内存表操作类 */ class CRunAppInfoTableOperate { public: - CRunAppInfoTableOperate(const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, - const kbd_public::SNodeInfo &stLocalNodeInfo); + CRunAppInfoTableOperate(const iot_public::CSysInfoInterfacePtr &ptrSysInfo, + const iot_public::SNodeInfo &stLocalNodeInfo); virtual ~CRunAppInfoTableOperate(); /** @@ -35,11 +35,11 @@ namespace kbd_sys int updateRunAppInfo(const STableRunAppInfo &stRunAppInfo); private: - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库接口类指针 - kbd_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 - kbd_dbms::CRdbAccessEx m_objRunAppInfoTable; //< sys_run_app_info表，单线程使用，暂未加锁 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库接口类指针 + iot_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 + iot_dbms::CRdbAccessEx m_objRunAppInfoTable; //< sys_run_app_info表，单线程使用，暂未加锁 }; typedef boost::shared_ptr CRunAppInfoTableOperatePtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_proc_mng/RunProcInfoTableOperate.cpp b/platform/src/sys/sys_proc_mng/RunProcInfoTableOperate.cpp index 74ffb871..f0c5efd6 100644 --- a/platform/src/sys/sys_proc_mng/RunProcInfoTableOperate.cpp +++ b/platform/src/sys/sys_proc_mng/RunProcInfoTableOperate.cpp @@ -7,15 +7,15 @@ #include "common/Common.h" #include "pub_logger_api/logger.h" -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; -kbd_sys::CRunProcInfoTableOperate::CRunProcInfoTableOperate() +iot_sys::CRunProcInfoTableOperate::CRunProcInfoTableOperate() { } -kbd_sys::CRunProcInfoTableOperate::~CRunProcInfoTableOperate() +iot_sys::CRunProcInfoTableOperate::~CRunProcInfoTableOperate() { if (m_objRunProcInfoTable.close()) { @@ -30,7 +30,7 @@ kbd_sys::CRunProcInfoTableOperate::~CRunProcInfoTableOperate() } /* @brief 初始化 */ -int kbd_sys::CRunProcInfoTableOperate::initialize() +int iot_sys::CRunProcInfoTableOperate::initialize() { //< 打开sys_run_proc_info表 if (m_objRunProcInfoTable.open(CN_AppName_BASE.c_str(), CN_TN_SysRunProcInfo.c_str())) @@ -47,7 +47,7 @@ int kbd_sys::CRunProcInfoTableOperate::initialize() } /* @brief 获取指定进程的运行信息 */ -int kbd_sys::CRunProcInfoTableOperate::getProcInfoByKey(const SProcessInfoKey &stProcKey, STableRunProcInfo &stRunProcInfo) +int iot_sys::CRunProcInfoTableOperate::getProcInfoByKey(const SProcessInfoKey &stProcKey, STableRunProcInfo &stRunProcInfo) { CTableLockGuard tableLock(m_objRunProcInfoTable); @@ -71,7 +71,7 @@ int kbd_sys::CRunProcInfoTableOperate::getProcInfoByKey(const SProcessInfoKey &s } /* @brief 设置指定记录的is_fault字段值,单线程访问，暂不加锁 */ -int kbd_sys::CRunProcInfoTableOperate::updateProcFlagWhenFailed(const SProcessInfoKey &stProcKey) +int iot_sys::CRunProcInfoTableOperate::updateProcFlagWhenFailed(const SProcessInfoKey &stProcKey) { STableRunProcInfoKey stKey; stKey.nDomainId = stProcKey.nDomainId; diff --git a/platform/src/sys/sys_proc_mng/RunProcInfoTableOperate.h b/platform/src/sys/sys_proc_mng/RunProcInfoTableOperate.h index 5040ebeb..4e910b67 100644 --- a/platform/src/sys/sys_proc_mng/RunProcInfoTableOperate.h +++ b/platform/src/sys/sys_proc_mng/RunProcInfoTableOperate.h @@ -9,7 +9,7 @@ #include "rdb_api/CRdbAccessEx.h" #include "sys_proc_mng_api/SysRunProcInfoTable.h" -namespace kbd_sys +namespace iot_sys { const int kbdErrProcMngApi_NoRecord = 2; //< 记录不存在 @@ -43,9 +43,9 @@ namespace kbd_sys int updateProcFlagWhenFailed(const SProcessInfoKey &stProcKey); private: - kbd_dbms::CRdbAccessEx m_objRunProcInfoTable; //< sys_run_proc_info表 + iot_dbms::CRdbAccessEx m_objRunProcInfoTable; //< sys_run_proc_info表 }; typedef boost::shared_ptr CRunProcInfoTableOperatePtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_proc_mng/main.cpp b/platform/src/sys/sys_proc_mng/main.cpp index ac6425c0..fabb6f7b 100644 --- a/platform/src/sys/sys_proc_mng/main.cpp +++ b/platform/src/sys/sys_proc_mng/main.cpp @@ -7,6 +7,6 @@ int main(int argc, char *argv[]) { - kbd_sys::CProcMngApp objApp; + iot_sys::CProcMngApp objApp; return objApp.main(argc, argv); } \ No newline at end of file diff --git a/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.cpp b/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.cpp index a89e88a4..9f1aec62 100644 --- a/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.cpp +++ b/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.cpp @@ -13,10 +13,10 @@ using namespace std; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; -kbd_sys::CProcMngApiThread::CProcMngApiThread(const SProcessInfoKey &stProcKey) +iot_sys::CProcMngApiThread::CProcMngApiThread(const SProcessInfoKey &stProcKey) :CTimerThreadBase("ProcMngApiThread", 100), m_pProcQuit(NULL), m_stProcRunInfo(stProcKey) @@ -30,7 +30,7 @@ kbd_sys::CProcMngApiThread::CProcMngApiThread(const SProcessInfoKey &stProcKey) m_lLastCheckDogTime = getMonotonicMsec(); } -kbd_sys::CProcMngApiThread::~CProcMngApiThread() +iot_sys::CProcMngApiThread::~CProcMngApiThread() { m_pProcQuit = NULL; if (m_objRunProcInfoTable.close()) @@ -46,7 +46,7 @@ kbd_sys::CProcMngApiThread::~CProcMngApiThread() } /* @brief 业务处理函数，主要进行进程信息的心跳检测是否退出等 */ -void kbd_sys::CProcMngApiThread::execute() +void iot_sys::CProcMngApiThread::execute() { /* @brief 心跳 */ if (kbdSuccess != heartbeat()) @@ -86,7 +86,7 @@ void kbd_sys::CProcMngApiThread::execute() #endif } -void kbd_sys::CProcMngApiThread::beforeQuit() +void iot_sys::CProcMngApiThread::beforeQuit() { /* @brief 线程退出前，清理run_proc_info表中相关字段，更新内存表 */ boost::mutex::scoped_lock lock(m_objMutex); @@ -139,7 +139,7 @@ void kbd_sys::CProcMngApiThread::beforeQuit() } /* @brief 设置进程退出通知回调 */ -int kbd_sys::CProcMngApiThread::setProcQuitCallback(CProcessQuitInterface *pProcQuit) +int iot_sys::CProcMngApiThread::setProcQuitCallback(CProcessQuitInterface *pProcQuit) { if (pProcQuit == NULL) { @@ -153,13 +153,13 @@ int kbd_sys::CProcMngApiThread::setProcQuitCallback(CProcessQuitInterface *pProc } /* @brief 取消进程退出通知回调 */ -void kbd_sys::CProcMngApiThread::unsetProcQuitCallback() +void iot_sys::CProcMngApiThread::unsetProcQuitCallback() { m_pProcQuit = NULL; } /* @brief 更新进程信息 */ -int kbd_sys::CProcMngApiThread::updateProcessInfo(bool bActive, bool bMaster, bool bSlave) +int iot_sys::CProcMngApiThread::updateProcessInfo(bool bActive, bool bMaster, bool bSlave) { /* @brief 更新m_stProcRunInfo，同时更新内存表 */ boost::mutex::scoped_lock lock(m_objMutex); @@ -204,7 +204,7 @@ int kbd_sys::CProcMngApiThread::updateProcessInfo(bool bActive, bool bMaster, bo } /* @brief 初始化进程信息 */ -int kbd_sys::CProcMngApiThread::initProcInfo(bool bActive, bool bMaster /*= false*/, bool bSlave /*= false*/) +int iot_sys::CProcMngApiThread::initProcInfo(bool bActive, bool bMaster /*= false*/, bool bSlave /*= false*/) { /* @brief 先查询，不存在则插入一条，存在则更新 */ boost::mutex::scoped_lock lock(m_objMutex); @@ -283,7 +283,7 @@ int kbd_sys::CProcMngApiThread::initProcInfo(bool bActive, bool bMaster /*= fals } /* @brief 获取进程信息 */ -int kbd_sys::CProcMngApiThread::getProcessInfo(SProcRunInfo &stProcInfo) +int iot_sys::CProcMngApiThread::getProcessInfo(SProcRunInfo &stProcInfo) { boost::mutex::scoped_lock lock(m_objMutex); CTableLockGuard tableLock(m_objRunProcInfoTable); @@ -319,7 +319,7 @@ int kbd_sys::CProcMngApiThread::getProcessInfo(SProcRunInfo &stProcInfo) } /* @brief 初始化线程相关资源 */ -int kbd_sys::CProcMngApiThread::initialize() +int iot_sys::CProcMngApiThread::initialize() { #ifndef DISABLE_DOG_AUTH //< 不需要检查加密狗的程序，不构造实例，避免不必要的开销 @@ -349,7 +349,7 @@ int kbd_sys::CProcMngApiThread::initialize() } /* @brief 获取进程是否需要退出的标识，true-需要退出，false-不需要退出或者获取失败 */ -bool kbd_sys::CProcMngApiThread::isToQuit() +bool iot_sys::CProcMngApiThread::isToQuit() { boost::mutex::scoped_lock lock(m_objMutex); CTableLockGuard tableLock(m_objRunProcInfoTable); @@ -375,7 +375,7 @@ bool kbd_sys::CProcMngApiThread::isToQuit() } /* @brief 通知进程退出 */ -int kbd_sys::CProcMngApiThread::notifyProcToQuit() +int iot_sys::CProcMngApiThread::notifyProcToQuit() { if (m_pProcQuit != NULL) { @@ -393,7 +393,7 @@ int kbd_sys::CProcMngApiThread::notifyProcToQuit() } /* @brief 进程信息心跳 */ -int kbd_sys::CProcMngApiThread::heartbeat() +int iot_sys::CProcMngApiThread::heartbeat() { boost::mutex::scoped_lock lock(m_objMutex); CTableLockGuard tableLock(m_objRunProcInfoTable); diff --git a/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.h b/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.h index 625068c3..9cfe1702 100644 --- a/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.h +++ b/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.h @@ -12,11 +12,11 @@ #include "rdb_api/CRdbAccessEx.h" #include "sys_dog_auth_api/DogAuthInterface.h" -namespace kbd_sys +namespace iot_sys { - typedef std::map ColNameToVarMAP; //< <列名，列值> + typedef std::map ColNameToVarMAP; //< <列名，列值> - class CProcMngApiThread : public kbd_public::CTimerThreadBase + class CProcMngApiThread : public iot_public::CTimerThreadBase { typedef std::map ColNameToDataTypeMAP; //< <列名，数据类型> typedef std::map ColNameToVarintValueMAP; //< <列名，值（变体类型）> @@ -111,8 +111,8 @@ namespace kbd_sys STableRunProcInfo m_stProcRunInfo; //< 当前进程的进程信息 boost::mutex m_objMutex; //< 互斥锁，保护m_stProcRunInfo - kbd_dbms::CRdbAccessEx m_objRunProcInfoTable; //< 内存库访问类 + iot_dbms::CRdbAccessEx m_objRunProcInfoTable; //< 内存库访问类 }; typedef boost::shared_ptr CProcMngApiThreadPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_proc_mng_api/ProcMngImpl.cpp b/platform/src/sys/sys_proc_mng_api/ProcMngImpl.cpp index 65957572..1de16cf2 100644 --- a/platform/src/sys/sys_proc_mng_api/ProcMngImpl.cpp +++ b/platform/src/sys/sys_proc_mng_api/ProcMngImpl.cpp @@ -7,16 +7,16 @@ #include "Common.h" #include "public/pub_logger_api/logger.h" -using namespace kbd_public; +using namespace iot_public; -kbd_sys::CProcMngImpl::CProcMngImpl(const SProcessInfoKey &stProcKey) +iot_sys::CProcMngImpl::CProcMngImpl(const SProcessInfoKey &stProcKey) :m_stProcKey(stProcKey), m_bIsInitProcInfo(false) { m_ptrProcMngThread.reset(); } -kbd_sys::CProcMngImpl::~CProcMngImpl() +iot_sys::CProcMngImpl::~CProcMngImpl() { if (m_ptrProcMngThread != NULL) { @@ -26,7 +26,7 @@ kbd_sys::CProcMngImpl::~CProcMngImpl() } /* @brief 设置进程退出通知回调 */ -int kbd_sys::CProcMngImpl::setCallback(CProcessQuitInterface *pQuitInterface) +int iot_sys::CProcMngImpl::setCallback(CProcessQuitInterface *pQuitInterface) { if (m_ptrProcMngThread != NULL && pQuitInterface != NULL) { @@ -40,7 +40,7 @@ int kbd_sys::CProcMngImpl::setCallback(CProcessQuitInterface *pQuitInterface) } /* @brief 清除回调 */ -void kbd_sys::CProcMngImpl::unsetCallback() +void iot_sys::CProcMngImpl::unsetCallback() { if (m_ptrProcMngThread != NULL) { @@ -49,7 +49,7 @@ void kbd_sys::CProcMngImpl::unsetCallback() } /* @brief 更新进程信息 */ -int kbd_sys::CProcMngImpl::updateProcessInfo(bool bActive, bool bMaster, bool bSlave) +int iot_sys::CProcMngImpl::updateProcessInfo(bool bActive, bool bMaster, bool bSlave) { int nRet = kbdFailed; if (!m_bIsInitProcInfo) @@ -69,7 +69,7 @@ int kbd_sys::CProcMngImpl::updateProcessInfo(bool bActive, bool bMaster, bool bS } /* @brief 获取进程信息 */ -int kbd_sys::CProcMngImpl::getProcessInfo(SProcRunInfo &stProcInfo) +int iot_sys::CProcMngImpl::getProcessInfo(SProcRunInfo &stProcInfo) { if (m_ptrProcMngThread == NULL) { @@ -80,7 +80,7 @@ int kbd_sys::CProcMngImpl::getProcessInfo(SProcRunInfo &stProcInfo) } /* @brief 初始化 */ -int kbd_sys::CProcMngImpl::initialize() +int iot_sys::CProcMngImpl::initialize() { LOGINFO("创建进程信息监测线程，同时初始化进程信息"); m_ptrProcMngThread = boost::make_shared(m_stProcKey); diff --git a/platform/src/sys/sys_proc_mng_api/ProcMngImpl.h b/platform/src/sys/sys_proc_mng_api/ProcMngImpl.h index c027c416..93c906d7 100644 --- a/platform/src/sys/sys_proc_mng_api/ProcMngImpl.h +++ b/platform/src/sys/sys_proc_mng_api/ProcMngImpl.h @@ -7,7 +7,7 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "ProcMngApiThread.h" -namespace kbd_sys +namespace iot_sys { class CProcMngImpl : public CProcMngInterface { @@ -70,5 +70,5 @@ namespace kbd_sys typedef boost::shared_ptr CProcMngImplPtr; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/platform/src/sys/sys_proc_mng_api/ProcMngInterface.cpp b/platform/src/sys/sys_proc_mng_api/ProcMngInterface.cpp index 0ecf08bd..6e130f5e 100644 --- a/platform/src/sys/sys_proc_mng_api/ProcMngInterface.cpp +++ b/platform/src/sys/sys_proc_mng_api/ProcMngInterface.cpp @@ -7,9 +7,9 @@ #include "Common.h" #include "ProcMngImpl.h" -using namespace kbd_sys; +using namespace iot_sys; -SYS_PROC_MNG_API CProcMngInterfacePtr kbd_sys::getProcMngInstance(const SProcessInfoKey &stProcKey) +SYS_PROC_MNG_API CProcMngInterfacePtr iot_sys::getProcMngInstance(const SProcessInfoKey &stProcKey) { CProcMngImplPtr ptrProcMng = boost::make_shared(stProcKey); if (ptrProcMng != NULL) diff --git a/platform/src/tools/Other/lua_function_test/CExecFunction.h b/platform/src/tools/Other/lua_function_test/CExecFunction.h index 44d174cd..a6fba710 100644 --- a/platform/src/tools/Other/lua_function_test/CExecFunction.h +++ b/platform/src/tools/Other/lua_function_test/CExecFunction.h @@ -5,7 +5,7 @@ #include #include "pub_lua_engine_api/LuaEngineInterface.h" -using namespace kbd_public; +using namespace iot_public; class CExecFunction { public: diff --git a/platform/src/tools/Other/lua_function_test/CLuaFunctionTest.h b/platform/src/tools/Other/lua_function_test/CLuaFunctionTest.h index 5635a139..f3abe29f 100644 --- a/platform/src/tools/Other/lua_function_test/CLuaFunctionTest.h +++ b/platform/src/tools/Other/lua_function_test/CLuaFunctionTest.h @@ -13,7 +13,7 @@ namespace Ui { class CLuaFunctionTest; } -using namespace kbd_public; +using namespace iot_public; class CLuaFunctionTest : public QWidget { Q_OBJECT diff --git a/platform/src/tools/fbd_designer/fbd_designer/main.cpp b/platform/src/tools/fbd_designer/fbd_designer/main.cpp index 44b2b2bc..316dbf35 100644 --- a/platform/src/tools/fbd_designer/fbd_designer/main.cpp +++ b/platform/src/tools/fbd_designer/fbd_designer/main.cpp @@ -6,8 +6,8 @@ #include "sys_login_api/CLoginDlg.h" #include "CFBDMainWindow.h" -using namespace kbd_public; -using namespace kbd_net; +using namespace iot_public; +using namespace iot_net; int main(int argc, char *argv[]) { diff --git a/platform/src/tools/fbd_designer/fbd_diagram/CDiagram.cpp b/platform/src/tools/fbd_designer/fbd_diagram/CDiagram.cpp index 4a7c31ac..44550418 100644 --- a/platform/src/tools/fbd_designer/fbd_diagram/CDiagram.cpp +++ b/platform/src/tools/fbd_designer/fbd_diagram/CDiagram.cpp @@ -19,9 +19,9 @@ #endif using namespace std; -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_public; +using namespace iot_idl; CDiagram::CDiagram() { diff --git a/platform/src/tools/fbd_designer/fbd_diagram/CDiagram.h b/platform/src/tools/fbd_designer/fbd_diagram/CDiagram.h index eb9fc21d..94ebad29 100644 --- a/platform/src/tools/fbd_designer/fbd_diagram/CDiagram.h +++ b/platform/src/tools/fbd_designer/fbd_diagram/CDiagram.h @@ -89,7 +89,7 @@ private: int m_nMaxIndex; // 当前画面已经用到的最大的index QMutex m_oMutex; QTimer* m_pRunTimer;// 读取实时数据的定时器 - kbd_net::CMbCommunicator* m_pMbComm;// 请求服务端实时数据的通讯器 + iot_net::CMbCommunicator* m_pMbComm;// 请求服务端实时数据的通讯器 }; #endif // FLOWDIAGRAM_H diff --git a/platform/src/tools/fbd_designer/fbd_editor/CFBDMainWindow.cpp b/platform/src/tools/fbd_designer/fbd_editor/CFBDMainWindow.cpp index d1fb5a33..994d6788 100644 --- a/platform/src/tools/fbd_designer/fbd_editor/CFBDMainWindow.cpp +++ b/platform/src/tools/fbd_designer/fbd_editor/CFBDMainWindow.cpp @@ -22,8 +22,8 @@ #endif using namespace std; -using namespace kbd_net; -using namespace kbd_public; +using namespace iot_net; +using namespace iot_public; #define UNTITLED_NAME "Untitled Diagram" #define DIAGRAM_FILES "XML Diagram Files (*.xml);;All Files (*)" @@ -91,9 +91,9 @@ CFBDMainWindow::~CFBDMainWindow() void CFBDMainWindow::initLanguage() { // 加载语言翻译文件 - const std::string strLanguage = std::move( kbd_public::getCurLanguage()); + const std::string strLanguage = std::move( iot_public::getCurLanguage()); const std::string strQmFile = - std::move( kbd_public::CFileUtil::getPathOfResFile( "fbd_editor/translate/fbd_editor_" + strLanguage + ".qm" )); + std::move( iot_public::CFileUtil::getPathOfResFile( "fbd_editor/translate/fbd_editor_" + strLanguage + ".qm" )); if ( !strQmFile.empty()) { auto *pTrans = new QTranslator; @@ -215,8 +215,8 @@ bool CFBDMainWindow::initQss() bool CFBDMainWindow::initPlugins() { - QString sPath_platform = QString::fromStdString(kbd_public::CFileUtil::getPathOfBinDir("platform")) + "/fbd/plugins/"; - QString sPath_product = QString::fromStdString(kbd_public::CFileUtil::getPathOfBinDir("product")) + "/fbd/plugins/"; + QString sPath_platform = QString::fromStdString(iot_public::CFileUtil::getPathOfBinDir("platform")) + "/fbd/plugins/"; + QString sPath_product = QString::fromStdString(iot_public::CFileUtil::getPathOfBinDir("product")) + "/fbd/plugins/"; m_pPluginManager = CPluginManager::getInstance(); m_pPluginManager->loadPlugins(sPath_platform); m_pPluginManager->loadPlugins(sPath_product); @@ -247,11 +247,11 @@ bool CFBDMainWindow::initBlockMenu( QString sBusinessTypeName ) } // 打开产品配置文件 - QFile objFile( kbd_public::CFileUtil::getPathOfCfgFile("fbd_editor_blockMenu.xml",CN_DIR_PRODUCT).c_str() ); + QFile objFile( iot_public::CFileUtil::getPathOfCfgFile("fbd_editor_blockMenu.xml",CN_DIR_PRODUCT).c_str() ); if ( !objFile.exists() || !objFile.open(QIODevice::ReadOnly|QIODevice::Text) ) { // 产品配置文件打开失败则打开平台配置文件 - objFile.setFileName( kbd_public::CFileUtil::getPathOfCfgFile("fbd_editor_blockMenu.xml",CN_DIR_PLATFORM).c_str() ); + objFile.setFileName( iot_public::CFileUtil::getPathOfCfgFile("fbd_editor_blockMenu.xml",CN_DIR_PLATFORM).c_str() ); if ( !objFile.exists() || !objFile.open(QIODevice::ReadOnly|QIODevice::Text) ) return false; } diff --git a/platform/src/tools/fbd_designer/fbd_editor/CGroup.cpp b/platform/src/tools/fbd_designer/fbd_editor/CGroup.cpp index 4154b729..cbb40d6a 100644 --- a/platform/src/tools/fbd_designer/fbd_editor/CGroup.cpp +++ b/platform/src/tools/fbd_designer/fbd_editor/CGroup.cpp @@ -4,8 +4,8 @@ #include "db_api_ex/CDbApi.h" #include "pub_logger_api/logger.h" -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; CGroup::CGroup(QMap objMap, QWidget *parent) : QDialog(parent), @@ -34,7 +34,7 @@ CGroup::CGroup(QMap objMap, QWidget *parent) : // 初始化系统信息查询库 CSysInfoInterfacePtr pSysInfo; - if ( !kbd_public::createSysInfoInstance(pSysInfo) ) + if ( !iot_public::createSysInfoInstance(pSysInfo) ) { QMessageBox::critical(0,tr("错误"),tr("创建系统信息访问库失败")); return; diff --git a/platform/src/tools/fbd_designer/fbd_editor/CGroup.h b/platform/src/tools/fbd_designer/fbd_editor/CGroup.h index 756926ce..773745c0 100644 --- a/platform/src/tools/fbd_designer/fbd_editor/CGroup.h +++ b/platform/src/tools/fbd_designer/fbd_editor/CGroup.h @@ -29,8 +29,8 @@ public slots: private: Ui::CGroup *ui; - std::vector m_vecLocationInfo; - std::vector m_vecSubsystemInfo; + std::vector m_vecLocationInfo; + std::vector m_vecSubsystemInfo; QMap m_mapAllBusinessType;// 业务类型id与名称对应关系的map id和名称均使用字符串表示 bool m_bGroupChanged; }; diff --git a/platform/src/tools/fbd_designer/fbd_editor/CGroupEdit.cpp b/platform/src/tools/fbd_designer/fbd_editor/CGroupEdit.cpp index 472119b8..db513d41 100644 --- a/platform/src/tools/fbd_designer/fbd_editor/CGroupEdit.cpp +++ b/platform/src/tools/fbd_designer/fbd_editor/CGroupEdit.cpp @@ -3,8 +3,8 @@ #include "pub_logger_api/logger.h" #include "pub_sysinfo_api/SysInfoApi.h" -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; CGroupEdit::CGroupEdit(QMap objMap, QWidget *parent) : QDialog(parent), @@ -29,7 +29,7 @@ CGroupEdit::CGroupEdit(QMap objMap, QWidget *parent) : // 初始化系统信息查询库 CSysInfoInterfacePtr pSysInfo; - if ( !kbd_public::createSysInfoInstance(pSysInfo) ) + if ( !iot_public::createSysInfoInstance(pSysInfo) ) { QMessageBox::critical(0,tr("错误"),tr("创建系统信息访问库失败")); return; diff --git a/platform/src/tools/fbd_designer/fbd_editor/CSetGroupDlg.cpp b/platform/src/tools/fbd_designer/fbd_editor/CSetGroupDlg.cpp index 1a4eb33d..ac84d66f 100644 --- a/platform/src/tools/fbd_designer/fbd_editor/CSetGroupDlg.cpp +++ b/platform/src/tools/fbd_designer/fbd_editor/CSetGroupDlg.cpp @@ -7,8 +7,8 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "db_api_ex/CDbApi.h" -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; CSetGroupDialog::CSetGroupDialog(int nCurrentBusinessTypeId, QWidget *parent) : QDialog(parent), diff --git a/platform/src/tools/model_common/common.cpp b/platform/src/tools/model_common/common.cpp index d11fe8b5..ee9ba026 100644 --- a/platform/src/tools/model_common/common.cpp +++ b/platform/src/tools/model_common/common.cpp @@ -18,7 +18,7 @@ #include #include "pub_utility_api/CommonConfigParse.h" -using namespace kbd_public; +using namespace iot_public; QString Common::m_pathTable = ""; QString Common::m_pathTree = ""; @@ -39,7 +39,7 @@ void Common::initPath() m_pathIscsHome = QCoreApplication::applicationDirPath() +"/../.."; m_pathSysModelConfig = m_pathIscsHome + "/data/sys_model_info"; m_path61850Cfg = m_pathIscsHome +"/data/config61850"; - m_language = kbd_public::getCurLanguage().c_str(); + m_language = iot_public::getCurLanguage().c_str(); m_pathStyle = m_pathIscsHome + "/platform/common/resource/" + m_language + "/model_studio/setting/style/"; } @@ -142,7 +142,7 @@ bool Common::isInTablePath(const QString &xmlFileName) bool Common::isSysRun() { - kbd_dbms::CRdbMngIntereface objRunProcInfoTable; + iot_dbms::CRdbMngIntereface objRunProcInfoTable; if (objRunProcInfoTable.isLoadAppDb()) { LOGDEBUG("isSysRun() true"); @@ -423,7 +423,7 @@ QString Common::createViewName(const QString &tableName, const QString &filter) void Common::styleWidget(QWidget *widget, const QString &qssFile) { - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile(qssFile.toStdString()) ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile(qssFile.toStdString()) ; QFile file(QString::fromStdString(strFullPath)); if(!file.open(QIODevice::ReadOnly)) return ; @@ -433,7 +433,7 @@ void Common::styleWidget(QWidget *widget, const QString &qssFile) QString Common::getStyleSheetPath(const QString &qssFile) { - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile(qssFile.toStdString()) ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile(qssFile.toStdString()) ; QFile file(QString::fromStdString(strFullPath)); if(!file.open(QIODevice::ReadOnly)) return ""; diff --git a/platform/src/tools/model_plugin/FESWidget/kbdupdatepsc3000dlg.cpp b/platform/src/tools/model_plugin/FESWidget/kbdupdatepsc3000dlg.cpp index e36d0060..78d4b994 100644 --- a/platform/src/tools/model_plugin/FESWidget/kbdupdatepsc3000dlg.cpp +++ b/platform/src/tools/model_plugin/FESWidget/kbdupdatepsc3000dlg.cpp @@ -438,7 +438,7 @@ bool KbdUpdatePsc3000Dlg::UpdateDigitalPoints(QString devId,QString fesDevTag,QS //更新测点属性 QList listSql; - if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == kbd_dbms::DB_MYSQL) + if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == iot_dbms::DB_MYSQL) { sql = "UPDATE fes_digital t1,psc3000_dig t2 SET t1.DESCRIPTION = t2.DESCRIPTION,\ t1.RES_PARA_INT1 = t2.REMOTE_NO,t1.SEQ_NO = t2.REMOTE_NO WHERE t1.DEV_TAG = '%1' AND t2.DEV_ID = '%2' \ @@ -541,7 +541,7 @@ bool KbdUpdatePsc3000Dlg::UpdateAnalogPoints(QString devId,QString fesDevTag,QSt //更新测点属性 QList listSql; - if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == kbd_dbms::DB_MYSQL) + if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == iot_dbms::DB_MYSQL) { sql = "UPDATE fes_analog t1,psc3000_ana t2 SET t1.DESCRIPTION = t2.DESCRIPTION,\ t1.RES_PARA_INT1 = t2.REMOTE_NO,t1.COEFF = t2.RATIO,t1.SEQ_NO = t2.REMOTE_NO WHERE t1.DEV_TAG = '%1' \ @@ -644,7 +644,7 @@ bool KbdUpdatePsc3000Dlg::UpdateAccumlPoints(QString devId,QString fesDevTag,QSt //更新测点属性 QList listSql; - if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == kbd_dbms::DB_MYSQL) + if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == iot_dbms::DB_MYSQL) { sql = "UPDATE fes_accuml t1,psc3000_acc t2 SET t1.DESCRIPTION = t2.DESCRIPTION,\ t1.RES_PARA_INT1 = t2.REMOTE_NO,t1.COEFF = t2.RATIO,t1.SEQ_NO = t2.REMOTE_NO WHERE t1.DEV_TAG = '%1' \ @@ -781,7 +781,7 @@ bool KbdUpdatePsc3000Dlg::UpdateDigitalCtrlPoints(QString devId, QString fesDevT listSql.clear(); QSet setUpdatePoints = setPcsPoints & setFesPoints; - if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == kbd_dbms::DB_MYSQL) + if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == iot_dbms::DB_MYSQL) { sql = "UPDATE psc3000_dig_ctrl t1,fes_digital_ctrl t2 SET t2.DESCRIPTION = t1.DESCRIPTION,t2.RES_PARA_INT1 = t1.REMOTE_NO,t2.SEQ_NO = t1.REMOTE_NO \ where t1.TAG_NAME = '%1' AND t2.POINT_TP_NAME = '%2' AND t1.DEV_ID = '%3' AND t2.DEV_TAG = '%4';"; @@ -924,7 +924,7 @@ bool KbdUpdatePsc3000Dlg::UpdateConstPoints(QString devId, QString fesDevTag) if (m_operType == EoperType::OPER_UPDATE) { //更新PCS3000中属性被修改的点 - if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == kbd_dbms::DB_MYSQL) + if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == iot_dbms::DB_MYSQL) { sql = "UPDATE psc3000_const t1,fes_const t2 SET t2.DESCRIPTION = t1.DESCRIPTION,\ t2.VALUE_RATIO = t1.RATIO,t2.VALUE_ADDED = t1.REVISE,t2.VALUE_TEXT = t1.VALUE_TEXT,\ @@ -1521,7 +1521,7 @@ void KbdUpdatePsc3000Dlg::updateFesPointCoeff(QString fesDevTag) { QStringList listSql; - if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == kbd_dbms::DB_MYSQL) + if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == iot_dbms::DB_MYSQL) { listSql << QString("update accuml_map_to_fes,fes_accuml set accuml_map_to_fes.COEFF = fes_accuml.COEFF where accuml_map_to_fes.KEY_ID_TAG \ = concat(fes_accuml.APP_TABLE_NAME, '.' , fes_accuml.APP_TAG_NAME) and fes_accuml.DEV_TAG = '%1' and fes_accuml.COEFF != '-1';").arg(fesDevTag); diff --git a/platform/src/tools/model_studio/loginDialog/logindlg.cpp b/platform/src/tools/model_studio/loginDialog/logindlg.cpp index eb3d3b48..3ef5e4c2 100644 --- a/platform/src/tools/model_studio/loginDialog/logindlg.cpp +++ b/platform/src/tools/model_studio/loginDialog/logindlg.cpp @@ -43,10 +43,10 @@ void LoginDlg::initLayout() m_lePort = new QLineEdit(settings.value("MySQL/login/port","3306").toString(),this); m_comboxDbType = new QComboBox(this); m_comboxDbType->setView(new QListView); - m_comboxDbType->addItem(tr("MySQL"),kbd_dbms::EDbType::DB_MYSQL); - m_comboxDbType->addItem(tr("Oracle"),kbd_dbms::EDbType::DB_ORACLE); - m_comboxDbType->addItem(tr("OpenGauss"),kbd_dbms::EDbType::DB_OPENGAUSS); - m_comboxDbType->addItem(tr("KingBase"),kbd_dbms::EDbType::DB_KINGBASE); + m_comboxDbType->addItem(tr("MySQL"),iot_dbms::EDbType::DB_MYSQL); + m_comboxDbType->addItem(tr("Oracle"),iot_dbms::EDbType::DB_ORACLE); + m_comboxDbType->addItem(tr("OpenGauss"),iot_dbms::EDbType::DB_OPENGAUSS); + m_comboxDbType->addItem(tr("KingBase"),iot_dbms::EDbType::DB_KINGBASE); connect(m_comboxDbType,&QComboBox::currentTextChanged,this,&LoginDlg::onDbTypeChange); m_leDbName = new QLineEdit(settings.value("MySQL/login/dbname","iscs6000").toString(),this); @@ -182,8 +182,8 @@ void LoginDlg::onLoad() { //有可能会很耗时,使用子进程 QProcess proc; - const std::string strProcPath = std::move(kbd_public::CFileUtil::getPathOfBinFile( - std::string("model_waiting_dlg") + kbd_public::CFileUtil::getProcSuffix())); + const std::string strProcPath = std::move(iot_public::CFileUtil::getPathOfBinFile( + std::string("model_waiting_dlg") + iot_public::CFileUtil::getProcSuffix())); if(!strProcPath.empty()) proc.start(strProcPath.c_str()); @@ -196,7 +196,7 @@ void LoginDlg::onLoad() m_leIp->text(), m_lePort->text().toInt(), m_leDbName->text(), - (kbd_dbms::EDbType)m_comboxDbType->currentData().toInt()); + (iot_dbms::EDbType)m_comboxDbType->currentData().toInt()); //检查是否系统建模 if(err.isEmpty()) diff --git a/platform/src/tools/model_studio/main.cpp b/platform/src/tools/model_studio/main.cpp index be165022..4011a64f 100644 --- a/platform/src/tools/model_studio/main.cpp +++ b/platform/src/tools/model_studio/main.cpp @@ -38,7 +38,7 @@ int main(int argc, char *argv[]) try { - kbd_public::StartLogSystem("MODEL", "model_studio"); + iot_public::StartLogSystem("MODEL", "model_studio"); } catch (std::exception& e) { @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) } Common::initPath(); - kbd_net::initMsgBus("model", "studio"); + iot_net::initMsgBus("model", "studio"); MS_LOG_DEBUG("model_studio begin run...."); // //翻译 @@ -84,8 +84,8 @@ int main(int argc, char *argv[]) // } delete KbdTableDataMgr::getInstance(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return ret; diff --git a/platform/src/tools/model_system_config/logindlg.cpp b/platform/src/tools/model_system_config/logindlg.cpp index 8aec8cc9..4ad79f0b 100644 --- a/platform/src/tools/model_system_config/logindlg.cpp +++ b/platform/src/tools/model_system_config/logindlg.cpp @@ -43,10 +43,10 @@ void LoginDlg::initLayout() m_lePort = new QLineEdit(settings.value("MySQL/login/port","3306").toString(),this); m_comboxDbType = new QComboBox(this); m_comboxDbType->setView(new QListView); - m_comboxDbType->addItem(tr("MySQL"),kbd_dbms::EDbType::DB_MYSQL); - m_comboxDbType->addItem(tr("Oracle"),kbd_dbms::EDbType::DB_ORACLE); - m_comboxDbType->addItem(tr("OpenGauss"),kbd_dbms::EDbType::DB_OPENGAUSS); - m_comboxDbType->addItem(tr("KingBase"),kbd_dbms::EDbType::DB_KINGBASE); + m_comboxDbType->addItem(tr("MySQL"),iot_dbms::EDbType::DB_MYSQL); + m_comboxDbType->addItem(tr("Oracle"),iot_dbms::EDbType::DB_ORACLE); + m_comboxDbType->addItem(tr("OpenGauss"),iot_dbms::EDbType::DB_OPENGAUSS); + m_comboxDbType->addItem(tr("KingBase"),iot_dbms::EDbType::DB_KINGBASE); connect(m_comboxDbType,&QComboBox::currentTextChanged,this,&LoginDlg::onDbTypeChange); m_leDbName = new QLineEdit(settings.value("MySQL/login/dbname","iscs6000").toString(),this); @@ -145,8 +145,8 @@ void LoginDlg::onLoad() //有可能会很耗时,使用子进程 QProcess proc; - const std::string strProcPath = std::move(kbd_public::CFileUtil::getPathOfBinFile( - std::string("model_waiting_dlg") + kbd_public::CFileUtil::getProcSuffix())); + const std::string strProcPath = std::move(iot_public::CFileUtil::getPathOfBinFile( + std::string("model_waiting_dlg") + iot_public::CFileUtil::getProcSuffix())); if(!strProcPath.empty()) proc.start(strProcPath.c_str()); @@ -158,7 +158,7 @@ void LoginDlg::onLoad() m_leIp->text(), m_lePort->text().toInt(), m_leDbName->text(), - (kbd_dbms::EDbType)m_comboxDbType->currentData().toInt()); + (iot_dbms::EDbType)m_comboxDbType->currentData().toInt()); if(err.isEmpty()) { proc.close(); diff --git a/platform/src/tools/model_system_config/main.cpp b/platform/src/tools/model_system_config/main.cpp index 1eb7894b..cfcb05d1 100644 --- a/platform/src/tools/model_system_config/main.cpp +++ b/platform/src/tools/model_system_config/main.cpp @@ -32,7 +32,7 @@ int main(int argc, char *argv[]) try { - kbd_public::StartLogSystem("MODEL", "model_system_config"); + iot_public::StartLogSystem("MODEL", "model_system_config"); } catch (std::exception& e) { @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) //结束工作 delete KbdTableDataMgr::getInstance(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return ret; } diff --git a/platform/src/tools/model_table/databasedirect.cpp b/platform/src/tools/model_table/databasedirect.cpp index 10e820dd..eb6194b1 100644 --- a/platform/src/tools/model_table/databasedirect.cpp +++ b/platform/src/tools/model_table/databasedirect.cpp @@ -3,7 +3,7 @@ #include "../model_common/common.h" #include "db_base_api/CDbBaseApi.h" -using namespace kbd_dbms; +using namespace iot_dbms; DataBaseDirect::DataBaseDirect():DataBaseInterface() { m_db = new CDbBaseApi(); @@ -19,7 +19,7 @@ DataBaseDirect::~DataBaseDirect() } } -QString DataBaseDirect::initDBLink(const QString &user, const QString &passwd, const QString &hostName, int port, const QString &dbName, kbd_dbms::EDbType type) +QString DataBaseDirect::initDBLink(const QString &user, const QString &passwd, const QString &hostName, int port, const QString &dbName, iot_dbms::EDbType type) { CDbPara objPara; objPara.setUserName(user); @@ -256,7 +256,7 @@ QString DataBaseDirect::getDbInfo() const + QObject::tr(" 数据库:")+ db->databaseName(); } -kbd_dbms::CDbPara DataBaseDirect::getDbPara() const +iot_dbms::CDbPara DataBaseDirect::getDbPara() const { return m_db->getDbPara(); } diff --git a/platform/src/tools/model_table/databasemodelsub.cpp b/platform/src/tools/model_table/databasemodelsub.cpp index 34db3d34..0dcb15c8 100644 --- a/platform/src/tools/model_table/databasemodelsub.cpp +++ b/platform/src/tools/model_table/databasemodelsub.cpp @@ -2,7 +2,7 @@ #include "db_api_ex/CDbApi.h" #include "../model_common/common.h" -using namespace kbd_dbms; +using namespace iot_dbms; DataBaseModelSub::DataBaseModelSub():DataBaseInterface() { m_db = new CDbApi(DB_CONN_MODEL_WRITE); @@ -17,7 +17,7 @@ DataBaseModelSub::~DataBaseModelSub() } } -QString DataBaseModelSub::initDBLink(const QString &user, const QString &passwd, const QString &hostName, int port, const QString &dbName, kbd_dbms::EDbType type) +QString DataBaseModelSub::initDBLink(const QString &user, const QString &passwd, const QString &hostName, int port, const QString &dbName, iot_dbms::EDbType type) { Q_UNUSED(user); Q_UNUSED(passwd); @@ -235,7 +235,7 @@ QString DataBaseModelSub::getDbInfo() const + QObject::tr(" 数据库:")+ db.getDatabaseName(); } -kbd_dbms::CDbPara DataBaseModelSub::getDbPara() const +iot_dbms::CDbPara DataBaseModelSub::getDbPara() const { return m_db->getCurrentDbPara(); } diff --git a/platform/src/tools/model_table/kbdtabledatamgr.cpp b/platform/src/tools/model_table/kbdtabledatamgr.cpp index 29974b53..85cfdf41 100644 --- a/platform/src/tools/model_table/kbdtabledatamgr.cpp +++ b/platform/src/tools/model_table/kbdtabledatamgr.cpp @@ -100,7 +100,7 @@ KbdTableDataMgr *KbdTableDataMgr::getInstance() * @return */ QString KbdTableDataMgr::initDBLink(DataBaseInterface::LinkType linkType, const QString &user, const QString &passwd, const QString &hostName, - int port, const QString &dbName, kbd_dbms::EDbType dbType) + int port, const QString &dbName, iot_dbms::EDbType dbType) { //只运行初始化一次 if(m_dbInterface != NULL) @@ -126,7 +126,7 @@ QString KbdTableDataMgr::initDBLink(DataBaseInterface::LinkType linkType) return QString("函数接口调用错误"); m_dbInterface = new DataBaseModelSub(); - return m_dbInterface->initDBLink("","","",0,"",(kbd_dbms::EDbType)0); + return m_dbInterface->initDBLink("","","",0,"",(iot_dbms::EDbType)0); } /** @@ -810,7 +810,7 @@ QString KbdTableDataMgr::getDbInfo() const return m_extraDbInfo + m_dbInterface->getDbInfo(); } -kbd_dbms::CDbPara KbdTableDataMgr::getDbPara() const +iot_dbms::CDbPara KbdTableDataMgr::getDbPara() const { return m_dbInterface->getDbPara(); } diff --git a/platform/src/tools/model_table/worker.cpp b/platform/src/tools/model_table/worker.cpp index d68f4fe8..562b85e0 100644 --- a/platform/src/tools/model_table/worker.cpp +++ b/platform/src/tools/model_table/worker.cpp @@ -160,7 +160,7 @@ void Worker::instPluginByFesDev(const QString &pluginName,const QStringList &rtu QStringList listSql; QString fesDevTag = rtuTag + "." + FesDevTagList.at(i); - if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == kbd_dbms::DB_MYSQL) + if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == iot_dbms::DB_MYSQL) { listSql << QString("update analog,fes_analog set analog.SEQ_NO = fes_analog.SEQ_NO where analog.TAG_NAME \ = fes_analog.APP_TAG_NAME and fes_analog.DEV_TAG = '%1';").arg(fesDevTag); @@ -2079,7 +2079,7 @@ void Worker::updateFesPointCoeff(QString rtuTag) QStringList listSql; QString fesDevTag = rtuTag + "." + listFesTag.at(i); - if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == kbd_dbms::DB_MYSQL) + if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == iot_dbms::DB_MYSQL) { listSql << QString("update accuml_map_to_fes,fes_accuml set accuml_map_to_fes.COEFF = fes_accuml.COEFF where accuml_map_to_fes.KEY_ID_TAG \ = concat(fes_accuml.APP_TABLE_NAME, '.' , fes_accuml.APP_TAG_NAME) and fes_accuml.DEV_TAG = '%1';").arg(fesDevTag); @@ -2101,7 +2101,7 @@ void Worker::updateFesPointCoeff(QString rtuTag) listSql << QString("update fes_analog set COEFF = '1' where DEV_TAG = '%1';").arg(fesDevTag); //更新点序号 - if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == kbd_dbms::DB_MYSQL) + if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == iot_dbms::DB_MYSQL) { listSql << QString("update analog,fes_analog set analog.SEQ_NO = fes_analog.SEQ_NO where analog.TAG_NAME \ = fes_analog.APP_TAG_NAME and fes_analog.DEV_TAG = '%1';").arg(fesDevTag);